1 files changed, 31 insertions, 25 deletions

diff --git a/src/Keys.hh b/src/Keys.hh
index 3b19aaa..9d1f090 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -1,4 +1,4 @@
-// Key2.hh for Fluxbox - an X11 Window manager
+// Keys.hh for Fluxbox - an X11 Window manager
 // Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,55 +18,60 @@
 // 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.
+
+// $Id: Keys.hh,v 1.4 2002/01/09 14:11:20 fluxgen Exp $
+
 #ifndef _KEYS_HH_
 #define _KEYS_HH_
 
 #include <string>
 #include <vector>
-        
+#include <X11/Xlib.h>
+
 class Keys 
 {
 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
+                        ICONIFY=0,
+                        RAISE,
+                        LOWER,
+                        CLOSE,
+                        ABORTKEYCHAIN,
+                        WORKSPACE1, WORKSPACE2, WORKSPACE3,     WORKSPACE4,     WORKSPACE5,
+                        WORKSPACE6,     WORKSPACE7,     WORKSPACE8,     WORKSPACE9,     WORKSPACE10,
+                        WORKSPACE11, WORKSPACE12,       NEXTWORKSPACE, PREVWORKSPACE,
+                        LEFTWORKSPACE, RIGHTWORKSPACE,
+                        KILLWINDOW, NEXTWINDOW, PREVWINDOW,
+                        NEXTTAB, PREVTAB,
+                        SHADE, MAXIMIZE, STICK, EXECUTE,        VERTMAX,
+                        HORIZMAX,       NUDGERIGHT,     NUDGELEFT,NUDGEUP,
+                        NUDGEDOWN,      BIGNUDGERIGHT, BIGNUDGELEFT,
+                        BIGNUDGEUP,     BIGNUDGEDOWN,
+                        HORIZINC,       VERTINC, HORIZDEC, VERTDEC,
+                        TOGGLEDECOR,
+                        LASTKEYGRAB
         };
         
-        Keys(char *filename);
+        Keys(Display *display, char *filename=0);
         ~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; }
+
 private:
         void deleteTree();
-        
+        void ungrabKeys();
         void bindKey(unsigned int key, unsigned int mod);
-        unsigned int getModifier(char *modstr);
-        unsigned int getKey(char *keystr);
+        unsigned int getModifier(const char *modstr);
+        unsigned int getKey(const char *keystr);
         void grabKey(unsigned int key, unsigned int mod);
         std::string filename;   
         
         class t_key {   
                 public:
-                t_key(unsigned int key, unsigned int mod, KeyAction action_ = lastKeygrab);
+                t_key(unsigned int key, unsigned int mod, KeyAction action_ = Keys::LASTKEYGRAB);
                 t_key(t_key *k);
                 ~t_key();
                 
@@ -111,6 +116,7 @@ private:
         std::vector<t_key *> m_keylist; 
         t_key *m_abortkey; //abortkey for keygrabbing chain
         std::string m_execcmdstring; //copy of the execcommandstring
+        Display *m_display;
 };
 
 #endif // _KEYS_HH_