X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=59aa1a19a20e2af7a22fb61f36723866dd597dab;hb=a765df7fa67ec4346179ade2cfb8f337286c88d7;hp=c04457da726a93fb4590f3609db3db93e2c91724;hpb=b35dae95a5cdb902f1661b9572af47c3f55c975c;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index c04457da..59aa1a19 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -5,104 +5,141 @@
 #endif
 
 #include "actions.hh"
-#include "widget.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 = 300;
-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->button = e.button;
   a->pos.setPoint(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));
-
-/*  doCallback(Action_ButtonPress, e.window,
-             (OBWidget::WidgetType)(w ? w->type():-1),
-             e.state, e.button, e.x_root, e.y_root, e.time);*/
-  if (w) {
-    Openbox::instance->bindings()->fire(MousePress, w->type(), e.window,
-                                        e.state, e.button,
-                                        e.x_root, e.y_root, e.time);
-  } else
-    assert(false); // why isnt there a type?
+  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(),
+                 MouseAction::Press);
+  openbox->bindings()->fireButton(&data);
     
   if (_button) return; // won't count toward CLICK events
 
   _button = e.button;
+
+  if (w->mcontext() == 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));
+  WidgetBase *w = dynamic_cast<WidgetBase*>
+    (openbox->findHandler(e.window));
+  if (!w) return;
+
+  // 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, w->mcontext(),
+                 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 &&
@@ -110,29 +147,21 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
     return;
 
   // run the CLICK python hook
-/*  doCallback(Action_Click, e.window,
-             (OBWidget::WidgetType)(w ? w->type():-1),
-             e.state, e.button, e.x_root, e.y_root, e.time);*/
-  if (w) {
-    Openbox::instance->bindings()->fire(MouseClick, w->type(), e.window,
-                                        e.state, e.button,
-                                        e.x_root, e.y_root, e.time);
-  } else
-    assert(false); // why isnt there a type?
-
-  if (e.time - _release.time < DOUBLECLICKDELAY &&
+  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;
+
+  if (e.time - _release.time < (unsigned)dblclick &&
       _release.win == e.window && _release.button == e.button) {
 
     // run the DOUBLECLICK python hook
-/*    doCallback(Action_DoubleClick, e.window,
-               (OBWidget::WidgetType)(w ? w->type():-1),
-               e.state, e.button, e.x_root, e.y_root, e.time);*/
-    if (w) {
-      Openbox::instance->bindings()->fire(MouseDoubleClick, w->type(),
-                                          e.window, e.state, e.button,
-                                          e.x_root, e.y_root, e.time);
-    } else
-      assert(false); // why isnt there a type?
+    data.action = MouseAction::DoubleClick;
+    openbox->bindings()->fireButton(&data);
     
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
@@ -147,52 +176,97 @@ 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);
   
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
-
   // run the ENTER python hook
-  doCallback(Action_EnterWindow, e.window,
-             (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
+  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, EventAction::EnterWindow, e.state);
+  openbox->bindings()->fireEvent(&data);
 }
 
 
-void OBActions::leaveHandler(const XCrossingEvent &e)
+void Actions::leaveHandler(const XCrossingEvent &e)
 {
-  OtkEventHandler::leaveHandler(e);
-
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
+  otk::EventHandler::leaveHandler(e);
 
   // run the LEAVE python hook
-  doCallback(Action_LeaveWindow, e.window,
-             (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
+  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, EventAction::LeaveWindow, e.state);
+  openbox->bindings()->fireEvent(&data);
 }
 
 
-void OBActions::keyPressHandler(const XKeyEvent &e)
+void Actions::keyPressHandler(const XKeyEvent &e)
 {
-//  OBWidget *w = dynamic_cast<OBWidget*>
-//    (Openbox::instance->findHandler(e.window));
+  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, KeyAction::Press);
+}
+
 
-  Openbox::instance->bindings()->fire(e.state, e.keycode, e.time);
+void Actions::keyReleaseHandler(const XKeyEvent &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 OBActions::motionHandler(const XMotionEvent &e)
+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;
   
   // compress changes to a window into a single change
   XEvent ce;
-  while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) {
+  while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
     if (ce.xmotion.window != e.window) {
-      XPutBackEvent(otk::OBDisplay::display, &ce);
+      XPutBackEvent(**otk::display, &ce);
       break;
     } else {
       x_root = e.x_root;
@@ -200,119 +274,63 @@ void OBActions::motionHandler(const XMotionEvent &e)
     }
   }
 
-  _dx = x_root - _posqueue[0]->pos.x(); _posqueue[0]->pos.setX(x_root);
-  _dy = y_root - _posqueue[0]->pos.y(); _posqueue[0]->pos.setY(y_root);
-  
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
-
-  // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
-  //      maybe that should all be done via python tho.. (or radial menus!)
-  // run the simple MOTION python hook for now...
-/*  doCallback(Action_MouseMotion, e.window,
-             (OBWidget::WidgetType)(w ? w->type():-1),
-             e.state, (unsigned)-1, x_root, y_root, e.time);*/
-  if (w) {
-    Openbox::instance->bindings()->fire(MouseMotion, w->type(), e.window,
-                                        e.state, _posqueue[0]->button,
-                                        _dx, _dy, e.time);
-  } else
-    assert(false); // why isnt there a type?
-}
-
-void OBActions::mapRequestHandler(const XMapRequestEvent &e)
-{
-  doCallback(Action_NewWindow, e.window, (OBWidget::WidgetType)-1,
-             0, 0, 0, 0, 0);
-}
-
-void OBActions::unmapHandler(const XUnmapEvent &e)
-{
-  (void)e;
-  doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1,
-             0, 0, 0, 0, 0);
-}
-
-void OBActions::destroyHandler(const XDestroyWindowEvent &e)
-{
-  (void)e;
-  doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1,
-             0, 0, 0, 0, 0);
-}
-
-void OBActions::doCallback(ActionType action, Window window,
-                           OBWidget::WidgetType type, unsigned int state,
-                           unsigned int button, int xroot, int yroot,
-                           Time time)
-{
-  std::pair<CallbackMap::iterator, CallbackMap::iterator> it_pair =
-    _callbacks.equal_range(action);
-
-  CallbackMap::iterator it;
-//  for (it = it_pair.first; it != it_pair.second; ++it)
-//    python_callback(it->second, action, window, type, state,
-//                    button, xroot, yroot, time);
-  // XXX do a callback
-}
-
-bool OBActions::registerCallback(ActionType action, PyObject *func,
-                                 bool atfront)
-{
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    return false;
+  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
   }
-  if (!func)
-    return false;
-
-  std::pair<CallbackMap::iterator, CallbackMap::iterator> it_pair =
-    _callbacks.equal_range(action);
-
-  CallbackMap::iterator it;
-  for (it = it_pair.first; it != it_pair.second; ++it)
-    if (it->second == func)
-      return true; // already in there
-  if (atfront)
-    _callbacks.insert(_callbacks.begin(), CallbackMapPair(action, func));
+  _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
-    _callbacks.insert(CallbackMapPair(action, func));
-  Py_INCREF(func);
-  return true;
+    screen = otk::display->findScreen(e.root)->screen();
+  MouseData data(screen, c, e.time, state, button, w->mcontext(),
+                 MouseAction::Motion, x_root, y_root,
+                 _posqueue[0]->pos, _posqueue[0]->clientarea);
+  openbox->bindings()->fireButton(&data);
 }
 
-bool OBActions::unregisterCallback(ActionType action, PyObject *func)
+#ifdef    XKB
+void Actions::xkbHandler(const XkbEvent &e)
 {
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    return false;
-  }
-  if (!func)
-    return false;
-  
-  std::pair<CallbackMap::iterator, CallbackMap::iterator> it_pair =
-    _callbacks.equal_range(action);
+  Window w;
+  int screen;
   
-  CallbackMap::iterator it;
-  for (it = it_pair.first; it != it_pair.second; ++it)
-    if (it->second == func)
-      break;
-  if (it != it_pair.second) { // its been registered before
-    Py_DECREF(func);
-    _callbacks.erase(it);
+  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, EventAction::Bell, 0);
+    openbox->bindings()->fireEvent(&data);
+    break;
   }
-  return true;
 }
+#endif // XKB
 
-bool OBActions::unregisterAllCallbacks(ActionType action)
-{
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    return false;
-  }
-
-  while (!_callbacks.empty()) {
-    CallbackMap::iterator it = _callbacks.begin();
-    Py_DECREF(it->second);
-    _callbacks.erase(it);
-  }
-  return true;
 }
 
-}