applied Sanders patches (numlock2)

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 58df281..0359971 100644 (file)
--- a/event.c
+++ b/event.c
@@ -8,10 +8,7 @@
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask       (ButtonMask | PointerMotionMask)
-
-/* CUSTOMIZE */
+/* static */
 
 typedef struct {
        unsigned long mod;
@@ -20,47 +17,9 @@ typedef struct {
        Arg arg;
 } Key;
 
-const char *browse[] = { "firefox", NULL };
-const char *gimp[] = { "gimp", NULL };
-const char *term[] = { 
-       "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
-       "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
-};
-const char *xlock[] = { "xlock", NULL };
-
-static Key key[] = {
-       /* modifier             key             function        arguments */
-       { MODKEY,               XK_0,           view,           { .i = Tfnord } }, 
-       { MODKEY,               XK_1,           view,           { .i = Tdev } }, 
-       { MODKEY,               XK_2,           view,           { .i = Tnet } }, 
-       { MODKEY,               XK_3,           view,           { .i = Twork } }, 
-       { MODKEY,               XK_4,           view,           { .i = Tmisc} }, 
-       { MODKEY,               XK_j,           focusnext,      { 0 } }, 
-       { MODKEY,               XK_k,           focusprev,      { 0 } },
-       { MODKEY,               XK_m,           togglemax,      { 0 } }, 
-       { MODKEY,               XK_space,       togglemode,     { 0 } }, 
-       { MODKEY,               XK_Return,      zoom,           { 0 } },
-       { MODKEY|ControlMask,   XK_0,           appendtag,      { .i = Tfnord } }, 
-       { MODKEY|ControlMask,   XK_1,           appendtag,      { .i = Tdev } }, 
-       { MODKEY|ControlMask,   XK_2,           appendtag,      { .i = Tnet } }, 
-       { MODKEY|ControlMask,   XK_3,           appendtag,      { .i = Twork } }, 
-       { MODKEY|ControlMask,   XK_4,           appendtag,      { .i = Tmisc } }, 
-       { MODKEY|ShiftMask,     XK_0,           replacetag,     { .i = Tfnord } }, 
-       { MODKEY|ShiftMask,     XK_1,           replacetag,     { .i = Tdev } }, 
-       { MODKEY|ShiftMask,     XK_2,           replacetag,     { .i = Tnet } }, 
-       { MODKEY|ShiftMask,     XK_3,           replacetag,     { .i = Twork } }, 
-       { MODKEY|ShiftMask,     XK_4,           replacetag,     { .i = Tmisc } }, 
-       { MODKEY|ShiftMask,     XK_c,           killclient,     { 0 } }, 
-       { MODKEY|ShiftMask,     XK_g,           spawn,          { .argv = gimp } },
-       { MODKEY|ShiftMask,     XK_l,           spawn,          { .argv = xlock } },
-       { MODKEY|ShiftMask,     XK_q,           quit,           { 0 } },
-       { MODKEY|ShiftMask,     XK_w,           spawn,          { .argv = browse } },
-       { MODKEY|ShiftMask,     XK_Return,      spawn,          { .argv = term } },
-};
-
-/* END CUSTOMIZE */
+KEYS
 
-/* static */
+#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
 
 static void
 movemouse(Client *c)
@@ -72,12 +31,12 @@ movemouse(Client *c)
 
        ocx = c->x;
        ocy = c->y;
-       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch (ev.type) {
                default: break;
                case Expose:
@@ -105,12 +64,12 @@ resizemouse(Client *c)
 
        ocx = c->x;
        ocy = c->y;
-       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
        for(;;) {
-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch(ev.type) {
                default: break;
                case Expose:
@@ -156,21 +115,20 @@ buttonpress(XEvent *e)
                        }
                        break;
                case Button4:
-                       a.i = (tsel + 1 < TLast) ? tsel + 1 : 0;
-                       view(&a);
+                       viewnext(&a);
                        break;
                case Button5:
-                       a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1;
-                       view(&a);
+                       viewprev(&a);
                        break;
                }
        }
        else if((c = getclient(ev->window))) {
+               focus(c);
                switch(ev->button) {
                default:
                        break;
                case Button1:
-                       if(arrange == dofloat || c->isfloat) {
+                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
                                higher(c);
                                movemouse(c);
                        }
@@ -179,7 +137,7 @@ buttonpress(XEvent *e)
                        lower(c);
                        break;
                case Button3:
-                       if(arrange == dofloat || c->isfloat) {
+                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
                                higher(c);
                                resizemouse(c);
                        }
@@ -241,7 +199,7 @@ enternotify(XEvent *e)
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
-       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
+       if(ev->detail == NotifyInferior)
                return;
 
        if((c = getclient(ev->window)))
@@ -267,14 +225,15 @@ expose(XEvent *e)
 static void
 keypress(XEvent *e)
 {
-       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+       static unsigned int len = sizeof(key) / sizeof(key[0]);
        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < len; i++)
-               if((keysym == key[i].keysym) && (key[i].mod == ev->state)) {
+               if(keysym == key[i].keysym &&
+                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                        return;
@@ -370,14 +329,27 @@ void (*handler[LASTEvent]) (XEvent *) = {
 void
 grabkeys()
 {
-       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+       static unsigned int len = sizeof(key) / sizeof(key[0]);
        unsigned int i;
        KeyCode code;
 
        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);
+               /* normal */
                XUngrabKey(dpy, code, key[i].mod, root);
                XGrabKey(dpy, code, key[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);
+               /* capslock */
+               XUngrabKey(dpy, code, key[i].mod | LockMask, root);
+               XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               /* numlock */
+               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
+               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               /* capslock & numlock */
+               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);
+               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
        }
 }