]> Dogcows Code - chaz/openbox/blobdiff - src/python.cc
move the focus_order lists into the kernel
[chaz/openbox] / src / python.cc
index ed171f9cc4880659e2f3642dd310b606964751d4..75b7cc13958c36952bdd592a754b6c640b200f9e 100644 (file)
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #include "python.hh"
+#include "openbox.hh"
+#include "actions.hh"
+#include "python.hh"
+#include "bindings.hh"
+#include "otk/display.hh"
+#include "otk/util.hh"
 
-#include <vector>
-#include <algorithm>
+extern "C" {
+#include <Python.h>
 
-namespace ob {
+#include "gettext.h"
+#define _(str) gettext(str)
+}
 
-typedef std::vector<PyObject*> FunctionList;
+namespace ob {
 
-static FunctionList callbacks[OBActions::NUM_ACTIONS];
+static PyObject *get = NULL;
 
-bool python_register(int action, PyObject *callback)
+void python_init(char *argv0)
 {
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    PyErr_SetString(PyExc_AssertionError, "Invalid action type.");
-    return false;
-  }
-  if (!PyCallable_Check(callback)) {
-    PyErr_SetString(PyExc_AssertionError, "Invalid callback function.");
-    return false;
+  // start the python engine
+  Py_SetProgramName(argv0);
+  Py_Initialize();
+  // prepend the openbox directories for python scripts to the sys path
+  PyRun_SimpleString("import sys");
+  PyRun_SimpleString("sys.path.insert(0, '" SCRIPTDIR "')");
+  PyRun_SimpleString(const_cast<char*>(("sys.path.insert(0, '" +
+                                        otk::expandTilde("~/.openbox/python") +
+                                        "')").c_str()));
+
+  return;
+  PyObject *obmodule = PyImport_ImportModule("config");
+  if (obmodule == NULL) {
+    PyErr_Print();
+    return;
   }
-  
-  FunctionList::iterator it = std::find(callbacks[action].begin(),
-                                       callbacks[action].end(),
-                                       callback);
-  if (it == callbacks[action].end()) { // not already in there
-    Py_XINCREF(callback);              // Add a reference to new callback
-    callbacks[action].push_back(callback);
+  PyObject *configdict = PyModule_GetDict(obmodule);
+  Py_DECREF(obmodule);
+
+  get = PyDict_GetItemString(configdict, "get");
+  if (get == NULL) {
+    PyErr_Print(); 
+    return;
   }
-  return true;
 }
 
-bool python_preregister(int action, PyObject *callback)
+void python_destroy()
 {
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    PyErr_SetString(PyExc_AssertionError, "Invalid action type.");
-    return false;
-  }
-  if (!PyCallable_Check(callback)) {
-    PyErr_SetString(PyExc_AssertionError, "Invalid callback function.");
-    return false;
-  }
-  
-  FunctionList::iterator it = std::find(callbacks[action].begin(),
-                                       callbacks[action].end(),
-                                       callback);
-  if (it == callbacks[action].end()) { // not already in there
-    Py_XINCREF(callback);              // Add a reference to new callback
-    callbacks[action].insert(callbacks[action].begin(), callback);
-  }
-  return true;
+  Py_Finalize();
 }
 
-bool python_unregister(int action, PyObject *callback)
+int python_exec(const std::string &path)
 {
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    PyErr_SetString(PyExc_AssertionError, "Invalid action type.");
-    return false;
-  }
-  if (!PyCallable_Check(callback)) {
-    PyErr_SetString(PyExc_AssertionError, "Invalid callback function.");
-    return false;
+  FILE *rcpyfd = fopen(path.c_str(), "r");
+  if (!rcpyfd) {
+    fprintf(stderr, _("Unabled to open python file %s\n"), path.c_str());
+    return 1;
   }
 
-  FunctionList::iterator it = std::find(callbacks[action].begin(),
-                                       callbacks[action].end(),
-                                       callback);
-  if (it != callbacks[action].end()) { // its been registered before
-    Py_XDECREF(*it);                   // Dispose of previous callback
-    callbacks[action].erase(it);
-  }
-  return true;
+  //PyRun_SimpleFile(rcpyfd, const_cast<char*>(path.c_str()));
+
+  PyObject *module = PyImport_AddModule("__main__");
+  assert(module);
+  PyObject *dict = PyModule_GetDict(module);
+  assert(dict);
+  PyObject *result = PyRun_File(rcpyfd, const_cast<char*>(path.c_str()),
+                                Py_file_input, dict, dict);
+  int ret = result == NULL ? 2 : 0;
+  if (result == NULL)
+    PyErr_Print();
+  
+  Py_XDECREF(result);
+    
+  Py_DECREF(dict);
+
+  fclose(rcpyfd);
+  return ret;
 }
 
-bool python_unregister_all(int action)
+bool python_get_long(const char *name, long *value)
 {
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    PyErr_SetString(PyExc_AssertionError, "Invalid action type.");
-    return false;
+  return false;
+  if (get == NULL) return false;
+  bool ret = false;
+
+  PyObject *val = PyObject_CallFunction(get, "ss", "openbox", name);
+  if (val == NULL)
+    PyErr_Print();
+  else if (PyInt_Check(val)) {
+    *value = PyInt_AsLong(val);
+    ret = true;
+  } else if (PyLong_Check(val)) {
+    *value = PyLong_AsLong(val);
+    ret = true;
   }
+  Py_XDECREF(val);
+  return ret;
+}
 
-  while (!callbacks[action].empty()) {
-    Py_XDECREF(callbacks[action].back());
-    callbacks[action].pop_back();
+bool python_get_string(const char *name, otk::ustring *value)
+{
+  return false;
+  if (get == NULL) return false;
+  bool ret = false;
+
+  PyObject *val = PyObject_CallFunction(get, "ss", "openbox", name);
+  if (val == NULL)
+    PyErr_Print();
+  else if (PyString_Check(val)) {
+    *value = std::string(PyString_AsString(val), PyString_Size(val));
+    ret = true;
   }
-  return true;
+  Py_XDECREF(val);
+  return ret;
 }
 
-void python_callback(OBActions::ActionType action, Window window,
-                     OBWidget::WidgetType type, unsigned int state,
-                     long d1, long d2, long d3, long d4)
+bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value)
 {
-  PyObject *arglist;
-  PyObject *result;
-
-  assert(action >= 0 && action < OBActions::NUM_ACTIONS);
-
-  if (d4 != LONG_MIN)
-    arglist = Py_BuildValue("iliillll", action, window, type, state,
-                            d1, d2, d3, d4);
-  else if (d3 != LONG_MIN)
-    arglist = Py_BuildValue("iliilll", action, window, type, state,
-                            d1, d2, d3);
-  else if (d2 != LONG_MIN)
-    arglist = Py_BuildValue("iliill", action, window, type, state, d1, d2);
-  else if (d1 != LONG_MIN)
-    arglist = Py_BuildValue("iliil", action, window, type, state, d1);
-  else
-    arglist = Py_BuildValue("ilii", action, window, type, state);
-
-  FunctionList::iterator it, end = callbacks[action].end();
-  for (it = callbacks[action].begin(); it != end; ++it) {
-    // call the callback
-    result = PyEval_CallObject(*it, arglist);
-    if (result) {
-      Py_DECREF(result);
-    } else {
-      // an exception occured in the script, display it
-      PyErr_Print();
+  return false;
+  if (get == NULL) return false;
+  bool ret = false;
+
+  PyObject *val = PyObject_CallFunction(get, "ss", "openbox", name);
+  if (val == NULL)
+    PyErr_Print();
+  else if (PyList_Check(val)) {
+    for (int i = 0, end = PyList_Size(val); i < end; ++i) {
+      PyObject *str = PyList_GET_ITEM(val, i);
+      if (PyString_Check(str))
+        value->push_back(std::string(PyString_AsString(str),
+                                     PyString_Size(str)));
     }
   }
-
-  Py_DECREF(arglist);
+  Py_XDECREF(val);
+  return ret;
 }
 
 }
This page took 0.024727 seconds and 4 git commands to generate.