add an unregister_all for python callbacks

[chaz/openbox] / src / python.cc

diff --git a/src/python.cc b/src/python.cc
index a00bc2454a498c85043abff8dcccec8fadde6e07..ed171f9cc4880659e2f3642dd310b606964751d4 100644 (file)
--- a/src/python.cc
+++ b/src/python.cc
@@ -32,6 +32,27 @@ bool python_register(int action, PyObject *callback)
   return true;
 }
 
+bool python_preregister(int action, PyObject *callback)
+{
+  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
+    PyErr_SetString(PyExc_AssertionError, "Invalid action type.");
+    return false;
+  }
+  if (!PyCallable_Check(callback)) {
+    PyErr_SetString(PyExc_AssertionError, "Invalid callback function.");
+    return false;
+  }
+  
+  FunctionList::iterator it = std::find(callbacks[action].begin(),
+                                       callbacks[action].end(),
+                                       callback);
+  if (it == callbacks[action].end()) { // not already in there
+    Py_XINCREF(callback);              // Add a reference to new callback
+    callbacks[action].insert(callbacks[action].begin(), callback);
+  }
+  return true;
+}
+
 bool python_unregister(int action, PyObject *callback)
 {
   if (action < 0 || action >= OBActions::NUM_ACTIONS) {
@@ -53,16 +74,41 @@ bool python_unregister(int action, PyObject *callback)
   return true;
 }
 
+bool python_unregister_all(int action)
+{
+  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
+    PyErr_SetString(PyExc_AssertionError, "Invalid action type.");
+    return false;
+  }
+
+  while (!callbacks[action].empty()) {
+    Py_XDECREF(callbacks[action].back());
+    callbacks[action].pop_back();
+  }
+  return true;
+}
+
 void python_callback(OBActions::ActionType action, Window window,
                      OBWidget::WidgetType type, unsigned int state,
-                     long d1, long d2)
+                     long d1, long d2, long d3, long d4)
 {
   PyObject *arglist;
   PyObject *result;
 
   assert(action >= 0 && action < OBActions::NUM_ACTIONS);
 
-  arglist = Py_BuildValue("iliill", action, window, type, state, d1, d2);
+  if (d4 != LONG_MIN)
+    arglist = Py_BuildValue("iliillll", action, window, type, state,
+                            d1, d2, d3, d4);
+  else if (d3 != LONG_MIN)
+    arglist = Py_BuildValue("iliilll", action, window, type, state,
+                            d1, d2, d3);
+  else if (d2 != LONG_MIN)
+    arglist = Py_BuildValue("iliill", action, window, type, state, d1, d2);
+  else if (d1 != LONG_MIN)
+    arglist = Py_BuildValue("iliil", action, window, type, state, d1);
+  else
+    arglist = Py_BuildValue("ilii", action, window, type, state);
 
   FunctionList::iterator it, end = callbacks[action].end();
   for (it = callbacks[action].begin(); it != end; ++it) {