Mercurial > dwm-meillo
changeset 145:774754477c35
applied Cedric's NumLock patch
| author | arg@10ksloc.org |
|---|---|
| date | Tue, 01 Aug 2006 12:41:38 +0200 (2006-08-01) |
| parents | e61447a7f249 |
| children | f328ce9c558c |
| files | event.c |
| diffstat | 1 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/event.c Tue Aug 01 12:39:14 2006 +0200 +++ b/event.c Tue Aug 01 12:41:38 2006 +0200 @@ -57,6 +57,9 @@ { MODKEY|ShiftMask, XK_w, spawn, { .argv = browse } }, }; +#define NumLockMask Mod2Mask +unsigned int valid_mask = 255 & ~( NumLockMask | LockMask); + /* END CUSTOMIZE */ /* static */ @@ -271,10 +274,11 @@ unsigned int i; KeySym keysym; XKeyEvent *ev = &e->xkey; + ev->state &= valid_mask; keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); for(i = 0; i < len; i++) - if((keysym == key[i].keysym) && (key[i].mod == ev->state)) { + if((keysym == key[i].keysym) && ((key[i].mod & valid_mask) == ev->state)) { if(key[i].func) key[i].func(&key[i].arg); return; @@ -377,7 +381,19 @@ for(i = 0; i < len; i++) { code = XKeysymToKeycode(dpy, key[i].keysym); XUngrabKey(dpy, code, key[i].mod, root); + if (NumLockMask) + { + XUngrabKey(dpy, code, key[i].mod | NumLockMask, root); + XUngrabKey(dpy, code, key[i].mod | NumLockMask | LockMask, root); + } XGrabKey(dpy, code, key[i].mod, root, True, GrabModeAsync, GrabModeAsync); + if (NumLockMask) + { + XGrabKey(dpy, code, key[i].mod | NumLockMask, root, True, + GrabModeAsync, GrabModeAsync); + XGrabKey(dpy, code, key[i].mod | NumLockMask | LockMask, root, True, + GrabModeAsync, GrabModeAsync); + } } }