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, 39 insertions, 37 deletions

diff --git a/src/Keys.cc b/src/Keys.cc
index 96f57cb..0d3eecd 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -27,7 +27,6 @@
 #include "FbTk/StringUtil.hh"
 #include "FbTk/App.hh"
 #include "FbTk/Command.hh"
-#include "FbTk/KeyUtil.hh"
 
 #include "CommandParser.hh"
 #include "FbTk/I18n.hh"
@@ -81,6 +80,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+#include <X11/Xutil.h>
+#include <X11/XKBlib.h>
 
 #include <iostream>
 #include <fstream>
@@ -102,7 +103,7 @@ Keys::Keys(const char *filename):
         load(filename);
 }
 
-Keys::~Keys() { 
+Keys::~Keys() {
 
     FbTk::KeyUtil::ungrabKeys();
     deleteTree();
@@ -112,12 +113,12 @@ Keys::~Keys() {
 void Keys::deleteTree() {
     while (!m_keylist.empty()) {
         if (m_keylist.back())
-            delete m_keylist.back();            
+            delete m_keylist.back();
         m_keylist.pop_back();
     }
 }
 
-/** 
+/**
     Load and grab keys
     TODO: error checking
     @return true on success else false
@@ -125,7 +126,7 @@ void Keys::deleteTree() {
 bool Keys::load(const char *filename) {
     if (!filename)
         return false;
-        
+
     //ungrab all keys
     FbTk::KeyUtil::ungrabKeys();
 
@@ -133,7 +134,7 @@ bool Keys::load(const char *filename) {
     deleteTree();
 
     FbTk::App::instance()->sync(false);
-                                                
+
     //open the file
     ifstream infile(filename);
     if (!infile)
@@ -158,8 +159,8 @@ bool Keys::load(const char *filename) {
 
 bool Keys::save(const char *filename) const {
     //!!
-    //!! TODO: fix keybinding saving 
-    //!! (we probably need to save key actions 
+    //!! TODO: fix keybinding saving
+    //!! (we probably need to save key actions
     //!! as strings instead of creating new Commands)
 
     // open file for writing
@@ -178,16 +179,16 @@ bool Keys::addBinding(const std::string &linebuffer) {
     // must have at least 1 argument
     if (val.size() <= 0)
         return true; // empty lines are valid.
-                        
+
     if (val[0][0] == '#' || val[0][0] == '!' ) //the line is commented
         return true; // still a valid line.
-                
+
     unsigned int key = 0, mod = 0;
     char keyarg = 0;
     t_key *current_key=0, *last_key=0;
 
     _FB_USES_NLS;
-    // for each argument 
+    // for each argument
     for (unsigned int argc=0; argc<val.size(); argc++) {
 
         if (val[argc][0] != ':') { // parse key(s)
@@ -199,7 +200,7 @@ bool Keys::addBinding(const std::string &linebuffer) {
                 int tmpmod = FbTk::KeyUtil::getModifier(val[argc].c_str());
                 if(tmpmod)
                     mod |= tmpmod; //If it's a modifier
-                else { 
+                else {
                     key = FbTk::KeyUtil::getKey(val[argc].c_str()); // else get the key
                     if (key == 0) {
                         cerr<<_FBTEXT(Keys, InvalidKeyMod, "Keys: Invalid key/modifier on line", "A bad key/modifier string was found on line (number following)")<<" "<<
@@ -209,13 +210,13 @@ bool Keys::addBinding(const std::string &linebuffer) {
                     if (!current_key) {
                         current_key = new t_key(key, mod);
                         last_key = current_key;
-                    } else { 
+                    } else {
                         t_key *temp_key = new t_key(key, mod);
                         last_key->keylist.push_back(temp_key);
                         last_key = temp_key;
                     }
                 }
-            }                   
+            }
 
         } else { // parse command line
             if (last_key == 0) {
@@ -224,7 +225,7 @@ bool Keys::addBinding(const std::string &linebuffer) {
                 return false;
             }
             bool ret_val = true;
-            const char *str = 
+            const char *str =
                 FbTk::StringUtil::strcasestr(linebuffer.c_str(),
                                              val[argc].c_str() + 1); // +1 to skip ':'
             if (str == 0) {
@@ -263,41 +264,42 @@ bool Keys::addBinding(const std::string &linebuffer) {
  @return the KeyAction of the XKeyEvent
 */
 void Keys::doAction(XKeyEvent &ke) {
-    static t_key *next_key = 0;
-    // Remove numlock, capslock and scrolllock
+
     ke.state = FbTk::KeyUtil::instance().cleanMods(ke.state);
-        
+
+    static struct t_key* next_key = 0;
+
     if (!next_key) {
-        
+
         for (unsigned int i=0; i<m_keylist.size(); i++) {
             if (*m_keylist[i] == ke) {
                 if (m_keylist[i]->keylist.size()) {
                     next_key = m_keylist[i];
-                    break; //end for-loop 
+                    break; //end for-loop
                 } else {
                     if (*m_keylist[i]->m_command != 0)
                         m_keylist[i]->m_command->execute();
                 }
             }
         }
-        
+
     } else { //check the nextkey
-        t_key *temp_key = next_key->find(ke);
+            t_key *temp_key = next_key->find(ke);
         if (temp_key) {
             if (temp_key->keylist.size()) {
-                next_key = temp_key;                                                            
+                next_key = temp_key;
             } else {
                 next_key = 0;
                 if (*temp_key->m_command != 0)
                     temp_key->m_command->execute();
             }
         }  else  {
-            temp_key = next_key;                
+            temp_key = next_key;
             next_key = 0;
             if (*temp_key->m_command != 0)
                 temp_key->m_command->execute();
-                
-        }               
+
+        }
     }
 }
 
@@ -318,7 +320,7 @@ bool Keys::mergeTree(t_key *newtree, t_key *basetree) {
     if (basetree==0) {
         unsigned int baselist_i=0;
         for (; baselist_i<m_keylist.size(); baselist_i++) {
-            if (m_keylist[baselist_i]->mod == newtree->mod && 
+            if (m_keylist[baselist_i]->mod == newtree->mod &&
                 m_keylist[baselist_i]->key == newtree->key) {
                 if (newtree->keylist.size() && *m_keylist[baselist_i]->m_command == 0) {
                     //assumes the newtree only have one branch
@@ -330,12 +332,12 @@ bool Keys::mergeTree(t_key *newtree, t_key *basetree) {
 
         if (baselist_i == m_keylist.size()) {
             FbTk::KeyUtil::grabKey(newtree->key, newtree->mod);
-            m_keylist.push_back(new t_key(newtree));                    
+            m_keylist.push_back(new t_key(newtree));
             if (newtree->keylist.size())
                 return mergeTree(newtree->keylist[0], m_keylist.back());
             return true;
         }
-                
+
     } else {
         unsigned int baselist_i = 0;
         for (; baselist_i<basetree->keylist.size(); baselist_i++) {
@@ -346,24 +348,24 @@ bool Keys::mergeTree(t_key *newtree, t_key *basetree) {
                     return mergeTree(newtree->keylist[0], basetree->keylist[baselist_i]);
                 } else
                     return false;
-            }                                   
+            }
         }
         //if it wasn't in the list grab the key and add it to the list
-        if (baselist_i==basetree->keylist.size()) {                     
+        if (baselist_i==basetree->keylist.size()) {
             FbTk::KeyUtil::grabKey(newtree->key, newtree->mod);
             basetree->keylist.push_back(new t_key(newtree));
             if (newtree->keylist.size())
                 return mergeTree(newtree->keylist[0], basetree->keylist.back());
-            return true;                
-        }               
+            return true;
+        }
     }
-        
+
     return false;
 }
 
 Keys::t_key::t_key(unsigned int key_, unsigned int mod_, FbTk::RefCount<FbTk::Command> command) {
     key = key_;
-    mod = mod_; 
+    mod = mod_;
     m_command = command;
 }
 
@@ -373,8 +375,8 @@ Keys::t_key::t_key(t_key *k) {
     m_command = k->m_command;
 }
 
-Keys::t_key::~t_key() { 
-    while (!keylist.empty()) {          
+Keys::t_key::~t_key() {
+    while (!keylist.empty()) {
         t_key *k = keylist.back();
         if (k != 0) { // make sure we don't have a bad key pointer
             delete k;