conflicts with python too :\

[chaz/openbox] / src / python.cc

diff --git a/src/python.cc b/src/python.cc
index e338b02cc9a0fb39a6d6fab96a07836792bca13a..d44b2d48a2c03603a3ee997f9910348c14437a8b 100644 (file)
--- a/src/python.cc
+++ b/src/python.cc
@@ -1,45 +1,93 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-
 #include "python.hh"
-#include "python_client.hh"
-#include "openbox.hh"
+
+#include <vector>
+#include <algorithm>
 
 namespace ob {
 
-extern "C" {
+typedef std::vector<PyObject*> FunctionList;
+
+static FunctionList callbacks[OBActions::NUM_ACTIONS];
 
-static PyObject *shit(PyObject *self, PyObject *args)
+bool python_register(int action, PyObject *callback)
 {
-  if (!PyArg_ParseTuple(args, ":shit"))
-    return NULL;
+  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].push_back(callback);
+  }
+  return true;
+}
 
-  printf("SHIT CALLED!@!\n");
+bool python_unregister(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;
+  }
 
-  return Py_None;
+  FunctionList::iterator it = std::find(callbacks[action].begin(),
+                                       callbacks[action].end(),
+                                       callback);
+  if (it != callbacks[action].end()) { // its been registered before
+    Py_XDECREF(*it);                   // Dispose of previous callback
+    callbacks[action].erase(it);
+  }
+  return true;
 }
-  
 
+void python_callback(OBActions::ActionType action, Window window,
+                     OBWidget::WidgetType type, unsigned int state,
+                     long d1, long d2, long d3, long d4)
+{
+  PyObject *arglist;
+  PyObject *result;
 
-static PyMethodDef OBMethods[] = {
-  {"shit", shit, METH_VARARGS,
-   "Do some shit, yo!"},
+  assert(action >= 0 && action < OBActions::NUM_ACTIONS);
 
-  {"get_client_dict", get_client_dict, METH_VARARGS,
-   "Get the list of all clients"},
+  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);
 
-  {NULL, NULL, 0, NULL}
-};
+  FunctionList::iterator it, end = callbacks[action].end();
+  for (it = callbacks[action].begin(); it != end; ++it) {
+    // call the callback
+    result = PyEval_CallObject(*it, arglist);
+    if (result) {
+      Py_DECREF(result);
+    } else {
+      // an exception occured in the script, display it
+      PyErr_Print();
+    }
+  }
 
-void initopenbox()
-{
-  PyClient_Type.ob_type = &PyType_Type;
-  
-  Py_InitModule("openbox", OBMethods);
-}
+  Py_DECREF(arglist);
 }
 
 }