X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.cc;h=576139618ce9bc5061d2daefbf00c3f4efa0dcd3;hb=a2de94e91e1c0e7775c97745ae11d14e5c5f5659;hp=4a70c8576ffc4b8a4175a3b148faf382574285b7;hpb=150c28620e1f14b7249038068bccca9563526377;p=chaz%2Fopenbox

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 4a70c857..57613961 100644
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -13,8 +13,13 @@ namespace otk {
 OtkEventDispatcher::OtkEventDispatcher()
   : _fallback(0), _master(0), _focus(None)
 {
+  _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()
@@ -38,93 +43,170 @@ void OtkEventDispatcher::clearHandler(Window id)
 
 void OtkEventDispatcher::dispatchEvents(void)
 {
-  OtkEventMap::iterator it;
   XEvent e;
-  Window focus = _focus;
-  Window unfocus = None;
+  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);
 
-#if 0
+#if 0//defined(DEBUG)
     printf("Event %d window %lx\n", e.type, e.xany.window);
 #endif
 
-    // 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);
-      }
+    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;
+    }
+    
+    // grab the lasttime and hack up the modifiers
+    switch (e.type) {
+    case ButtonPress:
+    case ButtonRelease:
+      _lasttime = e.xbutton.time;
+      e.xbutton.state &= ~(LockMask | OBDisplay::numLockMask() |
+                           OBDisplay::scrollLockMask());
+      break;
+    case KeyPress:
+      e.xkey.state &= ~(LockMask | OBDisplay::numLockMask() |
+                        OBDisplay::scrollLockMask());
+      break;
+    case MotionNotify:
+      _lasttime = e.xmotion.time;
+      e.xmotion.state &= ~(LockMask | OBDisplay::numLockMask() |
+                           OBDisplay::scrollLockMask());
+      break;
+    case PropertyNotify:
+      _lasttime = e.xproperty.time;
+      break;
+    case EnterNotify:
+    case LeaveNotify:
+      _lasttime = e.xcrossing.time;
+      break;
+    }
+
     // madly compress all focus events
-    } else if (e.type == FocusIn) {
+    if (e.type == FocusIn) {
       // any other types are not ones we're interested in
       if (e.xfocus.detail == NotifyNonlinear) {
-        if (e.xfocus.window != focus) {
-          unfocus = focus;
-          focus = e.xfocus.window;
-        }
+        focus = e.xfocus.window;
+        unfocus = None;
+        printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus);
       }
     } else if (e.type == FocusOut) {
       // any other types are not ones we're interested in
       if (e.xfocus.detail == NotifyNonlinear) {
-        if (e.xfocus.window == focus) {
-          unfocus = focus;
-          focus = None;
-        }
+        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);
       }
     } else {
       // normal events
-      dispatch(e);
+      dispatch(win, e);
     }
   }
 
-  if (focus != _focus) {
+  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.xfocus.window, _focus_e);
+
+    _focus = None;
+  } else if (focus != None && focus != _focus) {
+    // 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);
+    dispatch(_focus_e.xfocus.window, _focus_e);
+
+    if (_focus != None) {
+      printf("UNFOCUSING: %lx\n", _focus);
+      _focus_e.xfocus.type = FocusOut;
+      _focus_e.xfocus.window = _focus;
+      dispatch(_focus_e.xfocus.window, _focus_e);
+    }
+    
     _focus = focus;
   }
-  if (unfocus != None) {
-    _focus_e.xfocus.type = FocusOut;
-    _focus_e.xfocus.window = unfocus;
-    dispatch(_focus_e);
+  
+  if (leave != None) {
+    _crossing_e.xcrossing.type = LeaveNotify;
+    _crossing_e.xcrossing.window = leave;
+    _crossing_e.xcrossing.root = leave_root;
+    dispatch(_crossing_e.xcrossing.window, _crossing_e);
+  }
+  if (enter != None) {
+    _crossing_e.xcrossing.type = EnterNotify;
+    _crossing_e.xcrossing.window = enter;
+    _crossing_e.xcrossing.root = enter_root;
+    dispatch(_crossing_e.xcrossing.window, _crossing_e);
   }
 }
 
-void OtkEventDispatcher::dispatch(const XEvent &e) {
-  OtkEventHandler *handler;
+void OtkEventDispatcher::dispatch(Window win, const XEvent &e) {
+  OtkEventHandler *handler = 0;
   OtkEventMap::iterator it;
 
-  it = _map.find(e.xany.window);
+  if (_master)
+    _master->handle(e);
+
+  it = _map.find(win);
   
   if (it != _map.end())
     handler = it->second;
-  else
+  // these ConfigureRequests require some special attention
+  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;
+      
+    XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
+                     e.xconfigurerequest.value_mask, &xwc);
+  } else
     handler = _fallback;
 
   if (handler)
     handler->handle(e);
-
-  if (_master)
-    _master->handle(e);
 }
 
 OtkEventHandler *OtkEventDispatcher::findHandler(Window win)