Merge of TkAqua Cocoa portmacosx_cocoa_merge

1 files changed, 67 insertions, 124 deletions

diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c
index 46c6a00..483f799 100644
--- a/macosx/tkMacOSXEntry.c
+++ b/macosx/tkMacOSXEntry.c
@@ -4,63 +4,21 @@
  *	This file implements the native aqua entry widget.
  *
  * Copyright 2001, Apple Computer, Inc.
- * Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright 2008-2009, Apple Inc.
  *
- * See the file "license.terms" for information on usage and redistribution of
- * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution
+ * of 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
- *	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: tkMacOSXEntry.c,v 1.15 2008/11/08 18:44:40 dkf Exp $
+ * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.16 2009/06/29 14:35:01 das Exp $
  */
 
 #include "tkMacOSXPrivate.h"
-#include "tkMacOSXDefault.h"
 #include "tkEntry.h"
 
 static ThemeButtonKind	ComputeIncDecParameters(int height, int *width);
+
+#define HIOrientation kHIThemeOrientationNormal
 
 /*
  *--------------------------------------------------------------
@@ -86,31 +44,21 @@ ComputeIncDecParameters(
 {
     ThemeButtonKind kind;
 
-    TK_IF_HI_TOOLBOX (3,
-	if (height < 11 || height > 28) {
-	    *width = 0;
-	    kind = (ThemeButtonKind) 0;
-	} else {
-	    if (height >= 21) {
-		*width = 13;
-		kind = kThemeIncDecButton;
-	    } else if (height >= 18) {
-		*width = 12;
-		kind = kThemeIncDecButtonSmall;
-	    } else {
-		*width = 11;
-		kind = kThemeIncDecButtonMini;
-	    }
-	}
-    ) TK_ELSE_HI_TOOLBOX (3,
-	if (height < 21 || height > 28) {
-	    *width = 0;
-	    kind = (ThemeButtonKind) 0;
-	} else {
+    if (height < 11 || height > 28) {
+	*width = 0;
+	kind = (ThemeButtonKind) 0;
+    } else {
+	if (height >= 21) {
 	    *width = 13;
 	    kind = kThemeIncDecButton;
+	} else if (height >= 18) {
+	    *width = 12;
+	    kind = kThemeIncDecButtonSmall;
+	} else {
+	    *width = 11;
+	    kind = kThemeIncDecButtonMini;
 	}
-    ) TK_ENDIF
+    }
 
     return kind;
 }
@@ -141,13 +89,19 @@ TkpDrawEntryBorderAndFocus(
     Drawable d,
     int isSpinbox)
 {
-    Rect bounds;
+    CGRect bounds;
     TkMacOSXDrawingContext dc;
     GC bgGC;
     Tk_Window tkwin = entryPtr->tkwin;
-    ThemeDrawState drawState;
     int oldWidth = 0;
     MacDrawable *macDraw = (MacDrawable *) d;
+    const HIThemeFrameDrawInfo info = {
+	.version = 0,
+	.kind = kHIThemeFrameTextFieldSquare,
+	.state = (entryPtr->state == STATE_DISABLED ? kThemeStateInactive :
+		kThemeStateActive),
+	.isFocused = (entryPtr->flags & GOT_FOCUS ? 1 : 0),
+    };
 
     /*
      * I use 6 as the borderwidth. 2 of the 5 go into the actual frame the 3
@@ -169,13 +123,12 @@ TkpDrawEntryBorderAndFocus(
      */
 
     if (isSpinbox) {
-	ThemeButtonKind buttonKind;
 	int incDecWidth;
 
 	oldWidth = Tk_Width(tkwin);
 
-	buttonKind = ComputeIncDecParameters(Tk_Height(tkwin)
-		- 2 * MAC_OSX_FOCUS_WIDTH, &incDecWidth);
+	ComputeIncDecParameters(Tk_Height(tkwin) - 2 * MAC_OSX_FOCUS_WIDTH,
+		&incDecWidth);
 	Tk_Width(tkwin) -= incDecWidth + 1;
     }
 
@@ -193,32 +146,18 @@ TkpDrawEntryBorderAndFocus(
      * 3 according to the Carbon docs.
      */
 
-    bounds.left = macDraw->xOff + MAC_OSX_FOCUS_WIDTH;
-    bounds.top = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
-    bounds.right = macDraw->xOff + Tk_Width(tkwin) - MAC_OSX_FOCUS_WIDTH;
-    bounds.bottom = macDraw->yOff + Tk_Height(tkwin) - MAC_OSX_FOCUS_WIDTH;
-    if (entryPtr->state == STATE_DISABLED) {
-	drawState = kThemeStateInactive;
-    } else {
-	drawState = kThemeStateActive;
-    }
-    if (!TkMacOSXSetupDrawingContext(d, NULL, 0, &dc)) {
+    bounds.origin.x = macDraw->xOff + MAC_OSX_FOCUS_WIDTH;
+    bounds.origin.y = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
+    bounds.size.width = Tk_Width(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
+    bounds.size.height = Tk_Height(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
+    if (!TkMacOSXSetupDrawingContext(d, NULL, 1, &dc)) {
 	return 0;
     }
-    DrawThemeEditTextFrame(&bounds, drawState);
-    if (entryPtr->flags & GOT_FOCUS) {
-	/*
-	 * Don't call this if we don't have the focus, because then it erases
-	 * the focus rect to white, but we've already drawn the
-	 * highlightbackground above.
-	 */
-
-	DrawThemeFocusRect(&bounds, (entryPtr->flags & GOT_FOCUS) != 0);
-    }
+    ChkErr(HIThemeDrawFrame, &bounds, &info, dc.context, HIOrientation);
+    TkMacOSXRestoreDrawingContext(&dc);
     if (isSpinbox) {
 	Tk_Width(tkwin) = oldWidth;
     }
-    TkMacOSXRestoreDrawingContext(&dc);
     return 1;
 }
 
@@ -247,13 +186,7 @@ TkpDrawSpinboxButtons(
     Spinbox *sbPtr,
     Drawable d)
 {
-    Rect inBounds;
-    ThemeButtonKind inKind;
-    ThemeButtonDrawInfo inNewInfo;
-    ThemeButtonDrawInfo * inPrevInfo = NULL;
-    ThemeEraseUPP inEraseProc = NULL;
-    ThemeButtonDrawUPP inLabelProc = NULL;
-    UInt32 inUserData = 0;
+    CGRect bounds;
     Tk_Window tkwin = sbPtr->entry.tkwin;
     int height = Tk_Height(tkwin);
     int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;
@@ -262,6 +195,10 @@ TkpDrawSpinboxButtons(
     XRectangle rects[1];
     GC bgGC;
     MacDrawable *macDraw = (MacDrawable *) d;
+    HIThemeButtonDrawInfo info = {
+	.version = 0,
+	.adornment = kThemeAdornmentNone,
+    };
 
     /*
      * FIXME: RAISED really makes more sense
@@ -277,31 +214,29 @@ TkpDrawSpinboxButtons(
      * entry is a little bigger than this, so we give it a little slop.
      */
 
-    inKind = ComputeIncDecParameters(buttonHeight, &incDecWidth);
-    if (inKind == (ThemeButtonKind) 0) {
+    info.kind = ComputeIncDecParameters(buttonHeight, &incDecWidth);
+    if (info.kind == (ThemeButtonKind) 0) {
 	return 0;
     }
 
     if (sbPtr->entry.state == STATE_DISABLED) {
-	inNewInfo.state = kThemeStateInactive;
-	inNewInfo.value = kThemeButtonOff;
+	info.state = kThemeStateInactive;
+	info.value = kThemeButtonOff;
     } else if (sbPtr->selElement == SEL_BUTTONUP) {
-	inNewInfo.state = kThemeStatePressedUp;
-	inNewInfo.value = kThemeButtonOn;
+	info.state = kThemeStatePressedUp;
+	info.value = kThemeButtonOn;
     } else if (sbPtr->selElement == SEL_BUTTONDOWN) {
-	inNewInfo.state = kThemeStatePressedDown;
-	inNewInfo.value = kThemeButtonOn;
+	info.state = kThemeStatePressedDown;
+	info.value = kThemeButtonOn;
     } else {
-	inNewInfo.state = kThemeStateActive;
-	inNewInfo.value = kThemeButtonOff;
+	info.state = kThemeStateActive;
+	info.value = kThemeButtonOff;
     }
 
-    inNewInfo.adornment = kThemeAdornmentNone;
-
-    inBounds.left = macDraw->xOff + Tk_Width(tkwin) - incDecWidth - 1;
-    inBounds.right = macDraw->xOff + Tk_Width(tkwin) - 1;
-    inBounds.top = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
-    inBounds.bottom = macDraw->yOff + Tk_Height(tkwin) - MAC_OSX_FOCUS_WIDTH;
+    bounds.origin.x = macDraw->xOff + Tk_Width(tkwin) - incDecWidth - 1;
+    bounds.origin.y = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
+    bounds.size.width = incDecWidth;
+    bounds.size.height = Tk_Height(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
 
     /*
      * We had to make the entry part of the window smaller so that we wouldn't
@@ -310,17 +245,25 @@ TkpDrawSpinboxButtons(
      */
 
     bgGC = Tk_GCForColor(sbPtr->entry.highlightBgColorPtr, d);
-    rects[0].x = inBounds.left;
+    rects[0].x = bounds.origin.x;
     rects[0].y = 0;
     rects[0].width = Tk_Width(tkwin);
     rects[0].height = Tk_Height(tkwin);
     XFillRectangles(Tk_Display(tkwin), d, bgGC, rects, 1);
 
-    if (!TkMacOSXSetupDrawingContext(d, NULL, 0, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, NULL, 1, &dc)) {
 	return 0;
     }
-    ChkErr(DrawThemeButton, &inBounds, inKind, &inNewInfo, inPrevInfo,
-	    inEraseProc, inLabelProc, inUserData);
+    ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation, NULL);
     TkMacOSXRestoreDrawingContext(&dc);
     return 1;
 }
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 79
+ * coding: utf-8
+ * End:
+ */