X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=a99416ae83899bc72ec3e4ec118321dbf9e18273;hb=df0447ce6d57c6ece97e69fc0874595e4ac0ae75;hp=8fec3b15a3aced85d0f2e76cb5267fcc1bc513df;hpb=66a26917a0631463df7f72c34cbeb39df466918a;p=chaz%2Fopenbox

diff --git a/src/python.cc b/src/python.cc
index 8fec3b15..a99416ae 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -6,11 +6,11 @@
 #include "python.hh"
 #include "bindings.hh"
 #include "otk/display.hh"
+#include "otk/util.hh"
 
 extern "C" {
-// The initializer in openbox_wrap.cc
-extern void init_openbox(void);
-// The initializer in otk_wrap.cc
+// The initializer in openbox_wrap.cc / otk_wrap.cc
+extern void init_ob(void);
 extern void init_otk(void);
 }
 
@@ -18,289 +18,252 @@ namespace ob {
 
 static PyObject *obdict = NULL;
 
-// ************************************************************* //
-// Define some custom types which are passed to python callbacks //
-// ************************************************************* //
-
-typedef struct {
-  PyObject_HEAD;
-  OBActions::ActionType action;
-  Window window;
-  OBWidget::WidgetType type;
-  unsigned int state;
-  unsigned int button;
-  int xroot;
-  int yroot;
-  Time time;
-} ActionData;
-
-typedef struct {
-  PyObject_HEAD;
-  Window window;
-  unsigned int state;
-  unsigned int key;
-  Time time;
-} BindingData;
-
-static void ActionDataDealloc(ActionData *self)
-{
-  PyObject_Del((PyObject*)self);
-}
-
-static void BindingDataDealloc(BindingData *self)
-{
-  PyObject_Del((PyObject*)self);
-}
-
-PyObject *ActionData_action(ActionData *self, PyObject *args)
-{
-  if(!PyArg_ParseTuple(args,":action")) return NULL;
-  return PyLong_FromLong((int)self->action);
-}
-
-PyObject *ActionData_window(ActionData *self, PyObject *args)
+void python_init(char *argv0)
 {
-  if(!PyArg_ParseTuple(args,":window")) return NULL;
-  return PyLong_FromLong(self->window);
-}
+  // start the python engine
+  Py_SetProgramName(argv0);
+  Py_Initialize();
+  // initialize the C python module
+  init_otk();
+  init_ob();
+  // prepend the openbox directories for python scripts to the sys path
+  PyRun_SimpleString("import sys");
+  PyRun_SimpleString("sys.path.insert(0, '" SCRIPTDIR "')");
+  PyRun_SimpleString(const_cast<char*>(("sys.path.insert(0, '" +
+                                        otk::expandTilde("~/.openbox/python") +
+                                        "')").c_str()));
+  PyRun_SimpleString("import ob; import otk; import config;");
+  // set up convenience global variables
+  PyRun_SimpleString("ob.openbox = ob.Openbox_instance()");
+  PyRun_SimpleString("otk.display = otk.Display_instance()");
 
-PyObject *ActionData_target(ActionData *self, PyObject *args)
-{
-  if(!PyArg_ParseTuple(args,":target")) return NULL;
-  return PyLong_FromLong((int)self->type);
+  // set up access to the python global variables
+  PyObject *obmodule = PyImport_AddModule("config");
+  obdict = PyModule_GetDict(obmodule);
 }
 
-PyObject *ActionData_modifiers(ActionData *self, PyObject *args)
+void python_destroy()
 {
-  if(!PyArg_ParseTuple(args,":modifiers")) return NULL;
-  return PyLong_FromUnsignedLong(self->state);
+  Py_Finalize();
 }
 
-PyObject *ActionData_button(ActionData *self, PyObject *args)
+bool python_exec(const std::string &path)
 {
-  if(!PyArg_ParseTuple(args,":button")) return NULL;
-  int b = 0;
-  switch (self->button) {
-  case Button5: b++;
-  case Button4: b++;
-  case Button3: b++;
-  case Button2: b++;
-  case Button1: b++;
-  default: ;
+  FILE *rcpyfd = fopen(path.c_str(), "r");
+  if (!rcpyfd) {
+    printf("Failed to load python file %s\n", path.c_str());
+    return false;
   }
-  return PyLong_FromLong(b);
+  PyRun_SimpleFile(rcpyfd, const_cast<char*>(path.c_str()));
+  fclose(rcpyfd);
+  return true;
 }
 
-PyObject *ActionData_xroot(ActionData *self, PyObject *args)
+bool python_get_long(const char *name, long *value)
 {
-  if(!PyArg_ParseTuple(args,":xroot")) return NULL;
-  return PyLong_FromLong(self->xroot);
+  PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
+  if (!(val && PyInt_Check(val))) return false;
+  
+  *value = PyInt_AsLong(val);
+  return true;
 }
 
-PyObject *ActionData_yroot(ActionData *self, PyObject *args)
+bool python_get_string(const char *name, otk::ustring *value)
 {
-  if(!PyArg_ParseTuple(args,":yroot")) return NULL;
-  return PyLong_FromLong(self->yroot);
+  PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
+  if (!(val && PyString_Check(val))) return false;
+  
+  *value = PyString_AsString(val);
+  return true;
 }
 
-PyObject *ActionData_time(ActionData *self, PyObject *args)
+bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value)
 {
-  if(!PyArg_ParseTuple(args,":time")) return NULL;
-  return PyLong_FromLong(self->time);
+  PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
+  if (!(val && PyList_Check(val))) return false;
+
+  for (int i = 0, end = PyList_Size(val); i < end; ++i) {
+    PyObject *str = PyList_GetItem(val, i);
+    if (PyString_Check(str))
+      value->push_back(PyString_AsString(str));
+  }
+  return true;
 }
 
-static PyMethodDef ActionData_methods[] = {
-  {"action", (PyCFunction)ActionData_action, METH_VARARGS,
-   "Return the action being executed."},
-  {"window", (PyCFunction)ActionData_window, METH_VARARGS,
-   "Return the client window id."},
-  {"target", (PyCFunction)ActionData_target, METH_VARARGS,
-   "Return the target type that the action is occuring on."},
-  {"modifiers", (PyCFunction)ActionData_modifiers, METH_VARARGS,
-   "Return the modifier keys state."},
-  {"button", (PyCFunction)ActionData_button, METH_VARARGS,
-   "Return the number of the pressed button (1-5)."},
-  {"xroot", (PyCFunction)ActionData_xroot, METH_VARARGS,
-   "Return the X-position of the mouse cursor on the root window."},
-  {"yroot", (PyCFunction)ActionData_yroot, METH_VARARGS,
-   "Return the Y-position of the mouse cursor on the root window."},
-  {"time", (PyCFunction)ActionData_time, METH_VARARGS,
-   "Return the time at which the event occured."},
-  {NULL, NULL, 0, NULL}
-};
+// ************************************* //
+// Stuff for calling from Python scripts //
+// ************************************* //
 
-PyObject *BindingData_window(BindingData *self, PyObject *args)
+PyObject *mbind(const std::string &button, ob::MouseContext::MC context,
+                ob::MouseAction::MA action, PyObject *func)
 {
-  if(!PyArg_ParseTuple(args,":window")) return NULL;
-  return PyLong_FromLong(self->window);
+  if (!PyCallable_Check(func)) {
+    PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
+    return NULL;
+  }
+  if(context < 0 || context >= MouseContext::NUM_MOUSE_CONTEXT) {
+    PyErr_SetString(PyExc_ValueError, "Invalid MouseContext");
+    return NULL;
+  }
+  if(action < 0 || action >= MouseAction::NUM_MOUSE_ACTION) {
+    PyErr_SetString(PyExc_ValueError, "Invalid MouseAction");
+    return NULL;
+  }
+  
+  if (!ob::openbox->bindings()->addButton(button, context,
+                                          action, func)) {
+    PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
+    return NULL;
+  }
+  Py_INCREF(Py_None); return Py_None;
 }
 
-PyObject *BindingData_modifiers(BindingData *self, PyObject *args)
+PyObject *ebind(ob::EventAction::EA action, PyObject *func)
 {
-  if(!PyArg_ParseTuple(args,":modifiers")) return NULL;
-  return PyLong_FromUnsignedLong(self->state);
+  if (!PyCallable_Check(func)) {
+    PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
+    return NULL;
+  }
+  
+  if (!ob::openbox->bindings()->addEvent(action, func)) {
+    PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
+    return NULL;
+  }
+  Py_INCREF(Py_None); return Py_None;
 }
 
-PyObject *BindingData_key(BindingData *self, PyObject *args)
+PyObject *kgrab(int screen, PyObject *func)
 {
-  if(!PyArg_ParseTuple(args,":key")) return NULL;
-  return PyString_FromString(
-    XKeysymToString(XKeycodeToKeysym(otk::OBDisplay::display, self->key, 0)));
+  if (!PyCallable_Check(func)) {
+    PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
+    return NULL;
+  }
 
+  if (!ob::openbox->bindings()->grabKeyboard(screen, func)) {
+    PyErr_SetString(PyExc_RuntimeError,"Unable to grab keybaord.");
+    return NULL;
+  }
+  Py_INCREF(Py_None); return Py_None;
 }
 
-PyObject *BindingData_time(BindingData *self, PyObject *args)
+PyObject *kungrab()
 {
-  if(!PyArg_ParseTuple(args,":time")) return NULL;
-  return PyLong_FromLong(self->time);
+  ob::openbox->bindings()->ungrabKeyboard();
+  Py_INCREF(Py_None); return Py_None;
 }
 
-static PyMethodDef BindingData_methods[] = {
-  {"window", (PyCFunction)BindingData_window, METH_VARARGS,
-   "Return the client window id."},
-  {"modifiers", (PyCFunction)BindingData_modifiers, METH_VARARGS,
-   "Return the modifier keys state."},
-  {"key", (PyCFunction)BindingData_key, METH_VARARGS,
-   "Return the name of the pressed key."},
-  {"time", (PyCFunction)BindingData_time, METH_VARARGS,
-   "Return the time at which the event occured."},
-  {NULL, NULL, 0, NULL}
-};
-
-static PyObject *ActionDataGetAttr(PyObject *obj, char *name)
+PyObject *mgrab(int screen)
 {
-  return Py_FindMethod(ActionData_methods, obj, name);
+  if (!ob::openbox->bindings()->grabPointer(screen)) {
+    PyErr_SetString(PyExc_RuntimeError,"Unable to grab pointer.");
+    return NULL;
+  }
+  Py_INCREF(Py_None); return Py_None;
 }
 
-static PyObject *BindingDataGetAttr(PyObject *obj, char *name)
+PyObject *mungrab()
 {
-  return Py_FindMethod(BindingData_methods, obj, name);
+  ob::openbox->bindings()->ungrabPointer();
+  Py_INCREF(Py_None); return Py_None;
 }
 
-static PyTypeObject ActionData_Type = {
-  PyObject_HEAD_INIT(NULL)
-  0,
-  "ActionData",
-  sizeof(ActionData),
-  0,
-  (destructor)ActionDataDealloc,
-  0,
-  (getattrfunc)ActionDataGetAttr,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-};
-
-static PyTypeObject BindingData_Type = {
-  PyObject_HEAD_INIT(NULL)
-  0,
-  "BindingData",
-  sizeof(BindingData),
-  0,
-  (destructor)BindingDataDealloc,
-  0,
-  (getattrfunc)BindingDataGetAttr,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-};
-
-// **************** //
-// End custom types //
-// **************** //
-
-void python_init(char *argv0)
+PyObject *kbind(PyObject *keylist, ob::KeyContext::KC context, PyObject *func)
 {
-  Py_SetProgramName(argv0);
-  Py_Initialize();
-  init_otk();
-  init_openbox();
-  PyRun_SimpleString("from _otk import *; from _openbox import *;");
-
-  // set up access to the python global variables
-  PyObject *obmodule = PyImport_AddModule("__main__");
-  obdict = PyModule_GetDict(obmodule);
-
-  // set up the custom types
-  ActionData_Type.ob_type = &PyType_Type;
-  BindingData_Type.ob_type = &PyType_Type;
-}
+  if (!PyCallable_Check(func)) {
+    PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
+    return NULL;
+  }
+  if (!PyList_Check(keylist)) {
+    PyErr_SetString(PyExc_TypeError, "Invalid keylist. Not a list.");
+    return NULL;
+  }
 
-void python_destroy()
-{
-  Py_DECREF(obdict);
-}
+  ob::Bindings::StringVect vectkeylist;
+  for (int i = 0, end = PyList_Size(keylist); i < end; ++i) {
+    PyObject *str = PyList_GetItem(keylist, i);
+    if (!PyString_Check(str)) {
+      PyErr_SetString(PyExc_TypeError,
+                     "Invalid keylist. It must contain only strings.");
+      return NULL;
+    }
+    vectkeylist.push_back(PyString_AsString(str));
+  }
 
-bool python_exec(const std::string &path)
-{
-  FILE *rcpyfd = fopen(path.c_str(), "r");
-  if (!rcpyfd) {
-    printf("failed to load python file %s\n", path.c_str());
-    return false;
+  (void)context; // XXX use this sometime!
+  if (!ob::openbox->bindings()->addKey(vectkeylist, func)) {
+    PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
+    return NULL;
   }
-  PyRun_SimpleFile(rcpyfd, const_cast<char*>(path.c_str()));
-  fclose(rcpyfd);
-  return true;
+  Py_INCREF(Py_None); return Py_None;
 }
 
-static void call(PyObject *func, PyObject *data)
+/*
+PyObject *kunbind(PyObject *keylist, PyObject *func)
 {
-  PyObject *arglist;
-  PyObject *result;
-
-  arglist = Py_BuildValue("(O)", data);
+  if (!PyList_Check(keylist)) {
+    PyErr_SetString(PyExc_TypeError, "Invalid keylist. Not a list.");
+    return NULL;
+  }
+  if (!PyCallable_Check(func)) {
+    PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
+    return NULL;
+  }
   
-  // call the callback
-  result = PyEval_CallObject(func, arglist);
-  if (!result) {
-    // an exception occured in the script, display it
-    PyErr_Print();
+  ob::Bindings::StringVect vectkeylist;
+  for (int i = 0, end = PyList_Size(keylist); i < end; ++i) {
+    PyObject *str = PyList_GetItem(keylist, i);
+    if (!PyString_Check(str)) {
+      PyErr_SetString(PyExc_TypeError,
+                     "Invalid keylist. It must contain only strings.");
+      return NULL;
+    }
+    vectkeylist.push_back(PyString_AsString(str));
   }
 
-  Py_XDECREF(result);
-  Py_DECREF(arglist);
+  if (!ob::openbox->bindings()->removeKey(vectkeylist, func)) {
+      PyErr_SetString(PyExc_RuntimeError, "Could not remove callback.");
+      return NULL;
+  }
+  Py_INCREF(Py_None); return Py_None;
 }
+*/
 
-void python_callback(PyObject *func, OBActions::ActionType action,
-                     Window window, OBWidget::WidgetType type,
-                     unsigned int state, unsigned int button,
-                     int xroot, int yroot, Time time)
+void kunbind_all()
 {
-  assert(func);
-  
-  ActionData *data = PyObject_New(ActionData, &ActionData_Type);
-  data->action = action;
-  data->window = window;
-  data->type   = type;
-  data->state  = state;
-  data->button = button;
-  data->xroot  = xroot;
-  data->yroot  = yroot;
-  data->time   = time;
-
-  call(func, (PyObject*)data);
-  Py_DECREF(data);
+  ob::openbox->bindings()->removeAllKeys();
 }
 
-void python_callback(PyObject *func, Window window, unsigned int state,
-			 unsigned int key, Time time)
+void set_reset_key(const std::string &key)
 {
-  if (!func) return;
-
-  BindingData *data = PyObject_New(BindingData, &BindingData_Type);
-  data->window = window;
-  data->state  = state;
-  data->key    = key;
-  data->time   = time;
-
-  call(func, (PyObject*)data);
-  Py_DECREF(data);
+  ob::openbox->bindings()->setResetKey(key);
 }
 
-bool python_get_string(const char *name, std::string *value)
+PyObject *send_client_msg(Window target, Atom type, Window about,
+                          long data, long data1, long data2,
+                          long data3, long data4)
 {
-  PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
-  if (!(val && PyString_Check(val))) return false;
-  
-  *value = PyString_AsString(val);
-  return true;
+  XEvent e;
+  e.xclient.type = ClientMessage;
+  e.xclient.format = 32;
+  e.xclient.message_type = type;
+  e.xclient.window = about;
+  e.xclient.data.l[0] = data;
+  e.xclient.data.l[1] = data1;
+  e.xclient.data.l[2] = data2;
+  e.xclient.data.l[3] = data3;
+  e.xclient.data.l[4] = data4;
+
+  XSendEvent(**otk::display, target, false,
+             SubstructureRedirectMask | SubstructureNotifyMask,
+             &e);
+  Py_INCREF(Py_None); return Py_None;
 }
 
+void execute(const std::string &bin, int screen)
+{
+  if (screen >= ScreenCount(**otk::display))
+    screen = 0;
+  otk::bexec(bin, otk::display->screenInfo(screen)->displayString());
+}
 
 }