X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.hh;h=4da0583627d3a6ffb35daa701e6575f96476bd39;hb=a4a8d09f4b9431d6d831cb7aa220e6c952802c95;hp=51e2b213131195908e16ad49128b6981b634cf9a;hpb=b35dae95a5cdb902f1661b9572af47c3f55c975c;p=chaz%2Fopenbox

diff --git a/src/bindings.hh b/src/bindings.hh
index 51e2b213..4da05836 100644
--- a/src/bindings.hh
+++ b/src/bindings.hh
@@ -52,9 +52,9 @@ typedef struct KeyBindingTree {
 
 typedef struct ButtonBinding {
   Binding binding;
-  typedef std::list<PyObject*> CallbackList;
-  CallbackList callback[NUM_MOUSE_ACTION];
+  PyObject *callback[NUM_MOUSE_ACTION];
   ButtonBinding() : binding(0, 0) {
+    for(int i=0; i<NUM_MOUSE_ACTION; ++i) callback[i] = 0;
   }
 };
 
@@ -97,19 +97,19 @@ public:
     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, PyObject *callback);
+  bool addKey(const StringVect &keylist, PyObject *callback);
 
   //! Removes a key binding
   /*!
     @return The callbackid of the binding, or '< 0' if there was no binding to
             be removed.
   */
-  bool remove(const StringVect &keylist);
+  bool removeKey(const StringVect &keylist);
 
   //! Removes all key bindings
-  void removeAll();
+  void removeAllKeys();
 
-  void fire(unsigned int modifiers,unsigned int key, Time time);
+  void fireKey(unsigned int modifiers,unsigned int key, Time time);
 
   void setResetKey(const std::string &key);
 
@@ -120,9 +120,10 @@ public:
 
   void grabButtons(bool grab, OBClient *client);
 
-  void fire(MouseAction action, OBWidget::WidgetType type, Window win,
-            unsigned int modifiers, unsigned int button,
-            int xroot, int yroot, Time time);
+  //! Removes all button bindings
+  void removeAllButtons();
+
+  void fireButton(ButtonData *data);
 };
 
 }