X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=08f8f506139cf2398f8ce25c511500789c0cb82f;hb=7fe3301e7ea905a8a76d54c22751f3d8a346e28b;hp=e338b02cc9a0fb39a6d6fab96a07836792bca13a;hpb=700984bd150d98a6876c117c2e1b1b3c72cffce1;p=chaz%2Fopenbox

diff --git a/src/python.cc b/src/python.cc
index e338b02c..08f8f506 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -1,45 +1,47 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-
 #include "python.hh"
-#include "python_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" {
-
-static PyObject *shit(PyObject *self, PyObject *args)
-{
-  if (!PyArg_ParseTuple(args, ":shit"))
-    return NULL;
-
-  printf("SHIT CALLED!@!\n");
-
-  return Py_None;
+#include <Python.h>
 }
-  
 
+namespace ob {
 
-static PyMethodDef OBMethods[] = {
-  {"shit", shit, METH_VARARGS,
-   "Do some shit, yo!"},
-
-  {"get_client_dict", get_client_dict, METH_VARARGS,
-   "Get the list of all clients"},
-
-  {NULL, NULL, 0, NULL}
-};
+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()));
+}
 
-void initopenbox()
+void python_destroy()
 {
-  PyClient_Type.ob_type = &PyType_Type;
-  
-  Py_InitModule("openbox", OBMethods);
+  Py_Finalize();
 }
+
+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;
 }
 
 }