* macosx/tkMacOSXCarbonEvents.c: add window event target carbon event

	* macosx/tkMacOSXEvent.c:	 handler for all kEventClassWindow and
	* macosx/tkMacOSXEvent.h:	 kEventClassMouse events;
	* macosx/tkMacOSXNotify.c:	 move all remaining events except for
	* macosx/tkMacOSXWindowEvent.c:	 kEventClassKeyboard from dispatcher to
	application event handler; pass event handler callRef downstream; fix
	debug event tracing; process all tcl event types in carbon event timer;
	delay carbon event timer first fire; add TkMacOSXTrackingLoop() to mark
	enter/exit of event tracking loop during which all tcl events but only
	carbon update events should be processed by the timer (replaces various
	calls to Tcl_SetServiceMode()); rename TkMacOSXReceiveAndProcessEvent()
	to TkMacOSXReceiveAndDispatchEvent(), move it from tkMacOSXEvent.c to
	tkMacOSXCarbonEvents.c and modify it to dequeue only update events
	during a tracking loop; add TkMacOSXRunTclEventLoop() to standardize
	the various ways in use to run the tcl event loop; add handling of
	kEventClassAppearance events (for ScrollBarVariantChanged event).

	* macosx/tkMacOSXDialog.c:	use new TkMacOSXTrackingLoop() around
	* macosx/tkMacOSXEvent.c:	blocking API that puts up modal dialogs
	* macosx/tkMacOSXMenu.c:	or when entering/exiting menu/control
	* macosx/tkMacOSXMouseEvent.c:	tracking, window dragging and other
	* macosx/tkMacOSXScale.c:	mouse tracking loops.
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXDialog.c:	use new TkMacOSXRunTclEventLoop()
	* macosx/tkMacOSXScale.c:	instead of Tcl_DoOneEvent(),
	* macosx/tkMacOSXScrlbr.c:	Tcl_ServiceAll(), TclServiceIdle()
	* macosx/tkMacOSXWindowEvent.c:	and Tcl_GlobalEval("update idletasks").

	* macosx/tkMacOSXColor.c: make available as Tk system colors all
	* macosx/tkMacOSXPort.h:  appearance manager brushes, text colors and
	backgrounds with new and legacy names, as well as the fully transparent
	color "systemTransparent"; add TkMacOSXSetColorIn{Port,Context}() to
	directly set an X pixel color value in the current QD port resp. the
	given CG context without requiring passage through rgb representation
	(lossy for most system colors); modernize/remove Classic-era code;
	replace crufty strcmp() elseifs by Tcl_GetIndexFromObjStruct().

	* macosx/tkMacOSXButton.c:	use new TkMacOSXSetColorInPort()
	* macosx/tkMacOSXDraw.c:	instead of setting rgb color directly
	* macosx/tkMacOSXMenubutton.c:	to allow for non-rgb system colors.

	* macosx/tkMacOSXCursor.c: implement "none" cursor as on other
	platforms [Patch 1615427]; add all missing appearance manager cursors.

	* macosx/tkMacOSXDefault.h: set SELECT_FG_COLORs to None to match aqua
	L&F; use standard system color names; use new 'menu' system font;
	correct default scrollbar width.

	* macosx/tkMacOSXDraw.c:	standardize initialization, use and
	* macosx/tkMacOSXInt.h:		emptying of various static temp rgns
	* macosx/tkMacOSXRegion.c:	onto two global RgnHandles; in debug
	* macosx/tkMacOSXSubwindows.c:	builds, verify emptiness of these temp
	* macosx/tkMacOSXWindowEvent.c:	rgns before use.

	* macosx/tkMacOSXDraw.c: add TkMacOSX{Setup,Restore}DrawingContext() to
	* macosx/tkMacOSXInt.h:  abstract common setup & teardown of drawing
	environment (for both CG and QD); save/restore QD theme drawing state;
	handle GC clip region; add TkpClipDrawableToRect() to allow clipped
	drawing into drawable regardless of GC used; use new system color
	"systemWindowHeaderBackground" to setup background in themed toplevels;
	correct implementation of TkMacOSXMakeStippleMap().

	* macosx/tkMacOSXEntry.c:  use new TkMacOSXSetupDrawingContext() and
	* macosx/tkMacOSXFont.c:   TkMacOSXRestoreDrawingContext() instead of
	* macosx/ttkMacOSXTheme.c: various setup/teardown procs like
	TkMacOSX{SetUp,Release}CGContext(), TkMacOSXQuarz{Start,End}Draw(),
	TkMacOSXSetUpGraphicsPort() etc.

	* macosx/tkMacOSXEmbed.c: add CG context and drawable clip rgn fields
	* macosx/tkMacOSXInt.h:   to MacDrawable struct.
	* macosx/tkMacOSXSubwindows.c:

	* macosx/tkMacOSXDialog.c: make -parent option of tk_getOpenFile et al.
	use the sheet version of NavServices dialogs; ensure native parent win
	exists before using StandardSheet API for tk_messageBox [Bug 1677611];
	force sheets to behave like app-modal dialogs via WindowModality() API;
	use more modern ColorPicker API.

	* macosx/tkAboutDlg.r: use themed movable modal dialog, fix (c) year.

	* macosx/tkMacOSXEntry.c:  take xOff/yOff of MacDrawable into account
	* macosx/ttkMacOSXTheme.c: when computing locations/bounds to ensure
	correct posititioning when not drawing into intermediate pixmap.

	* macosx/tkMacOSXFont.c: use appearance manager API to map system font
	* macosx/tkMacOSXFont.h: names to TkFonts; add "menu" system font for
	menu item text drawing from MDEF; always draw with CG; remove QD
	dependent stippling algorithm; move most header declarations into the
	source file (as they were not used anywhere else).

	* macosx/tkMacOSXMenu.c:		 large-scale rewrite of custom
	* macosx/tkMacOSXMenu.r (removed):	 MDEF and related code that
	* macosx/Wish.xcode/project.pbxproj:	 restores many longtime-MIA
	* macosx/Wish.xcodeproj/project.pbxproj: features to working order
	* unix/Makefile.in:			 (e.g. images, custom colors &
	fonts in menus etc); implement compound menu items; use Appearance Mgr
	and ThemeText APIs to mimic native MDEF as closely as possible when
	default "menu" system font is used; remove now obsolete SICN drawing
	code and resources.

	* macosx/tkMacOSXCarbonEvents.c: handle additional menu carbon events
	* macosx/tkMacOSXEvent.c:	 in order to support <<MenuSelect>> in
	* macosx/tkMacOSXMenu.c:	 the menubar and in menus that are not
	* macosx/tkMacOSXMenus.c:	 using the custom MDEF [Bug 1620826];
	fix early and missing clearing of current Tk active menu entry; fix
	extraneous sending of <<MenuSelect>> during active menu entry clearing.

	* macosx/tkMacOSXMouseEvent.c: add support for async window dragging by
	the window server; set the corresponding window attribute by default.

	* macosx/tkMacOSXMouseEvent.c: rationalized handling order of
	non-mousedown events; add TkMacOSXModifierState() to retrieve the
	current key modifiers in carbon format.

	* macosx/tkMacOSXScrlbr.c: use appearance manager API to retrieve
	scrollbar component metrics; add awareness of multiple possibilites for
	scrollbar arrow position in aqua and handle user changes to arrow
	position pref; handle difference in metrics of small & large scrollbar
	variants; handle aqua "jump to here" scrollbar behaviour; correct
	computation of scroll view size and position; enforce min scrollbar
	height to avoid scrollbar component overlap; erase scrollbar area
	outside of standard width; remove broken auto-adjust code; account for
	window class when leaving space for grow box; remove code to manually
	draw grow box; use modern API for thumb scroll proc; replace
	HiliteControl() by modern API; replace control mgr constants with
	appearance mgr equivalents.

	* macosx/tkMacOSXSubwindows.c: use SetWindowBounds() API instead of
	SizeWindow(); invalidate clip regions after X{Map,Unmap}Window as fix
	for [Bug 940117] made them dependent on mapping state; remove unneeded
	calls to TkMacOSXInvalClipRgns() and unnecessary setting of QD port;
	use native-endian pixmap on intel; remove obsolete pixmap pix locking.

	* macosx/tkMacOSXWindowEvent.c: handle only the first of a batch of
	kEventAppAvailableWindowBoundsChanged events sent per transaction;
	handle kEventWindowBoundsChanged event to support live window resizing
	and centralized sending of location/size changed ConfigureNotify
	events; ensure HIGrowBox is redrawn after bounds change; constrain
	window after dragging to ensure titlebar is not inacessible
	offscreen or under dock/menubar; handle kEventWindowGetRegion and
	kEventWindowDrawContent for transparent windows to mark resp. paint
	content region as transparent; handle kEventWindowConstrain for
	fullscreen windows to ensure bounds match new screen size; enter/exit
	fullscreen UIMode upon activation/deactivation of fullscreen window.

	* macosx/tkMacOSXWm.c: use live-resize and async-drag carbon window
	* macosx/tkMacOSXWm.h: attributes for toplevels by default; implement
	new [wm attributes] -topmost, -transparent and -fullscreen; refactor
	WmAttributesCmd() parallelling the tkUnixWm.c implementation, use thus
	factored proc to set proxy icon from [wm iconbitmap]; dynamically
	determine default values for toplevel min and max sizes (similar to
	tkWinWm.c impl): min sizes depend on window class & attributes to
	ensure visibility of all titlebar widgets and grow box, max sizes
	depend on maximal window bounds for all active displays; factor out
	code that puts into effect changes to master or override_redirect; use
	RepositionWindow() API to determine staggered initial window bounds;
	correct resize limit calculations, handle gridding and use modern
	resize API in TkMacOSXGrowToplevel(); remove sending of ConfigureNotify
	after resize or zoom (now handled by BoundsChanged handler); correct
	composite carbon window attribute handling, remove currently unusable
	attributes and add new attributes in [tk::unsupported::MacWindowStyle];
	ensure validity of window class and attributes before use; apply
	changes to window class when handling carbon window attribute changes
	(if HIWindowChangeClass() API available); add debug build warning
	message when deprecated window style is used instead of window class;
	use transparent HIGrowBox for resizable windows; avoid unnecessary
	calls to window structure width API; use tcl time API in TkpGetMS();
	add TkMacOSXEnterExitFullscreen() to enter/exit UIMode with dock and
	menubar hidden; restrict wmTracing output to debug builds; remove
	unneeded calls to TkMacOSXInvalClipRgns() and unnecessary setting of QD
	port; workaround GetWindowStructureWidths() Carbon bug (bogus results
	for never-mapped floating windows).

	* macosx/tkMacOSXXStubs.c (TkMacOSXDisplayChanged): add maximal window
	bounds field to Screen record (in ext_data), computed as the union of
	available window positioning bounds of all graphics devices (displays).

	* macosx/tkMacOSXBitmap.c: fix macRoman encoding leak.
	* macosx/tkMacOSXCursor.c:

	* macosx/tkMacOSXDebug.c (TkMacOSXCarbonEventToAscii): use static
	* macosx/tkMacOSXDebug.h: buffer to simplify callers; const fixes.

	* macosx/tkMacOSXBitmap.c: use more efficient QDSwapPort() instead of
	* macosx/tkMacOSXButton.c: GetPort()/SetPort()/GetGWorld()/SetGWorld().
	* macosx/tkMacOSXDraw.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXScale.c:
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXColor.c: use kHIToolboxVersionNumber for runtime OS
	* macosx/tkMacOSXEntry.c: version check rather than Gestalt() etc.
	* macosx/tkMacOSXInt.h:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXDraw.c: remove obsolete and now incorrect
	* macosx/tkMacOSXInt.h:  tkMenuCascadeRgn clipping code.
	* macosx/tkMacOSXMenu.c:

	* macosx/tkMacOSXHLEvents.c: replace Tcl_GlobalEval() resp. Tcl_Eval()
	* macosx/tkMacOSXScrlbr.c:   by Tcl_EvalEx().
	* macosx/tkMacOSXInit.c:

	* macosx/tkMacOSXInit.c (TkpInit): reorder initialization steps.

	* macosx/tkMacOSXKeyEvent.c: remove pre-10.2 support.

	* macosx/tkMacOSXMenus.c: remove now useless call to
	TkMacOSXHandleTearoffMenu(); use \x.. quoting for non-latin1 macroman
	literar chars to allow file to be edited as utf-8.

	* macosx/tkMacOSXScale.c: replace TrackControl() by modern
	* macosx/tkMacOSXScrlbr.c: HandleControlClick() API (using new
	TkMacOSXModifierState()).

	* macosx/tkMacOSXInt.h:		move all constant #defines needed to
	* macosx/tkMacOSXColor.c:	support building on older OS X releases
	* macosx/tkMacOSXEvent.h:	to a central location in tkMacOSXInt.h.
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXWm.c:
	* macosx/ttkMacOSXTheme.c:

	* macosx/tkMacOSXInt.h:		 add ChkErr() macro to factor out
	* macosx/tkMacOSXButton.c:	 Carbon OSStatus return value checking
	* macosx/tkMacOSXCarbonEvents.c: and TkMacOSXDbgMsg() macro to factour
	* macosx/tkMacOSXClipboard.c:	 out debug message output; use these
	* macosx/tkMacOSXColor.c:	 macros to replace #ifdef TK_MAC_DEBUG
	* macosx/tkMacOSXCursor.c:	 blocks & direct printing to stderr,
	* macosx/tkMacOSXDebug.c:	 and to do additional OSStatus return
	* macosx/tkMacOSXDialog.c:	 checking, and to standardize OSStatus
	* macosx/tkMacOSXDraw.c:	 usage.
	* macosx/tkMacOSXEntry.c:
	* macosx/tkMacOSXEvent.c:
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXHLEvents.c:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXSubwindows.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXSend.c:	remove duplicate/unused declarations
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXDebug.c:	const fixes.
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXTest.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/Wish-Info.plist.in: add tcl document extensions/mime types and
	LSMinimumSystemVersion, LSRequiresCarbon & NSAppleScriptEnabled keys.

	* macosx/Wish-Common.xcconfig: add Wish's Info.plist as __info_plist
	section to tktest; enable more warnings.

	* macosx/Wish.xcodeproj/project.pbxproj: add 'DebugMemCompile' build
	configuration that calls configure with --enable-symbols=all; disable
	configure check for __attribute__((__visibility__("hidden"))) in Debug
	configuration to restore availability of ZeroLink.

	* macosx/Wish-Common.xcconfig:	fix whitespace.
	* macosx/Wish-Debug.xcconfig:
	* macosx/Wish-Release.xcconfig:
	* macosx/tkMacOSXAETE.r:
	* macosx/tkMacOSXConfig.c:
	* macosx/tkMacOSXCursors.r:
	* macosx/tkMacOSXKeyboard.c:
	* macosx/tkMacOSXSend.c:
	* macosx/ttkMacOSXTheme.c:
	* macosx/tkMacOSXXCursors.r:
	* macosx/README:

	* macosx/GNUmakefile:		fix/add copyright and license refs.
	* macosx/Tk-Info.plist.in:
	* macosx/Wish-Info.plist.in:
	* macosx/Wish.xcode/project.pbxproj:
	* macosx/Wish.xcodeproj/project.pbxproj:
	* macosx/tkMacOSX.h:

1 files changed, 84 insertions, 107 deletions

diff --git a/macosx/tkMacOSXSend.c b/macosx/tkMacOSXSend.c
index c9ef484..179beb6 100644
--- a/macosx/tkMacOSXSend.c
+++ b/macosx/tkMacOSXSend.c
@@ -1,49 +1,47 @@
-/* 
+/*
  * tkMacOSXSend.c --
  *
  *	This file provides procedures that implement the "send"
  *	command, allowing commands to be passed from interpreter
- *	to interpreter.  This current implementation for the Mac
+ *	to interpreter. This current implementation for the Mac
  *	has most functionality stubed out.
  *
  *	The current plan, which we have not had time to implement, is
  *	for the first Wish app to create a gestalt of type 'WIsH'.
  *	This gestalt will point to a table, in system memory, of
- *	Tk apps.  Each Tk app, when it starts up, will register their
- *	name, and process ID, in this table.  This will allow us to 
+ *	Tk apps. Each Tk app, when it starts up, will register their
+ *	name, and process ID, in this table. This will allow us to
  *	implement "tk appname".
  *
  *	Then the send command will look up the process id of the target
- *	app in this table, and send an AppleEvent to that process.  The
+ *	app in this table, and send an AppleEvent to that process. The
  *	AppleEvent handler is much like the do script handler, except that
- *      you have to specify the name of the tk app as well, since there may
+ *	you have to specify the name of the tk app as well, since there may
  *	be many interps in one wish app, and you need to send it to the
  *	right one.
  *
  *	Implementing this has been on our list of things to do, but what
- *	with the demise of Tcl at Sun, and the lack of resources at 
- *	Scriptics it may not get done for awhile.  So this sketch is
+ *	with the demise of Tcl at Sun, and the lack of resources at
+ *	Scriptics it may not get done for awhile. So this sketch is
  *	offered for the brave to attempt if they need the functionality...
  *
  * Copyright (c) 1989-1994 The Regents of the University of California.
  * Copyright (c) 1994-1998 Sun Microsystems, Inc.
  * Copyright 2001, Apple Computer, Inc.
+ * Copyright (c) 2005-2007 Daniel A. Steffen <das@users.sourceforge.net>
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXSend.c,v 1.5 2006/03/24 14:58:01 das Exp $
+ * RCS: @(#) $Id: tkMacOSXSend.c,v 1.6 2007/04/23 21:24:34 das Exp $
  */
 
 #include "tkMacOSXInt.h"
 
-MODULE_SCOPE int	Tk_SendObjCmd _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-
-     /* 
-      * The following structure is used to keep track of the
-      * interpreters registered by this process.
-      */
+/*
+ * The following structure is used to keep track of the
+ * interpreters registered by this process.
+ */
 
 typedef struct RegisteredInterp {
     char *name;			/* Interpreter's name (malloc-ed). */
@@ -60,7 +58,7 @@ typedef struct RegisteredInterp {
  * property "InterpRegistry" on the root window of the display.
  * It is organized as a series of zero or more concatenated strings
  * (in no particular order), each of the form
- * 	window space name '\0'
+ *	window space name '\0'
  * where "window" is the hex id of the comm. window to use to talk
  * to an interpreter named "name".
  *
@@ -79,14 +77,14 @@ typedef struct NameRegistry {
 				 * out when the NameRegistry is closed. */
     unsigned long propLength;	/* Length of the property, in bytes. */
     char *property;		/* The contents of the property, or NULL
-				 * if none.  See format description above;
+				 * if none. See format description above;
 				 * this is *not* terminated by the first
-				 * null character.  Dynamically allocated. */
+				 * null character. Dynamically allocated. */
     int allocedByX;		/* Non-zero means must free property with
-				 * XFree;  zero means use ckfree. */
+				 * XFree; zero means use ckfree. */
 } NameRegistry;
 
-static int initialized = false;	/* A flag to denote if we have initialized yet. */
+static int initialized = false; /* A flag to denote if we have initialized yet. */
 
 static RegisteredInterp *interpListPtr = NULL;
 /* List of all interpreters
@@ -94,78 +92,78 @@ static RegisteredInterp *interpListPtr = NULL;
 
      /*
       * The information below is used for communication between processes
-      * during "send" commands.  Each process keeps a private window, never
-      * even mapped, with one property, "Comm".  When a command is sent to
+      * during "send" commands. Each process keeps a private window, never
+      * even mapped, with one property, "Comm". When a command is sent to
       * an interpreter, the command is appended to the comm property of the
-      * communication window associated with the interp's process.  Similarly,
+      * communication window associated with the interp's process. Similarly,
       * when a result is returned from a sent command, it is also appended
       * to the comm property.
       *
-      * Each command and each result takes the form of ASCII text.  For a
+      * Each command and each result takes the form of ASCII text. For a
       * command, the text consists of a zero character followed by several
-      * null-terminated ASCII strings.  The first string consists of the
-      * single letter "c".  Subsequent strings have the form "option value"
+      * null-terminated ASCII strings. The first string consists of the
+      * single letter "c". Subsequent strings have the form "option value"
       * where the following options are supported:
       *
       * -r commWindow serial
       *
-      *	This option means that a response should be sent to the window
-      *	whose X identifier is "commWindow" (in hex), and the response should
-      *	be identified with the serial number given by "serial" (in decimal).
-      *	If this option isn't specified then the send is asynchronous and
-      *	no response is sent.
+      * This option means that a response should be sent to the window
+      * whose X identifier is "commWindow" (in hex), and the response should
+      * be identified with the serial number given by "serial" (in decimal).
+      * If this option isn't specified then the send is asynchronous and
+      * no response is sent.
       *
       * -n name
-      *	"Name" gives the name of the application for which the command is
-      *	intended.  This option must be present.
+      * "Name" gives the name of the application for which the command is
+      * intended. This option must be present.
       *
       * -s script
       *
-      *	"Script" is the script to be executed.  This option must be present.
+      * "Script" is the script to be executed. This option must be present.
       *
-      * The options may appear in any order.  The -n and -s options must be
-      * present, but -r may be omitted for asynchronous RPCs.  For compatibility
+      * The options may appear in any order. The -n and -s options must be
+      * present, but -r may be omitted for asynchronous RPCs. For compatibility
       * with future releases that may add new features, there may be additional
-      * options present;  as long as they start with a "-" character, they will
+      * options present; as long as they start with a "-" character, they will
       * be ignored.
       *
       * A result also consists of a zero character followed by several null-
-      * terminated ASCII strings.  The first string consists of the single
-      * letter "r".  Subsequent strings have the form "option value" where
+      * terminated ASCII strings. The first string consists of the single
+      * letter "r". Subsequent strings have the form "option value" where
       * the following options are supported:
       *
       * -s serial
       *
-      *	Identifies the command for which this is the result.  It is the
-      *	same as the "serial" field from the -s option in the command.  This
-      *	option must be present.
+      * Identifies the command for which this is the result. It is the
+      * same as the "serial" field from the -s option in the command. This
+      * option must be present.
       *
       * -c code
       *
-      *	"Code" is the completion code for the script, in decimal.  If the
-      *	code is omitted it defaults to TCL_OK.
+      * "Code" is the completion code for the script, in decimal. If the
+      * code is omitted it defaults to TCL_OK.
       *
       * -r result
       *
-      *	"Result" is the result string for the script, which may be either
-      *	a result or an error message.  If this field is omitted then it
-      *	defaults to an empty string.
+      * "Result" is the result string for the script, which may be either
+      * a result or an error message. If this field is omitted then it
+      * defaults to an empty string.
       *
       * -i errorInfo
       *
-      *	"ErrorInfo" gives a string with which to initialize the errorInfo
-      *	variable.  This option may be omitted;  it is ignored unless the
-      *	completion code is TCL_ERROR.
+      * "ErrorInfo" gives a string with which to initialize the errorInfo
+      * variable. This option may be omitted; it is ignored unless the
+      * completion code is TCL_ERROR.
       *
       * -e errorCode
       *
-      *	"ErrorCode" gives a string with with to initialize the errorCode
-      *	variable.  This option may be omitted;  it is ignored  unless the
-      *	completion code is TCL_ERROR.
+      * "ErrorCode" gives a string with with to initialize the errorCode
+      * variable. This option may be omitted; it is ignored  unless the
+      * completion code is TCL_ERROR.
       *
       * Options may appear in any order, and only the -s option must be
-      * present.  As with commands, there may be additional options besides
-      * these;  unknown options are ignored.
+      * present. As with commands, there may be additional options besides
+      * these; unknown options are ignored.
       */
 
      /*
@@ -179,29 +177,8 @@ static RegisteredInterp *interpListPtr = NULL;
  * Forward declarations for procedures defined later in this file:
  */
 
-static int		SendInit _ANSI_ARGS_((Tcl_Interp *interp));
-/*
-static int		AppendErrorProc _ANSI_ARGS_((ClientData clientData,
-				XErrorEvent *errorPtr));
-static void		DeleteProc _ANSI_ARGS_((ClientData clientData));
-static void		RegAddName _ANSI_ARGS_((NameRegistry *regPtr,
-				char *name, Window commWindow));
-static void		RegClose _ANSI_ARGS_((NameRegistry *regPtr));
-static void		RegDeleteName _ANSI_ARGS_((NameRegistry *regPtr,
-	      		        char *name));
-static Window		RegFindName _ANSI_ARGS_((NameRegistry *regPtr,
-				char *name));
-static NameRegistry *	RegOpen _ANSI_ARGS_((Tcl_Interp *interp,
-			     TkWindow *winPtr, int lock));
-static void		SendEventProc _ANSI_ARGS_((ClientData clientData,
-							   XEvent *eventPtr));
-static Bool		SendRestrictProc _ANSI_ARGS_((Display *display,
-			      XEvent *eventPtr, char *arg));
-static int		ServerSecure _ANSI_ARGS_((TkDisplay *dispPtr));
-static void		TimeoutProc _ANSI_ARGS_((ClientData clientData));
-static int		ValidateName _ANSI_ARGS_((TkDisplay *dispPtr,
-			     char *name, Window commWindow, int oldOK));
-*/
+static int SendInit(Tcl_Interp *interp);
+
 
 /*
  *--------------------------------------------------------------
@@ -209,20 +186,20 @@ static int		ValidateName _ANSI_ARGS_((TkDisplay *dispPtr,
  * Tk_SetAppName --
  *
  *	This procedure is called to associate an ASCII name with a Tk
- *	application.  If the application has already been named, the
+ *	application. If the application has already been named, the
  *	name replaces the old one.
  *
  * Results:
  *	The return value is the name actually given to the application.
  *	This will normally be the same as name, but if name was already
  *	in use for an application then a name of the form "name #2" will
- *	be chosen,  with a high enough number to make the name unique.
+ *	be chosen, with a high enough number to make the name unique.
  *
  * Side effects:
  *	Registration info is saved, thereby allowing the "send" command
- *	to be used later to invoke commands in the application.  In
+ *	to be used later to invoke commands in the application. In
  *	addition, the "send" command is created in the application's
- *	interpreter.  The registration will be removed automatically
+ *	interpreter. The registration will be removed automatically
  *	if the interpreter is deleted or the "send" command is removed.
  *
  *--------------------------------------------------------------
@@ -231,18 +208,18 @@ static int		ValidateName _ANSI_ARGS_((TkDisplay *dispPtr,
 CONST char *
 Tk_SetAppName(
     Tk_Window tkwin,		/* Token for any window in the application
-				 * to be named:  it is just used to identify
-				 * the application and the display.  */
+				 * to be named:	 it is just used to identify
+				 * the application and the display. */
     CONST char *name)			/* The name that will be used to
 				 * refer to the interpreter in later
-				 * "send" commands.  Must be globally
+				 * "send" commands. Must be globally
 				 * unique. */
 {
     TkWindow *winPtr = (TkWindow *) tkwin;
     Tcl_Interp *interp = winPtr->mainPtr->interp;
     int i, suffix, offset, result;
     RegisteredInterp *riPtr, *prevPtr;
-    CONST char *actualName;
+    const char *actualName;
     Tcl_DString dString;
     Tcl_Obj *resultObjPtr, *interpNamePtr;
     char *interpName;
@@ -257,7 +234,7 @@ Tk_SetAppName(
      * will take care of disposing of this entry.
      */
 
-    for (riPtr = interpListPtr, prevPtr = NULL; riPtr != NULL; 
+    for (riPtr = interpListPtr, prevPtr = NULL; riPtr != NULL;
 	    prevPtr = riPtr, riPtr = riPtr->nextPtr) {
 	if (riPtr->interp == interp) {
 	    if (prevPtr == NULL) {
@@ -270,8 +247,8 @@ Tk_SetAppName(
     }
 
     /*
-     * Pick a name to use for the application.  Use "name" if it's not
-     * already in use.  Otherwise add a suffix such as " #2", trying
+     * Pick a name to use for the application. Use "name" if it's not
+     * already in use. Otherwise add a suffix such as " #2", trying
      * larger and larger numbers until we eventually find one that is
      * unique.
      */
@@ -289,7 +266,7 @@ Tk_SetAppName(
 	if (interpNamePtr == NULL) {
 	    break;
 	}
-	interpName = Tcl_GetStringFromObj(interpNamePtr, NULL);
+	interpName = Tcl_GetString(interpNamePtr);
 	if (strcmp(actualName, interpName) == 0) {
 	    if (suffix == 1) {
 		Tcl_DStringAppend(&dString, name, -1);
@@ -320,7 +297,7 @@ Tk_SetAppName(
     interpListPtr = riPtr;
     strcpy(riPtr->name, actualName);
 
-    Tcl_CreateObjCommand(interp, "send", Tk_SendObjCmd, 
+    Tcl_CreateObjCommand(interp, "send", Tk_SendObjCmd,
 	    (ClientData) riPtr, NULL /* TODO: DeleteProc */);
     if (Tcl_IsSafe(interp)) {
 	Tcl_HideCommand(interp, "send", "send");
@@ -354,7 +331,7 @@ Tk_SendObjCmd(
     int objc,			/* Number of arguments */
     Tcl_Obj *CONST objv[])	/* The arguments */
 {
-    CONST char *sendOptions[] = {"-async", "-displayof", "-", (char *) NULL};
+    const char *sendOptions[] = {"-async", "-displayof", "-", NULL};
     char *stringRep, *destName;
     int async = 0;
     int i, index, firstArg;
@@ -363,7 +340,7 @@ Tk_SendObjCmd(
     int result = TCL_OK;
 
     for (i = 1; i < (objc - 1); ) {
-	stringRep = Tcl_GetStringFromObj(objv[i], NULL);
+	stringRep = Tcl_GetString(objv[i]);
 	if (stringRep[0] == '-') {
 	    if (Tcl_GetIndexFromObj(interp, objv[i], sendOptions, "option", 0,
 		    &index) != TCL_OK) {
@@ -381,32 +358,32 @@ Tk_SendObjCmd(
 	    break;
 	}
     }
-	
+
     if (objc < (i + 2)) {
 	Tcl_WrongNumArgs(interp, 1, objv,
 		"?options? interpName arg ?arg ...?");
 	return TCL_ERROR;
     }
 
-    destName = Tcl_GetStringFromObj(objv[i], NULL);
+    destName = Tcl_GetString(objv[i]);
     firstArg = i + 1;
 
     resultPtr = Tcl_GetObjResult(interp);
 
     /*
-     * See if the target interpreter is local.  If so, execute
+     * See if the target interpreter is local. If so, execute
      * the command directly without going through the DDE server.
      * The only tricky thing is passing the result from the target
-     * interpreter to the invoking interpreter.  Watch out:  they
+     * interpreter to the invoking interpreter. Watch out:  they
      * could be the same!
      */
 
-    for (riPtr = interpListPtr; (riPtr != NULL) 
+    for (riPtr = interpListPtr; (riPtr != NULL)
 	    && (strcmp(destName, riPtr->name)); riPtr = riPtr->nextPtr) {
 	/*
 	 * Empty loop body.
 	 */
-    
+
     }
 
     if (riPtr != NULL) {
@@ -442,16 +419,16 @@ Tk_SendObjCmd(
 
 		/*
 		 * An error occurred, so transfer error information from the
-		 * destination interpreter back to our interpreter.  Must clear
+		 * destination interpreter back to our interpreter. Must clear
 		 * interp's result before calling Tcl_AddErrorInfo, since
 		 * Tcl_AddErrorInfo will store the interp's result in errorInfo
-		 * before appending riPtr's $errorInfo;  we've already got
+		 * before appending riPtr's $errorInfo; we've already got
 		 * everything we need in riPtr's $errorInfo.
 		 */
 
 		Tcl_ResetResult(interp);
 		Tcl_AddErrorInfo(interp, Tcl_GetVar2(localInterp,
-			"errorInfo", (char *) NULL, TCL_GLOBAL_ONLY));
+			"errorInfo", NULL, TCL_GLOBAL_ONLY));
 		/* errorObjPtr = Tcl_GetObjVar2(localInterp, "errorCode", NULL,
 			TCL_GLOBAL_ONLY);
 		Tcl_SetObjErrorCode(interp, errorObjPtr); */
@@ -480,9 +457,9 @@ Tk_SendObjCmd(
  *	of a particular window.
  *
  * Results:
- *	A standard Tcl return value.  Interp->result will be set
+ *	A standard Tcl return value. Interp->result will be set
  *	to hold a list of all the interpreter names defined for
- *	tkwin's display.  If an error occurs, then TCL_ERROR
+ *	tkwin's display. If an error occurs, then TCL_ERROR
  *	is returned and interp->result will hold an error message.
  *
  * Side effects:
@@ -503,11 +480,11 @@ TkGetInterpNames(
     listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
     riPtr = interpListPtr;
     while (riPtr != NULL) {
-	Tcl_ListObjAppendElement(interp, listObjPtr, 
+	Tcl_ListObjAppendElement(interp, listObjPtr,
 		Tcl_NewStringObj(riPtr->name, -1));
 	riPtr = riPtr->nextPtr;
     }
-    
+
     Tcl_SetObjResult(interp, listObjPtr);
     return TCL_OK;
 }