diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-19 23:15:42 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-19 23:15:42 +0000 |
| commit | 1efc5111ec358130368a9c8a6c8a5ced02331b9c (patch) | |
| tree | e50bc4d010fff504483cfb3afdd5ac88a4c08cff | |
| parent | 927bc7818cc3e882d1ecbcf93ff2a437d5599031 (diff) | |
revert r6638
| -rw-r--r-- | openbox/keyboard.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/openbox/keyboard.c b/openbox/keyboard.c index 432599e8..ab9d05b0 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -31,6 +31,7 @@ #include "config.h" #include "keytree.h" #include "keyboard.h" +#include "translate.h" #include "moveresize.h" #include "popup.h" #include "gettext.h" @@ -292,16 +293,7 @@ void keyboard_event(ObClient *client, const XEvent *e) p = curpos->first_child; while (p) { if (p->key == e->xkey.keycode && - /* tricksy. - if you have Super_L and Super_R bound to different modXmasks, - this makes either mod mask count as Super - - e.g. Super_L is mod1 and Super_R is mod2, so.. - p->state = 00011 - key state is just Super_L so 00001 - 00011 | 00001 == 00011 == p->state - */ - (p->state | e->xkey.state) == p->state) + p->state == e->xkey.state) { /* if we hit a key binding, then close any open menus and run it */ if (menu_frame_visible) |
