implemented ungrabkeys() which is called in cleanup()

diff --git a/dwm.h b/dwm.h
index c13179fe46110e0b70e70d89b96e494710184eb0..a1bd1e4863bf7a2dddebc668438000eab2d70a48 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -108,6 +108,7 @@ extern unsigned int textw(const char *text);
 
 /* event.c */
 extern void grabkeys();
+extern void ungrabkeys();
 
 /* main.c */
 extern int getproto(Window w);

diff --git a/event.c b/event.c
index e5ca1664854a8402c24820185dbf8dce386de1d8..4357eaee441d98c687a0359336d0622d70ca3077 100644 (file)
--- a/event.c
+++ b/event.c
@@ -370,3 +370,19 @@ 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);
+       }
+}

diff --git a/main.c b/main.c
index 16ebbaef7e739f16d526c9c6fc93fe26485fd07c..228228bfb37d522259f7e79822e1ace4a1bc8058 100644 (file)
--- a/main.c
+++ b/main.c
@@ -22,6 +22,7 @@ static Bool otherwm;
 static void
 cleanup()
 {
+       ungrabkeys();
        while(sel) {
                resize(sel, True, TopLeft);
                unmanage(sel);