1 files changed, 31 insertions, 25 deletions

diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc
index 0578b9c..6ffe2a2 100644
--- a/src/FbTk/KeyUtil.cc
+++ b/src/FbTk/KeyUtil.cc
@@ -42,16 +42,16 @@ struct t_modlist{
 };
 
 const struct t_modlist modlist[] = {
-    {"SHIFT", ShiftMask},
-    {"LOCK", LockMask},
-    {"CONTROL", ControlMask},
-    {"MOD1", Mod1Mask},
-    {"MOD2", Mod2Mask},
-    {"MOD3", Mod3Mask},
-    {"MOD4", Mod4Mask},
-    {"MOD5", Mod5Mask},
-    {"ALT", Mod1Mask},
-    {"CTRL", ControlMask},
+    {"shift", ShiftMask},
+    {"lock", LockMask},
+    {"control", ControlMask},
+    {"mod1", Mod1Mask},
+    {"mod2", Mod2Mask},
+    {"mod3", Mod3Mask},
+    {"mod4", Mod4Mask},
+    {"mod5", Mod5Mask},
+    {"alt", Mod1Mask},
+    {"ctrl", ControlMask},
     {0, 0}
 };
 
@@ -88,7 +88,7 @@ void KeyUtil::loadModmap() {
         XFreeModifiermap(m_modmap);
 
     m_modmap = XGetModifierMapping(App::instance()->display());
-        
+
     // find modifiers and set them
     for (int i=0, realkey=0; i<8; ++i) {
         for (int key=0; key<m_modmap->max_keypermod; ++key, ++realkey) {
@@ -96,7 +96,7 @@ void KeyUtil::loadModmap() {
             if (m_modmap->modifiermap[realkey] == 0)
                 continue;
 
-            KeySym ks = XKeycodeToKeysym(App::instance()->display(), 
+            KeySym ks = XKeycodeToKeysym(App::instance()->display(),
                     m_modmap->modifiermap[realkey], 0);
 
             switch (ks) {
@@ -154,12 +154,18 @@ void KeyUtil::grabButton(unsigned int button, unsigned int mod, Window win,
 */
 
 unsigned int KeyUtil::getKey(const char *keystr) {
-    if (!keystr)
-        return 0;
-    KeySym sym = XStringToKeysym(keystr);
-    if (sym==NoSymbol)
-        return 0;
-    return XKeysymToKeycode(App::instance()->display(), sym);
+
+    KeyCode code = 0;
+
+    if (keystr) {
+
+        KeySym sym = XStringToKeysym(keystr);
+        if (sym != NoSymbol) {
+            code = XKeysymToKeycode(App::instance()->display(), sym);
+        }
+    }
+
+    return code;
 }
 
 
@@ -169,14 +175,14 @@ unsigned int KeyUtil::getKey(const char *keystr) {
 unsigned int KeyUtil::getModifier(const char *modstr) {
     if (!modstr)
         return 0;
-    
+
     // find mod mask string
     for (unsigned int i=0; modlist[i].str !=0; i++) {
-        if (modlist[i] == modstr)               
-            return modlist[i].mask;             
+        if (modlist[i] == modstr)
+            return modlist[i].mask;
     }
-        
-    return 0;   
+
+    return 0;
 }
 
 /// Ungrabs the keys
@@ -193,7 +199,7 @@ void KeyUtil::ungrabButtons(Window win) {
 unsigned int KeyUtil::keycodeToModmask(unsigned int keycode) {
     XModifierKeymap *modmap = instance().m_modmap;
 
-    if (!modmap) 
+    if (!modmap)
         return 0;
 
     // search through modmap for this keycode
@@ -204,7 +210,7 @@ unsigned int KeyUtil::keycodeToModmask(unsigned int keycode) {
             if (modmap->modifiermap[modmap->max_keypermod*mod + key] == keycode) {
                 return modlist[mod].mask;
             }
-        } 
+        }
     }
     // no luck
     return 0;