X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=179e737264e9b0c2da1df04a95d8b029b5a1756f;hb=d22a6c6c04cf20bd23efa68ad1202f278f25e113;hp=ff02d6d4022843d936b6fa8009e74914b233f499;hpb=084d6f4e42396a5d2baf72877b5abf3ae6fef7be;p=chaz%2Fopenbox

diff --git a/src/python.cc b/src/python.cc
index ff02d6d4..179e7372 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
-extern void init_openbox(void);
+// The initializer in openbox_wrap.cc / otk_wrap.cc
+extern void init_ob(void);
+extern void init_otk(void);
 }
 
 namespace ob {
@@ -23,34 +24,35 @@ void python_init(char *argv0)
   Py_SetProgramName(argv0);
   Py_Initialize();
   // initialize the C python module
-  init_openbox();
-  // include the openbox directories for python scripts in the sys path
+  init_otk();
+  init_ob();
+  // prepend the openbox directories for python scripts to the sys path
   PyRun_SimpleString("import sys");
-  PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')");
-  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()));
-  // import the otk and openbox modules into the main namespace
-  PyRun_SimpleString("from openbox import *;");
+  PyRun_SimpleString("import ob; import otk; import config;");
   // set up convenience global variables
-  PyRun_SimpleString("openbox = Openbox_instance()");
-  PyRun_SimpleString("display = Display_instance()");
+  PyRun_SimpleString("ob.openbox = ob.Openbox_instance()");
+  PyRun_SimpleString("otk.display = otk.Display_instance()");
 
   // set up access to the python global variables
-  PyObject *obmodule = PyImport_AddModule("__main__");
+  PyObject *obmodule = PyImport_AddModule("config");
   obdict = PyModule_GetDict(obmodule);
 }
 
 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()));
@@ -93,8 +95,8 @@ bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value)
 // Stuff for calling from Python scripts //
 // ************************************* //
 
-PyObject *mbind(const std::string &button, ob::MouseContext context,
-                ob::MouseAction action, PyObject *func)
+PyObject *mbind(const std::string &button, ob::MouseContext::MC context,
+                ob::MouseAction::MA action, PyObject *func)
 {
   if (!PyCallable_Check(func)) {
     PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
@@ -102,14 +104,14 @@ PyObject *mbind(const std::string &button, ob::MouseContext context,
   }
   
   if (!ob::openbox->bindings()->addButton(button, context,
-                                                    action, func)) {
+                                          action, func)) {
     PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
     return NULL;
   }
   Py_INCREF(Py_None); return Py_None;
 }
 
-PyObject *ebind(ob::EventAction action, PyObject *func)
+PyObject *ebind(ob::EventAction::EA action, PyObject *func)
 {
   if (!PyCallable_Check(func)) {
     PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
@@ -143,7 +145,22 @@ PyObject *kungrab()
   Py_INCREF(Py_None); return Py_None;
 }
 
-PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func)
+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)) {
     PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
@@ -233,4 +250,11 @@ PyObject *send_client_msg(Window target, Atom type, Window about,
   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());
+}
+
 }