X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.hh;h=c3dabeb8d06bde4ba23196abe3d05ea47fe6812e;hb=579ed5aa8d1b33a69476c2182a98ebc30557f096;hp=6ca4e1c5f9569afb3831e3c45427765fe19e1ffe;hpb=b34824a4e2ddc0247099fa1b3952de426bfde05b;p=chaz%2Fopenbox

diff --git a/src/python.hh b/src/python.hh
index 6ca4e1c5..c3dabeb8 100644
--- a/src/python.hh
+++ b/src/python.hh
@@ -8,20 +8,53 @@
 
 #include "actions.hh"
 #include "widget.hh"
+#include "bindings.hh"
 
 extern "C" {
 #include <Python.h>
 }
 
+#include <string>
+
 namespace ob {
 
-bool python_register(int action, PyObject *callback);
-bool python_unregister(int action, PyObject *callback);
+enum MouseContext {
+  MC_Frame,
+  MC_Titlebar,
+  MC_Window,
+  MC_MaximizeButton,
+  MC_CloseButton,
+  MC_IconifyButton,
+  MC_StickyButton,
+  MC_Grip,
+  MC_Root,
+  MC_MenuItem,
+  MC_All,
+  NUM_MOUSE_CONTEXT
+}
+enum KeyContext {
+  KC_Menu,
+  KC_All,
+  NUM_KEY_CONTEXT
+}
+
+#ifndef SWIG
+void python_init(char *argv0);
+void python_destroy();
+bool python_exec(const std::string &path);
+                 
+void python_callback(PyObject *func, OBActions::ActionType action,
+                     Window window, OBWidget::WidgetType type,
+                     unsigned int state, unsigned int button,
+                     int xroot, int yroot, Time time);
+
+void python_callback(PyObject *func, Window window, unsigned int state,
+                     unsigned int key, Time time);
+
 
-void python_callback(OBActions::ActionType action, Window window,
-                     OBWidget::WidgetType type, unsigned int state,
-                     long d1 = LONG_MIN, long d2 = LONG_MIN,
-                     long d3 = LONG_MIN, long d4 = LONG_MIN);
+bool python_get_string(const char *name, std::string *value);
+bool python_get_stringlist(const char *name, std::vector<std::string> *value);
+#endif
 
 }