X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=1213f21ef40a1293948f3e9f65159651e8c81caf;hb=7fe3301e7ea905a8a76d54c22751f3d8a346e28b;hp=14fba7db125cd17232708634f69ba2d2ac635490;hpb=345d957e1ea577480f807b892b73c3f52fe913d2;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 14fba7db..1213f21e 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -1,113 +1,162 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "actions.hh"
-#include "widget.hh"
 #include "openbox.hh"
 #include "client.hh"
+#include "frame.hh"
 #include "screen.hh"
 #include "python.hh"
 #include "bindings.hh"
 #include "otk/display.hh"
 
-#include <stdio.h>
+#include <cstdio>
+#include <algorithm>
 
 namespace ob {
 
-const int OBActions::BUTTONS;
+const int Actions::BUTTONS;
 
-OBActions::OBActions()
-  : _button(0)
+Actions::Actions()
+  : _button(0),
+    _dragging(false)
 {
   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(const XButtonEvent &e)
+void Actions::insertPress(const XButtonEvent &e)
 {
   ButtonPressAction *a = _posqueue[BUTTONS - 1];
-  for (int i=BUTTONS-1; i>0;)
-    _posqueue[i] = _posqueue[--i];
+  // 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->win = e.window;
   a->button = e.button;
-  a->pos.setPoint(e.x_root, e.y_root);
+  a->pos = otk::Point(e.x_root, e.y_root);
 
-  OBClient *c = Openbox::instance->findClient(e.window);
+  Client *c = openbox->findClient(e.window);
   if (c) a->clientarea = c->area();
 }
 
-void OBActions::removePress(const XButtonEvent &e)
+void Actions::removePress(const XButtonEvent &e)
 {
+  int i;
   ButtonPressAction *a = 0;
-  for (int i=0; i<BUTTONS; ++i) {
-    if (_posqueue[i]->button == e.button)
+  for (i=0; i<BUTTONS-1; ++i)
+    if (_posqueue[i]->button == e.button) {
       a = _posqueue[i];
-    if (a) // found one and removed it
+      break;
+    }
+  if (a) { // found one, remove it and shift the rest up one
+    for (; i < BUTTONS-1; ++i)
       _posqueue[i] = _posqueue[i+1];
-  }
-  if (a) { // found one
     _posqueue[BUTTONS-1] = a;
-    a->button = 0;
   }
+  _posqueue[BUTTONS-1]->button = 0;
 }
 
-void OBActions::buttonPressHandler(const XButtonEvent &e)
+void Actions::buttonPressHandler(const XButtonEvent &e)
 {
-  OtkEventHandler::buttonPressHandler(e);
+  otk::EventHandler::buttonPressHandler(e);
   insertPress(e);
-  
-  // run the PRESS python hook
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
-  assert(w); // everything should be a widget
 
+  printf("press queue %u pressed %u\n", _button, e.button);
+
+  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);
   int screen;
-  OBClient *c = Openbox::instance->findClient(e.window);
+  Client *c = openbox->findClient(e.window);
   if (c)
     screen = c->screen();
   else
-    screen = otk::OBDisplay::findScreen(e.root)->screen();
-  ButtonData data(screen, c, e.time, state, e.button, w->mcontext(),
-                  MousePress);
-  Openbox::instance->bindings()->fireButton(&data);
+    screen = otk::display->findScreen(e.root)->screen();
+  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 (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
+      clicks/doubleclicks etc still work.
+    */
+    //XButtonEvent ev = e;
+    //ev.type = ButtonRelease;
+    buttonReleaseHandler(e);
+  }
 }
   
 
-void OBActions::buttonReleaseHandler(const XButtonEvent &e)
+void Actions::buttonReleaseHandler(const XButtonEvent &e)
 {
-  OtkEventHandler::buttonReleaseHandler(e);
+  otk::EventHandler::buttonReleaseHandler(e);
   removePress(e);
   
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
-  assert(w); // everything should be a widget
+  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;
 
   _button = 0;
+  _dragging = false;
 
   // find the area of the window
   XWindowAttributes attr;
-  if (!XGetWindowAttributes(otk::OBDisplay::display, e.window, &attr)) return;
+  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 &&
@@ -115,31 +164,16 @@ void OBActions::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;
-  OBClient *c = Openbox::instance->findClient(e.window);
-  if (c)
-    screen = c->screen();
-  else
-    screen = otk::OBDisplay::findScreen(e.root)->screen();
-  ButtonData data(screen, c, e.time, state, e.button, w->mcontext(),
-                  MouseClick);
-  Openbox::instance->bindings()->fireButton(&data);
+  data.action = MouseAction::Click;
+  openbox->bindings()->fireButton(&data);
     
-
-  // XXX: dont load this every time!!@*
-  long dblclick;
-  if (!python_get_long("double_click_delay", &dblclick))
-    dblclick = 300;
-
+  long dblclick = openbox->screen(screen)->config().double_click_delay;
   if (e.time - _release.time < (unsigned)dblclick &&
       _release.win == e.window && _release.button == e.button) {
 
     // run the DOUBLECLICK python hook
-    data.action = MouseDoubleClick;
-    Openbox::instance->bindings()->fireButton(&data);
+    data.action = MouseAction::DoubleClick;
+    openbox->bindings()->fireButton(&data);
     
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
@@ -154,127 +188,180 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
 }
 
 
-void OBActions::enterHandler(const XCrossingEvent &e)
+void Actions::enterHandler(const XCrossingEvent &e)
 {
-  OtkEventHandler::enterHandler(e);
+  otk::EventHandler::enterHandler(e);
   
   // run the ENTER python hook
   int screen;
-  OBClient *c = Openbox::instance->findClient(e.window);
+  Client *c = openbox->findClient(e.window);
   if (c)
     screen = c->screen();
   else
-    screen = otk::OBDisplay::findScreen(e.root)->screen();
-  EventData data(screen, c, EventEnterWindow, e.state);
-  Openbox::instance->bindings()->fireEvent(&data);
+    screen = otk::display->findScreen(e.root)->screen();
+  EventData data(screen, c, EventAction::EnterWindow, e.state);
+  openbox->bindings()->fireEvent(&data);
 }
 
 
-void OBActions::leaveHandler(const XCrossingEvent &e)
+void Actions::leaveHandler(const XCrossingEvent &e)
 {
-  OtkEventHandler::leaveHandler(e);
+  otk::EventHandler::leaveHandler(e);
 
   // run the LEAVE python hook
   int screen;
-  OBClient *c = Openbox::instance->findClient(e.window);
+  Client *c = openbox->findClient(e.window);
   if (c)
     screen = c->screen();
   else
-    screen = otk::OBDisplay::findScreen(e.root)->screen();
-  EventData data(screen, c, EventLeaveWindow, e.state);
-  Openbox::instance->bindings()->fireEvent(&data);
+    screen = otk::display->findScreen(e.root)->screen();
+  EventData data(screen, c, EventAction::LeaveWindow, e.state);
+  openbox->bindings()->fireEvent(&data);
 }
 
 
-void OBActions::keyPressHandler(const XKeyEvent &e)
+void Actions::keyPressHandler(const XKeyEvent &e)
 {
-  OtkEventHandler::keyPressHandler(e);
+  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::instance->bindings()->
-    fireKey(otk::OBDisplay::findScreen(e.root)->screen(),
-            state, e.keycode, e.time);
+
+  // add to the state the mask of the modifier being pressed, if it is
+  // a modifier key being pressed (this is a little ugly..)
+  const XModifierKeymap *map = otk::display->modifierMap();
+  const int mask_table[] = {
+    ShiftMask, LockMask, ControlMask, Mod1Mask,
+    Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
+  };
+  KeyCode *kp = map->modifiermap;
+  for (int i = 0, n = sizeof(mask_table)/sizeof(mask_table[0]); i < n; ++i) {
+    for (int k = 0; k < map->max_keypermod; ++k) {
+      if (*kp == e.keycode) { // found the keycode
+        state |= mask_table[i]; // add the mask for it
+        i = n; // cause the first loop to break;
+        break; // get outta here!
+      }
+      ++kp;
+    }
+  }
+  
+  openbox->bindings()->
+    fireKey(otk::display->findScreen(e.root)->screen(),
+            state, e.keycode, e.time, KeyAction::Press);
 }
 
 
-void OBActions::motionHandler(const XMotionEvent &e)
+void Actions::keyReleaseHandler(const XKeyEvent &e)
 {
-  OtkEventHandler::motionHandler(e);
+  otk::EventHandler::keyReleaseHandler(e);
+
+  // kill off the Button1Mask etc, only want the modifiers
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+
+  // remove from the state the mask of the modifier being released, if it is
+  // a modifier key being released (this is a little ugly..)
+  const XModifierKeymap *map = otk::display->modifierMap();
+  const int mask_table[] = {
+    ShiftMask, LockMask, ControlMask, Mod1Mask,
+    Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
+  };
+  KeyCode *kp = map->modifiermap;
+  for (int i = 0, n = sizeof(mask_table)/sizeof(mask_table[0]); i < n; ++i) {
+    for (int k = 0; k < map->max_keypermod; ++k) {
+      if (*kp == e.keycode) { // found the keycode
+        state &= ~mask_table[i]; // remove the mask for it
+        i = n; // cause the first loop to break;
+        break; // get outta here!
+      }
+      ++kp;
+    }
+  }
+  
+  openbox->bindings()->
+    fireKey(otk::display->findScreen(e.root)->screen(),
+            state, e.keycode, e.time, KeyAction::Release);
+}
+
+
+void Actions::motionHandler(const XMotionEvent &e)
+{
+  otk::EventHandler::motionHandler(e);
 
   if (!e.same_screen) return; // this just gets stupid
 
-  int x_root = e.x_root, y_root = e.y_root;
+  if (e.window != _posqueue[0]->win) 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
+
+  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;
-    }
+  while (XCheckTypedWindowEvent(**otk::display, e.window, e.type, &ce)) {
+    x_root = e.x_root;
+    y_root = e.y_root;
   }
 
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
-  assert(w); // everything should be a widget
+  int screen;
+  Client *c = openbox->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::display->findScreen(e.root)->screen();
+
+  if (!_dragging) {
+    int dx = x_root - _posqueue[0]->pos.x();
+    int dy = y_root - _posqueue[0]->pos.y();
+    long threshold = openbox->screen(screen)->config().drag_threshold;
+    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;
-  OBClient *c = Openbox::instance->findClient(e.window);
-  if (c)
-    screen = c->screen();
-  else
-    screen = otk::OBDisplay::findScreen(e.root)->screen();
-  MotionData data(screen, c, e.time, state, button, w->mcontext(), MouseMotion,
-                  x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea);
-  Openbox::instance->bindings()->fireButton((ButtonData*)&data);
-}
-
-void OBActions::mapRequestHandler(const XMapRequestEvent &e)
-{
-  OtkEventHandler::mapRequestHandler(e);
-  // do this in OBScreen::manageWindow
-}
-
-void OBActions::unmapHandler(const XUnmapEvent &e)
-{
-  OtkEventHandler::unmapHandler(e);
-  // do this in OBScreen::unmanageWindow
-}
-
-void OBActions::destroyHandler(const XDestroyWindowEvent &e)
-{
-  OtkEventHandler::destroyHandler(e);
-  // do this in OBScreen::unmanageWindow
+  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);
 }
 
 #ifdef    XKB
-void OBActions::xkbHandler(const XkbEvent &e)
+void Actions::xkbHandler(const XkbEvent &e)
 {
   Window w;
   int screen;
   
-  OtkEventHandler::xkbHandler(e);
+  otk::EventHandler::xkbHandler(e);
 
   switch (((XkbAnyEvent*)&e)->xkb_type) {
   case XkbBellNotify:
     w = ((XkbBellNotifyEvent*)&e)->window;
-    OBClient *c = Openbox::instance->findClient(w);
+    Client *c = openbox->findClient(w);
     if (c)
       screen = c->screen();
     else
-      screen = Openbox::instance->focusedScreen()->number();
-    EventData data(screen, c, EventBell, 0);
-    Openbox::instance->bindings()->fireEvent(&data);
+      screen = openbox->focusedScreen()->number();
+    EventData data(screen, c, EventAction::Bell, 0);
+    openbox->bindings()->fireEvent(&data);
     break;
   }
 }