X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fpython.hh;h=8868ee87503484b9bc842a335c7cb9749d1082c8;hb=b67f5e702e3cc12e4217dd31e2c522dde1ee19b0;hp=189c29b32a05569d89dc30e8dfea14a8ac04024a;hpb=0d00827947ef02749d44802613ca13df284e544f;p=chaz%2Fopenbox

diff --git a/src/python.hh b/src/python.hh
index 189c29b3..8868ee87 100644
--- a/src/python.hh
+++ b/src/python.hh
@@ -65,8 +65,7 @@ enum EventAction {
   NUM_EVENTS
 };
 
-// *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** //
-class MotionData {
+class MouseData {
 public:
   int screen;
   OBClient *client;
@@ -84,10 +83,10 @@ public:
   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) {
+  MouseData(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;
@@ -104,21 +103,8 @@ public:
     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) {
+  MouseData(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;
@@ -126,6 +112,14 @@ public:
     this->button = button;
     this->context= context;
     this->action = action;
+    this->xroot  = xroot;
+    this->yroot  = yroot;
+    this->pressx = 0;
+    this->pressy = 0;
+    this->press_clientx      = 0;
+    this->press_clienty      = 0;
+    this->press_clientwidth  = 0;
+    this->press_clientheight = 0;
   }
 };
 
@@ -177,8 +171,7 @@ bool python_get_stringlist(const char *name, std::vector<std::string> *value);
 /***********************************************
  * 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, MouseData *data);
 void python_callback(PyObject *func, EventData *data);
 void python_callback(PyObject *func, KeyData *data);