diff options
author | fvogel <fvogelnew1@free.fr> | 2016-05-30 20:28:46 (GMT) |
---|---|---|
committer | fvogel <fvogelnew1@free.fr> | 2016-05-30 20:28:46 (GMT) |
commit | b0f8a381431c74215bad3b48731863b2f2a865ea (patch) | |
tree | 61eeb47d6a39314452eed642f297dd8fdd10fa58 /generic/tkBind.c | |
parent | 04fec7a1258813e4b388f6ed6e6111f1374065cb (diff) | |
parent | eaeeba79fc052ae34dc42dca194a6fba26b27f98 (diff) | |
download | tk-b0f8a381431c74215bad3b48731863b2f2a865ea.zip tk-b0f8a381431c74215bad3b48731863b2f2a865ea.tar.gz tk-b0f8a381431c74215bad3b48731863b2f2a865ea.tar.bz2 |
Fixed tests cases bad interactions and a forgotten mouse warping case (event generate {} <...> -warp 1 is valid)
Diffstat (limited to 'generic/tkBind.c')
-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 8ee5994..acc4e43 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); } |