X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.hh;h=e4bd65f321afa1ae5a7083cbcf500a50d3608d3f;hb=d4853f108c1d22c344c1cb9a8a8b7cdc46648983;hp=4545627a713c808d37cd77f5cf78284332d073c8;hpb=656f2fbecf7f74e497353a4bff902ec16937cfc4;p=chaz%2Fopenbox

diff --git a/src/bindings.hh b/src/bindings.hh
index 4545627a..e4bd65f3 100644
--- a/src/bindings.hh
+++ b/src/bindings.hh
@@ -46,11 +46,15 @@ public:
   typedef std::vector<std::string> StringVect;
 
 private:
-  BindingTree _tree;// root node of the tree (this doesn't have siblings!)
+  BindingTree _keytree; // root node of the tree (this doesn't have siblings!)
+  BindingTree *_curpos; // position in the keytree
 
-  int find(BindingTree *search);
-  bool translate(const std::string &str, Binding &b);
+  BindingTree _mousetree; // this tree is a list. it has only siblings
+  
+  int find_key(BindingTree *search);
+  bool translate(const std::string &str, Binding &b, bool askey);
   BindingTree *buildtree(const StringVect &keylist, int id);
+  void OBBindings::assimilate(BindingTree *node);
  
 public:
   //! Initializes an OBBinding object
@@ -58,20 +62,35 @@ public:
   //! Destroys the OBBinding object
   virtual ~OBBindings();
 
-  //! Adds a new binding
+  //! Adds a new mouse binding
+  /*!
+    A binding will fail to be added if the binding already exists, or if the
+    string is invalid.    
+    @return true if the binding could be added; false if it could not.
+  */
+  bool add_mouse(const std::string &button, int id);
+
+  //! Removes a mouse binding
+  /*!
+    @return The id of the binding that was removed, or '< 0' if none were
+            removed.
+  */
+  int remove_mouse(const std::string &button);
+
+  //! 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.    
     @return true if the binding could be added; false if it could not.
   */
-  bool add(const StringVect &keylist, int id);
+  bool add_key(const StringVect &keylist, int id);
 
   //! Removes a key binding
   /*!
     @return The id of the binding that was removed, or '< 0' if none were
             removed.
   */
-  int remove(const StringVect &keylist);
+  int remove_key(const StringVect &keylist);
 
   //! Removes all key bindings
   void remove_all();
@@ -81,7 +100,9 @@ public:
     @return -1 if the keybinding was not found but does not conflict with
     any others; -2 if the keybinding conflicts with another.
   */
-  int find(const StringVect &keylist);
+  int find_key(const StringVect &keylist);
+
+  void process(unsigned int modifiers, unsigned int key);
 
   // 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