X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.cc;h=62335781dabd2370f2c4d0b419c12cf92b64e4a6;hb=f3865bb12c2b3506e181f15f09b8429a59a618f8;hp=2d177d6937912192151c6f305d144e00bee69a5b;hpb=9ec1f7cdba43874b4720c4bd9e6ea42525c4c832;p=chaz%2Fopenbox

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 2d177d69..62335781 100644
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -56,6 +56,32 @@ void OtkEventDispatcher::dispatchEvents(void)
     printf("Event %d window %lx\n", e.type, e.xany.window);
 #endif
 
+    printf("num=%u scroll=%u\n", OBDisplay::numLockMask(), OBDisplay::scrollLockMask());
+
+    // 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;
+    }
+
     // these ConfigureRequests require some special attention
     if (e.type == ConfigureRequest) {
       // find the actual window! e.xany.window is the parent window
@@ -85,14 +111,14 @@ void OtkEventDispatcher::dispatchEvents(void)
       if (e.xfocus.detail == NotifyNonlinear) {
         focus = e.xfocus.window;
         unfocus = None;
-        printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus);
+        //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) {
         unfocus = e.xfocus.window;
         focus = None;
-        printf("FocusOut focus=%lx unfocus=%lx\n", focus, unfocus);
+        //printf("FocusOut focus=%lx unfocus=%lx\n", focus, unfocus);
       }
     // madly compress all crossing events
     } else if (e.type == EnterNotify) {
@@ -101,14 +127,14 @@ void OtkEventDispatcher::dispatchEvents(void)
         // 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);
+        //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);
+        //printf("Leave enter=%lx leave=%lx\n", enter, leave);
       }
     } else {
       // normal events
@@ -118,22 +144,22 @@ void OtkEventDispatcher::dispatchEvents(void)
 
   if (unfocus != None) {
     // the last focus event was an FocusOut, so where the hell is the focus at?
-//    printf("UNFOCUSING: %lx\n", unfocus);
+    //printf("UNFOCUSING: %lx\n", unfocus);
     _focus_e.xfocus.type = FocusOut;
     _focus_e.xfocus.window = unfocus;
     dispatch(_focus_e);
 
     _focus = None;
-  } else if (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);
+    //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);
+      //printf("UNFOCUSING: %lx\n", _focus);
       _focus_e.xfocus.type = FocusOut;
       _focus_e.xfocus.window = _focus;
       dispatch(_focus_e);