X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.hh;h=772b2a40840f57e009609f02b236019a8235c05c;hb=02b63185a22e64edaed916daa8559d769eb7bc5f;hp=259686d29a98723bc36896ab6bc59d7045423dce;hpb=084d6f4e42396a5d2baf72877b5abf3ae6fef7be;p=chaz%2Fopenbox

diff --git a/src/bindings.hh b/src/bindings.hh
index 259686d2..772b2a40 100644
--- a/src/bindings.hh
+++ b/src/bindings.hh
@@ -51,7 +51,7 @@ typedef struct KeyBindingTree {
 
 typedef struct ButtonBinding {
   Binding binding;
-  CallbackList callbacks[NUM_MOUSE_ACTION];
+  CallbackList callbacks[MouseAction::NUM_MOUSE_ACTION];
   ButtonBinding() : binding(0, 0) {}
 };
 
@@ -77,12 +77,12 @@ private:
   static void resetChains(Bindings *self); // the timer's timeout function
 
   typedef std::list <ButtonBinding*> ButtonBindingList;
-  ButtonBindingList _buttons[NUM_MOUSE_CONTEXT];
+  ButtonBindingList _buttons[MouseContext::NUM_MOUSE_CONTEXT];
 
-  void grabButton(bool grab, const Binding &b, MouseContext context,
+  void grabButton(bool grab, const Binding &b, MouseContext::MC context,
                   Client *client);
 
-  CallbackList _eventlist[NUM_EVENTS];
+  CallbackList _eventlist[EventAction::NUM_EVENTS];
 
   PyObject *_keybgrab_callback;
   
@@ -103,18 +103,18 @@ public:
   */
   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 removeKey(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 removeKey(const StringVect &keylist, PyObject *callback);
 
   //! Removes all key bindings
   void removeAllKeys();
 
   void fireKey(int screen, unsigned int modifiers,unsigned int key, Time time,
-               KeyAction action);
+               KeyAction::KA action);
 
   void setResetKey(const std::string &key);
 
@@ -123,8 +123,11 @@ public:
   bool grabKeyboard(int screen, PyObject *callback);
   void ungrabKeyboard();
 
-  bool addButton(const std::string &but, MouseContext context,
-                 MouseAction action, PyObject *callback);
+  bool grabPointer(int screen);
+  void ungrabPointer();
+
+  bool addButton(const std::string &but, MouseContext::MC context,
+                 MouseAction::MA action, PyObject *callback);
 
   void grabButtons(bool grab, Client *client);
 
@@ -134,10 +137,10 @@ public:
   void fireButton(MouseData *data);
 
   //! Bind a callback for an event
-  bool addEvent(EventAction action, PyObject *callback);
+  bool addEvent(EventAction::EA action, PyObject *callback);
 
   //! Unbind the callback function from an event
-  bool removeEvent(EventAction action, PyObject *callback);
+  bool removeEvent(EventAction::EA action, PyObject *callback);
 
   //! Remove all callback functions
   void removeAllEvents();