summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2016-05-30 20:20:28 (GMT)
committerfvogel <fvogelnew1@free.fr>2016-05-30 20:20:28 (GMT)
commiteaeeba79fc052ae34dc42dca194a6fba26b27f98 (patch)
tree8cbe447b5ccfad9d8a09717de6f63c61e96ed7f1
parentf363246b699fde869681e5213bc1e6e100e81529 (diff)
parentf77be3e4cd37f2986f8c5960d7b61d2f800ba6b4 (diff)
downloadtk-eaeeba79fc052ae34dc42dca194a6fba26b27f98.zip
tk-eaeeba79fc052ae34dc42dca194a6fba26b27f98.tar.gz
tk-eaeeba79fc052ae34dc42dca194a6fba26b27f98.tar.bz2
Fixed tests cases bad interactions and a forgotten mouse warping case (event generate {} <...> -warp 1 is valid)
-rw-r--r--generic/tkBind.c7
-rw-r--r--tests/bind.test1
2 files changed, 6 insertions, 2 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 4374494..3b05066 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -3539,10 +3539,13 @@ DoWarp(
* DoWarp was scheduled only if the window was mapped. It needs to be
* still mapped at the time the present idle callback is executed. Also
* one needs to guard against window destruction in the meantime.
+ * Finally, the case warpWindow == NULL is special in that it means
+ * the whole screen.
*/
- if (Tk_IsMapped(dispPtr->warpWindow)
- && (Tk_WindowId(dispPtr->warpWindow) != None)) {
+ if ((dispPtr->warpWindow == NULL) ||
+ (Tk_IsMapped(dispPtr->warpWindow)
+ && (Tk_WindowId(dispPtr->warpWindow) != None))) {
TkpWarpPointer(dispPtr);
XForceScreenSaver(dispPtr->display, ScreenSaverReset);
}
diff --git a/tests/bind.test b/tests/bind.test
index ff1b4f9..892ba36 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6108,6 +6108,7 @@ test bind-32 {-warp, window was destroyed before the idle callback DoWarp} -setu
update
} -body {
event generate .t.f <Button-1> -warp 1
+ event generate .t.f <ButtonRelease-1>
destroy .t.f
update ; # shall simply not crash
} -cleanup {