diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2012-12-18 17:37:40 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2012-12-18 17:37:40 +0000 |
| commit | 933ed133cd6f1aaa8f05a94789e1593dd136d3f7 (patch) | |
| tree | 49d2420999ceda7b33387d49335583a82c51d4c9 /app/cwm | |
| parent | affa3b7dcb8d6dd879ecdd48683265cb68e77ffc (diff) | |
define LockMask|Mod2Mask; no functional change
Diffstat (limited to 'app/cwm')
| -rw-r--r-- | app/cwm/calmwm.h | 3 | ||||
| -rw-r--r-- | app/cwm/xevents.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h index d9b023182..5d4a9fa1a 100644 --- a/app/cwm/calmwm.h +++ b/app/cwm/calmwm.h @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.174 2012/12/18 00:14:41 okan Exp $ + * $OpenBSD: calmwm.h,v 1.175 2012/12/18 17:37:39 okan Exp $ */ #ifndef _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/app/cwm/xevents.c b/app/cwm/xevents.c index a1571439d..df4f51c3f 100644 --- a/app/cwm/xevents.c +++ b/app/cwm/xevents.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: xevents.c,v 1.69 2012/11/09 03:52:02 okan Exp $ + * $OpenBSD: xevents.c,v 1.70 2012/12/18 17:37:39 okan Exp $ */ /* @@ -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) |