diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-10 09:05:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-10 09:05:42 (GMT) |
| commit | bb805f74b6239a7dfb381e2df229fc05b9dce46d (patch) | |
| tree | 9f5cadf56bd48c70a28b8182c91163305f120adb /generic | |
| parent | 973801d8127e97e3ed229755f4379ef7d4b327a3 (diff) | |
| parent | e41b58b108a24a08463fbc083fbfae137d3a8897 (diff) | |
| download | tk-bb805f74b6239a7dfb381e2df229fc05b9dce46d.zip tk-bb805f74b6239a7dfb381e2df229fc05b9dce46d.tar.gz tk-bb805f74b6239a7dfb381e2df229fc05b9dce46d.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkBind.c | 36 | ||||
| -rw-r--r-- | generic/tkInt.h | 1 | ||||
| -rw-r--r-- | generic/tkWindow.c | 2 |
3 files changed, 32 insertions, 7 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index aaa5386..e0cc1ca 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -1267,7 +1267,7 @@ Tk_BindEvent( */ if ((eventPtr->type >= TK_LASTEVENT) || !flagArray[eventPtr->type]) { - return; + return; } dispPtr = ((TkWindow *) tkwin)->dispPtr; @@ -3466,12 +3466,7 @@ HandleEventGenerate( if ((warp != 0) && Tk_IsMapped(tkwin)) { TkDisplay *dispPtr = TkGetDisplay(event.general.xmotion.display); - /* - * TODO: No protection is in place to handle dispPtr destruction - * before DoWarp is called back. - */ - - Tk_Window warpWindow = Tk_IdToWindow(dispPtr->display, +Tk_Window warpWindow = Tk_IdToWindow(dispPtr->display, event.general.xmotion.window); if (!(dispPtr->flags & TK_DISPLAY_IN_WARP)) { @@ -4321,6 +4316,33 @@ TkpGetBindingXEvent( } /* + *---------------------------------------------------------------------- + * + * TkpCancelWarp -- + * + * This function cancels an outstanding pointer warp and + * is called during tear down of the display. + * + * Results: + * None. + * + * Side effects: + * None. + * + *---------------------------------------------------------------------- + */ + +void +TkpCancelWarp( + TkDisplay *dispPtr) +{ + if (dispPtr->flags & TK_DISPLAY_IN_WARP) { + Tcl_CancelIdleCall(DoWarp, dispPtr); + dispPtr->flags &= ~TK_DISPLAY_IN_WARP; + } +} + +/* * Local Variables: * mode: c * c-basic-offset: 4 diff --git a/generic/tkInt.h b/generic/tkInt.h index 3138ffc..474cfb0 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -1223,6 +1223,7 @@ MODULE_SCOPE int TkInitTkCmd(Tcl_Interp *interp, MODULE_SCOPE int TkInitFontchooser(Tcl_Interp *interp, ClientData clientData); MODULE_SCOPE void TkpWarpPointer(TkDisplay *dispPtr); +MODULE_SCOPE void TkpCancelWarp(TkDisplay *dispPtr); MODULE_SCOPE int TkListCreateFrame(ClientData clientData, Tcl_Interp *interp, Tcl_Obj *listObj, int toplevel, Tcl_Obj *nameObj); diff --git a/generic/tkWindow.c b/generic/tkWindow.c index ed57280..d9b5dec 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -239,6 +239,8 @@ TkCloseDisplay( { TkClipCleanup(dispPtr); + TkpCancelWarp(dispPtr); + if (dispPtr->name != NULL) { ckfree(dispPtr->name); } |