From: Dana Jansens <danakj@orodu.net>
Date: Sat, 19 May 2007 23:16:04 +0000 (+0000)
Subject: merge r6646 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~18
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a2ae6ece726a2f66a4200a95affcfe605fb0212f;p=dana%2Fopenbox.git

merge r6646 from trunk
---

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)