revert def_motion

[chaz/openbox] / src / python.hh

diff --git a/src/python.hh b/src/python.hh
index 8a1bb16135936b3af552cabe77270798f0397f44..9279caefc72f56978a0efed585158a88955166b7 100644 (file)
--- a/src/python.hh
+++ b/src/python.hh
@@ -17,8 +17,16 @@ extern "C" {
 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);
@@ -26,17 +34,29 @@ 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
+//! 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(PyObject *keylist, PyObject *callback);
+bool python_bind_key(PyObject *keylist, PyObject *callback);
+
+bool python_unbind_key(PyObject *keylist);
+
+void python_set_reset_key(const std::string &key);
+
+//! 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);
 
-bool python_unbind(PyObject *keylist);
+bool python_unbind_mouse(const std::string &button);
 
-bool python_unbind_all();
+void python_unbind_all();
 
 //! Fire a python callback function
 void python_callback(OBActions::ActionType action, Window window,
@@ -44,6 +64,10 @@ void python_callback(OBActions::ActionType action, Window window,
                      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);
+
 }
 
 #endif // __python_hh