X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=0741f2da940e4df8f40e4cb8ef91ab9e8ab84844;hb=fbfa2798623ffa2ae34946070d35eb529a6cb6a9;hp=2c2f9ae3b90c6c467ae87e6d6c651f11e7c48777;hpb=68194ce957db36ead19a39fdc7636a220befafe9;p=chaz%2Fopenbox

diff --git a/src/python.cc b/src/python.cc
index 2c2f9ae3..0741f2da 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -1,45 +1,66 @@
 // -*- 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"
-
-namespace ob {
+#include "actions.hh"
+#include "python.hh"
+#include "bindings.hh"
+#include "otk/display.hh"
+#include "otk/util.hh"
 
 extern "C" {
+#include <Python.h>
 
-static PyObject *shit(PyObject *self, PyObject *args)
-{
-  if (!PyArg_ParseTuple(args, ":shit"))
-    return NULL;
+#include "gettext.h"
+#define _(str) gettext(str)
+}
 
-  printf("SHIT CALLED!@!\n");
+namespace ob {
 
-  return Py_None;
+void python_init(char *argv0)
+{
+  // 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()));
 }
-  
-
 
-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"},*/
+int python_exec(const std::string &path)
+{
+  FILE *rcpyfd = fopen(path.c_str(), "r");
+  if (!rcpyfd) {
+    fprintf(stderr, _("Unabled to open python file %s\n"), path.c_str());
+    return 1;
+  }
 
-  {NULL, NULL, 0, NULL}
-};
+  //PyRun_SimpleFile(rcpyfd, const_cast<char*>(path.c_str()));
 
-void initopenbox()
-{
-  PyClient_Type.ob_type = &PyType_Type;
+  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_InitModule("openbox", OBMethods);
-}
+  Py_XDECREF(result);
+    
+  Py_DECREF(dict);
+
+  fclose(rcpyfd);
+  return ret;
 }
 
 }