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

	* macosx/tkMacOSXEvent.c:	 handler for all kEventClassWindow and
	* macosx/tkMacOSXEvent.h:	 kEventClassMouse events; move all
	* macosx/tkMacOSXNotify.c:	 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
	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
	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; disable broken QD stippling.

	* macosx/tkMacOSXMenu.c:		large-scale rewrite of custom
	* macosx/tkMacOSXMenu.r (removed):	MDEF and related code that
	* unix/Makefile.in:			restores many longtime-MIA
	features to working order (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/tkMacOSXFont.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/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/tkMacOSXAETE.r:	fix whitespace.
	* macosx/tkMacOSXConfig.c:
	* macosx/tkMacOSXCursors.r:
	* macosx/tkMacOSXKeyboard.c:
	* macosx/tkMacOSXSend.c:
	* macosx/tkMacOSXXCursors.r:
	* macosx/README:

	* macosx/Makefile:		fix/add copyright and license refs.
	* macosx/Tk-Info.plist.in:
	* macosx/Wish-Info.plist.in:
	* macosx/tkMacOSX.h:

1 files changed, 165 insertions, 166 deletions

diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c
index e40312d..8009173 100644
--- a/macosx/tkMacOSXClipboard.c
+++ b/macosx/tkMacOSXClipboard.c
@@ -1,15 +1,16 @@
 /*
  * tkMacOSXClipboard.c --
  *
- *         This file manages the clipboard for the Tk toolkit.
+ *	This file manages the clipboard for the Tk toolkit.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  * Copyright 2001, Apple Computer, Inc.
+ * Copyright (c) 2006-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: tkMacOSXClipboard.c,v 1.2.2.5 2007/01/19 00:41:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXClipboard.c,v 1.2.2.6 2007/04/29 02:26:48 das Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -21,66 +22,66 @@
  *
  * TkSelGetSelection --
  *
- *        Retrieve the specified selection from another process.  For
- *        now, only fetching XA_STRING from CLIPBOARD is supported.
- *        Eventually other types should be allowed.
- * 
+ *	Retrieve the specified selection from another process. For
+ *	now, only fetching XA_STRING from CLIPBOARD is supported.
+ *	Eventually other types should be allowed.
+ *
  * 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 the interp's result.
+ *	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 the interp's result.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
 int
 TkSelGetSelection(
-    Tcl_Interp *interp,                /* Interpreter to use for reporting
-                                 * errors. */
-    Tk_Window tkwin,                /* Window on whose behalf to retrieve
-                                 * the selection (determines display
-                                 * from which to retrieve). */
-    Atom selection,                /* Selection to retrieve. */
-    Atom target,                /* Desired form in which selection
-                                 * is to be returned. */
-    Tk_GetSelProc *proc,        /* Procedure to call to process the
-                                 * selection, once it has been retrieved. */
-    ClientData clientData)        /* Arbitrary value to pass to proc. */
+    Tcl_Interp *interp,		/* Interpreter to use for reporting errors. */
+    Tk_Window tkwin,		/* Window on whose behalf to retrieve the
+				 * selection (determines display from which to
+				 * retrieve). */
+    Atom selection,		/* Selection to retrieve. */
+    Atom target,		/* Desired form in which selection is to be
+				 * returned. */
+    Tk_GetSelProc *proc,	/* Procedure to call to process the selection,
+				 * once it has been retrieved. */
+    ClientData clientData)	/* Arbitrary value to pass to proc. */
 {
     int result;
-    int err;
+    OSStatus err;
     long length;
     ScrapRef scrapRef;
-    char * buf;
+    char *buf;
 
     if ((selection == Tk_InternAtom(tkwin, "CLIPBOARD"))
-            && (target == XA_STRING)) {
-        /* 
-         * Get the scrap from the Macintosh global clipboard.
-         */
-         
-        err = GetCurrentScrap(&scrapRef);
-        if (err != noErr) {
-            Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection),
-                " GetCurrentScrap failed.", (char *) NULL);
-            return TCL_ERROR;
-        }
+	    && (target == XA_STRING)) {
+	/*
+	 * Get the scrap from the Macintosh global clipboard.
+	 */
+
+	err = ChkErr(GetCurrentScrap, &scrapRef);
+	if (err != noErr) {
+	    Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection),
+		    " GetCurrentScrap failed.", NULL);
+	    return TCL_ERROR;
+	}
 
 	/*
 	 * Try UNICODE first
 	 */
-        err = GetScrapFlavorSize(scrapRef, kScrapFlavorTypeUnicode, &length);
-        if (err == noErr && length > 0) {
+	err = ChkErr(GetScrapFlavorSize, scrapRef, kScrapFlavorTypeUnicode,
+		&length);
+	if (err == noErr && length > 0) {
 	    Tcl_DString ds;
 	    char *data;
 
 	    buf = (char *) ckalloc(length + 2);
 	    buf[length] = 0;
 	    buf[length+1] = 0; /* 2-byte unicode null */
-	    err = GetScrapFlavorData(scrapRef, kScrapFlavorTypeUnicode,
+	    err = ChkErr(GetScrapFlavorData, scrapRef, kScrapFlavorTypeUnicode,
 		    &length, buf);
 	    if (err == noErr) {
 		Tcl_DStringInit(&ds);
@@ -98,49 +99,49 @@ TkSelGetSelection(
 	    }
 	}
 
-        err = GetScrapFlavorSize(scrapRef, 'TEXT', &length);
-        if (err != noErr) {
-            Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection),
-                " GetScrapFlavorSize failed.", (char *) NULL);
-            return TCL_ERROR;
-        }
-        if (length > 0) {
-            Tcl_DString encodedText;
-            char *data;
-
-            buf = (char *) ckalloc(length + 1);
+	err = ChkErr(GetScrapFlavorSize, scrapRef, 'TEXT', &length);
+	if (err != noErr) {
+	    Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection),
+		    " GetScrapFlavorSize failed.", NULL);
+	    return TCL_ERROR;
+	}
+	if (length > 0) {
+	    Tcl_DString encodedText;
+	    char *data;
+
+	    buf = (char *) ckalloc(length + 1);
 	    buf[length] = 0;
-	    err = GetScrapFlavorData(scrapRef, 'TEXT', &length, buf);
-            if (err != noErr) {
-                    Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection),
-                        " GetScrapFlavorData failed.", (char *) NULL);
-                    return TCL_ERROR;
-            }
-            
-            /* 
-             * Tcl expects '\n' not '\r' as the line break character.
-             */
-
-            for (data = buf; *data != '\0'; data++) {
-                if (*data == '\r') {
-                    *data = '\n';
-                }
-            }
-            
-            Tcl_ExternalToUtfDString(TkMacOSXCarbonEncoding, buf, length, 
-				     &encodedText);
-            result = (*proc)(clientData, interp,
-                    Tcl_DStringValue(&encodedText));
-            Tcl_DStringFree(&encodedText);
-
-            ckfree(buf);
-            return result;
-        }
+	    err = ChkErr(GetScrapFlavorData, scrapRef, 'TEXT', &length, buf);
+	    if (err != noErr) {
+		    Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection),
+			" GetScrapFlavorData failed.", NULL);
+		    return TCL_ERROR;
+	    }
+
+	    /*
+	     * Tcl expects '\n' not '\r' as the line break character.
+	     */
+
+	    for (data = buf; *data != '\0'; data++) {
+		if (*data == '\r') {
+		    *data = '\n';
+		}
+	    }
+
+	    Tcl_ExternalToUtfDString(TkMacOSXCarbonEncoding, buf, length,
+		    &encodedText);
+	    result = (*proc)(clientData, interp,
+		    Tcl_DStringValue(&encodedText));
+	    Tcl_DStringFree(&encodedText);
+
+	    ckfree(buf);
+	    return result;
+	}
     }
-    
+
     Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection),
-        " selection doesn't exist or form \"", Tk_GetAtomName(tkwin, target),
-        "\" not defined", (char *) NULL);
+	    " selection doesn't exist or form \"",
+	    Tk_GetAtomName(tkwin, target), "\" not defined", NULL);
     return TCL_ERROR;
 }
 
@@ -149,25 +150,25 @@ TkSelGetSelection(
  *
  * TkSetSelectionOwner --
  *
- *        This function claims ownership of the specified selection.
- *        If the selection is CLIPBOARD, then we empty the system
- *        clipboard.
+ *	This function claims ownership of the specified selection.
+ *	If the selection is CLIPBOARD, then we empty the system
+ *	clipboard.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
 void
 XSetSelectionOwner(
-    Display* display,        /* X Display. */
-    Atom selection,        /* What selection to own. */
-    Window owner,        /* Window to be the owner. */
-    Time time)                /* The current time? */
+    Display *display,		/* X Display. */
+    Atom selection,		/* What selection to own. */
+    Window owner,		/* Window to be the owner. */
+    Time time)			/* The current time? */
 {
     Tk_Window tkwin;
     TkDisplay *dispPtr;
@@ -180,17 +181,16 @@ XSetSelectionOwner(
     tkwin = (Tk_Window) TkGetMainInfoList()->winPtr;
 
     if (selection == Tk_InternAtom(tkwin, "CLIPBOARD")) {
+	/*
+	 * Only claim and empty the clipboard if we aren't already the
+	 * owner of the clipboard.
+	 */
 
-        /*
-         * Only claim and empty the clipboard if we aren't already the
-         * owner of the clipboard.
-         */
-
-        dispPtr = TkGetMainInfoList()->winPtr->dispPtr;
-        if (dispPtr->clipboardActive) {
-            return;
-        }
-        ClearCurrentScrap();
+	dispPtr = TkGetMainInfoList()->winPtr->dispPtr;
+	if (dispPtr->clipboardActive) {
+	    return;
+	}
+	ClearCurrentScrap();
     }
 }
 
@@ -199,23 +199,24 @@ XSetSelectionOwner(
  *
  * TkSelUpdateClipboard --
  *
- *        This function is called to force the clipboard to be updated
- *        after new data is added.  On the Mac we don't need to do
- *        anything.
+ *	This function is called to force the clipboard to be updated
+ *	after new data is added. On the Mac we don't need to do
+ *	anything.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
 void
 TkSelUpdateClipboard(
-    TkWindow *winPtr,                        /* Window associated with clipboard. */
-    TkClipboardTarget *targetPtr)        /* Info about the content. */
+    TkWindow *winPtr,		/* Window associated with clipboard. */
+    TkClipboardTarget *targetPtr)
+				/* Info about the content. */
 {
 }
 
@@ -224,28 +225,26 @@ TkSelUpdateClipboard(
  *
  * TkSelEventProc --
  *
- *        This procedure is invoked whenever a selection-related
- *        event occurs. 
+ *	This procedure is invoked whenever a selection-related
+ *	event occurs.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        Lots:  depends on the type of event.
+ *	Lots: depends on the type of event.
  *
  *--------------------------------------------------------------
  */
 
 void
 TkSelEventProc(
-    Tk_Window tkwin,                /* Window for which event was
-                                 * targeted. */
-    register XEvent *eventPtr)        /* X event:  either SelectionClear,
-                                 * SelectionRequest, or
-                                 * SelectionNotify. */
+    Tk_Window tkwin,		/* Window for which event was targeted. */
+    register XEvent *eventPtr)	/* X event: either SelectionClear,
+				 * SelectionRequest, or SelectionNotify. */
 {
     if (eventPtr->type == SelectionClear) {
-        TkSelClearSelection(tkwin, eventPtr);
+	TkSelClearSelection(tkwin, eventPtr);
     }
 }
 
@@ -254,22 +253,22 @@ TkSelEventProc(
  *
  * TkSelPropProc --
  *
- *        This procedure is invoked when property-change events
- *        occur on windows not known to the toolkit.  This is a stub
- *        function under Windows.
+ *	This procedure is invoked when property-change events
+ *	occur on windows not known to the toolkit. This is a stub
+ *	function under Windows.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
 void
 TkSelPropProc(
-    register XEvent *eventPtr)                /* X PropertyChange event. */
+    register XEvent *eventPtr)	/* X PropertyChange event. */
 {
 }
 
@@ -278,20 +277,20 @@ TkSelPropProc(
  *
  * TkSuspendClipboard --
  *
- *        Handle clipboard conversion as required by the suppend event.
- *        This function is also called on exit.
+ *	Handle clipboard conversion as required by the suppend event.
+ *	This function is also called on exit.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        The local scrap is moved to the global scrap.
+ *	The local scrap is moved to the global scrap.
  *
  *----------------------------------------------------------------------
  */
 
 void
-TkSuspendClipboard()
+TkSuspendClipboard(void)
 {
     TkClipboardTarget *targetPtr;
     TkClipboardBuffer *cbPtr;
@@ -302,50 +301,50 @@ TkSuspendClipboard()
 
     dispPtr = TkGetDisplayList();
     if ((dispPtr == NULL) || !dispPtr->clipboardActive) {
-        return;
+	return;
     }
 
     for (targetPtr = dispPtr->clipTargetPtr; targetPtr != NULL;
-            targetPtr = targetPtr->nextPtr) {
-        if (targetPtr->type == XA_STRING)
-            break;
+	    targetPtr = targetPtr->nextPtr) {
+	if (targetPtr->type == XA_STRING) {
+	    break;
+	}
     }
     if (targetPtr != NULL) {
-        Tcl_DString encodedText;
-	Tcl_DString unicodedText;	  
-
-        length = 0;
-        for (cbPtr = targetPtr->firstBufferPtr; cbPtr != NULL;
-                cbPtr = cbPtr->nextPtr) {
-            length += cbPtr->length;
-        }
-
-        buffer = ckalloc(length);
-        buffPtr = buffer;
-        for (cbPtr = targetPtr->firstBufferPtr; cbPtr != NULL;
-                cbPtr = cbPtr->nextPtr) {
-            for (p = cbPtr->buffer, endPtr = p + cbPtr->length;
-                    p < endPtr; p++) {
-                if (*p == '\n') {
-                    *buffPtr++ = '\r';
-                } else {
-                    *buffPtr++ = *p;
-                }
-            }
-        }
-
-        ClearCurrentScrap();
-        GetCurrentScrap(&scrapRef);
-        Tcl_UtfToExternalDString(TkMacOSXCarbonEncoding, buffer, 
-                length, &encodedText);
-        PutScrapFlavor(scrapRef, 'TEXT', 0, 
-                Tcl_DStringLength(&encodedText), 
-                Tcl_DStringValue(&encodedText) );
-        Tcl_DStringFree(&encodedText);
+	Tcl_DString encodedText, unicodedText;
+
+	length = 0;
+	for (cbPtr = targetPtr->firstBufferPtr; cbPtr != NULL;
+		cbPtr = cbPtr->nextPtr) {
+	    length += cbPtr->length;
+	}
+
+	buffer = ckalloc(length);
+	buffPtr = buffer;
+	for (cbPtr = targetPtr->firstBufferPtr; cbPtr != NULL;
+		cbPtr = cbPtr->nextPtr) {
+	    for (p = cbPtr->buffer, endPtr = p + cbPtr->length;
+		    p < endPtr; p++) {
+		if (*p == '\n') {
+		    *buffPtr++ = '\r';
+		} else {
+		    *buffPtr++ = *p;
+		}
+	    }
+	}
+
+	ClearCurrentScrap();
+	GetCurrentScrap(&scrapRef);
+	Tcl_UtfToExternalDString(TkMacOSXCarbonEncoding, buffer, length,
+		&encodedText);
+	PutScrapFlavor(scrapRef, 'TEXT', 0, Tcl_DStringLength(&encodedText),
+		Tcl_DStringValue(&encodedText));
+	Tcl_DStringFree(&encodedText);
 
 	/*
-	 * Also put unicode data on scrap
+	 * Also put unicode data on scrap.
 	 */
+
 	Tcl_DStringInit(&unicodedText);
 	Tcl_UtfToUniCharDString(buffer, length, &unicodedText);
 	PutScrapFlavor(scrapRef, kScrapFlavorTypeUnicode, 0,
@@ -353,19 +352,19 @@ TkSuspendClipboard()
 		Tcl_DStringValue(&unicodedText));
 	Tcl_DStringFree(&unicodedText);
 
-        ckfree(buffer);
+	ckfree(buffer);
     }
 
     /*
-     * The system now owns the scrap.  We tell Tk that it has
+     * The system now owns the scrap. We tell Tk that it has
      * lost the selection so that it will look for it the next time
-     * it needs it.  (Window list NULL if quiting.)
+     * it needs it. (Window list NULL if quiting.)
      */
 
     if (TkGetMainInfoList() != NULL) {
-        Tk_ClearSelection((Tk_Window) TkGetMainInfoList()->winPtr, 
-                Tk_InternAtom((Tk_Window) TkGetMainInfoList()->winPtr,
-                        "CLIPBOARD"));
+	Tk_ClearSelection((Tk_Window) TkGetMainInfoList()->winPtr,
+		Tk_InternAtom((Tk_Window) TkGetMainInfoList()->winPtr,
+		"CLIPBOARD"));
     }
 
     return;