summary refs log tree commit diff
path: root/xevents.c
diff options
context:
space:
mode:
authoroga <oga>2008-06-17 23:40:33 +0000
committeroga <oga>2008-06-17 23:40:33 +0000
commit4f2d4724c961aac55558069973f8a20bf01d8338 (patch)
tree274432e36f535ac87a4e355edf5c87ee7cdf5af0 /xevents.c
parent19ba704ee3b16bcf4a29c223c5796a7f63fa6b6d (diff)
downloadcwm-4f2d4724c961aac55558069973f8a20bf01d8338.tar.gz
cwm-4f2d4724c961aac55558069973f8a20bf01d8338.tar.xz
cwm-4f2d4724c961aac55558069973f8a20bf01d8338.zip
Ignore caps lock and numlock for keyboard bindings. The way Xlib makes
you do this is ugly. Also remove mod2 (numlock) and mod3 (odd) from the
list of keybinding modifiers. They don't make much sense here.

based on a heavily modified diff from Martynas.

ok okan.
Diffstat (limited to 'xevents.c')
-rw-r--r--xevents.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/xevents.c b/xevents.c
index dc3ac87..b4f068c 100644
--- a/xevents.c
+++ b/xevents.c
@@ -228,6 +228,9 @@ xev_handle_buttonpress(struct xevent *xev, XEvent *ee)
 
 	cc = client_find(e->window);
 
+	/* Ignore caps lock and numlock */
+	e->state &= ~(Mod2Mask | LockMask);
+
 	TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) {
 		if (e->button == mb->button && e->state == mb->modmask)
 			break;
@@ -273,6 +276,9 @@ xev_handle_keypress(struct xevent *xev, XEvent *ee)
 	keysym = XKeycodeToKeysym(X_Dpy, e->keycode, 0);
 	skeysym = XKeycodeToKeysym(X_Dpy, e->keycode, 1);
 
+	/* we don't care about caps lock and numlock here */
+	e->state &= ~(LockMask | Mod2Mask);
+
 	TAILQ_FOREACH(kb, &Conf.keybindingq, entry) {
 		if (keysym != kb->keysym && skeysym == kb->keysym)
 			modshift = ShiftMask;