minor improvements in legibility

1 files changed, 313 insertions, 318 deletions

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 57bd33b..093e842 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1,8 +1,8 @@
 /*
  * tkMacOSXWindowEvent.c --
  *
- *	This file defines the routines for both creating and handling
- *	Window Manager class events for Tk.
+ *	This file defines the routines for both creating and handling Window
+ *	Manager class events for Tk.
  *
  * Copyright 2001, Apple Computer, Inc.
  * Copyright (c) 2005-2007 Daniel A. Steffen <das@users.sourceforge.net>
@@ -11,50 +11,44 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  *	The following terms apply to all files originating from Apple
- *	Computer, Inc. ("Apple") and associated with the software
- *	unless explicitly disclaimed in individual files.
- *
- *
- *	Apple hereby grants permission to use, copy, modify,
- *	distribute, and license this software and its documentation
- *	for any purpose, provided that existing copyright notices are
- *	retained in all copies and that this notice is included
- *	verbatim in any distributions. No written agreement, license,
- *	or royalty fee is required for any of the authorized
- *	uses. Modifications to this software may be copyrighted by
- *	their authors and need not follow the licensing terms
- *	described here, provided that the new terms are clearly
- *	indicated on the first page of each file where they apply.
- *
- *
- *	IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE
- *	SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
- *	INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
- *	THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
- *	EVEN IF APPLE OR THE AUTHORS HAVE BEEN ADVISED OF THE
- *	POSSIBILITY OF SUCH DAMAGE.  APPLE, THE AUTHORS AND
- *	DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
- *	BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
- *	FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.	 THIS
- *	SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND APPLE,THE
- *	AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
+ *	Computer, Inc. ("Apple") and associated with the software unless
+ *	explicitly disclaimed in individual files.
+ *
+ *	Apple hereby grants permission to use, copy, modify, distribute, and
+ *	license this software and its documentation for any purpose, provided
+ *	that existing copyright notices are retained in all copies and that
+ *	this notice is included verbatim in any distributions. No written
+ *	agreement, license, or royalty fee is required for any of the
+ *	authorized uses. Modifications to this software may be copyrighted by
+ *	their authors and need not follow the licensing terms described here,
+ *	provided that the new terms are clearly indicated on the first page of
+ *	each file where they apply.
+ *
+ *	IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE SOFTWARE
+ *	BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+ *	CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS
+ *	DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF APPLE OR THE
+ *	AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  APPLE,
+ *	THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+ *	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
+ *	NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND
+ *	APPLE, THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
  *	MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
- *	GOVERNMENT USE: If you are acquiring this software on behalf
- *	of the U.S. government, the Government shall have only
- *	"Restricted Rights" in the software and related documentation
- *	as defined in the Federal Acquisition Regulations (FARs) in
- *	Clause 52.227.19 (c) (2).  If you are acquiring the software
- *	on behalf of the Department of Defense, the software shall be
- *	classified as "Commercial Computer Software" and the
- *	Government shall have only "Restricted Rights" as defined in
- *	Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- *	foregoing, the authors grant the U.S. Government and others
- *	acting in its behalf permission to use and distribute the
- *	software in accordance with the terms specified in this
- *	license.
- *
- * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.32 2008/06/19 00:11:08 das Exp $
+ *	GOVERNMENT USE: If you are acquiring this software on behalf of the
+ *	U.S. government, the Government shall have only "Restricted Rights" in
+ *	the software and related documentation as defined in the Federal
+ *	Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you are
+ *	acquiring the software on behalf of the Department of Defense, the
+ *	software shall be classified as "Commercial Computer Software" and the
+ *	Government shall have only "Restricted Rights" as defined in Clause
+ *	252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
+ *	authors grant the U.S. Government and others acting in its behalf
+ *	permission to use and distribute the software in accordance with the
+ *	terms specified in this license.
+ *
+ * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.33 2008/10/05 21:26:11 dkf Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -72,20 +66,19 @@
  * Declaration of functions used only in this file
  */
 
-static int GenerateUpdateEvent(Window window);
-static int GenerateUpdates(HIMutableShapeRef updateRgn, CGRect *updateBounds,
-	TkWindow *winPtr);
-static int GenerateActivateEvents(Window window, int activeFlag);
-static void ClearPort(CGrafPtr port, HIShapeRef updateRgn);
-
+static int		GenerateUpdateEvent(Window window);
+static int		GenerateUpdates(HIMutableShapeRef updateRgn,
+			    CGRect *updateBounds, TkWindow *winPtr);
+static int		GenerateActivateEvents(Window window, int activeFlag);
+static void		ClearPort(CGrafPtr port, HIShapeRef updateRgn);
 
 /*
  *----------------------------------------------------------------------
  *
  * TkMacOSXProcessApplicationEvent --
  *
- *	This processes Application level events, mainly activate
- *	and deactivate.
+ *	This processes Application level events, mainly activate and
+ *	deactivate.
  *
  * Results:
  *	0.
@@ -98,8 +91,8 @@ static void ClearPort(CGrafPtr port, HIShapeRef updateRgn);
 
 MODULE_SCOPE int
 TkMacOSXProcessApplicationEvent(
-	TkMacOSXEvent *eventPtr,
-	MacEventStatus *statusPtr)
+    TkMacOSXEvent *eventPtr,
+    MacEventStatus *statusPtr)
 {
     Tcl_CmdInfo dummy;
 
@@ -109,60 +102,61 @@ TkMacOSXProcessApplicationEvent(
      * the "show" proc when we have been hidden already, not as a substitute
      * for <Activate>. So I use this toggle...
      */
+
     static int toggleHide = 0;
 
     switch (eventPtr->eKind) {
-	case kEventAppActivated:
-	    ShowFloatingWindows();
-	    break;
-	case kEventAppDeactivated:
-	    TkSuspendClipboard();
-	    HideFloatingWindows();
-	    break;
-	case kEventAppQuit:
-	    statusPtr->stopProcessing = 1;
-	    break;
-	case kEventAppHidden:
-	    if (toggleHide == 0) {
-		toggleHide = 1;
-		if (eventPtr->interp && Tcl_GetCommandInfo(eventPtr->interp,
-			"::tk::mac::OnHide", &dummy)) {
-		    Tcl_GlobalEval(eventPtr->interp, "::tk::mac::OnHide");
-		}
-	    }
-	    statusPtr->stopProcessing = 1;
-	    break;
-	case kEventAppShown:
-	    if (toggleHide == 1) {
-		toggleHide = 0;
-		if (eventPtr->interp && Tcl_GetCommandInfo(eventPtr->interp,
-			"::tk::mac::OnShow", &dummy)) {
-		    Tcl_GlobalEval(eventPtr->interp, "::tk::mac::OnShow");
-		}
+    case kEventAppActivated:
+	ShowFloatingWindows();
+	break;
+    case kEventAppDeactivated:
+	TkSuspendClipboard();
+	HideFloatingWindows();
+	break;
+    case kEventAppQuit:
+	statusPtr->stopProcessing = 1;
+	break;
+    case kEventAppHidden:
+	if (toggleHide == 0) {
+	    toggleHide = 1;
+	    if (eventPtr->interp && Tcl_GetCommandInfo(eventPtr->interp,
+		    "::tk::mac::OnHide", &dummy)) {
+		Tcl_GlobalEval(eventPtr->interp, "::tk::mac::OnHide");
 	    }
-	    statusPtr->stopProcessing = 1;
-	    break;
-	case kEventAppAvailableWindowBoundsChanged: {
-	    static UInt32 prevId = 0;
-	    UInt32 id;
-	    OSStatus err;
-
-	    err = ChkErr(GetEventParameter, eventPtr->eventRef,
-		    kEventParamTransactionID, typeUInt32,
-		    NULL, sizeof(id), NULL, &id);
-	    if (err != noErr || id != prevId) {
-		TkDisplay *dispPtr = TkGetDisplayList();
-
-		prevId = id;
-		TkMacOSXDisplayChanged(dispPtr->display);
+	}
+	statusPtr->stopProcessing = 1;
+	break;
+    case kEventAppShown:
+	if (toggleHide == 1) {
+	    toggleHide = 0;
+	    if (eventPtr->interp && Tcl_GetCommandInfo(eventPtr->interp,
+		    "::tk::mac::OnShow", &dummy)) {
+		Tcl_GlobalEval(eventPtr->interp, "::tk::mac::OnShow");
 	    }
-	    /*
-	     * Should we call ::tk::mac::OnDisplayChanged?
-	     */
-	    break;
 	}
-	default:
-	    break;
+	statusPtr->stopProcessing = 1;
+	break;
+    case kEventAppAvailableWindowBoundsChanged: {
+	static UInt32 prevId = 0;
+	UInt32 id;
+	OSStatus err;
+
+	err = ChkErr(GetEventParameter, eventPtr->eventRef,
+		kEventParamTransactionID, typeUInt32, NULL, sizeof(id), NULL,
+		&id);
+	if (err != noErr || id != prevId) {
+	    TkDisplay *dispPtr = TkGetDisplayList();
+
+	    prevId = id;
+	    TkMacOSXDisplayChanged(dispPtr->display);
+	}
+	/*
+	 * Should we call ::tk::mac::OnDisplayChanged?
+	 */
+	break;
+    }
+    default:
+	break;
     }
     return 0;
 }
@@ -185,15 +179,15 @@ TkMacOSXProcessApplicationEvent(
 
 MODULE_SCOPE int
 TkMacOSXProcessAppearanceEvent(
-	TkMacOSXEvent *eventPtr,
-	MacEventStatus *statusPtr)
+    TkMacOSXEvent *eventPtr,
+    MacEventStatus *statusPtr)
 {
     switch (eventPtr->eKind) {
-	case kEventAppearanceScrollBarVariantChanged:
-	    TkMacOSXInitScrollbarMetrics();
-	    break;
-	default:
-	    break;
+    case kEventAppearanceScrollBarVariantChanged:
+	TkMacOSXInitScrollbarMetrics();
+	break;
+    default:
+	break;
     }
     return 0;
 }
@@ -203,23 +197,21 @@ TkMacOSXProcessAppearanceEvent(
  *
  * TkMacOSXProcessWindowEvent --
  *
- *	This processes Window level events, mainly activate
- *	and deactivate.
+ *	This processes Window level events, mainly activate and deactivate.
  *
  * Results:
  *	0.
  *
  * Side effects:
- *	Cause Windows to be moved forward or backward in the
- *	window stack.
+ *	Cause Windows to be moved forward or backward in the window stack.
  *
  *----------------------------------------------------------------------
  */
 
 MODULE_SCOPE int
 TkMacOSXProcessWindowEvent(
-	TkMacOSXEvent * eventPtr,
-	MacEventStatus * statusPtr)
+    TkMacOSXEvent *eventPtr,
+    MacEventStatus *statusPtr)
 {
     OSStatus err;
     WindowRef whichWindow;
@@ -229,20 +221,20 @@ TkMacOSXProcessWindowEvent(
     TkWindow *winPtr;
 
     switch (eventPtr->eKind) {
-	case kEventWindowActivated:
-	case kEventWindowDeactivated:
-	case kEventWindowUpdate:
-	case kEventWindowExpanding:
-	case kEventWindowBoundsChanged:
-	case kEventWindowDragStarted:
-	case kEventWindowDragCompleted:
-	case kEventWindowConstrain:
-	case kEventWindowGetRegion:
-	case kEventWindowDrawContent:
-	    break;
-	default:
-	    return 0;
-	    break;
+    case kEventWindowActivated:
+    case kEventWindowDeactivated:
+    case kEventWindowUpdate:
+    case kEventWindowExpanding:
+    case kEventWindowBoundsChanged:
+    case kEventWindowDragStarted:
+    case kEventWindowDragCompleted:
+    case kEventWindowConstrain:
+    case kEventWindowGetRegion:
+    case kEventWindowDrawContent:
+	break;
+    default:
+	return 0;
+	break;
     }
     err = ChkErr(GetEventParameter, eventPtr->eventRef,
 	    kEventParamDirectObject, typeWindowRef, NULL, sizeof(whichWindow),
@@ -253,169 +245,160 @@ TkMacOSXProcessWindowEvent(
 
     window = TkMacOSXGetXWindow(whichWindow);
     dispPtr = TkGetDisplayList();
-    winPtr = (TkWindow *)Tk_IdToWindow(dispPtr->display, window);
+    winPtr = (TkWindow *) Tk_IdToWindow(dispPtr->display, window);
 
     switch (eventPtr->eKind) {
-	case kEventWindowActivated:
-	case kEventWindowDeactivated:
-	    if (window != None) {
-		int activate = (eventPtr->eKind == kEventWindowActivated);
-
-		eventFound |= GenerateActivateEvents(window, activate);
-		eventFound |= TkMacOSXGenerateFocusEvent(window, activate);
-		if (winPtr) {
-		    TkMacOSXEnterExitFullscreen(winPtr, activate);
-		}
-		statusPtr->stopProcessing = 1;
-	    }
-	    break;
-	case kEventWindowUpdate:
-	    if (window != None && GenerateUpdateEvent(window)) {
-		eventFound = true;
-		statusPtr->stopProcessing = 1;
-	    }
-	    break;
-	case kEventWindowExpanding:
+    case kEventWindowActivated:
+    case kEventWindowDeactivated:
+	if (window != None) {
+	    int activate = (eventPtr->eKind == kEventWindowActivated);
+
+	    eventFound |= GenerateActivateEvents(window, activate);
+	    eventFound |= TkMacOSXGenerateFocusEvent(window, activate);
 	    if (winPtr) {
-		winPtr->wmInfoPtr->hints.initial_state =
-			TkMacOSXIsWindowZoomed(winPtr) ? ZoomState : 
-			NormalState;
-		Tk_MapWindow((Tk_Window) winPtr);
-		/*
-		 * Need to process all Tk events generated by Tk_MapWindow()
-		 * before returning to ensure all children are mapped, as
-		 * otherwise the Activate event that follows Expanding would
-		 * not be processed by any unmapped children.
-		 */
-		while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS)) {};
-		while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {};
+		TkMacOSXEnterExitFullscreen(winPtr, activate);
 	    }
-	    break;
-	case kEventWindowBoundsChanged:
-	    if (winPtr) {
-		WmInfo *wmPtr = winPtr->wmInfoPtr;
-		UInt32 attr;
-		Rect bounds;
-		int x = -1, y = -1, width = -1, height = -1, flags = 0;
-
-		ChkErr(GetEventParameter, eventPtr->eventRef,
-			kEventParamAttributes, typeUInt32,
-			NULL, sizeof(attr), NULL, &attr);
-		ChkErr(GetEventParameter, eventPtr->eventRef,
-			kEventParamCurrentBounds, typeQDRectangle,
-			NULL, sizeof(bounds), NULL, &bounds);
-		if (attr & kWindowBoundsChangeOriginChanged) {
-		    x = bounds.left - wmPtr->xInParent;
-		    y = bounds.top	- wmPtr->yInParent;
-		    flags |= TK_LOCATION_CHANGED;
-		}
-		if (attr & kWindowBoundsChangeSizeChanged) {
-		    width = bounds.right  - bounds.left;
-		    height = bounds.bottom - bounds.top;
-		    flags |= TK_SIZE_CHANGED;
-		}
-		TkMacOSXInvalClipRgns((Tk_Window) winPtr);
-		TkMacOSXInvalidateWindow((MacDrawable *) window,
-			TK_PARENT_WINDOW);
-		TkGenWMConfigureEvent((Tk_Window)winPtr, x, y, width,
-			height, flags);
-		if (attr & kWindowBoundsChangeUserResize ||
-			attr & kWindowBoundsChangeUserDrag) {
-		    TkMacOSXRunTclEventLoop();
-		}
-		if (wmPtr->attributes & kWindowResizableAttribute) {
-		    HIViewRef growBoxView;
+	    statusPtr->stopProcessing = 1;
+	}
+	break;
+    case kEventWindowUpdate:
+	if (window != None && GenerateUpdateEvent(window)) {
+	    eventFound = true;
+	    statusPtr->stopProcessing = 1;
+	}
+	break;
+    case kEventWindowExpanding:
+	if (winPtr) {
+	    winPtr->wmInfoPtr->hints.initial_state =
+		    TkMacOSXIsWindowZoomed(winPtr) ? ZoomState : NormalState;
+	    Tk_MapWindow((Tk_Window) winPtr);
 
-		    err = HIViewFindByID(HIViewGetRoot(whichWindow),
-			    kHIViewWindowGrowBoxID, &growBoxView);
-		    if (err == noErr) {
-			ChkErr(HIViewSetNeedsDisplay, growBoxView, true);
-		    }
-		}
-	    }
-	    break;
-	case kEventWindowDragStarted:
-	    if (!(TkMacOSXModifierState() & cmdKey)) { 
-		TkMacOSXBringWindowForward(whichWindow);
+	    /*
+	     * Need to process all Tk events generated by Tk_MapWindow()
+	     * before returning to ensure all children are mapped, as
+	     * otherwise the Activate event that follows Expanding would not
+	     * be processed by any unmapped children.
+	     */
+
+	    while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS)) {/*empty body*/};
+	    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {/*empty body*/};
+	}
+	break;
+    case kEventWindowBoundsChanged:
+	if (winPtr) {
+	    WmInfo *wmPtr = winPtr->wmInfoPtr;
+	    UInt32 attr;
+	    Rect bounds;
+	    int x = -1, y = -1, width = -1, height = -1, flags = 0;
+
+	    ChkErr(GetEventParameter, eventPtr->eventRef,
+		    kEventParamAttributes, typeUInt32, NULL, sizeof(attr),
+		    NULL, &attr);
+	    ChkErr(GetEventParameter, eventPtr->eventRef,
+		    kEventParamCurrentBounds, typeQDRectangle, NULL,
+		    sizeof(bounds), NULL, &bounds);
+	    if (attr & kWindowBoundsChangeOriginChanged) {
+		x = bounds.left - wmPtr->xInParent;
+		y = bounds.top - wmPtr->yInParent;
+		flags |= TK_LOCATION_CHANGED;
 	    }
-	    TkMacOSXTrackingLoop(1);
-	    break;
-	case kEventWindowDragCompleted: {
-	    Rect maxBounds, bounds, strWidths;
-	    int h = 0, v = 0;
-
-	    TkMacOSXTrackingLoop(0);
-	    ChkErr(GetWindowGreatestAreaDevice, whichWindow,
-		    kWindowDragRgn, NULL, &maxBounds);
-	    ChkErr(GetWindowBounds, whichWindow, kWindowStructureRgn,
-		    &bounds);
-	    ChkErr(GetWindowStructureWidths, whichWindow, &strWidths);
-	    if (bounds.left > maxBounds.right - strWidths.left) {
-		h = maxBounds.right
-			- (strWidths.left ? strWidths.left : 40)
-			- bounds.left;
-	    } else if (bounds.right < maxBounds.left
-		    + strWidths.right) {
-		h = maxBounds.left
-			+ (strWidths.right ? strWidths.right : 40)
-			- bounds.right;
+	    if (attr & kWindowBoundsChangeSizeChanged) {
+		width = bounds.right - bounds.left;
+		height = bounds.bottom - bounds.top;
+		flags |= TK_SIZE_CHANGED;
 	    }
-	    if (bounds.top > maxBounds.bottom - strWidths.top) {
-		v = maxBounds.bottom
-			- (strWidths.top ? strWidths.top : 40)
-			- bounds.top;
-	    } else if (bounds.bottom < maxBounds.top
-		    + strWidths.bottom) {
-		v = maxBounds.top
-			+ (strWidths.bottom ? strWidths.bottom : 40)
-			- bounds.bottom;
-	    } else if (strWidths.top && bounds.top < maxBounds.top) {
-		v = maxBounds.top - bounds.top;
+	    TkMacOSXInvalClipRgns((Tk_Window) winPtr);
+	    TkMacOSXInvalidateWindow((MacDrawable*) window, TK_PARENT_WINDOW);
+	    TkGenWMConfigureEvent((Tk_Window)winPtr, x, y, width, height,
+		    flags);
+	    if (attr & kWindowBoundsChangeUserResize ||
+		    attr & kWindowBoundsChangeUserDrag) {
+		TkMacOSXRunTclEventLoop();
 	    }
-	    if (h || v) {
-		OffsetRect(&bounds, h, v);
-		ChkErr(SetWindowBounds, whichWindow,
-		    kWindowStructureRgn, &bounds);
+	    if (wmPtr->attributes & kWindowResizableAttribute) {
+		HIViewRef growBoxView;
+
+		err = HIViewFindByID(HIViewGetRoot(whichWindow),
+			kHIViewWindowGrowBoxID, &growBoxView);
+		if (err == noErr) {
+		    ChkErr(HIViewSetNeedsDisplay, growBoxView, true);
+		}
 	    }
-	    break;
 	}
-	case kEventWindowConstrain:
-	    if (winPtr && (winPtr->wmInfoPtr->flags & WM_FULLSCREEN) &&
-		    TkMacOSXMakeFullscreen(winPtr, whichWindow, 1,
-		    NULL) == TCL_OK) {
-		statusPtr->stopProcessing = 1;
-	    }
-	    break;
-	case kEventWindowGetRegion:
-	    if (winPtr && (winPtr->wmInfoPtr->flags & WM_TRANSPARENT)) {
-		WindowRegionCode code;
+	break;
+    case kEventWindowDragStarted:
+	if (!(TkMacOSXModifierState() & cmdKey)) { 
+	    TkMacOSXBringWindowForward(whichWindow);
+	}
+	TkMacOSXTrackingLoop(1);
+	break;
+    case kEventWindowDragCompleted: {
+	Rect maxBounds, bounds, strWidths;
+	int h = 0, v = 0;
+
+	TkMacOSXTrackingLoop(0);
+	ChkErr(GetWindowGreatestAreaDevice, whichWindow, kWindowDragRgn, NULL,
+		&maxBounds);
+	ChkErr(GetWindowBounds, whichWindow, kWindowStructureRgn, &bounds);
+	ChkErr(GetWindowStructureWidths, whichWindow, &strWidths);
+	if (bounds.left > maxBounds.right - strWidths.left) {
+	    h = maxBounds.right - (strWidths.left ? strWidths.left : 40)
+		    - bounds.left;
+	} else if (bounds.right < maxBounds.left + strWidths.right) {
+	    h = maxBounds.left + (strWidths.right ? strWidths.right : 40)
+		    - bounds.right;
+	}
+	if (bounds.top > maxBounds.bottom - strWidths.top) {
+	    v = maxBounds.bottom - (strWidths.top ? strWidths.top : 40)
+		    - bounds.top;
+	} else if (bounds.bottom < maxBounds.top + strWidths.bottom) {
+	    v = maxBounds.top + (strWidths.bottom ? strWidths.bottom : 40)
+		    - bounds.bottom;
+	} else if (strWidths.top && bounds.top < maxBounds.top) {
+	    v = maxBounds.top - bounds.top;
+	}
+	if (h || v) {
+	    OffsetRect(&bounds, h, v);
+	    ChkErr(SetWindowBounds, whichWindow, kWindowStructureRgn,&bounds);
+	}
+	break;
+    }
+    case kEventWindowConstrain:
+	if (winPtr && (winPtr->wmInfoPtr->flags & WM_FULLSCREEN) &&
+		TkMacOSXMakeFullscreen(winPtr,whichWindow,1,NULL) == TCL_OK) {
+	    statusPtr->stopProcessing = 1;
+	}
+	break;
+    case kEventWindowGetRegion:
+	if (winPtr && (winPtr->wmInfoPtr->flags & WM_TRANSPARENT)) {
+	    WindowRegionCode code;
+
+	    statusPtr->stopProcessing = (CallNextEventHandler(
+		    eventPtr->callRef, eventPtr->eventRef) == noErr);
+	    err = ChkErr(GetEventParameter, eventPtr->eventRef,
+		    kEventParamWindowRegionCode, typeWindowRegionCode, NULL,
+		    sizeof(code), NULL, &code);
+	    if (err == noErr && code == kWindowOpaqueRgn) {
+		RgnHandle rgn;
 
-		statusPtr->stopProcessing = (CallNextEventHandler(
-			eventPtr->callRef, eventPtr->eventRef) == noErr);
 		err = ChkErr(GetEventParameter, eventPtr->eventRef,
-			kEventParamWindowRegionCode, typeWindowRegionCode,
-			NULL, sizeof(code), NULL, &code);
-		if (err == noErr && code == kWindowOpaqueRgn) {
-		    RgnHandle rgn;
-
-		    err = ChkErr(GetEventParameter, eventPtr->eventRef,
-			    kEventParamRgnHandle, typeQDRgnHandle, NULL,
-			    sizeof(rgn), NULL, &rgn);
-		    if (err == noErr) {
-			SetEmptyRgn(rgn);
-			statusPtr->stopProcessing = 1;
-		    }
+			kEventParamRgnHandle, typeQDRgnHandle, NULL,
+			sizeof(rgn), NULL, &rgn);
+		if (err == noErr) {
+		    SetEmptyRgn(rgn);
+		    statusPtr->stopProcessing = 1;
 		}
 	    }
-	    break;
-	case kEventWindowDrawContent:
-	    if (winPtr && (winPtr->wmInfoPtr->flags & WM_TRANSPARENT)) {
-		CGrafPtr port;
+	}
+	break;
+    case kEventWindowDrawContent:
+	if (winPtr && (winPtr->wmInfoPtr->flags & WM_TRANSPARENT)) {
+	    CGrafPtr port;
 
-		GetPort(&port);
-		ClearPort(port, NULL);
-	    }
-	    break;
+	    GetPort(&port);
+	    ClearPort(port, NULL);
+	}
+	break;
     }
 
     return eventFound;
@@ -426,8 +409,8 @@ TkMacOSXProcessWindowEvent(
  *
  * GenerateUpdateEvent --
  *
- *	Given a Macintosh window update event this function generates
- *	all the Expose XEvents needed by Tk.
+ *	Given a Macintosh window update event this function generates all the
+ *	Expose XEvents needed by Tk.
  *
  * Results:
  *	True if event(s) are generated - false otherwise.
@@ -437,8 +420,10 @@ TkMacOSXProcessWindowEvent(
  *
  *----------------------------------------------------------------------
  */
+
 static int
-GenerateUpdateEvent(Window window)
+GenerateUpdateEvent(
+    Window window)
 {
     WindowRef macWindow;
     TkDisplay *dispPtr;
@@ -471,7 +456,8 @@ GenerateUpdateEvent(Window window)
 	ChkErr(GetWindowBounds, macWindow, kWindowContentRgn, &bounds);
 	dx = -bounds.left;
 	dy = -bounds.top;
-    ) TK_ENDIF
+    ) TK_ENDIF;
+
     updateRgn = HIShapeCreateMutableCopy(rgn);
     CFRelease(rgn);
     ChkErr(HIShapeOffset, updateRgn, dx, dy);
@@ -502,10 +488,10 @@ GenerateUpdateEvent(Window window)
  *
  * GenerateUpdates --
  *
- *	Given a Macintosh update region and a Tk window this function
- *	geneates a X Expose event for the window if it is within the
- *	update region. The function will then recursivly have each
- *	damaged window generate Expose events for its child windows.
+ *	Given a Macintosh update region and a Tk window this function geneates
+ *	a X Expose event for the window if it is within the update region. The
+ *	function will then recursivly have each damaged window generate Expose
+ *	events for its child windows.
  *
  * Results:
  *	True if event(s) are generated - false otherwise.
@@ -595,14 +581,14 @@ GenerateUpdates(
 
     return 1;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
  * GenerateActivateEvents --
  *
- *	Given a Macintosh window activate event this function generates all the
- *	X Activate events needed by Tk.
+ *	Given a Macintosh window activate event this function generates all
+ *	the X Activate events needed by Tk.
  *
  * Results:
  *	True if event(s) are generated - false otherwise.
@@ -615,8 +601,8 @@ GenerateUpdates(
 
 int
 GenerateActivateEvents(
-    Window window,		  /* Root X window for event. */
-    int activeFlag )
+    Window window,		/* Root X window for event. */
+    int activeFlag)
 {
     TkWindow *winPtr;
     TkDisplay *dispPtr;
@@ -630,14 +616,14 @@ GenerateActivateEvents(
     TkGenerateActivateEvents(winPtr,activeFlag);
     return true;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
  * TkMacOSXGenerateFocusEvent --
  *
- *	Given a Macintosh window activate event this function generates all the
- *	X Focus events needed by Tk.
+ *	Given a Macintosh window activate event this function generates all
+ *	the X Focus events needed by Tk.
  *
  * Results:
  *	True if event(s) are generated - false otherwise.
@@ -651,7 +637,7 @@ GenerateActivateEvents(
 MODULE_SCOPE int
 TkMacOSXGenerateFocusEvent(
     Window window,		/* Root X window for event. */
-    int activeFlag )
+    int activeFlag)
 {
     XEvent event;
     Tk_Window tkwin;
@@ -664,9 +650,10 @@ TkMacOSXGenerateFocusEvent(
     }
 
     /*
-     * Don't send focus events to windows of class help or to
-     * windows with the kWindowNoActivatesAttribute.
+     * Don't send focus events to windows of class help or to windows with the
+     * kWindowNoActivatesAttribute.
      */
+
     if (((TkWindow *)tkwin)->wmInfoPtr->macClass == kHelpWindowClass ||
 	    ((TkWindow *)tkwin)->wmInfoPtr->attributes &
 		    kWindowNoActivatesAttribute) {
@@ -674,8 +661,8 @@ TkMacOSXGenerateFocusEvent(
     }
 
     /*
-     * Generate FocusIn and FocusOut events. This event
-     * is only sent to the toplevel window.
+     * Generate FocusIn and FocusOut events. This event is only sent to the
+     * toplevel window.
      */
 
     if (activeFlag) {
@@ -700,9 +687,8 @@ TkMacOSXGenerateFocusEvent(
  *
  * TkGenWMConfigureEvent --
  *
- *	Generate a ConfigureNotify event for Tk. Depending on the
- *	value of flag the values of width/height, x/y, or both may
- *	be changed.
+ *	Generate a ConfigureNotify event for Tk. Depending on the value of
+ *	flag the values of width/height, x/y, or both may be changed.
  *
  * Results:
  *	None.
@@ -762,6 +748,7 @@ TkGenWMConfigureEvent(
     /*
      * Update window manager information.
      */
+
     if (Tk_IsTopLevel(winPtr)) {
 	wmPtr = winPtr->wmInfoPtr;
 	if (flags & TK_LOCATION_CHANGED) {
@@ -779,7 +766,7 @@ TkGenWMConfigureEvent(
 	    } else {
 		if (wmPtr->gridWin != NULL) {
 		    wmPtr->width = wmPtr->reqGridWidth
-			+ (width - winPtr->reqWidth)/wmPtr->widthInc;
+			    + (width - winPtr->reqWidth)/wmPtr->widthInc;
 		    if (wmPtr->width < 0) {
 			wmPtr->width = 0;
 		    }
@@ -795,7 +782,7 @@ TkGenWMConfigureEvent(
 	    } else {
 		if (wmPtr->gridWin != NULL) {
 		    wmPtr->height = wmPtr->reqGridHeight
-			+ (height - winPtr->reqHeight)/wmPtr->heightInc;
+			    + (height - winPtr->reqHeight)/wmPtr->heightInc;
 		    if (wmPtr->height < 0) {
 			wmPtr->height = 0;
 		    }
@@ -811,10 +798,11 @@ TkGenWMConfigureEvent(
     /*
      * Now set up the changes structure. Under X we wait for the
      * ConfigureNotify to set these values. On the Mac we know imediatly that
-     * this is what we want - so we just set them. However, we need to
-     * make sure the windows clipping region is marked invalid so the
-     * change is visible to the subwindow.
+     * this is what we want - so we just set them. However, we need to make
+     * sure the windows clipping region is marked invalid so the change is
+     * visible to the subwindow.
      */
+
     winPtr->changes.x = x;
     winPtr->changes.y = y;
     winPtr->changes.width = width;
@@ -862,16 +850,15 @@ TkGenWMDestroyEvent(
  * TkWmProtocolEventProc --
  *
  *	This procedure is called by the Tk_HandleEvent whenever a
- *	ClientMessage event arrives whose type is "WM_PROTOCOLS".
- *	This procedure handles the message from the window manager
- *	in an appropriate fashion.
+ *	ClientMessage event arrives whose type is "WM_PROTOCOLS". This
+ *	procedure handles the message from the window manager in an
+ *	appropriate fashion.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Depends on what sort of handler, if any, was set up for the
- *	protocol.
+ *	Depends on what sort of handler, if any, was set up for the protocol.
  *
  *----------------------------------------------------------------------
  */
@@ -893,11 +880,11 @@ TkWmProtocolEventProc(
     }
     protocol = (Atom) eventPtr->xclient.data.l[0];
     for (protPtr = wmPtr->protPtr; protPtr != NULL;
-		protPtr = protPtr->nextPtr) {
+	    protPtr = protPtr->nextPtr) {
 	if (protocol == protPtr->protocol) {
-	    Tcl_Preserve((ClientData) protPtr);
+	    Tcl_Preserve(protPtr);
 	    interp = protPtr->interp;
-	    Tcl_Preserve((ClientData) interp);
+	    Tcl_Preserve(interp);
 	    result = Tcl_GlobalEval(interp, protPtr->command);
 	    if (result != TCL_OK) {
 		Tcl_AddErrorInfo(interp, "\n    (command for \"");
@@ -906,15 +893,15 @@ TkWmProtocolEventProc(
 		Tcl_AddErrorInfo(interp, "\" window manager protocol)");
 		Tk_BackgroundError(interp);
 	    }
-	    Tcl_Release((ClientData) interp);
-	    Tcl_Release((ClientData) protPtr);
+	    Tcl_Release(interp);
+	    Tcl_Release(protPtr);
 	    return;
 	}
     }
 
     /*
-     * No handler was present for this protocol. If this is a
-     * WM_DELETE_WINDOW message then just destroy the window.
+     * No handler was present for this protocol. If this is a WM_DELETE_WINDOW
+     * message then just destroy the window.
      */
 
     if (protocol == Tk_InternAtom((Tk_Window) winPtr, "WM_DELETE_WINDOW")) {
@@ -968,6 +955,7 @@ Tk_MacOSXIsAppInFront(void)
  *
  *----------------------------------------------------------------------
  */
+
 static void
 ClearPort(
     CGrafPtr port,
@@ -990,3 +978,10 @@ ClearPort(
     CGContextClearRect(context, rect);
     QDEndCGContext(port, &context);
 }
+
+/*
+ * Local Variables:
+ * fill-column: 78
+ * c-basic-offset: 4
+ * End:
+ */