X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=ab9d05b09859c631b026bbf31d307adeba1b0c83;hb=1efc5111ec358130368a9c8a6c8a5ced02331b9c;hp=432599e8245ba68e968664e8e419d3f87a0443a7;hpb=927bc7818cc3e882d1ecbcf93ff2a437d5599031;p=chaz%2Fopenbox 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)