X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.cc;h=1b90dbc0d3f9a813b2bf94f19ec4400bdcdd9575;hb=648c55b829e09c66222a9bbf08d10434622feae2;hp=0c25ab08be823724f3b810f428cee7f534c57d6d;hpb=8c4357fccb29b1c4ddf560748b7e0b3e7285050a;p=chaz%2Fopenbox

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 0c25ab08..1b90dbc0 100644
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -1,196 +1,214 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "eventdispatcher.hh"
 #include "display.hh"
+
+#include <cstdio>
 #include <iostream>
 
 namespace otk {
 
-OtkEventDispatcher::OtkEventDispatcher()
-  : _fallback(0), _master(0), _focus(None)
+EventDispatcher::EventDispatcher()
+  : _fallback(0), _master(0)
 {
-  _focus_e.xfocus.display = OBDisplay::display;
-  _focus_e.xfocus.mode = NotifyNormal;
-  _focus_e.xfocus.detail = NotifyNonlinear;
-
-  _crossing_e.xcrossing.display = OBDisplay::display;
-  _crossing_e.xcrossing.mode = NotifyNormal;
-  _crossing_e.xcrossing.detail = NotifyNonlinear;
 }
 
-OtkEventDispatcher::~OtkEventDispatcher()
+EventDispatcher::~EventDispatcher()
 {
 }
 
-void OtkEventDispatcher::clearAllHandlers(void)
+void EventDispatcher::clearAllHandlers(void)
 {
   _map.clear();
 }
 
-void OtkEventDispatcher::registerHandler(Window id, OtkEventHandler *handler)
+void EventDispatcher::registerHandler(Window id, EventHandler *handler)
 {
-  _map.insert(std::pair<Window, OtkEventHandler*>(id, handler));
+  _map.insert(std::pair<Window, EventHandler*>(id, handler));
 }
 
-void OtkEventDispatcher::clearHandler(Window id)
+void EventDispatcher::clearHandler(Window id)
 {
   _map.erase(id);
 }
 
-void OtkEventDispatcher::dispatchEvents(void)
+void EventDispatcher::dispatchEvents(bool remote)
 {
-  OtkEventMap::iterator it;
   XEvent e;
-  Window focus = None, unfocus = None;
-  Window enter = None, leave = None;
-  Window enter_root = None, leave_root = None;
 
-  while (XPending(OBDisplay::display)) {
-    XNextEvent(OBDisplay::display, &e);
+  while (true) {
+    /*
+      There are slightly different event retrieval semantics here for local (or
+      high bandwidth) versus remote (or low bandwidth) connections to the
+      display/Xserver.
+    */
+    if (remote) {
+      if (!XPending(**display))
+        return;
+    } else {
+      /*
+        This XSync allows for far more compression of events, which makes
+        things like Motion events perform far far better. Since it also means
+        network traffic for every event instead of every X events (where X is
+        the number retrieved at a time), it probably should not be used for
+        setups where Openbox is running on a remote/low bandwidth
+        display/Xserver.
+      */
+      XSync(**display, false);
+      if (!XEventsQueued(**display, QueuedAlready))
+        return;
+    }
+    XNextEvent(**display, &e);
 
-#if 0
+#if 0//defined(DEBUG)
     printf("Event %d window %lx\n", e.type, e.xany.window);
 #endif
 
-    // grab the lasttime
-    switch (e.type) {
-    case ButtonPress:
-    case ButtonRelease:
-      _lasttime = e.xbutton.time; break;
-    case MotionNotify:
-      _lasttime = e.xmotion.time; break;
-    case PropertyNotify:
-      _lasttime = e.xproperty.time; break;
-    case EnterNotify:
-    case LeaveNotify:
-      _lasttime = e.xcrossing.time; break;
-    }
-
-    // these ConfigureRequests require some special attention
-    if (e.type == ConfigureRequest) {
-      // find the actual window! e.xany.window is the parent window
-      it = _map.find(e.xconfigurerequest.window);
-
-      if (it != _map.end())
-        it->second->handle(e);
-      else {
-        // unhandled configure requests must be used to configure the window
-        // directly
-        XWindowChanges xwc;
-
-        xwc.x = e.xconfigurerequest.x;
-        xwc.y = e.xconfigurerequest.y;
-        xwc.width = e.xconfigurerequest.width;
-        xwc.height = e.xconfigurerequest.height;
-        xwc.border_width = e.xconfigurerequest.border_width;
-        xwc.sibling = e.xconfigurerequest.above;
-        xwc.stack_mode = e.xconfigurerequest.detail;
-
-        XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
-                         e.xconfigurerequest.value_mask, &xwc);
-      }
-    // madly compress all focus events
-    } else if (e.type == FocusIn) {
-      // any other types are not ones we're interested in
-      if (e.xfocus.detail == NotifyNonlinear) {
-        focus = e.xfocus.window;
-        unfocus = None;
-        //printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus);
+    if (e.type == FocusIn || e.type == FocusOut) {
+      // focus events are a beast all their own.. yuk, hate, etc.
+      dispatchFocus(e);
+    } else {    
+      Window win;
+
+      // pick a window
+      switch (e.type) {
+      case UnmapNotify:
+        win = e.xunmap.window;
+        break;
+      case DestroyNotify:
+        win = e.xdestroywindow.window;
+        break;
+      case ConfigureRequest:
+        win = e.xconfigurerequest.window;
+        break;
+      default:
+        win = e.xany.window;
       }
-    } else if (e.type == FocusOut) {
-      // any other types are not ones we're interested in
-      if (e.xfocus.detail == NotifyNonlinear) {
-        unfocus = e.xfocus.window;
-        focus = None;
-        //printf("FocusOut focus=%lx unfocus=%lx\n", focus, unfocus);
-      }
-    // madly compress all crossing events
-    } else if (e.type == EnterNotify) {
-      // any other types are not ones we're interested in
-      if (e.xcrossing.mode == NotifyNormal) {
-        // any other types are not ones we're interested in
-        enter = e.xcrossing.window;
-        enter_root = e.xcrossing.root;
-        //printf("Enter enter=%lx leave=%lx\n", enter, leave);
-      }
-    } else if (e.type == LeaveNotify) {
-      // any other types are not ones we're interested in
-      if (e.xcrossing.mode == NotifyNormal) {
-        leave = e.xcrossing.window;
-        leave_root = e.xcrossing.root;
-        //printf("Leave enter=%lx leave=%lx\n", enter, leave);
+    
+      // grab the lasttime and hack up the modifiers
+      switch (e.type) {
+      case ButtonPress:
+      case ButtonRelease:
+        _lasttime = e.xbutton.time;
+        e.xbutton.state &= ~(LockMask | display->numLockMask() |
+                             display->scrollLockMask());
+        break;
+      case KeyPress:
+        e.xkey.state &= ~(LockMask | display->numLockMask() |
+                          display->scrollLockMask());
+        break;
+      case MotionNotify:
+        _lasttime = e.xmotion.time;
+        e.xmotion.state &= ~(LockMask | display->numLockMask() |
+                             display->scrollLockMask());
+        break;
+      case PropertyNotify:
+        _lasttime = e.xproperty.time;
+        break;
+      case EnterNotify:
+      case LeaveNotify:
+        _lasttime = e.xcrossing.time;
+        if (e.xcrossing.mode != NotifyNormal)
+          continue; // skip me!
+        break;
       }
-    } else {
-      // normal events
-      dispatch(e);
-    }
-  }
 
-  if (unfocus != None) {
-    // the last focus event was an FocusOut, so where the hell is the focus at?
-//    printf("UNFOCUSING: %lx\n", unfocus);
-    _focus_e.xfocus.type = FocusOut;
-    _focus_e.xfocus.window = unfocus;
-    dispatch(_focus_e);
-
-    _focus = None;
-  } else if (focus != None) {
-    // the last focus event was a FocusIn, so unfocus what used to be focus and
-    // focus this new target
-//    printf("FOCUSING: %lx\n", focus);
-    _focus_e.xfocus.type = FocusIn;
-    _focus_e.xfocus.window = focus;
-    dispatch(_focus_e);
-
-    if (_focus != None) {
-//      printf("UNFOCUSING: %lx\n", _focus);
-      _focus_e.xfocus.type = FocusOut;
-      _focus_e.xfocus.window = _focus;
-      dispatch(_focus_e);
+      dispatch(win, e);
     }
-    
-    _focus = focus;
   }
+}
+
+void EventDispatcher::dispatchFocus(const XEvent &e)
+{
+//  printf("focus %s detail %d -> 0x%lx\n",
+//         (e.xfocus.type == FocusIn ? "IN" : "OUT"),
+//         e.xfocus.detail, e.xfocus.window);
+  // ignore focus changes from grabs
+  if (e.xfocus.mode == NotifyGrab) //|| e.xfocus.mode == NotifyUngrab ||
+      // From Metacity, from WindowMaker, ignore all funky pointer root events
+      // its commented out cuz I don't think we need this at all. If problems
+      // arise we can look into it
+      //e.xfocus.detail > NotifyNonlinearVirtual)
+    return;
   
-  if (leave != None) {
-    _crossing_e.xcrossing.type = LeaveNotify;
-    _crossing_e.xcrossing.window = leave;
-    _crossing_e.xcrossing.root = leave_root;
-    dispatch(_crossing_e);
-  }
-  if (enter != None) {
-    _crossing_e.xcrossing.type = EnterNotify;
-    _crossing_e.xcrossing.window = enter;
-    _crossing_e.xcrossing.root = enter_root;
-    dispatch(_crossing_e);
+  if (e.type == FocusIn) {
+    //printf("Got FocusIn!\n");
+
+    // send a FocusIn to whatever was just focused
+    dispatch(e.xfocus.window, e);
+    //printf("Sent FocusIn 0x%lx\n", e.xfocus.window);
+
+  } else if (e.type == FocusOut) {
+    //printf("Got FocusOut!\n");
+
+    // FocusOut events just make us look for FocusIn events. They are ignored
+    // otherwise.
+    XEvent fi;
+    if (XCheckTypedEvent(**display, FocusIn, &fi)) {
+      //printf("Found FocusIn\n");
+      dispatchFocus(fi);
+      // dont unfocus the window we just focused!
+      if (fi.xfocus.window == e.xfocus.window)
+        return;
+    }
+
+    dispatch(e.xfocus.window, e);
+    //printf("Sent FocusOut 0x%lx\n", e.xfocus.window);
   }
 }
 
-void OtkEventDispatcher::dispatch(const XEvent &e) {
-  OtkEventHandler *handler;
-  OtkEventMap::iterator it;
+void EventDispatcher::dispatch(Window win, const XEvent &e)
+{
+  EventHandler *handler = 0;
+  EventMap::iterator it;
 
+  // master gets everything first
   if (_master)
     _master->handle(e);
 
-  it = _map.find(e.xany.window);
-  
-  if (it != _map.end())
+  // find handler for the chosen window
+  it = _map.find(win);
+
+  if (it != _map.end()) {
+    // if we found a handler
     handler = it->second;
-  else
+  } else if (e.type == ConfigureRequest) {
+    // unhandled configure requests must be used to configure the window
+    // directly
+    XWindowChanges xwc;
+      
+    xwc.x = e.xconfigurerequest.x;
+    xwc.y = e.xconfigurerequest.y;
+    xwc.width = e.xconfigurerequest.width;
+    xwc.height = e.xconfigurerequest.height;
+    xwc.border_width = e.xconfigurerequest.border_width;
+    xwc.sibling = e.xconfigurerequest.above;
+    xwc.stack_mode = e.xconfigurerequest.detail;
+    
+#ifdef DEBUG
+    printf("Proxying configure event for 0x%lx\n", e.xconfigurerequest.window);
+#endif
+    
+    // we are not to be held responsible if someone sends us an invalid
+    // request!
+    display->setIgnoreErrors(true); 
+    XConfigureWindow(**display, e.xconfigurerequest.window,
+                     e.xconfigurerequest.value_mask, &xwc);
+    display->setIgnoreErrors(false);
+  } else {
+    // grab a falback if it exists
     handler = _fallback;
+  }
 
   if (handler)
     handler->handle(e);
 }
 
-OtkEventHandler *OtkEventDispatcher::findHandler(Window win)
+EventHandler *EventDispatcher::findHandler(Window win)
 {
-  OtkEventMap::iterator it = _map.find(win);
+  EventMap::iterator it = _map.find(win);
   if (it != _map.end())
     return it->second;
   return 0;