diff options
| author | arg@10ksloc.org <unknown> | 2006-08-02 11:13:32 +0200 |
|---|---|---|
| committer | arg@10ksloc.org <unknown> | 2006-08-02 11:13:32 +0200 |
| commit | 3af6434085aee75bd90e22aee95419dc0ae0b969 (patch) | |
| tree | cb95e7ab70992fe6c3eb43bc1bf3a53261d6cb99 /event.c | |
| parent | 57871415c16664cce494b68dd3e985bcb32942c5 (diff) | |
| download | dwm-3af6434085aee75bd90e22aee95419dc0ae0b969.tar.gz | |
applied Sanders patches (numlock2)
Diffstat (limited to 'event.c')
| -rw-r--r-- | event.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/event.c b/event.c index 1aed904..0359971 100644 --- a/event.c +++ b/event.c @@ -19,7 +19,7 @@ typedef struct { KEYS -static unsigned int valid_mask = 255 & ~(NUMLOCKMASK | LockMask); +#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask)) static void movemouse(Client *c) @@ -229,11 +229,11 @@ keypress(XEvent *e) 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 & valid_mask) == ev->state)) { + if(keysym == key[i].keysym && + CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) { if(key[i].func) key[i].func(&key[i].arg); return; @@ -335,13 +335,20 @@ grabkeys() for(i = 0; i < len; i++) { code = XKeysymToKeycode(dpy, key[i].keysym); + /* normal */ XUngrabKey(dpy, code, key[i].mod, root); - 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); + /* capslock */ + XUngrabKey(dpy, code, key[i].mod | LockMask, root); + XGrabKey(dpy, code, key[i].mod | LockMask, root, True, + GrabModeAsync, GrabModeAsync); + /* numlock */ + XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root); XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True, GrabModeAsync, GrabModeAsync); + /* capslock & numlock */ + XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root); XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True, GrabModeAsync, GrabModeAsync); } |