X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/fe3dfbbe90f813294bb69e41f996a000f63c1560..78b050c13c8ea660ed801c21bddd2957a2bc3f40:/event.c

diff --git a/event.c b/event.c
index c5e5f40..5c21fcb 100644
--- a/event.c
+++ b/event.c
@@ -4,7 +4,6 @@
  */
 #include "dwm.h"
 #include <stdlib.h>
-#include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
@@ -145,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);
@@ -277,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)
 {
@@ -349,6 +358,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[LeaveNotify] = leavenotify,
 	[Expose] = expose,
 	[KeyPress] = keypress,
+	[MappingNotify] = mappingnotify,
 	[MapRequest] = maprequest,
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
@@ -361,11 +371,7 @@ grabkeys()
 	unsigned int i;
 	KeyCode code;
 
-	while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
-			 GrabModeAsync, CurrentTime) != GrabSuccess)
-		usleep(1000);
-	XUngrabKeyboard(dpy, CurrentTime);
-
+	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,