X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=0dbe46405128135b5cb874299242ecc88c190333;hb=c645416035d64cc959d1dd0e937b31b07489e54b;hp=6043ad0e6921a2f8ddf086eda167ebd9f25a9d8a;hpb=90ae66cc44a93ab1419821944c258e72d1e4b559;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 6043ad0e..0dbe4640 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -5,6 +5,11 @@
 #endif
 
 #include "actions.hh"
+#include "widget.hh"
+#include "openbox.hh"
+#include "client.hh"
+#include "python.hh"
+#include "otk/display.hh"
 
 #include <stdio.h>
 
@@ -13,9 +18,8 @@ namespace ob {
 const unsigned int OBActions::DOUBLECLICKDELAY = 300;
 
 OBActions::OBActions()
-  : _button(0), _enter_win(0)
+  : _button(0)
 {
-
   // XXX: load a configuration out of somewhere
 
 }
@@ -28,9 +32,15 @@ OBActions::~OBActions()
 
 void OBActions::buttonPressHandler(const XButtonEvent &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);
+  OtkEventHandler::buttonPressHandler(e);
+  
+  // run the PRESS guile 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);
     
   if (_button) return; // won't count toward CLICK events
 
@@ -40,9 +50,15 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
 
 void OBActions::buttonReleaseHandler(const XButtonEvent &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);
+  OtkEventHandler::buttonReleaseHandler(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);
 
   // not for the button we're watching?
   if (_button != e.button) return;
@@ -58,16 +74,18 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
         e.x < attr.width && e.y < attr.height))
     return;
 
-  // XXX: run the CLICK guile hook
-  printf("GUILE: CLICK: win %lx modifiers %u button %u time %lx\n",
-         (long)e.window, e.state, e.button, e.time);
+  // run the CLICK guile hook
+  python_callback(Action_Click, e.window,
+                  (OBWidget::WidgetType)(w ? w->type():-1),
+                  e.state, e.button, e.time);
 
   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);
+    // run the DOUBLECLICK guile hook
+    python_callback(Action_DoubleClick, e.window,
+                  (OBWidget::WidgetType)(w ? w->type():-1),
+                  e.state, e.button, e.time);
 
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
@@ -82,41 +100,72 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
 }
 
 
-void OBActions::enter(Window win, unsigned int modifiers)
+void OBActions::enterHandler(const XCrossingEvent &e)
 {
-  _enter_win = win;
-
-  (void)modifiers;
-  // XXX: run the ENTER guile hook
-  printf("GUILE: ENTER: win %lx modifiers %u\n", (long)win, modifiers);
+  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);
 }
 
 
-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;
+  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);
 }
 
 
-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;
+  OBWidget *w = dynamic_cast<OBWidget*>
+    (Openbox::instance->findHandler(e.window));
 
-  // XXX: some guile shit...
+  // run the KEY guile hook
+  python_callback(Action_KeyPress, e.window,
+                  (OBWidget::WidgetType)(w ? w->type():-1),
+                  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
+
+  int x_root = e.x_root, y_root = e.y_root;
+  
+  // compress changes to a window into a single change
+  XEvent ce;
+  while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) {
+    if (ce.xmotion.window != e.window) {
+      XPutBackEvent(otk::OBDisplay::display, &ce);
+      break;
+    } else {
+      x_root = e.x_root;
+      y_root = e.y_root;
+    }
+  }
+
+
+  OBWidget *w = dynamic_cast<OBWidget*>
+    (Openbox::instance->findHandler(e.window));
 
-  // XXX: some guile shit...
+  // 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);
 }