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

diff --git a/src/python.hh b/src/python.hh
index b868c472..c3dabeb8 100644
--- a/src/python.hh
+++ b/src/python.hh
@@ -14,57 +14,47 @@ extern "C" {
 #include <Python.h>
 }
 
-namespace ob {
-
-//! Add a python callback funtion to the back of the hook list
-/*!
-  Registering functions for KeyPress events is pointless. Use python_bind_key
-  instead to do this.
-*/
-bool python_register(int action, PyObject *callback);
-//! Add a python callback funtion to the front of the hook list
-/*!
-  Registering functions for KeyPress events is pointless. Use python_bind_key
-  instead to do this.
-*/
-bool python_preregister(int action, PyObject *callback);
-//! Remove a python callback function from the hook list
-bool python_unregister(int action, PyObject *callback);
-
-//! Removes all python callback functions from the hook list
-bool python_unregister_all(int action);
+#include <string>
 
-//! Add a keybinding
-/*!
-  @param keylist A python list of modifier/key/buttons, in the form:
-                 "C-A-space" or "A-Button1" etc.
-  @param callback A python function to call when the binding is used.
-*/
-bool python_bind_key(PyObject *keylist, PyObject *callback);
-
-bool python_unbind_key(PyObject *keylist);
+namespace ob {
 
-//! Adds a mouse binding
-/*!
-  Bindings do not generate motion events. You can only handle motion events by
-  using register to set a function for all motion events. Bindings do generate
-  ButtonPress, ButtonRelease, Click, and DoubleClick events.
-*/
-bool python_bind_mouse(const std::string &button, 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
+}
 
-bool python_unbind_mouse(const std::string &button);
+#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);
 
-bool python_unbind_all();
+void python_callback(PyObject *func, Window window, unsigned int state,
+                     unsigned int key, Time time);
 
-//! Fire a python callback function
-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);
 
-void python_callback_binding(int id, OBActions::ActionType action,
-                             Window window, unsigned int state,
-                             unsigned int keybutton, Time time);
+bool python_get_string(const char *name, std::string *value);
+bool python_get_stringlist(const char *name, std::vector<std::string> *value);
+#endif
 
 }