applied sanders somepatches.patch

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 4357eae..1d2227d 100644 (file)
--- a/event.c
+++ b/event.c
@@ -18,7 +18,7 @@ typedef struct {
 
 KEYS
 
 
 KEYS
 

-#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))

 
 static void
 movemouse(Client *c)
 
 static void
 movemouse(Client *c)


@@ -109,16 +109,22 @@ buttonpress(XEvent *e)
                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {
                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {

-                               if(ev->button == Button3)
-                                       toggleview(&a);
-                               else
+                               if(ev->button == Button1)

                                        view(&a);
                                        view(&a);

+                               else if(ev->button == Button3)
+                                       toggleview(&a);

                                return;
                        }
                }
                                return;
                        }
                }

+               if(ev->x < x + bmw) {
+                       if(ev->button == Button1)
+                               togglemode(NULL);
+               }

        }
        else if((c = getclient(ev->window))) {
                focus(c);
        }
        else if((c = getclient(ev->window))) {
                focus(c);

+               if(CLEANMASK(ev->state) == 0)
+                       return;

                switch(ev->button) {
                default:
                        break;
                switch(ev->button) {
                default:
                        break;


@@ -144,11 +150,11 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
 static void
 configurerequest(XEvent *e)
 {

+       unsigned long newmask;

        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XEvent synev;
        XWindowChanges wc;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XEvent synev;
        XWindowChanges wc;

-       unsigned long newmask;

 
        if((c = getclient(ev->window))) {
                gravitate(c, True);
 
        if((c = getclient(ev->window))) {
                gravitate(c, True);


@@ -254,13 +260,15 @@ keypress(XEvent *e)
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);

-       for(i = 0; i < len; i++)
+       for(i = 0; i < len; i++) {

                if(keysym == key[i].keysym &&
                if(keysym == key[i].keysym &&

-                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) {
+                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+               {

                        if(key[i].func)
                                key[i].func(&key[i].arg);
                        return;
                }
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                        return;
                }

+       }

 }
 
 static void
 }
 
 static void


@@ -274,6 +282,16 @@ leavenotify(XEvent *e)
        }
 }
 
        }
 }
 

+static void
+mappingnotify(XEvent *e)
+{
+       XMappingEvent *ev = &e->xmapping;
+
+       XRefreshKeyboardMapping(ev);
+       if(ev->request == MappingKeyboard)
+               grabkeys();
+}
+

 static void
 maprequest(XEvent *e)
 {
 static void
 maprequest(XEvent *e)
 {


@@ -346,6 +364,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [LeaveNotify] = leavenotify,
        [Expose] = expose,
        [KeyPress] = keypress,
        [LeaveNotify] = leavenotify,
        [Expose] = expose,
        [KeyPress] = keypress,

+       [MappingNotify] = mappingnotify,

        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify


@@ -358,31 +377,29 @@ grabkeys()
        unsigned int i;
        KeyCode code;
 
        unsigned int i;
        KeyCode code;
 

+       XUngrabKey(dpy, AnyKey, AnyModifier, root);

        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);
                XGrabKey(dpy, code, key[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);
                XGrabKey(dpy, code, key[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+               XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+               XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,

                                GrabModeAsync, GrabModeAsync);
        }
 }
 
 void
                                GrabModeAsync, GrabModeAsync);
        }
 }
 
 void

-ungrabkeys()
+procevent()

 {
 {

-       static unsigned int len = sizeof(key) / sizeof(key[0]);
-       unsigned int i;
-       KeyCode code;
+       XEvent ev;

 
 

-       for(i = 0; i < len; i++) {
-               code = XKeysymToKeycode(dpy, key[i].keysym);
-               XUngrabKey(dpy, code, key[i].mod, root);
-               XUngrabKey(dpy, code, key[i].mod | LockMask, root);
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);
+       while(XPending(dpy)) {
+               XNextEvent(dpy, &ev);
+               if(handler[ev.type])
+                       (handler[ev.type])(&ev); /* call handler */

        }
 }
        }
 }

+