new python callbacks data, infrastructure. going to rework bindings code. cvs wont...

[chaz/openbox] / src / python.hh

diff --git a/src/python.hh b/src/python.hh
index c5e566f440271acf8daf5d245d51f8f109268d93..189c29b32a05569d89dc30e8dfea14a8ac04024a 100644 (file)
--- a/src/python.hh
+++ b/src/python.hh
@@ -6,6 +6,11 @@
   @brief wee
 */
 
+#include "otk/point.hh"
+#include "otk/rect.hh"
+#include "otk/property.hh"
+#include "otk/display.hh"
+
 extern "C" {
 #include <X11/Xlib.h>
 #include <Python.h>
@@ -16,9 +21,12 @@ extern "C" {
 
 namespace ob {
 
+class OBClient;
+
 enum MouseContext {
   MC_Frame,
   MC_Titlebar,
+  MC_Handle,
   MC_Window,
   MC_MaximizeButton,
   MC_CloseButton,
@@ -44,32 +52,151 @@ enum KeyContext {
   NUM_KEY_CONTEXT
 };
 
+enum EventAction {
+  EventEnterWindow,
+  EventLeaveWindow,
+  EventPlaceWindow,
+  EventNewWindow,
+  EventCloseWindow,
+  EventStartup,
+  EventShutdown,
+  EventFocus,
+  EventBell,
+  NUM_EVENTS
+};
+
+// *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** //
+class MotionData {
+public:
+  int screen;
+  OBClient *client;
+  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(int screen, OBClient *client, Time time, unsigned int state,
+             unsigned int button, MouseContext context, MouseAction action,
+             int xroot, int yroot, const otk::Point &initpos,
+             const otk::Rect &initarea) {
+    this->screen = screen;
+    this->client = client;
+    this->time   = time;
+    this->state  = state;
+    this->button = button;
+    this->context= context;
+    this->action = action;
+    this->xroot  = xroot;
+    this->yroot  = yroot;
+    this->pressx = initpos.x();
+    this->pressy = initpos.y();
+    this->press_clientx      = initarea.x();
+    this->press_clienty      = initarea.y();
+    this->press_clientwidth  = initarea.width();
+    this->press_clientheight = initarea.height();
+  }
+};
+
+// *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** //
+class ButtonData {
+public:
+  int screen;
+  OBClient *client;
+  Time time;
+  unsigned int state;
+  unsigned int button;
+  MouseContext context;
+  MouseAction action;
+
+  ButtonData(int screen, OBClient *client, Time time, unsigned int state,
+             unsigned int button, MouseContext context, MouseAction action) {
+    this->screen = screen;
+    this->client = client;
+    this->time   = time;
+    this->state  = state;
+    this->button = button;
+    this->context= context;
+    this->action = action;
+  }
+};
+
+class EventData {
+public:
+  int screen;
+  OBClient *client;
+  unsigned int state;
+  EventAction action;
+
+  EventData(int screen, OBClient *client, EventAction action,
+            unsigned int state) {
+    this->screen = screen;
+    this->client = client;
+    this->action = action;
+    this->state  = state;
+  }
+};
+
+class KeyData {
+public:
+  int screen;
+  OBClient *client;
+  Time time;
+  unsigned int state;
+  std::string key;
+
+  KeyData(int screen, OBClient *client, Time time, unsigned int state,
+          unsigned int key) {
+    this->screen = screen;
+    this->client = client;
+    this->time   = time;
+    this->state  = state;
+    this->key    = XKeysymToString(XKeycodeToKeysym(otk::OBDisplay::display,
+                                                    key, 0));
+  }
+};
+
 #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_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);
+/***********************************************
+ * These are found in openbox.i, not python.cc *
+ ***********************************************/
+void python_callback(PyObject *func, MotionData *data);
+void python_callback(PyObject *func, ButtonData *data);
+void python_callback(PyObject *func, EventData *data);
+void python_callback(PyObject *func, KeyData *data);
+
+#endif // SWIG
+
+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);
 
-PyObject * kbind(PyObject *keylist, ob::KeyContext context, PyObject *func);
-PyObject * kunbind(PyObject *keylist);
-void kunbind_all();
 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);
 }
 
+
 #endif // __python_hh