From e5d59c2d7b9934445c060b03a1f3c99246d65b93 Mon Sep 17 00:00:00 2001 From: okan Date: Tue, 18 Dec 2012 17:37:39 +0000 Subject: [PATCH] define LockMask|Mod2Mask; no functional change --- calmwm.h | 1 + xevents.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/calmwm.h b/calmwm.h index 3d44e9b..8ea091a 100644 --- a/calmwm.h +++ b/calmwm.h @@ -53,6 +53,7 @@ #define MENUGRABMASK (BUTTONMASK|ButtonMotionMask|StructureNotifyMask|\ PointerMotionMask) #define SEARCHMASK (KeyPressMask|ExposureMask) +#define IGNOREMODMASK (LockMask|Mod2Mask) /* kb movement */ #define CWM_MOVE 0x0001 diff --git a/xevents.c b/xevents.c index e167189..421a1b7 100644 --- a/xevents.c +++ b/xevents.c @@ -241,8 +241,7 @@ xev_handle_buttonpress(XEvent *ee) sc = screen_fromroot(e->root); cc = client_find(e->window); - /* Ignore caps lock and numlock */ - e->state &= ~(Mod2Mask | LockMask); + e->state &= ~IGNOREMODMASK; TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) { if (e->button == mb->button && e->state == mb->modmask) @@ -283,8 +282,7 @@ xev_handle_keypress(XEvent *ee) keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0); skeysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 1); - /* we don't care about caps lock and numlock here */ - e->state &= ~(LockMask | Mod2Mask); + e->state &= ~IGNOREMODMASK; TAILQ_FOREACH(kb, &Conf.keybindingq, entry) { if (keysym != kb->keysym && skeysym == kb->keysym)