X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=bb5088e92447e23d9b1da283e90e1f835247a51a;hb=74cfb1b4c115cdb4e05aa823b09d2b5ea9d0d690;hp=e2999b768360776d8d7ac7f599eadf6ab8f7ca94;hpb=91c7e5c378b1a639c6f5383915ed68b36b7735d4;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index e2999b76..bb5088e9 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -5,9 +5,9 @@
 #endif
 
 #include "actions.hh"
-#include "widgetbase.hh"
 #include "openbox.hh"
 #include "client.hh"
+#include "frame.hh"
 #include "screen.hh"
 #include "python.hh"
 #include "bindings.hh"
@@ -45,7 +45,7 @@ void Actions::insertPress(const XButtonEvent &e)
   }
   _posqueue[0] = a;
   a->button = e.button;
-  a->pos.setPoint(e.x_root, e.y_root);
+  a->pos = otk::Point(e.x_root, e.y_root);
 
   Client *c = openbox->findClient(e.window);
   if (c) a->clientarea = c->area();
@@ -72,12 +72,20 @@ void Actions::buttonPressHandler(const XButtonEvent &e)
 {
   otk::EventHandler::buttonPressHandler(e);
   insertPress(e);
-  
-  // run the PRESS python hook
-  WidgetBase *w = dynamic_cast<WidgetBase*>
-    (openbox->findHandler(e.window));
-  if (!w) return;
 
+  MouseContext::MC context;
+  EventHandler *h = openbox->findHandler(e.window);
+  Frame *f = dynamic_cast<Frame*>(h);
+  if (f)
+    context= f->mouseContext(e.window);
+  else if (dynamic_cast<Client*>(h))
+    context = MouseContext::Window;
+  else if (dynamic_cast<Screen*>(h))
+    context = MouseContext::Root;
+  else
+    return; // not a valid mouse context
+
+  // run the PRESS python hook
   // kill off the Button1Mask etc, only want the modifiers
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
@@ -87,15 +95,15 @@ void Actions::buttonPressHandler(const XButtonEvent &e)
     screen = c->screen();
   else
     screen = otk::display->findScreen(e.root)->screen();
-  MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
-                 MousePress);
+  MouseData data(screen, c, e.time, state, e.button, context,
+                 MouseAction::Press);
   openbox->bindings()->fireButton(&data);
     
   if (_button) return; // won't count toward CLICK events
 
   _button = e.button;
 
-  if (w->mcontext() == MC_Window) {
+  if (context == MouseContext::Window) {
     /*
       Because of how events are grabbed on the client window, we can't get
       ButtonRelease events, so instead we simply manufacture them here, so that
@@ -113,9 +121,31 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
   otk::EventHandler::buttonReleaseHandler(e);
   removePress(e);
   
-  WidgetBase *w = dynamic_cast<WidgetBase*>
-    (openbox->findHandler(e.window));
-  if (!w) return;
+  MouseContext::MC context;
+  EventHandler *h = openbox->findHandler(e.window);
+  Frame *f = dynamic_cast<Frame*>(h);
+  if (f)
+    context= f->mouseContext(e.window);
+  else if (dynamic_cast<Client*>(h))
+    context = MouseContext::Window;
+  else if (dynamic_cast<Screen*>(h))
+    context = MouseContext::Root;
+  else
+    return; // not a valid mouse context
+
+  // run the RELEASE python hook
+  // kill off the Button1Mask etc, only want the modifiers
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  int screen;
+  Client *c = openbox->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::display->findScreen(e.root)->screen();
+  MouseData data(screen, c, e.time, state, e.button, context,
+                 MouseAction::Release);
+  openbox->bindings()->fireButton(&data);
 
   // not for the button we're watching?
   if (_button != e.button) return;
@@ -133,30 +163,20 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
     return;
 
   // run the CLICK python hook
-  // kill off the Button1Mask etc, only want the modifiers
-  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
-                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
-  int screen;
-  Client *c = openbox->findClient(e.window);
-  if (c)
-    screen = c->screen();
-  else
-    screen = otk::display->findScreen(e.root)->screen();
-  MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
-                 MouseClick);
+  data.action = MouseAction::Click;
   openbox->bindings()->fireButton(&data);
     
 
   // XXX: dont load this every time!!@*
   long dblclick;
-  if (!python_get_long("double_click_delay", &dblclick))
+  if (!python_get_long("DOUBLE_CLICK_DELAY", &dblclick))
     dblclick = 300;
 
   if (e.time - _release.time < (unsigned)dblclick &&
       _release.win == e.window && _release.button == e.button) {
 
     // run the DOUBLECLICK python hook
-    data.action = MouseDoubleClick;
+    data.action = MouseAction::DoubleClick;
     openbox->bindings()->fireButton(&data);
     
     // reset so you cant triple click for 2 doubleclicks
@@ -183,7 +203,7 @@ void Actions::enterHandler(const XCrossingEvent &e)
     screen = c->screen();
   else
     screen = otk::display->findScreen(e.root)->screen();
-  EventData data(screen, c, EventEnterWindow, e.state);
+  EventData data(screen, c, EventAction::EnterWindow, e.state);
   openbox->bindings()->fireEvent(&data);
 }
 
@@ -199,14 +219,13 @@ void Actions::leaveHandler(const XCrossingEvent &e)
     screen = c->screen();
   else
     screen = otk::display->findScreen(e.root)->screen();
-  EventData data(screen, c, EventLeaveWindow, e.state);
+  EventData data(screen, c, EventAction::LeaveWindow, e.state);
   openbox->bindings()->fireEvent(&data);
 }
 
 
 void Actions::keyPressHandler(const XKeyEvent &e)
 {
-  printf("press\n");
   otk::EventHandler::keyPressHandler(e);
 
   // kill off the Button1Mask etc, only want the modifiers
@@ -214,13 +233,12 @@ void Actions::keyPressHandler(const XKeyEvent &e)
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
   openbox->bindings()->
     fireKey(otk::display->findScreen(e.root)->screen(),
-            state, e.keycode, e.time, EventKeyPress);
+            state, e.keycode, e.time, KeyAction::Press);
 }
 
 
 void Actions::keyReleaseHandler(const XKeyEvent &e)
 {
-  printf("release\n");
   otk::EventHandler::keyReleaseHandler(e);
 
   // kill off the Button1Mask etc, only want the modifiers
@@ -228,7 +246,7 @@ void Actions::keyReleaseHandler(const XKeyEvent &e)
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
 
   // remove from the state the mask of the modifier being released, if it is
-  // a modifier key being released (XXX this is a little ugly..)
+  // a modifier key being released (this is a little ugly..)
   const XModifierKeymap *map = otk::display->modifierMap();
   const int mask_table[] = {
     ShiftMask, LockMask, ControlMask, Mod1Mask,
@@ -248,7 +266,7 @@ void Actions::keyReleaseHandler(const XKeyEvent &e)
   
   openbox->bindings()->
     fireKey(otk::display->findScreen(e.root)->screen(),
-            state, e.keycode, e.time, EventKeyRelease);
+            state, e.keycode, e.time, KeyAction::Release);
 }
 
 
@@ -258,30 +276,33 @@ void Actions::motionHandler(const XMotionEvent &e)
 
   if (!e.same_screen) return; // this just gets stupid
 
+  MouseContext::MC context;
+  EventHandler *h = openbox->findHandler(e.window);
+  Frame *f = dynamic_cast<Frame*>(h);
+  if (f)
+    context= f->mouseContext(e.window);
+  else if (dynamic_cast<Client*>(h))
+    context = MouseContext::Window;
+  else if (dynamic_cast<Screen*>(h))
+    context = MouseContext::Root;
+  else
+    return; // not a valid mouse context
+
   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::display, e.type, &ce)) {
-    if (ce.xmotion.window != e.window) {
-      XPutBackEvent(**otk::display, &ce);
-      break;
-    } else {
-      x_root = e.x_root;
-      y_root = e.y_root;
-    }
+  while (XCheckTypedWindowEvent(**otk::display, e.window, e.type, &ce)) {
+    x_root = e.x_root;
+    y_root = e.y_root;
   }
 
-  WidgetBase *w = dynamic_cast<WidgetBase*>
-    (openbox->findHandler(e.window));
-  if (!w) return;
-
   if (!_dragging) {
     long threshold;
     int dx = x_root - _posqueue[0]->pos.x();
     int dy = y_root - _posqueue[0]->pos.y();
     // XXX: dont get this from python every time!
-    if (!python_get_long("drag_threshold", &threshold))
+    if (!python_get_long("DRAG_THRESHOLD", &threshold))
       threshold = 0;
     if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
       return; // not at the threshold yet
@@ -301,8 +322,9 @@ void Actions::motionHandler(const XMotionEvent &e)
     screen = c->screen();
   else
     screen = otk::display->findScreen(e.root)->screen();
-  MouseData data(screen, c, e.time, state, button, w->mcontext(), MouseMotion,
-                 x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea);
+  MouseData data(screen, c, e.time, state, button, context,
+                 MouseAction::Motion, x_root, y_root,
+                 _posqueue[0]->pos, _posqueue[0]->clientarea);
   openbox->bindings()->fireButton(&data);
 }
 
@@ -322,7 +344,7 @@ void Actions::xkbHandler(const XkbEvent &e)
       screen = c->screen();
     else
       screen = openbox->focusedScreen()->number();
-    EventData data(screen, c, EventBell, 0);
+    EventData data(screen, c, EventAction::Bell, 0);
     openbox->bindings()->fireEvent(&data);
     break;
   }