X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=28369e9a2e1e1d5d8b62d89f926b192369cb4ba1;hb=abaaed47f1796e950d3e1d98d8ccfd6304bc94cf;hp=f95d4723772f0b89e4af3ad38a82cd26c1fcdea4;hpb=997f94cf8657201ea9d1f2497e4ec4f56342e22f;p=chaz%2Fopenbox

diff --git a/src/python.cc b/src/python.cc
index f95d4723..28369e9a 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -9,8 +9,9 @@
 #include "otk/util.hh"
 
 extern "C" {
-// The initializer in openbox_wrap.cc
+// The initializer in openbox_wrap.cc / otk_wrap.cc
 extern void init_ob(void);
+extern void init_otk(void);
 }
 
 namespace ob {
@@ -23,17 +24,18 @@ void python_init(char *argv0)
   Py_SetProgramName(argv0);
   Py_Initialize();
   // initialize the C python module
+  init_otk();
   init_ob();
-  // include the openbox directories for python scripts in the sys path
+  // prepend the openbox directories for python scripts to the sys path
   PyRun_SimpleString("import sys");
-  PyRun_SimpleString(const_cast<char*>(("sys.path.append('" +
+  PyRun_SimpleString("sys.path.insert(0, '" SCRIPTDIR "')");
+  PyRun_SimpleString(const_cast<char*>(("sys.path.insert(0, '" +
                                         otk::expandTilde("~/.openbox/python") +
                                         "')").c_str()));
-  PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')");
-  PyRun_SimpleString("import ob;");
+  PyRun_SimpleString("import ob; import otk; import config;");
   // set up convenience global variables
   PyRun_SimpleString("ob.openbox = ob.Openbox_instance()");
-  PyRun_SimpleString("ob.display = ob.Display_instance()");
+  PyRun_SimpleString("otk.display = otk.Display_instance()");
 
   // set up access to the python global variables
   PyObject *obmodule = PyImport_AddModule("config");
@@ -142,6 +144,21 @@ PyObject *kungrab()
   Py_INCREF(Py_None); return Py_None;
 }
 
+PyObject *mgrab(int screen)
+{
+  if (!ob::openbox->bindings()->grabPointer(screen)) {
+    PyErr_SetString(PyExc_RuntimeError,"Unable to grab pointer.");
+    return NULL;
+  }
+  Py_INCREF(Py_None); return Py_None;
+}
+
+PyObject *mungrab()
+{
+  ob::openbox->bindings()->ungrabPointer();
+  Py_INCREF(Py_None); return Py_None;
+}
+
 PyObject *kbind(PyObject *keylist, ob::KeyContext::KC context, PyObject *func)
 {
   if (!PyCallable_Check(func)) {