new mouse button code is seeming to work. you can move windows

[chaz/openbox] / src / python.hh

diff --git a/src/python.hh b/src/python.hh
index 8a1bb16135936b3af552cabe77270798f0397f44..c5e566f440271acf8daf5d245d51f8f109268d93 100644 (file)
--- a/src/python.hh
+++ b/src/python.hh
@@ -6,43 +6,69 @@
   @brief wee
 */
 
-#include "actions.hh"
-#include "widget.hh"
-#include "bindings.hh"
-
 extern "C" {
+#include <X11/Xlib.h>
 #include <Python.h>
 }
 
+#include <string>
+#include <vector>
+
 namespace ob {
 
-//! Add a python callback funtion to the back of the hook list
-bool python_register(int action, PyObject *callback);
-//! Add a python callback funtion to the front of the hook list
-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);
-
-//! Add a mouse/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(PyObject *keylist, PyObject *callback);
+enum MouseContext {
+  MC_Frame,
+  MC_Titlebar,
+  MC_Window,
+  MC_MaximizeButton,
+  MC_CloseButton,
+  MC_IconifyButton,
+  MC_StickyButton,
+  MC_Grip,
+  MC_Root,
+  MC_MenuItem,
+  NUM_MOUSE_CONTEXT
+};
+
+enum MouseAction {
+  MousePress,
+  MouseClick,
+  MouseDoubleClick,
+  MouseMotion,
+  NUM_MOUSE_ACTION
+};
+
+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, MouseAction action,
+                     Window window, MouseContext context,
+                     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);
+
 
-bool python_unbind(PyObject *keylist);
+bool python_get_string(const char *name, std::string *value);
+bool python_get_stringlist(const char *name, std::vector<std::string> *value);
+#endif
 
-bool python_unbind_all();
+PyObject * mbind(const std::string &button, ob::MouseContext context,
+                 ob::MouseAction action, PyObject *func);
 
-//! 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);
+PyObject * kbind(PyObject *keylist, ob::KeyContext context, PyObject *func);
+PyObject * kunbind(PyObject *keylist);
+void kunbind_all();
+void set_reset_key(const std::string &key);
 
 }