X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=75b7cc13958c36952bdd592a754b6c640b200f9e;hb=cce970813f088952e05e20f13d77d6f4766863e3;hp=64398e38be5c7298029c568b4133e63e8bc6f91c;hpb=8ad1d0bb99ec03c0a233df74aff986c4d49a762b;p=chaz%2Fopenbox

diff --git a/src/python.cc b/src/python.cc
index 64398e38..75b7cc13 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -8,9 +8,16 @@
 #include "otk/display.hh"
 #include "otk/util.hh"
 
+extern "C" {
+#include <Python.h>
+
+#include "gettext.h"
+#define _(str) gettext(str)
+}
+
 namespace ob {
 
-static PyObject *obdict = NULL;
+static PyObject *get = NULL;
 
 void python_init(char *argv0)
 {
@@ -23,15 +30,21 @@ void python_init(char *argv0)
   PyRun_SimpleString(const_cast<char*>(("sys.path.insert(0, '" +
                                         otk::expandTilde("~/.openbox/python") +
                                         "')").c_str()));
-  //PyRun_SimpleString("import ob; import otk; import config;");
-  PyRun_SimpleString("import config;");
-  // set up convenience global variables
-  //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("config");
-  obdict = PyModule_GetDict(obmodule);
+
+  return;
+  PyObject *obmodule = PyImport_ImportModule("config");
+  if (obmodule == NULL) {
+    PyErr_Print();
+    return;
+  }
+  PyObject *configdict = PyModule_GetDict(obmodule);
+  Py_DECREF(obmodule);
+
+  get = PyDict_GetItemString(configdict, "get");
+  if (get == NULL) {
+    PyErr_Print(); 
+    return;
+  }
 }
 
 void python_destroy()
@@ -39,49 +52,90 @@ void python_destroy()
   Py_Finalize();
 }
 
-bool python_exec(const std::string &path)
+int 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());
-    return false;
+    fprintf(stderr, _("Unabled to open python file %s\n"), path.c_str());
+    return 1;
   }
-  PyRun_SimpleFile(rcpyfd, const_cast<char*>(path.c_str()));
+
+  //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 true;
+  return ret;
 }
 
 bool python_get_long(const char *name, long *value)
 {
-  PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
-  if (!(val && PyInt_Check(val))) return false;
-  
-  *value = PyInt_AsLong(val);
-  return true;
+  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;
 }
 
 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;
-  
-  *value = PyString_AsString(val);
-  return true;
+  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;
+  }
+  Py_XDECREF(val);
+  return ret;
 }
 
 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 false;
+  if (get == NULL) return false;
+  bool ret = false;
 
-  value->clear();
-  
-  for (int i = 0, end = PyList_Size(val); i < end; ++i) {
-    PyObject *str = PyList_GetItem(val, i);
-    if (PyString_Check(str))
-      value->push_back(PyString_AsString(str));
+  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)));
+    }
   }
-  return true;
+  Py_XDECREF(val);
+  return ret;
 }
 
 }