Fix for #1160244, #1099704, #1094107:

if the xkb-extension is enabled and the user switches between his/her
keyboardlayouts fluxbox's keybhandling doesn't work well anymore because
xkeyevent.state contains also xkb-related flags and thus we have to handle
that with caution.

KeyUtils now contain 'isolateModifierMask()' to really work only on the
modifiers. why not as part of cleanMods() ? because the XLookupString return
false results, eg TextBox's would only print chars from the first
keyboardlayout.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/FbTk/KeyUtil.hh b/src/FbTk/KeyUtil.hh
index 4cafcdd..e32384f 100644
--- a/src/FbTk/KeyUtil.hh
+++ b/src/FbTk/KeyUtil.hh
@@ -70,6 +70,14 @@ public:
          return mods & ~(capslock() | numlock() );
     }
 
+    /** 
+       strip away everything which is actually not a modifier
+       eg, xkb-keyboardgroups are encoded as bit 13 and 14
+    */
+    unsigned int isolateModifierMask(unsigned int mods) {
+        return mods & (ShiftMask|LockMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask); 
+    }
+
     /**
        Convert the specified key into appropriate modifier mask
        @return corresponding modifier mask
@@ -78,6 +86,7 @@ public:
     int numlock() const { return Mod2Mask; } //m_numlock; }
     int capslock() const { return LockMask; } //m_capslock; }
     int scrolllock() const { return Mod5Mask; } //m_scrolllock; }
+
 private:
     void loadModmap();