split up widget and basewidget

[chaz/openbox] / src / actions.cc

diff --git a/src/actions.cc b/src/actions.cc
index d8162a50572d1dfd4c693c0c2ad00cfcc217677c..b83b521dd1794f6b96a0efe2cad72a0b4f77dd3a 100644 (file)
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -5,18 +5,20 @@
 #endif
 
 #include "actions.hh"
+#include "otk/display.hh"
 
 #include <stdio.h>
 
 namespace ob {
 
 const unsigned int OBActions::DOUBLECLICKDELAY = 300;
+const int OBActions::BUTTONS;
 
 OBActions::OBActions()
-  : _button(0), _enter_win(0)
+  : _button(0)
 {
-  for (int i = 0; i < 2; ++i)
-    _presses[i] = new MousePressAction();
+  for (int i=0; i<BUTTONS; ++i)
+    _posqueue[i] = new ButtonPressAction();
 
   // XXX: load a configuration out of somewhere
 
@@ -25,22 +27,41 @@ OBActions::OBActions()
 
 OBActions::~OBActions()
 {
+  for (int i=0; i<BUTTONS; ++i)
+    delete _posqueue[i];
 }
 
 
-void OBActions::insertPress(Window win, unsigned int button, Time time)
+void OBActions::insertPress(const XButtonEvent &e)
 {
-  MousePressAction *a = _presses[1];
-  _presses[1] = _presses[0];
-  _presses[0] = a;
-  a->win = win;
-  a->button = button;
-  a->time = time;
+  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, e.y);
 }
 
+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);
+  
   // XXX: run the PRESS guile hook
   printf("GUILE: PRESS: win %lx modifiers %u button %u time %lx\n",
          (long)e.window, e.state, e.button, e.time);
@@ -48,19 +69,20 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
   if (_button) return; // won't count toward CLICK events
 
   _button = e.button;
-
-  insertPress(e.window, e.button, e.time);
 }
   
 
 void OBActions::buttonReleaseHandler(const XButtonEvent &e)
 {
+  OtkEventHandler::buttonReleaseHandler(e);
+  removePress(e);
+  
   // XXX: run the RELEASE guile hook
   printf("GUILE: RELEASE: win %lx modifiers %u button %u time %lx\n",
          (long)e.window, e.state, e.button, e.time);
 
   // not for the button we're watching?
-  if (_button && _button != e.button) return;
+  if (_button != e.button) return;
 
   _button = 0;
 
@@ -77,53 +99,60 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
   printf("GUILE: CLICK: win %lx modifiers %u button %u time %lx\n",
          (long)e.window, e.state, e.button, e.time);
 
-  if (_presses[0]->win == _presses[1]->win &&
-      _presses[0]->button == _presses[1]->button &&
-      e.time - _presses[1]->time < DOUBLECLICKDELAY) {
+  if (e.time - _release.time < DOUBLECLICKDELAY &&
+      _release.win == e.window && _release.button == e.button) {
 
     // XXX: run the DOUBLECLICK guile hook
     printf("GUILE: DOUBLECLICK: win %lx modifiers %u button %u time %lx\n",
            (long)e.window, e.state, e.button, e.time);
 
+    // reset so you cant triple click for 2 doubleclicks
+    _release.win = 0;
+    _release.button = 0;
+    _release.time = 0;
+  } else {
+    // save the button release, might be part of a double click
+    _release.win = e.window;
+    _release.button = e.button;
+    _release.time = e.time;
   }
 }
 
 
-void OBActions::enter(Window win, unsigned int modifiers)
+void OBActions::enterHandler(const XCrossingEvent &e)
 {
-  _enter_win = win;
-
-  (void)modifiers;
+  OtkEventHandler::enterHandler(e);
+  
   // XXX: run the ENTER guile hook
-  printf("GUILE: ENTER: win %lx modifiers %u\n", (long)win, modifiers);
-
+  printf("GUILE: ENTER: win %lx modifiers %u\n", (long)e.window, e.state);
 }
 
 
-void OBActions::leave(unsigned int modifiers)
+void OBActions::leaveHandler(const XCrossingEvent &e)
 {
-  (void)modifiers;
-  // XXX: run the LEAVE guile hook
-  printf("GUILE: LEAVE: win %lx modifiers %u\n", (long)_enter_win, modifiers);
+  OtkEventHandler::leaveHandler(e);
 
-  _enter_win = 0;
+  // XXX: run the LEAVE guile hook
+  printf("GUILE: LEAVE: win %lx modifiers %u\n", (long)e.window, e.state);
 }
 
 
-void OBActions::drag(Window win, otk::Point delta, unsigned int modifiers,
-                     unsigned int button, Time time)
+void OBActions::keyPressHandler(const XKeyEvent &e)
 {
-  (void)win;(void)delta;(void)modifiers;(void)button;(void)time;
-
-  // XXX: some guile shit...
+  // XXX: run the KEY guile hook
+  printf("GUILE: KEY: win %lx modifiers %u keycode %u\n",
+         (long)e.window, e.state, e.keycode);
 }
 
 
-void OBActions::key(Window win, unsigned int modifiers, unsigned int keycode)
+void OBActions::motionHandler(const XMotionEvent &e)
 {
-  (void)win;(void)modifiers;(void)keycode;
+  if (!e.same_screen) return; // this just gets stupid
 
-  // XXX: some guile shit...
+  // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
+  printf("GUILE: MOTION: win %lx modifiers %u x %d y %d\n",
+         (long)e.window, e.state,
+         e.x - _posqueue[0]->pos.x(), e.y - _posqueue[0]->pos.y());
 }