Tk Source Code

* tests/panedwindow.test: * generic/tkPanedWindow.c: ensure that sash index is lower bounds checked. [Bug #548727]

* generic/tkClipboard.c (TkClipCleanup): Add code to set dispPtr->clipWindow to NULL, this was accidently removed by last commit. Fixes a crash while running the tests under win32.

* generic/tkBind.c (TkBindDeadWindow): Handle case where Tk_DestroyWindow is invoked on clipboard and send windows. * generic/tkClipboard.c (TkClipCleanup): Invoke Tk_DestroyWindow to cleanup the dispPtr->clipWindow. Call Tcl_Preserve and Tcl_Release on the window to avoid an invalid memory ref on shutdown. * generic/tkEvent.c (Tk_HandleEvent): Panic if XCreateIC is invoked twice for the same window. This should never happen, the check were just added to make sure it does not since this could lead to crashes in XCloseIM. * generic/tkFocus.c (TkFocusDeadWindow): Handle case where Tk_DestroyWindow is invoked on clipboard and send windows. * generic/tkOption.c (TkOptionDeadWindow): Ditto. * generic/tkWindow.c (TkCloseDisplay): Move deletion of dispPtr->winTable after TkpCloseDisplay call since Tk_DestroyWindow uses it and could be called by TkpCloseDisplay for clipboard/send windows. Also invoke ckfree for the dispPtr instead of doing it in TkpCloseDisplay. (Tk_DestroyWindow): Check for a null winPtr->mainPtr before doing certain cleanup tasks so the we can invoke Tk_DestroyWindow on clipboard and send windows. We need to do this so that XDestroyIC will get invoked for the input contexts of each window. * mac/tkMacXStubs.c (TkpCloseDisplay): Don't free the displayPtr since this is now done in TkCloseDisplay. * unix/tkUnixEvent.c (TkpCloseDisplay, OpenIM): Remove conditional compilation around calls to XCloseIM since I am confident that the crashes related to input contexts has been fixed. Don't free the displayPtr since this is now done in TkCloseDisplay. * unix/tkUnixSend.c (TkSendCleanup): Invoke the Tk_DestroyWindow method to cleanup the special send window. This will call XDestroyIC and thereby avoid a crash in XCloseIM. The send window needs to be Tcl_Preserve and Tcl_Release to avoid an invalid memory ref on shutdown. * win/tkWinX.c (TkpCloseDisplay): Don't free the displayPtr since this is now done in TkCloseDisplay.

* generic/tkImage.c (Tk_ImageObjCmd, DeleteImage): Call Tcl_Preserve and Tcl_Release for the masterPtr->winPtr window to avoid accessing memory that had already been deallocated in DeleteImage.

Trims to support the removal of RESOURCE_INCLUDED from rc scripts from Tcl's accepted FR #565088.

* generic/tk.h: Changed RESOURCE_INCLUDED to be RC_INVOKED as the RC tool defines this already by default.

* win/rc/tk.rc: * win/rc/wish.rc: removed the #define RESOURCE_INCLUDED lines.

* unix/Makefile.in (dist): correct installation of wish.exe.manifest to DISTDIR target directory.

* generic/tkCmds.c (Tk_TkObjCmd): * generic/tkInt.h (struct TkCaret): * mac/tkMacXStubs.c (Tk_SetCaretPos): * unix/tkUnixKey.c (TkpGetString, Tk_SetCaretPos): * win/tkWinX.c (Tk_SetCaretPos): * tests/tk.test: Added 'tk caret' implementation of TIP#96 * doc/SetCaret.3 (new): which adds a TkCaret structure element to * doc/tk.n: TkDisplay for maintaining state.

* unix/tkUnixSend.c (TkSendCleanup): special cleanup of inputContext to avoid bug in XCloseIM. (dejong)

* Added catalog for UK English. Currently includes only Color -> Colour translation.

* generic/tkWindow.c (Tk_DestroyWindow): Set the pathName component of a window to NULL after its memory has been deallocated to avoid a possible illegal memory access as a result of a call to Tk_PathName() on a Tk_Window structure of a window that has already been destroyed. [Tk bug 521946]

* generic/tkOption.c (Tk_GetOption): Allocate memory with ckalloc not malloc. This keeps Tk from erroring out when built with TCL_MEM_DEBUG.

* generic/tkBind.c (HandleEventGenerate): * generic/tkInt.h: changed warpInProgress boolean from int to a bit in the flags variable (TK_DISPLAY_IN_WARP)

* generic/tkCmds.c (Tk_TkObjCmd): * unix/tkUnixKey.c (TkpGetString): * generic/tkEvent.c (Tk_HandleEvent): * generic/tkInt.h: changed useInputMethods boolean from int to a bit in the flags variable (TK_DISPLAY_USE_IM)

* generic/tkInt.h: * generic/tkCmds.c (Tk_WmObjCmd): * unix/tkUnixWm.c (Tk_WmCmd): * win/tkWinWm.c (Tk_WmCmd): changed wmTracing from being an int to just a bit in the flags variable (TK_DISPLAY_WM_TRACING)

* generic/tkEvent.c (Tk_HandleEvent): * unix/tkUnixEvent.c (OpenIM): * unix/tkUnixKey.c (TkpGetString): * generic/tkInt.h: added TK_USE_XIM_SPOT flag bit for TkDisplay and used this to allow a runtime check to see if over-the-spot XIM is possible. If not it will try and fallback to the old-style input context, which handles things like dead keys input.

* generic/tk.decls: added TIP #84 implementation that adds a * generic/tkDecls.h: Tk_CollapseMotionEvents API which controls * generic/tkEvent.c: Tk's collapsing of incoming motion events * generic/tkInt.h: on its windows. The default remains to do * generic/tkStubInit.c: collapsing. Added a flags parameter to the * generic/tkWindow.c: internal display structure to support this * doc/QWinEvent.3: and be used in the future for other bits.

* generic/tkBind.c (TkXErrorHandler): Declare static function to avoid compiler error with VC++.

* generic/tkBind.c (ExpandPercents): Cast argument to Tk_GetAtomName in order to avoid compiler warning.

* tests/winfo.test: Add basic tests for winfo ismapped.

* tests/unixWm.test: * tests/wm.test: Move wm minsize and wm maxsize usage tests into the cross platform wm tests.

* tests/cursor.test: corrected error after cursor-2.2. * tests/defs.tcl: Added enhancements to Tk's fake version of tcltest required by recent cursor.test changes.

* changes: Clearly label wm transient changes as a POTENTIAL INCOMPATIBILITY. * doc/wm.n: Remove "some window managers will" text and explicitly state what behavior a transient window will display. Also mention that it is an error to make a window a transient of itself.

* library/choosedir.tcl (tk::dialog::file::chooseDir): * library/clrpick.tcl (tk::dialog::file::chooseDir): * library/msgbox.tcl (tk::MessageBox): * library/tkfbox.tcl (tk::dialog::file): * library/xmfbox.tcl (tk::MotifFDialog): Remove the transient property on dialogs after they have been dismissed to insulate them from further state changes in the master. This keeps a withdrawn dialog from being mapped when the master is deiconified. [Tk patch 568278]

* win/tkWinCursor.c (TkGetCursorByName): reverted fix from 2002-06-06 because it broke the ability to use built-in cursors like left_ptr.

* library/choosedir.tcl (tk::dialog::file::chooseDir): * library/clrpick.tcl (tk::dialog::color): * library/dialog.tcl (tk_dialog): * library/msgbox.tcl (tk::MessageBox): * library/tkfbox.tcl (tk::dialog::file): * library/xmfbox.tcl (tk::MotifFDialog_Create): Only make the dialog window a transient if the master is visible. This check already appeared in some of the dialogs. This patch just copies the check into those that were lacking.

* changes: Add note about new transient behavior. * tests/unixWm.test: Check that the WM_TRANSIENT_FOR property for a transient window is being cleared when the master is destroyed. * tests/wm.test: Source defs.tcl instead of using tcltest to match the rest of Tk's test files. Add new tests that ensure that a transient's state mirrors the state of the master. * unix/tkUnixWm.c (WmInfo, TkWmNewWindow, TkWmMapWindow, TkWmDeadWindow, Tk_WmCmd, WmWaitMapProc): Add numTransients member to WmInfo structure. Keep state of master and transient in sync using a callback that tracks MapNotify and UnmapNotify events. When the master is mapped, map the transient. When the master is unmapped or iconified, withdraw the transient. * win/tkWinWm.c (TkWmMapWindow, TkpWmSetState, TkWmDeadWindow, Tk_WmCmd, WmWaitVisibilityOrMapProc): Keep state of master and transient in sync using a callback that tracks MapNotify and UnmapNotify events. Move masterPtr check from TkpWmSetState into TkWmMapWindow to deal with WM_NEVER_MAPPED transients. Cleanup numTransients and the callback in TkWmDeadWindow. Cleanup numTransients and the callback only after deleting a master in wm transient command to avoid deleting the callback when an error is raised. Add support for MapNotify and UnmapNotify events to the master callback.

* library/bgerror.tcl (tk::dialog::error::bgerror): Don't set the bgerror dialog as a transient of itself since this operation is ill defined.

* changes: Document [wm transient .t .t] error. * tests/wm.test: Check that setting a window as a transient of itself raises an error. Check that passing a non-toplevel window to the wm transient command uses the enclosing toplevel. * unix/tkUnixWm.c (Tk_WmCmd): Raise an error if the user tries to make a toplevel a transient of itself. * win/tkWinWm.c (Tk_WmCmd): Raise an error if the user tries to make a toplevel a transient of itself. Test for other error before checking for the transient self error.

* unix/tkUnixWm.c (WmInfo, TkWmCleanup, TkWmNewWindow, TkWmMapWindow, TkWmDeadWindow, Tk_WmCmd): Replace WmInfo's master and masterWindowName members with a masterPtr member. This implementation is much simpler and mirrors the Win32 implementation. This change makes it easy to check the flags of the master window. No user visible changes.

* generic/tkInt.decls: Add unix decl for TkpWmSetState. * generic/tkIntPlatDecls.h: Regen. * generic/tkStubInit.c: Regen. * tests/wm.test: Test state changes between iconic, normal, and withdrawn both before and after initial mapping. * unix/tkUnixWm.c (Tk_WmCmd, TkpWmSetState): Move state change code into TkpWmSetState to more closely match the Win32 implementation. No functional changes.

* tests/embed.test: Added cross platform embed tests. Check that window passed to -use has the -container option set. * tests/wm.test: Remove useless catch call. Deiconify . just in case, stackorder tests will not pass unless it is in the normal state. Add -container flag to embedded stackorder test. * unix/tkUnixEmbed.c (TkpUseWindow): * win/tkWinEmbed.c (TkpUseWindow): Lookup Tk window based on the id passed in as the value for -use. Generate an error if the Tk window did not have the -container option set.

* mac/tkMacWm.c (Tk_WmCmd): * tests/unixWm.test: Move wm transient checks over to wm.test so they will be run on all systems. * tests/wm.test: Add tests to check for error when an iconwindow is passed to the wm transient command. * unix/tkUnixWm.c (Tk_WmCmd): * win/tkWinWm.c (Tk_WmCmd): Raise an error if one of the windows passed to the wm transient command is an iconwindow for another toplevel.

* mac/tkMacWm.c (TkWmStackorderToplevelWrapperMap): * tests/wm.test: Add embedded Window test case for the stackorder command. * unix/tkUnixWm.c (TkWmStackorderToplevelWrapperMap): * win/tkWinWm.c (TkWmStackorderToplevelWrapperMap): Ignore embedded windows during wm stackorder command.

* unix/configure: Regen. * unix/configure.in: Invoke SC_ENABLE_SHARED before calling SC_CONFIG_CFLAGS so that the SHARED_BUILD variable can be checked inside SC_CONFIG_CFLAGS. * unix/tcl.m4: Update from Tcl.

* A little namespace cleanup on Daniel Steffen's latest revisions to avoid defining new global commands.

* mac/tkMacInit.c: * mac/tkMacTclCode.r: include msgcat package in resources as bgerror depends on it. Restores ability of mac static build to run standalone (except for encoding file issues).

* mac/tkMacInit.c: * library/console.tcl: * library/tk.tcl: fix tk.tcl not sourcing library files that define bindings at startup on mac. (independent of tk library files being in resources or on auto_path)

* Cleaned up namespace usage of the bgerror dialog. Completes soft dependence on msgcat. [FR 539309]

* unix/configure: * unix/tcl.m4: change HP-11 SHLIB_LD_LIBS from "" to ${LIBS} so that the .sl knows its dependent libs.

* mac/tkMacTclCode.r: * mac/tkMacResource.r: added check of TCLTK_NO_LIBRARY_TEXT_RESOURCES #define to allow disabling the inclusion of the tk library code in the resource fork of Tk executables and shared libraries. Moved tk library code inclusion to separate file like in tcl. Added 'panedwindow' resource.

* library/button.tcl (ButtonLeave): corrected the 3 implementations of ButtonLeave to check for Priv(relief) existing before trying to use it. [Patch #541849]

* generic/tkTextDisp.c (DisplayLineBackground): * unix/tkUnix3d.c (Tk_3DHorizontalBevel): * unix/tkUnixFont.c (Tk_DrawChars): applied fixes to not overrun the X window 16-bit size limit. [Patch #541999] (bonfield)

Sorry for delaying this fix for months; I hadn't noticed that it had been reviewed! check-in: e382bf93 user: dkf tags: trunk

* generic/tkWindow.c (TkCloseDisplay): Added to centralize where a display was closed. This handles freeing memory associated with a display and closing it. (DeleteWindowsExitProc): actually close displays. This would also ideally be done in Tk_DestroyWindow when the last window on the display has been closed, but that still has unresolved order of cleanup problems. (Tk_DestroyWindow): added TkFocusFree call.

* unix/tkUnixEvent.c (TkpCloseDisplay): call TkSendCleanup and TkWmCleanup.

* generic/tkStubInit.c: * generic/tkIntPlatDecls.h: * generic/tkIntDecls.h: * generic/tkInt.decls: added TkFocusFree, TkClipCleanup and TkGCCleanup generic private procs, and TkWmCleanup, TkSendCleanup and TkFreeXId unix private procs.

* generic/tkInt.h: * unix/tkUnixXId.c (TkFreeXId): frees XID resources. Made idCleanupScheduled a Tcl_TimerToken (was int) in TkDisplay structure to allow us to delete the timer scheduled for it.

* generic/tkGC.c (TkGCCleanup): frees TkDisplay data

* unix/tkUnixWm.c (TkWmStackorderToplevel): ensure children structure is freed. (ConfigureEvent, ComputeReparentGeometry): Add extra wm tracing info (TkWmRestackToplevel): initialize changes to 0 to prevent UMR. Use WaitForConfigureNotify on all windows. This part still requires fixing as it is the root of the 2 second raise delay on some window managers (those that use extra wrapper windows of their own).

* unix/tkUnixSelect.c (SelRcvIncrProc): added missing Tcl_Release of interp

* generic/tkGet.c (FreeUidThreadExitProc): free thread-specific resources on thread exit

* unix/tkUnixFont.c (FontPkgCleanup): cleanup thread specific font resources on thread exit.

* mac/tkMacXStubs.c (TkpOpenDisplay): memset the initial display structures to 0.

* generic/tkOption.c (OptionThreadExitProc): freed tsd option stacks on thread exit. (Tk_GetOption): free mem used to get Tk_Uid

* win/tkWinX.c (Tk_SetCaretPos): remove WM_IME_STARTCOMPOSITION and place the IME position within Tk_SetCaretPos. Cache results in Tk_SetCaretPos to reduce unnecessary repositioning. Also call DestroyCaret if we receive WM_KILLFOCUS. (TkpOpenDisplay): ZeroMemory the initial display structures. (TkWinGetUnicodeEncoding): Added so that Windows only needs to cache this value one, and then free it in TkWinXCleanup. (HandleIMEComposition): add support for Win98 and ATOK13 IME. (yamamoto)

* win/tkWinInt.h: declaration for TkWinGetUnicodeEncoding * win/tkWinDialog.c (GetFileNameW): use TkWinGetUnicodeEncoding * win/tkWinInit.c (TkpDisplayWarning): use TkWinGetUnicodeEncoding * win/tkWinFont.c: use TkWinGetUnicodeEncoding instead of static unicodeEncoding.

* generic/tkConsole.c (ConsoleCmd): correct return that should have just set result code.

* generic/tkImgPhoto.c: Added PhotoFormatThreadExitProc to clean up on thread exit. (Tk_PhotoPutBlock) slight code updates

* win/configure: * win/tcl.m4: Enabled COFF as well as CV style debug info with --enable-symbols to allow Dr. Watson users to see function info. More info on debugging levels can be obtained at: http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp

* generic/tkPanedWindow.c (DestroyPanedWindow, ConfigureSlaves): fix mem leaks in not freeing slave info

* doc/wm.n: * mac/tkMacWm.c: * tests/wm.test: * unix/tkUnixWm.c: * win/tkWinWm.c: Update wm stackorder usage message to make it clear that either 1 or 3 arguments are required. [Bug 540013]

* mac/tkMacProjects.sea.hqx: added tkPanedWindow.c to projects * mac/tkMacAppInit.c: fixes to MSL stdin/stdout hookup to the TkConsole when using shared MSL libraries; fix for crashing bug on exit: writing to stdin/sterr when console has already been destroyed. (both fixes need support in MSL, see 'CW Pro6 changes' in tcl/mac/tcltkMacBuildSupport.sea.hqx) * mac/tkMacDialog.c: fixes to Navigation Services Dialog filter. * mac/tkMacDraw.c: add panic for overwide TkImages that would crash Tk on mac otherwise.

* win/tkWinButton.c (TkpDisplayButton): * generic/tkTextMark.c (TkTextInsertDisplayProc): * generic/tkCanvText.c (DisplayCanvText): * generic/tkEntry.c (DisplayEntry): added Tk_SetCaretPos calls.

* win/Makefile.in: changed gdb and shell targets to properly build all binaries before running (otherwise an error often occured).

* unix/tkUnixWm.c (CreateWrapper): Removed redundat setting of inputContext to null.

* unix/tkUnixEvent.c: * generic/tkWindow.c: moved OpenIM over to tkUnixEvent.c. Removed setting inputContext to null in Tk_MakeWindowExist as it was redundant.

* generic/tkInt.h: added TK_XIM_SPOT #define (default 1). Added XFontSet attribute to TkDisplay when TK_XIM_SPOT is true. * generic/tkEvent.c (Tk_HandleEvent): made sure inputContexts are not getting created on DestroyNotify events (for dead windows). Added over-the-spot support if TK_XIM_SPOT is defined (default). The is the nicer XIM behavior, but uses a bit more memory.

* win/tkWinX.c: added Tk_SetCaretPos code to position IME windows correctly when WM_IME_STARTCOMPOSITION is received.

* unix/tkUnixKey.c: added Tk_SetCaretPos and code for setting XIM caret in TkpGetString.

* generic/tkStubInit.c: * generic/tkDecls.h: * generic/tk.decls: added Tk_SetCaretPos declaration. This command allows users to indicate the cursor position and is used by XIM (Unix) or IME (Windows) to place the caret box correctly. It is also part of correct Accessibility style on Windows to make the magnifier jump to the focus point.

* win/makefile.vc: Tk helpfile is now installing itself into Tcl's contents file as part of the install target and rebuilding the contents table as desired. [Bug 527941]

* win/.cvsignore (new): * win/lamp.bmp (new): * win/makefile.vc: * win/nmakehlp.c (new): * win/rules.vc: Brought the makefile up-to-date with Tcl's one. This now has support for Win9x issues and the winhelp target now exists. Color scheme can be changed. I'm just imparting a first suggestion using orange :) I'll have to think about the install portion of the helpfile as I'll need to do some tricks to insert tk's contents file into Tcl's using some special winhlp32.exe switches. [Bug 533862 527941]

* Ran 'autoconf' - forgotten when bump to 8.4a5.

* Updates to handle change in type of part2 argument of Tcl_VarTraceProc typedef. [TIP 27] [Patch 532644].

* generic/tkOldConfig.c (Tk_ConfigureValue): prevent leaving interp->result as NULL.

* win/tkWinX.c: Define _WIN32_IE as 0x0300 before including commctrl.h so that we can access the InitCommonControlsEx API when building Tk with mingw.

* library/console.tcl (ConsoleBind): Corrected console <<Paste>> binding on Unix platforms.

* generic/tkWindow.c (Tk_MainWindow, Tk_GetNumMainWindows): protect against being called before Tcl stubs are init'ed. [Bug #220916] (porter)

* generic/tkText.c (ConfigureText): reenable the blinking cursor on state change where necessary. [Bug #503772]

* tests/listbox.test: * generic/tkListbox.c: corrected error handling when setting to an invalid listvar value. [Bug #503613]

* library/scale.tcl: mirror B2 bindings to B3 on Windows to better accomodate two button mice. [Patch #493145]

* unix/configure: Regen. * unix/tcl.m4: Update from Tcl.

Added proc comments. Made configuring sash cursor more efficient. Added Cursor timer that restores the default cursor when pointer is no longer over the sash. This is necessary because Leave events won't be seen when moving into a paned child.

* library/panedwindow.tcl (ReleaseSash): changed to not pass x and y args at all (they aren't used).

* generic/tkPanedWindow.c (PanedWindowWidgetObjCmd): fixed returns that should have been breaks instead. Corrected .pw configure handling for insufficient args. [Patch #521436] (boudaillier)