X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=1d4a5bb691a3ce4cbe4fbaef8dd62da6277a04fa;hb=40449e199dfeab57e8d147e07989aef339a7da59;hp=0dbe46405128135b5cb874299242ecc88c190333;hpb=b34824a4e2ddc0247099fa1b3952de426bfde05b;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 0dbe4640..1d4a5bb6 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef HAVE_CONFIG_H
 # include "../config.h"
@@ -9,38 +9,75 @@
 #include "openbox.hh"
 #include "client.hh"
 #include "python.hh"
+#include "bindings.hh"
 #include "otk/display.hh"
 
 #include <stdio.h>
 
 namespace ob {
 
-const unsigned int OBActions::DOUBLECLICKDELAY = 300;
+const int OBActions::BUTTONS;
 
 OBActions::OBActions()
   : _button(0)
 {
-  // XXX: load a configuration out of somewhere
-
+  for (int i=0; i<BUTTONS; ++i)
+    _posqueue[i] = new ButtonPressAction();
 }
 
 
 OBActions::~OBActions()
 {
+  for (int i=0; i<BUTTONS; ++i)
+    delete _posqueue[i];
+}
+
+
+void OBActions::insertPress(const XButtonEvent &e)
+{
+  ButtonPressAction *a = _posqueue[BUTTONS - 1];
+  for (int i=BUTTONS-1; i>0;)
+    _posqueue[i] = _posqueue[--i];
+  _posqueue[0] = a;
+  a->button = e.button;
+  a->pos.setPoint(e.x_root, e.y_root);
+
+  OBClient *c = Openbox::instance->findClient(e.window);
+  if (c) a->clientarea = c->area();
 }
 
+void OBActions::removePress(const XButtonEvent &e)
+{
+  ButtonPressAction *a = 0;
+  for (int i=0; i<BUTTONS; ++i) {
+    if (_posqueue[i]->button == e.button)
+      a = _posqueue[i];
+    if (a) // found one and removed it
+      _posqueue[i] = _posqueue[i+1];
+  }
+  if (a) { // found one
+    _posqueue[BUTTONS-1] = a;
+    a->button = 0;
+  }
+}
 
 void OBActions::buttonPressHandler(const XButtonEvent &e)
 {
   OtkEventHandler::buttonPressHandler(e);
+  insertPress(e);
   
-  // run the PRESS guile hook
+  // run the PRESS python hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
-
-  python_callback(Action_ButtonPress, e.window,
-                  (OBWidget::WidgetType)(w ? w->type():-1),
-                  e.state, e.button, e.x_root, e.y_root, e.time);
+  assert(w); // everything should be a widget
+
+  // kill off the Button1Mask etc, only want the modifiers
+  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
 
@@ -51,14 +88,11 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
 void OBActions::buttonReleaseHandler(const XButtonEvent &e)
 {
   OtkEventHandler::buttonReleaseHandler(e);
+  removePress(e);
   
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
-
-  // run the RELEASE guile hook
-  python_callback(Action_ButtonRelease, e.window,
-                  (OBWidget::WidgetType)(w ? w->type():-1),
-                  e.state, e.button, e.x_root, e.y_root, e.time);
+  assert(w); // everything should be a widget
 
   // not for the button we're watching?
   if (_button != e.button) return;
@@ -74,19 +108,27 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
         e.x < attr.width && e.y < attr.height))
     return;
 
-  // run the CLICK guile hook
-  python_callback(Action_Click, e.window,
-                  (OBWidget::WidgetType)(w ? w->type():-1),
-                  e.state, e.button, e.time);
+  // run the CLICK python hook
+  // kill off the Button1Mask etc, only want the modifiers
+  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) {
+  // XXX: dont load this every time!!@*
+  long dblclick;
+  if (!python_get_long("double_click_delay", &dblclick))
+    dblclick = 300;
 
-    // run the DOUBLECLICK guile hook
-    python_callback(Action_DoubleClick, e.window,
-                  (OBWidget::WidgetType)(w ? w->type():-1),
-                  e.state, e.button, e.time);
+  if (e.time - _release.time < (unsigned)dblclick &&
+      _release.win == e.window && _release.button == e.button) {
 
+    // run the DOUBLECLICK python hook
+    data->action = MouseDoubleClick;
+    Openbox::instance->bindings()->fireButton(data);
+    
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
     _release.button = 0;
@@ -97,6 +139,8 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
     _release.button = e.button;
     _release.time = e.time;
   }
+
+  Py_DECREF((PyObject*)data);
 }
 
 
@@ -104,12 +148,10 @@ void OBActions::enterHandler(const XCrossingEvent &e)
 {
   OtkEventHandler::enterHandler(e);
   
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
-
-  // run the ENTER guile hook
-  python_callback(Action_EnterWindow, e.window,
-                  (OBWidget::WidgetType)(w ? w->type():-1), e.state);
+  // run the ENTER python hook
+  EventData *data = new_event_data(e.window, EventEnterWindow, e.state);
+  Openbox::instance->bindings()->fireEvent(data);
+  Py_DECREF((PyObject*)data);
 }
 
 
@@ -117,29 +159,28 @@ void OBActions::leaveHandler(const XCrossingEvent &e)
 {
   OtkEventHandler::leaveHandler(e);
 
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
-
-  // run the LEAVE guile hook
-  python_callback(Action_LeaveWindow, e.window,
-                  (OBWidget::WidgetType)(w ? w->type():-1), e.state);
+  // run the LEAVE python hook
+  EventData *data = new_event_data(e.window, EventLeaveWindow, e.state);
+  Openbox::instance->bindings()->fireEvent(data);
+  Py_DECREF((PyObject*)data);
 }
 
 
 void OBActions::keyPressHandler(const XKeyEvent &e)
 {
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
+  OtkEventHandler::keyPressHandler(e);
 
-  // run the KEY guile hook
-  python_callback(Action_KeyPress, e.window,
-                  (OBWidget::WidgetType)(w ? w->type():-1),
-                  e.state, e.keycode);
+  // kill off the Button1Mask etc, only want the modifiers
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  Openbox::instance->bindings()->fireKey(state, e.keycode, e.time);
 }
 
 
 void OBActions::motionHandler(const XMotionEvent &e)
 {
+  OtkEventHandler::motionHandler(e);
+
   if (!e.same_screen) return; // this just gets stupid
 
   int x_root = e.x_root, y_root = e.y_root;
@@ -156,17 +197,39 @@ void OBActions::motionHandler(const XMotionEvent &e)
     }
   }
 
-
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
+  assert(w); // everything should be a widget
+
+  // run the MOTION python hook
+  // kill off the Button1Mask etc, only want the modifiers
+  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)
+{
+  OtkEventHandler::mapRequestHandler(e);
+  // do this in OBScreen::manageWindow
+}
 
-  // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
-  //      maybe that should all be done via python tho..
-  // run the simple MOTION guile hook for now...
-  python_callback(Action_MouseMotion, e.window,
-                  (OBWidget::WidgetType)(w ? w->type():-1),
-                  e.state, e.x_root, e.y_root, e.time);
+void OBActions::unmapHandler(const XUnmapEvent &e)
+{
+  OtkEventHandler::unmapHandler(e);
+  // do this in OBScreen::unmanageWindow
 }
 
+void OBActions::destroyHandler(const XDestroyWindowEvent &e)
+{
+  OtkEventHandler::destroyHandler(e);
+  // do this in OBScreen::unmanageWindow
+}
 
 }