put event bindings in OBBindings too

src/actions.cc

@@ -23,9 +23,6 @@ OBActions::OBActions()
 {
   for (int i=0; i<BUTTONS; ++i)
     _posqueue[i] = new ButtonPressAction();
-
-  for (int i = 0; i < NUM_EVENTS; ++i)
-    _callback[i] = 0;
 }
 
 
@@ -150,11 +147,9 @@ void OBActions::enterHandler(const XCrossingEvent &e)
   OtkEventHandler::enterHandler(e);
   
   // run the ENTER python hook
-  if (_callback[EventEnterWindow]) {
+  EventData *data = new_event_data(e.window, EventEnterWindow, e.state);
-    EventData *data = new_event_data(e.window, EventEnterWindow, e.state);
+  Openbox::instance->bindings()->fireEvent(data);
-    python_callback(_callback[EventEnterWindow], (PyObject*)data);
+  Py_DECREF((PyObject*)data);
-    Py_DECREF((PyObject*)data);
-  }
 }
 
 
@@ -163,11 +158,9 @@ void OBActions::leaveHandler(const XCrossingEvent &e)
   OtkEventHandler::leaveHandler(e);
 
   // run the LEAVE python hook
-  if (_callback[EventLeaveWindow]) {
+  EventData *data = new_event_data(e.window, EventLeaveWindow, e.state);
-    EventData *data = new_event_data(e.window, EventLeaveWindow, e.state);
+  Openbox::instance->bindings()->fireEvent(data);
-    python_callback(_callback[EventLeaveWindow], (PyObject*)data);
+  Py_DECREF((PyObject*)data);
-    Py_DECREF((PyObject*)data);
-  }
 }
 
 
@@ -221,64 +214,27 @@ void OBActions::mapRequestHandler(const XMapRequestEvent &e)
 {
   OtkEventHandler::mapRequestHandler(e);
 
-  if (_callback[EventNewWindow]) {
+  EventData *data = new_event_data(e.window, EventNewWindow, 0);
-    EventData *data = new_event_data(e.window, EventNewWindow, 0);
+  Openbox::instance->bindings()->fireEvent(data);
-    python_callback(_callback[EventNewWindow], (PyObject*)data);
+  Py_DECREF((PyObject*)data);
-    Py_DECREF((PyObject*)data);
-  }
 }
 
 void OBActions::unmapHandler(const XUnmapEvent &e)
 {
   OtkEventHandler::unmapHandler(e);
 
-  if (_callback[EventCloseWindow]) {
+  EventData *data = new_event_data(e.window, EventCloseWindow, 0);
-    EventData *data = new_event_data(e.window, EventCloseWindow, 0);
+  Openbox::instance->bindings()->fireEvent(data);
-    python_callback(_callback[EventCloseWindow], (PyObject*)data);
+  Py_DECREF((PyObject*)data);
-    Py_DECREF((PyObject*)data);
-  }
 }
 
 void OBActions::destroyHandler(const XDestroyWindowEvent &e)
 {
   OtkEventHandler::destroyHandler(e);
 
-  if (_callback[EventCloseWindow]) {
+  EventData *data = new_event_data(e.window, EventCloseWindow, 0);
-    EventData *data = new_event_data(e.window, EventCloseWindow, 0);
+  Openbox::instance->bindings()->fireEvent(data);
-    python_callback(_callback[EventCloseWindow], (PyObject*)data);
+  Py_DECREF((PyObject*)data);
-    Py_DECREF((PyObject*)data);
-  }
-}
-
-bool OBActions::bind(EventAction action, PyObject *func)
-{
-  if (action < 0 || action >= NUM_EVENTS) {
-    return false;
-  }
-
-  Py_XDECREF(_callback[action]);
-  _callback[action] = func;
-  Py_INCREF(func);
-  return true;
-}
-
-bool OBActions::unbind(EventAction action)
-{
-  if (action < 0 || action >= NUM_EVENTS) {
-    return false;
-  }
-  
-  Py_XDECREF(_callback[action]);
-  _callback[action] = 0;
-  return true;
-}
-
-void OBActions::unbindAll()
-{
-  for (int i = 0; i < NUM_EVENTS; ++i) {
-    Py_XDECREF(_callback[i]);
-    _callback[i] = 0;
-  }
 }
 
 }

src/actions.hh

@@ -60,8 +60,6 @@ private:
   void insertPress(const XButtonEvent &e);
   void removePress(const XButtonEvent &e);
 
-  PyObject *_callback[NUM_EVENTS];
-
 public:
   //! Constructs an OBActions object
   OBActions();
@@ -82,14 +80,6 @@ public:
   virtual void unmapHandler(const XUnmapEvent &e);
   virtual void destroyHandler(const XDestroyWindowEvent &e);
 
-  //! Bind a callback for an action
-  bool bind(EventAction action, PyObject *func);
-
-  //! Unbind the callback function from an action
-  bool unbind(EventAction action);
-
-  //! Remove all callback functions
-  void unbindAll();
 };
 
 }

src/bindings.cc

@@ -147,6 +147,9 @@ OBBindings::OBBindings()
   _timer.setTimeout(5000); // chains reset after 5 seconds
   
   setResetKey("C-g"); // set the default reset key
+
+  for (int i = 0; i < NUM_EVENTS; ++i)
+    _events[i] = 0;
 }
 
 
@@ -155,6 +158,7 @@ OBBindings::~OBBindings()
   grabKeys(false);
   removeAllKeys();
   removeAllButtons();
+  removeAllEvents();
 }
 
 
@@ -493,4 +497,42 @@ void OBBindings::fireButton(ButtonData *data)
     }
 }
 
+
+bool OBBindings::addEvent(EventAction action, PyObject *callback)
+{
+  if (action < 0 || action >= NUM_EVENTS) {
+    return false;
+  }
+
+  Py_XDECREF(_events[action]);
+  _events[action] = callback;
+  Py_INCREF(callback);
+  return true;
+}
+
+bool OBBindings::removeEvent(EventAction action)
+{
+  if (action < 0 || action >= NUM_EVENTS) {
+    return false;
+  }
+  
+  Py_XDECREF(_events[action]);
+  _events[action] = 0;
+  return true;
+}
+
+void OBBindings::removeAllEvents()
+{
+  for (int i = 0; i < NUM_EVENTS; ++i) {
+    Py_XDECREF(_events[i]);
+    _events[i] = 0;
+  }
+}
+
+void OBBindings::fireEvent(EventData *data)
+{
+  if (_events[data->action])
+    python_callback(_events[data->action], (PyObject*)data);
+}
+
 }

src/bindings.hh

@@ -85,6 +85,8 @@ private:
   void grabButton(bool grab, const Binding &b, MouseContext context,
                   OBClient *client);
 
+  PyObject *_events[NUM_EVENTS];
+  
 public:
   //! Initializes an OBBindings object
   OBBindings();
@@ -127,6 +129,17 @@ public:
   void removeAllButtons();
 
   void fireButton(ButtonData *data);
+
+  //! Bind a callback for an event
+  bool addEvent(EventAction action, PyObject *callback);
+
+  //! Unbind the callback function from an event
+  bool removeEvent(EventAction action);
+
+  //! Remove all callback functions
+  void removeAllEvents();
+
+  void fireEvent(EventData *data);
 };
 
 }

src/python.cc

@@ -455,7 +455,7 @@ PyObject *ebind(ob::EventAction action, PyObject *func)
     return NULL;
   }
   
-  if (!ob::Openbox::instance->actions()->bind(action, func)) {
+  if (!ob::Openbox::instance->bindings()->addEvent(action, func)) {
     PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
     return NULL;
   }