better reparent handling, dont fux with the event stack..

[chaz/openbox] / src / python.hh

diff --git a/src/python.hh b/src/python.hh
index 2bf656d8620a4696f27c54350d1c74772636dba9..cfa625d035fd36ed329239ac73f1fb83eff2153b 100644 (file)
--- a/src/python.hh
+++ b/src/python.hh
@@ -8,6 +8,7 @@
 
 #include "otk/point.hh"
 #include "otk/rect.hh"
+#include "otk/property.hh"
 
 extern "C" {
 #include <X11/Xlib.h>
@@ -51,8 +52,12 @@ enum KeyContext {
 enum EventAction {
   EventEnterWindow,
   EventLeaveWindow,
+  EventPlaceWindow,
   EventNewWindow,
   EventCloseWindow,
+  EventStartup,
+  EventShutdown,
+  EventFocus,
   NUM_EVENTS
 };
 
@@ -61,6 +66,7 @@ enum EventAction {
 // *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** //
 typedef struct {
   PyObject_HEAD;
+  int screen;
   Window window;
   Time time;
   unsigned int state;
@@ -80,6 +86,7 @@ typedef struct {
 // *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** //
 typedef struct {
   PyObject_HEAD;
+  int screen;
   Window window;
   Time time;
   unsigned int state;
@@ -90,6 +97,7 @@ typedef struct {
 
 typedef struct {
   PyObject_HEAD;
+  int screen;
   Window window;
   unsigned int state;
   EventAction action;
@@ -97,6 +105,7 @@ typedef struct {
 
 typedef struct {
   PyObject_HEAD;
+  int screen;
   Window window;
   Time time;
   unsigned int state;
@@ -107,17 +116,17 @@ void python_init(char *argv0);
 void python_destroy();
 bool python_exec(const std::string &path);
                  
-MotionData *new_motion_data(Window window, Time time, unsigned int state,
-                            unsigned int button, MouseContext context,
-                            MouseAction action, int xroot, int yroot,
-                            const otk::Point &initpos,
+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(Window window, Time time, unsigned int state,
-                            unsigned int button, MouseContext context,
-                            MouseAction action);
-EventData *new_event_data(Window window, EventAction action,
-                           unsigned int state);
-KeyData *new_key_data(Window window, Time time, unsigned int state,
+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);
@@ -136,6 +145,10 @@ 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);
+
 }
 
 #endif // __python_hh