#include "python.hh"
#include "bindings.hh"
#include "otk/display.hh"
+#include "otk/util.hh"
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 {
void python_init(char *argv0)
{
+ // start the python engine
Py_SetProgramName(argv0);
Py_Initialize();
- init_otk();
+ // initialize the C python module
init_openbox();
- PyRun_SimpleString("from _otk import *; from _openbox import *;");
+ // 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*>(("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 = OBDisplay_display()");
+ PyRun_SimpleString("display = Display_instance()");
- /* 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);
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;
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;
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;
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;
}
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)) {
vectkeylist.push_back(PyString_AsString(str));
}
- if (!ob::Openbox::instance->bindings()->addKey(vectkeylist, func)) {
+ (void)context; // XXX use this sometime!
+ if (!ob::openbox->bindings()->addKey(vectkeylist, func)) {
PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
return NULL;
}
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)) {
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;
}
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,
+PyObject *send_client_msg(Window target, Atom type, Window about,
long data, long data1, long data2,
long data3, long data4)
{
- if (type < 0 || type >= otk::OBProperty::NUM_ATOMS) {
- PyErr_SetString(PyExc_TypeError,
- "Invalid atom type. Must be from otk::OBProperty::Atoms");
- return NULL;
- }
-
XEvent e;
e.xclient.type = ClientMessage;
e.xclient.format = 32;
- e.xclient.message_type =
- Openbox::instance->property()->atom((otk::OBProperty::Atoms)type);
+ e.xclient.message_type = type;
e.xclient.window = about;
e.xclient.data.l[0] = data;
e.xclient.data.l[1] = data1;
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;