X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=5c21fcbeea6a79cef4bb1a9dd2e5c92c1bf5fc5c;hb=4ad20ffc2c23d29329bc7349985d889f2cb45612;hp=4357eaee441d98c687a0359336d0622d70ca3077;hpb=375a251d16de567b6c62cce208f388cd16e0ce0f;p=dwm.git

diff --git a/event.c b/event.c
index 4357eae..5c21fcb 100644
--- a/event.c
+++ b/event.c
@@ -144,11 +144,11 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
+	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XEvent synev;
 	XWindowChanges wc;
-	unsigned long newmask;
 
 	if((c = getclient(ev->window))) {
 		gravitate(c, True);
@@ -254,13 +254,15 @@ keypress(XEvent *e)
 	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 &&
-				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;
 		}
+	}
 }
 
 static void
@@ -275,6 +277,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 XWindowAttributes wa;
@@ -346,6 +358,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[LeaveNotify] = leavenotify,
 	[Expose] = expose,
 	[KeyPress] = keypress,
+	[MappingNotify] = mappingnotify,
 	[MapRequest] = maprequest,
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
@@ -358,6 +371,7 @@ grabkeys()
 	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,
@@ -370,19 +384,3 @@ grabkeys()
 				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);
-	}
-}