load default key bindings on error

3 files changed, 42 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index f6d2f28..aa3c575 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
  (Format: Year/Month/Day)
 Changes for 1.0.0:
+*07/09/30:
+   * Load menu and workspacemenu mouse bindings if error when loading
+     initial key bindings. Else can't get to menu to reload config (Simon)
+     Keys.hh/cc
 *07/09/20:
    * Updated ru_RU ( Thanks Slava Semushin )
 *07/09/13:
diff --git a/src/Keys.cc b/src/Keys.cc
index fd96fe8..72d59cd 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -166,22 +166,32 @@ void Keys::ungrabButtons() {
     @return true on success else false
 */
 bool Keys::load(const char *filename) {
-    if (!filename)
-        return false;
-
-    //free memory of previous grabs
-    deleteTree();
+    // an intentionally empty file will still have one root mapping
+    bool firstload = m_map.empty();
 
-    m_map["default:"] = new t_key(0,0,0,0);
+    if (!filename) {
+        if (firstload)
+            loadDefaults();
+        return false;
+    }
 
     FbTk::App::instance()->sync(false);
 
-    //open the file
+    // open the file
     ifstream infile(filename);
-    if (!infile)
-        return false; // faild to open file
+    if (!infile) {
+        if (firstload)
+            loadDefaults();
 
-    unsigned int current_line = 0;//so we can tell the user where the fault is
+        return false; // failed to open file
+    }
+
+    // free memory of previous grabs
+    deleteTree();
+
+    m_map["default:"] = new t_key(0,0,0,0);
+
+    unsigned int current_line = 0; //so we can tell the user where the fault is
 
     while (!infile.eof()) {
         string linebuffer;
@@ -204,6 +214,21 @@ bool Keys::load(const char *filename) {
     return true;
 }
 
+/**
+ * Load critical key/mouse bindings for when there are fatal errors reading the keyFile.
+ */
+void Keys::loadDefaults() {
+#ifdef DEBUG
+    cerr<<"Loading default key bindings"<<endl;
+#endif
+    deleteTree();
+    m_map["default:"] = new t_key(0,0,0,0);
+    addBinding("OnDesktop Mouse1 :HideMenus");
+    addBinding("OnDesktop Mouse2 :WorkspaceMenu");
+    addBinding("OnDesktop Mouse3 :RootMenu");
+    keyMode("default");
+}
+
 bool Keys::save(const char *filename) const {
     //!!
     //!! TODO: fix keybinding saving
diff --git a/src/Keys.hh b/src/Keys.hh
index c075d38..a83a0ec 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -97,6 +97,9 @@ private:
     void grabButton(unsigned int button, unsigned int mod);
     void ungrabButtons();
 
+    // Load default keybindings for when there are errors loading the initial one
+    void loadDefaults();
+
     std::string m_filename;
 
     class t_key;