X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fpython.hh;h=2f77932138c724ae312298bd909c4e7e1e688cee;hb=d833fb1ecc6a65a8bccbbe15e372904f4bf17f23;hp=2bf656d8620a4696f27c54350d1c74772636dba9;hpb=a0350e27b311db5cab49035752d3852ee68bf8a2;p=chaz%2Fopenbox

diff --git a/src/python.hh b/src/python.hh
index 2bf656d8..2f779321 100644
--- a/src/python.hh
+++ b/src/python.hh
@@ -53,6 +53,8 @@ enum EventAction {
   EventLeaveWindow,
   EventNewWindow,
   EventCloseWindow,
+  EventStartup,
+  EventShutdown,
   NUM_EVENTS
 };
 
@@ -61,6 +63,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 +83,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 +94,7 @@ typedef struct {
 
 typedef struct {
   PyObject_HEAD;
+  int screen;
   Window window;
   unsigned int state;
   EventAction action;
@@ -97,6 +102,7 @@ typedef struct {
 
 typedef struct {
   PyObject_HEAD;
+  int screen;
   Window window;
   Time time;
   unsigned int state;
@@ -107,17 +113,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);