Added tag 0.9 for changeset fae61afa861755636c4a1070694209ace8efbb6c

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 2df9683..545efe9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -11,6 +11,7 @@
 #include <unistd.h>
 #include <sys/select.h>
 #include <X11/cursorfont.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <X11/cursorfont.h>

+#include <X11/keysym.h>

 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 


@@ -26,7 +27,16 @@ cleanup()
                resize(sel, True, TopLeft);
                unmanage(sel);
        }
                resize(sel, True, TopLeft);
                unmanage(sel);
        }

+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       else
+               XFreeFont(dpy, dc.font.xfont);
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       XDestroyWindow(dpy, barwin);
+       XFreePixmap(dpy, dc.drawable);
+       XFreeGC(dpy, dc.gc);

        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);

+       XSync(dpy, False);

 }
 
 static void
 }
 
 static void


@@ -36,6 +46,7 @@ scan()
        Window *wins, d1, d2;
        XWindowAttributes wa;
 
        Window *wins, d1, d2;
        XWindowAttributes wa;
 

+       wins = NULL;

        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))


@@ -85,7 +96,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 char stext[1024];
 Bool *seltag;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 char stext[1024];
 Bool *seltag;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;

-unsigned int ntags;
+unsigned int ntags, numlockmask;

 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;


@@ -162,12 +173,12 @@ xerror(Display *dpy, XErrorEvent *ee)
 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {

-       int i, xfd;
+       int i, j, xfd;

        unsigned int mask;
        fd_set rd;
        Bool readin = True;
        Window w;
        unsigned int mask;
        fd_set rd;
        Bool readin = True;
        Window w;

-       XEvent ev;
+       XModifierKeymap *modmap;

        XSetWindowAttributes wa;
 
        if(argc == 2 && !strncmp("-v", argv[1], 3)) {
        XSetWindowAttributes wa;
 
        if(argc == 2 && !strncmp("-v", argv[1], 3)) {


@@ -194,6 +205,7 @@ main(int argc, char *argv[])
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
 
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
 

+       XSync(dpy, False);

        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);


@@ -211,7 +223,16 @@ main(int argc, char *argv[])
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 

-       wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
+       modmap = XGetModifierMapping(dpy);
+       for (i = 0; i < 8; i++) {
+               for (j = 0; j < modmap->max_keypermod; j++) {
+                       if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+                               numlockmask = (1 << i);
+               }
+       }
+       XFree(modmap);
+
+       wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask;

        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 


@@ -233,13 +254,12 @@ main(int argc, char *argv[])
        sh = DisplayHeight(dpy, screen);
        mw = (sw * MASTERW) / 100;
 
        sh = DisplayHeight(dpy, screen);
        mw = (sw * MASTERW) / 100;
 

-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ButtonPressMask | ExposureMask;
-

        bx = by = 0;
        bw = sw;
        dc.h = bh = dc.font.height + 4;
        bx = by = 0;
        bw = sw;
        dc.h = bh = dc.font.height + 4;

+       wa.override_redirect = 1;
+       wa.background_pixmap = ParentRelative;
+       wa.event_mask = ButtonPressMask | ExposureMask;

        barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
        barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);


@@ -258,6 +278,7 @@ main(int argc, char *argv[])
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);

+       procevent();

        while(running) {
                FD_ZERO(&rd);
                if(readin)
        while(running) {
                FD_ZERO(&rd);
                if(readin)


@@ -277,14 +298,8 @@ main(int argc, char *argv[])
                                        strcpy(stext, "broken pipe");
                                drawstatus();
                        }
                                        strcpy(stext, "broken pipe");
                                drawstatus();
                        }

-                       if(FD_ISSET(xfd, &rd)) {
-                               while(XPending(dpy)) {
-                                       XNextEvent(dpy, &ev);
-                                       if(handler[ev.type])
-                                               (handler[ev.type])(&ev); /* call handler */
-                               }
-                       }

                }
                }

+               procevent();

        }
        cleanup();
        XCloseDisplay(dpy);
        }
        cleanup();
        XCloseDisplay(dpy);