A more robust approach to warping with respect to a window: make the call to TkpWarpPointer happen in TkPointerEvent instead of as an idle event. This allows to remove some update/after commands in tests since warping with respect to a window is now synchronous (it happens before event generate $win <Motion> -warp 1 ... returns).

1 files changed, 37 insertions, 0 deletions

diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 2855637..0750bd5 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -774,6 +774,33 @@ TkPointerEvent(
 	return 1;
     }
 
+    if ((eventPtr->type == MotionNotify) && !appGrabbed) {
+        if ((dispPtr->flags & TK_DISPLAY_IN_WARP)) {
+
+            /*
+             * A NULL warpWindow means warping with respect to the whole screen.
+             * We can only be here if we're warping with respect to a window.
+             */
+
+            assert(dispPtr->warpWindow);
+
+            /*
+             * Warping with respect to a window can only be done if the window is
+             * mapped. This was checked in HandleEvent. The windows needs to be
+             * still mapped at the time the present code is executed. Also
+             * one needs to guard against window destruction in the meantime.
+             */
+
+            if (Tk_IsMapped(dispPtr->warpWindow) && Tk_WindowId(dispPtr->warpWindow) != None) {
+                TkpWarpPointer(dispPtr);
+                XForceScreenSaver(dispPtr->display, ScreenSaverReset);
+            }
+	    Tcl_Release(dispPtr->warpWindow);
+	    dispPtr->warpWindow = NULL;
+            dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
+        }
+    }
+        
     if (!appGrabbed) {
 	return 1;
     }
@@ -800,6 +827,16 @@ TkPointerEvent(
 	    Tk_QueueWindowEvent(eventPtr, TCL_QUEUE_HEAD);
 	    return 0;
 	}
+        if ((dispPtr->flags & TK_DISPLAY_IN_WARP)) {
+            assert(dispPtr->warpWindow);
+            if (Tk_IsMapped(dispPtr->warpWindow) && Tk_WindowId(dispPtr->warpWindow) != None) {
+                TkpWarpPointer(dispPtr);
+                XForceScreenSaver(dispPtr->display, ScreenSaverReset);
+            }
+	    Tcl_Release(dispPtr->warpWindow);
+	    dispPtr->warpWindow = NULL;
+            dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
+        }
 	return 1;
     }