X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=96290bddc6ab9ac80caf76d0936586036c901c2e;hb=8f8acc24933830d4f5784616b9b0c5896bde0b93;hp=27f4ccae28c54c2e004be90348e7d2b17552aa48;hpb=ca3e463057ebf8a7a48a5997aedc062cdac72f3f;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 27f4ccae..96290bdd 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -5,9 +5,10 @@
 #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"
@@ -16,7 +17,6 @@
 
 namespace ob {
 
-const unsigned int OBActions::DOUBLECLICKDELAY = 300;
 const int OBActions::BUTTONS;
 
 OBActions::OBActions()
@@ -37,30 +37,33 @@ OBActions::~OBActions()
 void OBActions::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);
   if (c) a->clientarea = c->area();
-  printf("press %d x:%d y:%d winx:%d winy:%d\n", e.button, e.x_root, e.y_root, c->area().x(), c->area().y());
 }
 
 void OBActions::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)
@@ -73,16 +76,33 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
     (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;
+  OBClient *c = Openbox::instance->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::OBDisplay::findScreen(e.root)->screen();
+  MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+                 MousePress);
+  Openbox::instance->bindings()->fireButton(&data);
     
   if (_button) return; // won't count toward CLICK events
 
   _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);
+  }
 }
   
 
@@ -110,19 +130,31 @@ 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);
-  ButtonData *data = new_button_data(e.window, e.time, state, e.button,
-                                     w->mcontext(), MouseClick);
-  Openbox::instance->bindings()->fire(data);
+  int screen;
+  OBClient *c = Openbox::instance->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::OBDisplay::findScreen(e.root)->screen();
+  MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+                 MouseClick);
+  Openbox::instance->bindings()->fireButton(&data);
     
 
-  if (e.time - _release.time < DOUBLECLICKDELAY &&
+  // 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
-    data->action = MouseDoubleClick;
-    Openbox::instance->bindings()->fire(data);
+    data.action = MouseDoubleClick;
+    Openbox::instance->bindings()->fireButton(&data);
     
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
@@ -134,8 +166,6 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
     _release.button = e.button;
     _release.time = e.time;
   }
-
-  Py_DECREF((PyObject*)data);
 }
 
 
@@ -143,12 +173,15 @@ void OBActions::enterHandler(const XCrossingEvent &e)
 {
   OtkEventHandler::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;
+  OBClient *c = Openbox::instance->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);
 }
 
 
@@ -156,28 +189,35 @@ void OBActions::leaveHandler(const XCrossingEvent &e)
 {
   OtkEventHandler::leaveHandler(e);
 
-  OBWidget *w = dynamic_cast<OBWidget*>
-    (Openbox::instance->findHandler(e.window));
-
   // run the LEAVE python hook
-  doCallback(Action_LeaveWindow, e.window,
-             (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
+  int screen;
+  OBClient *c = Openbox::instance->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);
 }
 
 
 void OBActions::keyPressHandler(const XKeyEvent &e)
 {
-//  OBWidget *w = dynamic_cast<OBWidget*>
-//    (Openbox::instance->findHandler(e.window));
+  OtkEventHandler::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);
+  Openbox::instance->bindings()->
+    fireKey(otk::OBDisplay::findScreen(e.root)->screen(),
+            state, e.keycode, e.time);
 }
 
 
 void OBActions::motionHandler(const XMotionEvent &e)
 {
+  OtkEventHandler::motionHandler(e);
+
   if (!e.same_screen) return; // this just gets stupid
 
   int x_root = e.x_root, y_root = e.y_root;
@@ -199,112 +239,61 @@ void OBActions::motionHandler(const XMotionEvent &e)
   assert(w); // everything should be a widget
 
   // 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;
-  printf("motion %d x:%d y:%d winx:%d winy:%d\n", button, x_root, y_root,
-         _posqueue[0]->clientarea.x(), _posqueue[0]->clientarea.y());
-  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);
+  int screen;
+  OBClient *c = Openbox::instance->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::OBDisplay::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::instance->bindings()->fireButton(&data);
 }
 
 void OBActions::mapRequestHandler(const XMapRequestEvent &e)
 {
-  doCallback(Action_NewWindow, e.window, (OBWidget::WidgetType)-1,
-             0, 0, 0, 0, 0);
+  OtkEventHandler::mapRequestHandler(e);
+  // do this in OBScreen::manageWindow
 }
 
 void OBActions::unmapHandler(const XUnmapEvent &e)
 {
-  (void)e;
-  doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1,
-             0, 0, 0, 0, 0);
+  OtkEventHandler::unmapHandler(e);
+  // do this in OBScreen::unmanageWindow
 }
 
 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;
-  }
-  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));
-  else
-    _callbacks.insert(CallbackMapPair(action, func));
-  Py_INCREF(func);
-  return true;
+  OtkEventHandler::destroyHandler(e);
+  // do this in OBScreen::unmanageWindow
 }
 
-bool OBActions::unregisterCallback(ActionType action, PyObject *func)
+#ifdef    XKB
+void OBActions::xkbHandler(const XkbEvent &e)
 {
-  if (action < 0 || action >= OBActions::NUM_ACTIONS) {
-    return false;
-  }
-  if (!func)
-    return false;
+  Window w;
+  int screen;
   
-  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);
+  OtkEventHandler::xkbHandler(e);
+
+  switch (((XkbAnyEvent*)&e)->xkb_type) {
+  case XkbBellNotify:
+    w = ((XkbBellNotifyEvent*)&e)->window;
+    OBClient *c = Openbox::instance->findClient(w);
+    if (c)
+      screen = c->screen();
+    else
+      screen = Openbox::instance->focusedScreen()->number();
+    EventData data(screen, c, EventBell, 0);
+    Openbox::instance->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;
 }
 
-}