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

diff --git a/src/python.cc b/src/python.cc
index ed171f9c..0741f2da 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -1,128 +1,66 @@
 // -*- 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>
-
-namespace ob {
-
-typedef std::vector<PyObject*> FunctionList;
-
-static FunctionList callbacks[OBActions::NUM_ACTIONS];
+extern "C" {
+#include <Python.h>
 
-bool python_register(int action, PyObject *callback)
-{
-  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].push_back(callback);
-  }
-  return true;
+#include "gettext.h"
+#define _(str) gettext(str)
 }
 
-bool python_preregister(int action, PyObject *callback)
-{
-  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;
-}
+namespace ob {
 
-bool python_unregister(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;
-  }
-
-  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;
+  // 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()));
 }
 
-bool python_unregister_all(int action)
+void python_destroy()
 {
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    PyErr_SetString(PyExc_AssertionError, "Invalid action type.");
-    return false;
-  }
-
-  while (!callbacks[action].empty()) {
-    Py_XDECREF(callbacks[action].back());
-    callbacks[action].pop_back();
-  }
-  return true;
+  Py_Finalize();
 }
 
-void python_callback(OBActions::ActionType action, Window window,
-                     OBWidget::WidgetType type, unsigned int state,
-                     long d1, long d2, long d3, long d4)
+int python_exec(const std::string &path)
 {
-  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();
-    }
+  FILE *rcpyfd = fopen(path.c_str(), "r");
+  if (!rcpyfd) {
+    fprintf(stderr, _("Unabled to open python file %s\n"), path.c_str());
+    return 1;
   }
 
-  Py_DECREF(arglist);
+  //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;
 }
 
 }