* Merged 8.1 branch into the main trunk

29 files changed, 4586 insertions, 1728 deletions

diff --git a/win/README b/win/README
index b2727ae..8879da9 100644
--- a/win/README
+++ b/win/README
@@ -1,10 +1,10 @@
-Tk 8.0.5 for Windows
+Tk 8.1 for Windows
 
 by Scott Stanton
 Scriptics Corporation
 scott.stanton@scriptics.com
 
-RCS: @(#) $Id: README,v 1.8 1999/02/09 03:46:27 stanton Exp $
+RCS: @(#) $Id: README,v 1.9 1999/04/16 01:51:48 stanton Exp $
 
 1. Introduction
 ---------------
@@ -17,25 +17,25 @@ contains information specific to the Windows version of Tk.
 2. Distribution notes
 ---------------------
 
-Tk 8.0 for Windows is distributed in binary form in addition to the
+Tk 8.1 for Windows is distributed in binary form in addition to the
 common source release.  The binary distribution is a self-extracting
 archive with a built-in installation script.
 
 Look for the binary release in the same location as the source release
-(ftp.scriptics.com:/pub/tcl/tcl8_0 or any of the mirror sites).  For
-most users, the binary release will be much easier to install and use.
-You only need the source release if you plan to modify the core of
-Tcl, or if you need to compile with a different compiler.  With the
-addition of the dynamic loading interface, it is no longer necessary
-to have the source distribution in order to build and use extensions.
+(ftp.scriptics.com:/pub/tcl/tcl8_1 or any of the mirror sites).  For most users,
+the binary release will be much easier to install and use.  You only
+need the source release if you plan to modify the core of Tcl, or if
+you need to compile with a different compiler.  With the addition of
+the dynamic loading interface, it is no longer necessary to have the
+source distribution in order to build and use extensions.
 
 3. Compiling Tk
 ----------------
 
 In order to compile Tk for Windows, you need the following items:
 
-	Tcl 8.0 Source Distribution (plus any patches)
-	Tk 8.0 Source Distribution (plus any patches)
+	Tcl 8.1 Source Distribution (plus any patches)
+	Tk 8.1 Source Distribution (plus any patches)
 
 	The latest Win32 SDK header files
 
@@ -43,7 +43,7 @@ In order to compile Tk for Windows, you need the following items:
 	  or
 	Visual C++ 2.x or later
 
-In practice, 8.0.5 was built with Visual C++ 5.0
+In practice, 8.1 was built with Visual C++ 5.0
 
 In the "win" subdirectory of the source release, you will find two
 files called "makefile.bc" and "makefile.vc".  These are the makefiles
@@ -59,19 +59,20 @@ find them.  Tk looks in one of two places for the library files:
 
 	1) The environment variable "TK_LIBRARY".
 
-	2) In the lib\tk8.0 directory under the Tcl installation directory
+	2) In the lib\tk8.1 directory under the Tcl installation directory
 	   as specified in the registry:
 
-		HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0
-		Value Name is "Root"
+		    HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.1\
 
 	2) Relative to the directory containing the current .exe.
-	    Tk will look for a directory "..\lib\tk8.0" relative to the
+	    Tk will look for a directory "..\lib\tk8.1" relative to the
 	    directory containing the currently running .exe.
 
-Note that in order to run wish80.exe, you must ensure that tcl80.dll,
-tclpip80.dll, and tk80.dll are on your path, in the system directory,
-or in the directory containing wish80.exe.
+Note that in order to run wish81.exe, you must ensure that tcl81.dll,
+tclpip81.dll, and tk81.dll are on your path, in the system directory, 
+or in the directory containing wish81.exe.
+
+Note that Tk no longer supports Win32s.
 
 4. Test suite
 -------------
@@ -102,15 +103,14 @@ Windows beta version of Tk:
 - Tk_dialog appears in the upper left corner.  This is a symptom of a
   larger problem with "wm geometry" when applied to unmapped or
   iconified windows.
-- Some keys don't work on international keyboards.
 - PPM images are using the wrong translation mode for writing to
   files, resulting in CR/LF terminated PPM files.
 - Tk crashes if the display depth changes while it is running.  Tk
   also doesn't consistently track changes in the system colors.
 
 If you have comments or bug reports for the Windows version of Tk,
-please direct them to:
+please use our on-line bug form at:
 
-<bugs@scriptics.com>
+http://www.scriptics.com/support/bugForm.html
 
 or post them to the newsgroup comp.lang.tcl.
diff --git a/win/makefile.bc b/win/makefile.bc
index 57642d9..46814e6 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -1,11 +1,11 @@
 # Borland C++ 4.5 makefile for Tk
 #
-# Copyright (c) 1995-1996 by Sun Microsystems, Inc.
+# Copyright (c) 1995-1997 by Sun Microsystems, Inc.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: makefile.bc,v 1.8 1999/02/04 21:02:58 stanton Exp $
+# RCS: @(#) $Id: makefile.bc,v 1.9 1999/04/16 01:51:48 stanton Exp $
 
 
 #
@@ -19,7 +19,7 @@
 ROOT	= ..
 TMPDIR	= .
 TOOLS	= c:\bc45
-TCLDIR	= ..\..\tcl8.0.5
+TCLDIR	= ..\..\tcl8.1b3
 
 # uncomment the following line to compile with symbols
 #DEBUG=1
@@ -104,6 +104,7 @@ TKOBJS = \
 	$(TMPDIR)\tkWinButton.obj \
 	$(TMPDIR)\tkWinClipboard.obj \
 	$(TMPDIR)\tkWinColor.obj \
+	$(TMPDIR)\tkWinConfig.obj \
 	$(TMPDIR)\tkWinCursor.obj \
 	$(TMPDIR)\tkWinDialog.obj \
 	$(TMPDIR)\tkWinDraw.obj \
@@ -118,6 +119,7 @@ TKOBJS = \
 	$(TMPDIR)\tkWinRegion.obj \
 	$(TMPDIR)\tkWinScrlbr.obj \
 	$(TMPDIR)\tkWinSend.obj \
+	$(TMPDIR)\tkWinTest.obj \
 	$(TMPDIR)\tkWinWindow.obj \
 	$(TMPDIR)\tkWinWm.obj \
 	$(TMPDIR)\tkWinX.obj \
@@ -168,6 +170,8 @@ TKOBJS = \
 	$(TMPDIR)\tkMenubutton.obj \
 	$(TMPDIR)\tkMenuDraw.obj \
 	$(TMPDIR)\tkMessage.obj \
+	$(TMPDIR)\tkObj.obj \
+	$(TMPDIR)\tkOldConfig.obj \
 	$(TMPDIR)\tkOption.obj \
 	$(TMPDIR)\tkPack.obj \
 	$(TMPDIR)\tkPlace.obj \
@@ -189,11 +193,11 @@ TKOBJS = \
 	$(TMPDIR)\tkVisual.obj \
 	$(TMPDIR)\tkWindow.obj
 
-TCLDLL = tcl80.dll
-TCLLIB = tcl80.lib
-TKDLL = tk80.dll
-TKLIB = tk80.lib
-WISH = wish80.exe
+TCLDLL = tcl81.dll
+TCLLIB = tcl81.lib
+TKDLL = tk81.dll
+TKLIB = tk81.lib
+WISH = wish81.exe
 TKTEST = tktest.exe
 
 #
diff --git a/win/makefile.vc b/win/makefile.vc
index 99eaece..508d260 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -3,8 +3,8 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# RCS: @(#) $Id: makefile.vc,v 1.21 1999/04/16 01:25:56 stanton Exp $
+# Copyright (c) 1995-1997 Sun Microsystems, Inc.
+# RCS: @(#) $Id: makefile.vc,v 1.22 1999/04/16 01:51:48 stanton Exp $
 
 # Does not depend on the presence of any environment variables in
 # order to compile tcl; all needed information is derived from 
@@ -28,12 +28,15 @@
 ROOT		= ..
 TOOLS32		= c:\program files\devstudio\vc
 TOOLS32_rc	= c:\program files\devstudio\sharedide
-TCLDIR		= ..\..\tcl8.0.5
-INSTALLDIR	= c:\program files\tcl
+TCLDIR		= ..\..\tcl8.1b3
+INSTALLDIR      = c:\program files\tcl
 
 # Set this to the appropriate value of /MACHINE: for your platform
 MACHINE	= IX86
 
+# Uncomment the following line to compile with thread support
+#THREADDEFINES = -DTCL_THREADS=1
+
 # Set NODEBUG to 0 to compile with symbols
 NODEBUG = 1
 
@@ -46,11 +49,13 @@ NODEBUG = 1
 
 TCLNAMEPREFIX = tcl
 TKNAMEPREFIX = tk
-TCLSTUBPREFIX = $(TCLNAMEPREFIX)stub
-TKSTUBPREFIX = $(TKNAMEPREFIX)stub
 WISHNAMEPREFIX = wish
-VERSION = 80
-DOTVERSION = 8.0
+VERSION = 81
+DOTVERSION = 8.1
+
+TCLSTUBPREFIX = $(TCLNAMEPREFIX)stub
+TKSTUBPREFIX  = $(TKNAMEPREFIX)stub
+
 
 BINROOT		= .
 !IF "$(NODEBUG)" == "1"
@@ -69,7 +74,7 @@ TCLPLUGINLIB 	= $(TCLNAMEPREFIX)$(VERSION)p.lib
 TCLSTUBLIB	= $(TCLSTUBPREFIX)$(VERSION)$(DBGX).lib
 TKDLLNAME	= $(TKNAMEPREFIX)$(VERSION)$(DBGX).dll
 TKDLL 		= $(OUTDIR)\$(TKDLLNAME)
-TKLIB		= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)$(DBGX).lib
+TKLIB 		= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)$(DBGX).lib
 TKSTUBLIBNAME	= $(TKSTUBPREFIX)$(VERSION)$(DBGX).lib
 TKSTUBLIB	= $(OUTDIR)\$(TKSTUBLIBNAME)
 TKPLUGINDLLNAME	= $(TKNAMEPREFIX)$(VERSION)p$(DBG).dll
@@ -77,9 +82,11 @@ TKPLUGINDLL 	= $(OUTDIR)\$(TKPLUGINDLLNAME)
 TKPLUGINLIB 	= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)p$(DBGX).lib
 
 WISH 		= $(OUTDIR)\$(WISHNAMEPREFIX)$(VERSION)$(DBGX).exe
+WISHC 		= $(OUTDIR)\$(WISHNAMEPREFIX)c$(VERSION)$(DBGX).exe
 WISHP 		= $(OUTDIR)\$(WISHNAMEPREFIX)p$(VERSION)$(DBGX).exe
 TKTEST 		= $(OUTDIR)\$(TKNAMEPREFIX)test.exe
 DUMPEXTS 	= $(TMPDIR)\dumpexts.exe
+CAT32           = $(TMPDIR)\cat32.exe
 
 BIN_INSTALL_DIR = $(INSTALLDIR)\bin
 INCLUDE_INSTALL_DIR = $(INSTALLDIR)\include
@@ -92,7 +99,9 @@ WISHOBJS = \
 TKTESTOBJS = \
 	$(TMPDIR)\tkTest.obj \
 	$(TMPDIR)\tkSquare.obj \
-	$(TMPDIR)\testMain.obj
+	$(TMPDIR)\testMain.obj \
+# the tkThreadTest.c file has not been checked it yet.
+#	$(TMPDIR)\tkThreadTest.obj
 
 XLIBOBJS = \
 	$(TMPDIR)\xcolors.obj \
@@ -111,6 +120,7 @@ TKOBJS = \
 	$(TMPDIR)\tkWinButton.obj \
 	$(TMPDIR)\tkWinClipboard.obj \
 	$(TMPDIR)\tkWinColor.obj \
+	$(TMPDIR)\tkWinConfig.obj \
 	$(TMPDIR)\tkWinCursor.obj \
 	$(TMPDIR)\tkWinDialog.obj \
 	$(TMPDIR)\tkWinDraw.obj \
@@ -125,6 +135,7 @@ TKOBJS = \
 	$(TMPDIR)\tkWinRegion.obj \
 	$(TMPDIR)\tkWinScrlbr.obj \
 	$(TMPDIR)\tkWinSend.obj \
+	$(TMPDIR)\tkWinTest.obj \
 	$(TMPDIR)\tkWinWindow.obj \
 	$(TMPDIR)\tkWinWm.obj \
 	$(TMPDIR)\tkWinX.obj \
@@ -175,6 +186,8 @@ TKOBJS = \
 	$(TMPDIR)\tkMenubutton.obj \
 	$(TMPDIR)\tkMenuDraw.obj \
 	$(TMPDIR)\tkMessage.obj \
+	$(TMPDIR)\tkObj.obj \
+	$(TMPDIR)\tkOldConfig.obj \
 	$(TMPDIR)\tkOption.obj \
 	$(TMPDIR)\tkPack.obj \
 	$(TMPDIR)\tkPlace.obj \
@@ -195,14 +208,11 @@ TKOBJS = \
 	$(TMPDIR)\tkUtil.obj \
 	$(TMPDIR)\tkVisual.obj \
 	$(TMPDIR)\tkStubInit.obj \
+	$(TMPDIR)\tkStubLib.obj \
 	$(TMPDIR)\tkWindow.obj
 
-TKSTUBOBJS = \
-	$(TMPDIR)\tkStubLib.obj \
-	$(TMPDIR)\tkStubs.obj \
-	$(TMPDIR)\tkPlatStubs.obj \
-	$(TMPDIR)\tkIntStubs.obj \
-	$(TMPDIR)\tkIntPlatStubs.obj
+TKSTUBOBJS = $(TMPDIR)\tkStubLib.obj \
+
 
 cc32		= "$(TOOLS32)\bin\cl.exe"
 link32		= "$(TOOLS32)\bin\link.exe"
@@ -222,7 +232,7 @@ TK_INCLUDES	= -I$(WINDIR) -I$(GENERICDIR) -I$(BITMAPDIR) -I$(XLIBDIR) \
 TK_DEFINES	= $(DEBUGDEFINES)
 
 TK_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
-			$(TK_INCLUDES) $(TK_DEFINES)
+			$(TK_INCLUDES) $(TK_DEFINES) -DUSE_TCL_STUBS
 
 WISH_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
 			$(TK_INCLUDES) $(TK_DEFINES)
@@ -263,7 +273,7 @@ libcdll = msvcrt$(DBGX).lib oldnames.lib
 baselibs   = kernel32.lib $(optlibs) advapi32.lib
 winlibs    = $(baselibs) user32.lib gdi32.lib comdlg32.lib winspool.lib
 guilibs	   = $(libc) $(winlibs)
-
+conlibs    = $(libc) $(baselibs)
 guilibsdll = $(libcdll) $(winlibs)
 
 ######################################################################
@@ -317,11 +327,23 @@ CON_CFLAGS	= $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE
 # Project specific targets
 ######################################################################
 
-all:    setup $(WISH)
-test:	setup $(TKTEST)
+all:    setup $(WISH) $(CAT32)
 install: install-binaries install-libraries
 plugin:	setup $(TKPLUGINDLL) $(WISHP)
-tktest: setup $(TKTEST)
+tktest: setup $(TKTEST) $(CAT32)
+test:	setup $(TKTEST) $(TKLIB) $(CAT32)
+	set TCL_LIBRARY=$(TCLDIR)/library
+	set PATH=$(TCLDIR)\win\$(TMPDIRNAME);$(PATH)
+	$(TKTEST) $(ROOT)/tests/all.tcl | $(CAT32)
+
+#       copy $(TCLDIR)\bin\pkgIndex.tcl $(OUTDIR)
+
+console-wish : all $(WISHC)
+
+stubs:
+	$(TCLDIR)\win\$(TMPDIRNAME)\tclsh$(VERSION)$(DBGX) \
+		$(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
+		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls
 
 setup:
 	@mkd $(TMPDIR)
@@ -334,15 +356,6 @@ install-binaries:
 	@mkd "$(LIB_INSTALL_DIR)"
 	copy $(TKLIB) "$(LIB_INSTALL_DIR)"
 
-#
-# Regenerate the stubs files.
-#
-
-stubs:
-	$(TCLDIR)\win\$(TMPDIRNAME)\tclsh$(VERSION)$(DBGX) \
-		$(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
-		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls
-
 install-libraries:
 	@mkd "$(INCLUDE_INSTALL_DIR)"
 	@mkd "$(INCLUDE_INSTALL_DIR)\X11"
@@ -357,19 +370,19 @@ install-libraries:
 	xcopy "$(ROOT)\library\demos" "$(SCRIPT_INSTALL_DIR)\demos"
 	xcopy "$(ROOT)\library\demos\images" "$(SCRIPT_INSTALL_DIR)\demos\images"
 
-$(TKLIB): $(TKDLL)
+$(TKLIB): $(TKDLL) $(TKSTUBLIB)
+
+$(TKSTUBLIB): $(TKSTUBOBJS)
+        $(lib32) /out:$@ $(TKSTUBOBJS)
 
 $(TKDLL): $(TKOBJS) $(TMPDIR)\tk.res $(TMPDIR)\tk.def
 	set LIB=$(TOOLS32)\lib
        $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tk.def \
-		-out:$@ $(TMPDIR)\tk.res $(TCLLIBDIR)\$(TCLLIB) \
+		-out:$@ $(TMPDIR)\tk.res $(TCLLIBDIR)\$(TCLSTUBLIB) \
 		$(guilibsdll) @<<
 			$(TKOBJS)
 <<
 
-$(TKSTUBLIB): $(TKSTUBOBJS)
-	$(lib32) /out:$@ $(TKSTUBOBJS)
-
 $(TKPLUGINLIB): $(TKPLUGINDLL)
 
 $(TKPLUGINDLL): $(TKOBJS) $(TMPDIR)\tk.res $(TMPDIR)\plugin.def
@@ -380,23 +393,25 @@ $(TKPLUGINDLL): $(TKOBJS) $(TMPDIR)\tk.res $(TMPDIR)\plugin.def
 			$(TKOBJS)
 <<
 
-$(WISH): $(WISHOBJS) $(TKSTUBLIB) $(TKLIB) $(TMPDIR)\wish.res
+$(WISH): $(WISHOBJS) $(TKLIB) $(TMPDIR)\wish.res
 	set LIB=$(TOOLS32)\lib
-	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -stack:2300000 \
-		-out:$@ \
+	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@ \
+		$(guilibsdll) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB) $(WISHOBJS) 
+
+$(WISHC): $(WISHOBJS) $(TKLIB) $(TMPDIR)\wish.res
+	set LIB=$(TOOLS32)\lib
+	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\wish.res -out:$@ \
 		$(guilibsdll) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB) $(WISHOBJS) 
 
 $(WISHP): $(WISHOBJS) $(TKPLUGINLIB) $(TMPDIR)\wish.res
 	set LIB=$(TOOLS32)\lib
-	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -stack:2300000 \
-		-out:$@ \
+	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@ \
 		$(guilibsdll) $(TCLLIBDIR)\$(TCLPLUGINLIB) \
 		$(TKPLUGINLIB) $(WISHOBJS) 
 
-$(TKTEST): $(TKTESTOBJS) $(TKSTUBLIB) $(TMPDIR)\wish.res
+$(TKTEST): $(TKTESTOBJS) $(TKLIB) $(TMPDIR)\wish.res
 	set LIB=$(TOOLS32)\lib
-	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -stack:2300000 \
-		-out:$@ \
+	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@ \
 		$(guilibsdll) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB) $(TKTESTOBJS)
 
 $(TMPDIR)\tk.def: $(DUMPEXTS) $(TKOBJS)
@@ -415,6 +430,11 @@ $(DUMPEXTS): $(TCLDIR)\win\winDumpExts.c
 	$(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@ \
 		$(TMPDIR)\winDumpExts.obj 
 
+$(CAT32): $(TCLDIR)\win\cat.c
+	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
+	set LIB=$(TOOLS32)\lib
+	$(link32) $(conlflags) -out:$@ -stack:16384 $(TMPDIR)\cat.obj $(conlibs)
+
 #
 # Regenerate the stubs files.
 #
@@ -428,13 +448,13 @@ genstubs:
 #
 
 $(TMPDIR)\testMain.obj: $(ROOT)\win\winMain.c
-	$(cc32) $(TK_CFLAGS) -DTK_TEST -Fo$@ $?
+	$(cc32) $(WISH_CFLAGS) -DTK_TEST -Fo$@ $?
 
 $(TMPDIR)\tkTest.obj: $(ROOT)\generic\tkTest.c
-	$(cc32) $(TK_CFLAGS) -Fo$@ $?
+	$(cc32) $(WISH_CFLAGS) -Fo$@ $?
 
 $(TMPDIR)\tkSquare.obj: $(ROOT)\generic\tkSquare.c
-	$(cc32) $(TK_CFLAGS) -Fo$@ $?
+	$(cc32) $(WISH_CFLAGS) -Fo$@ $?
 
 $(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
 	$(cc32) $(WISH_CFLAGS) -Fo$@ $?
@@ -456,7 +476,8 @@ $(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
 	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
 
 {$(RCDIR)}.rc{$(TMPDIR)}.res:
-	$(rc32) -fo $@ -r -i $(GENERICDIR) $<
+	$(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TOOLS32)\include" \
+		-i "$(TCLDIR)\generic" $<
 
 clean:
         -@del $(OUTDIR)\*.exp 
diff --git a/win/rc/tk.rc b/win/rc/tk.rc
index bab7515..3960c3e 100644
--- a/win/rc/tk.rc
+++ b/win/rc/tk.rc
@@ -1,8 +1,9 @@
-// RCS: @(#) $Id: tk.rc,v 1.2 1998/09/14 18:24:02 stanton Exp $
+// RCS: @(#) $Id: tk.rc,v 1.3 1999/04/16 01:51:55 stanton Exp $
 //
 // Version
 //
 
+#include <windows.h>
 #define RESOURCE_INCLUDED
 #include <tk.h>
 
@@ -37,6 +38,36 @@ BEGIN
     END
 END
 
+#include <dlgs.h>
+FILEOPENORD DIALOG DISCARDABLE  36, 24, 218, 138
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Choose Directory"
+FONT 8, "Helv"
+BEGIN
+    LTEXT           "Directory &name:",-1,8,6,118,9
+    EDITTEXT        edt10,8,26,144,12, WS_TABSTOP | ES_AUTOHSCROLL
+    LISTBOX         lst2,8,40,144,64,LBS_SORT | LBS_OWNERDRAWFIXED | 
+                    LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | 
+                    LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Dri&ves:",stc4,8,106,92,9
+    COMBOBOX        cmb2,8,115,144,68,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | 
+                    CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | 
+                    WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "OK",1,160,6,50,14,WS_GROUP
+    PUSHBUTTON      "Cancel",2,160,24,50,14,WS_GROUP
+    PUSHBUTTON      "&Help",psh15,160,42,50,14,WS_GROUP
+    CHECKBOX        "&Read only",chx1,160,66,50,12,WS_GROUP
+    PUSHBUTTON      "Net&work...",psh14,160,115,50,14,WS_GROUP
+
+    LTEXT           "a",stc3,9,143,114,15
+    EDITTEXT        edt1,7,158,135,20,NOT WS_TABSTOP
+    LISTBOX         lst1,8,205,134,42,LBS_NOINTEGRALHEIGHT
+    COMBOBOX        cmb1,8,253,135,21,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | 
+                    CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | 
+                    WS_VSCROLL
+
+END
+
 //
 // Icons
 //
diff --git a/win/tkWin.h b/win/tkWin.h
index 191ceea..c9fc84c 100644
--- a/win/tkWin.h
+++ b/win/tkWin.h
@@ -4,12 +4,12 @@
  *	Declarations of public types and interfaces that are only
  *	available under Windows.
  *
- * Copyright (c) 1996 by Sun Microsystems, Inc.
+ * Copyright (c) 1996-1997 by Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWin.h,v 1.5 1999/03/10 07:04:46 stanton Exp $
+ * RCS: @(#) $Id: tkWin.h,v 1.6 1999/04/16 01:51:48 stanton Exp $
  */
 
 #ifndef _TKWIN
@@ -28,7 +28,6 @@
 # define TCL_STORAGE_CLASS DLLEXPORT
 #endif
 
-
 /*
  * The following messages are use to communicate between a Tk toplevel
  * and its container window.
@@ -47,6 +46,7 @@
  *
  *--------------------------------------------------------------
  */
+
 #include "tkPlatDecls.h"
 
 # undef TCL_STORAGE_CLASS
diff --git a/win/tkWin32Dll.c b/win/tkWin32Dll.c
index bfbdad2..7b43d99 100644
--- a/win/tkWin32Dll.c
+++ b/win/tkWin32Dll.c
@@ -8,12 +8,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWin32Dll.c,v 1.2 1998/09/14 18:23:59 stanton Exp $
+ * RCS: @(#) $Id: tkWin32Dll.c,v 1.3 1999/04/16 01:51:48 stanton Exp $
  */
 
-#include "tkPort.h"
 #include "tkWinInt.h"
 
+static int tkPlatformId;
+
 /*
  * The following declaration is for the VC++ DLL entry point.
  */
@@ -70,6 +71,8 @@ DllMain(hInstance, reason, reserved)
     DWORD reason;
     LPVOID reserved;
 {
+    OSVERSIONINFO os;
+
     /*
      * If we are attaching to the DLL from a new process, tell Tk about
      * the hInstance to use. If we are detaching then clean up any
@@ -77,9 +80,40 @@ DllMain(hInstance, reason, reserved)
      */
     
     if (reason == DLL_PROCESS_ATTACH) {
+	os.dwOSVersionInfoSize = sizeof(os);
+	GetVersionEx(&os);
+	tkPlatformId = os.dwPlatformId;
+
         TkWinXInit(hInstance);
     } else if (reason == DLL_PROCESS_DETACH) {
         TkWinXCleanup(hInstance);
     }
     return(TRUE);
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkWinGetPlatformId --
+ *
+ *	Determines whether running under NT, 95, or Win32s, to allow 
+ *	runtime conditional code.
+ *
+ * Results:
+ *	The return value is one of:
+ *	    VER_PLATFORM_WIN32s		Win32s on Windows 3.1. 
+ *	    VER_PLATFORM_WIN32_WINDOWS	Win32 on Windows 95.
+ *	    VER_PLATFORM_WIN32_NT	Win32 on Windows NT
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int		
+TkWinGetPlatformId()
+{
+    return tkPlatformId;
+}
+
diff --git a/win/tkWin3d.c b/win/tkWin3d.c
index 9b95c63..5f90e60 100644
--- a/win/tkWin3d.c
+++ b/win/tkWin3d.c
@@ -9,11 +9,11 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWin3d.c,v 1.2 1998/09/14 18:23:59 stanton Exp $
+ * RCS: @(#) $Id: tkWin3d.c,v 1.3 1999/04/16 01:51:49 stanton Exp $
  */
 
-#include <tk3d.h>
-#include <tkWinInt.h>
+#include "tkWinInt.h"
+#include "tk3d.h"
 
 /*
  * This structure is used to keep track of the extra colors used by
diff --git a/win/tkWinButton.c b/win/tkWinButton.c
index ee9b29e..16fcf9e 100644
--- a/win/tkWinButton.c
+++ b/win/tkWinButton.c
@@ -4,12 +4,12 @@
  *	This file implements the Windows specific portion of the button
  *	widgets.
  *
- * Copyright (c) 1996 by Sun Microsystems, Inc.
+ * Copyright (c) 1996-1998 by Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinButton.c,v 1.2 1998/09/14 18:23:59 stanton Exp $
+ * RCS: @(#) $Id: tkWinButton.c,v 1.3 1999/04/16 01:51:49 stanton Exp $
  */
 
 #define OEMRESOURCE
@@ -65,26 +65,20 @@ enum {
 };
 
 /*
- * Set to non-zero if this module is initialized.
+ * Cached information about the boxes bitmap, and the default border 
+ * width for a button in string form for use in Tk_OptionSpecs for 
+ * the various button widget classes.
  */
 
-static int initialized = 0;
-
-/*
- * Variables for the cached information about the boxes bitmap.
- */
-
-static BITMAPINFOHEADER *boxesPtr = NULL;   /* Information about the bitmap. */
-static DWORD *boxesPalette = NULL;	    /* Pointer to color palette. */
-static LPSTR boxesBits = NULL;		    /* Pointer to bitmap data. */
-static DWORD boxHeight = 0, boxWidth = 0;    /* Size of each sub-image. */
-
-/*
- * This variable holds the default border width for a button in string
- * form for use in a Tk_ConfigSpec.
- */
-
-static char defWidth[8];
+typedef struct ThreadSpecificData { 
+    BITMAPINFOHEADER *boxesPtr;   /* Information about the bitmap. */
+    DWORD *boxesPalette;	  /* Pointer to color palette. */
+    LPSTR boxesBits;		  /* Pointer to bitmap data. */
+    DWORD boxHeight;              /* Height of each sub-image. */
+    DWORD boxWidth ;              /* Width of each sub-image. */
+    char defWidth[TCL_INTEGER_SPACE];
+} ThreadSpecificData;
+static Tcl_ThreadDataKey dataKey;
 
 /*
  * Declarations for functions defined in this file.
@@ -99,7 +93,6 @@ static DWORD		ComputeStyle _ANSI_ARGS_((WinButton* butPtr));
 static Window		CreateProc _ANSI_ARGS_((Tk_Window tkwin,
 			    Window parent, ClientData instanceData));
 static void		InitBoxes _ANSI_ARGS_((void));
-static void		UpdateButtonDefaults _ANSI_ARGS_((void));
 
 /*
  * The class procedure table for the button widgets.
@@ -146,65 +139,75 @@ InitBoxes()
     HGLOBAL hblk;
     LPBITMAPINFOHEADER newBitmap;
     DWORD size;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     hrsrc = FindResource(module, "buttons", RT_BITMAP);
     if (hrsrc) {
 	hblk = LoadResource(module, hrsrc);
-	boxesPtr = (LPBITMAPINFOHEADER)LockResource(hblk);
+	tsdPtr->boxesPtr = (LPBITMAPINFOHEADER)LockResource(hblk);
     }
 
     /*
      * Copy the DIBitmap into writable memory.
      */
 
-    if (boxesPtr != NULL && !(boxesPtr->biWidth % 4)
-	    && !(boxesPtr->biHeight % 2)) {
-	size = boxesPtr->biSize + (1 << boxesPtr->biBitCount) * sizeof(RGBQUAD)
-	    + boxesPtr->biSizeImage;
+    if (tsdPtr->boxesPtr != NULL && !(tsdPtr->boxesPtr->biWidth % 4)
+	    && !(tsdPtr->boxesPtr->biHeight % 2)) {
+	size = tsdPtr->boxesPtr->biSize + (1 << tsdPtr->boxesPtr->biBitCount) 
+                * sizeof(RGBQUAD) + tsdPtr->boxesPtr->biSizeImage;
 	newBitmap = (LPBITMAPINFOHEADER) ckalloc(size);
-	memcpy(newBitmap, boxesPtr, size);
-	boxesPtr = newBitmap;
-	boxWidth = boxesPtr->biWidth / 4;
-	boxHeight = boxesPtr->biHeight / 2;
-	boxesPalette = (DWORD*) (((LPSTR)boxesPtr) + boxesPtr->biSize);
-	boxesBits = ((LPSTR)boxesPalette)
-	    + ((1 << boxesPtr->biBitCount) * sizeof(RGBQUAD));
+	memcpy(newBitmap, tsdPtr->boxesPtr, size);
+	tsdPtr->boxesPtr = newBitmap;
+	tsdPtr->boxWidth = tsdPtr->boxesPtr->biWidth / 4;
+	tsdPtr->boxHeight = tsdPtr->boxesPtr->biHeight / 2;
+	tsdPtr->boxesPalette = (DWORD*) (((LPSTR) tsdPtr->boxesPtr) 
+                + tsdPtr->boxesPtr->biSize);
+	tsdPtr->boxesBits = ((LPSTR) tsdPtr->boxesPalette)
+	    + ((1 << tsdPtr->boxesPtr->biBitCount) * sizeof(RGBQUAD));
     } else {
-	boxesPtr = NULL;
+	tsdPtr->boxesPtr = NULL;
     }
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * UpdateButtonDefaults --
+ * TkpButtonSetDefaults --
  *
- *	This function retrieves the current system defaults for
- *	the button widgets.
+ *	This procedure is invoked before option tables are created for
+ *	buttons.  It modifies some of the default values to match the
+ *	current values defined for this platform.
  *
  * Results:
- *	None.
+ *	Some of the default values in *specPtr are modified.
  *
  * Side effects:
- *	Updates the configuration defaults for buttons.
+ *	Updates some of.
  *
  *----------------------------------------------------------------------
  */
 
 void
-UpdateButtonDefaults()
+TkpButtonSetDefaults(specPtr)
+    Tk_OptionSpec *specPtr;	/* Points to an array of option specs,
+				 * terminated by one with type
+				 * TK_OPTION_END. */
 {
-    Tk_ConfigSpec *specPtr;
-    int width = GetSystemMetrics(SM_CXEDGE);
-
-    if (width == 0) {
-	width = 1;
+    int width;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
+    if (tsdPtr->defWidth[0] == 0) {
+	width = GetSystemMetrics(SM_CXEDGE);
+	if (width == 0) {
+	    width = 1;
+	}
+	sprintf(tsdPtr->defWidth, "%d", width);
     }
-    sprintf(defWidth, "%d", width);
-    for (specPtr = tkpButtonConfigSpecs; specPtr->type != TK_CONFIG_END;
-	    specPtr++) {
-	if (specPtr->offset == Tk_Offset(TkButton, borderWidth)) {
-	    specPtr->defValue = defWidth;
+    for ( ; specPtr->type != TK_OPTION_END; specPtr++) {
+	if (specPtr->internalOffset == Tk_Offset(TkButton, borderWidth)) {
+	    specPtr->defValue = tsdPtr->defWidth;
 	}
     }
 }
@@ -231,11 +234,6 @@ TkpCreateButton(tkwin)
 {
     WinButton *butPtr;
 
-    if (!initialized) {
-	UpdateButtonDefaults();
-	initialized = 1;
-    }
-
     butPtr = (WinButton *)ckalloc(sizeof(WinButton));
     butPtr->hwnd = NULL;
     return (TkButton *) butPtr;
@@ -354,23 +352,28 @@ TkpDisplayButton(clientData)
 				 * it is a flavor of button, so we offset
 				 * the text to make the button appear to
 				 * move up and down as the relief changes. */
+    DWORD *boxesPalette;
+
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
+    boxesPalette= tsdPtr->boxesPalette;
     butPtr->flags &= ~REDRAW_PENDING;
     if ((butPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) {
 	return;
     }
 
     border = butPtr->normalBorder;
-    if ((butPtr->state == tkDisabledUid) && (butPtr->disabledFg != NULL)) {
+    if ((butPtr->state == STATE_DISABLED) && (butPtr->disabledFg != NULL)) {
 	gc = butPtr->disabledGC;
-    } else if ((butPtr->state == tkActiveUid)
+    } else if ((butPtr->state == STATE_ACTIVE)
 	    && !Tk_StrictMotif(butPtr->tkwin)) {
 	gc = butPtr->activeTextGC;
 	border = butPtr->activeBorder;
     } else {
 	gc = butPtr->normalTextGC;
     }
-    if ((butPtr->flags & SELECTED) && (butPtr->state != tkActiveUid)
+    if ((butPtr->flags & SELECTED) && (butPtr->state != STATE_ACTIVE)
 	    && (butPtr->selectBorder != NULL) && !butPtr->indicatorOn) {
 	border = butPtr->selectBorder;
     }
@@ -391,7 +394,7 @@ TkpDisplayButton(clientData)
      */
 
     if (butPtr->type == TYPE_BUTTON) {
-	defaultWidth = ((butPtr->defaultState == tkActiveUid)
+	defaultWidth = ((butPtr->defaultState == DEFAULT_ACTIVE)
 		? butPtr->highlightWidth : 0);
 	offset = 1;
     } else {
@@ -500,17 +503,17 @@ TkpDisplayButton(clientData)
      */
 
     if ((butPtr->type >= TYPE_CHECK_BUTTON) && butPtr->indicatorOn
-	    && boxesPtr) {
+	    && tsdPtr->boxesPtr) {
 	int xSrc, ySrc;
 
 	x -= butPtr->indicatorSpace;
 	y -= butPtr->indicatorDiameter / 2;
 
-	xSrc = (butPtr->flags & SELECTED) ? boxWidth : 0;
-	if (butPtr->state == tkActiveUid) {
-	    xSrc += boxWidth*2;
+	xSrc = (butPtr->flags & SELECTED) ? tsdPtr->boxWidth : 0;
+	if (butPtr->state == STATE_ACTIVE) {
+	    xSrc += tsdPtr->boxWidth*2;
 	}
-	ySrc = (butPtr->type == TYPE_RADIO_BUTTON) ? 0 : boxHeight;
+	ySrc = (butPtr->type == TYPE_RADIO_BUTTON) ? 0 : tsdPtr->boxHeight;
 		
 	/*
 	 * Update the palette in the boxes bitmap to reflect the current
@@ -530,7 +533,7 @@ TkpDisplayButton(clientData)
 		border, TK_3D_LIGHT2));
 	boxesPalette[PAL_BOTTOM_OUTER] = FlipColor(TkWinGetBorderPixels(tkwin,
 		border, TK_3D_LIGHT_GC));
-	if (butPtr->state == tkDisabledUid) {
+	if (butPtr->state == STATE_DISABLED) {
 	    boxesPalette[PAL_INTERIOR] = FlipColor(TkWinGetBorderPixels(tkwin,
 		border, TK_3D_LIGHT2));
 	} else if (butPtr->selectBorder != NULL) {
@@ -543,9 +546,10 @@ TkpDisplayButton(clientData)
 		border, TK_3D_FLAT_GC));
 
 	dc = TkWinGetDrawableDC(butPtr->display, pixmap, &state);
-	StretchDIBits(dc, x, y, boxWidth, boxHeight, xSrc, ySrc, 
-		boxWidth, boxHeight, boxesBits, (LPBITMAPINFO)boxesPtr, 
-		DIB_RGB_COLORS, SRCCOPY);
+	StretchDIBits(dc, x, y, tsdPtr->boxWidth, tsdPtr->boxHeight, 
+                xSrc, ySrc, tsdPtr->boxWidth, tsdPtr->boxHeight, 
+                tsdPtr->boxesBits, (LPBITMAPINFO) tsdPtr->boxesPtr, 
+                DIB_RGB_COLORS, SRCCOPY);
 	TkWinReleaseDrawableDC(pixmap, dc, &state);
     }
 
@@ -556,7 +560,7 @@ TkpDisplayButton(clientData)
      * must temporarily modify the GC.
      */
 
-    if ((butPtr->state == tkDisabledUid)
+    if ((butPtr->state == STATE_DISABLED)
 	    && ((butPtr->disabledFg == NULL) || (butPtr->image != NULL))) {
 	if ((butPtr->flags & SELECTED) && !butPtr->indicatorOn
 		&& (butPtr->selectBorder != NULL)) {
@@ -636,6 +640,8 @@ TkpComputeButtonGeometry(butPtr)
 {
     int width, height, avgWidth;
     Tk_FontMetrics fm;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (butPtr->highlightWidth < 0) {
 	butPtr->highlightWidth = 0;
@@ -643,7 +649,7 @@ TkpComputeButtonGeometry(butPtr)
     butPtr->inset = butPtr->highlightWidth + butPtr->borderWidth;
     butPtr->indicatorSpace = 0;
 
-    if (!boxesPtr) {
+    if (!tsdPtr->boxesPtr) {
 	InitBoxes();
     }
 
@@ -657,8 +663,8 @@ TkpComputeButtonGeometry(butPtr)
 	    height = butPtr->height;
 	}
 	if ((butPtr->type >= TYPE_CHECK_BUTTON) && butPtr->indicatorOn) {
-	    butPtr->indicatorSpace = boxWidth * 2;
-	    butPtr->indicatorDiameter = boxHeight;
+	    butPtr->indicatorSpace = tsdPtr->boxWidth * 2;
+	    butPtr->indicatorDiameter = tsdPtr->boxHeight;
 	}
     } else if (butPtr->bitmap != None) {
 	Tk_SizeOfBitmap(butPtr->display, butPtr->bitmap, &width, &height);
@@ -666,8 +672,8 @@ TkpComputeButtonGeometry(butPtr)
     } else {
 	Tk_FreeTextLayout(butPtr->textLayout);
 	butPtr->textLayout = Tk_ComputeTextLayout(butPtr->tkfont,
-		butPtr->text, -1, butPtr->wrapLength, butPtr->justify, 0,
-		&butPtr->textWidth, &butPtr->textHeight);
+		Tcl_GetString(butPtr->textPtr), -1, butPtr->wrapLength,
+		butPtr->justify, 0, &butPtr->textWidth, &butPtr->textHeight);
 
 	width = butPtr->textWidth;
 	height = butPtr->textHeight;
@@ -682,7 +688,7 @@ TkpComputeButtonGeometry(butPtr)
 	}
 
 	if ((butPtr->type >= TYPE_CHECK_BUTTON) && butPtr->indicatorOn) {
-	    butPtr->indicatorDiameter = boxHeight;
+	    butPtr->indicatorDiameter = tsdPtr->boxHeight;
 	    butPtr->indicatorSpace = butPtr->indicatorDiameter + avgWidth;
 	}
 
@@ -788,7 +794,7 @@ ButtonProc(hwnd, message, wParam, lParam)
 	case BN_CLICKED: {
 	    int code;
 	    Tcl_Interp *interp = butPtr->info.interp;
-	    if (butPtr->info.state != tkDisabledUid) {
+	    if (butPtr->info.state != STATE_DISABLED) {
 		Tcl_Preserve((ClientData)interp);
 		code = TkInvokeButton((TkButton*)butPtr);
 		if (code != TCL_OK && code != TCL_CONTINUE
diff --git a/win/tkWinClipboard.c b/win/tkWinClipboard.c
index 8bf9e2b..de0b40c 100644
--- a/win/tkWinClipboard.c
+++ b/win/tkWinClipboard.c
@@ -3,12 +3,12 @@
  *
  *	This file contains functions for managing the clipboard.
  *
- * Copyright (c) 1995 Sun Microsystems, Inc.
+ * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinClipboard.c,v 1.2 1998/09/14 18:23:59 stanton Exp $
+ * RCS: @(#) $Id: tkWinClipboard.c,v 1.3 1999/04/16 01:51:49 stanton Exp $
  */
 
 #include "tkWinInt.h"
@@ -27,7 +27,7 @@
  * Results:
  *	The return value is a standard Tcl return value.
  *	If an error occurs (such as no selection exists)
- *	then an error message is left in interp->result.
+ *	then an error message is left in the interp's result.
  *
  * Side effects:
  *	None.
@@ -50,6 +50,7 @@ TkSelGetSelection(interp, tkwin, selection, target, proc, clientData)
     ClientData clientData;	/* Arbitrary value to pass to proc. */
 {
     char *data, *buffer, *destPtr;
+    Tcl_DString ds;
     HGLOBAL handle;
     int result, length;
 
@@ -72,8 +73,10 @@ TkSelGetSelection(interp, tkwin, selection, target, proc, clientData)
 		*destPtr = '\0';
 		GlobalUnlock(handle);
 		CloseClipboard();
-		result = (*proc)(clientData, interp, buffer);
+		Tcl_ExternalToUtfDString(NULL, buffer, -1, &ds);
 		ckfree(buffer);
+		result = (*proc)(clientData, interp, Tcl_DStringValue(&ds));
+		Tcl_DStringFree(&ds);
 		return result;
 	    }
 	    CloseClipboard();
@@ -119,7 +122,7 @@ XSetSelectionOwner(display, selection, owner, time)
      * It expects a Tk_Window, even though it only needs a Tk_Display.
      */
 
-    tkwin = (Tk_Window)tkMainWindowList->winPtr;
+    tkwin = (Tk_Window) TkGetMainInfoList()->winPtr;
 
     if (selection == Tk_InternAtom(tkwin, "CLIPBOARD")) {
 
@@ -162,8 +165,9 @@ TkWinClipboardRender(dispPtr, format)
     TkClipboardTarget *targetPtr;
     TkClipboardBuffer *cbPtr;
     HGLOBAL handle;
-    char *buffer, *p, *endPtr;
+    char *buffer, *p, *rawText, *endPtr;
     int length;
+    Tcl_DString ds;
 
     for (targetPtr = dispPtr->clipTargetPtr; targetPtr != NULL;
 	    targetPtr = targetPtr->nextPtr) {
@@ -183,11 +187,7 @@ TkWinClipboardRender(dispPtr, format)
 	    }
 	}
     }
-    handle = GlobalAlloc(GMEM_MOVEABLE|GMEM_DDESHARE, length+1);
-    if (!handle) {
-	return;
-    }
-    buffer = GlobalLock(handle);
+    buffer = rawText = ckalloc(length + 1);
     if (targetPtr != NULL) {
 	for (cbPtr = targetPtr->firstBufferPtr; cbPtr != NULL;
 		cbPtr = cbPtr->nextPtr) {
@@ -201,7 +201,18 @@ TkWinClipboardRender(dispPtr, format)
 	}
     }
     *buffer = '\0';
+    Tcl_UtfToExternalDString(NULL, rawText, -1, &ds);
+    ckfree(rawText);
+    handle = GlobalAlloc(GMEM_MOVEABLE|GMEM_DDESHARE,
+	    Tcl_DStringLength(&ds)+1);
+    if (!handle) {
+	Tcl_DStringFree(&ds);
+	return;
+    }
+    buffer = GlobalLock(handle);
+    memcpy(buffer, Tcl_DStringValue(&ds), Tcl_DStringLength(&ds) + 1);
     GlobalUnlock(handle);
+    Tcl_DStringFree(&ds);
     SetClipboardData(CF_TEXT, handle);
     return;
 }
diff --git a/win/tkWinColor.c b/win/tkWinColor.c
index 2c941ba..febf0cb 100644
--- a/win/tkWinColor.c
+++ b/win/tkWinColor.c
@@ -9,11 +9,11 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinColor.c,v 1.2 1998/09/14 18:23:59 stanton Exp $
+ * RCS: @(#) $Id: tkWinColor.c,v 1.3 1999/04/16 01:51:49 stanton Exp $
  */
 
-#include <tkColor.h>
-#include <tkWinInt.h>
+#include "tkWinInt.h"
+#include "tkColor.h"
 
 /*
  * The following structure is used to keep track of each color that is
@@ -27,12 +27,6 @@ typedef struct WinColor {
 } WinColor;
 
 /*
- * colorTable is a hash table used to look up X colors by name.
- */
-
-static Tcl_HashTable colorTable;
-
-/*
  * The sysColors array contains the names and index values for the
  * Windows indirect system color names.  In use, all of the names
  * will have the string "System" prepended, but we omit it in the table
@@ -75,7 +69,10 @@ static SystemColorEntry sysColors[] = {
     NULL,			0
 };
 
-static int ncolors = 0;
+typedef struct ThreadSpecificData { 
+    int ncolors;
+} ThreadSpecificData;
+static Tcl_ThreadDataKey dataKey;
 
 /*
  * Forward declarations for functions defined later in this file.
@@ -111,13 +108,15 @@ FindSystemColor(name, colorPtr, indexPtr)
     int *indexPtr;		/* Out parameter to store color index. */
 {
     int l, u, r, i;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
      * Count the number of elements in the color array if we haven't
      * done so yet.
      */
 
-    if (ncolors == 0) {
+    if (tsdPtr->ncolors == 0) {
 	SystemColorEntry *ePtr;
 	int version;
 
@@ -130,7 +129,7 @@ FindSystemColor(name, colorPtr, indexPtr)
 		    ePtr->index = COLOR_BTNHIGHLIGHT;
 		}
 	    }
-	    ncolors++;
+	    tsdPtr->ncolors++;
 	}
     }
 
@@ -139,7 +138,7 @@ FindSystemColor(name, colorPtr, indexPtr)
      */
 
     l = 0;
-    u = ncolors - 1;
+    u = tsdPtr->ncolors - 1;
     while (l <= u) {
 	i = (l + u) / 2;
 	r = strcasecmp(name, sysColors[i].name);
diff --git a/win/tkWinConfig.c b/win/tkWinConfig.c
new file mode 100644
index 0000000..1b4f0a3
--- /dev/null
+++ b/win/tkWinConfig.c
@@ -0,0 +1,60 @@
+/* 
+ * tkWinConfig.c --
+ *
+ *	This module implements the Windows system defaults for
+ *	the configuration package.
+ *
+ * Copyright (c) 1997 by Sun Microsystems, Inc.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) $Id: tkWinConfig.c,v 1.2 1999/04/16 01:51:50 stanton Exp $
+ */
+
+#include "tk.h"
+#include "tkInt.h"
+#include "tkWinInt.h"
+
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkpGetSystemDefault --
+ *
+ *	Given a dbName and className for a configuration option,
+ *	return a string representation of the option.
+ *
+ * Results:
+ *	Returns a Tk_Uid that is the string identifier that identifies
+ *	this option. Returns NULL if there are no system defaults
+ *	that match this pair.
+ *
+ * Side effects:
+ *	None, once the package is initialized.
+ *
+ *----------------------------------------------------------------------
+ */
+
+Tcl_Obj *
+TkpGetSystemDefault(
+    Tk_Window tkwin,		/* A window to use. */
+    char *dbName,		/* The option database name. */
+    char *className)		/* The name of the option class. */
+{
+    Tcl_Obj *valueObjPtr;
+    Tk_Uid classUid;
+
+    if (tkwin == NULL) {
+	return NULL;
+    }
+
+    valueObjPtr = NULL;
+    classUid = Tk_Class(tkwin);
+
+    if (strcmp(classUid, "Menu") == 0) {
+	valueObjPtr = TkWinGetMenuSystemDefault(tkwin, dbName, className);
+    }
+
+    return valueObjPtr;
+}
diff --git a/win/tkWinCursor.c b/win/tkWinCursor.c
index 4c26500..2dfba03 100644
--- a/win/tkWinCursor.c
+++ b/win/tkWinCursor.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinCursor.c,v 1.2 1998/09/14 18:23:59 stanton Exp $
+ * RCS: @(#) $Id: tkWinCursor.c,v 1.3 1999/04/16 01:51:50 stanton Exp $
  */
 
 #include "tkWinInt.h"
@@ -152,7 +152,7 @@ TkCreateCursorFromData(tkwin, source, mask, width, height, xHot, yHot,
 /*
  *----------------------------------------------------------------------
  *
- * TkFreeCursor --
+ * TkpFreeCursor --
  *
  *	This procedure is called to release a cursor allocated by
  *	TkGetCursorByName.
@@ -167,11 +167,10 @@ TkCreateCursorFromData(tkwin, source, mask, width, height, xHot, yHot,
  */
 
 void
-TkFreeCursor(cursorPtr)
+TkpFreeCursor(cursorPtr)
     TkCursor *cursorPtr;
 {
     TkWinCursor *winCursorPtr = (TkWinCursor *) cursorPtr;
-    ckfree((char *) winCursorPtr);
 }
 
 /*
diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h
index ee0f9e5..8f6a29c 100644
--- a/win/tkWinDefault.h
+++ b/win/tkWinDefault.h
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinDefault.h,v 1.2 1998/09/14 18:23:59 stanton Exp $
+ * RCS: @(#) $Id: tkWinDefault.h,v 1.3 1999/04/16 01:51:50 stanton Exp $
  */
 
 #ifndef _TKWINDEFAULT
@@ -65,7 +65,8 @@
 #define DEF_CHKRAD_FG			TEXT_FG
 #define DEF_BUTTON_FONT		CTL_FONT
 #define DEF_BUTTON_HEIGHT		"0"
-#define DEF_BUTTON_HIGHLIGHT_BG	NORMAL_BG
+#define DEF_BUTTON_HIGHLIGHT_BG_COLOR	DEF_BUTTON_BG_COLOR
+#define DEF_BUTTON_HIGHLIGHT_BG_MONO	DEF_BUTTON_BG_MONO
 #define DEF_BUTTON_HIGHLIGHT		HIGHLIGHT
 #define DEF_LABEL_HIGHLIGHT_WIDTH	"0"
 #define DEF_BUTTON_HIGHLIGHT_WIDTH	"1"
@@ -288,7 +289,8 @@
 #define DEF_MENUBUTTON_FONT		CTL_FONT
 #define DEF_MENUBUTTON_FG		NORMAL_FG
 #define DEF_MENUBUTTON_HEIGHT		"0"
-#define DEF_MENUBUTTON_HIGHLIGHT_BG	NORMAL_BG
+#define DEF_MENUBUTTON_HIGHLIGHT_BG_COLOR DEF_MENUBUTTON_BG_COLOR
+#define DEF_MENUBUTTON_HIGHLIGHT_BG_MONO  DEF_MENUBUTTON_BG_MONO
 #define DEF_MENUBUTTON_HIGHLIGHT	HIGHLIGHT
 #define DEF_MENUBUTTON_HIGHLIGHT_WIDTH	"0"
 #define DEF_MENUBUTTON_IMAGE		(char *) NULL
@@ -347,7 +349,8 @@
 #define DEF_SCALE_FG_COLOR		NORMAL_FG
 #define DEF_SCALE_FG_MONO		BLACK
 #define DEF_SCALE_FROM			"0"
-#define DEF_SCALE_HIGHLIGHT_BG		NORMAL_BG
+#define DEF_SCALE_HIGHLIGHT_BG_COLOR	DEF_SCALE_BG_COLOR
+#define DEF_SCALE_HIGHLIGHT_BG_MONO	DEF_SCALE_BG_MONO
 #define DEF_SCALE_HIGHLIGHT		HIGHLIGHT
 #define DEF_SCALE_HIGHLIGHT_WIDTH	"2"
 #define DEF_SCALE_LABEL			""
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index aa79171..bb3eb19 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -1,3 +1,4 @@
+
 /*
  * tkWinDialog.c --
  *
@@ -8,10 +9,10 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinDialog.c,v 1.2 1998/09/14 18:23:59 stanton Exp $
+ * RCS: @(#) $Id: tkWinDialog.c,v 1.3 1999/04/16 01:51:50 stanton Exp $
  *
  */
- 
+
 #include "tkWinInt.h"
 #include "tkFileFilter.h"
 
@@ -19,138 +20,139 @@
 #include <dlgs.h>       /* includes common dialog template defines */
 #include <cderr.h>      /* includes the common dialog error codes */
 
-#if ((TK_MAJOR_VERSION == 4) && (TK_MINOR_VERSION <= 2))
+typedef struct ThreadSpecificData { 
+    int debugFlag;            /* Flags whether we should output debugging 
+			       * information while displaying a builtin 
+			       * dialog. */
+    Tcl_Interp *debugInterp;  /* Interpreter to used for debugging. */
+    UINT WM_LBSELCHANGED;     /* Holds a registered windows event used for
+			       * communicating between the Directory
+			       * Chooser dialog and its hook proc. */
+} ThreadSpecificData;
+static Tcl_ThreadDataKey dataKey;
+
 /*
- * The following function is implemented on tk4.3 and after only 
+ * The following structures are used by Tk_MessageBox() to parse 
+ * arguments and return results.
  */
-#define Tk_GetHWND TkWinGetHWND
-#endif
 
-#define SAVE_FILE 0
-#define OPEN_FILE 1
+static const TkStateMap iconMap[] = {
+    {MB_ICONERROR,		"error"},
+    {MB_ICONINFORMATION,	"info"},
+    {MB_ICONQUESTION,		"question"},
+    {MB_ICONWARNING,		"warning"},
+    {-1,			NULL}
+};
+	  
+static const TkStateMap typeMap[] = {
+    {MB_ABORTRETRYIGNORE,	"abortretryignore"},
+    {MB_OK, 			"ok"},
+    {MB_OKCANCEL,		"okcancel"},
+    {MB_RETRYCANCEL,		"retrycancel"},
+    {MB_YESNO,			"yesno"},
+    {MB_YESNOCANCEL,		"yesnocancel"},
+    {-1,			NULL}
+};
 
-/*----------------------------------------------------------------------
- * MsgTypeInfo --
- *
- *	This structure stores the type of available message box in an
- *	easy-to-process format. Used by th Tk_MessageBox() function
- *----------------------------------------------------------------------
- */
-typedef struct MsgTypeInfo {
-    char * name;
-    int type;
-    int numButtons;
-    char * btnNames[3];
-} MsgTypeInfo;
-
-#define NUM_TYPES 6
-
-static MsgTypeInfo 
-msgTypeInfo[NUM_TYPES] = {
-    {"abortretryignore", MB_ABORTRETRYIGNORE, 3, {"abort", "retry", "ignore"}},
-    {"ok", 		 MB_OK, 	      1, {"ok"                      }},
-    {"okcancel",	 MB_OKCANCEL,	      2, {"ok",    "cancel"         }},
-    {"retrycancel",	 MB_RETRYCANCEL,      2, {"retry", "cancel"         }},
-    {"yesno",		 MB_YESNO,	      2, {"yes",   "no"             }},
-    {"yesnocancel",	 MB_YESNOCANCEL,      3, {"yes",   "no",    "cancel"}}
+static const TkStateMap buttonMap[] = {
+    {IDABORT,			"abort"},
+    {IDRETRY,			"retry"},
+    {IDIGNORE,			"ignore"},
+    {IDOK,			"ok"},
+    {IDCANCEL,			"cancel"},
+    {IDNO,			"no"},
+    {IDYES,			"yes"},
+    {-1,			NULL}
+};
+
+static const int buttonFlagMap[] = {
+    MB_DEFBUTTON1, MB_DEFBUTTON2, MB_DEFBUTTON3, MB_DEFBUTTON4
+};
+
+static const struct {int type; int btnIds[3];} allowedTypes[] = {
+    {MB_ABORTRETRYIGNORE,	{IDABORT, IDRETRY,  IDIGNORE}},
+    {MB_OK, 			{IDOK,    -1,       -1      }},
+    {MB_OKCANCEL,		{IDOK,    IDCANCEL, -1      }},
+    {MB_RETRYCANCEL,		{IDRETRY, IDCANCEL, -1      }},
+    {MB_YESNO,			{IDYES,   IDNO,     -1      }},
+    {MB_YESNOCANCEL,		{IDYES,   IDNO,     IDCANCEL}}
 };
 
+#define NUM_TYPES (sizeof(allowedTypes) / sizeof(allowedTypes[0]))
+
 /*
- * The following structure is used in the GetOpenFileName() and
- * GetSaveFileName() calls.
+ * The following structure is used to pass information between the directory
+ * chooser procedure, Tk_ChooseDirectoryObjCmd(), and its dialog hook proc.
  */
-typedef struct _OpenFileData {
-    Tcl_Interp * interp;
-    TCHAR szFile[MAX_PATH+1];
-} OpenFileData;
+
+typedef struct ChooseDir {
+    Tcl_Interp *interp;		/* Interp, used only if debug is turned on, 
+				 * for setting the "tk_dialog" variable. */
+    int lastCtrl;		/* Used by hook proc to keep track of last
+				 * control that had input focus, so when OK
+				 * is pressed we know whether to browse a
+				 * new directory or return. */
+    int lastIdx;		/* Last item that was selected in directory 
+				 * browser listbox. */
+    TCHAR path[MAX_PATH];	/* On return from choose directory dialog, 
+				 * holds the selected path.  Cannot return 
+				 * selected path in ofnPtr->lpstrFile because
+				 * the default dialog proc stores a '\0' in 
+				 * it, since, of course, no _file_ was 
+				 * selected. */
+} ChooseDir;
 
 /*
- * The following structure is used in the ChooseColor() call.
+ * Definitions of procedures used only in this file.
  */
-typedef struct _ChooseColorData {
-    Tcl_Interp * interp;
-    char * title;			/* Title of the color dialog */
-} ChooseColorData;
-
-
-static int 		GetFileName _ANSI_ARGS_((ClientData clientData,
-    			    Tcl_Interp *interp, int argc, char **argv,
-    			    int isOpen));
-static UINT CALLBACK	ColorDlgHookProc _ANSI_ARGS_((HWND hDlg, UINT uMsg,
-			    WPARAM wParam, LPARAM lParam));
-static int 		MakeFilter _ANSI_ARGS_((Tcl_Interp *interp,
-    			    OPENFILENAME *ofnPtr, char * string));
-static int		ParseFileDlgArgs _ANSI_ARGS_((Tcl_Interp * interp,
-    			    OPENFILENAME *ofnPtr, int argc, char ** argv,
-			    int isOpen));
-static int 		ProcessCDError _ANSI_ARGS_((Tcl_Interp * interp,
-			    DWORD dwErrorCode, HWND hWnd));
+
+static UINT APIENTRY	ChooseDirectoryHookProc(HWND hdlg, UINT uMsg, 
+			    WPARAM wParam, LPARAM lParam);
+static UINT CALLBACK	ColorDlgHookProc(HWND hDlg, UINT uMsg, WPARAM wParam,
+			    LPARAM lParam);
+static int 		GetFileName(ClientData clientData, 
+			    Tcl_Interp *interp, int objc, 
+			    Tcl_Obj *CONST objv[], int isOpen);
+static int 		MakeFilter(Tcl_Interp *interp, char *string, 
+			    Tcl_DString *dsPtr);
+static UINT APIENTRY	OFNHookProc(HWND hdlg, UINT uMsg, WPARAM wParam, 
+			    LPARAM lParam);
+static void		SetTkDialog(ClientData clientData);
+static int		TrySetDirectory(HWND hwnd, const TCHAR *dir);
 
 /*
- *----------------------------------------------------------------------
+ *-------------------------------------------------------------------------
  *
- * EvalArgv --
+ * TkWinDialogDebug --
  *
- *	Invokes the Tcl procedure with the arguments. argv[0] is set by
- *	the caller of this function. It may be different than cmdName.
- *	The TCL command will see argv[0], not cmdName, as its name if it
- *	invokes [lindex [info level 0] 0]
+ *	Function to turn on/off debugging support for common dialogs under
+ *	windows.  The variable "tk_debug" is set to the identifier of the
+ *	dialog window when the modal dialog window pops up and it is safe to 
+ *	send messages to the dialog.
  *
  * Results:
- *	TCL_ERROR if the command does not exist and cannot be autoloaded.
- *	Otherwise, return the result of the evaluation of the command.
+ *	None.
  *
  * Side effects:
- *	The command may be autoloaded.
+ *	This variable only makes sense if just one dialog is up at a time.
  *
- *----------------------------------------------------------------------
+ *-------------------------------------------------------------------------
  */
 
-static int 
-EvalArgv(interp, cmdName, argc, argv)
-    Tcl_Interp *interp;		/* Current interpreter. */
-    char * cmdName;		/* Name of the TCL command to call */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
+void	    	
+TkWinDialogDebug(
+    int debug)
 {
-    Tcl_CmdInfo cmdInfo;
-
-    if (!Tcl_GetCommandInfo(interp, cmdName, &cmdInfo)) {
-	char * cmdArgv[2];
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-	/*
-	 * This comand is not in the interpreter yet -- looks like we
-	 * have to auto-load it
-	 */
-	if (!Tcl_GetCommandInfo(interp, "auto_load", &cmdInfo)) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendResult(interp, "cannot execute command \"auto_load\"",
-		NULL);
-	    return TCL_ERROR;
-	}
-
-	cmdArgv[0] = "auto_load";
-	cmdArgv[1] = cmdName;
-
-	if ((*cmdInfo.proc)(cmdInfo.clientData, interp, 2, cmdArgv)!= TCL_OK){ 
-	    return TCL_ERROR;
-	}
-
-	if (!Tcl_GetCommandInfo(interp, cmdName, &cmdInfo)) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendResult(interp, "cannot auto-load command \"",
-		cmdName, "\"",NULL);
-	    return TCL_ERROR;
-	}
-    }
-
-    return (*cmdInfo.proc)(cmdInfo.clientData, interp, argc, argv);
+    tsdPtr->debugFlag = debug;
 }
 
 /*
- *----------------------------------------------------------------------
+ *-------------------------------------------------------------------------
  *
- * Tk_ChooseColorCmd --
+ * Tk_ChooseColorObjCmd --
  *
  *	This procedure implements the color dialog box for the Windows
  *	platform. See the user documentation for details on what it
@@ -164,106 +166,105 @@ EvalArgv(interp, cmdName, argc, argv)
  *	This window is not destroyed and will be reused the next time the
  *	application invokes the "tk_chooseColor" command.
  *
- *----------------------------------------------------------------------
+ *-------------------------------------------------------------------------
  */
 
 int
-Tk_ChooseColorCmd(clientData, interp, argc, argv)
+Tk_ChooseColorObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Main window associated with interpreter. */
     Tcl_Interp *interp;		/* Current interpreter. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
+    int objc;			/* Number of arguments. */
+    Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
-    Tk_Window parent = Tk_MainWindow(interp);
-    ChooseColorData custData;
-    int oldMode;
+    Tk_Window tkwin, parent;
+    int i, oldMode, winCode;
     CHOOSECOLOR chooseColor;
-    char * colorStr = NULL;
-    int i;
-    int winCode, tclCode;
-    XColor * colorPtr = NULL;
     static inited = 0;
-    static long dwCustColors[16];
+    static COLORREF dwCustColors[16];
     static long oldColor;		/* the color selected last time */
-
-    custData.title     = NULL;
-
-    if (!inited) {
+    static char *optionStrings[] = {
+	"-initialcolor",    "-parent",	    "-title",	    NULL
+    };
+    enum options {
+	COLOR_INITIAL,	    COLOR_PARENT,   COLOR_TITLE
+    };
+
+    if (inited == 0) {
 	/*
 	 * dwCustColors stores the custom color which the user can
-	 * modify. We store these colors in a fixed array so that the next
+	 * modify. We store these colors in a static array so that the next
 	 * time the color dialog pops up, the same set of custom colors
 	 * remain in the dialog.
 	 */
-	for (i=0; i<16; i++) {
-	    dwCustColors[i] = (RGB(255-i*10, i, i*10)) ;
+	for (i = 0; i < 16; i++) {
+	    dwCustColors[i] = RGB(255-i * 10, i, i * 10);
 	}
-	oldColor = RGB(0xa0,0xa0,0xa0);
+	oldColor = RGB(0xa0, 0xa0, 0xa0);
 	inited = 1;
     }
 
-    /*
-     * 1. Parse the arguments
-     */
-
-    chooseColor.lStructSize  = sizeof(CHOOSECOLOR) ;
-    chooseColor.hwndOwner    = 0;			/* filled in below */
-    chooseColor.hInstance    = 0;
-    chooseColor.rgbResult    = oldColor;
-    chooseColor.lpCustColors = (LPDWORD) dwCustColors ;
-    chooseColor.Flags        = CC_RGBINIT | CC_FULLOPEN | CC_ENABLEHOOK;
-    chooseColor.lCustData    = (LPARAM)&custData;
-    chooseColor.lpfnHook     = ColorDlgHookProc;
-    chooseColor.lpTemplateName = NULL;
-
-    for (i=1; i<argc; i+=2) {
-        int v = i+1;
-	int len = strlen(argv[i]);
-
-	if (strncmp(argv[i], "-initialcolor", len)==0) {
-	    if (v==argc) {goto arg_missing;}
-
-	    colorStr = argv[v];
+    tkwin = (Tk_Window) clientData;
+
+    parent			= tkwin;
+    chooseColor.lStructSize	= sizeof(CHOOSECOLOR) ;
+    chooseColor.hwndOwner	= 0;			
+    chooseColor.hInstance	= 0;
+    chooseColor.rgbResult	= oldColor;
+    chooseColor.lpCustColors	= dwCustColors ;
+    chooseColor.Flags		= CC_RGBINIT | CC_FULLOPEN | CC_ENABLEHOOK;
+    chooseColor.lCustData	= (LPARAM) NULL;
+    chooseColor.lpfnHook	= ColorDlgHookProc;
+    chooseColor.lpTemplateName	= (LPTSTR) interp;
+
+    for (i = 1; i < objc; i += 2) {
+	int index;
+	char *string;
+	Tcl_Obj *optionPtr, *valuePtr;
+
+	optionPtr = objv[i];
+	valuePtr = objv[i + 1];
+
+	if (Tcl_GetIndexFromObj(interp, optionPtr, optionStrings, "option",
+		TCL_EXACT, &index) != TCL_OK) {
+	    return TCL_ERROR;
 	}
-	else if (strncmp(argv[i], "-parent", len)==0) {
-	    if (v==argc) {goto arg_missing;}
-
-	    parent=Tk_NameToWindow(interp, argv[v], Tk_MainWindow(interp));
-	    if (parent == NULL) {
-		return TCL_ERROR;
-	    }
+	if (i + 1 == objc) {
+	    string = Tcl_GetStringFromObj(optionPtr, NULL);
+	    Tcl_AppendResult(interp, "value for \"", string, "\" missing", 
+		    (char *) NULL);
+	    return TCL_ERROR;
 	}
-	else if (strncmp(argv[i], "-title", len)==0) {
-	    if (v==argc) {goto arg_missing;}
 
-	    custData.title = argv[v];
-	}
-	else {
-    	    Tcl_AppendResult(interp, "unknown option \"", 
-		argv[i], "\", must be -initialcolor, -parent or -title",
-		NULL);
-		return TCL_ERROR;
+	string = Tcl_GetStringFromObj(valuePtr, NULL);
+	switch ((enum options) index) {
+	    case COLOR_INITIAL: {
+		XColor *colorPtr;
+
+		colorPtr = Tk_GetColor(interp, tkwin, string);
+		if (colorPtr == NULL) {
+		    return TCL_ERROR;
+		}
+		chooseColor.rgbResult = RGB(colorPtr->red / 0x100, 
+			colorPtr->green / 0x100, colorPtr->blue / 0x100);
+		break;
+	    }
+	    case COLOR_PARENT: {
+		parent = Tk_NameToWindow(interp, string, tkwin);
+		if (parent == NULL) {
+		    return TCL_ERROR;
+		}
+		break;
+	    }
+	    case COLOR_TITLE: {
+		chooseColor.lCustData = (LPARAM) string;
+		break;
+	    }
 	}
     }
 
-    if (Tk_WindowId(parent) == None) {
-	Tk_MakeWindowExist(parent);
-    }
+    Tk_MakeWindowExist(parent);
     chooseColor.hwndOwner = Tk_GetHWND(Tk_WindowId(parent));
 
-    if (colorStr != NULL) {
-	colorPtr = Tk_GetColor(interp, Tk_MainWindow(interp), colorStr);
-	if (!colorPtr) {
-	    return TCL_ERROR;
-	}
-	chooseColor.rgbResult = RGB((colorPtr->red/0x100), 
-	    (colorPtr->green/0x100), (colorPtr->blue/0x100));
-    }	
-
-    /*
-     * 2. Popup the dialog
-     */
-
     oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
     winCode = ChooseColor(&chooseColor);
     (void) Tcl_SetServiceMode(oldMode);
@@ -278,6 +279,7 @@ Tk_ChooseColorCmd(clientData, interp, argc, argv)
     /*
      * 3. Process the result of the dialog
      */
+
     if (winCode) {
 	/*
 	 * User has selected a color
@@ -285,75 +287,67 @@ Tk_ChooseColorCmd(clientData, interp, argc, argv)
 	char result[100];
 
 	sprintf(result, "#%02x%02x%02x",
-	    GetRValue(chooseColor.rgbResult), 
-	    GetGValue(chooseColor.rgbResult), 
-	    GetBValue(chooseColor.rgbResult));
+	GetRValue(chooseColor.rgbResult), 
+	        GetGValue(chooseColor.rgbResult), 
+		GetBValue(chooseColor.rgbResult));
         Tcl_AppendResult(interp, result, NULL);
-	tclCode = TCL_OK;
-
 	oldColor = chooseColor.rgbResult;
-    } else {
-	/*
-	 * User probably pressed Cancel, or an error occurred
-	 */
-	tclCode = ProcessCDError(interp, CommDlgExtendedError(), 
-	     chooseColor.hwndOwner);
-    }
-
-    if (colorPtr) {
-	Tk_FreeColor(colorPtr);
     }
-
-    return tclCode;
-
-  arg_missing:
-    Tcl_AppendResult(interp, "value for \"", argv[argc-1], "\" missing",
-	NULL);
-    return TCL_ERROR;
+    return TCL_OK;
 }
 
 /*
- *----------------------------------------------------------------------
+ *-------------------------------------------------------------------------
  *
  * ColorDlgHookProc --
  *
- *	Gets called during the execution of the color dialog. It processes
- *	the "interesting" messages that Windows send to the dialog.
+ *	Provides special handling of messages for the Color common dialog
+ *	box.  Used to set the title when the dialog first appears.
  *
  * Results:
- *	TRUE if the message has been processed, FALSE otherwise.
+ *	The return value is 0 if the default dialog box procedure should
+ *	handle the message, non-zero otherwise. 
  *
  * Side effects:
- *	Changes the title of the dialog window when it is popped up.
+ *	Changes the title of the dialog window.
  *
  *----------------------------------------------------------------------
  */
 
-static UINT
-CALLBACK ColorDlgHookProc(hDlg, uMsg, wParam, lParam)
-    HWND hDlg;			/* Handle to the color dialog */
-    UINT uMsg;			/* Type of message */
-    WPARAM wParam;		/* word param, interpretation depends on uMsg*/
-    LPARAM lParam;		/* long param, interpretation depends on uMsg*/
+static UINT CALLBACK 
+ColorDlgHookProc(hDlg, uMsg, wParam, lParam)
+    HWND hDlg;			/* Handle to the color dialog. */
+    UINT uMsg;			/* Type of message. */
+    WPARAM wParam;		/* First message parameter. */
+    LPARAM lParam;		/* Second message parameter. */
 {
-    CHOOSECOLOR * ccPtr;
-    ChooseColorData * pCustData;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     switch (uMsg) {
-      case WM_INITDIALOG:
-	/* Save the pointer to CHOOSECOLOR so that we can use it later */
-	SetWindowLong(hDlg, DWL_USER, lParam);
-
-	/* Set the title string of the dialog */
-	ccPtr = (CHOOSECOLOR*)lParam;
-	pCustData = (ChooseColorData*)(ccPtr->lCustData);
-	if (pCustData->title && *(pCustData->title)) {
- 	    SetWindowText(hDlg, (LPCSTR)pCustData->title);
-	}
+	case WM_INITDIALOG: {
+	    const char *title;
+	    CHOOSECOLOR *ccPtr;
+	    Tcl_DString ds;
 
-	return TRUE;
-    }
+	    /* 
+	     * Set the title string of the dialog.
+	     */
 
+	    ccPtr = (CHOOSECOLOR *) lParam;
+	    title = (const char *) ccPtr->lCustData;
+	    if ((title != NULL) && (title[0] != '\0')) {
+		Tcl_UtfToExternalDString(NULL, title, -1, &ds);
+		SetWindowText(hDlg, (TCHAR *) Tcl_DStringValue(&ds));
+		Tcl_DStringFree(&ds);
+	    }
+	    if (tsdPtr->debugFlag) {
+		tsdPtr->debugInterp = (Tcl_Interp *) ccPtr->lpTemplateName;
+		Tcl_DoWhenIdle(SetTkDialog, (ClientData) hDlg);
+	    }
+	    return TRUE;
+	}
+    }
     return FALSE;
 }
 
@@ -371,21 +365,18 @@ CALLBACK ColorDlgHookProc(hDlg, uMsg, wParam, lParam)
  *
  * Side effects:
  *	A dialog window is created the first this procedure is called.
- *	This window is not destroyed and will be reused the next time
- *	the application invokes the "tk_getOpenFile" or
- *	"tk_getSaveFile" command.
  *
  *----------------------------------------------------------------------
  */
 
 int
-Tk_GetOpenFileCmd(clientData, interp, argc, argv)
+Tk_GetOpenFileObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Main window associated with interpreter. */
     Tcl_Interp *interp;		/* Current interpreter. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
+    int objc;			/* Number of arguments. */
+    Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
-    return GetFileName(clientData, interp, argc, argv, OPEN_FILE);
+    return GetFileName(clientData, interp, objc, objv, 1);
 }
 
 /*
@@ -406,13 +397,13 @@ Tk_GetOpenFileCmd(clientData, interp, argc, argv)
  */
 
 int
-Tk_GetSaveFileCmd(clientData, interp, argc, argv)
+Tk_GetSaveFileObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Main window associated with interpreter. */
     Tcl_Interp *interp;		/* Current interpreter. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
+    int objc;			/* Number of arguments. */
+    Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
-    return GetFileName(clientData, interp, argc, argv, SAVE_FILE);
+    return GetFileName(clientData, interp, objc, objv, 0);
 }
 
 /*
@@ -432,41 +423,197 @@ Tk_GetSaveFileCmd(clientData, interp, argc, argv)
  */
 
 static int 
-GetFileName(clientData, interp, argc, argv, isOpen)
+GetFileName(clientData, interp, objc, objv, open)
     ClientData clientData;	/* Main window associated with interpreter. */
     Tcl_Interp *interp;		/* Current interpreter. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
-    int isOpen;			/* true if we should call GetOpenFileName(),
-				 * false if we should call GetSaveFileName() */
+    int objc;			/* Number of arguments. */
+    Tcl_Obj *CONST objv[];	/* Argument objects. */
+    int open;			/* 1 to call GetOpenFileName(), 0 to 
+				 * call GetSaveFileName(). */
 {
-    OPENFILENAME openFileName, *ofnPtr;
-    int tclCode, winCode, oldMode;
-    OpenFileData *custData;
-    char buffer[MAX_PATH+1];
-    
-    ofnPtr = &openFileName;
+    OPENFILENAME ofn;
+    TCHAR file[MAX_PATH], savePath[MAX_PATH];
+    int result, winCode, oldMode, i;
+    char *extension, *filter, *title;
+    Tk_Window tkwin;
+    Tcl_DString utfFilterString, utfDirString;
+    Tcl_DString extString, filterString, dirString, titleString;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+    static char *optionStrings[] = {
+	"-defaultextension", "-filetypes", "-initialdir", "-initialfile",
+	"-parent",	"-title",	NULL
+    };
+    enum options {
+	FILE_DEFAULT,	FILE_TYPES,	FILE_INITDIR,	FILE_INITFILE,
+	FILE_PARENT,	FILE_TITLE
+    };
+
+    result = TCL_ERROR;
+    file[0] = '\0';
 
     /*
-     * 1. Parse the arguments.
+     * Parse the arguments.
      */
-    if (ParseFileDlgArgs(interp, ofnPtr, argc, argv, isOpen) != TCL_OK) {
-	return TCL_ERROR;
+
+    extension = NULL;
+    filter = NULL;
+    Tcl_DStringInit(&utfFilterString);
+    Tcl_DStringInit(&utfDirString);
+    tkwin = (Tk_Window) clientData;
+    title = NULL;
+
+    for (i = 1; i < objc; i += 2) {
+	int index;
+	char *string;
+	Tcl_Obj *optionPtr, *valuePtr;
+
+	optionPtr = objv[i];
+	valuePtr = objv[i + 1];
+
+	if (Tcl_GetIndexFromObj(interp, optionPtr, optionStrings, "option", 
+		0, &index) != TCL_OK) {
+	    goto end;
+	}
+	if (i + 1 == objc) {
+	    string = Tcl_GetStringFromObj(optionPtr, NULL);
+	    Tcl_AppendResult(interp, "value for \"", string, "\" missing", 
+		    (char *) NULL);
+	    goto end;
+	}
+
+	string = Tcl_GetStringFromObj(valuePtr, NULL);
+	switch ((enum options) index) {
+	    case FILE_DEFAULT: {
+		if (string[0] == '.') {
+		    string++;
+		}
+		extension = string;
+		break;
+	    }
+	    case FILE_TYPES: {
+		Tcl_DStringFree(&utfFilterString);
+		if (MakeFilter(interp, string, &utfFilterString) != TCL_OK) {
+		    goto end;
+		}
+		filter = Tcl_DStringValue(&utfFilterString);
+		break;
+	    }
+	    case FILE_INITDIR: {
+		Tcl_DStringFree(&utfDirString);
+		if (Tcl_TranslateFileName(interp, string, 
+			&utfDirString) == NULL) {
+		    goto end;
+		}
+		break;
+	    }
+	    case FILE_INITFILE: {
+		Tcl_DString ds;
+
+		if (Tcl_TranslateFileName(interp, string, &ds) == NULL) {
+		    goto end;
+		}
+		Tcl_UtfToExternal(NULL, NULL, Tcl_DStringValue(&ds), 
+			Tcl_DStringLength(&ds), 0, NULL, (char *) file, 
+			sizeof(file), NULL, NULL, NULL);
+		break;
+	    }
+	    case FILE_PARENT: {
+		tkwin = Tk_NameToWindow(interp, string, tkwin);
+		if (tkwin == NULL) {
+		    goto end;
+		}
+		break;
+	    }
+	    case FILE_TITLE: {
+		title = string;
+		break;
+	    }
+	}
+    }
+
+    if (filter == NULL) {
+	if (MakeFilter(interp, "", &utfFilterString) != TCL_OK) {
+	    goto end;
+	}
+    }
+
+    Tk_MakeWindowExist(tkwin);
+
+    ofn.lStructSize		= sizeof(ofn);
+    ofn.hwndOwner		= Tk_GetHWND(Tk_WindowId(tkwin));
+    ofn.hInstance		= (HINSTANCE) GetWindowLong(ofn.hwndOwner, 
+					GWL_HINSTANCE);
+    ofn.lpstrFilter		= NULL;
+    ofn.lpstrCustomFilter	= NULL;
+    ofn.nMaxCustFilter		= 0;
+    ofn.nFilterIndex		= 0;
+    ofn.lpstrFile		= (LPTSTR) file;
+    ofn.nMaxFile		= MAX_PATH;
+    ofn.lpstrFileTitle		= NULL;
+    ofn.nMaxFileTitle		= 0;
+    ofn.lpstrInitialDir		= NULL;
+    ofn.lpstrTitle		= NULL;
+    ofn.Flags			= OFN_HIDEREADONLY | OFN_PATHMUSTEXIST 
+				  | OFN_NOCHANGEDIR;
+    ofn.nFileOffset		= 0;
+    ofn.nFileExtension		= 0;
+    ofn.lpstrDefExt		= NULL;
+    ofn.lpfnHook		= OFNHookProc;
+    ofn.lCustData		= (LPARAM) interp;
+    ofn.lpTemplateName		= NULL;
+
+    if (LOBYTE(LOWORD(GetVersion())) >= 4) {
+	/*
+	 * Use the "explorer" style file selection box on platforms that
+	 * support it (Win95 and NT4.0 both have a major version number
+	 * of 4).
+	 */
+
+	ofn.Flags |= OFN_EXPLORER;
+    }
+
+    if (open != 0) {
+	ofn.Flags |= OFN_FILEMUSTEXIST;
+    } else {
+	ofn.Flags |= OFN_OVERWRITEPROMPT;
+    }
+
+    if (tsdPtr->debugFlag != 0) {
+	ofn.Flags |= OFN_ENABLEHOOK;
+    }
+
+    if (extension != NULL) {
+	Tcl_UtfToExternalDString(NULL, extension, -1, &extString);
+	ofn.lpstrDefExt = (LPTSTR) Tcl_DStringValue(&extString);
+    }
+    Tcl_UtfToExternalDString(NULL, Tcl_DStringValue(&utfFilterString),
+	    Tcl_DStringLength(&utfFilterString), &filterString);
+    ofn.lpstrFilter = (LPTSTR) Tcl_DStringValue(&filterString);
+
+    if (Tcl_DStringValue(&utfDirString)[0] != '\0') {
+	Tcl_UtfToExternalDString(NULL, Tcl_DStringValue(&utfDirString),
+		Tcl_DStringLength(&utfDirString), &dirString);
+        ofn.lpstrInitialDir = (LPTSTR) Tcl_DStringValue(&dirString);
+    }
+    if (title != NULL) {
+	Tcl_UtfToExternalDString(NULL, title, -1, &titleString);
+	ofn.lpstrTitle = (LPTSTR) Tcl_DStringValue(&titleString);
     }
-    custData = (OpenFileData*) ofnPtr->lCustData;
 
     /*
-     * 2. Call the common dialog function.
+     * Popup the dialog.  
      */
+
+    GetCurrentDirectory(MAX_PATH, savePath);
     oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
-    GetCurrentDirectory(MAX_PATH+1, buffer);
-    if (isOpen) {
-	winCode = GetOpenFileName(ofnPtr);
+    if (open != 0) {
+	winCode = GetOpenFileName(&ofn);
     } else {
-	winCode = GetSaveFileName(ofnPtr);
+	winCode = GetSaveFileName(&ofn);
     }
-    SetCurrentDirectory(buffer);
-    (void) Tcl_SetServiceMode(oldMode);
+    Tcl_SetServiceMode(oldMode);
+    SetCurrentDirectory(savePath);
 
     /*
      * Clear the interp result since anything may have happened during the
@@ -475,18 +622,16 @@ GetFileName(clientData, interp, argc, argv, isOpen)
 
     Tcl_ResetResult(interp);
 
-    if (ofnPtr->lpstrInitialDir != NULL) {
-	ckfree((char*) ofnPtr->lpstrInitialDir);
-    }
-
     /*
-     * 3. Process the results.
+     * Process the results.
      */
-    if (winCode) {
+
+    if (winCode != 0) {
 	char *p;
-	Tcl_ResetResult(interp);
+	Tcl_DString ds;
 
-	for (p = custData->szFile; p && *p; p++) {
+	Tcl_ExternalToUtfDString(NULL, (char *) ofn.lpstrFile, -1, &ds);
+	for (p = Tcl_DStringValue(&ds); *p != '\0'; p++) {
 	    /*
 	     * Change the pathname to the Tcl "normalized" pathname, where
 	     * back slashes are used instead of forward slashes
@@ -495,177 +640,80 @@ GetFileName(clientData, interp, argc, argv, isOpen)
 		*p = '/';
 	    }
 	}
-	Tcl_AppendResult(interp, custData->szFile, NULL);
-	tclCode = TCL_OK;
-    } else {
-	tclCode = ProcessCDError(interp, CommDlgExtendedError(),
-		ofnPtr->hwndOwner);
+	Tcl_AppendResult(interp, Tcl_DStringValue(&ds), NULL);
+	Tcl_DStringFree(&ds);
     }
 
-    if (custData) {
-	ckfree((char*)custData);
+    if (ofn.lpstrTitle != NULL) {
+	Tcl_DStringFree(&titleString);
+    }
+    if (ofn.lpstrInitialDir != NULL) {
+	Tcl_DStringFree(&dirString);
     }
-    if (ofnPtr->lpstrFilter) {
-	ckfree((char*)ofnPtr->lpstrFilter);
+    Tcl_DStringFree(&filterString);
+    if (ofn.lpstrDefExt != NULL) {
+	Tcl_DStringFree(&extString);
     }
+    result = TCL_OK;
+
+    end:
+    Tcl_DStringFree(&utfDirString);
+    Tcl_DStringFree(&utfFilterString);
 
-    return tclCode;
+    return result;
 }
 
 /*
- *----------------------------------------------------------------------
+ *-------------------------------------------------------------------------
  *
- * ParseFileDlgArgs --
+ * OFNHookProc --
  *
- *	Parses the arguments passed to tk_getOpenFile and tk_getSaveFile.
+ *	Hook procedure called only if debugging is turned on.  Sets
+ *	the "tk_dialog" variable when the dialog is ready to receive
+ *	messages.
  *
  * Results:
- *	A standard TCL return value.
+ *	Returns 0 to allow default processing of messages to occur.
  *
  * Side effects:
- *	The OPENFILENAME structure is initialized and modified according
- *	to the arguments.
+ *	None.
  *
- *----------------------------------------------------------------------
+ *-------------------------------------------------------------------------
  */
 
-static int 
-ParseFileDlgArgs(interp, ofnPtr, argc, argv, isOpen)
-    Tcl_Interp * interp;	/* Current interpreter. */
-    OPENFILENAME *ofnPtr;	/* Info about the file dialog */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
-    int isOpen;			/* true if we should call GetOpenFileName(),
-				 * false if we should call GetSaveFileName() */
+static UINT APIENTRY 
+OFNHookProc(
+    HWND hdlg,		// handle to child dialog window
+    UINT uMsg,		// message identifier
+    WPARAM wParam,	// message parameter
+    LPARAM lParam) 	// message parameter
 {
-    OpenFileData * custData;
-    int i;
-    Tk_Window parent = Tk_MainWindow(interp);
-    int doneFilter = 0;
-    int windowsMajorVersion;
-    Tcl_DString buffer;
-
-    custData = (OpenFileData*)ckalloc(sizeof(OpenFileData));
-    custData->interp = interp;
-    strcpy(custData->szFile, "");
-
-    /* Fill in the OPENFILENAME structure to */
-    ofnPtr->lStructSize       = sizeof(OPENFILENAME);
-    ofnPtr->hwndOwner         = 0;			/* filled in below */
-    ofnPtr->lpstrFilter       = NULL;
-    ofnPtr->lpstrCustomFilter = NULL;
-    ofnPtr->nMaxCustFilter    = 0;
-    ofnPtr->nFilterIndex      = 0;
-    ofnPtr->lpstrFile         = custData->szFile;
-    ofnPtr->nMaxFile          = sizeof(custData->szFile);
-    ofnPtr->lpstrFileTitle    = NULL;
-    ofnPtr->nMaxFileTitle     = 0;
-    ofnPtr->lpstrInitialDir   = NULL;
-    ofnPtr->lpstrTitle        = NULL;
-    ofnPtr->nFileOffset       = 0;
-    ofnPtr->nFileExtension    = 0;
-    ofnPtr->lpstrDefExt       = NULL;
-    ofnPtr->lpfnHook 	      = NULL; 
-    ofnPtr->lCustData         = (DWORD)custData;
-    ofnPtr->lpTemplateName    = NULL;
-    ofnPtr->Flags             = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
-
-    windowsMajorVersion = LOBYTE(LOWORD(GetVersion()));
-    if (windowsMajorVersion >= 4) {
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+    OPENFILENAME *ofnPtr;
+
+    if (uMsg == WM_INITDIALOG) {
+	SetWindowLong(hdlg, GWL_USERDATA, lParam);
+    } else if (uMsg == WM_WINDOWPOSCHANGED) {
 	/*
-	 * Use the "explorer" style file selection box on platforms that
-	 * support it (Win95 and NT4.0, both have a major version number
-	 * of 4)
+	 * This message is delivered at the right time to both 
+	 * old-style and explorer-style hook procs to enable Tk
+	 * to set the debug information.  Unhooks itself so it 
+	 * won't set the debug information every time it gets a 
+	 * WM_WINDOWPOSCHANGED message.
 	 */
-	ofnPtr->Flags |= OFN_EXPLORER;
-    }
-
-
-    if (isOpen) {
-	ofnPtr->Flags |= OFN_FILEMUSTEXIST;
-    } else {
-	ofnPtr->Flags |= OFN_OVERWRITEPROMPT;
-    }
-
-    for (i=1; i<argc; i+=2) {
-        int v = i+1;
-	int len = strlen(argv[i]);
-
-	if (strncmp(argv[i], "-defaultextension", len)==0) {
-	    if (v==argc) {goto arg_missing;}
-
-	    ofnPtr->lpstrDefExt = argv[v];
-	    if (ofnPtr->lpstrDefExt[0] == '.') {
-		/* Windows will insert the dot for us */
-		ofnPtr->lpstrDefExt ++;
-	    }
-	}
-	else if (strncmp(argv[i], "-filetypes", len)==0) {
-	    if (v==argc) {goto arg_missing;}
-
-	    if (MakeFilter(interp, ofnPtr, argv[v]) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    doneFilter = 1;
-	}
-	else if (strncmp(argv[i], "-initialdir", len)==0) {
-	    if (v==argc) {goto arg_missing;}
-
-	    if (Tcl_TranslateFileName(interp, argv[v], &buffer) == NULL) {
-		return TCL_ERROR;
-	    }
-	    ofnPtr->lpstrInitialDir = ckalloc(Tcl_DStringLength(&buffer)+1);
-	    strcpy((char*)ofnPtr->lpstrInitialDir, Tcl_DStringValue(&buffer));
-	    Tcl_DStringFree(&buffer);
-	}
-	else if (strncmp(argv[i], "-initialfile", len)==0) {
-	    if (v==argc) {goto arg_missing;}
 
-	    if (Tcl_TranslateFileName(interp, argv[v], &buffer) == NULL) {
-		return TCL_ERROR;
+        ofnPtr = (OPENFILENAME *) GetWindowLong(hdlg, GWL_USERDATA);
+	if (ofnPtr != NULL) {
+	    if (ofnPtr->Flags & OFN_EXPLORER) {
+		hdlg = GetParent(hdlg);
 	    }
-	    strcpy(ofnPtr->lpstrFile, Tcl_DStringValue(&buffer));
-	    Tcl_DStringFree(&buffer);
+	    tsdPtr->debugInterp = (Tcl_Interp *) ofnPtr->lCustData;
+	    Tcl_DoWhenIdle(SetTkDialog, (ClientData) hdlg);
+	    SetWindowLong(hdlg, GWL_USERDATA, (LPARAM) NULL);
 	}
-	else if (strncmp(argv[i], "-parent", len)==0) {
-	    if (v==argc) {goto arg_missing;}
-
-	    parent=Tk_NameToWindow(interp, argv[v], Tk_MainWindow(interp));
-	    if (parent == NULL) {
-		return TCL_ERROR;
-	    }
-	}
-	else if (strncmp(argv[i], "-title", len)==0) {
-	    if (v==argc) {goto arg_missing;}
-
-	    ofnPtr->lpstrTitle = argv[v];
-	}
-	else {
-    	    Tcl_AppendResult(interp, "unknown option \"", 
-		argv[i], "\", must be -defaultextension, ",
-		"-filetypes, -initialdir, -initialfile, -parent or -title",
-		NULL);
-	    return TCL_ERROR;
-	}
-    }
-
-    if (!doneFilter) {
-	if (MakeFilter(interp, ofnPtr, "") != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    }
-
-    if (Tk_WindowId(parent) == None) {
-	Tk_MakeWindowExist(parent);
     }
-    ofnPtr->hwndOwner = Tk_GetHWND(Tk_WindowId(parent));
-
-    return TCL_OK;
-
-  arg_missing:
-    Tcl_AppendResult(interp, "value for \"", argv[argc-1], "\" missing",
-	NULL);
-    return TCL_ERROR;
+    return 0;
 }
 
 /*
@@ -684,10 +732,11 @@ ParseFileDlgArgs(interp, ofnPtr, argc, argv, isOpen)
  *
  *----------------------------------------------------------------------
  */
-static int MakeFilter(interp, ofnPtr, string) 
+static int 
+MakeFilter(interp, string, dsPtr) 
     Tcl_Interp *interp;		/* Current interpreter. */
-    OPENFILENAME *ofnPtr;	/* Info about the file dialog */
     char *string;		/* String value of the -filetypes option */
+    Tcl_DString *dsPtr;		/* Filled with windows filter string. */
 {
     char *filterStr;
     char *p;
@@ -702,7 +751,7 @@ static int MakeFilter(interp, ofnPtr, string)
 
     if (flist.filters == NULL) {
 	/*
-	 * Use "All Files (*.*) as the default filter is none is specified
+	 * Use "All Files (*.*) as the default filter if none is specified
 	 */
 	char *defaultFilter = "All Files (*.*)";
 
@@ -790,10 +839,8 @@ static int MakeFilter(interp, ofnPtr, string)
 	*p = '\0';
     }
 
-    if (ofnPtr->lpstrFilter != NULL) {
-	ckfree((char*)ofnPtr->lpstrFilter);
-    }
-    ofnPtr->lpstrFilter = filterStr;
+    Tcl_DStringAppend(dsPtr, filterStr, p - filterStr);
+    ckfree((char *) filterStr);
 
     TkFreeFileFilters(&flist);
     return TCL_OK;
@@ -802,249 +849,583 @@ static int MakeFilter(interp, ofnPtr, string)
 /*
  *----------------------------------------------------------------------
  *
- * Tk_MessageBoxCmd --
+ * Tk_ChooseDirectoryObjCmd --
  *
- *	This procedure implements the MessageBox window for the
- *	Windows platform. See the user documentation for details on what
- *	it does.
+ *	This procedure implements the "tk_chooseDirectory" dialog box 
+ *	for the Windows platform. See the user documentation for details 
+ *	on what it does.
  *
  * Results:
  *	See user documentation.
  *
  * Side effects:
- *	None. The MessageBox window will be destroy before this procedure
- *	returns.
+ *	A modal dialog window is created.  Tcl_SetServiceMode() is
+ *	called to allow background events to be processed
  *
  *----------------------------------------------------------------------
  */
 
 int
-Tk_MessageBoxCmd(clientData, interp, argc, argv)
+Tk_ChooseDirectoryObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Main window associated with interpreter. */
     Tcl_Interp *interp;		/* Current interpreter. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
+    int objc;			/* Number of arguments. */
+    Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
-    int flags;
-    Tk_Window parent = Tk_MainWindow(interp);
-    HWND hWnd;
-    char *message = "";
-    char *title = "";
-    int icon = MB_ICONINFORMATION;
-    int type = MB_OK;
-    int i, j;
-    char *result;
-    int code, oldMode;
-    char *defaultBtn = NULL;
-    int defaultBtnIdx = -1;
-
-    for (i=1; i<argc; i+=2) {
-	int v = i+1;
-	int len = strlen(argv[i]);
-
-	if (strncmp(argv[i], "-default", len)==0) {
-	    if (v==argc) {goto arg_missing;}
-
-	    defaultBtn = argv[v];
+    OPENFILENAME ofn;
+    TCHAR path[MAX_PATH], savePath[MAX_PATH];
+    ChooseDir cd;
+    int result, mustExist, code, mode, i;
+    Tk_Window tkwin;
+    char *utfTitle;
+    Tcl_DString utfDirString;
+    Tcl_DString titleString, dirString;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+    static char *optionStrings[] = {
+	"-initialdir",	"-mustexist",	"-parent",	"-title",
+	NULL
+    };
+    enum options {
+	DIR_INITIAL,	DIR_EXIST,	DIR_PARENT,	FILE_TITLE
+    };
+
+    if (tsdPtr->WM_LBSELCHANGED == 0) {
+        tsdPtr->WM_LBSELCHANGED = RegisterWindowMessage(LBSELCHSTRING);
+    }
+   
+    result = TCL_ERROR;
+    path[0] = '\0';
+
+    Tcl_DStringInit(&utfDirString);
+    mustExist = 0;
+    tkwin = (Tk_Window) clientData;
+    utfTitle = NULL;
+
+    for (i = 1; i < objc; i += 2) {
+	int index;
+	char *string;
+	Tcl_Obj *optionPtr, *valuePtr;
+
+	optionPtr = objv[i];
+	valuePtr = objv[i + 1];
+
+	if (Tcl_GetIndexFromObj(interp, optionPtr, optionStrings, "option",
+		0, &index) != TCL_OK) {
+	    goto cleanup;
+	}
+	if (i + 1 == objc) {
+	    string = Tcl_GetStringFromObj(optionPtr, NULL);
+	    Tcl_AppendResult(interp, "value for \"", string, "\" missing", 
+		    (char *) NULL);
+	    goto cleanup;
 	}
-	else if (strncmp(argv[i], "-icon", len)==0) {
-	    if (v==argc) {goto arg_missing;}
 
-	    if (strcmp(argv[v], "error") == 0) {
-		icon = MB_ICONERROR;
+	string = Tcl_GetStringFromObj(valuePtr, NULL);
+	switch ((enum options) index) {
+	    case DIR_INITIAL: {
+		Tcl_DStringFree(&utfDirString);
+		if (Tcl_TranslateFileName(interp, string, 
+			&utfDirString) == NULL) {
+		    goto cleanup;
+		}
+		break;
 	    }
-	    else if (strcmp(argv[v], "info") == 0) {
-		icon = MB_ICONINFORMATION;
+	    case DIR_EXIST: {
+		if (Tcl_GetBooleanFromObj(interp, valuePtr, &mustExist) != TCL_OK) {
+		    goto cleanup;
+		}
+		break;
 	    }
-	    else if (strcmp(argv[v], "question") == 0) {
-		icon = MB_ICONQUESTION;
+	    case DIR_PARENT: {
+		tkwin = Tk_NameToWindow(interp, string, tkwin);
+		if (tkwin == NULL) {
+		    goto cleanup;
+		}
+		break;
 	    }
-	    else if (strcmp(argv[v], "warning") == 0) {
-		icon = MB_ICONWARNING;
+	    case FILE_TITLE: {
+		utfTitle = string;
+		break;
 	    }
-	    else {
-	        Tcl_AppendResult(interp, "invalid icon \"", argv[v],
-		    "\", must be error, info, question or warning", NULL);
-		return TCL_ERROR;
+	}
+    }
+
+    Tk_MakeWindowExist(tkwin);
+
+    cd.interp = interp;
+
+    ofn.lStructSize		= sizeof(ofn);
+    ofn.hwndOwner		= Tk_GetHWND(Tk_WindowId(tkwin));
+    ofn.hInstance		= (HINSTANCE) GetWindowLong(ofn.hwndOwner, 
+					GWL_HINSTANCE);
+    ofn.lpstrFilter		= NULL;
+    ofn.lpstrCustomFilter	= NULL;
+    ofn.nMaxCustFilter		= 0;
+    ofn.nFilterIndex		= 0;
+    ofn.lpstrFile		= NULL; //(TCHAR *) path;
+    ofn.nMaxFile		= MAX_PATH;
+    ofn.lpstrFileTitle		= NULL;
+    ofn.nMaxFileTitle		= 0;
+    ofn.lpstrInitialDir		= NULL;
+    ofn.lpstrTitle		= NULL;
+    ofn.Flags			= OFN_HIDEREADONLY  
+				  | OFN_ENABLEHOOK | OFN_ENABLETEMPLATE;
+    ofn.nFileOffset		= 0;
+    ofn.nFileExtension		= 0;
+    ofn.lpstrDefExt		= NULL;
+    ofn.lCustData		= (LPARAM) &cd;
+    ofn.lpfnHook		= ChooseDirectoryHookProc;
+    ofn.lpTemplateName		= MAKEINTRESOURCE(FILEOPENORD);
+
+    if (Tcl_DStringValue(&utfDirString)[0] != '\0') {
+	Tcl_UtfToExternalDString(NULL, Tcl_DStringValue(&utfDirString), 
+		Tcl_DStringLength(&utfDirString), &dirString);
+	ofn.lpstrInitialDir = (LPTSTR) Tcl_DStringValue(&dirString);
+    }
+    if (mustExist) {
+	ofn.Flags |= OFN_PATHMUSTEXIST;
+    }
+    if (utfTitle != NULL) {
+	Tcl_UtfToExternalDString(NULL, utfTitle, -1, &titleString);
+	ofn.lpstrTitle = (LPTSTR) Tcl_DStringValue(&titleString);
+    }
+
+    /*
+     * Display dialog.  The choose directory dialog doesn't preserve the
+     * current directory, so it must be saved and restored here.
+     */
+    
+    GetCurrentDirectory(MAX_PATH, savePath);
+    mode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
+    code = GetOpenFileName(&ofn);
+    Tcl_SetServiceMode(mode);
+    SetCurrentDirectory(savePath);
+
+    Tcl_ResetResult(interp);
+    if (code != 0) {
+	/*
+	 * Change the pathname to the Tcl "normalized" pathname, where
+	 * back slashes are used instead of forward slashes
+	 */
+
+	char *p;
+	Tcl_DString ds;
+
+	Tcl_ExternalToUtfDString(NULL, (char *) cd.path, -1, &ds);
+	for (p = Tcl_DStringValue(&ds); *p != '\0'; p++) {
+	    if (*p == '\\') {
+		*p = '/';
 	    }
 	}
-	else if (strncmp(argv[i], "-message", len)==0) {
-	    if (v==argc) {goto arg_missing;}
+	Tcl_AppendResult(interp, Tcl_DStringValue(&ds), NULL);
+	Tcl_DStringFree(&ds);
+    }
 
-	    message = argv[v];
+    if (ofn.lpstrTitle != NULL) {
+	Tcl_DStringFree(&titleString);
+    }
+    if (ofn.lpstrInitialDir != NULL) {
+	Tcl_DStringFree(&dirString);
+    }
+    result = TCL_OK;
+
+    cleanup:
+    Tcl_DStringFree(&utfDirString);
+
+    return result;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * ChooseDirectoryHookProc --
+ *
+ *	Hook procedure called by the ChooseDirectory dialog to modify
+ *	its default behavior.  The ChooseDirectory dialog is really an
+ *	OpenFile dialog with certain controls rearranged and certain
+ *	behaviors changed.  For instance, typing a name in the 
+ *	ChooseDirectory dialog selects a directory, rather than 
+ *	selecting a file.
+ *
+ * Results:
+ *	Returns 0 to allow default processing of message, or 1 to 
+ *	tell default dialog procedure not to process the message.
+ *
+ * Side effects:
+ *	A dialog window is created the first this procedure is called.
+ *	This window is not destroyed and will be reused the next time
+ *	the application invokes the "tk_getOpenFile" or
+ *	"tk_getSaveFile" command.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static UINT APIENTRY 
+ChooseDirectoryHookProc(
+    HWND hwnd,
+    UINT message,
+    WPARAM wParam,
+    LPARAM lParam)
+{
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+    OPENFILENAME *ofnPtr;
+
+    /*
+     * GWL_USERDATA keeps track of ofnPtr.
+     */
+    
+    ofnPtr = (OPENFILENAME *) GetWindowLong(hwnd, GWL_USERDATA);
+
+    if (message == WM_INITDIALOG) {
+        ChooseDir *cdPtr;
+
+	SetWindowLong(hwnd, GWL_USERDATA, lParam);
+	ofnPtr = (OPENFILENAME *) lParam;
+	cdPtr = (ChooseDir *) ofnPtr->lCustData;
+	cdPtr->lastCtrl = 0;
+	cdPtr->lastIdx = 1000;
+	cdPtr->path[0] = '\0';
+
+	if (ofnPtr->lpstrInitialDir == NULL) {
+	    GetCurrentDirectory(MAX_PATH, cdPtr->path);
+	} else {
+	    lstrcpy(cdPtr->path, ofnPtr->lpstrInitialDir);
 	}
-	else if (strncmp(argv[i], "-parent", len)==0) {
-	    if (v==argc) {goto arg_missing;}
+	SetDlgItemText(hwnd, edt10, cdPtr->path);
+	SendDlgItemMessage(hwnd, edt10, EM_SETSEL, 0, -1);
+	if (tsdPtr->debugFlag) {
+	    tsdPtr->debugInterp = cdPtr->interp;
+	    Tcl_DoWhenIdle(SetTkDialog, (ClientData) hwnd);
+	}
+	return 0;
+    }
+    if (ofnPtr == NULL) {
+	return 0;
+    }
 
-	    parent=Tk_NameToWindow(interp, argv[v], Tk_MainWindow(interp));
-	    if (parent == NULL) {
-		return TCL_ERROR;
+    if (message == tsdPtr->WM_LBSELCHANGED) {
+	/*
+	 * Called when double-clicking on directory.
+	 * If directory wasn't already open, browse that directory.
+	 * If directory was already open, return selected directory.
+	 */
+
+        ChooseDir *cdPtr;
+	int idCtrl, thisItem;
+
+	idCtrl = (int) wParam;
+        thisItem = LOWORD(lParam);
+	cdPtr = (ChooseDir *) ofnPtr->lCustData;
+
+	GetCurrentDirectory(MAX_PATH, cdPtr->path);
+	if (idCtrl == lst2) {
+	    if ((cdPtr->lastIdx < 0) || (cdPtr->lastIdx == thisItem)) {
+		EndDialog(hwnd, IDOK);
+		return 1;
 	    }
+	    cdPtr->lastIdx = thisItem;
 	}
-	else if (strncmp(argv[i], "-title", len)==0) {
-	    if (v==argc) {goto arg_missing;}
+	SetDlgItemText(hwnd, edt10, cdPtr->path);
+	SendDlgItemMessage(hwnd, edt10, EM_SETSEL, 0, -1);
+    } else if (message == WM_COMMAND) {
+        ChooseDir *cdPtr;
+	int idCtrl, notifyCode;
+
+	idCtrl = LOWORD(wParam);
+	notifyCode = HIWORD(wParam);
+	cdPtr = (ChooseDir *) ofnPtr->lCustData;
+
+	if ((idCtrl != IDOK) || (notifyCode != BN_CLICKED)) {
+	    /*
+	     * OK Button wasn't clicked.  Do the default.
+	     */
 
-	    title = argv[v];
+	    if ((idCtrl == lst2) || (idCtrl == edt10)) {
+		cdPtr->lastCtrl = idCtrl;
+	    }
+	    return 0;
 	}
-	else if (strncmp(argv[i], "-type", len)==0) {
-	    int found = 0;
 
-	    if (v==argc) {goto arg_missing;}
+	/*
+	 * Dialogs also get the message that OK was clicked when Enter 
+	 * is pressed in some other control.  Find out what window
+	 * we were really in when we got the supposed "OK", because the 
+	 * behavior is different.
+	 */
+
+	if (cdPtr->lastCtrl == edt10) {
+	    /*
+	     * Hit Enter or clicked OK while typing a directory name in the 
+	     * edit control.
+	     * If it's a new name, try to go to that directory.
+	     * If the name hasn't changed since last time, return selected 
+	     * directory.
+	     */
 
-	    for (j=0; j<NUM_TYPES; j++) {
-		if (strcmp(argv[v], msgTypeInfo[j].name) == 0) {
-		    type = msgTypeInfo[j].type;
-		    found = 1;
-		    break;
+	    int changed;
+	    TCHAR tmp[MAX_PATH];
+
+	    if (GetDlgItemText(hwnd, edt10, tmp, MAX_PATH) == 0) {
+		return 0;
+	    }
+
+	    changed = lstrcmp(cdPtr->path, tmp);
+	    lstrcpy(cdPtr->path, tmp);
+
+	    if (SetCurrentDirectory(cdPtr->path) == 0) {
+		/*
+		 * Non-existent directory.
+		 */
+
+		if (ofnPtr->Flags & OFN_PATHMUSTEXIST) {
+		    /*
+		     * Directory must exist.  Complain, then rehighlight text.
+		     */
+
+		    wsprintf(tmp, _T("Cannot change directory to \"%.200s\"."), 
+			    cdPtr->path);
+		    MessageBox(hwnd, tmp, NULL, MB_OK);
+		    SendDlgItemMessage(hwnd, edt10, EM_SETSEL, 0, -1);
+		    return 0;
+		} 
+		if (changed) {
+		    /*
+		     * Directory was invalid, but we want to keep displaying
+		     * this name.  Don't update the listbox that displays the 
+		     * current directory heirarchy, or it'll erase the name.
+		     */
+		    
+		    SendDlgItemMessage(hwnd, edt10, EM_SETSEL, 0, -1);
+		    return 0;
 		}
 	    }
-	    if (!found) {
-		Tcl_AppendResult(interp, "invalid message box type \"", 
-		    argv[v], "\", must be abortretryignore, ok, ",
-		    "okcancel, retrycancel, yesno or yesnocancel", NULL);
-		return TCL_ERROR;
+	    if (changed == 0) {
+		/*
+		 * Name hasn't changed since the last time we hit return
+		 * or double-clicked on a directory, so return this.
+		 */
+
+		EndDialog(hwnd, IDOK);
+		return 1;
 	    }
+	    
+	    cdPtr->lastCtrl = IDOK;
+
+	    /*
+	     * The following is the magic code, determined by running 
+	     * Spy++ on some other directory chooser, that it takes to 
+	     * get this dialog to update the listbox to display the 
+	     * current directory.
+	     */
+
+	    SetDlgItemText(hwnd, edt1, cdPtr->path);
+	    SendMessage(hwnd, WM_COMMAND, (WPARAM) MAKELONG(cmb2, 0x8003), 
+		    (LPARAM) GetDlgItem(hwnd, cmb2));
+	    return 0;
+	} else if (idCtrl == lst2) {
+	    /*
+	     * Enter key was pressed while in listbox.  
+	     * If it's a new directory, allow default behavior to open dir.
+	     * If the directory hasn't changed, return selected directory.
+	     */
+
+	    int thisItem;
+
+	    thisItem = (int) SendDlgItemMessage(hwnd, lst2, LB_GETCURSEL, 0, 0);
+	    if (cdPtr->lastIdx == thisItem) {
+		GetCurrentDirectory(MAX_PATH, cdPtr->path);
+		EndDialog(hwnd, IDOK);
+		return 1;
+	    }
+	} else if (idCtrl == IDOK) {
+	    /* 
+	     * The OK button was clicked.  Return the path currently specified
+	     * in the listbox.  
+	     *
+	     * The directory has not yet been changed to the one specified in
+	     * the listbox.  Returning 0 allows the default dialog proc to 
+	     * change the directory to the one specified in the listbox and 
+	     * then causes it to send a WM_LBSELCHANGED back to the hook proc.  
+	     * When we get that message, we will record the current directory
+	     * and then quit.
+	     */
+
+	    cdPtr->lastIdx = -1;
+	}
+    }
+    return 0;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Tk_MessageBoxObjCmd --
+ *
+ *	This procedure implements the MessageBox window for the
+ *	Windows platform. See the user documentation for details on what
+ *	it does.
+ *
+ * Results:
+ *	See user documentation.
+ *
+ * Side effects:
+ *	None. The MessageBox window will be destroy before this procedure
+ *	returns.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+Tk_MessageBoxObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;	/* Main window associated with interpreter. */
+    Tcl_Interp *interp;		/* Current interpreter. */
+    int objc;			/* Number of arguments. */
+    Tcl_Obj *CONST objv[];	/* Argument objects. */
+{
+    Tk_Window tkwin, parent;
+    HWND hWnd;
+    char *message, *title;
+    int defaultBtn, icon, type;
+    int i, oldMode, flags, winCode;
+    Tcl_DString messageString, titleString;
+    static char *optionStrings[] = {
+	"-default",	"-icon",	"-message",	"-parent",
+	"-title",	"-type",	NULL
+    };
+    enum options {
+	MSG_DEFAULT,	MSG_ICON,	MSG_MESSAGE,	MSG_PARENT,
+	MSG_TITLE,	MSG_TYPE
+    };
+
+    tkwin = (Tk_Window) clientData;
+
+    defaultBtn	= -1;
+    icon	= MB_ICONINFORMATION;
+    message	= NULL;
+    parent	= tkwin;
+    title	= NULL;
+    type	= MB_OK;
+
+    for (i = 1; i < objc; i += 2) {
+	int index;
+	char *string;
+	Tcl_Obj *optionPtr, *valuePtr;
+
+	optionPtr = objv[i];
+	valuePtr = objv[i + 1];
+
+	if (Tcl_GetIndexFromObj(interp, optionPtr, optionStrings, "option",
+		TCL_EXACT, &index) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	if (i + 1 == objc) {
+	    string = Tcl_GetStringFromObj(optionPtr, NULL);
+	    Tcl_AppendResult(interp, "value for \"", string, "\" missing", 
+		    (char *) NULL);
+	    return TCL_ERROR;
 	}
-	else {
-    	    Tcl_AppendResult(interp, "unknown option \"", 
-		argv[i], "\", must be -default, -icon, ",
-		"-message, -parent, -title or -type", NULL);
+
+        string = Tcl_GetStringFromObj(valuePtr, NULL);
+	switch ((enum options) index) {
+        case MSG_DEFAULT:
+	    defaultBtn = TkFindStateNumObj(interp, optionPtr, buttonMap, 
+		    valuePtr);
+	    if (defaultBtn < 0) {
+		return TCL_ERROR;
+	    }
+	    break;
+
+	case MSG_ICON:
+	    icon = TkFindStateNumObj(interp, optionPtr, iconMap, valuePtr);
+	    if (icon < 0) {
+		return TCL_ERROR;
+	    }
+	    break;
+
+	case MSG_MESSAGE:
+	    message = string;
+	    break;
+
+	case MSG_PARENT: 
+	    parent = Tk_NameToWindow(interp, string, tkwin);
+	    if (parent == NULL) {
 		return TCL_ERROR;
+	    }
+	    break;
+
+	case MSG_TITLE:
+	    title = string;
+	    break;
+
+	case MSG_TYPE:
+	    type = TkFindStateNumObj(interp, optionPtr, typeMap, valuePtr);
+	    if (type < 0) {
+		return TCL_ERROR;
+	    }
+	    break;
+
 	}
     }
 
-    /* Make sure we have a valid hWnd to act as the parent of this message box
-     */
-    if (Tk_WindowId(parent) == None) {
-	Tk_MakeWindowExist(parent);
-    }
+    Tk_MakeWindowExist(parent);
     hWnd = Tk_GetHWND(Tk_WindowId(parent));
 
-    if (defaultBtn != NULL) {
-	for (i=0; i<NUM_TYPES; i++) {
-	    if (type == msgTypeInfo[i].type) {
-		for (j=0; j<msgTypeInfo[i].numButtons; j++) {
-		    if (strcmp(defaultBtn, msgTypeInfo[i].btnNames[j])==0) {
-		        defaultBtnIdx = j;
+    flags = 0;
+    if (defaultBtn >= 0) {
+	int defaultBtnIdx;
+
+	defaultBtnIdx = -1;
+	for (i = 0; i < NUM_TYPES; i++) {
+	    if (type == allowedTypes[i].type) {
+		int j;
+
+		for (j = 0; j < 3; j++) {
+		    if (allowedTypes[i].btnIds[j] == defaultBtn) {
+			defaultBtnIdx = j;
 			break;
 		    }
 		}
 		if (defaultBtnIdx < 0) {
 		    Tcl_AppendResult(interp, "invalid default button \"",
-			defaultBtn, "\"", NULL);
+			    TkFindStateString(buttonMap, defaultBtn), 
+			    "\"", NULL);
 		    return TCL_ERROR;
 		}
 		break;
 	    }
 	}
-
-	switch (defaultBtnIdx) {
-	  case 0: flags = MB_DEFBUTTON1; break;
-	  case 1: flags = MB_DEFBUTTON2; break;
-	  case 2: flags = MB_DEFBUTTON3; break;
-	  case 3: flags = MB_DEFBUTTON4; break;
-	}
-    } else {
-	flags = 0;
+	flags = buttonFlagMap[defaultBtnIdx];
     }
     
-    flags |= icon | type;
+    flags |= icon | type | MB_SYSTEMMODAL;
+
+    Tcl_UtfToExternalDString(NULL, message, -1, &messageString);
+    Tcl_UtfToExternalDString(NULL, title, -1, &titleString);
+
     oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
-    code = MessageBox(hWnd, message, title, flags|MB_SYSTEMMODAL);
+    winCode = MessageBox(hWnd, Tcl_DStringValue(&messageString),
+		Tcl_DStringValue(&titleString), flags);
     (void) Tcl_SetServiceMode(oldMode);
 
-    switch (code) {
-      case IDABORT:	result = "abort";  break;
-      case IDCANCEL:	result = "cancel"; break;
-      case IDIGNORE:	result = "ignore"; break;
-      case IDNO:	result = "no";     break;
-      case IDOK:	result = "ok";     break;
-      case IDRETRY:	result = "retry";  break;
-      case IDYES:	result = "yes";    break;
-      default:		result = "";
-    }
-
-    /*
-     * When we come to here interp->result may have been changed by some
-     * background scripts. Call Tcl_SetResult() to make sure that any stuff
-     * lingering in interp->result will not appear in the result of
-     * this command.
-     */
+    Tcl_DStringFree(&messageString);
+    Tcl_DStringFree(&titleString);
 
-    Tcl_SetResult(interp, result, TCL_STATIC);
+    Tcl_SetResult(interp, TkFindStateString(buttonMap, winCode), TCL_STATIC);
     return TCL_OK;
-
-  arg_missing:
-    Tcl_AppendResult(interp, "value for \"", argv[argc-1], "\" missing",
-	NULL);
-    return TCL_ERROR;
 }
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcessCDError --
- *
- *	This procedure gets called if a Windows-specific error message
- *	has occurred during the execution of a common dialog or the
- *	user has pressed the CANCEL button.
- *
- * Results:
- *	If an error has indeed happened, returns a standard TCL result
- *	that reports the error code in string format. If the user has
- *	pressed the CANCEL button (dwErrorCode == 0), resets
- *	interp->result to the empty string.
- *
- * Side effects:
- *	interp->result is changed.
- *
- *----------------------------------------------------------------------
- */
-static int ProcessCDError(interp, dwErrorCode, hWnd)
-    Tcl_Interp * interp;		/* Current interpreter. */
-    DWORD dwErrorCode;			/* The Windows-specific error code */
-    HWND hWnd;				/* window in which the error happened*/
-{
-    char *string;
 
-    Tcl_ResetResult(interp);
+static void 
+SetTkDialog(ClientData clientData)
+{
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+    char buf[32];
+    HWND hwnd;
 
-    switch(dwErrorCode) {
-      case 0:	  /* User has hit CANCEL */
-	return TCL_OK;
-
-      case CDERR_DIALOGFAILURE:   string="CDERR_DIALOGFAILURE";  	break;
-      case CDERR_STRUCTSIZE:      string="CDERR_STRUCTSIZE";   		break;
-      case CDERR_INITIALIZATION:  string="CDERR_INITIALIZATION";   	break;
-      case CDERR_NOTEMPLATE:      string="CDERR_NOTEMPLATE";   		break;
-      case CDERR_NOHINSTANCE:     string="CDERR_NOHINSTANCE";   	break;
-      case CDERR_LOADSTRFAILURE:  string="CDERR_LOADSTRFAILURE";   	break;
-      case CDERR_FINDRESFAILURE:  string="CDERR_FINDRESFAILURE";   	break;
-      case CDERR_LOADRESFAILURE:  string="CDERR_LOADRESFAILURE";   	break;
-      case CDERR_LOCKRESFAILURE:  string="CDERR_LOCKRESFAILURE";   	break;
-      case CDERR_MEMALLOCFAILURE: string="CDERR_MEMALLOCFAILURE";   	break;
-      case CDERR_MEMLOCKFAILURE:  string="CDERR_MEMLOCKFAILURE";   	break;
-      case CDERR_NOHOOK:          string="CDERR_NOHOOK";   	 	break;
-      case PDERR_SETUPFAILURE:    string="PDERR_SETUPFAILURE";   	break;
-      case PDERR_PARSEFAILURE:    string="PDERR_PARSEFAILURE";   	break;
-      case PDERR_RETDEFFAILURE:   string="PDERR_RETDEFFAILURE";   	break;
-      case PDERR_LOADDRVFAILURE:  string="PDERR_LOADDRVFAILURE";   	break;
-      case PDERR_GETDEVMODEFAIL:  string="PDERR_GETDEVMODEFAIL";   	break;
-      case PDERR_INITFAILURE:     string="PDERR_INITFAILURE";   	break;
-      case PDERR_NODEVICES:       string="PDERR_NODEVICES";   		break;
-      case PDERR_NODEFAULTPRN:    string="PDERR_NODEFAULTPRN";   	break;
-      case PDERR_DNDMMISMATCH:    string="PDERR_DNDMMISMATCH";   	break;
-      case PDERR_CREATEICFAILURE: string="PDERR_CREATEICFAILURE";   	break;
-      case PDERR_PRINTERNOTFOUND: string="PDERR_PRINTERNOTFOUND";   	break;
-      case CFERR_NOFONTS:         string="CFERR_NOFONTS";   	 	break;
-      case FNERR_SUBCLASSFAILURE: string="FNERR_SUBCLASSFAILURE";   	break;
-      case FNERR_INVALIDFILENAME: string="FNERR_INVALIDFILENAME";   	break;
-      case FNERR_BUFFERTOOSMALL:  string="FNERR_BUFFERTOOSMALL";   	break;
-	
-      default:
-	string="unknown error";
-    }
+    hwnd = (HWND) clientData;
 
-    Tcl_AppendResult(interp, "Win32 internal error: ", string, NULL); 
-    return TCL_ERROR;
+    sprintf(buf, "0x%08x", hwnd);
+    Tcl_SetVar(tsdPtr->debugInterp, "tk_dialog", buf, TCL_GLOBAL_ONLY);
 }
diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c
index c68fb04..43a2197 100644
--- a/win/tkWinDraw.c
+++ b/win/tkWinDraw.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinDraw.c,v 1.3 1999/03/10 07:04:46 stanton Exp $
+ * RCS: @(#) $Id: tkWinDraw.c,v 1.4 1999/04/16 01:51:51 stanton Exp $
  */
 
 #include "tkWinInt.h"
@@ -106,6 +106,12 @@ static int bltModes[] = {
 typedef BOOL (CALLBACK *WinDrawFunc) _ANSI_ARGS_((HDC dc,
 			    CONST POINT* points, int npoints));
 
+typedef struct ThreadSpecificData {
+    POINT *winPoints;    /* Array of points that is reused. */
+    int nWinPoints;	/* Current size of point array. */
+} ThreadSpecificData;
+static Tcl_ThreadDataKey dataKey;
+
 /*
  * Forward declarations for procedures defined in this file:
  */
@@ -212,7 +218,8 @@ TkWinReleaseDrawableDC(d, dc, state)
  *	Returns the converted array of POINTs.
  *
  * Side effects:
- *	Allocates a block of memory that should not be freed.
+ *	Allocates a block of memory in thread local storage that 
+ *      should not be freed.
  *
  *----------------------------------------------------------------------
  */
@@ -224,8 +231,8 @@ ConvertPoints(points, npoints, mode, bbox)
     int mode;			/* CoordModeOrigin or CoordModePrevious. */
     RECT *bbox;			/* Bounding box of points. */
 {
-    static POINT *winPoints = NULL; /* Array of points that is reused. */
-    static int nWinPoints = -1;	    /* Current size of point array. */
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     int i;
 
     /*
@@ -233,16 +240,16 @@ ConvertPoints(points, npoints, mode, bbox)
      * we reuse the last array if it is large enough.
      */
 
-    if (npoints > nWinPoints) {
-	if (winPoints != NULL) {
-	    ckfree((char *) winPoints);
+    if (npoints > tsdPtr->nWinPoints) {
+	if (tsdPtr->winPoints != NULL) {
+	    ckfree((char *) tsdPtr->winPoints);
 	}
-	winPoints = (POINT *) ckalloc(sizeof(POINT) * npoints);
-	if (winPoints == NULL) {
-	    nWinPoints = -1;
+	tsdPtr->winPoints = (POINT *) ckalloc(sizeof(POINT) * npoints);
+	if (tsdPtr->winPoints == NULL) {
+	    tsdPtr->nWinPoints = -1;
 	    return NULL;
 	}
-	nWinPoints = npoints;
+	tsdPtr->nWinPoints = npoints;
     }
 
     bbox->left = bbox->right = points[0].x;
@@ -250,26 +257,26 @@ ConvertPoints(points, npoints, mode, bbox)
     
     if (mode == CoordModeOrigin) {
 	for (i = 0; i < npoints; i++) {
-	    winPoints[i].x = points[i].x;
-	    winPoints[i].y = points[i].y;
-	    bbox->left = MIN(bbox->left, winPoints[i].x);
-	    bbox->right = MAX(bbox->right, winPoints[i].x);
-	    bbox->top = MIN(bbox->top, winPoints[i].y);
-	    bbox->bottom = MAX(bbox->bottom, winPoints[i].y);
+	    tsdPtr->winPoints[i].x = points[i].x;
+	    tsdPtr->winPoints[i].y = points[i].y;
+	    bbox->left = MIN(bbox->left, tsdPtr->winPoints[i].x);
+	    bbox->right = MAX(bbox->right, tsdPtr->winPoints[i].x);
+	    bbox->top = MIN(bbox->top, tsdPtr->winPoints[i].y);
+	    bbox->bottom = MAX(bbox->bottom, tsdPtr->winPoints[i].y);
 	}
     } else {
-	winPoints[0].x = points[0].x;
-	winPoints[0].y = points[0].y;
+	tsdPtr->winPoints[0].x = points[0].x;
+	tsdPtr->winPoints[0].y = points[0].y;
 	for (i = 1; i < npoints; i++) {
-	    winPoints[i].x = winPoints[i-1].x + points[i].x;
-	    winPoints[i].y = winPoints[i-1].y + points[i].y;
-	    bbox->left = MIN(bbox->left, winPoints[i].x);
-	    bbox->right = MAX(bbox->right, winPoints[i].x);
-	    bbox->top = MIN(bbox->top, winPoints[i].y);
-	    bbox->bottom = MAX(bbox->bottom, winPoints[i].y);
+	    tsdPtr->winPoints[i].x = tsdPtr->winPoints[i-1].x + points[i].x;
+	    tsdPtr->winPoints[i].y = tsdPtr->winPoints[i-1].y + points[i].y;
+	    bbox->left = MIN(bbox->left, tsdPtr->winPoints[i].x);
+	    bbox->right = MAX(bbox->right, tsdPtr->winPoints[i].x);
+	    bbox->top = MIN(bbox->top, tsdPtr->winPoints[i].y);
+	    bbox->bottom = MAX(bbox->bottom, tsdPtr->winPoints[i].y);
 	}
     }
-    return winPoints;
+    return tsdPtr->winPoints;
 }
 
 /*
@@ -926,8 +933,6 @@ XDrawLines(display, d, gc, points, npoints, mode)
 /*
  *----------------------------------------------------------------------
  *
-#if 0
-
  * XFillPolygon --
  *
  *	Draws a filled polygon.
diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c
index 799bb92..1cc4057 100644
--- a/win/tkWinEmbed.c
+++ b/win/tkWinEmbed.c
@@ -6,12 +6,12 @@
  *	one application can use as its main window an internal window from
  *	another application).
  *
- * Copyright (c) 1996 Sun Microsystems, Inc.
+ * Copyright (c) 1996-1997 Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinEmbed.c,v 1.2 1998/09/14 18:24:00 stanton Exp $
+ * RCS: @(#) $Id: tkWinEmbed.c,v 1.3 1999/04/16 01:51:51 stanton Exp $
  */
 
 #include "tkWinInt.h"
@@ -38,9 +38,11 @@ typedef struct Container {
 					 * this process. */
 } Container;
 
-static Container *firstContainerPtr = NULL;
-					/* First in list of all containers
+typedef struct ThreadSpecificData {
+    Container *firstContainerPtr;       /* First in list of all containers
 					 * managed by this process.  */
+} ThreadSpecificData;
+static Tcl_ThreadDataKey dataKey;
 
 static void		CleanupContainerList _ANSI_ARGS_((
     			    ClientData clientData));
@@ -74,14 +76,16 @@ CleanupContainerList(clientData)
     ClientData clientData;
 {
     Container *nextPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     
     for (;
-        firstContainerPtr != (Container *) NULL;
-        firstContainerPtr = nextPtr) {
-        nextPtr = firstContainerPtr->nextPtr;
-        ckfree((char *) firstContainerPtr);
+        tsdPtr->firstContainerPtr != (Container *) NULL;
+        tsdPtr->firstContainerPtr = nextPtr) {
+        nextPtr = tsdPtr->firstContainerPtr->nextPtr;
+        ckfree((char *) tsdPtr->firstContainerPtr);
     }
-    firstContainerPtr = (Container *) NULL;
+    tsdPtr->firstContainerPtr = (Container *) NULL;
 }
 
 /*
@@ -126,7 +130,7 @@ TkpTestembedCmd(clientData, interp, argc, argv)
  *	The return value is normally TCL_OK. If an error occurred (such as
  *	if the argument does not identify a legal Windows window handle),
  *	the return value is TCL_ERROR and an error message is left in the
- *	interp->result if interp is not NULL.
+ *	the interp's result if interp is not NULL.
  *
  * Side effects:
  *	None.
@@ -147,6 +151,8 @@ TkpUseWindow(interp, tkwin, string)
     int id;
     HWND hwnd;
     Container *containerPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (winPtr->window != None) {
         panic("TkpUseWindow: Already assigned a window");
@@ -159,7 +165,8 @@ TkpUseWindow(interp, tkwin, string)
 
     /*
      * Check if the window is a valid handle. If it is invalid, return
-     * TCL_ERROR and potentially leave an error message in interp->result.
+     * TCL_ERROR and potentially leave an error message in the interp's
+     * result.
      */
 
     if (!IsWindow(hwnd)) {
@@ -190,7 +197,7 @@ TkpUseWindow(interp, tkwin, string)
      * things will get cleaned up at finalization.
      */
 
-    if (firstContainerPtr == (Container *) NULL) {
+    if (tsdPtr->firstContainerPtr == (Container *) NULL) {
         Tcl_CreateExitHandler(CleanupContainerList, (ClientData) NULL);
     }
     
@@ -201,8 +208,8 @@ TkpUseWindow(interp, tkwin, string)
      * app. are in the same process.
      */
 
-    for (containerPtr = firstContainerPtr; containerPtr != NULL;
-	    containerPtr = containerPtr->nextPtr) {
+    for (containerPtr = tsdPtr->firstContainerPtr; 
+            containerPtr != NULL; containerPtr = containerPtr->nextPtr) {
 	if (containerPtr->parentHWnd == hwnd) {
 	    winPtr->flags |= TK_BOTH_HALVES;
 	    containerPtr->parentPtr->flags |= TK_BOTH_HALVES;
@@ -213,8 +220,8 @@ TkpUseWindow(interp, tkwin, string)
 	containerPtr = (Container *) ckalloc(sizeof(Container));
 	containerPtr->parentPtr = NULL;
 	containerPtr->parentHWnd = hwnd;
-	containerPtr->nextPtr = firstContainerPtr;
-	firstContainerPtr = containerPtr;
+	containerPtr->nextPtr = tsdPtr->firstContainerPtr;
+	tsdPtr->firstContainerPtr = containerPtr;
     }
 
     /*
@@ -258,13 +265,15 @@ TkpMakeContainer(tkwin)
 {
     TkWindow *winPtr = (TkWindow *) tkwin;
     Container *containerPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
      * If this is the first container, register an exit handler so that
      * things will get cleaned up at finalization.
      */
 
-    if (firstContainerPtr == (Container *) NULL) {
+    if (tsdPtr->firstContainerPtr == (Container *) NULL) {
         Tcl_CreateExitHandler(CleanupContainerList, (ClientData) NULL);
     }
     
@@ -279,8 +288,8 @@ TkpMakeContainer(tkwin)
     containerPtr->parentHWnd = Tk_GetHWND(Tk_WindowId(tkwin));
     containerPtr->embeddedHWnd = NULL;
     containerPtr->embeddedPtr = NULL;
-    containerPtr->nextPtr = firstContainerPtr;
-    firstContainerPtr = containerPtr;
+    containerPtr->nextPtr = tsdPtr->firstContainerPtr;
+    tsdPtr->firstContainerPtr = containerPtr;
     winPtr->flags |= TK_CONTAINER;
 
     /*
@@ -358,12 +367,14 @@ TkWinEmbeddedEventProc(hwnd, message, wParam, lParam)
     LPARAM lParam;
 {
     Container *containerPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
      * Find the Container structure associated with the parent window.
      */
 
-    for (containerPtr = firstContainerPtr;
+    for (containerPtr = tsdPtr->firstContainerPtr;
 	    containerPtr->parentHWnd != hwnd;
 	    containerPtr = containerPtr->nextPtr) {
 	if (containerPtr == NULL) {
@@ -508,8 +519,10 @@ TkpGetOtherWindow(winPtr)
 				 * embedded window. */
 {
     Container *containerPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    for (containerPtr = firstContainerPtr; containerPtr != NULL;
+    for (containerPtr = tsdPtr->firstContainerPtr; containerPtr != NULL;
 	    containerPtr = containerPtr->nextPtr) {
 	if (containerPtr->embeddedPtr == winPtr) {
 	    return containerPtr->parentPtr;
@@ -608,6 +621,8 @@ EmbedWindowDeleted(winPtr)
 				 * was deleted. */
 {
     Container *containerPtr, *prevPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
      * Find the Container structure for this window work.  Delete the
@@ -616,7 +631,7 @@ EmbedWindowDeleted(winPtr)
      */
 
     prevPtr = NULL;
-    containerPtr = firstContainerPtr;
+    containerPtr = tsdPtr->firstContainerPtr;
     while (1) {
 	if (containerPtr->embeddedPtr == winPtr) {
 	    containerPtr->embeddedHWnd = NULL;
@@ -636,7 +651,7 @@ EmbedWindowDeleted(winPtr)
     if ((containerPtr->embeddedPtr == NULL)
 	    && (containerPtr->parentPtr == NULL)) {
 	if (prevPtr == NULL) {
-	    firstContainerPtr = containerPtr->nextPtr;
+	    tsdPtr->firstContainerPtr = containerPtr->nextPtr;
 	} else {
 	    prevPtr->nextPtr = containerPtr->nextPtr;
 	}
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index b850857..7680b97 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.c
@@ -4,33 +4,156 @@
  *	Contains the Windows implementation of the platform-independant
  *	font package interface.
  *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  * Copyright (c) 1994 Software Research Associates, Inc. 
+ * Copyright (c) 1995-1997 Sun Microsystems, Inc.
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinFont.c,v 1.4 1999/02/04 21:00:48 stanton Exp $
+ * RCS: @(#) $Id: tkWinFont.c,v 1.5 1999/04/16 01:51:51 stanton Exp $
  */
 
 #include "tkWinInt.h"
 #include "tkFont.h"
 
 /*
- * The following structure represents Windows' implementation of a font.
+ * The following structure represents a font family.  It is assumed that
+ * all screen fonts constructed from the same "font family" share certain
+ * properties; all screen fonts with the same "font family" point to a
+ * shared instance of this structure.  The most important shared property
+ * is the character existence metrics, used to determine if a screen font
+ * can display a given Unicode character.
+ *
+ * Under Windows, a "font family" is uniquely identified by its face name.
+ */
+
+#define FONTMAP_SHIFT	    10
+
+#define FONTMAP_PAGES	    	(1 << (sizeof(Tcl_UniChar)*8 - FONTMAP_SHIFT))
+#define FONTMAP_BITSPERPAGE	(1 << FONTMAP_SHIFT)
+
+typedef struct FontFamily {
+    struct FontFamily *nextPtr;	/* Next in list of all known font families. */
+    int refCount;		/* How many SubFonts are referring to this
+				 * FontFamily.  When the refCount drops to
+				 * zero, this FontFamily may be freed. */
+    /*
+     * Key.
+     */
+     
+    Tk_Uid faceName;		/* Face name key for this FontFamily. */
+
+    /*
+     * Derived properties.
+     */
+     
+    Tcl_Encoding encoding;	/* Encoding for this font family. */
+    int isSymbolFont;		/* Non-zero if this is a symbol font. */
+    int isWideFont;		/* 1 if this is a double-byte font, 0 
+				 * otherwise. */
+    BOOL (WINAPI *textOutProc)(HDC, int, int, TCHAR *, int);
+				/* The procedure to use to draw text after
+				 * it has been converted from UTF-8 to the 
+				 * encoding of this font. */
+    BOOL (WINAPI *getTextExtentPoint32Proc)(HDC, TCHAR *, int, LPSIZE);
+				/* The procedure to use to measure text after
+				 * it has been converted from UTF-8 to the 
+				 * encoding of this font. */
+
+    char *fontMap[FONTMAP_PAGES];
+				/* Two-level sparse table used to determine
+				 * quickly if the specified character exists.
+				 * As characters are encountered, more pages
+				 * in this table are dynamically added.  The
+				 * contents of each page is a bitmask
+				 * consisting of FONTMAP_BITSPERPAGE bits,
+				 * representing whether this font can be used
+				 * to display the given character at the
+				 * corresponding bit position.  The high bits
+				 * of the character are used to pick which
+				 * page of the table is used. */
+
+    /*
+     * Cached Truetype font info.
+     */
+     
+    int segCount;		/* The length of the following arrays. */
+    USHORT *startCount;		/* Truetype information about the font, */
+    USHORT *endCount;		/* indicating which characters this font
+				 * can display (malloced).  The format of
+				 * this information is (relatively) compact,
+				 * but would take longer to search than 
+				 * indexing into the fontMap[][] table. */
+} FontFamily;
+
+/*
+ * The following structure encapsulates an individual screen font.  A font
+ * object is made up of however many SubFonts are necessary to display a
+ * stream of multilingual characters.
+ */
+
+typedef struct SubFont {
+    char **fontMap;		/* Pointer to font map from the FontFamily, 
+				 * cached here to save a dereference. */
+    HFONT hFont;		/* The specific screen font that will be
+				 * used when displaying/measuring chars
+				 * belonging to the FontFamily. */
+    FontFamily *familyPtr;	/* The FontFamily for this SubFont. */
+} SubFont;
+
+/*
+ * The following structure represents Windows' implementation of a font
+ * object.
  */
 
+#define SUBFONT_SPACE		3
+#define BASE_CHARS		128
+
 typedef struct WinFont {
     TkFont font;		/* Stuff used by generic font package.  Must
 				 * be first in structure. */
-    HFONT hFont;		/* Windows information about font. */
+    SubFont staticSubFonts[SUBFONT_SPACE];
+				/* Builtin space for a limited number of
+				 * SubFonts. */
+    int numSubFonts;		/* Length of following array. */
+    SubFont *subFontArray;	/* Array of SubFonts that have been loaded
+				 * in order to draw/measure all the characters
+				 * encountered by this font so far.  All fonts
+				 * start off with one SubFont initialized by
+				 * AllocFont() from the original set of font
+				 * attributes.  Usually points to
+				 * staticSubFonts, but may point to malloced
+				 * space if there are lots of SubFonts. */
+
     HWND hwnd;			/* Toplevel window of application that owns
-				 * this font, used for getting HDC. */
+				 * this font, used for getting HDC for
+				 * offscreen measurements. */
+    int pixelSize;		/* Original pixel size used when font was
+				 * constructed. */
+    int widths[BASE_CHARS];	/* Widths of first 128 chars in the base
+				 * font, for handling common case.  The base
+				 * font is always used to draw characters
+				 * between 0x0000 and 0x007f. */
 } WinFont;
 
 /*
- * The following structure is used as to map between the Tcl strings
- * that represent the system fonts and the numbers used by Windows.
+ * The following structure is passed as the LPARAM when calling the font
+ * enumeration procedure to determine if a font can support the given
+ * character.
+ */
+
+typedef struct CanUse {
+    HDC hdc;
+    WinFont *fontPtr;
+    Tcl_DString *nameTriedPtr;
+    int ch;
+    SubFont *subFontPtr;
+} CanUse;
+
+/*
+ * The following structure is used to map between the Tcl strings that
+ * represent the system fonts and the numbers used by Windows.
  */
 
 static TkStateMap systemMap[] = {
@@ -43,16 +166,105 @@ static TkStateMap systemMap[] = {
     {-1,		    NULL}
 };
 
-#define ABS(x)          (((x) < 0) ? -(x) : (x))
+typedef struct ThreadSpecificData {
+    FontFamily *fontFamilyList; /* The list of font families that are 
+				 * currently loaded.  As screen fonts
+				 * are loaded, this list grows to hold 
+				 * information about what characters
+				 * exist in each font family.  */
+    Tcl_HashTable uidTable;
+} ThreadSpecificData;
+static Tcl_ThreadDataKey dataKey;
 
-static TkFont *		AllocFont _ANSI_ARGS_((TkFont *tkFontPtr, 
-                            Tk_Window tkwin, HFONT hFont));
-static char *		GetProperty _ANSI_ARGS_((CONST TkFontAttributes *faPtr,
-			    CONST char *option));
-static int CALLBACK	WinFontFamilyEnumProc _ANSI_ARGS_((ENUMLOGFONT *elfPtr,
-			    NEWTEXTMETRIC *ntmPtr, int fontType,
-			    LPARAM lParam));
+/*
+ * Information cached about the system at startup time.
+ */
+ 
+static int platformId;
+static Tcl_Encoding unicodeEncoding;
+static Tcl_Encoding systemEncoding;
 
+/*
+ * Procedures used only in this file.
+ */
+
+static FontFamily *	AllocFontFamily(HDC hdc, HFONT hFont, int base);
+static SubFont *	CanUseFallback(HDC hdc, WinFont *fontPtr, 
+			    char *fallbackName,	int ch);
+static SubFont *	CanUseFallbackWithAliases(HDC hdc, WinFont *fontPtr, 
+			    char *faceName, int ch, Tcl_DString *nameTriedPtr);
+static int		FamilyExists(HDC hdc, CONST char *faceName);
+static char *		FamilyOrAliasExists(HDC hdc, CONST char *faceName);
+static SubFont *	FindSubFontForChar(WinFont *fontPtr, int ch);
+static void		FontMapInsert(SubFont *subFontPtr, int ch);
+static void		FontMapLoadPage(SubFont *subFontPtr, int row);
+static int		FontMapLookup(SubFont *subFontPtr, int ch);
+static void		FreeFontFamily(FontFamily *familyPtr);
+static HFONT		GetScreenFont(CONST TkFontAttributes *faPtr,
+			    CONST char *faceName, int pixelSize);
+static void		InitFont(Tk_Window tkwin, HFONT hFont, 
+			    int overstrike, WinFont *tkFontPtr);
+static void		InitSubFont(HDC hdc, HFONT hFont, int base, 
+			    SubFont *subFontPtr);
+static int		LoadFontRanges(HDC hdc, HFONT hFont, 
+			    USHORT **startCount, USHORT **endCount,
+			    int *symbolPtr);
+static void		MultiFontTextOut(HDC hdc, WinFont *fontPtr, 
+			    CONST char *source, int numBytes, int x, int y);
+static void		ReleaseFont(WinFont *fontPtr);
+static void		ReleaseSubFont(SubFont *subFontPtr);
+static int		SeenName(CONST char *name, Tcl_DString *dsPtr);
+static void		SwapLong(PULONG p);
+static void		SwapShort(USHORT *p);
+static int CALLBACK	WinFontCanUseProc(ENUMLOGFONT *lfPtr, 
+			    NEWTEXTMETRIC *tmPtr, int fontType, 
+			    LPARAM lParam);
+static int CALLBACK	WinFontExistProc(ENUMLOGFONT *lfPtr, 
+			    NEWTEXTMETRIC *tmPtr, int fontType, 
+			    LPARAM lParam);
+static int CALLBACK	WinFontFamilyEnumProc(ENUMLOGFONT *lfPtr, 
+			    NEWTEXTMETRIC *tmPtr, int fontType, 
+			    LPARAM lParam);
+
+/*
+ *-------------------------------------------------------------------------
+ * 
+ * TkpFontPkgInit --
+ *
+ *	This procedure is called when an application is created.  It
+ *	initializes all the structures that are used by the 
+ *	platform-dependant code on a per application basis.
+ *
+ * Results:
+ *	None.  
+ *
+ * Side effects:
+ *	
+ *	None.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+void
+TkpFontPkgInit(
+    TkMainInfo *mainPtr)	/* The application being created. */
+{
+    OSVERSIONINFO os;
+
+    os.dwOSVersionInfoSize = sizeof(os);
+    GetVersionEx(&os);
+    platformId = os.dwPlatformId;
+    unicodeEncoding = Tcl_GetEncoding(NULL, "unicode");
+    if (platformId == VER_PLATFORM_WIN32_NT) {
+	/*
+	 * If running NT, then we will be calling some Unicode functions 
+	 * explictly.  So, even if the Tcl system encoding isn't Unicode, 
+	 * make sure we convert to/from the Unicode char set. 
+	 */
+
+	systemEncoding = unicodeEncoding;
+    }
+}
 
 /*
  *---------------------------------------------------------------------------
@@ -75,29 +287,29 @@ static int CALLBACK	WinFontFamilyEnumProc _ANSI_ARGS_((ENUMLOGFONT *elfPtr,
  *	the contents of the generic TkFont before calling TkpDeleteFont().
  *
  * Side effects:
- *	None.
+ *	Memory allocated.
  *
  *---------------------------------------------------------------------------
  */
 
 TkFont *
-TkpGetNativeFont(tkwin, name)
-    Tk_Window tkwin;		/* For display where font will be used. */
-    CONST char *name;		/* Platform-specific font name. */
+TkpGetNativeFont(
+    Tk_Window tkwin,		/* For display where font will be used. */
+    CONST char *name)		/* Platform-specific font name. */
 {
     int object;
-    HFONT hFont;
-    
+    WinFont *fontPtr;
+
     object = TkFindStateNum(NULL, NULL, systemMap, name);
     if (object < 0) {
 	return NULL;
     }
-    hFont = GetStockObject(object);
-    if (hFont == NULL) {
-	panic("TkpGetNativeFont: can't allocate stock font");
-    }
 
-    return AllocFont(NULL, tkwin, hFont);
+    tkwin = (Tk_Window) ((TkWindow *) tkwin)->mainPtr->winPtr;
+    fontPtr = (WinFont *) ckalloc(sizeof(WinFont));
+    InitFont(tkwin, GetStockObject(object), 0, fontPtr);
+
+    return (TkFont *) fontPtr;
 }
 
 /*
@@ -124,80 +336,86 @@ TkpGetNativeFont(tkwin, name)
  *	the contents of the generic TkFont before calling TkpDeleteFont().
  *
  * Side effects:
- *	None.
+ *	Memory allocated.
  *
  *---------------------------------------------------------------------------
  */
+
 TkFont *
-TkpGetFontFromAttributes(tkFontPtr, tkwin, faPtr)
-    TkFont *tkFontPtr;		/* If non-NULL, store the information in
+TkpGetFontFromAttributes(
+    TkFont *tkFontPtr,		/* If non-NULL, store the information in
 				 * this existing TkFont structure, rather than
 				 * allocating a new structure to hold the
 				 * font; the existing contents of the font
 				 * will be released.  If NULL, a new TkFont
 				 * structure is allocated. */
-    Tk_Window tkwin;		/* For display where font will be used. */
-    CONST TkFontAttributes *faPtr;  /* Set of attributes to match. */
+    Tk_Window tkwin,		/* For display where font will be used. */
+    CONST TkFontAttributes *faPtr)
+				/* Set of attributes to match. */
 {
-    LOGFONT lf;
+    int i, j;
+    HDC hdc;
+    HWND hwnd;
     HFONT hFont;
     Window window;
-    HWND hwnd;
-    HDC hdc;
+    WinFont *fontPtr;
+    char ***fontFallbacks;
+    char *faceName, *fallback, *actualName;
 
-    window = Tk_WindowId(((TkWindow *) tkwin)->mainPtr->winPtr);
-    hwnd = (window == None) ? NULL : TkWinGetHWND(window);
-
-    hdc = GetDC(hwnd);
-    lf.lfHeight		= -faPtr->pointsize;
-    if (lf.lfHeight < 0) {
-	lf.lfHeight = MulDiv(lf.lfHeight, 
-	        254 * WidthOfScreen(Tk_Screen(tkwin)),
-		720 * WidthMMOfScreen(Tk_Screen(tkwin)));
-    }
-    lf.lfWidth		= 0;
-    lf.lfEscapement	= 0;
-    lf.lfOrientation	= 0;
-    lf.lfWeight		= (faPtr->weight == TK_FW_NORMAL) ? FW_NORMAL : FW_BOLD;
-    lf.lfItalic		= faPtr->slant;
-    lf.lfUnderline	= faPtr->underline;
-    lf.lfStrikeOut	= faPtr->overstrike;
-    lf.lfCharSet	= DEFAULT_CHARSET;
-    lf.lfOutPrecision	= OUT_DEFAULT_PRECIS;
-    lf.lfClipPrecision	= CLIP_DEFAULT_PRECIS;
-    lf.lfQuality	= DEFAULT_QUALITY;
-    lf.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
-    if (faPtr->family == NULL) {
-	lf.lfFaceName[0] = '\0';
-    } else {
-	lstrcpyn(lf.lfFaceName, faPtr->family, sizeof(lf.lfFaceName));
-    }
-    ReleaseDC(hwnd, hdc);
+    tkwin   = (Tk_Window) ((TkWindow *) tkwin)->mainPtr->winPtr;
+    window  = Tk_WindowId(tkwin);
+    hwnd    = (window == None) ? NULL : TkWinGetHWND(window);
+    hdc	    = GetDC(hwnd);
 
     /*
-     * Replace the standard X and Mac family names with the names that
-     * Windows likes.
+     * Algorithm to get the closest font name to the one requested.
+     *
+     * try fontname
+     * try all aliases for fontname
+     * foreach fallback for fontname
+     *	    try the fallback
+     *	    try all aliases for the fallback
      */
 
-    if ((stricmp(lf.lfFaceName, "Times") == 0)
-	    || (stricmp(lf.lfFaceName, "New York") == 0)) {
-	strcpy(lf.lfFaceName, "Times New Roman");
-    } else if ((stricmp(lf.lfFaceName, "Courier") == 0)
-	    || (stricmp(lf.lfFaceName, "Monaco") == 0)) {
-	strcpy(lf.lfFaceName, "Courier New");
-    } else if ((stricmp(lf.lfFaceName, "Helvetica") == 0)
-	    || (stricmp(lf.lfFaceName, "Geneva") == 0)) {
-	strcpy(lf.lfFaceName, "Arial");
-    }
-
-    hFont = CreateFontIndirect(&lf);
-    if (hFont == NULL) {
-        hFont = GetStockObject(SYSTEM_FONT);
-	if (hFont == NULL) {
-	    panic("TkpGetFontFromAttributes: cannot get system font");
+    faceName = faPtr->family;
+    if (faceName != NULL) {
+	actualName = FamilyOrAliasExists(hdc, faceName);
+	if (actualName != NULL) {
+	    faceName = actualName;
+	    goto found;
+	}
+	fontFallbacks = TkFontGetFallbacks();
+	for (i = 0; fontFallbacks[i] != NULL; i++) {
+	    for (j = 0; (fallback = fontFallbacks[i][j]) != NULL; j++) {
+		if (strcasecmp(faceName, fallback) == 0) {
+		    break;
+		}
+	    }
+	    if (fallback != NULL) {
+		for (j = 0; (fallback = fontFallbacks[i][j]) != NULL; j++) {
+		    actualName = FamilyOrAliasExists(hdc, fallback);
+		    if (actualName != NULL) {
+			faceName = actualName;
+			goto found;
+		    }
+		}
+	    }
 	}
     }
-    return AllocFont(tkFontPtr, tkwin, hFont);
+
+    found:
+    ReleaseDC(hwnd, hdc);
+
+    hFont = GetScreenFont(faPtr, faceName, TkFontGetPixels(tkwin, faPtr->size));
+    if (tkFontPtr == NULL) {
+	fontPtr = (WinFont *) ckalloc(sizeof(WinFont));
+    } else {
+	fontPtr = (WinFont *) tkFontPtr;
+	ReleaseFont(fontPtr);
+    }
+    InitFont(tkwin, hFont, faPtr->overstrike, fontPtr);
+
+    return (TkFont *) fontPtr;
 }
 
 /*
@@ -220,26 +438,25 @@ TkpGetFontFromAttributes(tkFontPtr, tkwin, faPtr)
  */
 
 void
-TkpDeleteFont(tkFontPtr)
-    TkFont *tkFontPtr;		/* Token of font to be deleted. */
+TkpDeleteFont(
+    TkFont *tkFontPtr)		/* Token of font to be deleted. */
 {
     WinFont *fontPtr;
 
     fontPtr = (WinFont *) tkFontPtr;
-    DeleteObject(fontPtr->hFont);
-    ckfree((char *) fontPtr);
+    ReleaseFont(fontPtr);
 }
 
 /*
  *---------------------------------------------------------------------------
  *
- * TkpGetFontFamilies, WinFontEnumFamilyProc --
+ * TkpGetFontFamilies, WinFontFamilyEnumProc --
  *
  *	Return information about the font families that are available
  *	on the display of the given window.
  *
  * Results:
- *	interp->result is modified to hold a list of all the available
+ *	Modifies interp's result object to hold a list of all the available
  *	font families.
  *
  * Side effects:
@@ -249,51 +466,114 @@ TkpDeleteFont(tkFontPtr)
  */
  
 void
-TkpGetFontFamilies(interp, tkwin)
-    Tcl_Interp *interp;		/* Interp to hold result. */
-    Tk_Window tkwin;		/* For display to query. */
+TkpGetFontFamilies(
+    Tcl_Interp *interp,		/* Interp to hold result. */
+    Tk_Window tkwin)		/* For display to query. */
 {    
-    Window window;
-    HWND hwnd;
     HDC hdc;
+    HWND hwnd;
+    Window window;
 
-    window = Tk_WindowId(tkwin);
-    hwnd = (window == (Window) NULL) ? NULL : TkWinGetHWND(window);
+    window  = Tk_WindowId(tkwin);
+    hwnd    = (window == None) ? NULL : TkWinGetHWND(window);
+    hdc	    = GetDC(hwnd);
 
-    hdc = GetDC(hwnd);
-    EnumFontFamilies(hdc, NULL, (FONTENUMPROC) WinFontFamilyEnumProc,
-	    (LPARAM) interp);
+    /*
+     * On any version NT, there may fonts with international names.  
+     * Use the NT-only Unicode version of EnumFontFamilies to get the 
+     * font names.  If we used the ANSI version on a non-internationalized 
+     * version of NT, we would get font names with '?' replacing all 
+     * the international characters.
+     *
+     * On a non-internationalized verson of 95, fonts with international
+     * names are not allowed, so the ANSI version of EnumFontFamilies will 
+     * work.  On an internationalized version of 95, there may be fonts with 
+     * international names; the ANSI version will work, fetching the 
+     * name in the system code page.  Can't use the Unicode version of 
+     * EnumFontFamilies because it only exists under NT.
+     */
+
+    if (platformId == VER_PLATFORM_WIN32_NT) {
+	EnumFontFamiliesW(hdc, NULL, (FONTENUMPROCW) WinFontFamilyEnumProc,
+		(LPARAM) interp);
+    } else {
+	EnumFontFamiliesA(hdc, NULL, (FONTENUMPROCA) WinFontFamilyEnumProc,
+		(LPARAM) interp);
+    }	    
     ReleaseDC(hwnd, hdc);
 }
 
-/* ARGSUSED */
-
 static int CALLBACK
-WinFontFamilyEnumProc(elfPtr, ntmPtr, fontType, lParam)
-    ENUMLOGFONT *elfPtr;	/* Logical-font data. */
-    NEWTEXTMETRIC *ntmPtr;	/* Physical-font data (not used). */
-    int fontType;		/* Type of font (not used). */
-    LPARAM lParam;		/* Interp to hold result. */
+WinFontFamilyEnumProc(
+    ENUMLOGFONT *lfPtr,		/* Logical-font data. */
+    NEWTEXTMETRIC *tmPtr,	/* Physical-font data (not used). */
+    int fontType,		/* Type of font (not used). */
+    LPARAM lParam)		/* Result object to hold result. */
 {
+    char *faceName;
+    Tcl_DString faceString;
+    Tcl_Obj *strPtr;
     Tcl_Interp *interp;
 
     interp = (Tcl_Interp *) lParam;
-    Tcl_AppendElement(interp, elfPtr->elfLogFont.lfFaceName);
+    faceName = lfPtr->elfLogFont.lfFaceName;
+    Tcl_ExternalToUtfDString(systemEncoding, faceName, -1, &faceString);
+    strPtr = Tcl_NewStringObj(Tcl_DStringValue(&faceString),
+	    Tcl_DStringLength(&faceString));
+    Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(interp), strPtr);
+    Tcl_DStringFree(&faceString);
     return 1;
 }
 
 /*
+ *-------------------------------------------------------------------------
+ *
+ * TkpGetSubFonts --
+ *
+ *	A function used by the testing package for querying the actual 
+ *	screen fonts that make up a font object.
+ *
+ * Results:
+ *	Modifies interp's result object to hold a list containing the 
+ *	names of the screen fonts that make up the given font object.
+ *
+ * Side effects:
+ *	None.
+ *
+ *-------------------------------------------------------------------------
+ */
+	
+void
+TkpGetSubFonts(
+    Tcl_Interp *interp,		/* Interp to hold result. */
+    Tk_Font tkfont)		/* Font object to query. */
+{
+    int i;
+    WinFont *fontPtr;
+    FontFamily *familyPtr;
+    Tcl_Obj *resultPtr, *strPtr;
+
+    resultPtr = Tcl_GetObjResult(interp);    
+    fontPtr = (WinFont *) tkfont;
+    for (i = 0; i < fontPtr->numSubFonts; i++) {
+	familyPtr = fontPtr->subFontArray[i].familyPtr;
+	strPtr = Tcl_NewStringObj(familyPtr->faceName, -1);
+	Tcl_ListObjAppendElement(NULL, resultPtr, strPtr);
+    }
+}
+
+/*
  *---------------------------------------------------------------------------
  *
  *  Tk_MeasureChars --
  *
- *	Determine the number of characters from the string that will fit
+ *	Determine the number of bytes from the string that will fit
  *	in the given horizontal span.  The measurement is done under the
  *	assumption that Tk_DrawChars() will be used to actually display
  *	the characters.
  *
  * Results:
- *	The return value is the number of characters from source that
+ *	The return value is the number of bytes from source that
  *	fit into the span that extends from 0 to maxLength.  *lengthPtr is
  *	filled with the x-coordinate of the right edge of the last
  *	character that did fit.
@@ -303,126 +583,204 @@ WinFontFamilyEnumProc(elfPtr, ntmPtr, fontType, lParam)
  *
  *---------------------------------------------------------------------------
  */
+
 int
-Tk_MeasureChars(tkfont, source, numChars, maxLength, flags, lengthPtr)
-    Tk_Font tkfont;		/* Font in which characters will be drawn. */
-    CONST char *source;		/* Characters to be displayed.  Need not be
+Tk_MeasureChars(
+    Tk_Font tkfont,		/* Font in which characters will be drawn. */
+    CONST char *source,		/* UTF-8 string to be displayed.  Need not be
 				 * '\0' terminated. */
-    int numChars;		/* Maximum number of characters to consider
+    int numBytes,		/* Maximum number of bytes to consider
 				 * from source string. */
-    int maxLength;		/* If > 0, maxLength specifies the longest
-				 * permissible line length; don't consider any
-				 * character that would cross this
-				 * x-position.  If <= 0, then line length is
-				 * unbounded and the flags argument is
+    int maxLength,		/* If >= 0, maxLength specifies the longest
+				 * permissible line length in pixels; don't
+				 * consider any character that would cross
+				 * this x-position.  If < 0, then line length
+				 * is unbounded and the flags argument is
 				 * ignored. */
-    int flags;			/* Various flag bits OR-ed together:
+    int flags,			/* Various flag bits OR-ed together:
 				 * TK_PARTIAL_OK means include the last char
 				 * which only partially fit on this line.
 				 * TK_WHOLE_WORDS means stop on a word
 				 * boundary, if possible.
 				 * TK_AT_LEAST_ONE means return at least one
 				 * character even if no characters fit. */
-    int *lengthPtr;		/* Filled with x-location just after the
+    int *lengthPtr)		/* Filled with x-location just after the
 				 * terminating character. */
 {
-    WinFont *fontPtr;
     HDC hdc;
-    HFONT hFont;
-    int curX, curIdx;
+    HFONT oldFont;
+    WinFont *fontPtr;
+    int curX, curByte;
+    SubFont *lastSubFontPtr;
+
+    /*
+     * According to Microsoft tech support, Windows does not use kerning
+     * or fractional character widths when displaying text on the screen.
+     * So that means we can safely measure individual characters or spans
+     * of characters and add up the widths w/o any "off-by-one-pixel" 
+     * errors.  
+     */
 
     fontPtr = (WinFont *) tkfont;
 
     hdc = GetDC(fontPtr->hwnd);
-    hFont = SelectObject(hdc, fontPtr->hFont);
+    lastSubFontPtr = &fontPtr->subFontArray[0];
+    oldFont = SelectObject(hdc, lastSubFontPtr->hFont);
 
-    if (numChars == 0) {
+    if (numBytes == 0) {
 	curX = 0;
-	curIdx = 0;
-    } else if (maxLength <= 0) {
+	curByte = 0;
+    } else if (maxLength < 0) {				 
+	Tcl_UniChar ch;
 	SIZE size;
+	FontFamily *familyPtr;
+	Tcl_DString runString;
+	SubFont *thisSubFontPtr;
+	CONST char *p, *end, *next;
+
+    	/*
+    	 * A three step process:
+    	 * 1. Find a contiguous range of characters that can all be 
+    	 *    represented by a single screen font.
+    	 * 2. Convert those chars to the encoding of that font.
+	 * 3. Measure converted chars.
+    	 */
+
+        curX = 0;
+        end = source + numBytes;
+        for (p = source; p < end; ) {
+            next = p + Tcl_UtfToUniChar(p, &ch);
+            thisSubFontPtr = FindSubFontForChar(fontPtr, ch);
+            if (thisSubFontPtr != lastSubFontPtr) {
+		familyPtr = lastSubFontPtr->familyPtr;
+		Tcl_UtfToExternalDString(familyPtr->encoding, source, 
+			p - source, &runString);
+		(*familyPtr->getTextExtentPoint32Proc)(hdc, 
+			Tcl_DStringValue(&runString),
+			Tcl_DStringLength(&runString) >> familyPtr->isWideFont, 
+			&size);
+		curX += size.cx;
+		Tcl_DStringFree(&runString);
+                lastSubFontPtr = thisSubFontPtr;
+                source = p;
 
-	GetTextExtentPoint32(hdc, source, numChars, &size);
-	curX = size.cx;
-	curIdx = numChars;
+		SelectObject(hdc, lastSubFontPtr->hFont);
+            }
+            p = next;
+        }
+	familyPtr = lastSubFontPtr->familyPtr;
+	Tcl_UtfToExternalDString(familyPtr->encoding, source, p - source, 
+		&runString);
+	(*familyPtr->getTextExtentPoint32Proc)(hdc,
+		Tcl_DStringValue(&runString),
+		Tcl_DStringLength(&runString) >> familyPtr->isWideFont, 
+		&size);
+	curX += size.cx;
+	Tcl_DStringFree(&runString);
+	curByte = numBytes;
     } else {
-	int max;
-	int *partials;
+	Tcl_UniChar ch;
 	SIZE size;
+	char buf[16];
+	FontFamily *familyPtr;
+	SubFont *thisSubFontPtr;
+	CONST char *term, *end, *p, *next;
+	int newX, termX, sawNonSpace, srcRead, dstWrote;
+
+	/*
+	 * How many chars will fit in the space allotted? 
+	 * This first version may be inefficient because it measures
+	 * every character individually.  There is a function call that
+	 * can measure multiple characters at once and return the
+	 * offset of each of them, but it only works on NT, even though
+	 * the documentation claims it works for 95.
+	 * TODO: verify that GetTextExtentExPoint is still broken in '95, and
+	 * possibly use it for NT anyway since it should be much faster and
+	 * more accurate.
+	 */
+
+	next = source + Tcl_UtfToUniChar(source, &ch);
+	newX = curX = termX = 0;
 	
-	partials = (int *) ckalloc(numChars * sizeof (int));
-	GetTextExtentExPoint(hdc, source, numChars, maxLength, &max,
-		partials, &size);
-	
-	if ((flags & TK_WHOLE_WORDS) && max < numChars) {
-	    int sawSpace;
-	    int i;
-	    
-	    sawSpace = 0;
-	    i = max;
-	    while (i >= 0 && !isspace(source[i])) {
-    		--i;
-            }
-	    while (i >= 0 && isspace(source[i])) {
-		sawSpace = 1;
-		--i;
-            }
+	term = source;
+	end = source + numBytes;
 
-	    /*
-	     * If a space char was not found, and the flag for forcing
-	     * at least on (or more) chars to be drawn is false, then
-	     * set MAX to zero so no text is drawn.  Otherwise, if a
-	     * space was found, set max to be one char past the space.
-	     */
-	    
-	    if ((i < 0) && !(flags & TK_AT_LEAST_ONE)) {
-		max = 0;
-	    } else if (sawSpace) {
-		max = i + 1;
+	sawNonSpace = (ch > 255) || !isspace(ch);
+	for (p = source; ; ) {
+	    if (ch < BASE_CHARS) {
+		newX += fontPtr->widths[ch];
+	    } else {
+		thisSubFontPtr = FindSubFontForChar(fontPtr, ch);
+		if (thisSubFontPtr != lastSubFontPtr) {
+		    SelectObject(hdc, thisSubFontPtr->hFont);
+		    lastSubFontPtr = thisSubFontPtr;
+		}
+		familyPtr = lastSubFontPtr->familyPtr;
+		Tcl_UtfToExternal(NULL, familyPtr->encoding, p, next - p, 
+			0, NULL, buf, sizeof(buf), &srcRead, &dstWrote, NULL);
+		(*familyPtr->getTextExtentPoint32Proc)(hdc, buf, 
+			dstWrote >> familyPtr->isWideFont, &size);
+		newX += size.cx;
+	    }
+	    if (newX > maxLength) {
+		break;
+	    }
+	    curX = newX;
+	    p = next;
+	    if (p >= end) {
+		term = end;
+		termX = curX;
+		break;
 	    }
-		
-	}
 
-	if (max == 0) {
-	    curX = 0;
-	} else {
-	    curX = partials[max - 1];
+	    next += Tcl_UtfToUniChar(next, &ch);
+	    if ((ch < 256) && isspace(ch)) {
+		if (sawNonSpace) {
+		    term = p;
+		    termX = curX;
+		    sawNonSpace = 0;
+		}
+	    } else {
+		sawNonSpace = 1;
+	    }
 	}
 
-	if (((flags & TK_PARTIAL_OK) && max < numChars && curX < maxLength)
-		|| ((flags & TK_AT_LEAST_ONE) && max == 0 && numChars > 0)) {
+	/*
+	 * P points to the first character that doesn't fit in the desired
+	 * span.  Use the flags to figure out what to return.
+	 */
 
+	if ((flags & TK_PARTIAL_OK) && (p < end) && (curX < maxLength)) {
 	    /*
-	     * MS BUG ALERT - We have to pass the bogus length, and
-	     * the dummyMax parameter, because without them the call crashes on
-	     * NT/J Service Pack 3 and less.  This is documented in the
-	     * Microsoft Knowledge Base.
+	     * Include the first character that didn't quite fit in the desired
+	     * span.  The width returned will include the width of that extra
+	     * character.
 	     */
-         
-	    int dummyMax;
-           
-	    /*
-	     * We want to include the first character that didn't
-	     * quite fit.  Call the function again to include the
-	     * width of the extra character.
-             */
-	    
-	    GetTextExtentExPoint(hdc, source, max + 1, INT_MAX, &dummyMax,
-		    partials, &size);
-	    curX = partials[max];
-	    ++max;
-
-	} 
-		
-	ckfree((char *) partials);
-	curIdx = max;
+
+	    curX = newX;
+	    p += Tcl_UtfToUniChar(p, &ch);
+	}
+	if ((flags & TK_AT_LEAST_ONE) && (term == source) && (p < end)) {
+	    term = p;
+	    termX = curX;
+	    if (term == source) {
+		term += Tcl_UtfToUniChar(term, &ch);
+		termX = newX;
+	    }
+	} else if ((p >= end) || !(flags & TK_WHOLE_WORDS)) {
+	    term = p;
+	    termX = curX;
+	}
+
+	curX = termX;
+	curByte = term - source;	
     }
 
-    SelectObject(hdc, hFont);
+    SelectObject(hdc, oldFont);
     ReleaseDC(fontPtr->hwnd, hdc);
 
     *lengthPtr = curX;
-    return curIdx;
+    return curByte;
 }
 
 /*
@@ -442,27 +800,26 @@ Tk_MeasureChars(tkfont, source, numChars, maxLength, flags, lengthPtr)
  */
 
 void
-Tk_DrawChars(display, drawable, gc, tkfont, source, numChars, x, y)
-    Display *display;		/* Display on which to draw. */
-    Drawable drawable;		/* Window or pixmap in which to draw. */
-    GC gc;			/* Graphics context for drawing characters. */
-    Tk_Font tkfont;		/* Font in which characters will be drawn;
+Tk_DrawChars(
+    Display *display,		/* Display on which to draw. */
+    Drawable drawable,		/* Window or pixmap in which to draw. */
+    GC gc,			/* Graphics context for drawing characters. */
+    Tk_Font tkfont,		/* Font in which characters will be drawn;
 				 * must be the same as font used in GC. */
-    CONST char *source;		/* Characters to be displayed.  Need not be
+    CONST char *source,		/* UTF-8 string to be displayed.  Need not be
 				 * '\0' terminated.  All Tk meta-characters
 				 * (tabs, control characters, and newlines)
 				 * should be stripped out of the string that
 				 * is passed to this function.  If they are
 				 * not stripped out, they will be displayed as
 				 * regular printing characters. */
-    int numChars;		/* Number of characters in string. */
-    int x, y;			/* Coordinates at which to place origin of
+    int numBytes,		/* Number of bytes in string. */
+    int x, int y)		/* Coordinates at which to place origin of
 				 * string when drawing. */
 {
     HDC dc;
-    HFONT hFont;
-    TkWinDCState state;
     WinFont *fontPtr;
+    TkWinDCState state;
 
     fontPtr = (WinFont *) gc->font;
     display->request++;
@@ -499,18 +856,16 @@ Tk_DrawChars(display, drawable, gc, tkfont, source, numChars, x, y)
 	SetBrushOrgEx(dc, gc->ts_x_origin, gc->ts_y_origin, NULL);
 	oldBrush = SelectObject(dc, stipple);
 
-	SetTextAlign(dcMem, TA_LEFT | TA_TOP);
+	SetTextAlign(dcMem, TA_LEFT | TA_BASELINE);
 	SetTextColor(dcMem, gc->foreground);
 	SetBkMode(dcMem, TRANSPARENT);
 	SetBkColor(dcMem, RGB(0, 0, 0));
 
-        hFont = SelectObject(dcMem, fontPtr->hFont);
-
 	/*
 	 * Compute the bounding box and create a compatible bitmap.
 	 */
 
-	GetTextExtentPoint(dcMem, source, numChars, &size);
+	GetTextExtentPoint(dcMem, source, numBytes, &size);
 	GetTextMetrics(dcMem, &tm);
 	size.cx -= tm.tmOverhang;
 	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
@@ -525,11 +880,11 @@ Tk_DrawChars(display, drawable, gc, tkfont, source, numChars, x, y)
 	 */
 
 	PatBlt(dcMem, 0, 0, size.cx, size.cy, BLACKNESS);
-	TextOut(dcMem, 0, 0, source, numChars);
+	MultiFontTextOut(dc, fontPtr, source, numBytes, x, y);
 	BitBlt(dc, x, y - tm.tmAscent, size.cx, size.cy, dcMem,
 		0, 0, 0xEA02E9);
 	PatBlt(dcMem, 0, 0, size.cx, size.cy, WHITENESS);
-	TextOut(dcMem, 0, 0, source, numChars);
+	MultiFontTextOut(dc, fontPtr, source, numBytes, x, y);
 	BitBlt(dc, x, y - tm.tmAscent, size.cx, size.cy, dcMem,
 		0, 0, 0x8A0E06);
 
@@ -537,7 +892,6 @@ Tk_DrawChars(display, drawable, gc, tkfont, source, numChars, x, y)
 	 * Destroy the temporary bitmap and restore the device context.
 	 */
 
-        SelectObject(dcMem, hFont);
 	SelectObject(dcMem, oldBitmap);
 	DeleteObject(bitmap);
 	DeleteDC(dcMem);
@@ -547,92 +901,1458 @@ Tk_DrawChars(display, drawable, gc, tkfont, source, numChars, x, y)
 	SetTextAlign(dc, TA_LEFT | TA_BASELINE);
 	SetTextColor(dc, gc->foreground);
 	SetBkMode(dc, TRANSPARENT);
-	hFont = SelectObject(dc, fontPtr->hFont);
-	TextOut(dc, x, y, source, numChars);
-        SelectObject(dc, hFont);
+	MultiFontTextOut(dc, fontPtr, source, numBytes, x, y);
     }
     TkWinReleaseDrawableDC(drawable, dc, &state);
 }
 
 /*
- *---------------------------------------------------------------------------
+ *-------------------------------------------------------------------------
  *
- * AllocFont --
+ * MultiFontTextOut --
  *
- *	Helper for TkpGetNativeFont() and TkpGetFontFromAttributes().
- *	Allocates and intializes the memory for a new TkFont that
- *	wraps the platform-specific data.
+ *	Helper function for Tk_DrawChars.  Draws characters, using the 
+ *	various screen fonts in fontPtr to draw multilingual characters.
+ *	Note: No bidirectional support.
  *
  * Results:
- *	Returns pointer to newly constructed TkFont.  
+ *	None.
+ *
+ * Side effects:
+ *	Information gets drawn on the screen.  
+ *	Contents of fontPtr may be modified if more subfonts were loaded 
+ *	in order to draw all the multilingual characters in the given 
+ *	string.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static void
+MultiFontTextOut(
+    HDC hdc,			/* HDC to draw into. */
+    WinFont *fontPtr,		/* Contains set of fonts to use when drawing
+				 * following string. */
+    CONST char *source,		/* Potentially multilingual UTF-8 string. */
+    int numBytes,		/* Length of string in bytes. */
+    int x, int y)		/* Coordinates at which to place origin *
+				 * of string when drawing. */
+{
+    Tcl_UniChar ch;
+    SIZE size;
+    HFONT oldFont;
+    FontFamily *familyPtr;
+    Tcl_DString runString;
+    CONST char *p, *end, *next;
+    SubFont *lastSubFontPtr, *thisSubFontPtr;
+
+    lastSubFontPtr = &fontPtr->subFontArray[0];
+    oldFont = SelectObject(hdc, lastSubFontPtr->hFont);
+
+    end = source + numBytes;
+    for (p = source; p < end; ) {
+        next = p + Tcl_UtfToUniChar(p, &ch);
+        thisSubFontPtr = FindSubFontForChar(fontPtr, ch);
+        if (thisSubFontPtr != lastSubFontPtr) {
+            if (p > source) {
+		familyPtr = lastSubFontPtr->familyPtr;
+ 		Tcl_UtfToExternalDString(familyPtr->encoding, source,
+			p - source, &runString);
+		(*familyPtr->textOutProc)(hdc, x, y, 
+			Tcl_DStringValue(&runString),
+			Tcl_DStringLength(&runString) >> familyPtr->isWideFont);
+		(*familyPtr->getTextExtentPoint32Proc)(hdc, 
+			Tcl_DStringValue(&runString),
+			Tcl_DStringLength(&runString) >> familyPtr->isWideFont, 
+			&size);
+		x += size.cx;
+		Tcl_DStringFree(&runString);
+	    }
+            lastSubFontPtr = thisSubFontPtr;
+            source = p;
+	    SelectObject(hdc, lastSubFontPtr->hFont);
+	}
+	p = next;
+    }
+    if (p > source) {
+	familyPtr = lastSubFontPtr->familyPtr;
+ 	Tcl_UtfToExternalDString(familyPtr->encoding, source, p - source,
+		&runString);
+	(*familyPtr->textOutProc)(hdc, x, y, Tcl_DStringValue(&runString),
+		Tcl_DStringLength(&runString) >> familyPtr->isWideFont);
+	Tcl_DStringFree(&runString);
+    }
+    SelectObject(hdc, oldFont);
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * InitFont --
+ *
+ *	Helper for TkpGetNativeFont() and TkpGetFontFromAttributes().
+ *	Initializes the memory for a new WinFont that wraps the 
+ *	platform-specific data.
  *
  *	The caller is responsible for initializing the fields of the
- *	TkFont that are used exclusively by the generic TkFont code, and
+ *	WinFont that are used exclusively by the generic TkFont code, and
  *	for releasing those fields before calling TkpDeleteFont().
  *
+ * Results:
+ *	Fills the WinFont structure.
+ *
  * Side effects:
  *	Memory allocated.
  *
  *---------------------------------------------------------------------------
  */ 
 
-static TkFont *
-AllocFont(tkFontPtr, tkwin, hFont)
-    TkFont *tkFontPtr;		/* If non-NULL, store the information in
-				 * this existing TkFont structure, rather than
-				 * allocating a new structure to hold the
-				 * font; the existing contents of the font
-				 * will be released.  If NULL, a new TkFont
-				 * structure is allocated. */
-    Tk_Window tkwin;		/* For display where font will be used. */
-    HFONT hFont;		/* Windows information about font. */
+static void
+InitFont(
+    Tk_Window tkwin,		/* Main window of interp in which font will 
+				 * be used, for getting HDC. */
+    HFONT hFont,		/* Windows token for font. */
+    int overstrike,		/* The overstrike attribute of logfont used
+				 * to allocate this font.  For some reason,
+				 * the TEXTMETRICs may contain incorrect info
+				 * in the tmStruckOut field. */
+    WinFont *fontPtr)		/* Filled with information constructed from
+				 * the above arguments. */
 {
-    HWND hwnd;
-    WinFont *fontPtr;
     HDC hdc;
+    HWND hwnd;
+    HFONT oldFont;
     TEXTMETRIC tm;
     Window window;
-    char buf[LF_FACESIZE];
+    TkFontMetrics *fmPtr;
+    Tcl_Encoding encoding;
+    Tcl_DString faceString;
     TkFontAttributes *faPtr;
+    char buf[LF_FACESIZE * sizeof(WCHAR)];
+ 
+    window  = Tk_WindowId(tkwin);
+    hwnd    = (window == None) ? NULL : TkWinGetHWND(window);
+    hdc	    = GetDC(hwnd);
+    oldFont = SelectObject(hdc, hFont);
 
-    if (tkFontPtr != NULL) {
-        fontPtr = (WinFont *) tkFontPtr;
-        DeleteObject(fontPtr->hFont);
+    GetTextMetrics(hdc, &tm);
+
+    /*
+     * On any version NT, there may fonts with international names.  
+     * Use the NT-only Unicode version of GetTextFace to get the font's 
+     * name.  If we used the ANSI version on a non-internationalized 
+     * version of NT, we would get a font name with '?' replacing all 
+     * the international characters.
+     *
+     * On a non-internationalized verson of 95, fonts with international
+     * names are not allowed, so the ANSI version of GetTextFace will work.
+     * On an internationalized version of 95, there may be fonts with 
+     * international names; the ANSI version will work, fetching the 
+     * name in the international system code page.  Can't use the Unicode 
+     * version of GetTextFace because it only exists under NT.
+     */
+
+    if (platformId == VER_PLATFORM_WIN32_NT) {
+	GetTextFaceW(hdc, LF_FACESIZE, (WCHAR *) buf);
     } else {
-        fontPtr = (WinFont *) ckalloc(sizeof(WinFont));
+	GetTextFaceA(hdc, LF_FACESIZE, (char *) buf);
     }
-    
-    window = Tk_WindowId(((TkWindow *) tkwin)->mainPtr->winPtr);
-    hwnd = (window == None) ? NULL : TkWinGetHWND(window);
-
-    hdc = GetDC(hwnd);
-    hFont = SelectObject(hdc, hFont);
-    GetTextFace(hdc, sizeof(buf), buf);
-    GetTextMetrics(hdc, &tm);
+    Tcl_ExternalToUtfDString(systemEncoding, buf, -1, &faceString);
 
     fontPtr->font.fid	= (Font) fontPtr;
 
-    faPtr = &fontPtr->font.fa;
-    faPtr->family	= Tk_GetUid(buf);
-    faPtr->pointsize	= MulDiv(tm.tmHeight - tm.tmInternalLeading,
-	    720 * WidthMMOfScreen(Tk_Screen(tkwin)),
-	    254 * WidthOfScreen(Tk_Screen(tkwin)));
+    faPtr		= &fontPtr->font.fa;
+    faPtr->family	= Tk_GetUid(Tcl_DStringValue(&faceString));
+    faPtr->size		= TkFontGetPoints(tkwin, -(tm.tmHeight - tm.tmInternalLeading));
     faPtr->weight	= (tm.tmWeight > FW_MEDIUM) ? TK_FW_BOLD : TK_FW_NORMAL;
     faPtr->slant	= (tm.tmItalic != 0) ? TK_FS_ITALIC : TK_FS_ROMAN;
     faPtr->underline	= (tm.tmUnderlined != 0) ? 1 : 0;
-    faPtr->overstrike	= (tm.tmStruckOut != 0) ? 1 : 0;
+    faPtr->overstrike	= overstrike;
+    
+    fmPtr		= &fontPtr->font.fm;
+    fmPtr->ascent	= tm.tmAscent;
+    fmPtr->descent	= tm.tmDescent;
+    fmPtr->maxWidth	= tm.tmMaxCharWidth;
+    fmPtr->fixed	= !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH);
 
-    fontPtr->font.fm.ascent	= tm.tmAscent;
-    fontPtr->font.fm.descent	= tm.tmDescent;
-    fontPtr->font.fm.maxWidth	= tm.tmMaxCharWidth;
-    fontPtr->font.fm.fixed	= !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH);
+    fontPtr->hwnd	= hwnd;
+    fontPtr->pixelSize	= tm.tmHeight - tm.tmInternalLeading;
 
-    hFont = SelectObject(hdc, hFont);
+    fontPtr->numSubFonts 	= 1;
+    fontPtr->subFontArray	= fontPtr->staticSubFonts;
+    InitSubFont(hdc, hFont, 1, &fontPtr->subFontArray[0]);
+
+    encoding = fontPtr->subFontArray[0].familyPtr->encoding;
+    if (encoding == unicodeEncoding) {
+	GetCharWidthW(hdc, 0, BASE_CHARS - 1, fontPtr->widths);
+    } else {
+	GetCharWidthA(hdc, 0, BASE_CHARS - 1, fontPtr->widths);
+    } 
+    Tcl_DStringFree(&faceString);
+
+    SelectObject(hdc, oldFont);
     ReleaseDC(hwnd, hdc);
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * ReleaseFont --
+ * 
+ *	Called to release the windows-specific contents of a TkFont.
+ *	The caller is responsible for freeing the memory used by the
+ *	font itself.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Memory is freed.
+ *
+ *---------------------------------------------------------------------------
+ */
+ 
+static void
+ReleaseFont(
+    WinFont *fontPtr)		/* The font to delete. */
+{
+    int i;
 
-    fontPtr->hFont		= hFont;
-    fontPtr->hwnd		= hwnd;
+    for (i = 0; i < fontPtr->numSubFonts; i++) {
+	ReleaseSubFont(&fontPtr->subFontArray[i]);
+    }
+    if (fontPtr->subFontArray != fontPtr->staticSubFonts) {
+	ckfree((char *) fontPtr->subFontArray);
+    }
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * InitSubFont --
+ *
+ *	Wrap a screen font and load the FontFamily that represents
+ *	it.  Used to prepare a SubFont so that characters can be mapped
+ *	from UTF-8 to the charset of the font.
+ *
+ * Results:
+ *	The subFontPtr is filled with information about the font.
+ *
+ * Side effects:
+ *	None.
+ *
+ *-------------------------------------------------------------------------
+ */
 
-    return (TkFont *) fontPtr;
+static void
+InitSubFont(
+    HDC hdc,			/* HDC in which font can be selected. */
+    HFONT hFont,		/* The screen font. */
+    int base,			/* Non-zero if this SubFont is being used
+				 * as the base font for a font object. */
+    SubFont *subFontPtr)	/* Filled with SubFont constructed from 
+    				 * above attributes. */
+{
+    subFontPtr->hFont	    = hFont;
+    subFontPtr->familyPtr   = AllocFontFamily(hdc, hFont, base);
+    subFontPtr->fontMap	    = subFontPtr->familyPtr->fontMap;
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * ReleaseSubFont --
+ *
+ *	Called to release the contents of a SubFont.  The caller is 
+ *	responsible for freeing the memory used by the SubFont itself.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Memory and resources are freed.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+static void
+ReleaseSubFont(
+    SubFont *subFontPtr)	/* The SubFont to delete. */
+{
+    DeleteObject(subFontPtr->hFont);
+    FreeFontFamily(subFontPtr->familyPtr);
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * AllocFontFamily --
+ *
+ *	Find the FontFamily structure associated with the given font
+ *	name.  The information should be stored by the caller in a 
+ *	SubFont and used when determining if that SubFont supports a 
+ *	character.
+ *
+ *	Cannot use the string name used to construct the font as the 
+ *	key, because the capitalization may not be canonical.  Therefore
+ *	use the face name actually retrieved from the font metrics as
+ *	the key.
+ *
+ * Results:
+ *	A pointer to a FontFamily.  The reference count in the FontFamily
+ *	is automatically incremented.  When the SubFont is released, the
+ *	reference count is decremented.  When no SubFont is using this
+ *	FontFamily, it may be deleted.
+ *
+ * Side effects:
+ *	A new FontFamily structure will be allocated if this font family
+ *	has not been seen.  TrueType character existence metrics are
+ *	loaded into the FontFamily structure.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static FontFamily *
+AllocFontFamily(
+    HDC hdc,			/* HDC in which font can be selected. */
+    HFONT hFont,		/* Screen font whose FontFamily is to be
+				 * returned. */
+    int base)			/* Non-zero if this font family is to be
+				 * used in the base font of a font object. */
+{
+    Tk_Uid faceName;
+    FontFamily *familyPtr;
+    Tcl_DString faceString;
+    Tcl_Encoding encoding;
+    char buf[LF_FACESIZE * sizeof(WCHAR)];
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
+    hFont = SelectObject(hdc, hFont);
+    if (platformId == VER_PLATFORM_WIN32_NT) {
+	GetTextFaceW(hdc, LF_FACESIZE, (WCHAR *) buf);
+    } else {
+	GetTextFaceA(hdc, LF_FACESIZE, (char *) buf);
+    }
+    Tcl_ExternalToUtfDString(systemEncoding, buf, -1, &faceString);
+    faceName = Tk_GetUid(Tcl_DStringValue(&faceString));
+    Tcl_DStringFree(&faceString);
+    hFont = SelectObject(hdc, hFont);
+
+    familyPtr = tsdPtr->fontFamilyList; 
+    for ( ; familyPtr != NULL; familyPtr = familyPtr->nextPtr) {
+	if (familyPtr->faceName == faceName) {
+	    familyPtr->refCount++;
+	    return familyPtr;
+	}
+    }
+
+    familyPtr = (FontFamily *) ckalloc(sizeof(FontFamily));
+    memset(familyPtr, 0, sizeof(FontFamily));
+    familyPtr->nextPtr = tsdPtr->fontFamilyList;
+    tsdPtr->fontFamilyList = familyPtr;
+
+    /* 
+     * Set key for this FontFamily. 
+     */
+
+    familyPtr->faceName = faceName;
+
+    /* 
+     * An initial refCount of 2 means that FontFamily information will
+     * persist even when the SubFont that loaded the FontFamily is released.
+     * Change it to 1 to cause FontFamilies to be unloaded when not in use.
+     */
+
+    familyPtr->refCount = 2;
+
+    familyPtr->segCount = LoadFontRanges(hdc, hFont, &familyPtr->startCount, 
+	    &familyPtr->endCount, &familyPtr->isSymbolFont);
+
+    encoding = NULL;
+    if (familyPtr->isSymbolFont != 0) {
+	/*
+	 * Symbol fonts are handled specially.  For instance, Unicode 0393
+	 * (GREEK CAPITAL GAMMA) must be mapped to Symbol character 0047
+	 * (GREEK CAPITAL GAMMA), because the Symbol font doesn't have a
+	 * GREEK CAPITAL GAMMA at location 0393.  If Tk interpreted the
+	 * Symbol font using the Unicode encoding, it would decide that
+	 * the Symbol font has no GREEK CAPITAL GAMMA, because the Symbol
+	 * encoding (of course) reports that character 0393 doesn't exist.  
+	 *
+	 * With non-symbol Windows fonts, such as Times New Roman, if the
+	 * font has a GREEK CAPITAL GAMMA, it will be found in the correct
+	 * Unicode location (0393); the GREEK CAPITAL GAMMA will not be off
+	 * hiding at some other location.
+	 */
+
+	encoding = Tcl_GetEncoding(NULL, faceName);
+    }
+
+    if (encoding == NULL) {
+	encoding = Tcl_GetEncoding(NULL, "unicode");
+	familyPtr->textOutProc =
+	    (BOOL (WINAPI *)(HDC, int, int, TCHAR *, int)) TextOutW;
+	familyPtr->getTextExtentPoint32Proc = 
+	    (BOOL (WINAPI *)(HDC, TCHAR *, int, LPSIZE)) GetTextExtentPoint32W;
+	familyPtr->isWideFont = 1;
+    } else {
+	familyPtr->textOutProc = 
+	    (BOOL (WINAPI *)(HDC, int, int, TCHAR *, int)) TextOutA;
+	familyPtr->getTextExtentPoint32Proc = 
+	    (BOOL (WINAPI *)(HDC, TCHAR *, int, LPSIZE)) GetTextExtentPoint32A;
+	familyPtr->isWideFont = 0;
+    } 
+
+    familyPtr->encoding = encoding;
+
+    return familyPtr;
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * FreeFontFamily --
+ *
+ *	Called to free a FontFamily when the SubFont is finished using it.
+ *	Frees the contents of the FontFamily and the memory used by the
+ *	FontFamily itself.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *-------------------------------------------------------------------------
+ */
+ 
+static void
+FreeFontFamily(
+    FontFamily *familyPtr)	/* The FontFamily to delete. */
+{
+    int i;
+    FontFamily **familyPtrPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
+    if (familyPtr == NULL) {
+        return;
+    }
+    familyPtr->refCount--;
+    if (familyPtr->refCount > 0) {
+    	return;
+    }
+    for (i = 0; i < FONTMAP_PAGES; i++) {
+        if (familyPtr->fontMap[i] != NULL) {
+            ckfree(familyPtr->fontMap[i]);
+        }
+    }
+    if (familyPtr->startCount != NULL) {
+	ckfree((char *) familyPtr->startCount);
+    }
+    if (familyPtr->endCount != NULL) {
+	ckfree((char *) familyPtr->endCount);
+    }
+    if (familyPtr->encoding != unicodeEncoding) {
+	Tcl_FreeEncoding(familyPtr->encoding);
+    }
+    
+    /* 
+     * Delete from list. 
+     */
+         
+    for (familyPtrPtr = &tsdPtr->fontFamilyList; ; ) {
+        if (*familyPtrPtr == familyPtr) {
+  	    *familyPtrPtr = familyPtr->nextPtr;
+	    break;
+	}
+	familyPtrPtr = &(*familyPtrPtr)->nextPtr;
+    }
+    
+    ckfree((char *) familyPtr);
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * FindSubFontForChar --
+ *
+ *	Determine which screen font is necessary to use to display the 
+ *	given character.  If the font object does not have a screen font 
+ *	that can display the character, another screen font may be loaded 
+ *	into the font object, following a set of preferred fallback rules.
+ *
+ * Results:
+ *	The return value is the SubFont to use to display the given 
+ *	character. 
+ *
+ * Side effects:
+ *	The contents of fontPtr are modified to cache the results
+ *	of the lookup and remember any SubFonts that were dynamically 
+ *	loaded.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static SubFont *
+FindSubFontForChar(
+    WinFont *fontPtr,		/* The font object with which the character
+				 * will be displayed. */
+    int ch)			/* The Unicode character to be displayed. */
+{
+    HDC hdc;
+    int i, j, k;
+    CanUse canUse;
+    char **aliases, **anyFallbacks;
+    char ***fontFallbacks;
+    char *fallbackName;
+    SubFont *subFontPtr;
+    Tcl_DString ds;
+    
+    if (ch < BASE_CHARS) {
+	return &fontPtr->subFontArray[0];
+    }
+
+    for (i = 0; i < fontPtr->numSubFonts; i++) {
+	if (FontMapLookup(&fontPtr->subFontArray[i], ch)) {
+	    return &fontPtr->subFontArray[i];
+	}
+    }
+
+    /*
+     * Keep track of all face names that we check, so we don't check some
+     * name multiple times if it can be reached by multiple paths.
+     */
+     
+    Tcl_DStringInit(&ds);
+    hdc = GetDC(fontPtr->hwnd);
+        
+    aliases = TkFontGetAliasList(fontPtr->font.fa.family);
+
+    fontFallbacks = TkFontGetFallbacks();
+    for (i = 0; fontFallbacks[i] != NULL; i++) {
+	for (j = 0; fontFallbacks[i][j] != NULL; j++) {
+	    fallbackName = fontFallbacks[i][j];
+	    if (strcasecmp(fallbackName, fontPtr->font.fa.family) == 0) {
+		/*
+		 * If the base font has a fallback...
+		 */
+
+		goto tryfallbacks;
+	    } else if (aliases != NULL) {
+		/* 
+		 * Or if an alias for the base font has a fallback...
+		 */
+
+		for (k = 0; aliases[k] != NULL; k++) {
+		    if (strcasecmp(aliases[k], fallbackName) == 0) {
+		        goto tryfallbacks;
+		    }
+		}
+	    }
+	}
+	continue;
+
+	/* 
+	 * ...then see if we can use one of the fallbacks, or an
+	 * alias for one of the fallbacks.
+	 */
+
+	tryfallbacks:
+	for (j = 0; fontFallbacks[i][j] != NULL; j++) {
+	    fallbackName = fontFallbacks[i][j];
+	    subFontPtr = CanUseFallbackWithAliases(hdc, fontPtr, fallbackName,
+		    ch, &ds);
+	    if (subFontPtr != NULL) {
+		goto end;
+	    }
+	}
+    }
+
+    /*
+     * See if we can use something from the global fallback list. 
+     */
+
+    anyFallbacks = TkFontGetGlobalClass();
+    for (i = 0; anyFallbacks[i] != NULL; i++) {
+	fallbackName = anyFallbacks[i];
+	subFontPtr = CanUseFallbackWithAliases(hdc, fontPtr, fallbackName, 
+		ch, &ds);
+	if (subFontPtr != NULL) {
+	    goto end;
+	}
+    }
+
+    /*
+     * Try all face names available in the whole system until we
+     * find one that can be used.
+     */
+
+    canUse.hdc = hdc;
+    canUse.fontPtr = fontPtr;
+    canUse.nameTriedPtr = &ds;
+    canUse.ch = ch;
+    canUse.subFontPtr = NULL;
+    if (platformId == VER_PLATFORM_WIN32_NT) {
+	EnumFontFamiliesW(hdc, NULL, (FONTENUMPROCW) WinFontCanUseProc,
+		(LPARAM) &canUse);
+    } else {
+	EnumFontFamiliesA(hdc, NULL, (FONTENUMPROCA) WinFontCanUseProc,
+		(LPARAM) &canUse);
+    }
+    subFontPtr = canUse.subFontPtr;
+
+    end:
+    Tcl_DStringFree(&ds);
+    
+    if (subFontPtr == NULL) {
+        /* 
+         * No font can display this character.  We will use the base font
+         * and have it display the "unknown" character.
+         */
+
+	subFontPtr = &fontPtr->subFontArray[0];
+        FontMapInsert(subFontPtr, ch);
+    }
+    ReleaseDC(fontPtr->hwnd, hdc);
+    return subFontPtr;
+}
+
+static int CALLBACK
+WinFontCanUseProc(
+    ENUMLOGFONT *lfPtr,		/* Logical-font data. */
+    NEWTEXTMETRIC *tmPtr,	/* Physical-font data (not used). */
+    int fontType,		/* Type of font (not used). */
+    LPARAM lParam)		/* Result object to hold result. */
+{
+    int ch;
+    HDC hdc;
+    WinFont *fontPtr;
+    CanUse *canUsePtr;
+    char *fallbackName;
+    SubFont *subFontPtr;
+    Tcl_DString faceString;
+    Tcl_DString *nameTriedPtr;
+
+    canUsePtr	    = (CanUse *) lParam;
+    ch		    = canUsePtr->ch;
+    hdc		    = canUsePtr->hdc;
+    fontPtr	    = canUsePtr->fontPtr;
+    nameTriedPtr    = canUsePtr->nameTriedPtr;
+
+    fallbackName = lfPtr->elfLogFont.lfFaceName;
+    Tcl_ExternalToUtfDString(systemEncoding, fallbackName, -1, &faceString);
+    fallbackName = Tcl_DStringValue(&faceString);
+
+    if (SeenName(fallbackName, nameTriedPtr) == 0) {
+	subFontPtr = CanUseFallback(hdc, fontPtr, fallbackName, ch);
+	if (subFontPtr != NULL) {
+	    canUsePtr->subFontPtr = subFontPtr;
+	    Tcl_DStringFree(&faceString);
+	    return 0;
+	}
+    }
+    Tcl_DStringFree(&faceString);
+    return 1;
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * FontMapLookup --
+ *
+ *	See if the screen font can display the given character.
+ *
+ * Results:
+ *	The return value is 0 if the screen font cannot display the
+ *	character, non-zero otherwise.
+ *
+ * Side effects:
+ *	New pages are added to the font mapping cache whenever the
+ *	character belongs to a page that hasn't been seen before.
+ *	When a page is loaded, information about all the characters on
+ *	that page is stored, not just for the single character in
+ *	question.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static int
+FontMapLookup(
+    SubFont *subFontPtr,	/* Contains font mapping cache to be queried
+				 * and possibly updated. */
+    int ch)			/* Character to be tested. */
+{
+    int row, bitOffset;
+
+    row = ch >> FONTMAP_SHIFT;
+    if (subFontPtr->fontMap[row] == NULL) {
+	FontMapLoadPage(subFontPtr, row);
+    }
+    bitOffset = ch & (FONTMAP_BITSPERPAGE - 1);
+    return (subFontPtr->fontMap[row][bitOffset >> 3] >> (bitOffset & 7)) & 1;
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * FontMapInsert --
+ *
+ *	Tell the font mapping cache that the given screen font should be
+ *	used to display the specified character.  This is called when no
+ *	font on the system can be be found that can display that 
+ *	character; we lie to the font and tell it that it can display
+ *	the character, otherwise we would end up re-searching the entire
+ *	fallback hierarchy every time that character was seen.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	New pages are added to the font mapping cache whenever the
+ *	character belongs to a page that hasn't been seen before.
+ *	When a page is loaded, information about all the characters on
+ *	that page is stored, not just for the single character in
+ *	question.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static void
+FontMapInsert(
+    SubFont *subFontPtr,	/* Contains font mapping cache to be 
+				 * updated. */
+    int ch)			/* Character to be added to cache. */
+{
+    int row, bitOffset;
+
+    row = ch >> FONTMAP_SHIFT;
+    if (subFontPtr->fontMap[row] == NULL) {
+	FontMapLoadPage(subFontPtr, row);
+    }
+    bitOffset = ch & (FONTMAP_BITSPERPAGE - 1);
+    subFontPtr->fontMap[row][bitOffset >> 3] |= 1 << (bitOffset & 7);
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * FontMapLoadPage --
+ *
+ *	Load information about all the characters on a given page.
+ *	This information consists of one bit per character that indicates
+ *	whether the associated HFONT can (1) or cannot (0) display the
+ *	characters on the page.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Mempry allocated.
+ *
+ *-------------------------------------------------------------------------
+ */
+static void 
+FontMapLoadPage(
+    SubFont *subFontPtr,	/* Contains font mapping cache to be 
+				 * updated. */
+    int row)			/* Index of the page to be loaded into 
+				 * the cache. */
+{
+    FontFamily *familyPtr;
+    Tcl_Encoding encoding;
+    char src[TCL_UTF_MAX], buf[16];
+    USHORT *startCount, *endCount;
+    int i, j, bitOffset, end, segCount;
+
+    subFontPtr->fontMap[row] = (char *) ckalloc(FONTMAP_BITSPERPAGE / 8);
+    memset(subFontPtr->fontMap[row], 0, FONTMAP_BITSPERPAGE / 8);
+
+    familyPtr = subFontPtr->familyPtr;
+    encoding = familyPtr->encoding;
+
+    if (familyPtr->encoding == unicodeEncoding) {
+	/*
+	 * Font is Unicode.  Few fonts are going to have all characters, so 
+	 * examine the TrueType character existence metrics to determine 
+	 * what characters actually exist in this font.
+	 */
+
+	segCount    = familyPtr->segCount;
+	startCount  = familyPtr->startCount;
+	endCount    = familyPtr->endCount;
+
+	j = 0;
+	end = (row + 1) << FONTMAP_SHIFT;
+	for (i = row << FONTMAP_SHIFT; i < end; i++) {
+	    for ( ; j < segCount; j++) {
+		if (endCount[j] >= i) {
+		    if (startCount[j] <= i) {
+			bitOffset = i & (FONTMAP_BITSPERPAGE - 1);
+			subFontPtr->fontMap[row][bitOffset >> 3] |= 1 << (bitOffset & 7);
+		    }
+		    break;
+		}
+	    }
+	}
+    } else if (familyPtr->isSymbolFont) {
+	/*
+	 * Assume that a symbol font with a known encoding has all the 
+	 * characters that its encoding claims it supports.  
+	 *	 
+	 * The test for "encoding == unicodeEncoding"
+	 * must occur before this case, to catch all symbol fonts (such 
+	 * as {Comic Sans MS} or Wingdings) for which we don't have 
+	 * encoding information; those symbol fonts are treated as if
+	 * they were in the Unicode encoding and their symbolic
+	 * character existence metrics are treated as if they were Unicode
+	 * character existence metrics.  This way, although we don't know
+	 * the proper Unicode -> symbol font mapping, we can install the
+	 * symbol font as the base font and access its glyphs.
+	 */
+
+        end = (row + 1) << FONTMAP_SHIFT;
+	for (i = row << FONTMAP_SHIFT; i < end; i++) {
+	    if (Tcl_UtfToExternal(NULL, encoding, src, 
+		    Tcl_UniCharToUtf(i, src), TCL_ENCODING_STOPONERROR, NULL, 
+		    buf, sizeof(buf), NULL, NULL, NULL) != TCL_OK) {
+		continue;
+	    }
+	    bitOffset = i & (FONTMAP_BITSPERPAGE - 1);
+	    subFontPtr->fontMap[row][bitOffset >> 3] |= 1 << (bitOffset & 7);
+	}
+    }
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * CanUseFallbackWithAliases --
+ *
+ *	Helper function for FindSubFontForChar.  Determine if the
+ *	specified face name (or an alias of the specified face name)
+ *	can be used to construct a screen font that can display the
+ *	given character.
+ *
+ * Results:
+ *	See CanUseFallback().
+ *
+ * Side effects:
+ *	If the name and/or one of its aliases was rejected, the
+ *	rejected string is recorded in nameTriedPtr so that it won't
+ *	be tried again.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+static SubFont *
+CanUseFallbackWithAliases(
+    HDC hdc,			/* HDC in which font can be selected. */
+    WinFont *fontPtr,		/* The font object that will own the new
+				 * screen font. */
+    char *faceName,		/* Desired face name for new screen font. */
+    int ch,			/* The Unicode character that the new
+				 * screen font must be able to display. */
+    Tcl_DString *nameTriedPtr)	/* Records face names that have already
+				 * been tried.  It is possible for the same
+				 * face name to be queried multiple times when
+				 * trying to find a suitable screen font. */
+{
+    int i;
+    char **aliases;
+    SubFont *subFontPtr;
+    
+    if (SeenName(faceName, nameTriedPtr) == 0) {
+	subFontPtr = CanUseFallback(hdc, fontPtr, faceName, ch);
+	if (subFontPtr != NULL) {
+	    return subFontPtr;
+	}
+    }
+    aliases = TkFontGetAliasList(faceName);
+    if (aliases != NULL) {
+	for (i = 0; aliases[i] != NULL; i++) {
+	    if (SeenName(aliases[i], nameTriedPtr) == 0) {
+		subFontPtr = CanUseFallback(hdc, fontPtr, aliases[i], ch);
+		if (subFontPtr != NULL) {
+		    return subFontPtr;
+		}
+	    }
+	}
+    }
+    return NULL;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * SeenName --
+ *
+ *	Used to determine we have already tried and rejected the given
+ *	face name when looking for a screen font that can support some
+ *	Unicode character.
+ *
+ * Results:
+ *	The return value is 0 if this face name has not already been seen,
+ *	non-zero otherwise.
+ *
+ * Side effects:
+ *	None.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+static int
+SeenName(
+    CONST char *name,		/* The name to check. */
+    Tcl_DString *dsPtr)		/* Contains names that have already been
+				 * seen. */
+{
+    CONST char *seen, *end;
+
+    seen = Tcl_DStringValue(dsPtr);
+    end = seen + Tcl_DStringLength(dsPtr);
+    while (seen < end) {
+	if (strcasecmp(seen, name) == 0) {
+	    return 1;
+	}
+	seen += strlen(seen) + 1;
+    }
+    Tcl_DStringAppend(dsPtr, (char *) name, (int) (strlen(name) + 1));
+    return 0;
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * CanUseFallback --
+ *
+ *	If the specified screen font has not already been loaded into 
+ *	the font object, determine if it can display the given character.
+ *
+ * Results:
+ *	The return value is a pointer to a newly allocated SubFont, owned
+ *	by the font object.  This SubFont can be used to display the given
+ *	character.  The SubFont represents the screen font with the base set 
+ *	of font attributes from the font object, but using the specified 
+ *	font name.  NULL is returned if the font object already holds
+ *	a reference to the specified physical font or if the specified 
+ *	physical font cannot display the given character.
+ *
+ * Side effects:				       
+ *	The font object's subFontArray is updated to contain a reference
+ *	to the newly allocated SubFont.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static SubFont *
+CanUseFallback(
+    HDC hdc,			/* HDC in which font can be selected. */
+    WinFont *fontPtr,		/* The font object that will own the new
+				 * screen font. */
+    char *faceName,		/* Desired face name for new screen font. */
+    int ch)			/* The Unicode character that the new
+				 * screen font must be able to display. */
+{
+    int i;
+    HFONT hFont;
+    SubFont subFont;
+
+    if (FamilyExists(hdc, faceName) == 0) {
+	return NULL;
+    }
+
+    /* 
+     * Skip all fonts we've already used.
+     */
+     
+    for (i = 0; i < fontPtr->numSubFonts; i++) {
+	if (faceName == fontPtr->subFontArray[i].familyPtr->faceName) {
+	    return NULL;
+	}
+    }
+
+    /*
+     * Load this font and see if it has the desired character.
+     */
+
+    hFont = GetScreenFont(&fontPtr->font.fa, faceName, fontPtr->pixelSize);
+    InitSubFont(hdc, hFont, 0, &subFont);
+    if (((ch < 256) && (subFont.familyPtr->isSymbolFont)) 
+	    || (FontMapLookup(&subFont, ch) == 0)) {
+	/*
+	 * Don't use a symbol font as a fallback font for characters below
+	 * 256.
+	 */
+
+	ReleaseSubFont(&subFont);
+	return NULL;
+    }
+
+    if (fontPtr->numSubFonts >= SUBFONT_SPACE) {
+	SubFont *newPtr;
+    	
+    	newPtr = (SubFont *) ckalloc(sizeof(SubFont) 
+		* (fontPtr->numSubFonts + 1));
+	memcpy((char *) newPtr, fontPtr->subFontArray,
+		fontPtr->numSubFonts * sizeof(SubFont));
+	if (fontPtr->subFontArray != fontPtr->staticSubFonts) {
+	    ckfree((char *) fontPtr->subFontArray);
+	}
+	fontPtr->subFontArray = newPtr;
+    }
+    fontPtr->subFontArray[fontPtr->numSubFonts] = subFont;
+    fontPtr->numSubFonts++;
+    return &fontPtr->subFontArray[fontPtr->numSubFonts - 1];
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * GetScreenFont --
+ *
+ *	Given the name and other attributes, construct an HFONT.
+ *	This is where all the alias and fallback substitution bottoms
+ *	out.
+ *
+ * Results:
+ *	The screen font that corresponds to the attributes.
+ *
+ * Side effects:
+ *	None.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+static HFONT 
+GetScreenFont(
+    CONST TkFontAttributes *faPtr,
+				/* Desired font attributes for new HFONT. */
+    CONST char *faceName,	/* Overrides font family specified in font
+				 * attributes. */
+    int pixelSize)		/* Overrides size specified in font 
+				 * attributes. */
+{
+    Tcl_DString ds;
+    HFONT hFont;
+    LOGFONTW lf;
+
+    lf.lfHeight		= -pixelSize;
+    lf.lfWidth		= 0;
+    lf.lfEscapement	= 0;
+    lf.lfOrientation	= 0;
+    lf.lfWeight		= (faPtr->weight == TK_FW_NORMAL) ? FW_NORMAL : FW_BOLD;
+    lf.lfItalic		= faPtr->slant;
+    lf.lfUnderline	= faPtr->underline;
+    lf.lfStrikeOut	= faPtr->overstrike;
+    lf.lfCharSet	= DEFAULT_CHARSET;
+    lf.lfOutPrecision	= OUT_TT_PRECIS;
+    lf.lfClipPrecision	= CLIP_DEFAULT_PRECIS;
+    lf.lfQuality	= DEFAULT_QUALITY;
+    lf.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
+
+    Tcl_UtfToExternalDString(systemEncoding, faceName, -1, &ds);
+
+    if (platformId == VER_PLATFORM_WIN32_NT) {    
+	Tcl_UniChar *src, *dst;
+	src = (Tcl_UniChar *) Tcl_DStringValue(&ds);
+	dst = (Tcl_UniChar *) lf.lfFaceName;
+	while (*src != '\0') {
+	    *dst++ = *src++;
+	}
+	*dst = '\0';
+	hFont = CreateFontIndirectW(&lf);
+    } else {
+	strcpy((char *) lf.lfFaceName, Tcl_DStringValue(&ds));
+	hFont = CreateFontIndirectA((LOGFONTA *) &lf);
+    }
+    Tcl_DStringFree(&ds);
+    return hFont;
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * FamilyExists, FamilyOrAliasExists, WinFontExistsProc --
+ *
+ *	Determines if any physical screen font exists on the system with 
+ *	the given family name.  If the family exists, then it should be
+ *	possible to construct some physical screen font with that family
+ *	name.
+ *
+ * Results:
+ *	The return value is 0 if the specified font family does not exist,
+ *	non-zero otherwise.
+ *
+ * Side effects:
+ *	None.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static int
+FamilyExists(
+    HDC hdc,			/* HDC in which font family will be used. */
+    CONST char *faceName)	/* Font family to query. */
+{
+    int result;
+    Tcl_DString faceString;
+
+    /*
+     * Just immediately rule out the following fonts, because they look so
+     * ugly on windows.  The caller's fallback mechanism will cause the
+     * corresponding appropriate TrueType fonts to be selected.
+     */
+
+    if (strcasecmp(faceName, "Courier") == 0) {
+	return 0;
+    }
+    if (strcasecmp(faceName, "Times") == 0) {
+	return 0;
+    }
+    if (strcasecmp(faceName, "Helvetica") == 0) {
+	return 0;
+    }
+    
+    Tcl_UtfToExternalDString(systemEncoding, faceName, -1, &faceString);
+
+    /*
+     * If the family exists, WinFontExistProc() will be called and 
+     * EnumFontFamilies() will return whatever WinFontExistProc() returns.  
+     * If the family doesn't exist, EnumFontFamilies() will just return a 
+     * non-zero value.
+     */
+
+    if (platformId == VER_PLATFORM_WIN32_NT) {
+	result = EnumFontFamiliesW(hdc, (WCHAR *) Tcl_DStringValue(&faceString),
+		(FONTENUMPROCW) WinFontExistProc, 0);
+    } else {
+	result = EnumFontFamiliesA(hdc, (char *) Tcl_DStringValue(&faceString),
+		(FONTENUMPROCA) WinFontExistProc, 0);
+    }
+    Tcl_DStringFree(&faceString);
+    return (result == 0);
 }
 
+static char *
+FamilyOrAliasExists(
+    HDC hdc, 
+    CONST char *faceName)
+{
+    char **aliases;
+    int i;
+
+    if (FamilyExists(hdc, faceName) != 0) {
+	return (char *) faceName;
+    }
+    aliases = TkFontGetAliasList(faceName);
+    if (aliases != NULL) {
+	for (i = 0; aliases[i] != NULL; i++) {
+	    if (FamilyExists(hdc, aliases[i]) != 0) {
+		return aliases[i];
+	    }
+	}
+    }
+    return NULL;
+}
+
+static int CALLBACK
+WinFontExistProc(
+    ENUMLOGFONT *lfPtr,		/* Logical-font data. */
+    NEWTEXTMETRIC *tmPtr,	/* Physical-font data (not used). */
+    int fontType,		/* Type of font (not used). */
+    LPARAM lParam)		/* EnumFontData to hold result. */
+{
+    return 0;
+}
+
+/*
+ * The following data structures are used when querying a TrueType font file
+ * to determine which characters the font supports.
+ */
+
+#pragma pack(1)			/* Structures are byte aligned in file. */
+
+#define CMAPHEX  0x636d6170	/* Key for character map resource. */
+
+typedef struct CMAPTABLE {
+    USHORT version;		/* Table version number (0). */
+    USHORT numTables;		/* Number of encoding tables following. */
+} CMAPTABLE;
+
+typedef struct ENCODINGTABLE {
+    USHORT platform;		/* Platform for which data is targeted.  
+				 * 3 means data is for Windows. */
+    USHORT encoding;		/* How characters in font are encoded.  
+				 * 1 means that the following subtable is 
+				 * keyed based on Unicode. */
+    ULONG offset;		/* Byte offset from beginning of CMAPTABLE 
+				 * to the subtable for this encoding. */
+} ENCODINGTABLE;
+
+typedef struct ANYTABLE {
+    USHORT format;		/* Format number. */
+    USHORT length;		/* The actual length in bytes of this 
+				 * subtable. */
+    USHORT version;		/* Version number (starts at 0). */
+} ANYTABLE;
+
+typedef struct BYTETABLE {
+    USHORT format;		/* Format number is set to 0. */
+    USHORT length;		/* The actual length in bytes of this 
+				 * subtable. */
+    USHORT version;		/* Version number (starts at 0). */
+    BYTE glyphIdArray[256];	/* Array that maps up to 256 single-byte char
+				 * codes to glyph indices. */
+} BYTETABLE;
+
+typedef struct SUBHEADER {
+    USHORT firstCode;		/* First valid low byte for subHeader. */
+    USHORT entryCount;		/* Number valid low bytes for subHeader. */
+    SHORT idDelta;		/* Constant adder to get base glyph index. */
+    USHORT idRangeOffset;	/* Byte offset from here to appropriate 
+				 * glyphIndexArray. */
+} SUBHEADER;
+
+typedef struct HIBYTETABLE {
+    USHORT format;  		/* Format number is set to 2. */
+    USHORT length;		/* The actual length in bytes of this
+				 * subtable. */
+    USHORT version;		/* Version number (starts at 0). */
+    USHORT subHeaderKeys[256];	/* Maps high bytes to subHeaders: value is 
+				 * subHeader index * 8. */
+#if 0
+    SUBHEADER subHeaders[];	/* Variable-length array of SUBHEADERs. */
+    USHORT glyphIndexArray[];	/* Variable-length array containing subarrays 
+				 * used for mapping the low byte of 2-byte 
+				 * characters. */
+#endif
+} HIBYTETABLE;
+
+typedef struct SEGMENTTABLE {
+    USHORT format;		/* Format number is set to 4. */
+    USHORT length;		/* The actual length in bytes of this
+				 * subtable. */
+    USHORT version;		/* Version number (starts at 0). */
+    USHORT segCountX2;		/* 2 x segCount. */
+    USHORT searchRange;		/* 2 x (2**floor(log2(segCount))). */
+    USHORT entrySelector;	/* log2(searchRange/2). */
+    USHORT rangeShift;		/* 2 x segCount - searchRange. */
+#if 0
+    USHORT endCount[segCount]	/* End characterCode for each segment. */
+    USHORT reservedPad;		/* Set to 0. */
+    USHORT startCount[segCount];/* Start character code for each segment. */
+    USHORT idDelta[segCount];	/* Delta for all character in segment. */
+    USHORT idRangeOffset[segCount]; /* Offsets into glyphIdArray or 0. */
+    USHORT glyphIdArray[]	/* Glyph index array. */
+#endif
+} SEGMENTTABLE;
+
+typedef struct TRIMMEDTABLE {
+    USHORT format;		/* Format number is set to 6. */
+    USHORT length;		/* The actual length in bytes of this
+				 * subtable. */
+    USHORT version;		/* Version number (starts at 0). */
+    USHORT firstCode;		/* First character code of subrange. */
+    USHORT entryCount;		/* Number of character codes in subrange. */
+#if 0
+    USHORT glyphIdArray[];	/* Array of glyph index values for 
+				        character codes in the range. */
+#endif
+} TRIMMEDTABLE;
+
+typedef union SUBTABLE {
+    ANYTABLE any;
+    BYTETABLE byte;
+    HIBYTETABLE hiByte;
+    SEGMENTTABLE segment;
+    TRIMMEDTABLE trimmed;
+} SUBTABLE;
+
+#pragma pack()
+
+/*
+ *-------------------------------------------------------------------------
+ *
+ * LoadFontRanges --
+ *
+ *	Given an HFONT, get the information about the characters that 
+ *	this font can display.
+ *
+ * Results:
+ *	If the font has no Unicode character information, the return value
+ *	is 0 and *startCountPtr and *endCountPtr are filled with NULL.  
+ *	Otherwise, *startCountPtr and *endCountPtr are set to pointers to 
+ *	arrays of TrueType character existence information and the return 
+ *	value is the length of the arrays (the two arrays are always the 
+ *	same length as each other).
+ *
+ * Side effects:
+ *	None.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static int
+LoadFontRanges(
+    HDC hdc,			/* HDC into which font can be selected. */
+    HFONT hFont,		/* HFONT to query. */
+    USHORT **startCountPtr,	/* Filled with malloced pointer to 
+				 * character range information. */
+    USHORT **endCountPtr,	/* Filled with malloced pointer to 
+				 * character range information. */
+    int *symbolPtr)
+ {
+    int n, i, swapped, offset, cbData, segCount;
+    DWORD cmapKey;
+    USHORT *startCount, *endCount;
+    CMAPTABLE cmapTable;
+    ENCODINGTABLE encTable;
+    SUBTABLE subTable;
+    char *s;
+
+    segCount = 0;
+    startCount = NULL;
+    endCount = NULL;
+    *symbolPtr = 0;
+
+    hFont = SelectObject(hdc, hFont);
+
+    i = 0;
+    s = (char *) &i;
+    *s = '\1';
+    swapped = 0;
+
+    if (i == 1) {
+	swapped = 1;
+    }
+
+    cmapKey = CMAPHEX;
+    if (swapped) {
+	SwapLong(&cmapKey);
+    }
+
+    n = GetFontData(hdc, cmapKey, 0, &cmapTable, sizeof(cmapTable));
+    if (n != GDI_ERROR) {
+	if (swapped) {
+	    SwapShort(&cmapTable.numTables);
+	}
+	for (i = 0; i < cmapTable.numTables; i++) {
+	    offset = sizeof(cmapTable) + i * sizeof(encTable);
+	    GetFontData(hdc, cmapKey, offset, &encTable, sizeof(encTable));
+	    if (swapped) {
+		SwapShort(&encTable.platform);
+		SwapShort(&encTable.encoding);
+		SwapLong(&encTable.offset);
+	    }
+	    if (encTable.platform != 3) {
+		/* 
+		 * Not Microsoft encoding.
+		 */
+
+		continue;
+	    }
+	    if (encTable.encoding == 0) {
+		*symbolPtr = 1;
+	    } else if (encTable.encoding != 1) {
+		continue;
+	    }
+
+	    GetFontData(hdc, cmapKey, encTable.offset, &subTable, 
+		    sizeof(subTable));
+	    if (swapped) {
+		SwapShort(&subTable.any.format);
+	    }
+	    if (subTable.any.format == 4) {
+		if (swapped) {
+		    SwapShort(&subTable.segment.segCountX2);
+		}
+		segCount = subTable.segment.segCountX2 / 2;
+		cbData = segCount * sizeof(USHORT);
+
+		startCount = (USHORT *) ckalloc(cbData);
+		endCount = (USHORT *) ckalloc(cbData);
+
+		offset = encTable.offset + sizeof(subTable.segment);
+		GetFontData(hdc, cmapKey, offset, endCount, cbData);
+		offset += cbData + sizeof(USHORT);
+		GetFontData(hdc, cmapKey, offset, startCount, cbData);
+		if (swapped) {
+		    for (i = 0; i < segCount; i++) {
+			SwapShort(&endCount[i]);
+			SwapShort(&startCount[i]);
+		    }
+		}
+		if (*symbolPtr != 0) {
+		    /*
+		     * Empirically determined:  When a symbol font is
+		     * loaded, the character existence metrics obtained
+		     * from the system are mildly wrong.  If the real range
+		     * of the symbol font is from 0020 to 00FE, then the
+		     * metrics are reported as F020 to F0FE.  When we load
+		     * a symbol font, we must fix the character existence
+		     * metrics.
+		     */
+
+		    for (i = 0; i < segCount; i++) {
+			if ((startCount[i] & 0xff00) == 0xf000) {
+			    startCount[i] &= 0xff;
+			}
+			if ((endCount[i] & 0xff00) == 0xf000) {
+			    endCount[i] &= 0xff;
+			}
+		    }
+		}
+	    }
+	}
+    }
+    SelectObject(hdc, hFont);
+
+    *startCountPtr = startCount;
+    *endCountPtr = endCount;
+    return segCount;
+}
+
+/*
+ *-------------------------------------------------------------------------
+ * 
+ * SwapShort, SwapLong --
+ *
+ *	Helper functions to convert the data loaded from TrueType font
+ *	files to Intel byte ordering.
+ *
+ * Results:
+ *	Bytes of input value are swapped and stored back in argument.
+ *
+ * Side effects:
+ *	None.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static void
+SwapShort(PUSHORT p)
+{
+    *p = (SHORT)(HIBYTE(*p) + (LOBYTE(*p) << 8));
+}
+
+static void 
+SwapLong(PULONG p)
+{					     
+    ULONG temp;
+
+    temp = (LONG) ((BYTE) *p);
+    temp <<= 8;
+    *p >>=8;
+
+    temp += (LONG) ((BYTE) *p);
+    temp <<= 8;
+    *p >>=8;
+
+    temp += (LONG) ((BYTE) *p);
+    temp <<= 8;
+    *p >>=8;
+
+    temp += (LONG) ((BYTE) *p);
+    *p = temp;
+}
diff --git a/win/tkWinInit.c b/win/tkWinInit.c
index 6cb21d8..93a4906 100644
--- a/win/tkWinInit.c
+++ b/win/tkWinInit.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinInit.c,v 1.2 1998/09/14 18:24:00 stanton Exp $
+ * RCS: @(#) $Id: tkWinInit.c,v 1.3 1999/04/16 01:51:52 stanton Exp $
  */
 
 #include "tkWinInt.h"
@@ -31,7 +31,7 @@
  *
  * Results:
  *	A standard Tcl completion code (TCL_OK or TCL_ERROR).  Also
- *	leaves information in interp->result.
+ *	leaves information in the interp's result.
  *
  * Side effects:
  *	Sets "tk_library" Tcl variable, runs "tk.tcl" script.
diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index 816e483..7fb1ea4 100644
--- a/win/tkWinInt.h
+++ b/win/tkWinInt.h
@@ -5,12 +5,12 @@
  *	Windows-specific parts of Tk, but aren't used by the rest of
  *	Tk.
  *
- * Copyright (c) 1995 Sun Microsystems, Inc.
+ * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinInt.h,v 1.5 1999/03/10 19:29:24 redman Exp $
+ * RCS: @(#) $Id: tkWinInt.h,v 1.6 1999/04/16 01:51:52 stanton Exp $
  */
 
 #ifndef _TKWININT
@@ -28,6 +28,11 @@
 #include "tkWin.h"
 #endif
 
+#ifndef _TKPORT
+#include "tkPort.h"
+#endif
+
+
 /*
  * Define constants missing from older Win32 SDK header files.
  */
@@ -148,9 +153,8 @@ extern int tkpWinRopModes[];
 
 #include "tkIntPlatDecls.h"
 
-extern void TkWinSetForegroundWindow(TkWindow *winPtr);
-extern LRESULT CALLBACK TkWinChildProc (HWND hwnd, UINT message,
-	WPARAM wParam, LPARAM lParam);
+extern LRESULT CALLBACK	TkWinChildProc _ANSI_ARGS_((HWND hwnd, UINT message,
+			    WPARAM wParam, LPARAM lParam));
 
 #endif /* _TKWININT */
 
diff --git a/win/tkWinKey.c b/win/tkWinKey.c
index 98cc24f..1ef7958 100644
--- a/win/tkWinKey.c
+++ b/win/tkWinKey.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinKey.c,v 1.3 1998/09/14 18:24:00 stanton Exp $
+ * RCS: @(#) $Id: tkWinKey.c,v 1.4 1999/04/16 01:51:52 stanton Exp $
  */
 
 #include "tkWinInt.h"
@@ -89,71 +89,59 @@ static Keys keymap[] = {
 /*
  *----------------------------------------------------------------------
  *
- * XLookupString --
+ * TkpGetString --
  *
- *	Retrieve the string equivalent for the given keyboard event.
+ *	Retrieve the UTF string equivalent for the given keyboard event.
  *
  * Results:
- *	Returns the number of characters stored in buffer_return.
+ *	Returns the UTF string.
  *
  * Side effects:
- *	Retrieves the characters stored in the event and inserts them
- *	into buffer_return.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
-int
-XLookupString(event_struct, buffer_return, bytes_buffer, keysym_return,
-	status_in_out)
-    XKeyEvent* event_struct;
-    char* buffer_return;
-    int bytes_buffer;
-    KeySym* keysym_return;
-    XComposeStatus* status_in_out;
+char *
+TkpGetString(winPtr, eventPtr, dsPtr)
+    TkWindow *winPtr;		/* Window where event occurred:  needed to
+				 * get input context. */
+    XEvent *eventPtr;		/* X keyboard event. */
+    Tcl_DString *dsPtr;		/* Uninitialized or empty string to hold
+				 * result. */
 {
-    int i, limit;
+    int index;
+    KeySym keysym;
+    XKeyEvent* keyEv = &eventPtr->xkey;
 
-    if (event_struct->send_event != -1) {
+    Tcl_DStringInit(dsPtr);
+    if (eventPtr->xkey.send_event != -1) {
 	/*
 	 * This is an event generated from generic code.  It has no
 	 * nchars or trans_chars members. 
 	 */
 
-	int index;
-	KeySym keysym;
-
 	index = 0;
-	if (event_struct->state & ShiftMask) {
+	if (eventPtr->xkey.state & ShiftMask) {
 	    index |= 1;
 	}
-	if (event_struct->state & Mod1Mask) {
+	if (eventPtr->xkey.state & Mod1Mask) {
 	    index |= 2;
 	}
-	keysym = XKeycodeToKeysym(event_struct->display, 
-		event_struct->keycode, index);
+	keysym = XKeycodeToKeysym(eventPtr->xkey.display, 
+		eventPtr->xkey.keycode, index);
 	if (((keysym != NoSymbol) && (keysym > 0) && (keysym < 256)) 
 		|| (keysym == XK_Return)
 		|| (keysym == XK_Tab)) {
-	    buffer_return[0] = (char) keysym;
-	    return 1;
+	    char buf[TCL_UTF_MAX];
+	    int len = Tcl_UniCharToUtf((Tcl_UniChar) keysym, buf);
+	    Tcl_DStringAppend(dsPtr, buf, len);
 	}
-	return 0;
-    }
-    if ((event_struct->nchars <= 0) || (buffer_return == NULL)) {
-	return 0;
-    }
-    limit = (event_struct->nchars < bytes_buffer) ? event_struct->nchars :
-	bytes_buffer;
-
-    for (i = 0; i < limit; i++) {
-	buffer_return[i] = event_struct->trans_chars[i];
-    }
-
-    if (keysym_return != NULL) {
-	*keysym_return = NoSymbol;
+    } else if (eventPtr->xkey.nbytes > 0) {
+	Tcl_ExternalToUtfDString(NULL, eventPtr->xkey.trans_chars,
+		eventPtr->xkey.nbytes, dsPtr);
     }
-    return i;
+    return Tcl_DStringValue(dsPtr);
 }
 
 /*
@@ -199,8 +187,8 @@ XKeycodeToKeysym(display, keycode, index)
      * for alphanumeric characters map onto Latin-1, we just return it.
      */
 
-    if (result == 1 && buf[0] >= 0x20) {
-	return (KeySym) buf[0];
+    if (result == 1 && UCHAR(buf[0]) >= 0x20) {
+	return (KeySym) UCHAR(buf[0]);
     }
 
     /*
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 734591d..b39d584 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -3,18 +3,20 @@
  *
  *	This module implements the Windows platform-specific features of menus.
  *
- * Copyright (c) 1996-1997 by Sun Microsystems, Inc.
+ * Copyright (c) 1996-1998 by Sun Microsystems, Inc.
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinMenu.c,v 1.4 1999/02/04 21:44:18 stanton Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.5 1999/04/16 01:51:52 stanton Exp $
  */
 
 #define OEMRESOURCE
-#include <string.h>
-#include "tkMenu.h"
 #include "tkWinInt.h"
+#include "tkMenu.h"
+
+#include <string.h>
 
 /*
  * The class of the window for popup menus.
@@ -50,34 +52,40 @@ static int indicatorDimensions[2];
 				/* The dimensions of the indicator space
 				 * in a menu entry. Calculated at init
 				 * time to save time. */
-static Tcl_HashTable commandTable;
+
+typedef struct ThreadSpecificData {
+    Tcl_HashTable commandTable;
 				/* A map of command ids to menu entries */
-static int inPostMenu;		/* We cannot be re-entrant like X Windows. */
-static WORD lastCommandID;	/* The last command ID we allocated. */
-static HWND menuHWND;		/* A window to service popup-menu messages
+    int inPostMenu;		/* We cannot be re-entrant like X Windows. */
+    WORD lastCommandID;	        /* The last command ID we allocated. */
+    HWND menuHWND;		/* A window to service popup-menu messages
 				 * in. */
-static int oldServiceMode;	/* Used while processing a menu; we need
+    int oldServiceMode;	        /* Used while processing a menu; we need
 				 * to set the event mode specially when we
 				 * enter the menu processing modal loop
 				 * and reset it when menus go away. */
-static TkMenu *modalMenuPtr;	/* The menu we are processing inside the modal
+    TkMenu *modalMenuPtr;	/* The menu we are processing inside the modal
 				 * loop. We need this to reset all of the 
 				 * active items when menus go away since
 				 * Windows does not see fit to give this
 				 * to us when it sends its WM_MENUSELECT. */
+    Tcl_HashTable winMenuTable;
+				/* Need this to map HMENUs back to menuPtrs */
+} ThreadSpecificData;
+static Tcl_ThreadDataKey dataKey;
+
 static OSVERSIONINFO versionInfo;
 				/* So we don't have to keep doing this */
-static Tcl_HashTable winMenuTable;
-				/* Need this to map HMENUs back to menuPtrs */
 
 /*
  * The following are default menu value strings.
  */
 
-static char borderString[5];	/* The string indicating how big the border is */
+static int defaultBorderWidth;	/* The windows default border width. */
 static Tcl_DString menuFontDString;
 				/* A buffer to store the default menu font
 				 * string. */
+TCL_DECLARE_MUTEX(winMenuMutex)
 
 /*
  * Forward declarations for procedures defined later in this file:
@@ -122,7 +130,7 @@ static void		DrawWindowsSystemBitmap _ANSI_ARGS_((
 			    GC gc, CONST RECT *rectPtr, int bitmapID,
 			    int alignFlags));
 static void		FreeID _ANSI_ARGS_((int commandID));
-static char *		GetEntryText _ANSI_ARGS_((TkMenuEntry *mePtr));
+static TCHAR *		GetEntryText _ANSI_ARGS_((TkMenuEntry *mePtr));
 static void		GetMenuAccelGeometry _ANSI_ARGS_((TkMenu *menuPtr,
 			    TkMenuEntry *mePtr, Tk_Font tkfont,
 			    CONST Tk_FontMetrics *fmPtr, int *widthPtr,
@@ -154,6 +162,7 @@ static void		ReconfigureWindowsMenu _ANSI_ARGS_((
 			    ClientData clientData));
 static void		RecursivelyClearActiveMenu _ANSI_ARGS_((
 			    TkMenu *menuPtr));
+static void		SetDefaults _ANSI_ARGS_((int firstTime));
 static LRESULT CALLBACK	TkWinMenuProc _ANSI_ARGS_((HWND hwnd,
 			    UINT message, WPARAM wParam,
 			    LPARAM lParam));
@@ -189,16 +198,18 @@ GetNewID(mePtr, menuIDPtr)
     int newEntry;
     Tcl_HashEntry *commandEntryPtr;
     WORD returnID;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    WORD curID = lastCommandID + 1;
+    WORD curID = tsdPtr->lastCommandID + 1;
 
     /*
      * The following code relies on WORD wrapping when the highest value is
      * incremented.
      */
     
-    while (curID != lastCommandID) {
-    	commandEntryPtr = Tcl_CreateHashEntry(&commandTable,
+    while (curID != tsdPtr->lastCommandID) {
+    	commandEntryPtr = Tcl_CreateHashEntry(&tsdPtr->commandTable,
 		(char *) curID, &newEntry);
     	if (newEntry == 1) {
     	    found = 1;
@@ -211,7 +222,7 @@ GetNewID(mePtr, menuIDPtr)
     if (found) {
     	Tcl_SetHashValue(commandEntryPtr, (char *) mePtr);
     	*menuIDPtr = (int) returnID;
-    	lastCommandID = returnID;
+    	tsdPtr->lastCommandID = returnID;
     	return TCL_OK;
     } else {
     	return TCL_ERROR;
@@ -238,7 +249,10 @@ static void
 FreeID(commandID)
     int commandID;
 {
-    Tcl_HashEntry *entryPtr = Tcl_FindHashEntry(&commandTable,
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
+    Tcl_HashEntry *entryPtr = Tcl_FindHashEntry(&tsdPtr->commandTable,
 	    (char *) commandID);
     
     if (entryPtr != NULL) {
@@ -272,6 +286,8 @@ TkpNewMenu(menuPtr)
     HMENU winMenuHdl;
     Tcl_HashEntry *hashEntryPtr;
     int newEntry;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     winMenuHdl = CreatePopupMenu();
     
@@ -286,7 +302,7 @@ TkpNewMenu(menuPtr)
      * back when dispatch messages.
      */
 
-    hashEntryPtr = Tcl_CreateHashEntry(&winMenuTable, (char *) winMenuHdl,
+    hashEntryPtr = Tcl_CreateHashEntry(&tsdPtr->winMenuTable, (char *) winMenuHdl,
 	    &newEntry);
     Tcl_SetHashValue(hashEntryPtr, (char *) menuPtr);
 
@@ -315,6 +331,9 @@ TkpDestroyMenu(menuPtr)
     TkMenu *menuPtr;	    /* The common menu structure */
 {
     HMENU winMenuHdl = (HMENU) menuPtr->platformData;
+    char *searchName;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (menuPtr->menuFlags & MENU_RECONFIGURE_PENDING) {
 	Tcl_CancelIdleCall(ReconfigureWindowsMenu, (ClientData) menuPtr);
@@ -339,7 +358,8 @@ TkpDestroyMenu(menuPtr)
 	for (searchEntryPtr = menuPtr->menuRefPtr->parentEntryPtr;
 	     searchEntryPtr != NULL;
 	     searchEntryPtr = searchEntryPtr->nextCascadePtr) {
-	    if (strcmp(searchEntryPtr->name, menuName) == 0) {
+	    searchName = Tcl_GetStringFromObj(searchEntryPtr->namePtr, NULL);
+	    if (strcmp(searchName, menuName) == 0) {
 		Tk_Window parentTopLevelPtr = searchEntryPtr
 		    ->menuPtr->parentTopLevelPtr;
 
@@ -357,7 +377,8 @@ TkpDestroyMenu(menuPtr)
 	 * Remove the menu from the menu hash table, then destroy the handle.
 	 */
 
-	hashEntryPtr = Tcl_FindHashEntry(&winMenuTable, (char *) winMenuHdl);
+	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable, 
+                (char *) winMenuHdl);
 	if (hashEntryPtr != NULL) {
 	    Tcl_DeleteHashEntry(hashEntryPtr);
 	}
@@ -365,8 +386,8 @@ TkpDestroyMenu(menuPtr)
     }
     menuPtr->platformData = NULL;
 
-    if (menuPtr == modalMenuPtr) {
-	modalMenuPtr = NULL;
+    if (menuPtr == tsdPtr->modalMenuPtr) {
+	tsdPtr->modalMenuPtr = NULL;
     }
 }
 
@@ -431,18 +452,23 @@ GetEntryText(mePtr)
     if (mePtr->type == TEAROFF_ENTRY) {
 	itemText = ckalloc(sizeof("(Tear-off)"));
 	strcpy(itemText, "(Tear-off)");
-    } else if (mePtr->imageString != NULL) {
+    } else if (mePtr->imagePtr != NULL) {
 	itemText = ckalloc(sizeof("(Image)"));
 	strcpy(itemText, "(Image)");
-    } else if (mePtr->bitmap != None) {
+    } else if (mePtr->bitmapPtr != NULL) {
 	itemText = ckalloc(sizeof("(Pixmap)"));
 	strcpy(itemText, "(Pixmap)");
-    } else if (mePtr->label == NULL || mePtr->labelLength == 0) {
+    } else if (mePtr->labelPtr == NULL || mePtr->labelLength == 0) {
 	itemText = ckalloc(sizeof("( )"));
 	strcpy(itemText, "( )");
     } else {
-	int size = mePtr->labelLength + 1;
-	int i, j;
+	int i;
+	char *label = (mePtr->labelPtr == NULL) ? "" 
+		: Tcl_GetStringFromObj(mePtr->labelPtr, NULL);
+	char *accel = (mePtr->accelPtr == NULL) ? "" 
+		: Tcl_GetStringFromObj(mePtr->accelPtr, NULL);
+	char *p, *next;
+	Tcl_DString itemString;
 
 	/*
 	 * We have to construct the string with an ampersand
@@ -451,57 +477,32 @@ GetEntryText(mePtr)
 	 * ampersands in the string.
 	 */
 
-	for (i = 0; i < mePtr->labelLength; i++) {
-	    if (mePtr->label[i] == '&') {
-		size++;
-	    }
-	}
+	Tcl_DStringInit(&itemString);
 
-	if (mePtr->underline >= 0) {
-	    size++;
-	    if (mePtr->label[mePtr->underline] == '&') {
-		size++;
+	for (p = label, i = 0; *p != '\0'; i++, p = next) {
+	    if (i == mePtr->underline) {
+		Tcl_DStringAppend(&itemString, "&", 1);
 	    }
-	}
-
-	if (mePtr->accelLength > 0) {
-	    size += mePtr->accelLength + 1;
-	}
-
-	for (i = 0; i < mePtr->accelLength; i++) {
-	    if (mePtr->accel[i] == '&') {
-		size++;
+	    if (*p == '&') {
+		Tcl_DStringAppend(&itemString, "&", 1);
 	    }
+	    next = Tcl_UtfNext(p);
+	    Tcl_DStringAppend(&itemString, p, next - p);
 	}
-
-	itemText = ckalloc(size);
-	
-	if (mePtr->labelLength == 0) {
-	    itemText[0] = 0;
-	} else {
-	    for (i = 0, j = 0; i < mePtr->labelLength; i++, j++) {
-		if (mePtr->label[i] == '&') {
-		    itemText[j++] = '&';
-		}
-		if (i == mePtr->underline) {
-		    itemText[j++] = '&';
+        if (mePtr->accelLength > 0) {
+	    Tcl_DStringAppend(&itemString, "\t", 1);
+	    for (p = accel, i = 0; *p != '\0'; i++, p = next) {
+		if (*p == '&') {
+		    Tcl_DStringAppend(&itemString, "&", 1);
 		}
-		itemText[j] = mePtr->label[i];
+		next = Tcl_UtfNext(p);
+		Tcl_DStringAppend(&itemString, p, next - p);
 	    }
-	    itemText[j] = '\0';
-	}
+	} 	    
 
-	if (mePtr->accelLength > 0) {
-	    strcat(itemText, "\t");
-	    for (i = 0, j = strlen(itemText); i < mePtr->accelLength;
-		    i++, j++) {
-		if (mePtr->accel[i] == '&') {
-		    itemText[j++] = '&';
-		}
-		itemText[j] = mePtr->accel[i];
-	    }
-	    itemText[j] = '\0';
-	}
+	itemText = ckalloc(Tcl_DStringLength(&itemString) + 1);
+	strcpy(itemText, Tcl_DStringValue(&itemString));
+	Tcl_DStringFree(&itemString);
     }
     return itemText;
 }
@@ -530,13 +531,14 @@ ReconfigureWindowsMenu(
     TkMenu *menuPtr = (TkMenu *) clientData;
     TkMenuEntry *mePtr;
     HMENU winMenuHdl = (HMENU) menuPtr->platformData;
-    char *itemText = NULL;
-    LPCTSTR lpNewItem;
+    TCHAR *itemText = NULL;
+    const TCHAR *lpNewItem;
     UINT flags;
     UINT itemID;
     int i, count, systemMenu = 0, base;
     int width, height;
-
+    Tcl_DString translatedText;
+  
     if (NULL == winMenuHdl) {
     	return;
     }
@@ -565,6 +567,7 @@ ReconfigureWindowsMenu(
 	lpNewItem = NULL;
 	flags = MF_BYPOSITION;
 	itemID = 0;
+	Tcl_DStringInit(&translatedText);
 
 	if ((menuPtr->menuType == MENUBAR) && (mePtr->type == TEAROFF_ENTRY)) {
 	    continue;
@@ -576,7 +579,8 @@ ReconfigureWindowsMenu(
 	    itemText = GetEntryText(mePtr);
 	    if ((menuPtr->menuType == MENUBAR)
 		    || (menuPtr->menuFlags & MENU_SYSTEM_MENU)) {
-		lpNewItem = itemText;
+		Tcl_UtfToExternalDString(NULL, itemText, -1, &translatedText);
+		lpNewItem = Tcl_DStringValue(&translatedText);
 	    } else {
 		lpNewItem = (LPCTSTR) mePtr;
 		flags |= MF_OWNERDRAW;
@@ -586,7 +590,7 @@ ReconfigureWindowsMenu(
     	     * Set enabling and disabling correctly.
     	     */
 
-	    if (mePtr->state == tkDisabledUid) {
+	    if (mePtr->state == ENTRY_DISABLED) {
 		flags |= MF_DISABLED;
 	    }
     	    
@@ -617,18 +621,21 @@ ReconfigureWindowsMenu(
 		if ((menuPtr->menuType == MENUBAR) 
 			&& !(mePtr->childMenuRefPtr->menuPtr->menuFlags
 				& MENU_SYSTEM_MENU)) {
+		    Tcl_DString ds;
 		    TkMenuReferences *menuRefPtr;
 		    TkMenu *systemMenuPtr = mePtr->childMenuRefPtr
 			->menuPtr;
-		    char *systemMenuName = ckalloc(strlen(
-			Tk_PathName(menuPtr->masterMenuPtr->tkwin))
-			    + strlen(".system") + 1);
 
-		    strcpy(systemMenuName, 
-			    Tk_PathName(menuPtr->masterMenuPtr->tkwin));
-		    strcat(systemMenuName, ".system");
+		    Tcl_DStringInit(&ds);
+		    Tcl_DStringAppend(&ds,
+			    Tk_PathName(menuPtr->masterMenuPtr->tkwin), -1);
+		    Tcl_DStringAppend(&ds, ".system", 7);
+
 		    menuRefPtr = TkFindMenuReferences(menuPtr->interp,
-			    systemMenuName);
+			    Tcl_DStringValue(&ds));
+		    
+		    Tcl_DStringFree(&ds);
+
 		    if ((menuRefPtr != NULL) 
 			    && (menuRefPtr->menuPtr != NULL)
 			    && (menuPtr->parentTopLevelPtr != NULL)
@@ -653,7 +660,6 @@ ReconfigureWindowsMenu(
 			    }
 			}
 		    }
-		    ckfree(systemMenuName);
 		}
 		if (mePtr->childMenuRefPtr->menuPtr->menuFlags 
 			& MENU_SYSTEM_MENU) {
@@ -664,6 +670,7 @@ ReconfigureWindowsMenu(
 	if (!systemMenu) {
 	    InsertMenu(winMenuHdl, 0xFFFFFFFF, flags, itemID, lpNewItem);
 	}
+	Tcl_DStringFree(&translatedText);
 	if (itemText != NULL) {
 	    ckfree(itemText);
 	    itemText = NULL;
@@ -709,8 +716,10 @@ TkpPostMenu(interp, menuPtr, x, y)
     POINT point;
     Tk_Window parentWindow = Tk_Parent(menuPtr->tkwin);
     int oldServiceMode = Tcl_GetServiceMode();
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    inPostMenu++;
+    tsdPtr->inPostMenu++;
 
     if (menuPtr->menuFlags & MENU_RECONFIGURE_PENDING) {
 	Tcl_CancelIdleCall(ReconfigureWindowsMenu, (ClientData) menuPtr);
@@ -719,7 +728,7 @@ TkpPostMenu(interp, menuPtr, x, y)
 
     result = TkPreprocessMenu(menuPtr);
     if (result != TCL_OK) {
-	inPostMenu--;
+	tsdPtr->inPostMenu--;
 	return result;
     }
 
@@ -729,7 +738,7 @@ TkpPostMenu(interp, menuPtr, x, y)
      */
     
     if (menuPtr->tkwin == NULL) {
-	inPostMenu--;
+	tsdPtr->inPostMenu--;
     	return TCL_OK;
     }
 
@@ -770,14 +779,14 @@ TkpPostMenu(interp, menuPtr, x, y)
     }
 
     TrackPopupMenu(winMenuHdl, flags, x, y, 0, 
-	    menuHWND, &noGoawayRect);
+	    tsdPtr->menuHWND, &noGoawayRect);
     Tcl_SetServiceMode(oldServiceMode);
 
     GetCursorPos(&point);
     Tk_PointerEvent(NULL, point.x, point.y);
 
-    if (inPostMenu) {
-	inPostMenu = 0;
+    if (tsdPtr->inPostMenu) {
+	tsdPtr->inPostMenu = 0;
     }
     return TCL_OK;
 }
@@ -886,24 +895,27 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
     int returnResult = 0;
     TkMenu *menuPtr;
     TkMenuEntry *mePtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     switch (*pMessage) {
 	case WM_INITMENU:
 	    TkMenuInit();
-	    hashEntryPtr = Tcl_FindHashEntry(&winMenuTable, (char *) *pwParam);
+	    hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable, 
+                    (char *) *pwParam);
 	    if (hashEntryPtr != NULL) {
-		oldServiceMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
+		tsdPtr->oldServiceMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
 		menuPtr = (TkMenu *) Tcl_GetHashValue(hashEntryPtr);
-		modalMenuPtr = menuPtr;
+		tsdPtr->modalMenuPtr = menuPtr;
 		if (menuPtr->menuFlags & MENU_RECONFIGURE_PENDING) {
 		    Tcl_CancelIdleCall(ReconfigureWindowsMenu, 
 			    (ClientData) menuPtr);
 		    ReconfigureWindowsMenu((ClientData) menuPtr);
 		}
-		if (!inPostMenu) {
+		if (!tsdPtr->inPostMenu) {
 		    Tcl_Interp *interp;
 		    int code;
- 
+
 		    interp = menuPtr->interp;
 		    Tcl_Preserve((ClientData)interp);
 		    code = TkPreprocessMenu(menuPtr);
@@ -918,7 +930,7 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
 		*plResult = 0;
 		returnResult = 1;
 	    } else {
-		modalMenuPtr = NULL;
+		tsdPtr->modalMenuPtr = NULL;
 	    }
 	    break;
 
@@ -928,7 +940,7 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
 	    if (HIWORD(*pwParam) != 0) {
 		break;
 	    }
-	    hashEntryPtr = Tcl_FindHashEntry(&commandTable,
+	    hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->commandTable,
 		    (char *)LOWORD(*pwParam));
 	    if (hashEntryPtr == NULL) {
 		break;
@@ -949,21 +961,23 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
 		menuPtr = mePtr->menuPtr;
 		menuRefPtr = TkFindMenuReferences(menuPtr->interp,
 			Tk_PathName(menuPtr->tkwin));
-		if ((menuRefPtr != NULL) && (menuRefPtr->parentEntryPtr 
-			!= NULL)) {
-		    for (parentEntryPtr = menuRefPtr->parentEntryPtr;
-			 strcmp(parentEntryPtr->name, 
-				 Tk_PathName(menuPtr->tkwin)) != 0; 
-			 parentEntryPtr = parentEntryPtr->nextCascadePtr) {
-
-			/*
-			 * Empty loop body.
-			 */
+		if ((menuRefPtr != NULL)
+			&& (menuRefPtr->parentEntryPtr != NULL)) {
+		    char *name;
 
+		    for (parentEntryPtr = menuRefPtr->parentEntryPtr;
+			 ; 
+			 parentEntryPtr = 
+			     parentEntryPtr->nextCascadePtr) {
+			name = Tcl_GetStringFromObj(
+			    parentEntryPtr->namePtr, NULL);
+			if (strcmp(name, Tk_PathName(menuPtr->tkwin))
+				== 0) {
+			    break;
+			}
 		    }
-		    if (parentEntryPtr->menuPtr
-			    ->entries[parentEntryPtr->index]->state
-			    != tkDisabledUid) {
+		    if (parentEntryPtr->menuPtr->entries[parentEntryPtr->index]
+			    ->state != ENTRY_DISABLED) {
 			TkActivateMenuEntry(parentEntryPtr->menuPtr, 
 				parentEntryPtr->index);
 		    }
@@ -972,8 +986,8 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
 		interp = menuPtr->interp;
 		Tcl_Preserve((ClientData)interp);
 		code = TkInvokeMenu(interp, menuPtr, mePtr->index);
-		if ((code != TCL_OK) && (code != TCL_CONTINUE)
-			&& (code != TCL_BREAK)) {
+		if (code != TCL_OK && code != TCL_CONTINUE
+			&& code != TCL_BREAK) {
 		    Tcl_AddErrorInfo(interp, "\n    (menu invoke)");
 		    Tcl_BackgroundError(interp);
 		}
@@ -987,19 +1001,27 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
 
 	case WM_MENUCHAR: {
 	    unsigned char menuChar = (unsigned char) LOWORD(*pwParam);
-	    hashEntryPtr = Tcl_FindHashEntry(&winMenuTable, (char *) *plParam);
+	    hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable, 
+                    (char *) *plParam);
 	    if (hashEntryPtr != NULL) {
 		int i;
 
 		*plResult = 0;
 		menuPtr = (TkMenu *) Tcl_GetHashValue(hashEntryPtr);
 		for (i = 0; i < menuPtr->numEntries; i++) {
-		    int underline = menuPtr->entries[i]->underline;
+		    int underline;
+		    char *label;
+
+		    underline = menuPtr->entries[i]->underline;
+		    if (menuPtr->entries[i]->labelPtr != NULL) {
+			label = Tcl_GetStringFromObj(
+				menuPtr->entries[i]->labelPtr, NULL);
+		    }
 		    if ((-1 != underline) 
-			    && (NULL != menuPtr->entries[i]->label)
+			    && (NULL != menuPtr->entries[i]->labelPtr)
 			    && (CharUpper((LPTSTR) menuChar) 
-			    == CharUpper((LPTSTR) (unsigned char) menuPtr
-			    ->entries[i]->label[underline]))) {
+			    == CharUpper((LPTSTR) (unsigned char) 
+			    label[underline]))) {
 			*plResult = (2 << 16) | i;
 			returnResult = 1;
 			break;
@@ -1020,9 +1042,14 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
 		itemPtr->itemHeight = mePtr->height;
 		itemPtr->itemWidth = mePtr->width;
 		if (mePtr->hideMargin) {
-		    itemPtr->itemWidth += 2 - indicatorDimensions[0];
+		    itemPtr->itemWidth += 2 - indicatorDimensions[1];
 		} else {
-		    itemPtr->itemWidth += 2 * menuPtr->activeBorderWidth;
+		    int activeBorderWidth;
+		    
+		    Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin,
+			    menuPtr->activeBorderWidthPtr, 
+			    &activeBorderWidth);
+		    itemPtr->itemWidth += 2 * activeBorderWidth;
 		}
 		*plResult = 1;
 		returnResult = 1;
@@ -1036,13 +1063,15 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
 	    Tk_FontMetrics fontMetrics;
 
 	    if (itemPtr != NULL) {
+		Tk_Font tkfont;
+
 		mePtr = (TkMenuEntry *) itemPtr->itemData;
 		menuPtr = mePtr->menuPtr;
 		twdPtr = (TkWinDrawable *) ckalloc(sizeof(TkWinDrawable));
 		twdPtr->type = TWD_WINDC;
 		twdPtr->winDC.hdc = itemPtr->hDC;
 
-		if (mePtr->state != tkDisabledUid) {
+		if (mePtr->state != ENTRY_DISABLED) {
 		    if (itemPtr->itemState & ODS_SELECTED) {
 			TkActivateMenuEntry(menuPtr, mePtr->index);
 		    } else {
@@ -1050,8 +1079,9 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
 		    }
 		}
 
-		Tk_GetFontMetrics(menuPtr->tkfont, &fontMetrics);
-		TkpDrawMenuEntry(mePtr, (Drawable) twdPtr, menuPtr->tkfont,
+		tkfont = Tk_GetFontFromObj(menuPtr->tkwin, menuPtr->fontPtr);
+		Tk_GetFontMetrics(tkfont, &fontMetrics);
+		TkpDrawMenuEntry(mePtr, (Drawable) twdPtr, tkfont,
 			&fontMetrics, itemPtr->rcItem.left,
 			itemPtr->rcItem.top, itemPtr->rcItem.right
 			- itemPtr->rcItem.left, itemPtr->rcItem.bottom
@@ -1070,14 +1100,14 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
 	    TkMenuInit();
 
 	    if ((flags == 0xFFFF) && (*plParam == 0)) {
-		Tcl_SetServiceMode(oldServiceMode);
-		if (modalMenuPtr != NULL) {
-		    RecursivelyClearActiveMenu(modalMenuPtr);
+		Tcl_SetServiceMode(tsdPtr->oldServiceMode);
+		if (tsdPtr->modalMenuPtr != NULL) {
+		    RecursivelyClearActiveMenu(tsdPtr->modalMenuPtr);
 		}
 	    } else {
 		menuPtr = NULL;
-		if (*plParam != 0) {
-		    hashEntryPtr = Tcl_FindHashEntry(&winMenuTable,
+ 		if (*plParam != 0) {
+		    hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable,
 			    (char *) *plParam);
 		    if (hashEntryPtr != NULL) {
 			menuPtr = (TkMenu *) Tcl_GetHashValue(hashEntryPtr);
@@ -1090,15 +1120,17 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
 			if (flags & MF_POPUP) {
 			    mePtr = menuPtr->entries[LOWORD(*pwParam)];
 			} else {
-			    hashEntryPtr = Tcl_FindHashEntry(&commandTable,
+			    hashEntryPtr = Tcl_FindHashEntry(
+                                    &tsdPtr->commandTable,
 				    (char *) LOWORD(*pwParam));
 			    if (hashEntryPtr != NULL) {
-				mePtr = (TkMenuEntry *) Tcl_GetHashValue(hashEntryPtr);
+				mePtr = (TkMenuEntry *) 
+					Tcl_GetHashValue(hashEntryPtr);
 			    }
 			}
 		    }	 
 
-		    if ((mePtr == NULL) || (mePtr->state == tkDisabledUid)) {
+		    if ((mePtr == NULL) || (mePtr->state == ENTRY_DISABLED)) {
 			TkActivateMenuEntry(menuPtr, -1);
 		    } else {
 			TkActivateMenuEntry(menuPtr, mePtr->index);
@@ -1171,18 +1203,21 @@ TkpSetWindowMenuBar(tkwin, menuPtr)
     TkMenu *menuPtr;	    /* The menu we are inserting */
 {
     HMENU winMenuHdl;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (menuPtr != NULL) {
 	Tcl_HashEntry *hashEntryPtr;
 	int newEntry;
 
 	winMenuHdl = (HMENU) menuPtr->platformData;
-	hashEntryPtr = Tcl_FindHashEntry(&winMenuTable, (char *) winMenuHdl);
+	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable, 
+                (char *) winMenuHdl);
 	Tcl_DeleteHashEntry(hashEntryPtr);
 	DestroyMenu(winMenuHdl);
 	winMenuHdl = CreateMenu();
-	hashEntryPtr = Tcl_CreateHashEntry(&winMenuTable, (char *) winMenuHdl,
-		&newEntry);
+	hashEntryPtr = Tcl_CreateHashEntry(&tsdPtr->winMenuTable, 
+                (char *) winMenuHdl, &newEntry);
 	Tcl_SetHashValue(hashEntryPtr, (char *) menuPtr);
 	menuPtr->platformData = (TkMenuPlatformData) winMenuHdl;
 	TkWinSetMenu(tkwin, winMenuHdl);
@@ -1254,7 +1289,11 @@ GetMenuIndicatorGeometry (
     if (mePtr->hideMargin) {
 	*widthPtr = 0;
     } else {
-	*widthPtr = indicatorDimensions[1] - menuPtr->borderWidth;
+	int borderWidth;
+
+	Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin,
+		menuPtr->borderWidthPtr, &borderWidth);
+	*widthPtr = indicatorDimensions[1] - borderWidth;
     }
 }
 
@@ -1286,10 +1325,11 @@ GetMenuAccelGeometry (
     *heightPtr = fmPtr->linespace;
     if (mePtr->type == CASCADE_ENTRY) {
 	*widthPtr = 0;
-    } else if (mePtr->accel == NULL) {
+    } else if (mePtr->accelPtr == NULL) {
 	*widthPtr = 0;
     } else {
-	*widthPtr = Tk_TextWidth(tkfont, mePtr->accel, mePtr->accelLength);
+	char *accel = Tcl_GetStringFromObj(mePtr->accelPtr, NULL);
+	*widthPtr = Tk_TextWidth(tkfont, accel, mePtr->accelLength);
     }
 }
 
@@ -1379,7 +1419,7 @@ DrawWindowsSystemBitmap(display, drawable, gc, rectPtr, bitmapID, alignFlags)
     Display *display;			/* The display we are drawing into */
     Drawable drawable;			/* The drawable we are working with */
     GC gc;				/* The GC to draw with */
-    CONST RECT *rectPtr;		/* The rectangle to draw into */			
+    CONST RECT *rectPtr;		/* The rectangle to draw into */
     int bitmapID;			/* The windows id of the system
 					 * bitmap to draw. */
     int alignFlags;			/* How to align the bitmap inside the
@@ -1465,47 +1505,52 @@ DrawMenuEntryIndicator(menuPtr, mePtr, d, gc, indicatorGC, tkfont, fmPtr, x,
     int width;
     int height;
 {
-    if ((mePtr->type == CHECK_BUTTON_ENTRY || 
-    	    mePtr->type == RADIO_BUTTON_ENTRY) 
-    	    && mePtr->indicatorOn
-	    && mePtr->entryFlags & ENTRY_SELECTED) {
-	RECT rect;
-	GC whichGC;
-
-	if (mePtr->state != tkNormalUid) {
-	    whichGC = gc;
-	} else {
-	    whichGC = indicatorGC;
-	}
-
-	rect.top = y;
-	rect.bottom = y + mePtr->height;
-	rect.left = menuPtr->borderWidth + menuPtr->activeBorderWidth + x;
-	rect.right = mePtr->indicatorSpace + x;
+    if ((mePtr->type == CHECK_BUTTON_ENTRY) 
+	    || (mePtr->type == RADIO_BUTTON_ENTRY)) {
+    	if (mePtr->indicatorOn && (mePtr->entryFlags & ENTRY_SELECTED)) {
+	    RECT rect;
+	    GC whichGC;
+	    int borderWidth, activeBorderWidth;
+	    if (mePtr->state != ENTRY_NORMAL) {
+		whichGC = gc;
+	    } else {
+		whichGC = indicatorGC;
+	    }
 
-	if ((mePtr->state == tkDisabledUid) && (menuPtr->disabledFg != NULL)
-		&& (versionInfo.dwMajorVersion >= 4)) {
-	    RECT hilightRect;
-	    COLORREF oldFgColor = whichGC->foreground;
-	
-	    whichGC->foreground = GetSysColor(COLOR_3DHILIGHT);
-	    hilightRect.top = rect.top + 1;
-	    hilightRect.bottom = rect.bottom + 1;
-	    hilightRect.left = rect.left + 1;
-	    hilightRect.right = rect.right + 1;
-	    DrawWindowsSystemBitmap(menuPtr->display, d, whichGC, 
-		    &hilightRect, OBM_CHECK, 0);
-	    whichGC->foreground = oldFgColor;
-	}
+	    rect.top = y;
+	    rect.bottom = y + mePtr->height;
+	    Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin,
+		    menuPtr->borderWidthPtr, &borderWidth);
+	    Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin,
+		    menuPtr->activeBorderWidthPtr, &activeBorderWidth);
+	    rect.left = borderWidth + activeBorderWidth + x;
+	    rect.right = mePtr->indicatorSpace + x;
+
+	    if ((mePtr->state == ENTRY_DISABLED)
+		    && (menuPtr->disabledFgPtr != NULL)
+		    && (versionInfo.dwMajorVersion >= 4)) {
+		RECT hilightRect;
+		COLORREF oldFgColor = whichGC->foreground;
+	    
+		whichGC->foreground = GetSysColor(COLOR_3DHILIGHT);
+		hilightRect.top = rect.top + 1;
+		hilightRect.bottom = rect.bottom + 1;
+		hilightRect.left = rect.left + 1;
+		hilightRect.right = rect.right + 1;
+		DrawWindowsSystemBitmap(menuPtr->display, d, whichGC, 
+			&hilightRect, OBM_CHECK, 0);
+		whichGC->foreground = oldFgColor;
+	    }
 
-	DrawWindowsSystemBitmap(menuPtr->display, d, whichGC, &rect, 
-		OBM_CHECK, 0);
+	    DrawWindowsSystemBitmap(menuPtr->display, d, whichGC, &rect, 
+		    OBM_CHECK, 0);
 
-	if ((mePtr->state == tkDisabledUid) 
-		&& (menuPtr->disabledImageGC != None)
-		&& (versionInfo.dwMajorVersion < 4)) {
-	    XFillRectangle(menuPtr->display, d, menuPtr->disabledImageGC,
-		    rect.left, rect.top, rect.right, rect.bottom);
+	    if ((mePtr->state == ENTRY_DISABLED) 
+		    && (menuPtr->disabledImageGC != None)
+		    && (versionInfo.dwMajorVersion < 4)) {
+		XFillRectangle(menuPtr->display, d, menuPtr->disabledImageGC,
+			rect.left, rect.top, rect.right, rect.bottom);
+	    }
 	}
     }    
 }
@@ -1550,18 +1595,23 @@ DrawMenuEntryAccelerator(menuPtr, mePtr, d, gc, tkfont, fmPtr,
 {
     int baseline;
     int leftEdge = x + mePtr->indicatorSpace + mePtr->labelWidth;
+    char *accel;
+    
+    if (mePtr->accelPtr != NULL) {
+	accel = Tcl_GetStringFromObj(mePtr->accelPtr, NULL);
+    }
 
     baseline = y + (height + fmPtr->ascent - fmPtr->descent) / 2;
 
-    if ((mePtr->state == tkDisabledUid) && (menuPtr->disabledFg != NULL)
-	    && ((mePtr->accel != NULL)
+    if ((mePtr->state == ENTRY_DISABLED) && (menuPtr->disabledFgPtr != NULL)
+	    && ((mePtr->accelPtr != NULL)
 	    || ((mePtr->type == CASCADE_ENTRY) && drawArrow))) {
 	if (versionInfo.dwMajorVersion >= 4) {
 	    COLORREF oldFgColor = gc->foreground;
 	    
 	    gc->foreground = GetSysColor(COLOR_3DHILIGHT);
-	    if (mePtr->accel != NULL) {
-		Tk_DrawChars(menuPtr->display, d, gc, tkfont, mePtr->accel,
+	    if (mePtr->accelPtr != NULL) {
+		Tk_DrawChars(menuPtr->display, d, gc, tkfont, accel,
 			mePtr->accelLength, leftEdge + 1, baseline + 1);
 	    }
 
@@ -1579,12 +1629,12 @@ DrawMenuEntryAccelerator(menuPtr, mePtr, d, gc, tkfont, fmPtr,
 	}
     }
 
-    if (mePtr->accel != NULL) {
-	Tk_DrawChars(menuPtr->display, d, gc, tkfont, mePtr->accel, 
+    if (mePtr->accelPtr != NULL) {
+	Tk_DrawChars(menuPtr->display, d, gc, tkfont, accel, 
 		mePtr->accelLength, leftEdge, baseline);
     }
 
-    if ((mePtr->state == tkDisabledUid) 
+    if ((mePtr->state == ENTRY_DISABLED) 
 	    && (menuPtr->disabledImageGC != None)
 	    && (versionInfo.dwMajorVersion < 4)) {
 	XFillRectangle(menuPtr->display, d, menuPtr->disabledImageGC,
@@ -1601,7 +1651,7 @@ DrawMenuEntryAccelerator(menuPtr, mePtr, d, gc, tkfont, fmPtr,
 	rect.right = x + width - 1;
 	DrawWindowsSystemBitmap(menuPtr->display, d, gc, &rect, OBM_MNARROW, 
 		ALIGN_BITMAP_RIGHT);
-	if ((mePtr->state == tkDisabledUid) 
+	if ((mePtr->state == ENTRY_DISABLED) 
 		&& (menuPtr->disabledImageGC != None)
 		&& (versionInfo.dwMajorVersion < 4)) {
 	    XFillRectangle(menuPtr->display, d, menuPtr->disabledImageGC,
@@ -1640,13 +1690,15 @@ DrawMenuSeparator(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, y, width, height)
     int height;				/* height of item */
 {
     XPoint points[2];
+    Tk_3DBorder border;
 
     points[0].x = x;
     points[0].y = y + height / 2;
     points[1].x = x + width - 1;
     points[1].y = points[0].y;
-    Tk_Draw3DPolygon(menuPtr->tkwin, d,
-	    menuPtr->border, points, 2, 1, TK_RELIEF_RAISED);
+    border = Tk_Get3DBorderFromObj(menuPtr->tkwin, menuPtr->borderPtr);
+    Tk_Draw3DPolygon(menuPtr->tkwin, d, border, points, 2, 1, 
+	    TK_RELIEF_RAISED);
 }
 
 /*
@@ -1680,10 +1732,14 @@ DrawMenuUnderline(
     int height)				/* Height of entry */
 {
     if (mePtr->underline >= 0) {
+	char *label = Tcl_GetStringFromObj(mePtr->labelPtr, NULL);
+	char *start = Tcl_UtfAtIndex(label, mePtr->underline);
+	char *end = Tcl_UtfNext(start);
+
     	Tk_UnderlineChars(menuPtr->display, d,
-    		gc, tkfont, mePtr->label, x + mePtr->indicatorSpace,
+    		gc, tkfont, label, x + mePtr->indicatorSpace,
     		y + (height + fmPtr->ascent - fmPtr->descent) / 2, 
-		mePtr->underline, mePtr->underline + 1);
+		start - label, end - label);
     }		
 }
 
@@ -1745,8 +1801,8 @@ MenuKeyBindProc(clientData, interp, eventPtr, tkwin, keySym)
 		CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)),
 			WM_SYSKEYDOWN, virtualKey, ((scanCode << 16)
 			| (1 << 29)));
-		if (eventPtr->xkey.nchars > 0) {
-		    for (i = 0; i < eventPtr->xkey.nchars; i++) {
+		if (eventPtr->xkey.nbytes > 0) {
+		    for (i = 0; i < eventPtr->xkey.nbytes; i++) {
 			CallWindowProc(DefWindowProc,
 				Tk_GetHWND(Tk_WindowId(tkwin)),
 				WM_SYSCHAR,
@@ -1872,9 +1928,14 @@ DrawMenuEntryLabel(
 {
     int baseline;
     int indicatorSpace =  mePtr->indicatorSpace;
-    int leftEdge = x + indicatorSpace + menuPtr->activeBorderWidth;
+    int activeBorderWidth;
+    int leftEdge;
     int imageHeight, imageWidth;
 
+    Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin,
+	    menuPtr->activeBorderWidthPtr, &activeBorderWidth);
+    leftEdge = x + indicatorSpace + activeBorderWidth;
+
     /*
      * Draw label or bitmap or image for entry.
      */
@@ -1892,27 +1953,25 @@ DrawMenuEntryLabel(
 		    imageHeight, d, leftEdge,
 		    (int) (y + (mePtr->height - imageHeight)/2));
     	}
-    } else if (mePtr->bitmap != None) {
+    } else if (mePtr->bitmapPtr != NULL) {
     	int width, height;
-
-        Tk_SizeOfBitmap(menuPtr->display,
-	        mePtr->bitmap, &width, &height);
-    	XCopyPlane(menuPtr->display,
-	    	mePtr->bitmap, d,
-	    	gc, 0, 0, (unsigned) width, (unsigned) height, leftEdge,
-	    	(int) (y + (mePtr->height - height)/2), 1);
+	Pixmap bitmap = Tk_GetBitmapFromObj(menuPtr->tkwin, mePtr->bitmapPtr);
+        Tk_SizeOfBitmap(menuPtr->display, bitmap, &width, &height);
+    	XCopyPlane(menuPtr->display, bitmap, d,	gc, 0, 0, (unsigned) width, 
+		(unsigned) height, leftEdge,
+		(int) (y + (mePtr->height - height)/2), 1);
     } else {
     	if (mePtr->labelLength > 0) {
-	    Tk_DrawChars(menuPtr->display, d, gc,
-		    tkfont, mePtr->label, mePtr->labelLength,
-		    leftEdge, baseline);
+	    char *label = Tcl_GetStringFromObj(mePtr->labelPtr, NULL);
+	    Tk_DrawChars(menuPtr->display, d, gc, tkfont, label, 
+		    mePtr->labelLength, leftEdge, baseline);
 	    DrawMenuUnderline(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, y,
 		    width, height);
     	}
     }
 
-    if (mePtr->state == tkDisabledUid) {
-	if (menuPtr->disabledFg == NULL) {
+    if (mePtr->state == ENTRY_DISABLED) {
+	if (menuPtr->disabledFgPtr == NULL) {
 	    XFillRectangle(menuPtr->display, d, menuPtr->disabledGC, x, y,
 		    (unsigned) width, (unsigned) height);
 	} else if ((mePtr->image != NULL) 
@@ -1983,6 +2042,7 @@ DrawTearoffEntry(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, y, width, height)
 {
     XPoint points[2];
     int segmentWidth, maxX;
+    Tk_3DBorder border;
 
     if (menuPtr->menuType != MASTER_MENU) {
 	return;
@@ -1993,13 +2053,14 @@ DrawTearoffEntry(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, y, width, height)
     points[1].y = points[0].y;
     segmentWidth = 6;
     maxX  = width - 1;
+    border = Tk_Get3DBorderFromObj(menuPtr->tkwin, menuPtr->borderPtr);
 
     while (points[0].x < maxX) {
 	points[1].x = points[0].x + segmentWidth;
 	if (points[1].x > maxX) {
 	    points[1].x = maxX;
 	}
-	Tk_Draw3DPolygon(menuPtr->tkwin, d, menuPtr->border, points, 2, 1,
+	Tk_Draw3DPolygon(menuPtr->tkwin, d, border, points, 2, 1,
 		TK_RELIEF_RAISED);
 	points[0].x += 2*segmentWidth;
     }
@@ -2014,7 +2075,7 @@ DrawTearoffEntry(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, y, width, height)
  *
  * Results:
  *	Returns standard TCL result. If TCL_ERROR is returned, then
- *	interp->result contains an error message.
+ *	the interp's result contains an error message.
  *
  * Side effects:
  *	Configuration information get set for mePtr; old resources
@@ -2085,8 +2146,7 @@ TkpDrawMenuEntry(mePtr, d, tkfont, menuMetricsPtr, x, y, width, height,
      * Choose the gc for drawing the foreground part of the entry.
      */
 
-    if ((mePtr->state == tkActiveUid)
-	    && !strictMotif) {
+    if ((mePtr->state == ENTRY_ACTIVE) && !strictMotif) {
 	gc = mePtr->activeGC;
 	if (gc == NULL) {
 	    gc = menuPtr->activeGC;
@@ -2094,21 +2154,22 @@ TkpDrawMenuEntry(mePtr, d, tkfont, menuMetricsPtr, x, y, width, height,
     } else {
     	TkMenuEntry *cascadeEntryPtr;
     	int parentDisabled = 0;
+	char *name;
     	
     	for (cascadeEntryPtr = menuPtr->menuRefPtr->parentEntryPtr;
     		cascadeEntryPtr != NULL;
     		cascadeEntryPtr = cascadeEntryPtr->nextCascadePtr) {
-    	    if (strcmp(cascadeEntryPtr->name, 
-    	    	    Tk_PathName(menuPtr->tkwin)) == 0) {
-    	    	if (cascadeEntryPtr->state == tkDisabledUid) {
+	    name = Tcl_GetStringFromObj(cascadeEntryPtr->namePtr, NULL);
+    	    if (strcmp(name, Tk_PathName(menuPtr->tkwin)) == 0) {
+    	    	if (mePtr->state == ENTRY_DISABLED) {
     	    	    parentDisabled = 1;
     	    	}
     	    	break;
     	    }
     	}
 
-	if (((parentDisabled || (mePtr->state == tkDisabledUid)))
-		&& (menuPtr->disabledFg != NULL)) {
+	if (((parentDisabled || (mePtr->state == ENTRY_DISABLED)))
+		&& (menuPtr->disabledFgPtr != NULL)) {
 	    gc = mePtr->disabledGC;
 	    if (gc == NULL) {
 		gc = menuPtr->disabledGC;
@@ -2124,24 +2185,22 @@ TkpDrawMenuEntry(mePtr, d, tkfont, menuMetricsPtr, x, y, width, height,
     if (indicatorGC == NULL) {
 	indicatorGC = menuPtr->indicatorGC;
     }
-	    
-    bgBorder = mePtr->border;
-    if (bgBorder == NULL) {
-	bgBorder = menuPtr->border;
-    }
+
+    bgBorder = Tk_Get3DBorderFromObj(menuPtr->tkwin,
+	    (mePtr->borderPtr == NULL) ? menuPtr->borderPtr
+	    : mePtr->borderPtr);
     if (strictMotif) {
 	activeBorder = bgBorder;
     } else {
-	activeBorder = mePtr->activeBorder;
-	if (activeBorder == NULL) {
-	    activeBorder = menuPtr->activeBorder;
-	}
+	activeBorder = Tk_Get3DBorderFromObj(menuPtr->tkwin,
+	    (mePtr->activeBorderPtr == NULL) ? menuPtr->activeBorderPtr
+	    : mePtr->activeBorderPtr);
     }
 
-    if (mePtr->tkfont == NULL) {
+    if (mePtr->fontPtr == NULL) {
 	fmPtr = menuMetricsPtr;
     } else {
-	tkfont = mePtr->tkfont;
+	tkfont = Tk_GetFontFromObj(menuPtr->tkwin, mePtr->fontPtr);
 	Tk_GetFontMetrics(tkfont, &entryMetrics);
 	fmPtr = &entryMetrics;
     }
@@ -2204,13 +2263,16 @@ GetMenuLabelGeometry(mePtr, tkfont, fmPtr, widthPtr, heightPtr)
  
     if (mePtr->image != NULL) {
     	Tk_SizeOfImage(mePtr->image, widthPtr, heightPtr);
-    } else if (mePtr->bitmap != (Pixmap) NULL) {
-    	Tk_SizeOfBitmap(menuPtr->display, mePtr->bitmap, widthPtr, heightPtr);
+    } else if (mePtr->bitmapPtr != NULL) {
+	Pixmap bitmap = Tk_GetBitmapFromObj(menuPtr->tkwin, mePtr->bitmapPtr);
+    	Tk_SizeOfBitmap(menuPtr->display, bitmap, widthPtr, heightPtr);
     } else {
     	*heightPtr = fmPtr->linespace;
     	
-    	if (mePtr->label != NULL) {
-    	    *widthPtr = Tk_TextWidth(tkfont, mePtr->label, mePtr->labelLength);
+    	if (mePtr->labelPtr != NULL) {
+	    char *label = Tcl_GetStringFromObj(mePtr->labelPtr, NULL);
+
+    	    *widthPtr = Tk_TextWidth(tkfont, label, mePtr->labelLength);
     	} else {
     	    *widthPtr = 0;
     	}
@@ -2247,7 +2309,7 @@ DrawMenuEntryBackground(
     int width,				/* width of rectangle to draw */
     int height)				/* height of rectangle to draw */
 {
-    if (mePtr->state == tkActiveUid) {
+    if (mePtr->state == ENTRY_ACTIVE) {
 	bgBorder = activeBorder;
     }
     Tk_Fill3DRectangle(menuPtr->tkwin, d, bgBorder,
@@ -2277,17 +2339,20 @@ void
 TkpComputeStandardMenuGeometry(
     TkMenu *menuPtr)		/* Structure describing menu. */
 {
-    Tk_Font tkfont;
+    Tk_Font menuFont, tkfont;
     Tk_FontMetrics menuMetrics, entryMetrics, *fmPtr;
     int x, y, height, width, indicatorSpace, labelWidth, accelWidth;
     int windowWidth, windowHeight, accelSpace;
     int i, j, lastColumnBreak = 0;
+    int activeBorderWidth, borderWidth;
     
     if (menuPtr->tkwin == NULL) {
 	return;
     }
 
-    x = y = menuPtr->borderWidth;
+    Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin, 
+	    menuPtr->borderWidthPtr, &borderWidth);
+    x = y = borderWidth;
     indicatorSpace = labelWidth = accelWidth = 0;
     windowHeight = 0;
 
@@ -2302,19 +2367,22 @@ TkpComputeStandardMenuGeometry(
      * give all of the geometry/drawing the entry's font and metrics.
      */
 
-    Tk_GetFontMetrics(menuPtr->tkfont, &menuMetrics);
-    accelSpace = Tk_TextWidth(menuPtr->tkfont, "M", 1);
+    menuFont = Tk_GetFontFromObj(menuPtr->tkwin, menuPtr->fontPtr);
+    Tk_GetFontMetrics(menuFont, &menuMetrics);
+    accelSpace = Tk_TextWidth(menuFont, "M", 1);
+    Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin,
+	    menuPtr->activeBorderWidthPtr, &activeBorderWidth);
 
     for (i = 0; i < menuPtr->numEntries; i++) {
-    	tkfont = menuPtr->entries[i]->tkfont;
-    	if (tkfont == NULL) {
-    	    tkfont = menuPtr->tkfont;
-    	    fmPtr = &menuMetrics;
-    	} else {
+	if (menuPtr->entries[i]->fontPtr == NULL) {
+	    tkfont = menuFont;
+	    fmPtr = &menuMetrics;
+	} else {
+	    tkfont = Tk_GetFontFromObj(menuPtr->tkwin,
+		    menuPtr->entries[i]->fontPtr);
     	    Tk_GetFontMetrics(tkfont, &entryMetrics);
     	    fmPtr = &entryMetrics;
     	}
-    	
 	if ((i > 0) && menuPtr->entries[i]->columnBreak) {
 	    if (accelWidth != 0) {
 		labelWidth += accelSpace;
@@ -2323,15 +2391,15 @@ TkpComputeStandardMenuGeometry(
 		menuPtr->entries[j]->indicatorSpace = indicatorSpace;
 		menuPtr->entries[j]->labelWidth = labelWidth;
 		menuPtr->entries[j]->width = indicatorSpace + labelWidth
-			+ accelWidth + 2 * menuPtr->activeBorderWidth;
+			+ accelWidth + 2 * activeBorderWidth;
 		menuPtr->entries[j]->x = x;
 		menuPtr->entries[j]->entryFlags &= ~ENTRY_LAST_COLUMN;
 	    }
 	    x += indicatorSpace + labelWidth + accelWidth
-		    + 2 * menuPtr->borderWidth;
+		    + 2 * borderWidth;
 	    indicatorSpace = labelWidth = accelWidth = 0;
 	    lastColumnBreak = i;
-	    y = menuPtr->borderWidth;
+	    y = borderWidth;
 	}
 
 	if (menuPtr->entries[i]->type == SEPARATOR_ENTRY) {
@@ -2379,7 +2447,7 @@ TkpComputeStandardMenuGeometry(
 	    	indicatorSpace = width;
 	    }
 
-	    menuPtr->entries[i]->height += 2 * menuPtr->activeBorderWidth + 1;
+	    menuPtr->entries[i]->height += 2 * activeBorderWidth + 1;
     	}
         menuPtr->entries[i]->y = y;
 	y += menuPtr->entries[i]->height;
@@ -2395,16 +2463,15 @@ TkpComputeStandardMenuGeometry(
 	menuPtr->entries[j]->indicatorSpace = indicatorSpace;
 	menuPtr->entries[j]->labelWidth = labelWidth;
 	menuPtr->entries[j]->width = indicatorSpace + labelWidth
-		+ accelWidth + 2 * menuPtr->activeBorderWidth;
+		+ accelWidth + 2 * activeBorderWidth;
 	menuPtr->entries[j]->x = x;
 	menuPtr->entries[j]->entryFlags |= ENTRY_LAST_COLUMN;
     }
     windowWidth = x + indicatorSpace + labelWidth + accelWidth + accelSpace
-	    + 2 * menuPtr->activeBorderWidth
-	    + 2 * menuPtr->borderWidth;
+	    + 2 * activeBorderWidth + 2 * borderWidth;
 
 
-    windowHeight += menuPtr->borderWidth;
+    windowHeight += borderWidth;
     
     /*
      * The X server doesn't like zero dimensions, so round up to at least
@@ -2530,14 +2597,55 @@ static void
 MenuExitHandler(
     ClientData clientData)	    /* Not used */
 {
-    DestroyWindow(menuHWND);
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
+    DestroyWindow(tsdPtr->menuHWND);
     UnregisterClass(MENU_CLASS_NAME, Tk_GetHINSTANCE());
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * TkpMenuInit --
+ * TkWinGetMenuSystemDefault --
+ *
+ *	Gets the Windows specific default value for a given X resource
+ *	database name.
+ *
+ * Results:
+ *	Returns a Tcl_Obj * with the default value. If there is no
+ *	Windows-specific default for this attribute, returns NULL.
+ *	This object has a ref count of 0.
+ *
+ * Side effects:
+ *	Storage is allocated.
+ *
+ *----------------------------------------------------------------------
+ */
+
+Tcl_Obj *
+TkWinGetMenuSystemDefault(
+    Tk_Window tkwin,		/* A window to use. */
+    char *dbName,		/* The option database name. */
+    char *className)		/* The name of the option class. */
+{
+    Tcl_Obj *valuePtr = NULL;
+
+    if ((strcmp(dbName, "activeBorderWidth") == 0) ||
+	    (strcmp(dbName, "borderWidth") == 0)) {
+	valuePtr = Tcl_NewIntObj(defaultBorderWidth);
+    } else if (strcmp(dbName, "font") == 0) {
+	valuePtr = Tcl_NewStringObj(Tcl_DStringValue(&menuFontDString),
+		-1);
+    }
+
+    return valuePtr;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkWinMenuSetDefaults --
  *
  *	Sets up the hash tables and the variables used by the menu package.
  *
@@ -2552,37 +2660,20 @@ MenuExitHandler(
  */
 
 void
-TkpMenuInit()
+SetDefaults(
+    int firstTime)		    /* Is this the first time this
+				     * has been called? */
 {
-    WNDCLASS wndClass;
-    char sizeString[4];
+    char sizeString[TCL_INTEGER_SPACE];
     char faceName[LF_FACESIZE];
     HDC scratchDC;
     Tcl_DString boldItalicDString;
     int bold = 0; 
     int italic = 0;
-    int i;
     TEXTMETRIC tm;
+    int pointSize;
+    HFONT menuFont;
 
-    Tcl_InitHashTable(&winMenuTable, TCL_ONE_WORD_KEYS);
-    Tcl_InitHashTable(&commandTable, TCL_ONE_WORD_KEYS);
- 
-    wndClass.style = CS_OWNDC;
-    wndClass.lpfnWndProc = TkWinMenuProc;
-    wndClass.cbClsExtra = 0;
-    wndClass.cbWndExtra = 0;
-    wndClass.hInstance = Tk_GetHINSTANCE();
-    wndClass.hIcon = NULL;
-    wndClass.hCursor = NULL;
-    wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
-    wndClass.lpszMenuName = NULL;
-    wndClass.lpszClassName = MENU_CLASS_NAME;
-    RegisterClass(&wndClass);
-
-    menuHWND = CreateWindow(MENU_CLASS_NAME, "MenuWindow", WS_POPUP,
-	0, 0, 10, 10, NULL, NULL, Tk_GetHINSTANCE(), NULL);
-
-    Tcl_CreateExitHandler(MenuExitHandler, (ClientData) NULL);
 
     versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);
 
@@ -2601,74 +2692,59 @@ TkpMenuInit()
      * out of options via a break statement.
      */
 
-    for (i = 0; ; i++) {
-	if (tkMenuConfigSpecs[i].type == TK_CONFIG_END) {
-	    break;
-	}
+    defaultBorderWidth = GetSystemMetrics(SM_CXBORDER);
+    if (GetSystemMetrics(SM_CYBORDER) > defaultBorderWidth) {
+	defaultBorderWidth = GetSystemMetrics(SM_CYBORDER);
+    }
 
-	if ((strcmp(tkMenuConfigSpecs[i].dbName,
-		"activeBorderWidth") == 0) ||
-		(strcmp(tkMenuConfigSpecs[i].dbName, "borderWidth") == 0)) {
-	    int borderWidth;
 
-	    borderWidth = GetSystemMetrics(SM_CXBORDER);
-	    if (GetSystemMetrics(SM_CYBORDER) > borderWidth) {
-		borderWidth = GetSystemMetrics(SM_CYBORDER);
-	    }
-	    sprintf(borderString, "%d", borderWidth);
-	    tkMenuConfigSpecs[i].defValue = borderString;
-	} else if ((strcmp(tkMenuConfigSpecs[i].dbName, "font") == 0)) {
-	    int pointSize;
-	    HFONT menuFont;
-
-	    scratchDC = CreateDC("DISPLAY", NULL, NULL, NULL);
-	    Tcl_DStringInit(&menuFontDString);
-
-	    if (versionInfo.dwMajorVersion >= 4) {
-		NONCLIENTMETRICS ncMetrics;
-
-		ncMetrics.cbSize = sizeof(ncMetrics);
-		SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncMetrics),
-			&ncMetrics, 0);
-		menuFont = CreateFontIndirect(&ncMetrics.lfMenuFont);
-	    } else {
-		menuFont = GetStockObject(SYSTEM_FONT);
-	    }
-	    SelectObject(scratchDC, menuFont);
-	    GetTextMetrics(scratchDC, &tm);
-	    GetTextFace(scratchDC, sizeof(menuFontDString), faceName);
-	    pointSize = MulDiv(tm.tmHeight - tm.tmInternalLeading,
-		    72, GetDeviceCaps(scratchDC, LOGPIXELSY));
-	    if (tm.tmWeight >= 700) {
-		bold = 1;
-	    }
-	    if (tm.tmItalic) {
-		italic = 1;
-	    }
+    scratchDC = CreateDC("DISPLAY", NULL, NULL, NULL);
+    if (!firstTime) {
+	Tcl_DStringFree(&menuFontDString);
+    }
+    Tcl_DStringInit(&menuFontDString);
 
-	    SelectObject(scratchDC, GetStockObject(SYSTEM_FONT));
-	    DeleteDC(scratchDC);
+    if (versionInfo.dwMajorVersion >= 4) {
+	NONCLIENTMETRICS ncMetrics;
 
-	    DeleteObject(menuFont);
-	    
-	    Tcl_DStringAppendElement(&menuFontDString, faceName);
-	    sprintf(sizeString, "%d", pointSize);
-	    Tcl_DStringAppendElement(&menuFontDString, sizeString);
-
-	    if (bold == 1 || italic == 1) {
-		Tcl_DStringInit(&boldItalicDString);
-		if (bold == 1) {
-		    Tcl_DStringAppendElement(&boldItalicDString, "bold");
-		}
-		if (italic == 1) {
-		    Tcl_DStringAppendElement(&boldItalicDString, "italic");
-		}
-		Tcl_DStringAppendElement(&menuFontDString, 
-			Tcl_DStringValue(&boldItalicDString));
-	    }
+	ncMetrics.cbSize = sizeof(ncMetrics);
+	SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncMetrics),
+		&ncMetrics, 0);
+	menuFont = CreateFontIndirect(&ncMetrics.lfMenuFont);
+    } else {
+	menuFont = GetStockObject(SYSTEM_FONT);
+    }
+    SelectObject(scratchDC, menuFont);
+    GetTextMetrics(scratchDC, &tm);
+    GetTextFace(scratchDC, sizeof(menuFontDString), faceName);
+    pointSize = MulDiv(tm.tmHeight - tm.tmInternalLeading,
+	    72, GetDeviceCaps(scratchDC, LOGPIXELSY));
+    if (tm.tmWeight >= 700) {
+	bold = 1;
+    }
+    if (tm.tmItalic) {
+	italic = 1;
+    }
+
+    SelectObject(scratchDC, GetStockObject(SYSTEM_FONT));
+    DeleteDC(scratchDC);
 
-	    tkMenuConfigSpecs[i].defValue = Tcl_DStringValue(&menuFontDString);
+    DeleteObject(menuFont);
+    
+    Tcl_DStringAppendElement(&menuFontDString, faceName);
+    sprintf(sizeString, "%d", pointSize);
+    Tcl_DStringAppendElement(&menuFontDString, sizeString);
+
+    if (bold == 1 || italic == 1) {
+	Tcl_DStringInit(&boldItalicDString);
+	if (bold == 1) {
+	    Tcl_DStringAppendElement(&boldItalicDString, "bold");
+	}
+	if (italic == 1) {
+	    Tcl_DStringAppendElement(&boldItalicDString, "italic");
 	}
+	Tcl_DStringAppendElement(&menuFontDString, 
+		Tcl_DStringValue(&boldItalicDString));
     }
 
     /*
@@ -2692,5 +2768,72 @@ TkpMenuInit()
 	indicatorDimensions[0] = HIWORD(dimensions);
 	indicatorDimensions[1] = LOWORD(dimensions);
    }
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkpMenuInit --
+ *
+ *	Sets up the process-wide variables used by the menu package.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	lastMenuID gets initialized.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+TkpMenuInit()
+{
+    WNDCLASS wndClass;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
+    wndClass.style = CS_OWNDC;
+    wndClass.lpfnWndProc = TkWinMenuProc;
+    wndClass.cbClsExtra = 0;
+    wndClass.cbWndExtra = 0;
+    wndClass.hInstance = Tk_GetHINSTANCE();
+    wndClass.hIcon = NULL;
+    wndClass.hCursor = NULL;
+    wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndClass.lpszMenuName = NULL;
+    wndClass.lpszClassName = MENU_CLASS_NAME;
+    RegisterClass(&wndClass);
+
+    tsdPtr->menuHWND = CreateWindow(MENU_CLASS_NAME, "MenuWindow", WS_POPUP,
+	0, 0, 10, 10, NULL, NULL, Tk_GetHINSTANCE(), NULL);
+
+    Tcl_CreateExitHandler(MenuExitHandler, (ClientData) NULL);
+    SetDefaults(1);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkpMenuThreadInit --
+ *
+ *	Sets up the thread-local hash tables used by the menu module.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Hash tables winMenuTable and commandTable are initialized.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+TkpMenuThreadInit()
+{
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
+    Tcl_InitHashTable(&tsdPtr->winMenuTable, TCL_ONE_WORD_KEYS);
+    Tcl_InitHashTable(&tsdPtr->commandTable, TCL_ONE_WORD_KEYS);
 }
diff --git a/win/tkWinPointer.c b/win/tkWinPointer.c
index 289ff4b..d503417 100644
--- a/win/tkWinPointer.c
+++ b/win/tkWinPointer.c
@@ -4,11 +4,12 @@
  *	Windows specific mouse tracking code.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinPointer.c,v 1.5 1999/03/10 19:29:24 redman Exp $
+ * RCS: @(#) $Id: tkWinPointer.c,v 1.6 1999/04/16 01:51:53 stanton Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index d673d46..5391b21 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -6,12 +6,11 @@
  *	file that contains #ifdefs to handle different flavors of OS.
  *
  * Copyright (c) 1995-1996 Sun Microsystems, Inc.
- * Copyright (c) 1998 by Scriptics Corporation.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinPort.h,v 1.4 1999/03/10 07:04:46 stanton Exp $
+ * RCS: @(#) $Id: tkWinPort.h,v 1.5 1999/04/16 01:51:53 stanton Exp $
  */
 
 #ifndef _WINPORT
@@ -22,6 +21,7 @@
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
+
 #include <malloc.h>
 #include <errno.h>
 #include <ctype.h>
@@ -33,6 +33,7 @@
 #include <io.h>
 #include <sys/stat.h>
 #include <time.h>
+#include <tchar.h>
 
 #ifdef _MSC_VER
 #    define hypot _hypot
@@ -110,16 +111,8 @@ struct timezone {
     int tz_dsttime;
 };
 
-extern int gettimeofday(struct timeval *, struct timezone *);
-
-/*
- * tclInt.h is included to get declarations of the following functions.
- *	void		panic _ANSI_ARGS_(TCL_VARARGS(char *,format));
- *	void		TclpGetTime _ANSI_ARGS_((Tcl_Time *time));
- */
-  
 #ifndef _TCLINT
-#   include <tclInt.h>
+#include <tclInt.h>
 #endif
 
 #endif /* _WINPORT */
diff --git a/win/tkWinScrlbr.c b/win/tkWinScrlbr.c
index 619a6f9..e81e77c 100644
--- a/win/tkWinScrlbr.c
+++ b/win/tkWinScrlbr.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinScrlbr.c,v 1.2 1998/09/14 18:24:01 stanton Exp $
+ * RCS: @(#) $Id: tkWinScrlbr.c,v 1.3 1999/04/16 01:51:53 stanton Exp $
  */
 
 #include "tkWinInt.h"
@@ -57,12 +57,14 @@ static int initialized = 0;
 static int hArrowWidth, hThumb; /* Horizontal control metrics. */
 static int vArrowWidth, vArrowHeight, vThumb; /* Vertical control metrics. */
 
+TCL_DECLARE_MUTEX(winScrlbrMutex)
+
 /*
  * This variable holds the default width for a scrollbar in string
  * form for use in a Tk_ConfigSpec.
  */
 
-static char defWidth[8];
+static char defWidth[TCL_INTEGER_SPACE];
 
 /*
  * Declarations for functions defined in this file.
@@ -116,8 +118,10 @@ TkpCreateScrollbar(tkwin)
     TkWindow *winPtr = (TkWindow *)tkwin;
     
     if (!initialized) {
+        Tcl_MutexLock(&winScrlbrMutex);
 	UpdateScrollbarMetrics();
 	initialized = 1;
+	Tcl_MutexUnlock(&winScrlbrMutex);
     }
 
     scrollPtr = (WinScrollbar *) ckalloc(sizeof(WinScrollbar));
diff --git a/win/tkWinTest.c b/win/tkWinTest.c
new file mode 100644
index 0000000..00553eb
--- /dev/null
+++ b/win/tkWinTest.c
@@ -0,0 +1,230 @@
+/* 
+ * tkWinTest.c --
+ *
+ *	Contains commands for platform specific tests for
+ *	the Windows platform.
+ *
+ * Copyright (c) 1997 Sun Microsystems, Inc.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) $Id: tkWinTest.c,v 1.2 1999/04/16 01:51:53 stanton Exp $
+ */
+
+#include "tkWinInt.h"
+
+HWND tkWinCurrentDialog;
+ 
+/*
+ * Forward declarations of procedures defined later in this file:
+ */
+
+int			TkplatformtestInit(Tcl_Interp *interp);
+static int		TestclipboardCmd(ClientData clientData,
+			    Tcl_Interp *interp, int argc, char **argv);
+static int		TestwineventCmd(ClientData clientData, 
+			    Tcl_Interp *interp, int argc, char **argv);
+
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkplatformtestInit --
+ *
+ *	Defines commands that test platform specific functionality for
+ *	Unix platforms.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	Defines new commands.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TkplatformtestInit(
+    Tcl_Interp *interp)		/* Interpreter to add commands to. */
+{
+    /*
+     * Add commands for platform specific tests on MacOS here.
+     */
+    
+    Tcl_CreateCommand(interp, "testclipboard", TestclipboardCmd,
+	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateCommand(interp, "testwinevent", TestwineventCmd,
+            (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TestclipboardCmd --
+ *
+ *	This procedure implements the testclipboard command. It provides
+ *	a way to determine the actual contents of the Windows clipboard.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+TestclipboardCmd(clientData, interp, argc, argv)
+    ClientData clientData;		/* Main window for application. */
+    Tcl_Interp *interp;			/* Current interpreter. */
+    int argc;				/* Number of arguments. */
+    char **argv;			/* Argument strings. */
+{
+    TkWindow *winPtr = (TkWindow *) clientData;
+    HGLOBAL handle;
+    char *data;
+
+    if (OpenClipboard(NULL)) {
+	handle = GetClipboardData(CF_TEXT);
+	if (handle != NULL) {
+	    data = GlobalLock(handle);
+	    Tcl_AppendResult(interp, data, (char *) NULL);
+	    GlobalUnlock(handle);
+	}
+	CloseClipboard();
+    }
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TestwineventCmd --
+ *
+ *	This procedure implements the testwinevent command. It provides
+ *	a way to send messages to windows dialogs.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+TestwineventCmd(clientData, interp, argc, argv)
+    ClientData clientData;		/* Main window for application. */
+    Tcl_Interp *interp;			/* Current interpreter. */
+    int argc;				/* Number of arguments. */
+    char **argv;			/* Argument strings. */
+{
+    HWND hwnd;
+    int id;
+    char *rest;
+    UINT message;
+    WPARAM wParam;
+    LPARAM lParam;
+    static TkStateMap messageMap[] = {
+	{WM_LBUTTONDOWN,	"WM_LBUTTONDOWN"},
+	{WM_LBUTTONUP,		"WM_LBUTTONUP"},
+	{WM_CHAR,		"WM_CHAR"},
+	{WM_GETTEXT,		"WM_GETTEXT"},
+	{WM_SETTEXT,		"WM_SETTEXT"},
+	{-1,			NULL}
+    };
+
+    if ((argc == 3) && (strcmp(argv[1], "debug") == 0)) {
+	int i;
+
+	if (Tcl_GetBoolean(interp, argv[2], &i) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	TkWinDialogDebug(i);
+	return TCL_OK;
+    }
+
+    if (argc < 4) {
+	return TCL_ERROR;
+    }
+
+    hwnd = (HWND) strtol(argv[1], &rest, 0);
+    if (rest == argv[2]) {
+	hwnd = FindWindow(NULL, argv[1]);
+	if (hwnd == NULL) {
+	    Tcl_SetResult(interp, "no such window", TCL_STATIC);
+	    return TCL_ERROR;
+	}
+    } 
+    UpdateWindow(hwnd);
+
+    id = strtol(argv[2], &rest, 0);
+    if (rest == argv[2]) {
+	HWND child;
+	char buf[256];
+
+	child = GetWindow(hwnd, GW_CHILD);
+	while (child != NULL) {
+	    SendMessage(child, WM_GETTEXT, (WPARAM) sizeof(buf), (LPARAM) buf);
+	    if (strcasecmp(buf, argv[2]) == 0) {
+		id = GetDlgCtrlID(child);
+		break;
+	    }
+	    child = GetWindow(child, GW_HWNDNEXT);
+	}
+	if (child == NULL) {
+	    return TCL_ERROR;
+	}
+    }
+    message = TkFindStateNum(NULL, NULL, messageMap, argv[3]);
+    if (message < 0) {
+	message = strtol(argv[3], NULL, 0);
+    }
+    wParam = 0;
+    lParam = 0;
+
+    if (argc > 4) {
+	wParam = strtol(argv[4], NULL, 0);
+    }
+    if (argc > 5) {
+	lParam = strtol(argv[5], NULL, 0);
+    }
+
+    switch (message) {
+	case WM_GETTEXT: {
+	    Tcl_DString ds;
+	    char buf[256];
+
+	    GetDlgItemText(hwnd, id, buf, 256);
+	    Tcl_ExternalToUtfDString(NULL, buf, -1, &ds);
+	    Tcl_AppendResult(interp, Tcl_DStringValue(&ds), NULL);
+	    Tcl_DStringFree(&ds);
+	    break;
+	}
+	case WM_SETTEXT: {
+	    Tcl_DString ds;
+
+	    Tcl_UtfToExternalDString(NULL, argv[4], -1, &ds);
+	    SetDlgItemText(hwnd, id, Tcl_DStringValue(&ds));
+	    Tcl_DStringFree(&ds);
+	    break;
+	}
+	default: {
+	    char buf[TCL_INTEGER_SPACE];
+	    
+	    sprintf(buf, "%d", 
+		    SendDlgItemMessage(hwnd, id, message, wParam, lParam));
+	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	    break;
+	}
+    }
+    return TCL_OK;
+}
+    
+
+
diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c
index 7d321d9..1b0e7a4 100644
--- a/win/tkWinWindow.c
+++ b/win/tkWinWindow.c
@@ -4,27 +4,22 @@
  *	Xlib emulation routines for Windows related to creating,
  *	displaying and destroying windows.
  *
- * Copyright (c) 1995 Sun Microsystems, Inc.
+ * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinWindow.c,v 1.4 1998/09/14 18:24:01 stanton Exp $
+ * RCS: @(#) $Id: tkWinWindow.c,v 1.5 1999/04/16 01:51:54 stanton Exp $
  */
 
 #include "tkWinInt.h"
 
-/*
- * The windowTable maps from HWND to Tk_Window handles.
- */
-
-static Tcl_HashTable windowTable;
-
-/*
- * Have statics in this module been initialized?
- */
-
-static int initialized = 0;
+typedef struct ThreadSpecificData {
+    int initialized;            /* 0 means table below needs initializing. */
+    Tcl_HashTable windowTable;  /* The windowTable maps from HWND to 
+				 * Tk_Window handles. */
+} ThreadSpecificData;
+static Tcl_ThreadDataKey dataKey;
 
 /*
  * Forward declarations for procedures defined in this file:
@@ -61,10 +56,12 @@ Tk_AttachHWND(tkwin, hwnd)
     int new;
     Tcl_HashEntry *entryPtr;
     TkWinDrawable *twdPtr = (TkWinDrawable *) Tk_WindowId(tkwin);
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    if (!initialized) {
-	Tcl_InitHashTable(&windowTable, TCL_ONE_WORD_KEYS);
-	initialized = 1;
+    if (!tsdPtr->initialized) {
+	Tcl_InitHashTable(&tsdPtr->windowTable, TCL_ONE_WORD_KEYS);
+	tsdPtr->initialized = 1;
     }
 
     /*
@@ -77,7 +74,7 @@ Tk_AttachHWND(tkwin, hwnd)
 	twdPtr->type = TWD_WINDOW;
 	twdPtr->window.winPtr = (TkWindow *) tkwin;
     } else if (twdPtr->window.handle != NULL) {
-	entryPtr = Tcl_FindHashEntry(&windowTable,
+	entryPtr = Tcl_FindHashEntry(&tsdPtr->windowTable,
 		(char *)twdPtr->window.handle);
 	Tcl_DeleteHashEntry(entryPtr);
     }
@@ -87,7 +84,7 @@ Tk_AttachHWND(tkwin, hwnd)
      */
 
     twdPtr->window.handle = hwnd;
-    entryPtr = Tcl_CreateHashEntry(&windowTable, (char *)hwnd, &new);
+    entryPtr = Tcl_CreateHashEntry(&tsdPtr->windowTable, (char *)hwnd, &new);
     Tcl_SetHashValue(entryPtr, (ClientData)tkwin);
 
     return (Window)twdPtr;
@@ -115,11 +112,14 @@ Tk_HWNDToWindow(hwnd)
     HWND hwnd;
 {
     Tcl_HashEntry *entryPtr;
-    if (!initialized) {
-	Tcl_InitHashTable(&windowTable, TCL_ONE_WORD_KEYS);
-	initialized = 1;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
+    if (!tsdPtr->initialized) {
+	Tcl_InitHashTable(&tsdPtr->windowTable, TCL_ONE_WORD_KEYS);
+	tsdPtr->initialized = 1;
     }
-    entryPtr = Tcl_FindHashEntry(&windowTable, (char*)hwnd);
+    entryPtr = Tcl_FindHashEntry(&tsdPtr->windowTable, (char*)hwnd);
     if (entryPtr != NULL) {
 	return (Tk_Window) Tcl_GetHashValue(entryPtr);
     }
@@ -190,7 +190,7 @@ TkpPrintWindowId(buf, window)
  *	The return value is normally TCL_OK;  in this case *idPtr
  *	will be set to the X Window id equivalent to string.  If
  *	string is improperly formed then TCL_ERROR is returned and
- *	an error message will be left in interp->result.  If the
+ *	an error message will be left in the interp's result.  If the
  *	number does not correspond to a Tk Window, then *idPtr will
  *	be set to None.
  *
@@ -295,6 +295,8 @@ XDestroyWindow(display, w)
     TkWinDrawable *twdPtr = (TkWinDrawable *)w;
     TkWindow *winPtr = TkWinGetWinPtr(w);
     HWND hwnd = Tk_GetHWND(w);
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     display->request++;
 
@@ -305,7 +307,7 @@ XDestroyWindow(display, w)
 
     TkPointerDeadWindow(winPtr);
 
-    entryPtr = Tcl_FindHashEntry(&windowTable, (char*)hwnd);
+    entryPtr = Tcl_FindHashEntry(&tsdPtr->windowTable, (char*)hwnd);
     if (entryPtr != NULL) {
 	Tcl_DeleteHashEntry(entryPtr);
     }
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index a0ed0ae..71b78ca 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -7,12 +7,12 @@
  *	to the window manager.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998 by Scriptics Corporation.
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinWm.c,v 1.7 1999/03/10 19:29:24 redman Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.8 1999/04/16 01:51:54 stanton Exp $
  */
 
 #include "tkWinInt.h"
@@ -227,22 +227,6 @@ typedef struct TkWmInfo {
 		(WS_EX_TOOLWINDOW|WS_EX_DLGMODALFRAME)
 
 /*
- * This module keeps a list of all top-level windows.
- */
-
-static WmInfo *firstWmPtr = NULL;	/* Points to first top-level window. */
-static WmInfo *foregroundWmPtr = NULL; /* Points to the foreground window. */
-
-/*
- * The variable below is used to enable or disable tracing in this
- * module.  If tracing is enabled, then information is printed on
- * standard output about interesting interactions with the window
- * manager.
- */
-
-static int wmTracing = 0;
-
-/*
  * The following structure is the official type record for geometry
  * management of top-level windows.
  */
@@ -255,41 +239,36 @@ static Tk_GeomMgr wmMgrType = {
     (Tk_GeomLostSlaveProc *) NULL,	/* lostSlaveProc */
 };
 
-/*
- * Global system palette.  This value always refers to the currently
- * installed foreground logical palette.
- */
-
-static HPALETTE systemPalette = NULL;
-
-/*
- * Window that is being constructed.  This value is set immediately
- * before a call to CreateWindowEx, and is used by SetLimits.
- * This is a gross hack needed to work around Windows brain damage
- * where it sends the WM_GETMINMAXINFO message before the WM_CREATE
- * window.
- */
-
-static TkWindow *createWindow = NULL;
-
-/*
- * Flag indicating whether this module has been initialized yet.
- */
-
-static int initialized = 0;
+typedef struct ThreadSpecificData {
+    HPALETTE systemPalette;      /* System palette; refers to the 
+				  * currently installed foreground logical
+				  * palette. */
+    TkWindow *createWindow;      /* Window that is being constructed.  This
+				  * value is set immediately before a
+				  * call to CreateWindowEx, and is used
+				  * by SetLimits.  This is a gross hack
+				  * needed to work around Windows brain
+				  * damage where it sends the
+				  * WM_GETMINMAXINFO message before the
+				  * WM_CREATE window. */
+    int initialized;             /* Flag indicating whether thread-
+				  * specific elements of module have 
+				  * been initialized. */
+    int firstWindow;             /* Flag, cleared when the first window
+				  * is mapped in a non-iconic state. */
+} ThreadSpecificData;
+static Tcl_ThreadDataKey dataKey;
 
 /*
- * Class for toplevel windows.
+ * The following variables cannot be placed in thread local storage
+ * because they must be shared across threads.
  */
 
-static WNDCLASS toplevelClass;
-
-/*
- * This flag is cleared when the first window is mapped in a non-iconic
- * state.
- */
+static WNDCLASS toplevelClass; /* Class for toplevel windows. */
+static int initialized;        /* Flag indicating whether module has
+				* been initialized. */
+TCL_DECLARE_MUTEX(winWmMutex)
 
-static int firstWindow = 1;
 
 /*
  * Forward declarations for procedures defined in this file:
@@ -314,7 +293,8 @@ static void		InvalidateSubTree _ANSI_ARGS_((TkWindow *winPtr,
 			    Colormap colormap));
 static int		ParseGeometry _ANSI_ARGS_((Tcl_Interp *interp,
 			    char *string, TkWindow *winPtr));
-static void		RefreshColormap _ANSI_ARGS_((Colormap colormap));
+static void		RefreshColormap _ANSI_ARGS_((Colormap colormap,
+	                    TkDisplay *dispPtr));
 static void		SetLimits _ANSI_ARGS_((HWND hwnd, MINMAXINFO *info));
 static LRESULT CALLBACK	TopLevelProc _ANSI_ARGS_((HWND hwnd, UINT message,
 			    WPARAM wParam, LPARAM lParam));
@@ -347,24 +327,49 @@ static LRESULT CALLBACK	WmProc _ANSI_ARGS_((HWND hwnd, UINT message,
 static void
 InitWm(void)
 {
-    if (initialized) {
-        return;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+    WNDCLASS * classPtr;
+
+    if (! tsdPtr->initialized) {
+	tsdPtr->initialized = 1;
+	tsdPtr->firstWindow = 1;
     }
-    initialized = 1;
-
-    toplevelClass.style = CS_HREDRAW | CS_VREDRAW | CS_CLASSDC;
-    toplevelClass.cbClsExtra = 0;
-    toplevelClass.cbWndExtra = 0;
-    toplevelClass.hInstance = Tk_GetHINSTANCE();
-    toplevelClass.hbrBackground = NULL;
-    toplevelClass.lpszMenuName = NULL;
-    toplevelClass.lpszClassName = TK_WIN_TOPLEVEL_CLASS_NAME;
-    toplevelClass.lpfnWndProc = WmProc;
-    toplevelClass.hIcon = LoadIcon(Tk_GetHINSTANCE(), "tk");
-    toplevelClass.hCursor = LoadCursor(NULL, IDC_ARROW);
-
-    if (!RegisterClass(&toplevelClass)) {
-	panic("Unable to register TkTopLevel class");
+    if (! initialized) {
+	Tcl_MutexLock(&winWmMutex);
+	if (! initialized) {
+	    initialized = 1;
+	    classPtr = &toplevelClass;
+
+    /*
+     * When threads are enabled, we cannot use CLASSDC because
+     * threads will then write into the same device context.
+     * 
+     * This is a hack; we should add a subsystem that manages
+     * device context on a per-thread basis.  See also tkWinX.c,
+     * which also initializes a WNDCLASS structure.
+     */
+
+#ifdef TCL_THREADS
+	    classPtr->style = CS_HREDRAW | CS_VREDRAW;
+#else
+	    classPtr->style = CS_HREDRAW | CS_VREDRAW | CS_CLASSDC;
+#endif
+	    classPtr->cbClsExtra = 0;
+	    classPtr->cbWndExtra = 0;
+	    classPtr->hInstance = Tk_GetHINSTANCE();
+	    classPtr->hbrBackground = NULL;
+	    classPtr->lpszMenuName = NULL;
+	    classPtr->lpszClassName = TK_WIN_TOPLEVEL_CLASS_NAME;
+	    classPtr->lpfnWndProc = WmProc;
+	    classPtr->hIcon = LoadIcon(Tk_GetHINSTANCE(), "tk");
+	    classPtr->hCursor = LoadCursor(NULL, IDC_ARROW);
+
+	    if (!RegisterClass(classPtr)) {
+		panic("Unable to register TkTopLevel class");
+	    }
+	}
+	Tcl_MutexUnlock(&winWmMutex);
     }
 }
 
@@ -389,14 +394,17 @@ static TkWindow *
 GetTopLevel(hwnd)
     HWND hwnd;
 {
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
     /*
      * If this function is called before the CreateWindowEx call
      * has completed, then the user data slot will not have been
      * set yet, so we use the global createWindow variable.
      */
 
-    if (createWindow) {
-	return createWindow;
+    if (tsdPtr->createWindow) {
+	return tsdPtr->createWindow;
     }
     return (TkWindow *) GetWindowLong(hwnd, GWL_USERDATA);
 }
@@ -510,10 +518,13 @@ void
 TkWinWmCleanup(hInstance)
     HINSTANCE hInstance;
 {
-    if (!initialized) {
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
+    if (!tsdPtr->initialized) {
         return;
     }
-    initialized = 0;
+    tsdPtr->initialized = 0;
     
     UnregisterClass(TK_WIN_TOPLEVEL_CLASS_NAME, hInstance);
 }
@@ -596,8 +607,8 @@ TkWmNewWindow(winPtr)
     wmPtr->cmdArgv = NULL;
     wmPtr->clientMachine = NULL;
     wmPtr->flags = WM_NEVER_MAPPED;
-    wmPtr->nextPtr = firstWmPtr;
-    firstWmPtr = wmPtr;
+    wmPtr->nextPtr = winPtr->dispPtr->firstWmPtr;
+    winPtr->dispPtr->firstWmPtr = wmPtr;
 
     /*
      * Tk must monitor structure events for top-level windows, in order
@@ -644,6 +655,9 @@ UpdateWrapper(winPtr)
     HWND child = TkWinGetHWND(winPtr->window);
     int x, y, width, height, state;
     WINDOWPLACEMENT place;
+    Tcl_DString titleString;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     parentHWND = NULL;
     child = TkWinGetHWND(winPtr->window); 
@@ -720,13 +734,15 @@ UpdateWrapper(winPtr)
 	 * to the TkWindow.
 	 */
 
-	createWindow = winPtr;
+	tsdPtr->createWindow = winPtr;
+	Tcl_UtfToExternalDString(NULL, wmPtr->titleUid, -1, &titleString);
 	wmPtr->wrapper = CreateWindowEx(wmPtr->exStyle,
 		TK_WIN_TOPLEVEL_CLASS_NAME,
-		wmPtr->titleUid, wmPtr->style, x, y, width, height,
-		parentHWND, NULL, Tk_GetHINSTANCE(), NULL);
+		Tcl_DStringValue(&titleString), wmPtr->style, x, y, width, 
+		height, parentHWND, NULL, Tk_GetHINSTANCE(), NULL);
+	Tcl_DStringFree(&titleString);
 	SetWindowLong(wmPtr->wrapper, GWL_USERDATA, (LONG) winPtr);
-	createWindow = NULL;
+	tsdPtr->createWindow = NULL;
 
 	place.length = sizeof(WINDOWPLACEMENT);
 	GetWindowPlacement(wmPtr->wrapper, &place);
@@ -800,8 +816,8 @@ UpdateWrapper(winPtr)
      * we should activate the initial window.
      */
 
-    if (firstWindow) {
-	firstWindow = 0;
+    if (tsdPtr->firstWindow) {
+	tsdPtr->firstWindow = 0;
 	SetActiveWindow(wmPtr->wrapper);
     }
 }
@@ -835,8 +851,10 @@ TkWmMapWindow(winPtr)
 				 * be mapped. */
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    if (!initialized) {
+    if (!tsdPtr->initialized) {
 	InitWm();
     }
 
@@ -917,6 +935,7 @@ TkpWmSetState(winPtr, state)
     WmInfo *wmPtr = winPtr->wmInfoPtr;
     int cmd;
     
+
     if (wmPtr->flags & WM_NEVER_MAPPED) {
 	wmPtr->hints.initial_state = state;
 	return;
@@ -932,6 +951,7 @@ TkpWmSetState(winPtr, state)
     } else if (state == ZoomState) {
 	cmd = SW_SHOWMAXIMIZED;
     }
+
     ShowWindow(wmPtr->wrapper, cmd);
     wmPtr->flags &= ~WM_SYNC_PENDING;
 }
@@ -969,11 +989,12 @@ TkWmDeadWindow(winPtr)
      * Clean up event related window info.
      */
 
-    if (firstWmPtr == wmPtr) {
-	firstWmPtr = wmPtr->nextPtr;
+    if (winPtr->dispPtr->firstWmPtr == wmPtr) {
+	winPtr->dispPtr->firstWmPtr = wmPtr->nextPtr;
     } else {
 	register WmInfo *prevPtr;
-	for (prevPtr = firstWmPtr; ; prevPtr = prevPtr->nextPtr) {
+	for (prevPtr = winPtr->dispPtr->firstWmPtr; ; prevPtr
+		 = prevPtr->nextPtr) {
 	    if (prevPtr == NULL) {
 		panic("couldn't unlink window in TkWmDeadWindow");
 	    }
@@ -988,7 +1009,8 @@ TkWmDeadWindow(winPtr)
      * Reset all transient windows whose master is the dead window.
      */
 
-    for (wmPtr2 = firstWmPtr; wmPtr2 != NULL; wmPtr2 = wmPtr2->nextPtr) {
+    for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL; wmPtr2
+	     = wmPtr2->nextPtr) {
 	if (wmPtr2->masterPtr == winPtr) {
 	    wmPtr2->masterPtr = NULL;
 	    if ((wmPtr2->wrapper != None)
@@ -1102,10 +1124,11 @@ Tk_WmCmd(clientData, interp, argc, argv)
     char **argv;		/* Argument strings. */
 {
     Tk_Window tkwin = (Tk_Window) clientData;
-    TkWindow *winPtr;
+    TkWindow *winPtr = NULL;
     register WmInfo *wmPtr;
     int c;
     size_t length;
+    TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
     if (argc < 2) {
 	wrongNumArgs:
@@ -1123,10 +1146,10 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    return TCL_ERROR;
 	}
 	if (argc == 2) {
-	    interp->result = (wmTracing) ? "on" : "off";
+	    Tcl_SetResult(interp, ((dispPtr->wmTracing) ? "on" : "off"), TCL_STATIC);
 	    return TCL_OK;
 	}
-	return Tcl_GetBoolean(interp, argv[2], &wmTracing);
+	return Tcl_GetBoolean(interp, argv[2], &dispPtr->wmTracing);
     }
 
     if (argc < 3) {
@@ -1153,9 +1176,12 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->sizeHintsFlags & PAspect) {
-		sprintf(interp->result, "%d %d %d %d", wmPtr->minAspect.x,
+		char buf[TCL_INTEGER_SPACE * 4];
+		
+		sprintf(buf, "%d %d %d %d", wmPtr->minAspect.x,
 			wmPtr->minAspect.y, wmPtr->maxAspect.x,
 			wmPtr->maxAspect.y);
+		Tcl_SetResult(interp, buf, TCL_VOLATILE);
 	    }
 	    return TCL_OK;
 	}
@@ -1170,7 +1196,8 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    }
 	    if ((numer1 <= 0) || (denom1 <= 0) || (numer2 <= 0) ||
 		    (denom2 <= 0)) {
-		interp->result = "aspect number can't be <= 0";
+		Tcl_SetResult(interp, "aspect number can't be <= 0",
+			TCL_STATIC);
 		return TCL_ERROR;
 	    }
 	    wmPtr->minAspect.x = numer1;
@@ -1190,7 +1217,7 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->clientMachine != NULL) {
-		interp->result = wmPtr->clientMachine;
+		Tcl_SetResult(interp, wmPtr->clientMachine, TCL_STATIC);
 	    }
 	    return TCL_OK;
 	}
@@ -1286,7 +1313,7 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	 * Now we need to force the updated colormaps to be installed.
 	 */
 
-	if (wmPtr == foregroundWmPtr) {
+	if (wmPtr == winPtr->dispPtr->foregroundWmPtr) {
 	    InstallColormaps(wmPtr->wrapper, WM_QUERYNEWPALETTE, 1);
 	} else {
 	    InstallColormaps(wmPtr->wrapper, WM_PALETTECHANGED, 0);
@@ -1305,8 +1332,9 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->cmdArgv != NULL) {
-		interp->result = Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv);
-		interp->freeProc = TCL_DYNAMIC;
+		Tcl_SetResult(interp,
+			Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv),
+			TCL_DYNAMIC);
 	    }
 	    return TCL_OK;
 	}
@@ -1358,7 +1386,8 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    return TCL_ERROR;
 	}
 	if (argc == 3) {
-	    interp->result = wmPtr->hints.input ? "passive" : "active";
+	    Tcl_SetResult(interp, (wmPtr->hints.input ? "passive" : "active"),
+		    TCL_STATIC);
 	    return TCL_OK;
 	}
 	c = argv[3][0];
@@ -1375,6 +1404,7 @@ Tk_WmCmd(clientData, interp, argc, argv)
     } else if ((c == 'f') && (strncmp(argv[1], "frame", length) == 0)
 	    && (length >= 2)) {
 	HWND hwnd;
+	char buf[TCL_INTEGER_SPACE];
 
 	if (argc != 3) {
 	    Tcl_AppendResult(interp, "wrong # arguments: must be \"",
@@ -1388,7 +1418,8 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	if (hwnd == NULL) {
 	    hwnd = Tk_GetHWND(Tk_WindowId((Tk_Window) winPtr));
 	}
-	sprintf(interp->result, "0x%x", (unsigned int) hwnd);
+	sprintf(buf, "0x%x", (unsigned int) hwnd);
+	Tcl_SetResult(interp, buf, TCL_VOLATILE);
     } else if ((c == 'g') && (strncmp(argv[1], "geometry", length) == 0)
 	    && (length >= 2)) {
 	char xSign, ySign;
@@ -1401,6 +1432,8 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    return TCL_ERROR;
 	}
 	if (argc == 3) {
+	    char buf[16 + TCL_INTEGER_SPACE * 4];
+	    
 	    xSign = (wmPtr->flags & WM_NEGATIVE_X) ? '-' : '+';
 	    ySign = (wmPtr->flags & WM_NEGATIVE_Y) ? '-' : '+';
 	    if (wmPtr->gridWin != NULL) {
@@ -1412,8 +1445,9 @@ Tk_WmCmd(clientData, interp, argc, argv)
 		width = winPtr->changes.width;
 		height = winPtr->changes.height;
 	    }
-	    sprintf(interp->result, "%dx%d%c%d%c%d", width, height,
-		    xSign, wmPtr->x, ySign, wmPtr->y);
+	    sprintf(buf, "%dx%d%c%d%c%d", width, height, xSign, wmPtr->x,
+		    ySign, wmPtr->y);
+	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
 	    return TCL_OK;
 	}
 	if (*argv[3] == '\0') {
@@ -1434,9 +1468,12 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->sizeHintsFlags & PBaseSize) {
-		sprintf(interp->result, "%d %d %d %d", wmPtr->reqGridWidth,
+		char buf[TCL_INTEGER_SPACE * 4];
+		
+		sprintf(buf, "%d %d %d %d", wmPtr->reqGridWidth,
 			wmPtr->reqGridHeight, wmPtr->widthInc,
 			wmPtr->heightInc);
+		Tcl_SetResult(interp, buf, TCL_VOLATILE);
 	    }
 	    return TCL_OK;
 	}
@@ -1463,19 +1500,19 @@ Tk_WmCmd(clientData, interp, argc, argv)
 		return TCL_ERROR;
 	    }
 	    if (reqWidth < 0) {
-		interp->result = "baseWidth can't be < 0";
+		Tcl_SetResult(interp, "baseWidth can't be < 0", TCL_STATIC);
 		return TCL_ERROR;
 	    }
 	    if (reqHeight < 0) {
-		interp->result = "baseHeight can't be < 0";
+		Tcl_SetResult(interp, "baseHeight can't be < 0", TCL_STATIC);
 		return TCL_ERROR;
 	    }
 	    if (widthInc < 0) {
-		interp->result = "widthInc can't be < 0";
+		Tcl_SetResult(interp, "widthInc can't be < 0", TCL_STATIC);
 		return TCL_ERROR;
 	    }
 	    if (heightInc < 0) {
-		interp->result = "heightInc can't be < 0";
+		Tcl_SetResult(interp, "heightInc can't be < 0", TCL_STATIC);
 		return TCL_ERROR;
 	    }
 	    Tk_SetGrid((Tk_Window) winPtr, reqWidth, reqHeight, widthInc,
@@ -1494,7 +1531,7 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->hints.flags & WindowGroupHint) {
-		interp->result = wmPtr->leaderName;
+		Tcl_SetResult(interp, wmPtr->leaderName, TCL_STATIC);
 	    }
 	    return TCL_OK;
 	}
@@ -1527,8 +1564,9 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->hints.flags & IconPixmapHint) {
-		interp->result = Tk_NameOfBitmap(winPtr->display,
-			wmPtr->hints.icon_pixmap);
+		Tcl_SetResult(interp,
+			Tk_NameOfBitmap(winPtr->display, wmPtr->hints.icon_pixmap),
+			TCL_STATIC);
 	    }
 	    return TCL_OK;
 	}
@@ -1586,8 +1624,9 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->hints.flags & IconMaskHint) {
-		interp->result = Tk_NameOfBitmap(winPtr->display,
-			wmPtr->hints.icon_mask);
+		Tcl_SetResult(interp,
+			Tk_NameOfBitmap(winPtr->display, wmPtr->hints.icon_mask),
+			TCL_STATIC);
 	    }
 	    return TCL_OK;
 	}
@@ -1612,7 +1651,9 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    return TCL_ERROR;
 	}
 	if (argc == 3) {
-	    interp->result = (wmPtr->iconName != NULL) ? wmPtr->iconName : "";
+	    Tcl_SetResult(interp,
+		    ((wmPtr->iconName != NULL) ? wmPtr->iconName : ""),
+		    TCL_STATIC);
 	    return TCL_OK;
 	} else {
 	    wmPtr->iconName = Tk_GetUid(argv[3]);
@@ -1632,8 +1673,11 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->hints.flags & IconPositionHint) {
-		sprintf(interp->result, "%d %d", wmPtr->hints.icon_x,
+		char buf[TCL_INTEGER_SPACE * 2];
+		
+		sprintf(buf, "%d %d", wmPtr->hints.icon_x,
 			wmPtr->hints.icon_y);
+		Tcl_SetResult(interp, buf, TCL_VOLATILE);
 	    }
 	    return TCL_OK;
 	}
@@ -1662,7 +1706,7 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->icon != NULL) {
-		interp->result = Tk_PathName(wmPtr->icon);
+		Tcl_SetResult(interp, Tk_PathName(wmPtr->icon), TCL_STATIC);
 	    }
 	    return TCL_OK;
 	}
@@ -1729,8 +1773,9 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    if (!(wmPtr2->flags & WM_NEVER_MAPPED)) {
 		if (XWithdrawWindow(Tk_Display(tkwin2), Tk_WindowId(tkwin2),
 			Tk_ScreenNumber(tkwin2)) == 0) {
-		    interp->result =
-			    "couldn't send withdraw message to window manager";
+		    Tcl_SetResult(interp,
+			    "couldn't send withdraw message to window manager",
+			    TCL_STATIC);
 		    return TCL_ERROR;
 		}
 	    }
@@ -1745,8 +1790,11 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    return TCL_ERROR;
 	}
 	if (argc == 3) {
+	    char buf[TCL_INTEGER_SPACE * 2];
+	    
 	    GetMaxSize(wmPtr, &width, &height);
-	    sprintf(interp->result, "%d %d", width, height);
+	    sprintf(buf, "%d %d", width, height);
+    	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
 	    return TCL_OK;
 	}
 	if ((Tcl_GetInt(interp, argv[3], &width) != TCL_OK)
@@ -1766,8 +1814,11 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    return TCL_ERROR;
 	}
 	if (argc == 3) {
+	    char buf[TCL_INTEGER_SPACE * 2];
+	    
 	    GetMinSize(wmPtr, &width, &height);
-	    sprintf(interp->result, "%d %d", width, height);
+	    sprintf(buf, "%d %d", width, height);
+	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
 	    return TCL_OK;
 	}
 	if ((Tcl_GetInt(interp, argv[3], &width) != TCL_OK)
@@ -1790,9 +1841,9 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) {
-		interp->result = "1";
+		Tcl_SetResult(interp, "1", TCL_STATIC);
 	    } else {
-		interp->result = "0";
+		Tcl_SetResult(interp, "0", TCL_STATIC);
 	    }
 	    return TCL_OK;
 	}
@@ -1816,9 +1867,9 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->sizeHintsFlags & USPosition) {
-		interp->result = "user";
+		Tcl_SetResult(interp, "user", TCL_STATIC);
 	    } else if (wmPtr->sizeHintsFlags & PPosition) {
-		interp->result = "program";
+		Tcl_SetResult(interp, "program", TCL_STATIC);
 	    }
 	    return TCL_OK;
 	}
@@ -1872,7 +1923,7 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    for (protPtr = wmPtr->protPtr; protPtr != NULL;
 		    protPtr = protPtr->nextPtr) {
 		if (protPtr->protocol == protocol) {
-		    interp->result = protPtr->command;
+		    Tcl_SetResult(interp, protPtr->command, TCL_STATIC);
 		    return TCL_OK;
 		}
 	    }
@@ -1916,9 +1967,12 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    return TCL_ERROR;
 	}
 	if (argc == 3) {
-	    sprintf(interp->result, "%d %d",
+	    char buf[TCL_INTEGER_SPACE * 2];
+	    
+	    sprintf(buf, "%d %d",
 		    (wmPtr->flags  & WM_WIDTH_NOT_RESIZABLE) ? 0 : 1,
 		    (wmPtr->flags  & WM_HEIGHT_NOT_RESIZABLE) ? 0 : 1);
+	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
 	    return TCL_OK;
 	}
 	if ((Tcl_GetBoolean(interp, argv[3], &width) != TCL_OK)
@@ -1947,9 +2001,9 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	}
 	if (argc == 3) {
 	    if (wmPtr->sizeHintsFlags & USSize) {
-		interp->result = "user";
+		Tcl_SetResult(interp, "user", TCL_STATIC);
 	    } else if (wmPtr->sizeHintsFlags & PSize) {
-		interp->result = "program";
+		Tcl_SetResult(interp, "program", TCL_STATIC);
 	    }
 	    return TCL_OK;
 	}
@@ -1980,20 +2034,20 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    return TCL_ERROR;
 	}
 	if (wmPtr->iconFor != NULL) {
-	    interp->result = "icon";
+	    Tcl_SetResult(interp, "icon", TCL_STATIC);
 	} else {
 	    switch (wmPtr->hints.initial_state) {
 		case NormalState:
-		    interp->result = "normal";
+		    Tcl_SetResult(interp, "normal", TCL_STATIC);
 		    break;
 		case IconicState:
-		    interp->result = "iconic";
+		    Tcl_SetResult(interp, "iconic", TCL_STATIC);
 		    break;
 		case WithdrawnState:
-		    interp->result = "withdrawn";
+		    Tcl_SetResult(interp, "withdrawn", TCL_STATIC);
 		    break;
 		case ZoomState:
-		    interp->result = "zoomed";
+		    Tcl_SetResult(interp, "zoomed", TCL_STATIC);
 		    break;
 	    }
 	}
@@ -2005,13 +2059,18 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	    return TCL_ERROR;
 	}
 	if (argc == 3) {
-	    interp->result = (wmPtr->titleUid != NULL) ? wmPtr->titleUid
-		    : winPtr->nameUid;
+	    Tcl_SetResult(interp,
+		    ((wmPtr->titleUid != NULL) ? wmPtr->titleUid : winPtr->nameUid),
+		    TCL_STATIC);
 	    return TCL_OK;
 	} else {
 	    wmPtr->titleUid = Tk_GetUid(argv[3]);
 	    if (!(wmPtr->flags & WM_NEVER_MAPPED) && wmPtr->wrapper != NULL) {
-		SetWindowText(wmPtr->wrapper, wmPtr->titleUid);
+		Tcl_DString titleString;
+		Tcl_UtfToExternalDString(NULL, wmPtr->titleUid, -1, 
+			&titleString);
+		SetWindowText(wmPtr->wrapper, Tcl_DStringValue(&titleString));
+		Tcl_DStringFree(&titleString);
 	    }
 	}
     } else if ((c == 't') && (strncmp(argv[1], "transient", length) == 0)
@@ -2611,7 +2670,7 @@ UpdateGeometryInfo(clientData)
  *
  * Results:
  *	A standard Tcl return value, plus an error message in
- *	interp->result if an error occurs.
+ *	the interp's result if an error occurs.
  *
  * Side effects:
  *	The size and/or location of winPtr may change.
@@ -3136,7 +3195,7 @@ TkWmAddToColormapWindows(winPtr)
      * Now we need to force the updated colormaps to be installed.
      */
 
-    if (topPtr->wmInfoPtr == foregroundWmPtr) {
+    if (topPtr->wmInfoPtr == winPtr->dispPtr->foregroundWmPtr) {
 	InstallColormaps(topPtr->wmInfoPtr->wrapper, WM_QUERYNEWPALETTE, 1);
     } else {
 	InstallColormaps(topPtr->wmInfoPtr->wrapper, WM_PALETTECHANGED, 0);
@@ -3534,6 +3593,8 @@ InstallColormaps(hwnd, message, isForemost)
     HPALETTE oldPalette;
     TkWindow *winPtr = GetTopLevel(hwnd);
     WmInfo *wmPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 	    
     if (winPtr == NULL) {
 	return 0;
@@ -3550,17 +3611,17 @@ InstallColormaps(hwnd, message, isForemost)
 	 * secondary palettes are installed properly.
 	 */
 
-	foregroundWmPtr = wmPtr;
+	winPtr->dispPtr->foregroundWmPtr = wmPtr;
 
 	if (wmPtr->cmapCount > 0) {
 	    winPtr = wmPtr->cmapList[0];
 	}
 
-	systemPalette = TkWinGetPalette(winPtr->atts.colormap);
+	tsdPtr->systemPalette = TkWinGetPalette(winPtr->atts.colormap);
 	dc = GetDC(hwnd);
-	oldPalette = SelectPalette(dc, systemPalette, FALSE);
+	oldPalette = SelectPalette(dc, tsdPtr->systemPalette, FALSE);
 	if (RealizePalette(dc)) {
-	    RefreshColormap(winPtr->atts.colormap);
+	    RefreshColormap(winPtr->atts.colormap, winPtr->dispPtr);
 	} else if (wmPtr->cmapCount > 1) {
 	    SelectPalette(dc, oldPalette, TRUE);
 	    RealizePalette(dc);
@@ -3596,13 +3657,13 @@ InstallColormaps(hwnd, message, isForemost)
 	oldPalette = SelectPalette(dc,
 		TkWinGetPalette(winPtr->atts.colormap), TRUE);
 	if (RealizePalette(dc)) {
-	    RefreshColormap(winPtr->atts.colormap);
+	    RefreshColormap(winPtr->atts.colormap, winPtr->dispPtr);
 	}
 	for (; i < wmPtr->cmapCount; i++) {
 	    winPtr = wmPtr->cmapList[i];
 	    SelectPalette(dc, TkWinGetPalette(winPtr->atts.colormap), TRUE);
 	    if (RealizePalette(dc)) {
-		RefreshColormap(winPtr->atts.colormap);
+		RefreshColormap(winPtr->atts.colormap, winPtr->dispPtr);
 	    }
 	}
     }
@@ -3634,13 +3695,14 @@ InstallColormaps(hwnd, message, isForemost)
  */
 
 static void
-RefreshColormap(colormap)
+RefreshColormap(colormap, dispPtr)
     Colormap colormap;
+    TkDisplay *dispPtr;
 {
     WmInfo *wmPtr;
     int i;
 
-    for (wmPtr = firstWmPtr; wmPtr != NULL; wmPtr = wmPtr->nextPtr) {
+    for (wmPtr = dispPtr->firstWmPtr; wmPtr != NULL; wmPtr = wmPtr->nextPtr) {
 	if (wmPtr->cmapCount > 0) {
 	    for (i = 0; i < wmPtr->cmapCount; i++) {
 		if ((wmPtr->cmapList[i]->atts.colormap == colormap)
@@ -3722,7 +3784,10 @@ InvalidateSubTree(winPtr, colormap)
 HPALETTE
 TkWinGetSystemPalette()
 {
-    return systemPalette;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
+    return tsdPtr->systemPalette;
 }
 
 /*
@@ -3950,8 +4015,8 @@ WmProc(hwnd, message, wParam, lParam)
 			 * leaving move/size mode.  Note that this mechanism
 			 * assumes move/size is only one level deep. */
     LRESULT result;
-    TkWindow *winPtr;
-	
+    TkWindow *winPtr = NULL;
+
     if (TkWinHandleMenuEvent(&hwnd, &message, &wParam, &lParam, &result)) {
 	goto done;
     }
@@ -4235,21 +4300,22 @@ ActivateWindow(
     
     return 1;
 }
+
 
 /*
  *----------------------------------------------------------------------
  *
  * TkWinSetForegroundWindow --
  *
- *    This function is a wrapper for SetForegroundWindow, calling
+ *	This function is a wrapper for SetForegroundWindow, calling
  *      it on the wrapper window because it has no affect on child
  *      windows.
  *
  * Results:
- *    none
+ *	none
  *
  * Side effects:
- *    May activate the toplevel window.
+ *	May activate the toplevel window.
  *
  *----------------------------------------------------------------------
  */
diff --git a/win/tkWinX.c b/win/tkWinX.c
index 50a9e24..358d15e 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -10,10 +10,9 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinX.c,v 1.4 1998/10/10 00:30:37 rjohnson Exp $
+ * RCS: @(#) $Id: tkWinX.c,v 1.5 1999/04/16 01:51:54 stanton Exp $
  */
 
-#include "tkInt.h"
 #include "tkWinInt.h"
 
 /*
@@ -32,13 +31,23 @@ int tkpIsWin32s = -1;
  * Declarations of static variables used in this file.
  */
 
-static HINSTANCE tkInstance = (HINSTANCE) NULL;
-				/* Global application instance handle. */
-static TkDisplay *winDisplay;	/* Display that represents Windows screen. */
-static char winScreenName[] = ":0";
-				/* Default name of windows display. */
-static WNDCLASS childClass;	/* Window class for child windows. */
-static childClassInitialized = 0; /* Registered child class? */
+static char winScreenName[] = ":0"; /* Default name of windows display. */
+static HINSTANCE tkInstance;        /* Application instance handle. */
+static int childClassInitialized;   /* Registered child class? */
+static WNDCLASS childClass;	    /* Window class for child windows. */
+
+TCL_DECLARE_MUTEX(winXMutex)
+
+/*
+ * Thread local storage.  Notice that now each thread must have its
+ * own TkDisplay structure, since this structure contains most of
+ * the thread-specific date for threads.
+ */
+typedef struct ThreadSpecificData {
+    TkDisplay *winDisplay;       /* TkDisplay structure that *
+				  *  represents Windows screen. */
+} ThreadSpecificData;
+static Tcl_ThreadDataKey dataKey;
 
 /*
  * Forward declarations of procedures used in this file.
@@ -142,7 +151,21 @@ TkWinXInit(hInstance)
 
     tkInstance = hInstance;
 
+    /*
+     * When threads are enabled, we cannot use CLASSDC because
+     * threads will then write into the same device context.
+     * 
+     * This is a hack; we should add a subsystem that manages
+     * device context on a per-thread basis.  See also tkWinWm.c,
+     * which also initializes a WNDCLASS structure.
+     */
+
+#ifdef TCL_THREADS
+    childClass.style = CS_HREDRAW | CS_VREDRAW;
+#else
     childClass.style = CS_HREDRAW | CS_VREDRAW | CS_CLASSDC;
+#endif
+
     childClass.cbClsExtra = 0;
     childClass.cbWndExtra = 0;
     childClass.hInstance = hInstance;
@@ -236,10 +259,10 @@ TkGetDefaultScreenName(interp, screenName)
  *	specific information.
  *
  * Results:
- *	Returns a Display structure on success or NULL on failure.
+ *	Returns a TkDisplay structure on success or NULL on failure.
  *
  * Side effects:
- *	Allocates a new Display structure.
+ *	Allocates a new TkDisplay structure.
  *
  *----------------------------------------------------------------------
  */
@@ -252,10 +275,13 @@ TkpOpenDisplay(display_name)
     HDC dc;
     TkWinDrawable *twdPtr;
     Display *display;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    if (winDisplay != NULL) {
-	if (strcmp(winDisplay->display->display_name, display_name) == 0) {
-	    return winDisplay;
+    if (tsdPtr->winDisplay != NULL) {
+	if (strcmp(tsdPtr->winDisplay->display->display_name, display_name) 
+                == 0) {
+	    return tsdPtr->winDisplay;
 	} else {
 	    return NULL;
 	}
@@ -357,9 +383,9 @@ TkpOpenDisplay(display_name)
     display->default_screen = 0;
     screen->cmap = XCreateColormap(display, None, screen->root_visual,
 	    AllocNone);
-    winDisplay = (TkDisplay *) ckalloc(sizeof(TkDisplay));
-    winDisplay->display = display;
-    return winDisplay;
+    tsdPtr->winDisplay = (TkDisplay *) ckalloc(sizeof(TkDisplay));
+    tsdPtr->winDisplay->display = display;
+    return tsdPtr->winDisplay;
 }
 
 /*
@@ -385,8 +411,10 @@ TkpCloseDisplay(dispPtr)
 {
     Display *display = dispPtr->display;
     HWND hwnd;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    if (dispPtr != winDisplay) {
+    if (dispPtr != tsdPtr->winDisplay) {
         panic("TkpCloseDisplay: tried to call TkpCloseDisplay on another display");
         return;
     }
@@ -405,7 +433,7 @@ TkpCloseDisplay(dispPtr)
 	}
     }
 
-    winDisplay = NULL;
+    tsdPtr->winDisplay = NULL;
 
     if (display->display_name != (char *) NULL) {
         ckfree(display->display_name);
@@ -795,19 +823,61 @@ GenerateXEvent(hwnd, message, wParam, lParam)
 		     */
 		    event.type = KeyRelease;
 		    event.xkey.keycode = wParam;
-		    event.xkey.nchars = 0;
+		    event.xkey.nbytes = 0;
 		    break;
 
 		case WM_CHAR:
 		    /*
 		     * Synthesize both a KeyPress and a KeyRelease.
+		     * Strings generated by Input Method Editor are handled
+		     * in the following manner:
+		     * 1. A series of WM_KEYDOWN & WM_KEYUP messages that 
+		     *    cause GetTranslatedKey() to be called and return
+		     *    immediately because the WM_KEYDOWNs have no 
+		     *	  associated WM_CHAR messages -- the IME window is 
+		     *	  accumulating the characters and translating them 
+		     *    itself.  In the "bind" command, you get an event
+		     *	  with a mystery keysym and %A == "" for each 
+		     *	  WM_KEYDOWN that actually was meant for the IME.
+		     * 2. A WM_KEYDOWN corresponding to the "confirm typing"
+		     *    character.  This causes GetTranslatedKey() to be 
+		     *	  called.
+		     * 3. A WM_IME_NOTIFY message saying that the IME is 
+		     *	  done.  A side effect of this message is that 
+		     *    GetTranslatedKey() thinks this means that there
+		     *	  are no WM_CHAR messages and returns immediately.
+		     *    In the "bind" command, you get an another event
+		     *	  with a mystery keysym and %A == "".
+		     * 4. A sequence of WM_CHAR messages that correspond to 
+		     *	  the characters in the IME window.  A bunch of 
+		     *    simulated KeyPress/KeyRelease events will be 
+		     *    generated, one for each character.  Adjacent 
+		     *    WM_CHAR messages may actually specify the high
+		     *	  and low bytes of a multi-byte character -- in that
+		     *    case the two WM_CHAR messages will be combined into
+		     *	  one event.  It is the event-consumer's 
+		     *	  responsibility to convert the string returned from
+		     *	  XLookupString from system encoding to UTF-8.
+		     * 5. And finally we get the WM_KEYUP for the "confirm
+		     *    typing" character.
 		     */
 
 		    event.type = KeyPress;
 		    event.xany.send_event = -1;
 		    event.xkey.keycode = 0;
-		    event.xkey.nchars = 1;
+		    event.xkey.nbytes = 1;
 		    event.xkey.trans_chars[0] = (char) wParam;
+
+		    if (IsDBCSLeadByte((BYTE) wParam)) {
+			MSG msg;
+
+			if ((PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) != 0)
+				&& (msg.message == WM_CHAR)) {
+			    GetMessage(&msg, NULL, 0, 0);
+			    event.xkey.nbytes = 2;
+			    event.xkey.trans_chars[1] = (char) msg.wParam;
+			}
+		    }
 		    Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
 		    event.type = KeyRelease;
 		    break;
@@ -906,7 +976,7 @@ GetState(message, wParam, lParam)
  *	given KeyPress event.
  *
  * Results:
- *	Sets the trans_chars and nchars member of the key event.
+ *	Sets the trans_chars and nbytes member of the key event.
  *
  * Side effects:
  *	Removes any WM_CHAR messages waiting on the top of the system
@@ -920,14 +990,13 @@ GetTranslatedKey(xkey)
     XKeyEvent *xkey;
 {
     MSG msg;
+    char buf[XMaxTransChars];
     
-    xkey->nchars = 0;
+    xkey->nbytes = 0;
 
-    while (xkey->nchars < XMaxTransChars
+    while ((xkey->nbytes < XMaxTransChars)
 	    && PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
 	if ((msg.message == WM_CHAR) || (msg.message == WM_SYSCHAR)) {
-	    xkey->trans_chars[xkey->nchars] = (char) msg.wParam;
-	    xkey->nchars++;
 	    GetMessage(&msg, NULL, 0, 0);
 
 	    /*
@@ -941,6 +1010,9 @@ GetTranslatedKey(xkey)
 	    if ((msg.message == WM_CHAR) && (msg.lParam & 0x20000000)) {
 		xkey->state = 0;
 	    }
+	    buf[xkey->nbytes] = (char) msg.wParam;
+	    xkey->trans_chars[xkey->nbytes] = (char) msg.wParam;
+	    xkey->nbytes++;
 	} else {
 	    break;
 	}
diff --git a/win/winMain.c b/win/winMain.c
index 9cf081d..79f8f96 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -3,27 +3,30 @@
  *
  *	Main entry point for wish and other Tk-based applications.
  *
- * Copyright (c) 1995 Sun Microsystems, Inc.
+ * Copyright (c) 1995-1997 Sun Microsystems, Inc.
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: winMain.c,v 1.5 1999/03/10 07:04:46 stanton Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.6 1999/04/16 01:51:55 stanton Exp $
  */
 
 #include <tk.h>
-#include "tkInt.h"
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
 #include <malloc.h>
 #include <locale.h>
 
+#include "tkInt.h"
+
 /*
  * The following declarations refer to internal Tk routines.  These
  * interfaces are available for use, but are not supported.
  */
 
+
 /*
  * Forward declarations for procedures defined later in this file:
  */
@@ -35,6 +38,13 @@ static void		WishPanic _ANSI_ARGS_(TCL_VARARGS(char *,format));
 extern int		Tktest_Init(Tcl_Interp *interp);
 #endif /* TK_TEST */
 
+#ifdef TCL_TEST
+extern int		TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp));
+extern int		Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
+#endif /* TCL_TEST */
+
+static BOOL consoleRequired = TRUE;
+
 
 /*
  *----------------------------------------------------------------------
@@ -60,9 +70,8 @@ WinMain(hInstance, hPrevInstance, lpszCmdLine, nCmdShow)
     LPSTR lpszCmdLine;
     int nCmdShow;
 {
-    char **argv, *p;
+    char **argv;
     int argc;
-    char buffer[MAX_PATH];
 
     Tcl_SetPanicProc(WishPanic);
 
@@ -72,7 +81,7 @@ WinMain(hInstance, hPrevInstance, lpszCmdLine, nCmdShow)
      */
 
     setlocale(LC_ALL, "C");
-
+    setargv(&argc, &argv);
 
     /*
      * Increase the application queue size from default value of 8.
@@ -81,22 +90,16 @@ WinMain(hInstance, hPrevInstance, lpszCmdLine, nCmdShow)
      * This is only needed for Windows 3.x, since NT dynamically expands
      * the queue.
      */
-    SetMessageQueue(64);
 
-    setargv(&argc, &argv);
+    SetMessageQueue(64);
 
     /*
-     * Replace argv[0] with full pathname of executable, and forward
-     * slashes substituted for backslashes.
+     * Create the console channels and install them as the standard
+     * channels.  All I/O will be discarded until TkConsoleInit is
+     * called to attach the console to a text widget.
      */
 
-    GetModuleFileName(NULL, buffer, sizeof(buffer));
-    argv[0] = buffer;
-    for (p = buffer; *p != '\0'; p++) {
-	if (*p == '\\') {
-	    *p = '/';
-	}
-    }
+    consoleRequired = TRUE;
 
     Tk_Main(argc, argv, Tcl_AppInit);
     return 1;
@@ -114,7 +117,7 @@ WinMain(hInstance, hPrevInstance, lpszCmdLine, nCmdShow)
  *
  * Results:
  *	Returns a standard Tcl completion code, and leaves an error
- *	message in interp->result if an error occurs.
+ *	message in the interp's result if an error occurs.
  *
  * Side effects:
  *	Depends on the startup script.
@@ -132,7 +135,6 @@ Tcl_AppInit(interp)
     if (Tk_Init(interp) == TCL_ERROR) {
 	goto error;
     }
-
     Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
 
     /*
@@ -140,9 +142,22 @@ Tcl_AppInit(interp)
      * application.
      */
 
-    if (TkConsoleInit(interp) == TCL_ERROR) {
-	goto error;
+    if (consoleRequired) {
+	if (TkConsoleInit(interp) == TCL_ERROR) {
+	    goto error;
+	}
+    }
+
+#ifdef TCL_TEST
+    if (Tcltest_Init(interp) == TCL_ERROR) {
+	return TCL_ERROR;
     }
+    Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
+            (Tcl_PackageInitProc *) NULL);
+    if (TclObjTest_Init(interp) == TCL_ERROR) {
+	return TCL_ERROR;
+    }
+#endif /* TCL_TEST */
 
 #ifdef TK_TEST
     if (Tktest_Init(interp) == TCL_ERROR) {
@@ -156,7 +171,7 @@ Tcl_AppInit(interp)
     return TCL_OK;
 
 error:
-    WishPanic(interp->result);
+    WishPanic(Tcl_GetStringResult(interp));
     return TCL_ERROR;
 }
 
@@ -230,7 +245,7 @@ setargv(argcPtr, argvPtr)
     char **argv;
     int argc, size, inquote, copy, slashes;
     
-    cmdLine = GetCommandLine();
+    cmdLine = GetCommandLine();	/* INTL: BUG */
 
     /*
      * Precompute an overly pessimistic guess at the number of arguments
@@ -239,9 +254,9 @@ setargv(argcPtr, argvPtr)
 
     size = 2;
     for (p = cmdLine; *p != '\0'; p++) {
-	if (isspace(*p)) {
+	if ((*p == ' ') || (*p == '\t')) {	/* INTL: ISO space. */
 	    size++;
-	    while (isspace(*p)) {
+	    while ((*p == ' ') || (*p == '\t')) { /* INTL: ISO space. */
 		p++;
 	    }
 	    if (*p == '\0') {
@@ -249,8 +264,8 @@ setargv(argcPtr, argvPtr)
 	    }
 	}
     }
-    argSpace = (char *) ckalloc((unsigned) (size * sizeof(char *) 
-	    + strlen(cmdLine) + 1));
+    argSpace = (char *) Tcl_Alloc(
+	    (unsigned) (size * sizeof(char *) + strlen(cmdLine) + 1));
     argv = (char **) argSpace;
     argSpace += size * sizeof(char *);
     size--;
@@ -258,7 +273,7 @@ setargv(argcPtr, argvPtr)
     p = cmdLine;
     for (argc = 0; argc < size; argc++) {
 	argv[argc] = arg = argSpace;
-	while (isspace(*p)) {
+	while ((*p == ' ') || (*p == '\t')) {	/* INTL: ISO space. */
 	    p++;
 	}
 	if (*p == '\0') {
@@ -292,7 +307,8 @@ setargv(argcPtr, argvPtr)
 		slashes--;
 	    }
 
-	    if ((*p == '\0') || (!inquote && isspace(*p))) {
+	    if ((*p == '\0')
+		    || (!inquote && ((*p == ' ') || (*p == '\t')))) { /* INTL: ISO space. */
 		break;
 	    }
 	    if (copy != 0) {
@@ -310,3 +326,53 @@ setargv(argcPtr, argvPtr)
     *argvPtr = argv;
 }
 
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * main --
+ *
+ *	Main entry point from the console.
+ *
+ * Results:
+ *	None: Tk_Main never returns here, so this procedure never
+ *      returns either.
+ *
+ * Side effects:
+ *	Whatever the applications does.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int main(int argc, char **argv)
+{
+    Tcl_SetPanicProc(WishPanic);
+
+    /*
+     * Set up the default locale to be standard "C" locale so parsing
+     * is performed correctly.
+     */
+
+    setlocale(LC_ALL, "C");
+    /*
+     * Increase the application queue size from default value of 8.
+     * At the default value, cross application SendMessage of WM_KILLFOCUS
+     * will fail because the handler will not be able to do a PostMessage!
+     * This is only needed for Windows 3.x, since NT dynamically expands
+     * the queue.
+     */
+
+    SetMessageQueue(64);
+
+    /*
+     * Create the console channels and install them as the standard
+     * channels.  All I/O will be discarded until TkConsoleInit is
+     * called to attach the console to a text widget.
+     */
+
+    consoleRequired = FALSE;
+
+    Tk_Main(argc, argv, Tcl_AppInit);
+    return 0;
+}
+