summary refs log tree commit diff
path: root/xevents.c
diff options
context:
space:
mode:
authorokan <okan>2012-09-12 15:09:33 +0000
committerokan <okan>2012-09-12 15:09:33 +0000
commit871fdf56715dbc85b2ad4f058366a06a66615c65 (patch)
treecde1423167da28d0fff354ec210e9986bb0140c6 /xevents.c
parent637edf38d51024ba88184b1457640f8fa459e693 (diff)
downloadcwm-871fdf56715dbc85b2ad4f058366a06a66615c65.tar.gz
cwm-871fdf56715dbc85b2ad4f058366a06a66615c65.tar.xz
cwm-871fdf56715dbc85b2ad4f058366a06a66615c65.zip
revert previous for now until a way to test more than a few encodings is found
Diffstat (limited to 'xevents.c')
-rw-r--r--xevents.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xevents.c b/xevents.c
index a155614..eddf4fe 100644
--- a/xevents.c
+++ b/xevents.c
@@ -240,8 +240,8 @@ xev_handle_buttonpress(XEvent *ee)
 	sc = screen_fromroot(e->root);
 	cc = client_find(e->window);
 
-	/* only allow the ones we care about */
-	e->state &= (ControlMask | Mod1Mask | Mod4Mask | ShiftMask);
+	/* Ignore caps lock and numlock */
+	e->state &= ~(Mod2Mask | LockMask);
 
 	TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) {
 		if (e->button == mb->button && e->state == mb->modmask)
@@ -282,8 +282,8 @@ xev_handle_keypress(XEvent *ee)
 	keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0);
 	skeysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 1);
 
-	/* only allow the ones we care about */
-	e->state &= (ControlMask | Mod1Mask | Mod4Mask | ShiftMask);
+	/* 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)