X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=d4cba31e44394fb4d1589ee972066f4bb5b563ac;hb=96a9196cbb71b7f8d5e3d98a92b2e59bb1b591a8;hp=040d70206d44f26c49103ae7f2c571ed3420d373;hpb=007e17d32b16b1df6c5267c9f8701d315c0c3805;p=chaz%2Fopenbox

diff --git a/src/python.cc b/src/python.cc
index 040d7020..d4cba31e 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -27,13 +27,14 @@ void python_init(char *argv0)
   // 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()));
   // 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 = Display_instance()");
 
   // set up access to the python global variables
   PyObject *obmodule = PyImport_AddModule("__main__");
@@ -60,13 +61,13 @@ bool python_exec(const std::string &path)
 bool python_get_long(const char *name, long *value)
 {
   PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
-  if (!(val && PyLong_Check(val))) return false;
+  if (!(val && PyInt_Check(val))) return false;
   
-  *value = PyLong_AsLong(val);
+  *value = PyInt_AsLong(val);
   return true;
 }
 
-bool python_get_string(const char *name, std::string *value)
+bool python_get_string(const char *name, otk::ustring *value)
 {
   PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
   if (!(val && PyString_Check(val))) return false;
@@ -75,7 +76,7 @@ bool python_get_string(const char *name, std::string *value)
   return true;
 }
 
-bool python_get_stringlist(const char *name, std::vector<std::string> *value)
+bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value)
 {
   PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
   if (!(val && PyList_Check(val))) return false;
@@ -100,7 +101,7 @@ PyObject *mbind(const std::string &button, ob::MouseContext context,
     return NULL;
   }
   
-  if (!ob::Openbox::instance->bindings()->addButton(button, context,
+  if (!ob::openbox->bindings()->addButton(button, context,
                                                     action, func)) {
     PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
     return NULL;
@@ -115,7 +116,7 @@ PyObject *ebind(ob::EventAction action, PyObject *func)
     return NULL;
   }
   
-  if (!ob::Openbox::instance->bindings()->addEvent(action, func)) {
+  if (!ob::openbox->bindings()->addEvent(action, func)) {
     PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
     return NULL;
   }
@@ -133,7 +134,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)) {
@@ -145,7 +146,7 @@ PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func)
   }
 
   (void)context; // XXX use this sometime!
-  if (!ob::Openbox::instance->bindings()->addKey(vectkeylist, func)) {
+  if (!ob::openbox->bindings()->addKey(vectkeylist, func)) {
     PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
     return NULL;
   }
@@ -163,7 +164,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)) {
@@ -174,7 +175,7 @@ PyObject *kunbind(PyObject *keylist, PyObject *func)
     vectkeylist.push_back(PyString_AsString(str));
   }
 
-  if (!ob::Openbox::instance->bindings()->removeKey(vectkeylist, func)) {
+  if (!ob::openbox->bindings()->removeKey(vectkeylist, func)) {
       PyErr_SetString(PyExc_RuntimeError, "Could not remove callback.");
       return NULL;
   }
@@ -183,21 +184,21 @@ PyObject *kunbind(PyObject *keylist, PyObject *func)
 
 void kunbind_all()
 {
-  ob::Openbox::instance->bindings()->removeAllKeys();
+  ob::openbox->bindings()->removeAllKeys();
 }
 
 void set_reset_key(const std::string &key)
 {
-  ob::Openbox::instance->bindings()->setResetKey(key);
+  ob::openbox->bindings()->setResetKey(key);
 }
 
 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;
   }
   
@@ -205,7 +206,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->property()->atom((otk::Property::Atoms)type);
   e.xclient.window = about;
   e.xclient.data.l[0] = data;
   e.xclient.data.l[1] = data1;
@@ -213,7 +214,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, target, false,
              SubstructureRedirectMask | SubstructureNotifyMask,
              &e);
   Py_INCREF(Py_None); return Py_None;