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

diff --git a/src/python.cc b/src/python.cc
index 5a4d1bcf..64398e38 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -1,44 +1,87 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-
 #include "python.hh"
-#include "client.hh"
 #include "openbox.hh"
+#include "actions.hh"
+#include "python.hh"
+#include "bindings.hh"
+#include "otk/display.hh"
+#include "otk/util.hh"
 
 namespace ob {
 
-extern "C" {
+static PyObject *obdict = NULL;
 
-static PyObject *shit(PyObject *self, PyObject *args)
+void python_init(char *argv0)
 {
-  if (!PyArg_ParseTuple(args, ":shit"))
-    return NULL;
-
-  printf("SHIT CALLED!@!\n");
+  // 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()));
+  //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()");
 
-  Py_INCREF(Py_None);
-  return Py_None;
+  // set up access to the python global variables
+  PyObject *obmodule = PyImport_AddModule("config");
+  obdict = PyModule_GetDict(obmodule);
 }
-  
-
 
-static PyMethodDef OBMethods[] = {
-  {"shit", shit, METH_VARARGS,
-   "Do some shit, yo!"},
+void python_destroy()
+{
+  Py_Finalize();
+}
 
-/*  {"get_client_dict", get_client_dict, METH_VARARGS,
-    "Get the list of all clients"},*/
+bool 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;
+  }
+  PyRun_SimpleFile(rcpyfd, const_cast<char*>(path.c_str()));
+  fclose(rcpyfd);
+  return true;
+}
 
-  {NULL, NULL, 0, NULL}
-};
+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;
+}
 
-void initopenbox()
+bool python_get_string(const char *name, otk::ustring *value)
 {
-  Py_InitModule("openbox", OBMethods);
+  PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
+  if (!(val && PyString_Check(val))) return false;
+  
+  *value = PyString_AsString(val);
+  return true;
 }
+
+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;
+
+  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));
+  }
+  return true;
 }
 
 }