diff options
author | fvogel <fvogelnew1@free.fr> | 2016-05-30 20:20:28 (GMT) |
---|---|---|
committer | fvogel <fvogelnew1@free.fr> | 2016-05-30 20:20:28 (GMT) |
commit | 9e42ca85b34fab4bd0cdb37a10589fb013b2cfc2 (patch) | |
tree | 8cbe447b5ccfad9d8a09717de6f63c61e96ed7f1 /generic | |
parent | c4a34ede5497baa4a6bd962bed122d2fd767f0c5 (diff) | |
parent | 56c80a96b5756e61c7e0c63bf00975a2e1a871ff (diff) | |
download | tk-9e42ca85b34fab4bd0cdb37a10589fb013b2cfc2.zip tk-9e42ca85b34fab4bd0cdb37a10589fb013b2cfc2.tar.gz tk-9e42ca85b34fab4bd0cdb37a10589fb013b2cfc2.tar.bz2 |
Fixed tests cases bad interactions and a forgotten mouse warping case (event generate {} <...> -warp 1 is valid)
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkBind.c | 7 |
1 files changed, 5 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); } |