X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=ffa0a8f05f01feeb6c48b53f9a48832a84c82633;hb=f8ea576460470ecc2e395cf43e31a67752adbbb5;hp=c04457da726a93fb4590f3609db3db93e2c91724;hpb=b35dae95a5cdb902f1661b9572af47c3f55c975c;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index c04457da..ffa0a8f0 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -70,16 +70,14 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
   // run the PRESS python hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
-
-/*  doCallback(Action_ButtonPress, e.window,
-             (OBWidget::WidgetType)(w ? w->type():-1),
-             e.state, e.button, e.x_root, e.y_root, e.time);*/
-  if (w) {
-    Openbox::instance->bindings()->fire(MousePress, w->type(), e.window,
-                                        e.state, e.button,
-                                        e.x_root, e.y_root, e.time);
-  } else
-    assert(false); // why isnt there a type?
+  assert(w); // everything should be a widget
+
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  ButtonData *data = new_button_data(e.window, e.time, state, e.button,
+                                     w->mcontext(), MousePress);
+  Openbox::instance->bindings()->fireButton(data);
+  Py_DECREF((PyObject*)data);
     
   if (_button) return; // won't count toward CLICK events
 
@@ -94,6 +92,7 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
   
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
+  assert(w); // everything should be a widget
 
   // not for the button we're watching?
   if (_button != e.button) return;
@@ -110,29 +109,19 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
     return;
 
   // run the CLICK python hook
-/*  doCallback(Action_Click, e.window,
-             (OBWidget::WidgetType)(w ? w->type():-1),
-             e.state, e.button, e.x_root, e.y_root, e.time);*/
-  if (w) {
-    Openbox::instance->bindings()->fire(MouseClick, w->type(), e.window,
-                                        e.state, e.button,
-                                        e.x_root, e.y_root, e.time);
-  } else
-    assert(false); // why isnt there a type?
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  ButtonData *data = new_button_data(e.window, e.time, state, e.button,
+                                     w->mcontext(), MouseClick);
+  Openbox::instance->bindings()->fireButton(data);
+    
 
   if (e.time - _release.time < DOUBLECLICKDELAY &&
       _release.win == e.window && _release.button == e.button) {
 
     // run the DOUBLECLICK python hook
-/*    doCallback(Action_DoubleClick, e.window,
-               (OBWidget::WidgetType)(w ? w->type():-1),
-               e.state, e.button, e.x_root, e.y_root, e.time);*/
-    if (w) {
-      Openbox::instance->bindings()->fire(MouseDoubleClick, w->type(),
-                                          e.window, e.state, e.button,
-                                          e.x_root, e.y_root, e.time);
-    } else
-      assert(false); // why isnt there a type?
+    data->action = MouseDoubleClick;
+    Openbox::instance->bindings()->fireButton(data);
     
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
@@ -144,6 +133,8 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
     _release.button = e.button;
     _release.time = e.time;
   }
+
+  Py_DECREF((PyObject*)data);
 }
 
 
@@ -178,7 +169,9 @@ void OBActions::keyPressHandler(const XKeyEvent &e)
 //  OBWidget *w = dynamic_cast<OBWidget*>
 //    (Openbox::instance->findHandler(e.window));
 
-  Openbox::instance->bindings()->fire(e.state, e.keycode, e.time);
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  Openbox::instance->bindings()->fireKey(state, e.keycode, e.time);
 }
 
 
@@ -200,24 +193,20 @@ void OBActions::motionHandler(const XMotionEvent &e)
     }
   }
 
-  _dx = x_root - _posqueue[0]->pos.x(); _posqueue[0]->pos.setX(x_root);
-  _dy = y_root - _posqueue[0]->pos.y(); _posqueue[0]->pos.setY(y_root);
-  
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
-
-  // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
-  //      maybe that should all be done via python tho.. (or radial menus!)
-  // run the simple MOTION python hook for now...
-/*  doCallback(Action_MouseMotion, e.window,
-             (OBWidget::WidgetType)(w ? w->type():-1),
-             e.state, (unsigned)-1, x_root, y_root, e.time);*/
-  if (w) {
-    Openbox::instance->bindings()->fire(MouseMotion, w->type(), e.window,
-                                        e.state, _posqueue[0]->button,
-                                        _dx, _dy, e.time);
-  } else
-    assert(false); // why isnt there a type?
+  assert(w); // everything should be a widget
+
+  // run the MOTION python hook
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  unsigned int button = _posqueue[0]->button;
+  MotionData *data = new_motion_data(e.window, e.time, state, button,
+                                     w->mcontext(), MouseMotion,
+                                     x_root, y_root, _posqueue[0]->pos,
+                                     _posqueue[0]->clientarea);
+  Openbox::instance->bindings()->fireButton((ButtonData*)data);
+  Py_DECREF((PyObject*)data);
 }
 
 void OBActions::mapRequestHandler(const XMapRequestEvent &e)