X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=84cfff291a7abb5ca8e310678ad47332cbb2bc77;hb=cb5eb0d560759cebce3279cb28d942166e0e9a7a;hp=9feddbd8fb9b97ebcb4684fd7fea24917aac1d36;hpb=d600bf8d58205ea476458970b8dda5f6e8d9220b;p=chaz%2Fopenbox

diff --git a/src/python.cc b/src/python.cc
index 9feddbd8..84cfff29 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -26,12 +26,12 @@ void python_init(char *argv0)
   // 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; import otk; import config;");
   // set up convenience global variables
   PyRun_SimpleString("ob.openbox = ob.Openbox_instance()");
@@ -44,14 +44,14 @@ void python_init(char *argv0)
 
 void python_destroy()
 {
-  Py_DECREF(obdict);
+  Py_Finalize();
 }
 
 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());
+    printf("Failed to load python file %s\n", path.c_str());
     return false;
   }
   PyRun_SimpleFile(rcpyfd, const_cast<char*>(path.c_str()));
@@ -144,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)) {
@@ -174,6 +189,7 @@ PyObject *kbind(PyObject *keylist, ob::KeyContext::KC context, PyObject *func)
   Py_INCREF(Py_None); return Py_None;
 }
 
+/*
 PyObject *kunbind(PyObject *keylist, PyObject *func)
 {
   if (!PyList_Check(keylist)) {
@@ -202,6 +218,7 @@ PyObject *kunbind(PyObject *keylist, PyObject *func)
   }
   Py_INCREF(Py_None); return Py_None;
 }
+*/
 
 void kunbind_all()
 {