X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=b83b521dd1794f6b96a0efe2cad72a0b4f77dd3a;hb=301adc8bc20dff10093f3c0df44e30acbbddab67;hp=ec70b5b40c7e0acbd10c3765643a9549118640d0;hpb=73f7a0bd69607663050f02acf121f40a739d9619;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index ec70b5b4..b83b521d 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -5,16 +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)
 {
+  for (int i=0; i<BUTTONS; ++i)
+    _posqueue[i] = new ButtonPressAction();
 
   // XXX: load a configuration out of somewhere
 
@@ -23,12 +27,40 @@ OBActions::OBActions()
 
 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, 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",
@@ -43,6 +75,7 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
 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",
@@ -104,20 +137,22 @@ void OBActions::leaveHandler(const XCrossingEvent &e)
 }
 
 
-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());
 }