X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=65546167da65e7082e04d75c0d9ea47aac510b6f;hb=4c5671eecae90077dd930bf36af3be9e13305985;hp=35f53db4719eb2004615e9f413f457085dbfff87;hpb=4f01802c8cd0e0efc26896cf80e69dd9b6c06ec1;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 35f53db4..65546167 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -1,129 +1,298 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef HAVE_CONFIG_H
 # include "../config.h"
 #endif
 
 #include "actions.hh"
+#include "widgetbase.hh"
+#include "openbox.hh"
+#include "client.hh"
+#include "screen.hh"
+#include "python.hh"
+#include "bindings.hh"
+#include "otk/display.hh"
 
 #include <stdio.h>
+#include <algorithm>
 
 namespace ob {
 
-const unsigned int OBActions::DOUBLECLICKDELAY;
+const int Actions::BUTTONS;
 
-OBActions::OBActions()
-  : _button(0), _enter_win(0)
+Actions::Actions()
+  : _button(0),
+    _dragging(false)
 {
-  _presses[0] = new MousePressAction();
-  _presses[1] = new MousePressAction();
-  _presses[2] = new MousePressAction();
-
-  // XXX: load a configuration out of somewhere
-
+  for (int i=0; i<BUTTONS; ++i)
+    _posqueue[i] = new ButtonPressAction();
 }
 
 
-OBActions::~OBActions()
+Actions::~Actions()
 {
+  for (int i=0; i<BUTTONS; ++i)
+    delete _posqueue[i];
 }
 
 
-void OBActions::insertPress(Window win, unsigned int button, Time time)
+void Actions::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];
+  // rm'd the last one, shift them all down one
+  for (int i = BUTTONS-1; i > 0; --i) {
+    _posqueue[i] = _posqueue[i-1];
+  }
+  _posqueue[0] = a;
+  a->button = e.button;
+  a->pos.setPoint(e.x_root, e.y_root);
+
+  Client *c = openbox->findClient(e.window);
+  if (c) a->clientarea = c->area();
 }
 
+void Actions::removePress(const XButtonEvent &e)
+{
+  int i;
+  ButtonPressAction *a = 0;
+  for (i=0; i<BUTTONS-1; ++i)
+    if (_posqueue[i]->button == e.button) {
+      a = _posqueue[i];
+      break;
+    }
+  if (a) { // found one, remove it and shift the rest up one
+    for (; i < BUTTONS-1; ++i)
+      _posqueue[i] = _posqueue[i+1];
+    _posqueue[BUTTONS-1] = a;
+  }
+  _posqueue[BUTTONS-1]->button = 0;
+}
 
-void OBActions::bpress(Window win, unsigned int modifiers, unsigned int button,
-                       Time time)
+void Actions::buttonPressHandler(const XButtonEvent &e)
 {
-  (void)modifiers;
-  // XXX: run the PRESS guile hook
-  printf("GUILE: PRESS: win %lx modifiers %ux button %ud time %lx",
-         (long)win, modifiers, button, time);
+  otk::EventHandler::buttonPressHandler(e);
+  insertPress(e);
+  
+  // run the PRESS python hook
+  WidgetBase *w = dynamic_cast<WidgetBase*>
+    (openbox->findHandler(e.window));
+  if (!w) return;
+
+  // 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(),
+                 MousePress);
+  openbox->bindings()->fireButton(&data);
     
   if (_button) return; // won't count toward CLICK events
 
-  _button = button;
-
-  insertPress(win, button, time);
+  _button = e.button;
+
+  if (w->mcontext() == MC_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
+      clicks/doubleclicks etc still work.
+    */
+    //XButtonEvent ev = e;
+    //ev.type = ButtonRelease;
+    buttonReleaseHandler(e);
+  }
 }
   
 
-void OBActions::brelease(Window win, const otk::Rect &area,
-                         const otk::Point &mpos, 
-                         unsigned int modifiers, unsigned int button,
-                         Time time)
+void Actions::buttonReleaseHandler(const XButtonEvent &e)
 {
-  (void)modifiers;
-  // XXX: run the RELEASE guile hook
-  printf("GUILE: RELEASE: win %lx modifiers %ux button %ud time %lx",
-         (long)win, modifiers, button, time);
+  otk::EventHandler::buttonReleaseHandler(e);
+  removePress(e);
+  
+  WidgetBase *w = dynamic_cast<WidgetBase*>
+    (openbox->findHandler(e.window));
+  if (!w) return;
 
-  if (_button && _button != button) return; // not for the button we're watchin
+  // not for the button we're watching?
+  if (_button != e.button) return;
 
   _button = 0;
+  _dragging = false;
+
+  // find the area of the window
+  XWindowAttributes attr;
+  if (!XGetWindowAttributes(**otk::display, e.window, &attr)) return;
+
+  // if not on the window any more, it isnt a CLICK
+  if (!(e.same_screen && e.x >= 0 && e.y >= 0 &&
+        e.x < attr.width && e.y < attr.height))
+    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);
+  openbox->bindings()->fireButton(&data);
+    
 
-  if (!area.contains(mpos)) return; // not on the window any more
-
-  // XXX: run the CLICK guile hook
-  printf("GUILE: CLICK: win %lx modifiers %ux button %ud time %lx",
-         (long)win, modifiers, button, time);
-
-  if (_presses[0]->win == _presses[1]->win &&
-      _presses[0]->button == _presses[1]->button &&
-      time - _presses[1]->time < DOUBLECLICKDELAY) {
+  // XXX: dont load this every time!!@*
+  long dblclick;
+  if (!python_get_long("double_click_delay", &dblclick))
+    dblclick = 300;
 
-    // XXX: run the DOUBLECLICK guile hook
-    printf("GUILE: DOUBLECLICK: win %lx modifiers %ux button %ud time %lx",
-           (long)win, modifiers, button, time);
+  if (e.time - _release.time < (unsigned)dblclick &&
+      _release.win == e.window && _release.button == e.button) {
 
+    // run the DOUBLECLICK python hook
+    data.action = MouseDoubleClick;
+    openbox->bindings()->fireButton(&data);
+    
+    // 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 Actions::enterHandler(const XCrossingEvent &e)
 {
-  _enter_win = win;
-
-  (void)modifiers;
-  // XXX: run the ENTER guile hook
-  printf("GUILE: ENTER: win %lx modifiers %ux", (long)win, modifiers);
-
+  otk::EventHandler::enterHandler(e);
+  
+  // run the ENTER python hook
+  int screen;
+  Client *c = openbox->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::display->findScreen(e.root)->screen();
+  EventData data(screen, c, EventEnterWindow, e.state);
+  openbox->bindings()->fireEvent(&data);
 }
 
 
-void OBActions::leave(unsigned int modifiers)
+void Actions::leaveHandler(const XCrossingEvent &e)
 {
-  (void)modifiers;
-  // XXX: run the LEAVE guile hook
-  printf("GUILE: LEAVE: win %lx modifiers %ux", (long)_enter_win, modifiers);
-
-  _enter_win = 0;
+  otk::EventHandler::leaveHandler(e);
+
+  // run the LEAVE python hook
+  int screen;
+  Client *c = openbox->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::display->findScreen(e.root)->screen();
+  EventData data(screen, c, EventLeaveWindow, e.state);
+  openbox->bindings()->fireEvent(&data);
 }
 
 
-void OBActions::drag(Window win, otk::Point delta, unsigned int modifiers,
-                     unsigned int button, Time time)
+void Actions::keyPressHandler(const XKeyEvent &e)
 {
-  (void)win;(void)delta;(void)modifiers;(void)button;(void)time;
-
-  // XXX: some guile shit...
+  otk::EventHandler::keyPressHandler(e);
+
+  // kill off the Button1Mask etc, only want the modifiers
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  openbox->bindings()->
+    fireKey(otk::display->findScreen(e.root)->screen(),
+            state, e.keycode, e.time);
 }
 
 
-void OBActions::key(Window win, unsigned int modifiers, unsigned int keycode)
+void Actions::motionHandler(const XMotionEvent &e)
 {
-  (void)win;(void)modifiers;(void)keycode;
+  otk::EventHandler::motionHandler(e);
+
+  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::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;
+    }
+  }
 
-  // XXX: some guile shit...
+  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))
+      threshold = 0;
+    if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
+      return; // not at the threshold yet
+  }
+  _dragging = true; // in a drag now
+  
+  // check if the movement is more than the threshold
+
+  // run the MOTION python hook
+  // kill off the Button1Mask etc, only want the modifiers
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  unsigned int button = _posqueue[0]->button;
+  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, button, w->mcontext(), MouseMotion,
+                 x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea);
+  openbox->bindings()->fireButton(&data);
 }
 
+#ifdef    XKB
+void Actions::xkbHandler(const XkbEvent &e)
+{
+  Window w;
+  int screen;
+  
+  otk::EventHandler::xkbHandler(e);
+
+  switch (((XkbAnyEvent*)&e)->xkb_type) {
+  case XkbBellNotify:
+    w = ((XkbBellNotifyEvent*)&e)->window;
+    Client *c = openbox->findClient(w);
+    if (c)
+      screen = c->screen();
+    else
+      screen = openbox->focusedScreen()->number();
+    EventData data(screen, c, EventBell, 0);
+    openbox->bindings()->fireEvent(&data);
+    break;
+  }
+}
+#endif // XKB
 
 }
+