Tk Source Code

2006-04-11  Daniel Steffen  <[email protected]>

	* macosx/tkMacOSXInt.h:         Implemented 'zoomed' window state
	* macosx/tkMacOSXWindowEvent.c: handling for TkAqua, via titlebar
	* macosx/tkMacOSXWm.c:          widget clicks as well as [wm state].
	* doc/wm.n:                     [Bug 1073456]

2006-04-10  Don Porter  <[email protected]>

	*** 8.4.13 TAGGED FOR RELEASE ***

	* changes:	Updates for next RC.

2006-04-09  Daniel Steffen  <[email protected]>


	* macosx/tkMacOSXWm.c (WmResizableCmd): propagate window attribute
	changes to Carbon window manager. [FR 1467004]
	(TkSetWMName, TkMacOSXMakeRealWindowExist): allow empty name for
	toplevels, remove bogus initial window name. [Bug 1450800]

2006-04-07  Daniel Steffen  <[email protected]>

'\"
'\" Copyright (c) 1991-1994 The Regents of the University of California.
'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
'\"
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\" 
'\" RCS: @(#) $Id: wm.n,v 1.11.2.4 2006/04/11 07:36:40 das Exp $
'\" 
.so man.macros
.TH wm n 8.4 Tk "Tk Built-In Commands"
.BS
'\" Note:  do not modify the .SH NAME line immediately below!
.SH NAME
wm \- Communicate with window manager

a value from \fB0.0\fR (fully transparent) to \fB1.0\fR (opaque).  Values
outside that range will be constrained.  This is supported on Windows
2000/XP+.  Where not supported, the \fB\-alpha\fR value remains at
\fB1.0\fR.
.PP
On Mac OS X, \fB\-modified\fR gets or sets the modification state of the
window (determines whether the window close widget contains the modification
indicator and whether the proxy icon is draggable).
\fB\-titlepath\fR gets or sets the path of the file referenced as
the window proxy icon (which can be dragged and dropped in lieu of the file's
finder icon). \fB\-alpha\fR sets the alpha transparency level of the window,
it accepts a value from \fB0.0\fR (fully transparent) to \fB1.0\fR (opaque),
values outside that range will be constrained.
.PP
On Unix, there are currently no special attribute values.
.RE

\fIisbelow\fR are passed, a boolean result indicates whether
or not the first window is currently above or below the second
window in the stacking order.
.TP
\fBwm state \fIwindow\fR ?newstate?
If \fInewstate\fR is specified, the window will be set to the new state,
otherwise it returns the current state of \fIwindow\fR: either
\fBnormal\fR, \fBiconic\fR, \fBwithdrawn\fR, \fBicon\fR, or (Windows and Mac
OS X only) \fBzoomed\fR.
The difference between \fBiconic\fR and \fBicon\fR is that
\fBiconic\fR refers to a window that has been iconified (e.g., with the
\fBwm iconify\fR command) while \fBicon\fR refers to a window whose only
purpose is to serve as the icon for some other window (via the \fBwm
iconwindow\fR command).  The \fBicon\fR state cannot be set.
.TP
\fBwm title \fIwindow\fR ?\fIstring\fR?
If \fIstring\fR is specified, then it will be passed to the window

/*
 * tkMacOSXInt.h --
 *
 *	Declarations of Macintosh specific shared variables and procedures.
 *
 * Copyright (c) 1995-1997 Sun Microsystems, Inc.
 * Copyright 2001, Apple Computer, Inc.
 *
 * See the file "license.terms" for information on usage and redistribution
 * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 *
 * RCS: @(#) $Id: tkMacOSXInt.h,v 1.3.2.10 2006/04/11 07:36:40 das Exp $
 */

#ifndef _TKMACINT
#define _TKMACINT

#ifndef _TKINT
#include "tkInt.h"

extern void TkMacOSXDisplayChanged(Display *display);
extern int TkMacOSXUseAntialiasedText(Tcl_Interp *interp, int enable);
extern void TkMacOSXInitCarbonEvents(Tcl_Interp *interp);
extern int TkMacOSXInitCGDrawing(Tcl_Interp *interp, int enable, int antiAlias);
extern void TkMacOSXDefaultStartupScript(void);
extern int TkMacOSXGenerateFocusEvent( Window window, int activeFlag);
extern WindowClass TkMacOSXWindowClass(TkWindow *winPtr);
extern int TkMacOSXIsWindowZoomed(TkWindow *winPtr);

extern void* TkMacOSXGetNamedSymbol(const char* module, const char* symbol);
/* Macro to abstract common use of TkMacOSXGetNamedSymbol to initialize named symbols */
#define TkMacOSXInitNamedSymbol(module, ret, symbol, ...) \
    static ret (* symbol)(__VA_ARGS__) = (void*)(-1L); \
    if (symbol == (void*)(-1L)) { \
        symbol = TkMacOSXGetNamedSymbol(STRINGIFY(module), STRINGIFY(_##symbol));\
    }

#include "tkIntPlatDecls.h"

#endif /* _TKMACINT */

 *      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.3.2.10 2006/04/11 07:36:40 das Exp $
 */

#include "tkMacOSXInt.h"
#include "tkMacOSXWm.h"
#include "tkMacOSXEvent.h"
#include "tkMacOSXDebug.h"

            break;
        case kEventWindowExpanded: {
            TkDisplay *dispPtr;
            TkWindow  *winPtr;
            dispPtr = TkGetDisplayList();
            winPtr = (TkWindow *)Tk_IdToWindow(dispPtr->display, window);
            if (winPtr) {
		TkpWmSetState(winPtr, TkMacOSXIsWindowZoomed(winPtr) ?
			ZoomState : NormalState);
            }
            break;
        }
    }
    return 0;
}


 *
 * Copyright (c) 1994-1997 Sun Microsystems, Inc.
 * Copyright 2001, Apple Computer, Inc.
 *
 * See the file "license.terms" for information on usage and redistribution
 * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 *
 * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.23 2006/04/11 07:36:40 das Exp $
 */

#include "tkMacOSXInt.h"
#include "tkScrollbar.h"
#include "tkMacOSXWm.h"
#include "tkMacOSXEvent.h"

    /* Must have objc >= 3 at this point. */
    if (objc < 3) {
	Tcl_WrongNumArgs(interp, 1, objv,
	    "attributes window ?-modified ?bool?? ?-titlepath ?path?? ?-alpha ?double??");
	return TCL_ERROR;
    }

    if (winPtr->window == None) {
	Tk_MakeWindowExist((Tk_Window) winPtr);
    }
    if (!TkMacOSXHostToplevelExists(winPtr)) {
	TkMacOSXMakeRealWindowExist(winPtr);
    }
    macWindow = GetWindowFromPort(TkMacOSXGetDrawablePort(winPtr->window));

    if (objc == 3) {
	result = Tcl_NewObj();
	Tcl_AppendToObj(result, "-modified ", -1);
	WmAttrGetModifiedStatus(macWindow, result);
	Tcl_AppendToObj(result, " -titlepath ", -1);

Tk_Window tkwin;		/* Main window of the application. */
TkWindow *winPtr;           /* Toplevel to work with */
Tcl_Interp *interp;		/* Current interpreter. */
int objc;			/* Number of arguments. */
Tcl_Obj *CONST objv[];	/* Argument objects. */
{
    register WmInfo *wmPtr = winPtr->wmInfoPtr;

    if (objc != 3) {
        Tcl_WrongNumArgs(interp, 2, objv, "window");
        return TCL_ERROR;
    }
    if (wmPtr->iconFor != NULL) {
        Tcl_AppendResult(interp, "can't deiconify ", Tcl_GetString(objv[2]),
                         ": it is an icon for ", Tk_PathName(wmPtr->iconFor),
                         (char *) NULL);
        return TCL_ERROR;
    }
    if (winPtr->flags & TK_EMBEDDED) {
        Tcl_AppendResult(interp, "can't deiconify ", winPtr->pathName,
                         ": it is an embedded window", (char *) NULL);
        return TCL_ERROR;
    }
    TkpWmSetState(winPtr, TkMacOSXIsWindowZoomed(winPtr) ?




	    ZoomState : NormalState);
    return TCL_OK;
}

/*
 *----------------------------------------------------------------------
 *
 * WmFocusmodelCmd --

        } else { /* OPT_ZOOMED */
            TkpWmSetState(winPtr, ZoomState);
        }
    } else {
        if (wmPtr->iconFor != NULL) {
            Tcl_SetResult(interp, "icon", TCL_STATIC);
        } else {
	    if (wmPtr->hints.initial_state == NormalState ||
		    wmPtr->hints.initial_state == ZoomState) {
		wmPtr->hints.initial_state = (TkMacOSXIsWindowZoomed(winPtr) ?
			ZoomState : NormalState);
	    }
            switch (wmPtr->hints.initial_state) {
                case NormalState:
                    Tcl_SetResult(interp, "normal", TCL_STATIC);
                    break;
                case IconicState:
                    Tcl_SetResult(interp, "iconic", TCL_STATIC);
                    break;

{
    Point where = start;
    TkDisplay *dispPtr;
    Rect       portRect;

    SetPort(GetWindowPort(whichWindow));
    GlobalToLocal(&where);
    GetPortBounds(GetWindowPort(whichWindow), &portRect);
    if (where.h > (portRect.right - 16) &&
	    where.v > (portRect.bottom - 16)) {
	Window window;
	TkWindow *winPtr;
	WmInfo *wmPtr;
	Rect bounds;
	long growResult;

	}

	growResult = GrowWindow(whichWindow, start, &bounds);

	if (growResult != 0) {
	    SizeWindow(whichWindow,
		    LoWord(growResult), HiWord(growResult), true);
	    InvalWindowRect(whichWindow, &portRect); /* TODO: may not be needed */
	    TkMacOSXInvalClipRgns((Tk_Window) winPtr);
	    TkGenWMConfigureEvent((Tk_Window) winPtr, -1, -1, 
		    (int) LoWord(growResult), (int) HiWord(growResult),
		    TK_SIZE_CHANGED);
	    return true;
	}
	return false;

    }
    return (Window) Tcl_GetHashValue(hPtr);
}

/*
 *----------------------------------------------------------------------
 *
 * TkMacOSXIsWindowZoomed --
 *
 *	Ask Carbon if the given window is in the zoomed out state.
 *	Because dragging & growing a window can change the Carbon
 *	zoom state, we cannot rely on wmInfoPtr->hints.initial_state
 *	for this information.
 *
 * Results:
 *	True if window is zoomed out, false otherwise.
 *
 * Side effects:
 *	None.
 *
 *----------------------------------------------------------------------
 */

int
TkMacOSXIsWindowZoomed(
    TkWindow *winPtr)
{
    WmInfo *wmPtr = winPtr->wmInfoPtr;
    Point idealSize;
    
    if ((wmPtr->flags & WM_WIDTH_NOT_RESIZABLE) &&
	    (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE)) {
	return false;
    }
    if (wmPtr->flags & WM_WIDTH_NOT_RESIZABLE) {
	idealSize.h = winPtr->changes.width;
    } else {
	idealSize.h = wmPtr->maxWidth;
    }
    if (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE) {
	idealSize.v = winPtr->changes.height;
    } else {
	idealSize.v = wmPtr->maxHeight;
    }

    return IsWindowInStandardState(
	    GetWindowFromPort(TkMacOSXGetDrawablePort(winPtr->window)),
	    &idealSize, NULL);
}

/*
 *----------------------------------------------------------------------
 *
 * TkMacOSXZoomToplevel --
 *
 *	The function is invoked when the user clicks in the zoom region
 *	of a Tk window or when the window state is set/unset to "zoomed"
 *	manually. If the window is to be zoomed (in or out), the window
 *	size is changed and events are generated to let Tk know what
 *	happened.
 *
 * Results:
 *	True if events were placed on event queue, false otherwise.
 *
 * Side effects:
 *	The window may be resized & events placed on Tk's queue.
 *
 *----------------------------------------------------------------------
 */

int
TkMacOSXZoomToplevel(
    WindowRef whichWindow,	/* The Macintosh window to zoom. */
    short zoomPart)		/* Either inZoomIn or inZoomOut */
{
    Window window;
    TkDisplay *dispPtr;
    TkWindow *winPtr;
    WmInfo *wmPtr;
    Point location = {0, 0}, idealSize;
    Rect portRect;
    int xOffset, yOffset;
    OSStatus status;

    window = TkMacOSXGetXWindow(whichWindow);
    dispPtr = TkGetDisplayList();
    winPtr = (TkWindow *) Tk_IdToWindow(dispPtr->display, window);
    wmPtr = winPtr->wmInfoPtr;
    
    if ((wmPtr->flags & WM_WIDTH_NOT_RESIZABLE) &&
	    (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE)) {
	return false;
    }

    if (wmPtr->flags & WM_WIDTH_NOT_RESIZABLE) {
	idealSize.h = winPtr->changes.width;
    } else {
	idealSize.h = wmPtr->maxWidth;
    }



    if (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE) {
	idealSize.v = winPtr->changes.height;
    } else {
	idealSize.v = wmPtr->maxHeight;
    }

    /* Do nothing if already in desired zoom state */
    if (!IsWindowInStandardState(whichWindow, &idealSize, NULL) == 
	    (zoomPart == inZoomIn)) {
	return false;
    }

    SetPort(GetWindowPort(whichWindow));
    GetPortBounds(GetWindowPort(whichWindow), &portRect);
    status = ZoomWindowIdeal(whichWindow, zoomPart, &idealSize);
    if (status == noErr) {
	wmPtr->hints.initial_state =
		(zoomPart == inZoomIn ? NormalState : ZoomState);
	InvalWindowRect(whichWindow, &portRect);
	TkMacOSXInvalClipRgns((Tk_Window) winPtr);
	LocalToGlobal(&location);
	TkMacOSXWindowOffset(whichWindow, &xOffset, &yOffset);
	location.h -= xOffset;
	location.v -= yOffset;
	GetPortBounds(GetWindowPort(whichWindow), &portRect);
	TkGenWMConfigureEvent((Tk_Window) winPtr, location.h, location.v, 
		portRect.right - portRect.left, portRect.bottom - portRect.top,
		TK_BOTH_CHANGED);
	return true;
    } else {
	return false;
    }







































}

/*
 *----------------------------------------------------------------------
 *
 * TkUnsupported1Cmd --
 *

	 * to ensure we are topmost (for dropdowns).
	 */
	WindowGroupRef group = GetWindowGroupOfClass(kUtilityWindowClass);
	if (group != NULL) {
	    SetWindowGroup(newWindow, group);
	}
    }
    SetWindowModified(newWindow, false);

    if (!windowHashInit) {
	Tcl_InitHashTable(&windowTable, TCL_ONE_WORD_KEYS);
	windowHashInit = true;
    }
    valueHashPtr = Tcl_CreateHashEntry(&windowTable,
	    (char *) newWindow, &new);

	if (IsWindowCollapsable(macWin) && !IsWindowCollapsed(macWin)) {
	    CollapseWindow(macWin, true);
	}
	Tk_UnmapWindow((Tk_Window) winPtr);
    } else if (state == NormalState) {
	Tk_MapWindow((Tk_Window) winPtr);
	if (IsWindowCollapsable(macWin) && IsWindowCollapsed(macWin)) {
	    CollapseWindow(macWin, false);
	}
	TkMacOSXZoomToplevel(macWin, inZoomIn);
    } else if (state == ZoomState) {
	Tk_MapWindow((Tk_Window) winPtr);
	if (IsWindowCollapsable(macWin) && IsWindowCollapsed(macWin)) {
	    CollapseWindow(macWin, false);
	}
	TkMacOSXZoomToplevel(macWin, inZoomOut);
    }
}

/*
 *----------------------------------------------------------------------
 *
 * TkpIsWindowFloating --

            Tcl_Panic("num matched toplevel windows does not equal num children");
    }

    done:
    Tcl_DeleteHashTable(&table);
    return windows;
}