X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=9659b2f0cebfa03a3e89bfee0ef22bc95c1beba8;hb=1e47e17d08d72d181edc2bde598ad246055655ad;hp=79b9fc410dd85a131cad9ec1a84d5094b8e52e41;hpb=1c8090fa67994215f5e79cd9dd08f82110589d8a;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 79b9fc41..9659b2f0 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -1,107 +1,140 @@
 // -*- 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 unsigned int OBActions::DOUBLECLICKDELAY = 300;
-const int OBActions::BUTTONS;
-
-OBActions::OBActions()
-  : _button(0)
+Actions::Actions()
+  : _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::buttonPressHandler(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 (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;
+  otk::EventHandler::buttonPressHandler(e);
+
+  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
+
+  if (_press.button) {
+    unsigned int mask;
+    switch(_press.button) {
+    case Button1: mask = Button1Mask; break;
+    case Button2: mask = Button2Mask; break;
+    case Button3: mask = Button3Mask; break;
+    case Button4: mask = Button4Mask; break;
+    case Button5: mask = Button5Mask; break;
+    default: mask = 0; // on other buttons we have to assume its not pressed...
+    }
+    // was the button released but we didnt get the event? (pointergrabs cause
+    // this)
+    if (!(e.state & mask))
+      _press.button = 0;
   }
-}
-
-void OBActions::buttonPressHandler(const XButtonEvent &e)
-{
-  OtkEventHandler::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
-
+  // kill off the Button1Mask etc, only want the modifiers
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
-  ButtonData *data = new_button_data(e.window, e.time, state, e.button,
-                                     w->mcontext(), MousePress);
-  Openbox::instance->bindings()->fire(data);
-  Py_DECREF((PyObject*)data);
+  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::Press);
+  openbox->bindings()->fireButton(&data);
     
-  if (_button) return; // won't count toward CLICK events
-
-  _button = e.button;
+  if (_press.button) return; // won't count toward CLICK events
+
+  _press.win = e.window;
+  _press.button = e.button;
+  _press.pos = otk::Point(e.x_root, e.y_root);
+  if (c)
+    _press.clientarea = c->area();
+
+  printf("press queue %u pressed %u\n", _press.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);
-  removePress(e);
+  otk::EventHandler::buttonReleaseHandler(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;
+  if (_press.button != e.button) return;
 
-  _button = 0;
+  _press.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 &&
@@ -109,19 +142,16 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
     return;
 
   // run the CLICK python hook
-  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
-                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
-  ButtonData *data = new_button_data(e.window, e.time, state, e.button,
-                                     w->mcontext(), MouseClick);
-  Openbox::instance->bindings()->fire(data);
+  data.action = MouseAction::Click;
+  openbox->bindings()->fireButton(&data);
     
-
-  if (e.time - _release.time < DOUBLECLICKDELAY &&
+  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()->fire(data);
+    data.action = MouseAction::DoubleClick;
+    openbox->bindings()->fireButton(&data);
     
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
@@ -133,175 +163,187 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
     _release.button = e.button;
     _release.time = e.time;
   }
-
-  Py_DECREF((PyObject*)data);
 }
 
 
-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::instance->bindings()->fire(state, e.keycode, e.time);
-}
 
-
-void OBActions::motionHandler(const XMotionEvent &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)) {
-    if (ce.xmotion.window != e.window) {
-      XPutBackEvent(otk::OBDisplay::display, &ce);
-      break;
-    } else {
-      x_root = e.x_root;
-      y_root = e.y_root;
+  // 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);
+}
 
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
-  assert(w); // everything should be a widget
 
-  // run the MOTION python hook
+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);
-  unsigned int button = _posqueue[0]->button;
-  MotionData *data = new_motion_data(e.window, e.time, state, button,
-                                     w->mcontext(), MouseMotion,
-                                     x_root, y_root, _posqueue[0]->pos,
-                                     _posqueue[0]->clientarea);
-  Openbox::instance->bindings()->fire((ButtonData*)data);
-  Py_DECREF((PyObject*)data);
-}
 
-void OBActions::mapRequestHandler(const XMapRequestEvent &e)
-{
-  doCallback(Action_NewWindow, e.window, (OBWidget::WidgetType)-1,
-             0, 0, 0, 0, 0);
+  // 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::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 Actions::motionHandler(const XMotionEvent &e)
 {
-  (void)e;
-  doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1,
-             0, 0, 0, 0, 0);
-}
+  otk::EventHandler::motionHandler(e);
 
-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
-}
+  if (!e.same_screen) return; // this just gets stupid
 
-bool OBActions::registerCallback(ActionType action, PyObject *func,
-                                 bool atfront)
-{
-  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);
-
-  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));
+  if (e.window != _press.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
-    _callbacks.insert(CallbackMapPair(action, func));
-  Py_INCREF(func);
-  return true;
-}
+    return; // not a valid mouse context
 
-bool OBActions::unregisterCallback(ActionType action, PyObject *func)
-{
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    return false;
+  int x_root = e.x_root, y_root = e.y_root;
+
+  // compress changes to a window into a single change
+  XEvent ce;
+  while (XCheckTypedWindowEvent(**otk::display, e.window, e.type, &ce)) {
+    x_root = e.x_root;
+    y_root = e.y_root;
   }
-  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)
-      break;
-  if (it != it_pair.second) { // its been registered before
-    Py_DECREF(func);
-    _callbacks.erase(it);
+
+  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 - _press.pos.x();
+    int dy = y_root - _press.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
   }
-  return true;
+  _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 = _press.button;
+  MouseData data(screen, c, e.time, state, button, context,
+                 MouseAction::Motion, x_root, y_root,
+                 _press.pos, _press.clientarea);
+  openbox->bindings()->fireButton(&data);
 }
 
-bool OBActions::unregisterAllCallbacks(ActionType action)
+#ifdef    XKB
+void Actions::xkbHandler(const XkbEvent &e)
 {
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    return false;
-  }
-
-  while (!_callbacks.empty()) {
-    CallbackMap::iterator it = _callbacks.begin();
-    Py_DECREF(it->second);
-    _callbacks.erase(it);
+  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, EventAction::Bell, 0);
+    openbox->bindings()->fireEvent(&data);
+    break;
   }
-  return true;
 }
+#endif // XKB
 
 }
+