X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.hh;h=4da0583627d3a6ffb35daa701e6575f96476bd39;hb=105bd729e8341bacce630f2780f0a9a5a0102526;hp=0ae035761437ba5890860684d351e80ce4d6aedc;hpb=745e840547b5443ecfb9b6f0a4f14b0d035d59c2;p=chaz%2Fopenbox

diff --git a/src/bindings.hh b/src/bindings.hh
index 0ae03576..4da05836 100644
--- a/src/bindings.hh
+++ b/src/bindings.hh
@@ -7,9 +7,15 @@
 */
 
 #include "actions.hh"
+#include "python.hh"
 #include "otk/timer.hh"
 
+extern "C" {
+#include <Python.h>
+}
+
 #include <string>
+#include <list>
 #include <vector>
 
 namespace ob {
@@ -27,22 +33,30 @@ typedef struct Binding {
   Binding(unsigned int mod, unsigned int k) { modifiers = mod; key = k; }
 } Binding;
 
-typedef struct BindingTree {
+typedef struct KeyBindingTree {
   Binding binding;
-  int id;     // the id given for the binding in add()
-  bool chain; // true if this is a chain to another key (not an action)
+  PyObject *callback; // the callback given for the binding in add()
+  bool chain;     // true if this is a chain to another key (not an action)
 
-  struct BindingTree *next_sibling; // the next binding in the tree at the same
+  struct KeyBindingTree *next_sibling; // the next binding in the tree at the same
                                     // level
-  struct BindingTree *first_child;  // the first child of this binding (next
+  struct KeyBindingTree *first_child;  // the first child of this binding (next
                                     // binding in a chained sequence).
-  BindingTree(int id) : binding(0, 0) {
-    this->id = id; chain = true; next_sibling = first_child = 0;
+  KeyBindingTree(PyObject *callback) : binding(0, 0) {
+    this->callback = callback; chain = true; next_sibling = first_child = 0;
   }
-  BindingTree() : binding(0, 0) {
-    this->id = -1; chain = true; next_sibling = first_child = 0;
+  KeyBindingTree() : binding(0, 0) {
+    this->callback = 0; chain = true; next_sibling = first_child = 0;
+  }
+} KeyBindingTree;
+
+typedef struct ButtonBinding {
+  Binding binding;
+  PyObject *callback[NUM_MOUSE_ACTION];
+  ButtonBinding() : binding(0, 0) {
+    for(int i=0; i<NUM_MOUSE_ACTION; ++i) callback[i] = 0;
   }
-} BindingTree;
+};
 
 class OBBindings {
 public:
@@ -50,56 +64,66 @@ public:
   typedef std::vector<std::string> StringVect;
 
 private:
-  BindingTree _tree; // root node of the tree (this doesn't have siblings!)
-  BindingTree *_curpos; // position in the keytree
+  // root node of the tree (this doesn't have siblings!)
+  KeyBindingTree _keytree; 
+  KeyBindingTree *_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);
+  PyObject *find(KeyBindingTree *search, bool *conflict) const;
+  KeyBindingTree *buildtree(const StringVect &keylist,
+                            PyObject *callback) const;
+  void assimilate(KeyBindingTree *node);
 
-  static void reset(OBBindings *self);
+  static void reset(OBBindings *self); // the timer's timeout function
+
+  typedef std::list <ButtonBinding*> ButtonBindingList;
+  ButtonBindingList _buttons[NUM_MOUSE_CONTEXT];
 
 public:
-  //! Initializes an OBBinding object
+  //! Initializes an OBBindings object
   OBBindings();
-  //! Destroys the OBBinding object
+  //! Destroys the OBBindings object
   virtual ~OBBindings();
 
+  //! Translates a binding string into the actual Binding
+  bool translate(const std::string &str, Binding &b, bool askey = true) const;
+  
   //! 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 addKey(const StringVect &keylist, PyObject *callback);
 
   //! Removes a key binding
   /*!
-    @return The id of the binding that was removed, or '< 0' if none were
-            removed.
+    @return The callbackid of the binding, or '< 0' if there was no binding to
+            be removed.
   */
-  int remove(const StringVect &keylist);
+  bool removeKey(const StringVect &keylist);
 
   //! Removes all key bindings
-  void remove_all();
+  void removeAllKeys();
 
-  //! Finds a keybinding and returns its id or '< 0' if it isn't found.
-  /*!
-    @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);
-
-  void fire(Window window, unsigned int modifiers,unsigned int key, Time time);
+  void fireKey(unsigned int modifiers,unsigned int key, Time time);
 
   void setResetKey(const std::string &key);
 
   void grabKeys(bool grab);
+
+  bool addButton(const std::string &but, MouseContext context,
+                 MouseAction action, PyObject *callback);
+
+  void grabButtons(bool grab, OBClient *client);
+
+  //! Removes all button bindings
+  void removeAllButtons();
+
+  void fireButton(ButtonData *data);
 };
 
 }