X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=475b7299a32965fd7e0fdc6746714e9789acaac3;hb=fc7ec94f469a39b529f46507fbf1800e5bf42e1f;hp=9ea93b4d5b5c7d61d26fa4533c41ca9bc169edd6;hpb=b67f5e702e3cc12e4217dd31e2c522dde1ee19b0;p=chaz%2Fopenbox

diff --git a/src/python.cc b/src/python.cc
index 9ea93b4d..475b7299 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -11,8 +11,6 @@
 extern "C" {
 // The initializer in openbox_wrap.cc
 extern void init_openbox(void);
-// The initializer in otk_wrap.cc
-extern void init_otk(void);
 }
 
 namespace ob {
@@ -21,26 +19,22 @@ static PyObject *obdict = NULL;
 
 void python_init(char *argv0)
 {
+  // start the python engine
   Py_SetProgramName(argv0);
   Py_Initialize();
-  init_otk();
+  // initialize the C python module
   init_openbox();
+  // include the openbox directories for python scripts in the sys path
   PyRun_SimpleString("import sys");
   PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')");
-  PyRun_SimpleString(const_cast<char*>(((std::string)"sys.path.append('" +
+  PyRun_SimpleString(const_cast<char*>(("sys.path.append('" +
                                         otk::expandTilde("~/.openbox/python") +
                                         "')").c_str()));
-//  PyRun_SimpleString("from _otk import *; from _openbox import *;");
-  PyRun_SimpleString("from otk import *; from openbox import *;");
+  // import the otk and openbox modules into the main namespace
+  PyRun_SimpleString("from openbox import *;");
+  // set up convenience global variables
   PyRun_SimpleString("openbox = Openbox_instance()");
-  PyRun_SimpleString("display = OBDisplay_display()");
 
-  /* XXX
-     sys.path.append('stuff')
-     install the .py wrappers, and include their path with this, then import em
-     and ~/.openbox/python/ !!
-  */
-  
   // set up access to the python global variables
   PyObject *obmodule = PyImport_AddModule("__main__");
   obdict = PyModule_GetDict(obmodule);
@@ -139,7 +133,7 @@ PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func)
     return NULL;
   }
 
-  ob::OBBindings::StringVect vectkeylist;
+  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)) {
@@ -169,7 +163,7 @@ PyObject *kunbind(PyObject *keylist, PyObject *func)
     return NULL;
   }
   
-  ob::OBBindings::StringVect vectkeylist;
+  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)) {
@@ -201,9 +195,9 @@ PyObject *send_client_msg(Window target, int type, Window about,
                           long data, long data1, long data2,
                           long data3, long data4)
 {
-  if (type < 0 || type >= otk::OBProperty::NUM_ATOMS) {
+  if (type < 0 || type >= otk::Property::NUM_ATOMS) {
       PyErr_SetString(PyExc_TypeError,
-                     "Invalid atom type. Must be from otk::OBProperty::Atoms");
+                     "Invalid atom type. Must be from otk::Property::Atoms");
       return NULL;
   }
   
@@ -211,7 +205,7 @@ PyObject *send_client_msg(Window target, int type, Window about,
   e.xclient.type = ClientMessage;
   e.xclient.format = 32;
   e.xclient.message_type =
-    Openbox::instance->property()->atom((otk::OBProperty::Atoms)type);
+    Openbox::instance->property()->atom((otk::Property::Atoms)type);
   e.xclient.window = about;
   e.xclient.data.l[0] = data;
   e.xclient.data.l[1] = data1;
@@ -219,7 +213,7 @@ PyObject *send_client_msg(Window target, int type, Window about,
   e.xclient.data.l[3] = data3;
   e.xclient.data.l[4] = data4;
 
-  XSendEvent(otk::OBDisplay::display, target, false,
+  XSendEvent(otk::Display::display, target, false,
              SubstructureRedirectMask | SubstructureNotifyMask,
              &e);
   Py_INCREF(Py_None); return Py_None;