X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.hh;h=cfa625d035fd36ed329239ac73f1fb83eff2153b;hb=f11bd1b0cc5973590d1ee547736ac00f50447efa;hp=496b459de27682ba46879d170be490dcba4d9448;hpb=c645416035d64cc959d1dd0e937b31b07489e54b;p=chaz%2Fopenbox

diff --git a/src/python.hh b/src/python.hh
index 496b459d..cfa625d0 100644
--- a/src/python.hh
+++ b/src/python.hh
@@ -6,30 +6,148 @@
   @brief wee
 */
 
-#include "actions.hh"
-#include "widget.hh"
+#include "otk/point.hh"
+#include "otk/rect.hh"
+#include "otk/property.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);
-
-//! 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);
+enum MouseContext {
+  MC_Frame,
+  MC_Titlebar,
+  MC_Handle,
+  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
+};
+
+enum EventAction {
+  EventEnterWindow,
+  EventLeaveWindow,
+  EventPlaceWindow,
+  EventNewWindow,
+  EventCloseWindow,
+  EventStartup,
+  EventShutdown,
+  EventFocus,
+  NUM_EVENTS
+};
+
+#ifndef SWIG
+
+// *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** //
+typedef struct {
+  PyObject_HEAD;
+  int screen;
+  Window window;
+  Time time;
+  unsigned int state;
+  unsigned int button;
+  MouseContext context;
+  MouseAction action;
+  int xroot;
+  int yroot;
+  int pressx;
+  int pressy;
+  int press_clientx;
+  int press_clienty;
+  int press_clientwidth;
+  int press_clientheight;
+} MotionData;
+
+// *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** //
+typedef struct {
+  PyObject_HEAD;
+  int screen;
+  Window window;
+  Time time;
+  unsigned int state;
+  unsigned int button;
+  MouseContext context;
+  MouseAction action;
+} ButtonData;
+
+typedef struct {
+  PyObject_HEAD;
+  int screen;
+  Window window;
+  unsigned int state;
+  EventAction action;
+} EventData;
+
+typedef struct {
+  PyObject_HEAD;
+  int screen;
+  Window window;
+  Time time;
+  unsigned int state;
+  unsigned int key;
+} KeyData;
+
+void python_init(char *argv0);
+void python_destroy();
+bool python_exec(const std::string &path);
+                 
+MotionData *new_motion_data(int screen, Window window, Time time,
+                            unsigned int state, unsigned int button,
+                            MouseContext context, MouseAction action,
+                            int xroot, int yroot, const otk::Point &initpos,
+                            const otk::Rect &initarea);
+ButtonData *new_button_data(int screen, Window window, Time time,
+                            unsigned int state, unsigned int button,
+                            MouseContext context, MouseAction action);
+EventData *new_event_data(int screen, Window window, EventAction action,
+                          unsigned int state);
+KeyData *new_key_data(int screen, Window window, Time time, unsigned int state,
+                      unsigned int key);
+
+void python_callback(PyObject *func, PyObject *data);
+
+bool python_get_long(const char *name, long *value);
+bool python_get_string(const char *name, std::string *value);
+bool python_get_stringlist(const char *name, std::vector<std::string> *value);
+#endif
+
+PyObject *mbind(const std::string &button, ob::MouseContext context,
+                ob::MouseAction action, PyObject *func);
+
+PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func);
+
+PyObject *ebind(ob::EventAction action, PyObject *func);
+
+void set_reset_key(const std::string &key);
+
+PyObject *send_client_msg(Window target, int type, Window about,
+                          long data, long data1 = 0, long data2 = 0,
+                          long data3 = 0, long data4 = 0);
 
 }