X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.hh;h=0ae035761437ba5890860684d351e80ce4d6aedc;hb=745e840547b5443ecfb9b6f0a4f14b0d035d59c2;hp=ffe987b319a008c44a54c9ba00d0360ca9dd6262;hpb=35c3e996b57adf77b78eb756b20a15646961a74c;p=chaz%2Fopenbox

diff --git a/src/bindings.hh b/src/bindings.hh
index ffe987b3..0ae03576 100644
--- a/src/bindings.hh
+++ b/src/bindings.hh
@@ -6,11 +6,16 @@
   @brief I dunno.. some binding stuff?
 */
 
+#include "actions.hh"
+#include "otk/timer.hh"
+
 #include <string>
 #include <vector>
 
 namespace ob {
 
+class OBClient;
+
 typedef struct Binding {
   unsigned int modifiers;
   unsigned int key;
@@ -24,7 +29,6 @@ typedef struct Binding {
 
 typedef struct BindingTree {
   Binding binding;
-  std::string text;
   int id;     // the id given for the binding in add()
   bool chain; // true if this is a chain to another key (not an action)
 
@@ -46,20 +50,27 @@ public:
   typedef std::vector<std::string> StringVect;
 
 private:
-  BindingTree _tree;// root node of the tree (this doesn't have siblings!)
+  BindingTree _tree; // root node of the tree (this doesn't have siblings!)
+  BindingTree *_curpos; // position in the keytree
+
+  Binding _resetkey; // the key which resets the key chain status
+
+  otk::OBTimer _timer;
+  
+  int find(BindingTree *search) const;
+  bool translate(const std::string &str, Binding &b) const;
+  BindingTree *buildtree(const StringVect &keylist, int id) const;
+  void assimilate(BindingTree *node);
+
+  static void reset(OBBindings *self);
 
-  int find(BindingTree *search);
-  bool translate(const std::string &str, Binding &b);
-  BindingTree *buildtree(const StringVect &keylist, int id);
-  void OBBindings::assimilate(BindingTree *node);
- 
 public:
   //! Initializes an OBBinding object
   OBBindings();
   //! Destroys the OBBinding object
   virtual ~OBBindings();
 
-  //! Adds a new binding
+  //! Adds a new key binding
   /*!
     A binding will fail to be added if the binding already exists (as part of
     a chain or not), or if any of the strings in the keylist are invalid.    
@@ -84,11 +95,11 @@ public:
   */
   int find(const StringVect &keylist);
 
-  // XXX: need an exec() function or something that will be used by openbox
-  //      and hold state for which chain we're in etc. (it could have a timer
-  //      for reseting too...)
+  void fire(Window window, unsigned int modifiers,unsigned int key, Time time);
+
+  void setResetKey(const std::string &key);
 
-  void display();
+  void grabKeys(bool grab);
 };
 
 }