X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.hh;h=32f422ff80c43fd64433256405e3ea28c043343c;hb=747c089ae1c7df345c7ad98f833e8640ab0bc851;hp=8e91b5b681323acb63fe4b48c39f2aca0d44a400;hpb=a9a5f0d7510be5dbf8ae1db99e6c1c01035503d9;p=chaz%2Fopenbox

diff --git a/src/bindings.hh b/src/bindings.hh
index 8e91b5b6..32f422ff 100644
--- a/src/bindings.hh
+++ b/src/bindings.hh
@@ -20,7 +20,9 @@ extern "C" {
 
 namespace ob {
 
-class OBClient;
+class Client;
+
+typedef std::list<PyObject *> CallbackList;
 
 typedef struct Binding {
   unsigned int modifiers;
@@ -35,30 +37,25 @@ typedef struct Binding {
 
 typedef struct KeyBindingTree {
   Binding binding;
-  PyObject *callback; // the callback given for the binding in add()
+  CallbackList callbacks; // the callbacks given for the binding in add()
   bool chain;     // true if this is a chain to another key (not an action)
 
   struct KeyBindingTree *next_sibling; // the next binding in the tree at the same
                                     // level
   struct KeyBindingTree *first_child;  // the first child of this binding (next
                                     // binding in a chained sequence).
-  KeyBindingTree(PyObject *callback) : binding(0, 0) {
-    this->callback = callback; chain = true; next_sibling = first_child = 0;
-  }
   KeyBindingTree() : binding(0, 0) {
-    this->callback = 0; chain = true; next_sibling = first_child = 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;
-  }
+  CallbackList callbacks[NUM_MOUSE_ACTION];
+  ButtonBinding() : binding(0, 0) {}
 };
 
-class OBBindings {
+class Bindings {
 public:
   //! A list of strings
   typedef std::vector<std::string> StringVect;
@@ -70,28 +67,28 @@ private:
 
   Binding _resetkey; // the key which resets the key chain status
 
-  otk::OBTimer _timer;
+  otk::Timer *_timer;
   
-  PyObject *find(KeyBindingTree *search, bool *conflict) const;
+  KeyBindingTree *find(KeyBindingTree *search, bool *conflict) const;
   KeyBindingTree *buildtree(const StringVect &keylist,
                             PyObject *callback) const;
   void assimilate(KeyBindingTree *node);
 
-  static void resetChains(OBBindings *self); // the timer's timeout function
+  static void resetChains(Bindings *self); // the timer's timeout function
 
   typedef std::list <ButtonBinding*> ButtonBindingList;
   ButtonBindingList _buttons[NUM_MOUSE_CONTEXT];
 
   void grabButton(bool grab, const Binding &b, MouseContext context,
-                  OBClient *client);
+                  Client *client);
 
-  PyObject *_events[NUM_EVENTS];
+  CallbackList _eventlist[NUM_EVENTS];
   
 public:
-  //! Initializes an OBBindings object
-  OBBindings();
-  //! Destroys the OBBindings object
-  virtual ~OBBindings();
+  //! Initializes an Bindings object
+  Bindings();
+  //! Destroys the Bindings object
+  virtual ~Bindings();
 
   //! Translates a binding string into the actual Binding
   bool translate(const std::string &str, Binding &b, bool askey = true) const;
@@ -109,12 +106,12 @@ public:
     @return The callbackid of the binding, or '< 0' if there was no binding to
             be removed.
   */
-  bool removeKey(const StringVect &keylist);
+  bool removeKey(const StringVect &keylist, PyObject *callback);
 
   //! Removes all key bindings
   void removeAllKeys();
 
-  void fireKey(unsigned int modifiers,unsigned int key, Time time);
+  void fireKey(int screen, unsigned int modifiers,unsigned int key, Time time);
 
   void setResetKey(const std::string &key);
 
@@ -123,18 +120,18 @@ public:
   bool addButton(const std::string &but, MouseContext context,
                  MouseAction action, PyObject *callback);
 
-  void grabButtons(bool grab, OBClient *client);
+  void grabButtons(bool grab, Client *client);
 
   //! Removes all button bindings
   void removeAllButtons();
 
-  void fireButton(ButtonData *data);
+  void fireButton(MouseData *data);
 
   //! Bind a callback for an event
   bool addEvent(EventAction action, PyObject *callback);
 
   //! Unbind the callback function from an event
-  bool removeEvent(EventAction action);
+  bool removeEvent(EventAction action, PyObject *callback);
 
   //! Remove all callback functions
   void removeAllEvents();