1 files changed, 95 insertions, 87 deletions

diff --git a/src/Keys.hh b/src/Keys.hh
index 3b19aaa..014f5a1 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -1,5 +1,5 @@
-// Key2.hh for Fluxbox - an X11 Window manager
-// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
+// Keys.hh for Fluxbox - an X11 Window manager
+// Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -18,99 +18,107 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-#ifndef _KEYS_HH_
-#define _KEYS_HH_
+
+// $Id: Keys.hh,v 1.31 2003/12/20 17:37:20 fluxgen Exp $
+
+#ifndef KEYS_HH
+#define KEYS_HH
 
 #include <string>
 #include <vector>
-        
-class Keys 
-{
+#include <X11/Xlib.h>
+
+#include "FbTk/NotCopyable.hh"
+#include "FbTk/RefCount.hh"
+#include "FbTk/Command.hh"
+
+class Keys:private FbTk::NotCopyable  {
 public:
-enum KeyAction{
-                        grabIconify=0,
-                        grabRaise,
-                        grabLower,
-                        grabClose,
-                        grabAbortKeychain,
-                        grabWorkspace1, grabWorkspace2, grabWorkspace3, grabWorkspace4, grabWorkspace5,
-                        grabWorkspace6, grabWorkspace7, grabWorkspace8, grabWorkspace9, grabWorkspace10,
-                        grabWorkspace11, grabWorkspace12,       grabNextWorkspace, grabPrevWorkspace,
-                        grabLeftWorkspace, grabRightWorkspace,
-                        grabKillWindow, grabNextWindow, grabPrevWindow,
-                        grabNextTab, grabPrevTab,
-                        grabShade, grabMaximize, grabStick, grabExecute,        grabVertMax,
-                        grabHorizMax,   grabNudgeRight, grabNudgeLeft,grabNudgeUp,
-                        grabNudgeDown,  grabBigNudgeRight, grabBigNudgeLeft,
-                        grabBigNudgeUp, grabBigNudgeDown,
-                        grabHorizInc,   grabVertInc, grabHorizDec, grabVertDec,
-                        grabToggleDecor,
-                        lastKeygrab
-        };
-        
-        Keys(char *filename);
-        ~Keys();
-        bool load(char *filename=0);
-        KeyAction getAction(XKeyEvent *ke);
-        bool reconfigure(char *filename);
-        const char *getActionStr(KeyAction action);
-        std::string getExecCommand() { return m_execcmdstring; }
+
+    /**
+       Constructor
+       @param display display connection
+       @param filename file to load, default none
+    */
+    explicit Keys(const char *filename=0);
+    /// destructor
+    ~Keys();
+
+    /**
+       Load configuration from file
+       @return true on success, else false
+    */
+    bool load(const char *filename = 0);
+    /**
+       Save keybindings to a file
+       Note: the file will be overwritten
+       @return true on success, else false
+     */
+    bool save(const char *filename = 0) const;
+    /// bind a key action from a string
+    /// @return false on failure
+    bool addBinding(const std::string &binding);
+
+    /**
+       do action from XKeyEvent
+    */
+    void doAction(XKeyEvent &ke);
+
+    /**
+       Reload configuration from filename
+       @return true on success, else false
+    */
+    bool reconfigure(const char *filename);
+    const std::string filename() const { return m_filename; }
 private:
-        void deleteTree();
-        
-        void bindKey(unsigned int key, unsigned int mod);
-        unsigned int getModifier(char *modstr);
-        unsigned int getKey(char *keystr);
-        void grabKey(unsigned int key, unsigned int mod);
-        std::string filename;   
+    void deleteTree();
+
+    void bindKey(unsigned int key, unsigned int mod);
+    
+    std::string m_filename;     
         
-        class t_key {   
-                public:
-                t_key(unsigned int key, unsigned int mod, KeyAction action_ = lastKeygrab);
-                t_key(t_key *k);
-                ~t_key();
+    class t_key {       
+    public:
+        t_key(unsigned int key, unsigned int mod, 
+              FbTk::RefCount<FbTk::Command> command = FbTk::RefCount<FbTk::Command>(0));
+        t_key(t_key *k);
+        ~t_key();
                 
-                inline t_key *find(unsigned int key_, unsigned int mod_) {
-                        for (unsigned int i=0; i<keylist.size(); i++) {
-                                if (keylist[i]->key == key_ && keylist[i]->mod == mod_)
-                                        return keylist[i];                              
-                        }                       
-                        return 0;
-                }
-                inline t_key *find(XKeyEvent *ke) {
-                        for (unsigned int i=0; i<keylist.size(); i++) {
-                                if (keylist[i]->key == ke->keycode && keylist[i]->mod == ke->state)
-                                        return keylist[i];                              
-                        }                       
-                        return 0;
-                }
+        inline t_key *find(unsigned int key_, unsigned int mod_) {
+            for (unsigned int i=0; i<keylist.size(); i++) {
+                if (keylist[i]->key == key_ && keylist[i]->mod == mod_)
+                    return keylist[i];                          
+            }                   
+            return 0;
+        }
+        inline t_key *find(XKeyEvent &ke) {
+            for (unsigned int i=0; i<keylist.size(); i++) {
+                if (keylist[i]->key == ke.keycode && keylist[i]->mod == ke.state)
+                    return keylist[i];                          
+            }                   
+            return 0;
+        }
                         
-                inline bool operator == (XKeyEvent *ke) {
-                        return (mod == ke->state && key == ke->keycode);
-                }
+        inline bool operator == (XKeyEvent &ke) const {
+            return (mod == ke.state && key == ke.keycode);
+        }
                 
-                KeyAction action;
-                unsigned int key;
-                unsigned int mod;
-                std::vector<t_key *> keylist;
-                std::string execcommand;
-        };
-        
-        bool mergeTree(t_key *newtree, t_key *basetree=0);
-        #ifdef DEBUG
-        //debug functions
-        void showTree();
-        void showKeyTree(t_key *key, unsigned int w=0);
-        #endif //DEBUG
-        struct t_actionstr{
-                const char *string;
-                KeyAction action;
-        };      
-        static t_actionstr m_actionlist[];
-        
-        std::vector<t_key *> m_keylist; 
-        t_key *m_abortkey; //abortkey for keygrabbing chain
-        std::string m_execcmdstring; //copy of the execcommandstring
+        FbTk::RefCount<FbTk::Command> m_command;
+        unsigned int key;
+        unsigned int mod;
+        std::vector<t_key *> keylist;
+    };
+
+    /**
+       merge two linked list
+       @return true on success, else false
+    */
+    bool mergeTree(t_key *newtree, t_key *basetree=0);
+
+    std::vector<t_key *> m_keylist;     
+
+    Display *m_display;  ///< display connection
+    unsigned int m_current_line;
 };
 
-#endif // _KEYS_HH_
+#endif // KEYS_HH