about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R.Garbe <arg@10ksloc.org>2006-08-14 10:24:38 +0200
committerAnselm R.Garbe <arg@10ksloc.org>2006-08-14 10:24:38 +0200
commit375a251d16de567b6c62cce208f388cd16e0ce0f (patch)
tree15b16722d42a6f9ae483a89786431b0c0fb5cb5b
parentd4b7a9a3735deeab639f28b5bb2f568e0dc49616 (diff)
downloaddwm-375a251d16de567b6c62cce208f388cd16e0ce0f.tar.gz
implemented ungrabkeys() which is called in cleanup()
-rw-r--r--dwm.h1
-rw-r--r--event.c16
-rw-r--r--main.c1
3 files changed, 18 insertions, 0 deletions
diff --git a/dwm.h b/dwm.h
index c13179f..a1bd1e4 100644
--- 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 e5ca166..4357eae 100644
--- 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 16ebbae..228228b 100644
--- 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);
'>209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311