X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=716b033bfbbaf122af7d685fc922541f0e804cac;hb=40f3dfbaadef7e5b008d320ab92d47dbb63db1a9;hp=d2b4ceef34344e95960e1129a5a435c43af234ef;hpb=3827c1a76e27865a9e2cc9da43c42399ea354e18;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index d2b4ceef..716b033b 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"
@@ -16,14 +16,10 @@
 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
 
 }
@@ -31,55 +27,20 @@ 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_root, e.y_root);
-
-  OBClient *c = Openbox::instance->findClient(e.window);
-  // if it's not defined, they should have clicked on the root window, so this
-  // area would be meaningless anyways
-  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);
   
-  // XXX: run the PRESS guile hook
+  // run the PRESS guile hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  printf("GUILE: PRESS: win %lx type %d modifiers %u button %u time %lx\n",
-         (long)e.window, (w ? w->type():-1), e.state, e.button, e.time);
   python_callback(Action_ButtonPress, e.window,
                   (OBWidget::WidgetType)(w ? w->type():-1),
-                  e.state, e.button, e.time);
+                  e.state, e.button, e.x_root, e.y_root, e.time);
     
   if (_button) return; // won't count toward CLICK events
 
@@ -90,14 +51,14 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
 void OBActions::buttonReleaseHandler(const XButtonEvent &e)
 {
   OtkEventHandler::buttonReleaseHandler(e);
-  removePress(e);
   
-  // XXX: run the RELEASE guile hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  printf("GUILE: RELEASE: win %lx type %d, modifiers %u button %u time %lx\n",
-         (long)e.window, (w ? w->type():-1), e.state, e.button, e.time);
+  // 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;
@@ -113,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 type %d modifiers %u button %u time %lx\n",
-         (long)e.window, (w ? w->type():-1), 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 type %d modifiers %u button %u time %lx\n",
-           (long)e.window, (w ? w->type():-1), 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;
@@ -141,12 +104,12 @@ void OBActions::enterHandler(const XCrossingEvent &e)
 {
   OtkEventHandler::enterHandler(e);
   
-  // XXX: run the ENTER guile hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  printf("GUILE: ENTER: win %lx type %d modifiers %u\n",
-         (long)e.window, (w ? w->type():-1), e.state);
+  // run the ENTER guile hook
+  python_callback(Action_EnterWindow, e.window,
+                  (OBWidget::WidgetType)(w ? w->type():-1), e.state);
 }
 
 
@@ -154,23 +117,24 @@ void OBActions::leaveHandler(const XCrossingEvent &e)
 {
   OtkEventHandler::leaveHandler(e);
 
-  // XXX: run the LEAVE guile hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  printf("GUILE: LEAVE: win %lx type %d modifiers %u\n",
-         (long)e.window, (w ? w->type():-1), e.state);
+  // run the LEAVE guile hook
+  python_callback(Action_LeaveWindow, e.window,
+                  (OBWidget::WidgetType)(w ? w->type():-1), e.state);
 }
 
 
 void OBActions::keyPressHandler(const XKeyEvent &e)
 {
-  // XXX: run the KEY guile hook
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  printf("GUILE: KEY: win %lx type %d modifiers %u keycode %u\n",
-         (long)e.window, (w ? w->type():-1), e.state, e.keycode);
+  // run the KEY guile hook
+  python_callback(Action_KeyPress, e.window,
+                  (OBWidget::WidgetType)(w ? w->type():-1),
+                  e.state, e.keycode);
 }
 
 
@@ -196,35 +160,12 @@ void OBActions::motionHandler(const XMotionEvent &e)
   OBWidget *w = dynamic_cast<OBWidget*>
     (Openbox::instance->findHandler(e.window));
 
-  _dx = x_root - _posqueue[0]->pos.x();
-  _dy = y_root - _posqueue[0]->pos.y();
-  
   // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
-  printf("GUILE: MOTION: win %lx type %d  modifiers %u x %d y %d\n",
-         (long)e.window, (w ? w->type():-1), e.state, _dx, _dy);
-
-  OBClient *c = Openbox::instance->findClient(e.window);
-  if (w && c) {
-    switch (w->type()) {
-    case OBWidget::Type_Titlebar:
-    case OBWidget::Type_Label:
-      c->move(_posqueue[0]->clientarea.x() + _dx,
-              _posqueue[0]->clientarea.y() + _dy);
-      break;
-    case OBWidget::Type_LeftGrip:
-      c->resize(OBClient::TopRight,
-                _posqueue[0]->clientarea.width() - _dx,
-                _posqueue[0]->clientarea.height() + _dy);
-      break;
-    case OBWidget::Type_RightGrip:
-      c->resize(OBClient::TopLeft,
-                _posqueue[0]->clientarea.width() + _dx,
-                _posqueue[0]->clientarea.height() + _dy);
-      break;
-    default:
-      break;
-    }
-  }
+  //      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);
 }