merge the C branch into HEAD

[chaz/openbox] / src / actions.cc

diff --git a/src/actions.cc b/src/actions.cc
index 1213f21ef40a1293948f3e9f65159651e8c81caf..36b4f111acb72ddf7133115ce61411c7cede0c0d 100644 (file)
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -16,63 +16,20 @@
 
 namespace ob {
 
-const int Actions::BUTTONS;
-
 Actions::Actions()
-  : _button(0),
-    _dragging(false)
+  : _dragging(false)
 {
-  for (int i=0; i<BUTTONS; ++i)
-    _posqueue[i] = new ButtonPressAction();
 }
 
 
 Actions::~Actions()
 {
-  for (int i=0; i<BUTTONS; ++i)
-    delete _posqueue[i];
 }
 
 
-void Actions::insertPress(const XButtonEvent &e)
-{
-  ButtonPressAction *a = _posqueue[BUTTONS - 1];
-  // rm'd the last one, shift them all down one
-  for (int i = BUTTONS-1; i > 0; --i) {
-    _posqueue[i] = _posqueue[i-1];
-  }
-  _posqueue[0] = a;
-  a->win = e.window;
-  a->button = e.button;
-  a->pos = otk::Point(e.x_root, e.y_root);
-
-  Client *c = openbox->findClient(e.window);
-  if (c) a->clientarea = c->area();
-}
-
-void Actions::removePress(const XButtonEvent &e)
-{
-  int i;
-  ButtonPressAction *a = 0;
-  for (i=0; i<BUTTONS-1; ++i)
-    if (_posqueue[i]->button == e.button) {
-      a = _posqueue[i];
-      break;
-    }
-  if (a) { // found one, remove it and shift the rest up one
-    for (; i < BUTTONS-1; ++i)
-      _posqueue[i] = _posqueue[i+1];
-    _posqueue[BUTTONS-1] = a;
-  }
-  _posqueue[BUTTONS-1]->button = 0;
-}
-
 void Actions::buttonPressHandler(const XButtonEvent &e)
 {
   otk::EventHandler::buttonPressHandler(e);
-  insertPress(e);
-
-  printf("press queue %u pressed %u\n", _button, e.button);
 
   MouseContext::MC context;
   EventHandler *h = openbox->findHandler(e.window);
@@ -86,6 +43,22 @@ void Actions::buttonPressHandler(const XButtonEvent &e)
   else
     return; // not a valid mouse context
 
+  if (_press.button) {
+    unsigned int mask;
+    switch(_press.button) {
+    case Button1: mask = Button1Mask; break;
+    case Button2: mask = Button2Mask; break;
+    case Button3: mask = Button3Mask; break;
+    case Button4: mask = Button4Mask; break;
+    case Button5: mask = Button5Mask; break;
+    default: mask = 0; // on other buttons we have to assume its not pressed...
+    }
+    // was the button released but we didnt get the event? (pointergrabs cause
+    // this)
+    if (!(e.state & mask))
+      _press.button = 0;
+  }
+  
   // run the PRESS python hook
   // kill off the Button1Mask etc, only want the modifiers
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
@@ -100,9 +73,15 @@ void Actions::buttonPressHandler(const XButtonEvent &e)
                  MouseAction::Press);
   openbox->bindings()->fireButton(&data);
     
-  if (_button) return; // won't count toward CLICK events
+  if (_press.button) return; // won't count toward CLICK events
+
+  _press.win = e.window;
+  _press.button = e.button;
+  _press.pos = otk::Point(e.x_root, e.y_root);
+  if (c)
+    _press.clientarea = c->area();
 
-  _button = e.button;
+  printf("press queue %u pressed %u\n", _press.button, e.button);
 
   if (context == MouseContext::Window) {
     /*
@@ -120,7 +99,6 @@ void Actions::buttonPressHandler(const XButtonEvent &e)
 void Actions::buttonReleaseHandler(const XButtonEvent &e)
 {
   otk::EventHandler::buttonReleaseHandler(e);
-  removePress(e);
   
   MouseContext::MC context;
   EventHandler *h = openbox->findHandler(e.window);
@@ -149,9 +127,9 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
   openbox->bindings()->fireButton(&data);
 
   // not for the button we're watching?
-  if (_button != e.button) return;
+  if (_press.button != e.button) return;
 
-  _button = 0;
+  _press.button = 0;
   _dragging = false;
 
   // find the area of the window
@@ -167,7 +145,8 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
   data.action = MouseAction::Click;
   openbox->bindings()->fireButton(&data);
     
-  long dblclick = openbox->screen(screen)->config().double_click_delay;
+  long dblclick = 0;
+  python_get_long("double_click_delay", &dblclick);
   if (e.time - _release.time < (unsigned)dblclick &&
       _release.win == e.window && _release.button == e.button) {
 
@@ -292,7 +271,7 @@ void Actions::motionHandler(const XMotionEvent &e)
 
   if (!e.same_screen) return; // this just gets stupid
 
-  if (e.window != _posqueue[0]->win) return;
+  if (e.window != _press.win) return;
   
   MouseContext::MC context;
   EventHandler *h = openbox->findHandler(e.window);
@@ -311,8 +290,8 @@ void Actions::motionHandler(const XMotionEvent &e)
   // compress changes to a window into a single change
   XEvent ce;
   while (XCheckTypedWindowEvent(**otk::display, e.window, e.type, &ce)) {
-    x_root = e.x_root;
-    y_root = e.y_root;
+    x_root = ce.x_root;
+    y_root = ce.y_root;
   }
 
   int screen;
@@ -323,9 +302,10 @@ void Actions::motionHandler(const XMotionEvent &e)
     screen = otk::display->findScreen(e.root)->screen();
 
   if (!_dragging) {
-    int dx = x_root - _posqueue[0]->pos.x();
-    int dy = y_root - _posqueue[0]->pos.y();
-    long threshold = openbox->screen(screen)->config().drag_threshold;
+    int dx = x_root - _press.pos.x();
+    int dy = y_root - _press.pos.y();
+    long threshold = 0;
+    python_get_long("drag_threshold", &threshold);
     if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
       return; // not at the threshold yet
   }
@@ -337,10 +317,10 @@ void Actions::motionHandler(const XMotionEvent &e)
   // 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;
+  unsigned int button = _press.button;
   MouseData data(screen, c, e.time, state, button, context,
                  MouseAction::Motion, x_root, y_root,
-                 _posqueue[0]->pos, _posqueue[0]->clientarea);
+                 _press.pos, _press.clientarea);
   openbox->bindings()->fireButton(&data);
 }