remove unnecessary XSync

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 4357eae..125c6a2 100644 (file)
--- a/event.c
+++ b/event.c
@@ -254,13 +254,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 +276,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 +358,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,6 +371,7 @@ 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,
        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);
                XGrabKey(dpy, code, key[i].mod, root, True,


@@ -370,19 +384,3 @@ grabkeys()
                                GrabModeAsync, GrabModeAsync);
        }
 }
                                GrabModeAsync, GrabModeAsync);
        }
 }

-
-void
-ungrabkeys()
-{
-       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);
-               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);
-       }
-}