diff options
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 5226 |
1 files changed, 3079 insertions, 2147 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 59287c8..8a9b2af 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -2,15 +2,15 @@ * tkWinWm.c -- * * This module takes care of the interactions between a Tk-based - * application and the window manager. Among other things, it - * implements the "wm" command and passes geometry information - * to the window manager. + * application and the window manager. Among other things, it implements + * the "wm" command and passes geometry information to the window + * manager. * * Copyright (c) 1995-1997 Sun Microsystems, Inc. * Copyright (c) 1998-2000 by Scriptics Corporation. * - * 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. */ #include "tkWinInt.h" @@ -19,6 +19,7 @@ /* * These next two defines are only valid on Win2K/XP+. */ + #ifndef WS_EX_LAYERED #define WS_EX_LAYERED 0x00080000 #endif @@ -30,36 +31,38 @@ #endif /* - * Event structure for synthetic activation events. These events are - * placed on the event queue whenever a toplevel gets a WM_MOUSEACTIVATE - * message. + * Event structure for synthetic activation events. These events are placed on + * the event queue whenever a toplevel gets a WM_MOUSEACTIVATE message or + * a WM_ACTIVATE. If the window is being moved (*flagPtr will be true) + * then the handling of this event must be delayed until the operation + * has completed to avoid a premature WM_EXITSIZEMOVE event. */ typedef struct ActivateEvent { Tcl_Event ev; TkWindow *winPtr; + const int *flagPtr; + HWND hwnd; } ActivateEvent; /* - * A data structure of the following type holds information for - * each window manager protocol (such as WM_DELETE_WINDOW) for - * which a handler (i.e. a Tcl command) has been defined for a - * particular top-level window. + * A data structure of the following type holds information for each window + * manager protocol (such as WM_DELETE_WINDOW) for which a handler (i.e. a Tcl + * command) has been defined for a particular top-level window. */ typedef struct ProtocolHandler { Atom protocol; /* Identifies the protocol. */ struct ProtocolHandler *nextPtr; - /* Next in list of protocol handlers for - * the same top-level window, or NULL for - * end of list. */ + /* Next in list of protocol handlers for the + * same top-level window, or NULL for end of + * list. */ Tcl_Interp *interp; /* Interpreter in which to invoke command. */ - char command[4]; /* Tcl command to invoke when a client - * message for this protocol arrives. - * The actual size of the structure varies - * to accommodate the needs of the actual - * command. THIS MUST BE THE LAST FIELD OF - * THE STRUCTURE. */ + char command[4]; /* Tcl command to invoke when a client message + * for this protocol arrives. The actual size + * of the structure varies to accommodate the + * needs of the actual command. THIS MUST BE + * THE LAST FIELD OF THE STRUCTURE. */ } ProtocolHandler; #define HANDLER_SIZE(cmdLength) \ @@ -68,81 +71,87 @@ typedef struct ProtocolHandler { /* * Helper type passed via lParam to TkWmStackorderToplevelEnumProc */ + typedef struct TkWmStackorderToplevelPair { Tcl_HashTable *table; TkWindow **window_ptr; } TkWmStackorderToplevelPair; /* - * This structure represents the contents of a icon, in terms of its - * image. The HICON is an internal Windows format. Most of these - * icon-specific-structures originated with the Winico extension. - * We stripped out unused parts of that code, and integrated the - * code more naturally with Tcl. + * This structure represents the contents of a icon, in terms of its image. + * The HICON is an internal Windows format. Most of these icon-specific + * structures originated with the Winico extension. We stripped out unused + * parts of that code, and integrated the code more naturally with Tcl. */ + typedef struct { - UINT Width, Height, Colors; /* Width, Height and bpp */ - LPBYTE lpBits; /* ptr to DIB bits */ - DWORD dwNumBytes; /* how many bytes? */ - LPBITMAPINFO lpbi; /* ptr to header */ - LPBYTE lpXOR; /* ptr to XOR image bits */ - LPBYTE lpAND; /* ptr to AND image bits */ - HICON hIcon; /* DAS ICON */ + UINT Width, Height, Colors; /* Width, Height and bpp */ + LPBYTE lpBits; /* Ptr to DIB bits */ + DWORD dwNumBytes; /* How many bytes? */ + LPBITMAPINFO lpbi; /* Ptr to header */ + LPBYTE lpXOR; /* Ptr to XOR image bits */ + LPBYTE lpAND; /* Ptr to AND image bits */ + HICON hIcon; /* DAS ICON */ } ICONIMAGE, *LPICONIMAGE; + /* - * This structure is how we represent a block of the above - * items. We will reallocate these structures according to - * how many images they need to contain. + * This structure is how we represent a block of the above items. We will + * reallocate these structures according to how many images they need to + * contain. */ + typedef struct { - int nNumImages; /* How many images? */ - ICONIMAGE IconImages[1]; /* Image entries */ + int nNumImages; /* How many images? */ + ICONIMAGE IconImages[1]; /* Image entries */ } BlockOfIconImages, *BlockOfIconImagesPtr; + /* - * These two structures are used to read in icons from an - * 'icon directory' (i.e. the contents of a .icr file, say). - * We only use these structures temporarily, since we copy - * the information we want into a BlockOfIconImages. + * These two structures are used to read in icons from an 'icon directory' + * (i.e. the contents of a .icr file, say). We only use these structures + * temporarily, since we copy the information we want into a + * BlockOfIconImages. */ + typedef struct { - BYTE bWidth; /* Width of the image */ - BYTE bHeight; /* Height of the image (times 2) */ - BYTE bColorCount; /* Number of colors in image (0 if >=8bpp) */ - BYTE bReserved; /* Reserved */ - WORD wPlanes; /* Color Planes */ - WORD wBitCount; /* Bits per pixel */ - DWORD dwBytesInRes; /* how many bytes in this resource? */ - DWORD dwImageOffset; /* where in the file is this image */ + BYTE bWidth; /* Width of the image */ + BYTE bHeight; /* Height of the image (times 2) */ + BYTE bColorCount; /* Number of colors in image (0 if >=8bpp) */ + BYTE bReserved; /* Reserved */ + WORD wPlanes; /* Color Planes */ + WORD wBitCount; /* Bits per pixel */ + DWORD dwBytesInRes; /* How many bytes in this resource? */ + DWORD dwImageOffset; /* Where in the file is this image */ } ICONDIRENTRY, *LPICONDIRENTRY; + typedef struct { - WORD idReserved; /* Reserved */ - WORD idType; /* resource type (1 for icons) */ - WORD idCount; /* how many images? */ - ICONDIRENTRY idEntries[1]; /* the entries for each image */ + WORD idReserved; /* Reserved */ + WORD idType; /* Resource type (1 for icons) */ + WORD idCount; /* How many images? */ + ICONDIRENTRY idEntries[1]; /* The entries for each image */ } ICONDIR, *LPICONDIR; /* - * A pointer to one of these strucutures is associated with each - * toplevel. This allows us to free up all memory associated with icon - * resources when a window is deleted or if the window's icon is - * changed. They are simply reference counted according to: + * A pointer to one of these strucutures is associated with each toplevel. + * This allows us to free up all memory associated with icon resources when a + * window is deleted or if the window's icon is changed. They are simply + * reference counted according to: * - * (i) how many WmInfo structures point to this object - * (ii) whether the ThreadSpecificData defined in this file contains - * a pointer to this object. + * (1) How many WmInfo structures point to this object + * (2) Whether the ThreadSpecificData defined in this file contains a pointer + * to this object. * - * The former count is for windows whose icons are individually - * set, and the latter is for the global default icon choice. + * The former count is for windows whose icons are individually set, and the + * latter is for the global default icon choice. * - * Icons loaded from .icr/.icr use the iconBlock field, icons - * loaded from .exe/.dll use the hIcon field. + * Icons loaded from .icr/.icr use the iconBlock field, icons loaded from + * .exe/.dll use the hIcon field. */ + typedef struct WinIconInstance { - int refCount; /* Number of instances that share this - * data structure. */ + int refCount; /* Number of instances that share this data + * structure. */ BlockOfIconImagesPtr iconBlock; - /* Pointer to icon resource data for - * image. */ + /* Pointer to icon resource data for image */ } WinIconInstance; typedef struct WinIconInstance *WinIconPtr; @@ -153,96 +162,97 @@ typedef struct WinIconInstance *WinIconPtr; */ typedef struct TkWmInfo { - TkWindow *winPtr; /* Pointer to main Tk information for - * this window. */ - HWND wrapper; /* This is the decorative frame window - * created by the window manager to wrap - * a toplevel window. This window is - * a direct child of the root window. */ - char *title; /* Title to display in window caption. If - * NULL, use name of widget. Malloced. */ - char *iconName; /* Name to display in icon. Malloced. */ - XWMHints hints; /* Various pieces of information for - * window manager. */ + TkWindow *winPtr; /* Pointer to main Tk information for this + * window. */ + HWND wrapper; /* This is the decorative frame window created + * by the window manager to wrap a toplevel + * window. This window is a direct child of + * the root window. */ + char *title; /* Title to display in window caption. If + * NULL, use name of widget. Malloced. */ + char *iconName; /* Name to display in icon. Malloced. */ + XWMHints hints; /* Various pieces of information for window + * manager. */ char *leaderName; /* Path name of leader of window group * (corresponds to hints.window_group). - * Malloc-ed. Note: this field doesn't - * get updated if leader is destroyed. */ + * Malloc-ed. Note: this field doesn't get + * updated if leader is destroyed. */ TkWindow *masterPtr; /* Master window for TRANSIENT_FOR property, * or NULL. */ - Tk_Window icon; /* Window to use as icon for this window, - * or NULL. */ + Tk_Window icon; /* Window to use as icon for this window, or + * NULL. */ Tk_Window iconFor; /* Window for which this window is icon, or * NULL if this isn't an icon for anyone. */ /* - * Information used to construct an XSizeHints structure for - * the window manager: + * Information used to construct an XSizeHints structure for the window + * manager: */ int defMinWidth, defMinHeight, defMaxWidth, defMaxHeight; /* Default resize limits given by system. */ - int sizeHintsFlags; /* Flags word for XSizeHints structure. - * If the PBaseSize flag is set then the - * window is gridded; otherwise it isn't - * gridded. */ - int minWidth, minHeight; /* Minimum dimensions of window, in - * pixels or grid units. */ - int maxWidth, maxHeight; /* Maximum dimensions of window, in - * pixels or grid units. 0 to default. */ + int sizeHintsFlags; /* Flags word for XSizeHints structure. If the + * PBaseSize flag is set then the window is + * gridded; otherwise it isn't gridded. */ + int minWidth, minHeight; /* Minimum dimensions of window, in pixels or + * grid units. */ + int maxWidth, maxHeight; /* Maximum dimensions of window, in pixels or + * grid units. 0 to default. */ Tk_Window gridWin; /* Identifies the window that controls - * gridding for this top-level, or NULL if - * the top-level isn't currently gridded. */ - int widthInc, heightInc; /* Increments for size changes (# pixels - * per step). */ + * gridding for this top-level, or NULL if the + * top-level isn't currently gridded. */ + int widthInc, heightInc; /* Increments for size changes (# pixels per + * step). */ struct { int x; /* numerator */ - int y; /* denominator */ + int y; /* denominator */ } minAspect, maxAspect; /* Min/max aspect ratios for window. */ int reqGridWidth, reqGridHeight; - /* The dimensions of the window (in - * grid units) requested through - * the geometry manager. */ + /* The dimensions of the window (in grid + * units) requested through the geometry + * manager. */ int gravity; /* Desired window gravity. */ /* * Information used to manage the size and location of a window. */ - int width, height; /* Desired dimensions of window, specified - * in pixels or grid units. These values are - * set by the "wm geometry" command and by - * ConfigureNotify events (for when wm - * resizes window). -1 means user hasn't - * requested dimensions. */ + int width, height; /* Desired dimensions of window, specified in + * pixels or grid units. These values are set + * by the "wm geometry" command and by + * ConfigureNotify events (for when wm resizes + * window). -1 means user hasn't requested + * dimensions. */ int x, y; /* Desired X and Y coordinates for window. - * These values are set by "wm geometry", - * plus by ConfigureNotify events (when wm - * moves window). These numbers are - * different than the numbers stored in - * winPtr->changes because (a) they could be - * measured from the right or bottom edge - * of the screen (see WM_NEGATIVE_X and - * WM_NEGATIVE_Y flags) and (b) if the window - * has been reparented then they refer to the - * parent rather than the window itself. */ + * These values are set by "wm geometry", plus + * by ConfigureNotify events (when wm moves + * window). These numbers are different than + * the numbers stored in winPtr->changes + * because (a) they could be measured from the + * right or bottom edge of the screen (see + * WM_NEGATIVE_X and WM_NEGATIVE_Y flags) and + * (b) if the window has been reparented then + * they refer to the parent rather than the + * window itself. */ int borderWidth, borderHeight; /* Width and height of window dressing, in - * pixels for the current style/exStyle. This + * pixels for the current style/exStyle. This * includes the border on both sides of the * window. */ + int configX, configY; /* x,y position of toplevel when window is + * switched into fullscreen state, */ int configWidth, configHeight; /* Dimensions passed to last request that we - * issued to change geometry of window. Used - * to eliminate redundant resize operations. */ + * issued to change geometry of window. Used + * to eliminate redundant resize operations */ HMENU hMenu; /* the hMenu associated with this menu */ DWORD style, exStyle; /* Style flags for the wrapper window. */ LONG styleConfig; /* Extra user requested style bits */ LONG exStyleConfig; /* Extra user requested extended style bits */ Tcl_Obj *crefObj; /* COLORREF object for transparent handling */ COLORREF colorref; /* COLORREF for transparent handling */ - double alpha; /* Alpha transparency level - * 0.0 (fully transparent) .. 1.0 (opaque) */ + double alpha; /* Alpha transparency level 0.0 (fully + * transparent) .. 1.0 (opaque) */ /* * List of children of the toplevel which have private colormaps. @@ -255,61 +265,60 @@ typedef struct TkWmInfo { * Miscellaneous information. */ - ProtocolHandler *protPtr; /* First in list of protocol handlers for - * this window (NULL means none). */ + ProtocolHandler *protPtr; /* First in list of protocol handlers for this + * window (NULL means none). */ int cmdArgc; /* Number of elements in cmdArgv below. */ - CONST char **cmdArgv; /* Array of strings to store in the - * WM_COMMAND property. NULL means nothing - * available. */ + CONST char **cmdArgv; /* Array of strings to store in the WM_COMMAND + * property. NULL means nothing available. */ char *clientMachine; /* String to store in WM_CLIENT_MACHINE * property, or NULL. */ int flags; /* Miscellaneous flags, defined below. */ - int numTransients; /* number of transients on this window */ - WinIconPtr iconPtr; /* pointer to titlebar icon structure for - * this window, or NULL. */ + int numTransients; /* Number of transients on this window */ + WinIconPtr iconPtr; /* Pointer to titlebar icon structure for this + * window, or NULL. */ struct TkWmInfo *nextPtr; /* Next in list of all top-level windows. */ } WmInfo; /* * Flag values for WmInfo structures: * - * WM_NEVER_MAPPED - non-zero means window has never been - * mapped; need to update all info when - * window is first mapped. - * WM_UPDATE_PENDING - non-zero means a call to UpdateGeometryInfo - * has already been scheduled for this - * window; no need to schedule another one. - * WM_NEGATIVE_X - non-zero means x-coordinate is measured in - * pixels from right edge of screen, rather - * than from left edge. - * WM_NEGATIVE_Y - non-zero means y-coordinate is measured in + * WM_NEVER_MAPPED - Non-zero means window has never been mapped; + * need to update all info when window is first + * mapped. + * WM_UPDATE_PENDING - Non-zero means a call to UpdateGeometryInfo + * has already been scheduled for this window; + * no need to schedule another one. + * WM_NEGATIVE_X - Non-zero means x-coordinate is measured in + * pixels from right edge of screen, rather than + * from left edge. + * WM_NEGATIVE_Y - Non-zero means y-coordinate is measured in * pixels up from bottom of screen, rather than * down from top. - * WM_UPDATE_SIZE_HINTS - non-zero means that new size hints need to be + * WM_UPDATE_SIZE_HINTS - Non-zero means that new size hints need to be * propagated to window manager. Not used on Win. - * WM_SYNC_PENDING - set to non-zero while waiting for the window + * WM_SYNC_PENDING - Set to non-zero while waiting for the window * manager to respond to some state change. - * WM_MOVE_PENDING - non-zero means the application has requested - * a new position for the window, but it hasn't - * been reflected through the window manager - * yet. - * WM_COLORMAPS_EXPLICIT - non-zero means the colormap windows were - * set explicitly via "wm colormapwindows". - * WM_ADDED_TOPLEVEL_COLORMAP - non-zero means that when "wm colormapwindows" + * WM_MOVE_PENDING - Non-zero means the application has requested a + * new position for the window, but it hasn't + * been reflected through the window manager yet. + * WM_COLORMAPS_EXPLICIT - Non-zero means the colormap windows were set + * explicitly via "wm colormapwindows". + * WM_ADDED_TOPLEVEL_COLORMAP - Non-zero means that when "wm colormapwindows" * was called the top-level itself wasn't - * specified, so we added it implicitly at - * the end of the list. - * WM_WIDTH_NOT_RESIZABLE - non-zero means that we're not supposed to + * specified, so we added it implicitly at the + * end of the list. + * WM_WIDTH_NOT_RESIZABLE - Non-zero means that we're not supposed to * allow the user to change the width of the - * window (controlled by "wm resizable" - * command). - * WM_HEIGHT_NOT_RESIZABLE - non-zero means that we're not supposed to + * window (controlled by "wm resizable" command). + * WM_HEIGHT_NOT_RESIZABLE - Non-zero means that we're not supposed to * allow the user to change the height of the - * window (controlled by "wm resizable" - * command). - * WM_WITHDRAWN - non-zero means that this window has explicitly + * window (controlled by "wm resizable" command). + * WM_WITHDRAWN - Non-zero means that this window has explicitly * been withdrawn. If it's a transient, it should * not mirror state changes in the master. + * WM_FULLSCREEN - Non-zero means that this window has been placed + * in the full screen mode. It should be mapped at + * 0,0 and be the width and height of the screen. */ #define WM_NEVER_MAPPED (1<<0) @@ -325,6 +334,7 @@ typedef struct TkWmInfo { #define WM_WIDTH_NOT_RESIZABLE (1<<10) #define WM_HEIGHT_NOT_RESIZABLE (1<<11) #define WM_WITHDRAWN (1<<12) +#define WM_FULLSCREEN (1<<13) /* * Window styles for various types of toplevel windows. @@ -333,6 +343,9 @@ typedef struct TkWmInfo { #define WM_OVERRIDE_STYLE (WS_CLIPCHILDREN|WS_CLIPSIBLINGS|CS_DBLCLKS) #define EX_OVERRIDE_STYLE (WS_EX_TOOLWINDOW) +#define WM_FULLSCREEN_STYLE (WS_POPUP|WM_OVERRIDE_STYLE) +#define EX_FULLSCREEN_STYLE (WS_EX_APPWINDOW) + #define WM_TOPLEVEL_STYLE (WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN|CS_DBLCLKS) #define EX_TOPLEVEL_STYLE (0) @@ -341,257 +354,258 @@ typedef struct TkWmInfo { #define EX_TRANSIENT_STYLE (WS_EX_DLGMODALFRAME) /* - * The following structure is the official type record for geometry - * management of top-level windows. + * The following structure is the official type record for geometry management + * of top-level windows. */ static void TopLevelReqProc(ClientData dummy, Tk_Window tkwin); +static void RemapWindows(TkWindow *winPtr, HWND parentHWND); -static Tk_GeomMgr wmMgrType = { - "wm", /* name */ - TopLevelReqProc, /* requestProc */ - (Tk_GeomLostSlaveProc *) NULL, /* lostSlaveProc */ +static const Tk_GeomMgr wmMgrType = { + "wm", /* name */ + TopLevelReqProc, /* requestProc */ + NULL, /* lostSlaveProc */ }; typedef struct ThreadSpecificData { - HPALETTE systemPalette; /* System palette; refers to the - * currently installed foreground logical - * palette. */ - TkWindow *createWindow; /* Window that is being constructed. This - * value is set immediately before a - * call to CreateWindowEx, and is used - * by SetLimits. This is a gross hack - * needed to work around Windows brain - * damage where it sends the - * WM_GETMINMAXINFO message before the - * WM_CREATE window. */ - int initialized; /* Flag indicating whether thread- - * specific elements of module have - * been initialized. */ - int firstWindow; /* Flag, cleared when the first window - * is mapped in a non-iconic state. */ - WinIconPtr iconPtr; /* IconPtr being used as default for all - * toplevels, or NULL. */ + HPALETTE systemPalette; /* System palette; refers to the currently + * installed foreground logical palette. */ + TkWindow *createWindow; /* Window that is being constructed. This + * value is set immediately before a call to + * CreateWindowEx, and is used by SetLimits. + * This is a gross hack needed to work around + * Windows brain damage where it sends the + * WM_GETMINMAXINFO message before the + * WM_CREATE window. */ + int initialized; /* Flag indicating whether thread-specific + * elements of module have been + * initialized. */ + int firstWindow; /* Flag, cleared when the first window is + * mapped in a non-iconic state. */ + WinIconPtr iconPtr; /* IconPtr being used as default for all + * toplevels, or NULL. */ } ThreadSpecificData; static Tcl_ThreadDataKey dataKey; /* - * The following variables cannot be placed in thread local storage - * because they must be shared across threads. + * The following variables cannot be placed in thread local storage because + * they must be shared across threads. */ -static int initialized; /* Flag indicating whether module has - * been initialized. */ +static int initialized; /* Flag indicating whether module has been + * initialized. */ -/* - * A pointer to a shell proc which allows us to extract icons from - * any file. We just initialize this when we start up (if we can) - * and then it never changes +/* + * A pointer to a shell proc which allows us to extract icons from any file. + * We just initialize this when we start up (if we can) and then it never + * changes */ + DWORD* (WINAPI *shgetfileinfoProc) (LPCTSTR pszPath, DWORD dwFileAttributes, - SHFILEINFO* psfi, UINT cbFileInfo, UINT uFlags) = NULL; + SHFILEINFO* psfi, UINT cbFileInfo, UINT uFlags) = NULL; /* - * A pointer to SetLayeredWindowAttributes (user32.dll) which we - * retrieve dynamically because it is only valid on Win2K+. + * A pointer to SetLayeredWindowAttributes (user32.dll) which we retrieve + * dynamically because it is only valid on Win2K+. */ + BOOL (WINAPI *setLayeredWindowAttributesProc) (HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags) = NULL; TCL_DECLARE_MUTEX(winWmMutex) /* - * Forward declarations for procedures defined in this file: + * Forward declarations for functions defined in this file: */ -static int ActivateWindow _ANSI_ARGS_((Tcl_Event *evPtr, - int flags)); -static void ConfigureTopLevel _ANSI_ARGS_((WINDOWPOS *pos)); -static void GenerateConfigureNotify _ANSI_ARGS_(( - TkWindow *winPtr)); -static void GetMaxSize _ANSI_ARGS_((WmInfo *wmPtr, - int *maxWidthPtr, int *maxHeightPtr)); -static void GetMinSize _ANSI_ARGS_((WmInfo *wmPtr, - int *minWidthPtr, int *minHeightPtr)); -static TkWindow * GetTopLevel _ANSI_ARGS_((HWND hwnd)); -static void InitWm _ANSI_ARGS_((void)); -static int InstallColormaps _ANSI_ARGS_((HWND hwnd, int message, - int isForemost)); -static void InvalidateSubTree _ANSI_ARGS_((TkWindow *winPtr, - Colormap colormap)); -static void InvalidateSubTreeDepth _ANSI_ARGS_((TkWindow *winPtr)); -static int ParseGeometry _ANSI_ARGS_((Tcl_Interp *interp, - char *string, TkWindow *winPtr)); -static void RefreshColormap _ANSI_ARGS_((Colormap colormap, - TkDisplay *dispPtr)); -static void SetLimits _ANSI_ARGS_((HWND hwnd, MINMAXINFO *info)); -static void TkWmStackorderToplevelWrapperMap _ANSI_ARGS_(( - TkWindow *winPtr, - Display *display, - Tcl_HashTable *table)); -static LRESULT CALLBACK TopLevelProc _ANSI_ARGS_((HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam)); -static void TopLevelEventProc _ANSI_ARGS_((ClientData clientData, - XEvent *eventPtr)); -static void TopLevelReqProc _ANSI_ARGS_((ClientData dummy, - Tk_Window tkwin)); -static void UpdateGeometryInfo _ANSI_ARGS_(( - ClientData clientData)); -static void UpdateWrapper _ANSI_ARGS_((TkWindow *winPtr)); -static LRESULT CALLBACK WmProc _ANSI_ARGS_((HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam)); -static void WmWaitVisibilityOrMapProc _ANSI_ARGS_(( - ClientData clientData, XEvent *eventPtr)); -static BlockOfIconImagesPtr ReadIconOrCursorFromFile _ANSI_ARGS_(( - Tcl_Interp *interp, Tcl_Obj* fileName, BOOL isIcon)); -static WinIconPtr ReadIconFromFile _ANSI_ARGS_(( - Tcl_Interp *interp, Tcl_Obj *fileName)); -static WinIconPtr GetIconFromPixmap _ANSI_ARGS_((Display *dsPtr, - Pixmap pixmap)); -static int ReadICOHeader _ANSI_ARGS_((Tcl_Channel channel)); -static BOOL AdjustIconImagePointers _ANSI_ARGS_((LPICONIMAGE lpImage)); -static HICON MakeIconOrCursorFromResource - _ANSI_ARGS_((LPICONIMAGE lpIcon, BOOL isIcon)); -static HICON GetIcon _ANSI_ARGS_((WinIconPtr titlebaricon, - int icon_size)); -static int WinSetIcon _ANSI_ARGS_((Tcl_Interp *interp, - WinIconPtr titlebaricon, Tk_Window tkw)); -static void FreeIconBlock _ANSI_ARGS_((BlockOfIconImagesPtr lpIR)); -static void DecrIconRefCount _ANSI_ARGS_((WinIconPtr titlebaricon)); - -static int WmAspectCmd _ANSI_ARGS_((Tk_Window tkwin, +static int ActivateWindow(Tcl_Event *evPtr, int flags); +static void ConfigureTopLevel(WINDOWPOS *pos); +static void GenerateConfigureNotify(TkWindow *winPtr); +static void GenerateActivateEvent(TkWindow *winPtr, const int *flagPtr); +static void GetMaxSize(WmInfo *wmPtr, + int *maxWidthPtr, int *maxHeightPtr); +static void GetMinSize(WmInfo *wmPtr, + int *minWidthPtr, int *minHeightPtr); +static TkWindow * GetTopLevel(HWND hwnd); +static void InitWm(void); +static int InstallColormaps(HWND hwnd, int message, + int isForemost); +static void InvalidateSubTree(TkWindow *winPtr, Colormap colormap); +static void InvalidateSubTreeDepth(TkWindow *winPtr); +static int ParseGeometry(Tcl_Interp *interp, char *string, + TkWindow *winPtr); +static void RefreshColormap(Colormap colormap, TkDisplay *dispPtr); +static void SetLimits(HWND hwnd, MINMAXINFO *info); +static void TkWmStackorderToplevelWrapperMap(TkWindow *winPtr, + Display *display, Tcl_HashTable *table); +static LRESULT CALLBACK TopLevelProc(HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam); +static void TopLevelEventProc(ClientData clientData, + XEvent *eventPtr); +static void TopLevelReqProc(ClientData dummy, Tk_Window tkwin); +static void UpdateGeometryInfo(ClientData clientData); +static void UpdateWrapper(TkWindow *winPtr); +static LRESULT CALLBACK WmProc(HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam); +static void WmWaitVisibilityOrMapProc(ClientData clientData, + XEvent *eventPtr); +static BlockOfIconImagesPtr ReadIconOrCursorFromFile(Tcl_Interp *interp, + Tcl_Obj* fileName, BOOL isIcon); +static WinIconPtr ReadIconFromFile(Tcl_Interp *interp, + Tcl_Obj *fileName); +static WinIconPtr GetIconFromPixmap(Display *dsPtr, Pixmap pixmap); +static int ReadICOHeader(Tcl_Channel channel); +static BOOL AdjustIconImagePointers(LPICONIMAGE lpImage); +static HICON MakeIconOrCursorFromResource(LPICONIMAGE lpIcon, + BOOL isIcon); +static HICON GetIcon(WinIconPtr titlebaricon, int icon_size); +static int WinSetIcon(Tcl_Interp *interp, + WinIconPtr titlebaricon, Tk_Window tkw); +static void FreeIconBlock(BlockOfIconImagesPtr lpIR); +static void DecrIconRefCount(WinIconPtr titlebaricon); + +static int WmAspectCmd(Tk_Window tkwin, + TkWindow *winPtr, Tcl_Interp *interp, int objc, + Tcl_Obj *CONST objv[]); +static int WmAttributesCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmAttributesCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmClientCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmClientCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmColormapwindowsCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmColormapwindowsCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmCommandCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmCommandCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmDeiconifyCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmDeiconifyCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmFocusmodelCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmFocusmodelCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmForgetCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmFrameCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmFrameCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmGeometryCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmGeometryCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmGridCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmGridCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmGroupCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmGroupCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmIconbitmapCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmIconbitmapCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmIconifyCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmIconifyCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmIconmaskCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmIconmaskCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmIconnameCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmIconnameCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmIconphotoCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmIconphotoCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmIconpositionCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmIconpositionCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmIconwindowCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmIconwindowCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmMaxsizeCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmManageCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmMinsizeCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmMaxsizeCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmOverrideredirectCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmMinsizeCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmPositionfromCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmOverrideredirectCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmProtocolCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmPositionfromCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmResizableCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmProtocolCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmSizefromCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmResizableCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmStackorderCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmSizefromCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmStateCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmStackorderCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmTitleCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmStateCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmTransientCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmTitleCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static int WmWithdrawCmd _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *CONST objv[]); +static int WmTransientCmd(Tk_Window tkwin, TkWindow *winPtr, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[])); -static void WmUpdateGeom _ANSI_ARGS_((WmInfo *wmPtr, - TkWindow *winPtr)); + Tcl_Obj *CONST objv[]); +static int WmWithdrawCmd(Tk_Window tkwin, + TkWindow *winPtr, Tcl_Interp *interp, int objc, + Tcl_Obj *CONST objv[]); +static void WmUpdateGeom(WmInfo *wmPtr, TkWindow *winPtr); -/* Used in BytesPerLine */ -#define WIDTHBYTES(bits) ((((bits) + 31)>>5)<<2) +/* + * Used in BytesPerLine + */ +#define WIDTHBYTES(bits) ((((bits) + 31)>>5)<<2) + /* *---------------------------------------------------------------------- * * DIBNumColors -- * - * Calculates the number of entries in the color table, given by - * LPSTR lpbi - pointer to the CF_DIB memory block. Used by - * titlebar icon code. + * Calculates the number of entries in the color table, given by LPSTR + * lpbi - pointer to the CF_DIB memory block. Used by titlebar icon code. * * Results: - * - * WORD - Number of entries in the color table. - * - * Side effects: None. - * + * WORD - Number of entries in the color table. * *---------------------------------------------------------------------- */ -static WORD -DIBNumColors( LPSTR lpbi ) + +static WORD +DIBNumColors( + LPSTR lpbi) { WORD wBitCount; DWORD dwClrUsed; dwClrUsed = ((LPBITMAPINFOHEADER) lpbi)->biClrUsed; - if (dwClrUsed) + if (dwClrUsed) { return (WORD) dwClrUsed; + } wBitCount = ((LPBITMAPINFOHEADER) lpbi)->biBitCount; - switch (wBitCount) - { - case 1: return 2; - case 4: return 16; - case 8: return 256; - default:return 0; + switch (wBitCount) { + case 1: + return 2; + case 4: + return 16; + case 8: + return 256; + default: + return 0; } } @@ -600,22 +614,19 @@ DIBNumColors( LPSTR lpbi ) * * PaletteSize -- * - * Calculates the number of bytes in the color table, as given by - * LPSTR lpbi - pointer to the CF_DIB memory block. Used by - * titlebar icon code. + * Calculates the number of bytes in the color table, as given by LPSTR + * lpbi - pointer to the CF_DIB memory block. Used by titlebar icon code. * * Results: - * number of bytes in the color table - * - * Side effects: None. - * + * Number of bytes in the color table * *---------------------------------------------------------------------- */ -static WORD -PaletteSize( LPSTR lpbi ) +static WORD +PaletteSize( + LPSTR lpbi) { - return ((WORD)( DIBNumColors( lpbi ) * sizeof( RGBQUAD )) ); + return (WORD) (DIBNumColors(lpbi) * sizeof(RGBQUAD)); } /* @@ -623,9 +634,8 @@ PaletteSize( LPSTR lpbi ) * * FindDIBits -- * - * Locate the image bits in a CF_DIB format DIB, as given by - * LPSTR lpbi - pointer to the CF_DIB memory block. Used by - * titlebar icon code. + * Locate the image bits in a CF_DIB format DIB, as given by LPSTR lpbi - + * pointer to the CF_DIB memory block. Used by titlebar icon code. * * Results: * pointer to the image bits @@ -635,10 +645,12 @@ PaletteSize( LPSTR lpbi ) * *---------------------------------------------------------------------- */ -static LPSTR -FindDIBBits( LPSTR lpbi ) + +static LPSTR +FindDIBBits( + LPSTR lpbi) { - return ( lpbi + *(LPDWORD)lpbi + PaletteSize( lpbi ) ); + return lpbi + *(LPDWORD)lpbi + PaletteSize(lpbi); } /* @@ -647,19 +659,18 @@ FindDIBBits( LPSTR lpbi ) * BytesPerLine -- * * Calculates the number of bytes in one scan line, as given by - * LPBITMAPINFOHEADER lpBMIH - pointer to the BITMAPINFOHEADER - * that begins the CF_DIB block. Used by titlebar icon code. + * LPBITMAPINFOHEADER lpBMIH - pointer to the BITMAPINFOHEADER that + * begins the CF_DIB block. Used by titlebar icon code. * * Results: * number of bytes in one scan line (DWORD aligned) * - * Side effects: None - * - * *---------------------------------------------------------------------- */ -static DWORD -BytesPerLine( LPBITMAPINFOHEADER lpBMIH ) + +static DWORD +BytesPerLine( + LPBITMAPINFOHEADER lpBMIH) { return WIDTHBYTES(lpBMIH->biWidth * lpBMIH->biPlanes * lpBMIH->biBitCount); } @@ -669,41 +680,66 @@ BytesPerLine( LPBITMAPINFOHEADER lpBMIH ) * * AdjustIconImagePointers -- * - * Adjusts internal pointers in icon resource struct, as given - * by LPICONIMAGE lpImage - the resource to handle. Used by - * titlebar icon code. + * Adjusts internal pointers in icon resource struct, as given by + * LPICONIMAGE lpImage - the resource to handle. Used by titlebar icon + * code. * * Results: * BOOL - TRUE for success, FALSE for failure * - * Side effects: - * - * *---------------------------------------------------------------------- */ -static BOOL -AdjustIconImagePointers( LPICONIMAGE lpImage ) + +static BOOL +AdjustIconImagePointers( + LPICONIMAGE lpImage) { - /* Sanity check */ - if (lpImage==NULL) + /* + * Sanity check. + */ + + if (lpImage == NULL) { return FALSE; - /* BITMAPINFO is at beginning of bits */ + } + + /* + * BITMAPINFO is at beginning of bits. + */ + lpImage->lpbi = (LPBITMAPINFO)lpImage->lpBits; - /* Width - simple enough */ + + /* + * Width - simple enough. + */ + lpImage->Width = lpImage->lpbi->bmiHeader.biWidth; - /* - * Icons are stored in funky format where height is doubled - * so account for that + + /* + * Icons are stored in funky format where height is doubled so account for + * that. */ + lpImage->Height = (lpImage->lpbi->bmiHeader.biHeight)/2; - /* How many colors? */ - lpImage->Colors = lpImage->lpbi->bmiHeader.biPlanes * - lpImage->lpbi->bmiHeader.biBitCount; - /* XOR bits follow the header and color table */ + + /* + * How many colors? + */ + + lpImage->Colors = lpImage->lpbi->bmiHeader.biPlanes + * lpImage->lpbi->bmiHeader.biBitCount; + + /* + * XOR bits follow the header and color table. + */ + lpImage->lpXOR = (LPBYTE)FindDIBBits(((LPSTR)lpImage->lpbi)); - /* AND bits follow the XOR bits */ + + /* + * AND bits follow the XOR bits. + */ + lpImage->lpAND = lpImage->lpXOR + (lpImage->Height* - BytesPerLine((LPBITMAPINFOHEADER)(lpImage->lpbi))); + BytesPerLine((LPBITMAPINFOHEADER)(lpImage->lpbi))); return TRUE; } @@ -712,50 +748,70 @@ AdjustIconImagePointers( LPICONIMAGE lpImage ) * * MakeIconOrCursorFromResource -- * - * Construct an actual HICON structure from the information - * in a resource. + * Construct an actual HICON structure from the information in a + * resource. * * Results: - * - * - * Side effects: - * + * Icon * *---------------------------------------------------------------------- */ -static HICON -MakeIconOrCursorFromResource(LPICONIMAGE lpIcon, BOOL isIcon) { + +static HICON +MakeIconOrCursorFromResource( + LPICONIMAGE lpIcon, + BOOL isIcon) +{ HICON hIcon ; static FARPROC pfnCreateIconFromResourceEx=NULL; static int initinfo=0; - /* Sanity Check */ - if (lpIcon == NULL) + + /* + * Sanity Check + */ + + if (lpIcon == NULL) { return NULL; - if (lpIcon->lpBits == NULL) + } + if (lpIcon->lpBits == NULL) { return NULL; + } + if (!initinfo) { HMODULE hMod = GetModuleHandleA("USER32.DLL"); - initinfo=1; - if (hMod){ - pfnCreateIconFromResourceEx = - GetProcAddress(hMod, "CreateIconFromResourceEx"); - } - } - /* Let the OS do the real work :) */ - if (pfnCreateIconFromResourceEx!=NULL) { - hIcon = (HICON) (pfnCreateIconFromResourceEx) - (lpIcon->lpBits, lpIcon->dwNumBytes, isIcon, 0x00030000, - (*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biWidth, - (*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biHeight/2, 0); + + initinfo = 1; + if (hMod) { + pfnCreateIconFromResourceEx = + GetProcAddress(hMod, "CreateIconFromResourceEx"); + } + } + + /* + * Let the OS do the real work :) + */ + + if (pfnCreateIconFromResourceEx != NULL) { + hIcon = (HICON) (pfnCreateIconFromResourceEx) (lpIcon->lpBits, + lpIcon->dwNumBytes, isIcon, 0x00030000, + (*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biWidth, + (*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biHeight/2, 0); } else { hIcon = NULL; } - /* It failed, odds are good we're on NT so try the non-Ex way */ + + /* + * It failed, odds are good we're on NT so try the non-Ex way. + */ + if (hIcon == NULL) { - /* We would break on NT if we try with a 16bpp image */ + /* + * We would break on NT if we try with a 16bpp image. + */ + if (lpIcon->lpbi->bmiHeader.biBitCount != 16) { - hIcon = CreateIconFromResource(lpIcon->lpBits, lpIcon->dwNumBytes, - isIcon, 0x00030000); + hIcon = CreateIconFromResource(lpIcon->lpBits, lpIcon->dwNumBytes, + isIcon, 0x00030000); } } return hIcon; @@ -769,44 +825,51 @@ MakeIconOrCursorFromResource(LPICONIMAGE lpIcon, BOOL isIcon) { * Reads the header from an ICO file, as specfied by channel. * * Results: - * UINT - Number of images in file, -1 for failure. - * If this succeeds, there is a decent chance this is a - * valid icon file. - * - * Side effects: - * + * UINT - Number of images in file, -1 for failure. If this succeeds, + * there is a decent chance this is a valid icon file. * *---------------------------------------------------------------------- */ -static int -ReadICOHeader( Tcl_Channel channel ) + +static int +ReadICOHeader( + Tcl_Channel channel) { - WORD Input; - DWORD dwBytesRead; + union { + WORD word; + char bytes[sizeof(WORD)]; + } input; + + /* + * Read the 'reserved' WORD, which should be a zero word. + */ - /* Read the 'reserved' WORD */ - dwBytesRead = Tcl_Read( channel, (char*)&Input, sizeof( WORD )); - /* Did we get a WORD? */ - if (dwBytesRead != sizeof( WORD )) + if (Tcl_Read(channel, input.bytes, sizeof(WORD)) != sizeof(WORD)) { return -1; - /* Was it 'reserved' ? (ie 0) */ - if (Input != 0) + } + if (input.word != 0) { return -1; - /* Read the type WORD */ - dwBytesRead = Tcl_Read( channel, (char*)&Input, sizeof( WORD )); - /* Did we get a WORD? */ - if (dwBytesRead != sizeof( WORD )) + } + + /* + * Read the type WORD, which should be of type 1. + */ + + if (Tcl_Read(channel, input.bytes, sizeof(WORD)) != sizeof(WORD)) { return -1; - /* Was it type 1? */ - if (Input != 1) + } + if (input.word != 1) { return -1; - /* Get the count of images */ - dwBytesRead = Tcl_Read( channel, (char*)&Input, sizeof( WORD )); - /* Did we get a WORD? */ - if (dwBytesRead != sizeof( WORD )) + } + + /* + * Get and return the count of images. + */ + + if (Tcl_Read(channel, input.bytes, sizeof(WORD)) != sizeof(WORD)) { return -1; - /* Return the count */ - return (int)Input; + } + return (int) input.word; } /* @@ -824,10 +887,12 @@ ReadICOHeader( Tcl_Channel channel ) * *---------------------------------------------------------------------- */ -static int -InitWindowClass(WinIconPtr titlebaricon) + +static int +InitWindowClass( + WinIconPtr titlebaricon) { - ThreadSpecificData *tsdPtr = (ThreadSpecificData *) + ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (! tsdPtr->initialized) { @@ -845,28 +910,28 @@ InitWindowClass(WinIconPtr titlebaricon) if (shgetfileinfoProc == NULL) { HINSTANCE hInstance = LoadLibraryA("shell32"); if (hInstance != NULL) { - shgetfileinfoProc = - (DWORD* (WINAPI *) (LPCTSTR pszPath, DWORD dwFileAttributes, - SHFILEINFO* psfi, UINT cbFileInfo, UINT uFlags)) GetProcAddress(hInstance, - "SHGetFileInfo"); + shgetfileinfoProc = (DWORD* (WINAPI *) (LPCTSTR pszPath, + DWORD dwFileAttributes, SHFILEINFO* psfi, + UINT cbFileInfo, UINT uFlags)) + GetProcAddress(hInstance, "SHGetFileInfo"); FreeLibrary(hInstance); } } if (setLayeredWindowAttributesProc == NULL) { HINSTANCE hInstance = LoadLibraryA("user32"); if (hInstance != NULL) { - setLayeredWindowAttributesProc = - (BOOL (WINAPI *) (HWND hwnd, COLORREF crKey, - BYTE bAlpha, DWORD dwFlags)) - GetProcAddress(hInstance, - "SetLayeredWindowAttributes"); + setLayeredWindowAttributesProc = (BOOL (WINAPI*)(HWND hwnd, + COLORREF crKey, BYTE bAlpha, DWORD dwFlags)) + GetProcAddress(hInstance,"SetLayeredWindowAttributes"); FreeLibrary(hInstance); } } + /* - * The only difference between WNDCLASSW and WNDCLASSA are - * in pointers, so we can use the generic structure WNDCLASS. + * The only difference between WNDCLASSW and WNDCLASSA are in + * pointers, so we can use the generic structure WNDCLASS. */ + ZeroMemory(&class, sizeof(WNDCLASS)); class.style = CS_HREDRAW | CS_VREDRAW; @@ -881,10 +946,12 @@ InitWindowClass(WinIconPtr titlebaricon) if (class.hIcon == NULL) { return TCL_ERROR; } + /* - * Store pointer to default icon so we know when - * we need to free that information + * Store pointer to default icon so we know when we need to + * free that information */ + tsdPtr->iconPtr = titlebaricon; } class.hCursor = LoadCursor(NULL, IDC_ARROW); @@ -915,6 +982,7 @@ InitWindowClass(WinIconPtr titlebaricon) * *---------------------------------------------------------------------- */ + static void InitWm(void) { @@ -927,52 +995,54 @@ InitWm(void) * * WinSetIcon -- * - * Sets either the default toplevel titlebar icon, or the icon - * for a specific toplevel (if tkw is given, then only that - * window is used). + * Sets either the default toplevel titlebar icon, or the icon for a + * specific toplevel (if tkw is given, then only that window is used). * - * The ref-count of the titlebaricon is NOT changed. If this - * function returns successfully, the caller should assume - * the icon was used (and therefore the ref-count should - * be adjusted to reflect that fact). If the function returned - * an error, the caller should assume the icon was not used - * (and may wish to free the memory associated with it). + * The ref-count of the titlebaricon is NOT changed. If this function + * returns successfully, the caller should assume the icon was used (and + * therefore the ref-count should be adjusted to reflect that fact). If + * the function returned an error, the caller should assume the icon was + * not used (and may wish to free the memory associated with it). * * Results: * A standard Tcl return code. * * Side effects: - * One or all windows may have their icon changed. - * The Tcl result may be modified. - * The window-manager will be initialised if it wasn't already. + * One or all windows may have their icon changed. The Tcl result may be + * modified. The window-manager will be initialised if it wasn't already. * The given window will be forced into existence. * *---------------------------------------------------------------------- */ + static int -WinSetIcon(interp, titlebaricon, tkw) - Tcl_Interp *interp; - WinIconPtr titlebaricon; - Tk_Window tkw; +WinSetIcon( + Tcl_Interp *interp, + WinIconPtr titlebaricon, + Tk_Window tkw) { WmInfo *wmPtr; HWND hwnd; int application = 0; if (tkw == NULL) { - tkw = Tk_MainWindow(interp); + tkw = Tk_MainWindow(interp); application = 1; } if (!(Tk_IsTopLevel(tkw))) { Tcl_AppendResult(interp, "window \"", Tk_PathName(tkw), - "\" isn't a top-level window", (char *) NULL); + "\" isn't a top-level window", NULL); return TCL_ERROR; } if (Tk_WindowId(tkw) == None) { Tk_MakeWindowExist(tkw); } - /* We must get the window's wrapper, not the window itself */ + + /* + * We must get the window's wrapper, not the window itself. + */ + wmPtr = ((TkWindow*)tkw)->wmInfoPtr; hwnd = wmPtr->wrapper; @@ -980,56 +1050,39 @@ WinSetIcon(interp, titlebaricon, tkw) if (hwnd == NULL) { /* * I don't actually think this is ever the correct thing, unless - * perhaps the window doesn't have a wrapper. But I believe all + * perhaps the window doesn't have a wrapper. But I believe all * windows have wrappers. */ + hwnd = Tk_GetHWND(Tk_WindowId(tkw)); } + /* * If we aren't initialised, then just initialise with the user's - * icon. Otherwise our icon choice will be ignored moments later - * when Tk finishes initialising. + * icon. Otherwise our icon choice will be ignored moments later when + * Tk finishes initialising. */ + if (!initialized) { if (InitWindowClass(titlebaricon) != TCL_OK) { - Tcl_AppendResult(interp,"Unable to set icon", (char*)NULL); + Tcl_AppendResult(interp, "Unable to set icon", NULL); return TCL_ERROR; } } else { ThreadSpecificData *tsdPtr; - if ( -#ifdef _WIN64 - !SetClassLongPtr(hwnd, GCLP_HICONSM, - (LPARAM)GetIcon(titlebaricon, ICON_SMALL)) -#else - !SetClassLong(hwnd, GCL_HICONSM, - (LPARAM)GetIcon(titlebaricon, ICON_SMALL)) -#endif - ) { - /* - * For some reason this triggers, even though it seems - * to be successful This is probably related to the - * WNDCLASS vs WNDCLASSEX difference. Anyway it seems - * we have to ignore errors returned here. - */ - /* - * Tcl_AppendResult(interp,"Unable to set new small icon", (char*)NULL); - * return TCL_ERROR; - */ - } - if ( -#ifdef _WIN64 - !SetClassLongPtr(hwnd, GCLP_HICON, - (LPARAM)GetIcon(titlebaricon, ICON_BIG)) -#else - !SetClassLong(hwnd, GCL_HICON, - (LPARAM)GetIcon(titlebaricon, ICON_BIG)) -#endif - ) { - Tcl_AppendResult(interp,"Unable to set new icon", (char*)NULL); - return TCL_ERROR; - } + /* + * Don't check return result of SetClassLong() or + * SetClassLongPtr() since they return the previously set value + * which is zero on the initial call or in an error case. The MSDN + * documentation does not indicate that the result needs to be + * checked. + */ + + SetClassLongPtr(hwnd, GCLP_HICONSM, + (LPARAM) GetIcon(titlebaricon, ICON_SMALL)); + SetClassLongPtr(hwnd, GCLP_HICON, + (LPARAM) GetIcon(titlebaricon, ICON_BIG)); tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (tsdPtr->iconPtr != NULL) { @@ -1040,31 +1093,35 @@ WinSetIcon(interp, titlebaricon, tkw) } else { if (!initialized) { /* - * Need to initialise the wm otherwise we will fail on - * code which tries to set a toplevel's icon before that - * happens. Ignore return result. + * Need to initialise the wm otherwise we will fail on code which + * tries to set a toplevel's icon before that happens. Ignore + * return result. */ - (void)InitWindowClass(NULL); + + (void) InitWindowClass(NULL); } + /* * The following code is exercised if you do * * toplevel .t ; wm titlebaricon .t foo.icr * - * i.e. the wm hasn't had time to properly create - * the '.t' window before you set the icon. + * i.e. the wm hasn't had time to properly create the '.t' window + * before you set the icon. */ + if (hwnd == NULL) { /* - * This little snippet is copied from the 'Map' function, - * and should probably be placed in one proper location + * This little snippet is copied from the 'Map' function, and + * should probably be placed in one proper location. */ + UpdateWrapper(wmPtr->winPtr); wmPtr = ((TkWindow*)tkw)->wmInfoPtr; hwnd = wmPtr->wrapper; if (hwnd == NULL) { Tcl_AppendResult(interp, - "Can't set icon; window has no wrapper.", (char*)NULL); + "Can't set icon; window has no wrapper.", NULL); return TCL_ERROR; } } @@ -1073,16 +1130,23 @@ WinSetIcon(interp, titlebaricon, tkw) SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM) GetIcon(titlebaricon, ICON_BIG)); - /* Update the iconPtr we keep for each WmInfo structure. */ + /* + * Update the iconPtr we keep for each WmInfo structure. + */ + if (wmPtr->iconPtr != NULL) { - /* Free any old icon ptr which is associated with this window. */ + /* + * Free any old icon ptr which is associated with this window. + */ + DecrIconRefCount(wmPtr->iconPtr); } + /* - * We do not need to increment the ref count for the - * titlebaricon, because it was already incremented when we - * retrieved it. + * We do not need to increment the ref count for the titlebaricon, + * because it was already incremented when we retrieved it. */ + wmPtr->iconPtr = titlebaricon; } return TCL_OK; @@ -1093,8 +1157,8 @@ WinSetIcon(interp, titlebaricon, tkw) * * TkWinGetIcon -- * - * Gets either the default toplevel titlebar icon, or the icon - * for a specific toplevel (ICON_SMALL or ICON_BIG). + * Gets either the default toplevel titlebar icon, or the icon for a + * specific toplevel (ICON_SMALL or ICON_BIG). * * Results: * A Windows HICON. @@ -1104,22 +1168,29 @@ WinSetIcon(interp, titlebaricon, tkw) * *---------------------------------------------------------------------- */ + HICON -TkWinGetIcon(Tk_Window tkwin, DWORD iconsize) +TkWinGetIcon( + Tk_Window tkwin, + DWORD iconsize) { WmInfo *wmPtr; HICON icon; - ThreadSpecificData *tsdPtr = (ThreadSpecificData *) + ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (tsdPtr->iconPtr != NULL) { /* * return default toplevel icon */ - return GetIcon(tsdPtr->iconPtr, iconsize); + + return GetIcon(tsdPtr->iconPtr, (int)iconsize); } - /* ensure we operate on the toplevel, that has the icon refs */ + /* + * Ensure we operate on the toplevel, that has the icon refs. + */ + while (!Tk_IsTopLevel(tkwin)) { tkwin = Tk_Parent(tkwin); if (tkwin == NULL) { @@ -1136,23 +1207,20 @@ TkWinGetIcon(Tk_Window tkwin, DWORD iconsize) /* * return window toplevel icon */ - return GetIcon(wmPtr->iconPtr, iconsize); + + return GetIcon(wmPtr->iconPtr, (int)iconsize); } /* - * Find the icon otherwise associated with the toplevel, or - * finally with the window class. + * Find the icon otherwise associated with the toplevel, or finally with + * the window class. */ + icon = (HICON) SendMessage(wmPtr->wrapper, WM_GETICON, iconsize, (LPARAM) NULL); if (icon == (HICON) NULL) { -#ifdef _WIN64 icon = (HICON) GetClassLongPtr(wmPtr->wrapper, (iconsize == ICON_BIG) ? GCLP_HICON : GCLP_HICONSM); -#else - icon = (HICON) GetClassLong(wmPtr->wrapper, - (iconsize == ICON_BIG) ? GCL_HICON : GCL_HICONSM); -#endif } return icon; } @@ -1162,117 +1230,129 @@ TkWinGetIcon(Tk_Window tkwin, DWORD iconsize) * * ReadIconFromFile -- * - * Read the contents of a file (usually .ico, .icr) and extract an - * icon resource, if possible, otherwise check if the shell has an - * icon assigned to the given file and use that. If both of those - * fail, then NULL is returned, and an error message will already be - * in the interpreter. - * + * Read the contents of a file (usually .ico, .icr) and extract an icon + * resource, if possible, otherwise check if the shell has an icon + * assigned to the given file and use that. If both of those fail, then + * NULL is returned, and an error message will already be in the + * interpreter. + * * Results: - * A WinIconPtr structure containing the icons in the file, with - * its ref count already incremented. The calling procedure should - * either place this structure inside a WmInfo structure, or it should - * pass it on to DecrIconRefCount() to ensure no memory leaks occur. + * A WinIconPtr structure containing the icons in the file, with its ref + * count already incremented. The calling function should either place + * this structure inside a WmInfo structure, or it should pass it on to + * DecrIconRefCount() to ensure no memory leaks occur. * * If the given fileName did not contain a valid icon structure, * return NULL. * * Side effects: - * Memory is allocated for the returned structure and the icons - * it contains. If the structure is not wanted, it should be - * passed to DecrIconRefCount, and in any case a valid ref count - * should be ensured to avoid memory leaks. + * Memory is allocated for the returned structure and the icons it + * contains. If the structure is not wanted, it should be passed to + * DecrIconRefCount, and in any case a valid ref count should be ensured + * to avoid memory leaks. * - * Currently icon resources are not shared, so the ref count of - * one of these structures will always be 0 or 1. However all we - * need do is implement some sort of lookup function between - * filenames and WinIconPtr structures and no other code will need - * to be changed. The pseudo-code for this is implemented below - * in the 'if (0)' branch. It did not seem necessary to implement - * this optimisation here, since moving to icon<->image - * conversions will probably make it obsolete. + * Currently icon resources are not shared, so the ref count of one of + * these structures will always be 0 or 1. However all we need do is + * implement some sort of lookup function between filenames and + * WinIconPtr structures and no other code will need to be changed. The + * pseudo-code for this is implemented below in the 'if (0)' branch. It + * did not seem necessary to implement this optimisation here, since + * moving to icon<->image conversions will probably make it obsolete. * *---------------------------------------------------------------------- */ + static WinIconPtr -ReadIconFromFile(interp, fileName) - Tcl_Interp *interp; - Tcl_Obj *fileName; +ReadIconFromFile( + Tcl_Interp *interp, + Tcl_Obj *fileName) { WinIconPtr titlebaricon = NULL; + BlockOfIconImagesPtr lpIR; if (0 /* If we already have an icon for this filename */) { titlebaricon = NULL; /* Get the real value from a lookup */ titlebaricon->refCount++; return titlebaricon; - } else { - /* First check if it is a .ico file */ - BlockOfIconImagesPtr lpIR; - lpIR = ReadIconOrCursorFromFile(interp, fileName, TRUE); + } - /* - * Then see if we can ask the shell for the icon for this file. - * We want both the regular and small icons so that the Alt-Tab - * (task-switching) display uses the right icon. - */ - if (lpIR == NULL && shgetfileinfoProc != NULL) { - SHFILEINFO sfiSM; - Tcl_DString ds, ds2; - DWORD *res; - CONST char *file; - - file = Tcl_TranslateFileName(interp, Tcl_GetString(fileName), &ds); - if (file == NULL) { return NULL; } - Tcl_UtfToExternalDString(NULL, file, -1, &ds2); - Tcl_DStringFree(&ds); - res = (*shgetfileinfoProc)(Tcl_DStringValue(&ds2), 0, &sfiSM, - sizeof(SHFILEINFO), SHGFI_SMALLICON|SHGFI_ICON); + /* + * First check if it is a .ico file. + */ - if (res != 0) { - SHFILEINFO sfi; - int size; - - Tcl_ResetResult(interp); - res = (*shgetfileinfoProc)(Tcl_DStringValue(&ds2), 0, &sfi, - sizeof(SHFILEINFO), SHGFI_ICON); - - /* Account for extra icon, if necessary */ - size = sizeof(BlockOfIconImages) + - ((res != 0) ? sizeof(ICONIMAGE) : 0); - lpIR = (BlockOfIconImagesPtr) ckalloc(size); - if (lpIR == NULL) { - if (res != 0) { - DestroyIcon(sfi.hIcon); - } - DestroyIcon(sfiSM.hIcon); - Tcl_DStringFree(&ds2); - return NULL; - } - ZeroMemory(lpIR, size); + lpIR = ReadIconOrCursorFromFile(interp, fileName, TRUE); + + /* + * Then see if we can ask the shell for the icon for this file. We + * want both the regular and small icons so that the Alt-Tab (task- + * switching) display uses the right icon. + */ + + if (lpIR == NULL && shgetfileinfoProc != NULL) { + SHFILEINFO sfiSM; + Tcl_DString ds, ds2; + DWORD *res; + CONST char *file; + + file = Tcl_TranslateFileName(interp, Tcl_GetString(fileName), &ds); + if (file == NULL) { + return NULL; + } + Tcl_UtfToExternalDString(NULL, file, -1, &ds2); + Tcl_DStringFree(&ds); + res = (*shgetfileinfoProc)(Tcl_DStringValue(&ds2), 0, &sfiSM, + sizeof(SHFILEINFO), SHGFI_SMALLICON|SHGFI_ICON); + + if (res != 0) { + SHFILEINFO sfi; + unsigned size; - lpIR->nNumImages = ((res != 0) ? 2 : 1); - lpIR->IconImages[0].Width = 16; - lpIR->IconImages[0].Height = 16; - lpIR->IconImages[0].Colors = 4; - lpIR->IconImages[0].hIcon = sfiSM.hIcon; - /* All other IconImages fields are ignored */ + Tcl_ResetResult(interp); + res = (*shgetfileinfoProc)(Tcl_DStringValue(&ds2), 0, &sfi, + sizeof(SHFILEINFO), SHGFI_ICON); + + /* + * Account for extra icon, if necessary. + */ + size = sizeof(BlockOfIconImages) + + ((res != 0) ? sizeof(ICONIMAGE) : 0); + lpIR = (BlockOfIconImagesPtr) ckalloc(size); + if (lpIR == NULL) { if (res != 0) { - lpIR->IconImages[1].Width = 32; - lpIR->IconImages[1].Height = 32; - lpIR->IconImages[1].Colors = 4; - lpIR->IconImages[1].hIcon = sfi.hIcon; + DestroyIcon(sfi.hIcon); } + DestroyIcon(sfiSM.hIcon); + Tcl_DStringFree(&ds2); + return NULL; + } + ZeroMemory(lpIR, size); + + lpIR->nNumImages = ((res != 0) ? 2 : 1); + lpIR->IconImages[0].Width = 16; + lpIR->IconImages[0].Height = 16; + lpIR->IconImages[0].Colors = 4; + lpIR->IconImages[0].hIcon = sfiSM.hIcon; + + /* + * All other IconImages fields are ignored. + */ + + if (res != 0) { + lpIR->IconImages[1].Width = 32; + lpIR->IconImages[1].Height = 32; + lpIR->IconImages[1].Colors = 4; + lpIR->IconImages[1].hIcon = sfi.hIcon; } - Tcl_DStringFree(&ds2); - } - if (lpIR != NULL) { - titlebaricon = (WinIconPtr) ckalloc(sizeof(WinIconInstance)); - titlebaricon->iconBlock = lpIR; - titlebaricon->refCount = 1; } - return titlebaricon; + Tcl_DStringFree(&ds2); } + if (lpIR != NULL) { + titlebaricon = (WinIconPtr) ckalloc(sizeof(WinIconInstance)); + titlebaricon->iconBlock = lpIR; + titlebaricon->refCount = 1; + } + return titlebaricon; } /* @@ -1280,90 +1360,93 @@ ReadIconFromFile(interp, fileName) * * GetIconFromPixmap -- * - * Turn a Tk Pixmap (i.e. a bitmap) into an icon resource, if - * possible, otherwise NULL is returned. + * Turn a Tk Pixmap (i.e. a bitmap) into an icon resource, if possible, + * otherwise NULL is returned. * * Results: - * A WinIconPtr structure containing a conversion of the given - * bitmap into an icon, with its ref count already incremented. The - * calling procedure should either place this structure inside a - * WmInfo structure, or it should pass it on to DecrIconRefCount() - * to ensure no memory leaks occur. - * - * If the given pixmap did not contain a valid icon structure, - * return NULL. + * A WinIconPtr structure containing a conversion of the given bitmap + * into an icon, with its ref count already incremented. The calling + * function should either place this structure inside a WmInfo structure, + * or it should pass it on to DecrIconRefCount() to ensure no memory + * leaks occur. + * + * If the given pixmap did not contain a valid icon structure, return + * NULL. * * Side effects: - * Memory is allocated for the returned structure and the icons - * it contains. If the structure is not wanted, it should be - * passed to DecrIconRefCount, and in any case a valid ref count - * should be ensured to avoid memory leaks. - * - * Currently icon resources are not shared, so the ref count of - * one of these structures will always be 0 or 1. However all we - * need do is implement some sort of lookup function between - * pixmaps and WinIconPtr structures and no other code will need - * to be changed. + * Memory is allocated for the returned structure and the icons it + * contains. If the structure is not wanted, it should be passed to + * DecrIconRefCount, and in any case a valid ref count should be ensured + * to avoid memory leaks. + * + * Currently icon resources are not shared, so the ref count of one of + * these structures will always be 0 or 1. However all we need do is + * implement some sort of lookup function between pixmaps and WinIconPtr + * structures and no other code will need to be changed. * *---------------------------------------------------------------------- */ -static WinIconPtr -GetIconFromPixmap(dsPtr, pixmap) - Display *dsPtr; - Pixmap pixmap; + +static WinIconPtr +GetIconFromPixmap( + Display *dsPtr, + Pixmap pixmap) { WinIconPtr titlebaricon = NULL; - TkWinDrawable* twdPtr = (TkWinDrawable*) pixmap; - + TkWinDrawable *twdPtr = (TkWinDrawable*) pixmap; + BlockOfIconImagesPtr lpIR; + ICONINFO icon; + HICON hIcon; + int width, height; + if (twdPtr == NULL) { - return NULL; + return NULL; } - + if (0 /* If we already have an icon for this pixmap */) { titlebaricon = NULL; /* Get the real value from a lookup */ titlebaricon->refCount++; return titlebaricon; - } else { - BlockOfIconImagesPtr lpIR; - ICONINFO icon; - HICON hIcon; - int width, height; + } - Tk_SizeOfBitmap(dsPtr, pixmap, &width, &height); + Tk_SizeOfBitmap(dsPtr, pixmap, &width, &height); - icon.fIcon = TRUE; - icon.xHotspot = 0; - icon.yHotspot = 0; - icon.hbmMask = twdPtr->bitmap.handle; - icon.hbmColor = twdPtr->bitmap.handle; + icon.fIcon = TRUE; + icon.xHotspot = 0; + icon.yHotspot = 0; + icon.hbmMask = twdPtr->bitmap.handle; + icon.hbmColor = twdPtr->bitmap.handle; - hIcon = CreateIconIndirect(&icon); - if (hIcon == NULL) { - return NULL; - } + hIcon = CreateIconIndirect(&icon); + if (hIcon == NULL) { + return NULL; + } - lpIR = (BlockOfIconImagesPtr) ckalloc(sizeof(BlockOfIconImages)); - if (lpIR == NULL) { - DestroyIcon(hIcon); - return NULL; - } + lpIR = (BlockOfIconImagesPtr) ckalloc(sizeof(BlockOfIconImages)); + if (lpIR == NULL) { + DestroyIcon(hIcon); + return NULL; + } - lpIR->nNumImages = 1; - lpIR->IconImages[0].Width = width; - lpIR->IconImages[0].Height = height; - lpIR->IconImages[0].Colors = 1 << twdPtr->bitmap.depth; - lpIR->IconImages[0].hIcon = hIcon; - /* These fields are ignored */ - lpIR->IconImages[0].lpBits = 0; - lpIR->IconImages[0].dwNumBytes = 0; - lpIR->IconImages[0].lpXOR = 0; - lpIR->IconImages[0].lpAND = 0; + lpIR->nNumImages = 1; + lpIR->IconImages[0].Width = width; + lpIR->IconImages[0].Height = height; + lpIR->IconImages[0].Colors = 1 << twdPtr->bitmap.depth; + lpIR->IconImages[0].hIcon = hIcon; - titlebaricon = (WinIconPtr) ckalloc(sizeof(WinIconInstance)); - titlebaricon->iconBlock = lpIR; - titlebaricon->refCount = 1; - return titlebaricon; - } + /* + * These fields are ignored. + */ + + lpIR->IconImages[0].lpBits = 0; + lpIR->IconImages[0].dwNumBytes = 0; + lpIR->IconImages[0].lpXOR = 0; + lpIR->IconImages[0].lpAND = 0; + + titlebaricon = (WinIconPtr) ckalloc(sizeof(WinIconInstance)); + titlebaricon->iconBlock = lpIR; + titlebaricon->refCount = 1; + return titlebaricon; } /* @@ -1377,14 +1460,17 @@ GetIconFromPixmap(dsPtr, pixmap) * None. * * Side effects: - * If the ref count falls to zero, free the memory associated - * with the icon resource structures. In this case the pointer - * passed into this function is no longer valid. + * If the ref count falls to zero, free the memory associated with the + * icon resource structures. In this case the pointer passed into this + * function is no longer valid. * *---------------------------------------------------------------------- */ -static void -DecrIconRefCount(WinIconPtr titlebaricon) { + +static void +DecrIconRefCount( + WinIconPtr titlebaricon) +{ titlebaricon->refCount--; if (titlebaricon->refCount <= 0) { @@ -1402,9 +1488,8 @@ DecrIconRefCount(WinIconPtr titlebaricon) { * * FreeIconBlock -- * - * Frees all memory associated with a previously loaded - * titlebaricon. The icon block pointer is no longer - * valid once this function returns. + * Frees all memory associated with a previously loaded titlebaricon. + * The icon block pointer is no longer valid once this function returns. * * Results: * None. @@ -1414,12 +1499,17 @@ DecrIconRefCount(WinIconPtr titlebaricon) { * *---------------------------------------------------------------------- */ -static void -FreeIconBlock(BlockOfIconImagesPtr lpIR) + +static void +FreeIconBlock( + BlockOfIconImagesPtr lpIR) { int i; - /* Free all the bits */ + /* + * Free all the bits. + */ + for (i=0; i< lpIR->nNumImages; i++) { if (lpIR->IconImages[i].lpBits != NULL) { ckfree((char*)lpIR->IconImages[i].lpBits); @@ -1441,18 +1531,18 @@ FreeIconBlock(BlockOfIconImagesPtr lpIR) * Results: * Returns the icon, if found, else NULL. * - * Side effects: - * - * *---------------------------------------------------------------------- */ -static HICON -GetIcon(WinIconPtr titlebaricon, int icon_size) + +static HICON +GetIcon( + WinIconPtr titlebaricon, + int icon_size) { BlockOfIconImagesPtr lpIR; - + if (titlebaricon == NULL) { - return NULL; + return NULL; } lpIR = titlebaricon->iconBlock; @@ -1463,18 +1553,21 @@ GetIcon(WinIconPtr titlebaricon, int icon_size) int i; for (i = 0; i < lpIR->nNumImages; i++) { - /* Take the first or a 32x32 16 color icon*/ + /* + * Take the first or a 32x32 16 color icon + */ + if ((lpIR->IconImages[i].Height == size) - && (lpIR->IconImages[i].Width == size) - && (lpIR->IconImages[i].Colors >= 4)) { + && (lpIR->IconImages[i].Width == size) + && (lpIR->IconImages[i].Colors >= 4)) { return lpIR->IconImages[i].hIcon; } } - /* - * If we get here, then just return the first one, - * it will have to do! + /* + * If we get here, then just return the first one, it will have to do! */ + if (lpIR->nNumImages >= 1) { return lpIR->IconImages[0].hIcon; } @@ -1482,38 +1575,64 @@ GetIcon(WinIconPtr titlebaricon, int icon_size) return NULL; } +#if 0 /* UNUSED */ +static HCURSOR +TclWinReadCursorFromFile( + Tcl_Interp* interp, + Tcl_Obj* fileName) +{ + BlockOfIconImagesPtr lpIR; + HICON res = NULL; + + lpIR = ReadIconOrCursorFromFile(interp, fileName, FALSE); + if (lpIR == NULL) { + return NULL; + } + if (lpIR->nNumImages >= 1) { + res = CopyImage(lpIR->IconImages[0].hIcon, IMAGE_CURSOR,0,0,0); + } + FreeIconBlock(lpIR); + return res; +} +#endif + /* *---------------------------------------------------------------------- * * ReadIconOrCursorFromFile -- * - * Reads an Icon Resource from an ICO file, as given by - * char* fileName - Name of the ICO file. This name should - * be in Utf format. + * Reads an Icon Resource from an ICO file, as given by char* fileName - + * Name of the ICO file. This name should be in Utf format. * * Results: * Returns an icon resource, if found, else NULL. * * Side effects: - * May leave error messages in the Tcl interpreter. + * May leave error messages in the Tcl interpreter. * *---------------------------------------------------------------------- */ -static BlockOfIconImagesPtr -ReadIconOrCursorFromFile(Tcl_Interp* interp, Tcl_Obj* fileName, BOOL isIcon) + +static BlockOfIconImagesPtr +ReadIconOrCursorFromFile( + Tcl_Interp *interp, + Tcl_Obj *fileName, + BOOL isIcon) { - BlockOfIconImagesPtr lpIR, lpNew; - Tcl_Channel channel; - int i; - DWORD dwBytesRead; - LPICONDIRENTRY lpIDE; + BlockOfIconImagesPtr lpIR; + Tcl_Channel channel; + int i; + DWORD dwBytesRead; + LPICONDIRENTRY lpIDE; + + /* + * Open the file. + */ - /* Open the file */ channel = Tcl_FSOpenFileChannel(interp, fileName, "r", 0); if (channel == NULL) { - Tcl_AppendResult(interp,"Error opening file \"", - Tcl_GetString(fileName), - "\" for reading",(char*)NULL); + Tcl_AppendResult(interp,"Error opening file \"", + Tcl_GetString(fileName), "\" for reading", NULL); return NULL; } if (Tcl_SetChannelOption(interp, channel, "-translation", "binary") @@ -1526,99 +1645,127 @@ ReadIconOrCursorFromFile(Tcl_Interp* interp, Tcl_Obj* fileName, BOOL isIcon) Tcl_Close(NULL, channel); return NULL; } - /* Allocate memory for the resource structure */ + + /* + * Allocate memory for the resource structure + */ + lpIR = (BlockOfIconImagesPtr) ckalloc(sizeof(BlockOfIconImages)); - if (lpIR == NULL) { - Tcl_AppendResult(interp,"Error allocating memory",(char*)NULL); - Tcl_Close(NULL, channel); - return NULL; - } - /* Read in the header */ - if ((lpIR->nNumImages = ReadICOHeader( channel )) == -1) { - Tcl_AppendResult(interp,"Invalid file header",(char*)NULL); - Tcl_Close(NULL, channel); - ckfree((char*) lpIR ); - return NULL; - } - /* Adjust the size of the struct to account for the images */ - lpNew = (BlockOfIconImagesPtr) ckrealloc((char*)lpIR, - sizeof(BlockOfIconImages) + ((lpIR->nNumImages-1) * sizeof(ICONIMAGE))); - if (lpNew == NULL) { - Tcl_AppendResult(interp,"Error allocating memory",(char*)NULL); + + /* + * Read in the header + */ + + if ((lpIR->nNumImages = ReadICOHeader(channel)) == -1) { + Tcl_AppendResult(interp, "Invalid file header", NULL); Tcl_Close(NULL, channel); - ckfree( (char*)lpIR ); + ckfree((char*) lpIR); return NULL; } - lpIR = lpNew; - /* Allocate enough memory for the icon directory entries */ + + /* + * Adjust the size of the struct to account for the images. + */ + + lpIR = (BlockOfIconImagesPtr) ckrealloc((char*) lpIR, + sizeof(BlockOfIconImages) + + ((lpIR->nNumImages - 1) * sizeof(ICONIMAGE))); + + /* + * Allocate enough memory for the icon directory entries. + */ + lpIDE = (LPICONDIRENTRY) ckalloc(lpIR->nNumImages * sizeof(ICONDIRENTRY)); - if (lpIDE == NULL) { - Tcl_AppendResult(interp,"Error allocating memory",(char*)NULL); - Tcl_Close(NULL, channel); - ckfree( (char*)lpIR ); - return NULL; - } - /* Read in the icon directory entries */ - dwBytesRead = Tcl_Read(channel, (char*)lpIDE, - lpIR->nNumImages * sizeof( ICONDIRENTRY )); - if (dwBytesRead != lpIR->nNumImages * sizeof( ICONDIRENTRY )) { - Tcl_AppendResult(interp,"Error reading file",(char*)NULL); + + /* + * Read in the icon directory entries. + */ + + dwBytesRead = Tcl_Read(channel, (char*) lpIDE, + (int)(lpIR->nNumImages * sizeof(ICONDIRENTRY))); + if (dwBytesRead != lpIR->nNumImages * sizeof(ICONDIRENTRY)) { + Tcl_AppendResult(interp, "Error reading file", NULL); Tcl_Close(NULL, channel); - ckfree( (char*)lpIR ); + ckfree((char *) lpIDE); + ckfree((char *) lpIR); return NULL; } - /* NULL-out everything to make memory management easier */ - for( i = 0; i < lpIR->nNumImages; i++ ) { + + /* + * NULL-out everything to make memory management easier. + */ + + for (i = 0; i < lpIR->nNumImages; i++) { lpIR->IconImages[i].lpBits = NULL; } - /* Loop through and read in each image */ - for( i = 0; i < lpIR->nNumImages; i++ ) { - /* Allocate memory for the resource */ + + /* + * Loop through and read in each image. + */ + + for (i=0 ; i<lpIR->nNumImages ; i++) { + /* + * Allocate memory for the resource. + */ + lpIR->IconImages[i].lpBits = (LPBYTE) ckalloc(lpIDE[i].dwBytesInRes); - if (lpIR->IconImages[i].lpBits == NULL) { - Tcl_AppendResult(interp,"Error allocating memory",(char*)NULL); - goto readError; - } lpIR->IconImages[i].dwNumBytes = lpIDE[i].dwBytesInRes; - /* Seek to beginning of this image */ + + /* + * Seek to beginning of this image. + */ + if (Tcl_Seek(channel, lpIDE[i].dwImageOffset, FILE_BEGIN) == -1) { - Tcl_AppendResult(interp,"Error seeking in file",(char*)NULL); + Tcl_AppendResult(interp, "Error seeking in file", NULL); goto readError; } - /* Read it in */ - dwBytesRead = Tcl_Read(channel, (char *) lpIR->IconImages[i].lpBits, - lpIDE[i].dwBytesInRes); + + /* + * Read it in. + */ + + dwBytesRead = Tcl_Read(channel, (char *) lpIR->IconImages[i].lpBits, + (int) lpIDE[i].dwBytesInRes); if (dwBytesRead != lpIDE[i].dwBytesInRes) { - Tcl_AppendResult(interp,"Error reading file",(char*)NULL); + Tcl_AppendResult(interp, "Error reading file", NULL); goto readError; } - /* Set the internal pointers appropriately */ + + /* + * Set the internal pointers appropriately. + */ + if (!AdjustIconImagePointers( &(lpIR->IconImages[i]))) { - Tcl_AppendResult(interp,"Error converting to internal format", - (char*)NULL); + Tcl_AppendResult(interp, "Error converting to internal format", + NULL); goto readError; } lpIR->IconImages[i].hIcon = - MakeIconOrCursorFromResource(&(lpIR->IconImages[i]), isIcon); + MakeIconOrCursorFromResource(&(lpIR->IconImages[i]), isIcon); } - /* Clean up */ - ckfree((char*)lpIDE); + + /* + * Clean up + */ + + ckfree((char *) lpIDE); Tcl_Close(NULL, channel); if (lpIR == NULL){ - Tcl_AppendResult(interp,"Reading of ", Tcl_GetString(fileName), - " failed!",(char*)NULL); + Tcl_AppendResult(interp, "Reading of ", Tcl_GetString(fileName), + " failed!", NULL); return NULL; } return lpIR; + readError: Tcl_Close(NULL, channel); - for( i = 0; i < lpIR->nNumImages; i++ ) { - if (lpIR->IconImages[i].lpBits != NULL) { - ckfree((char*)lpIR->IconImages[i].lpBits); + for (i = 0; i < lpIR->nNumImages; i++) { + if (lpIR->IconImages[i].lpBits != NULL) { + ckfree((char *) lpIR->IconImages[i].lpBits); } } - ckfree((char*)lpIDE ); - ckfree((char*)lpIR ); + ckfree((char *) lpIDE); + ckfree((char *) lpIR); return NULL; } @@ -1627,8 +1774,7 @@ ReadIconOrCursorFromFile(Tcl_Interp* interp, Tcl_Obj* fileName, BOOL isIcon) * * GetTopLevel -- * - * This function retrieves the TkWindow associated with the - * given HWND. + * This function retrieves the TkWindow associated with the given HWND. * * Results: * Returns the matching TkWindow. @@ -1638,27 +1784,24 @@ ReadIconOrCursorFromFile(Tcl_Interp* interp, Tcl_Obj* fileName, BOOL isIcon) * *---------------------------------------------------------------------- */ + static TkWindow * -GetTopLevel(hwnd) - HWND hwnd; +GetTopLevel( + HWND hwnd) { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) - Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); + Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); /* - * If this function is called before the CreateWindowEx call - * has completed, then the user data slot will not have been - * set yet, so we use the global createWindow variable. + * If this function is called before the CreateWindowEx call has + * completed, then the user data slot will not have been set yet, so we + * use the global createWindow variable. */ if (tsdPtr->createWindow) { return tsdPtr->createWindow; } -#ifdef _WIN64 return (TkWindow *) GetWindowLongPtr(hwnd, GWLP_USERDATA); -#else - return (TkWindow *) GetWindowLong(hwnd, GWL_USERDATA); -#endif } /* @@ -1672,16 +1815,16 @@ GetTopLevel(hwnd) * None. * * Side effects: - * Changes the values of the info pointer to reflect the current - * minimum and maximum size values. + * Changes the values of the info pointer to reflect the current minimum + * and maximum size values. * *---------------------------------------------------------------------- */ static void -SetLimits(hwnd, info) - HWND hwnd; - MINMAXINFO *info; +SetLimits( + HWND hwnd, + MINMAXINFO *info) { register WmInfo *wmPtr; int maxWidth, maxHeight; @@ -1731,8 +1874,8 @@ SetLimits(hwnd, info) } /* - * If the window isn't supposed to be resizable, then set the - * minimum and maximum dimensions to be the same as the current size. + * If the window isn't supposed to be resizable, then set the minimum and + * maximum dimensions to be the same as the current size. */ if (!(wmPtr->flags & WM_SYNC_PENDING)) { @@ -1754,8 +1897,8 @@ SetLimits(hwnd, info) * * TkWinWmCleanup -- * - * Unregisters classes registered by the window manager. This is - * called from the DLL main entry point when the DLL is unloaded. + * Unregisters classes registered by the window manager. This is called + * from the DLL main entry point when the DLL is unloaded. * * Results: * None. @@ -1767,19 +1910,19 @@ SetLimits(hwnd, info) */ void -TkWinWmCleanup(hInstance) - HINSTANCE hInstance; +TkWinWmCleanup( + HINSTANCE hInstance) { ThreadSpecificData *tsdPtr; /* - * If we're using stubs to access the Tcl library, and they - * haven't been initialized, we can't call Tcl_GetThreadData. + * If we're using stubs to access the Tcl library, and they haven't been + * initialized, we can't call Tcl_GetThreadData. */ #ifdef USE_TCL_STUBS if (tclStubsPtr == NULL) { - return; + return; } #endif @@ -1789,10 +1932,10 @@ TkWinWmCleanup(hInstance) initialized = 0; tsdPtr = (ThreadSpecificData *) - Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); + Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (!tsdPtr->initialized) { - return; + return; } tsdPtr->initialized = 0; @@ -1804,9 +1947,8 @@ TkWinWmCleanup(hInstance) * * TkWmNewWindow -- * - * This procedure is invoked whenever a new top-level - * window is created. Its job is to initialize the WmInfo - * structure for the window. + * This function is invoked whenever a new top-level window is created. + * Its job is to initialize the WmInfo structure for the window. * * Results: * None. @@ -1818,8 +1960,8 @@ TkWinWmCleanup(hInstance) */ void -TkWmNewWindow(winPtr) - TkWindow *winPtr; /* Newly-created top-level window. */ +TkWmNewWindow( + TkWindow *winPtr) /* Newly-created top-level window. */ { register WmInfo *wmPtr; @@ -1828,6 +1970,7 @@ TkWmNewWindow(winPtr) /* * Initialize full structure, then set what isn't NULL */ + ZeroMemory(wmPtr, sizeof(WmInfo)); winPtr->wmInfoPtr = wmPtr; wmPtr->winPtr = winPtr; @@ -1859,7 +2002,7 @@ TkWmNewWindow(winPtr) wmPtr->x = winPtr->changes.x; wmPtr->y = winPtr->changes.y; wmPtr->crefObj = NULL; - wmPtr->colorref = (COLORREF) NULL; + wmPtr->colorref = (COLORREF)0; wmPtr->alpha = 1.0; wmPtr->configWidth = -1; @@ -1869,16 +2012,16 @@ TkWmNewWindow(winPtr) winPtr->dispPtr->firstWmPtr = wmPtr; /* - * Tk must monitor structure events for top-level windows, in order - * to detect size and position changes caused by window managers. + * Tk must monitor structure events for top-level windows, in order to + * detect size and position changes caused by window managers. */ Tk_CreateEventHandler((Tk_Window) winPtr, StructureNotifyMask, TopLevelEventProc, (ClientData) winPtr); /* - * Arrange for geometry requests to be reflected from the window - * to the window manager. + * Arrange for geometry requests to be reflected from the window to the + * window manager. */ Tk_ManageGeometry((Tk_Window) winPtr, &wmMgrType, (ClientData) 0); @@ -1889,24 +2032,23 @@ TkWmNewWindow(winPtr) * * UpdateWrapper -- * - * This function creates the wrapper window that contains the - * window decorations and menus for a toplevel. This function - * may be called after a window is mapped to change the window - * style. + * This function creates the wrapper window that contains the window + * decorations and menus for a toplevel. This function may be called + * after a window is mapped to change the window style. * * Results: * None. * * Side effects: - * Destroys any old wrapper window and replaces it with a newly - * created wrapper. + * Destroys any old wrapper window and replaces it with a newly created + * wrapper. * *---------------------------------------------------------------------- */ static void -UpdateWrapper(winPtr) - TkWindow *winPtr; /* Top-level window to redecorate. */ +UpdateWrapper( + TkWindow *winPtr) /* Top-level window to redecorate. */ { register WmInfo *wmPtr = winPtr->wmInfoPtr; HWND parentHWND, oldWrapper = wmPtr->wrapper; @@ -1918,21 +2060,24 @@ UpdateWrapper(winPtr) Tcl_DString titleString, classString; int *childStateInfo = NULL; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) - Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); + Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (winPtr->window == None) { /* * Ensure existence of the window to update the wrapper for. */ + Tk_MakeWindowExist((Tk_Window) winPtr); } child = TkWinGetHWND(winPtr->window); parentHWND = NULL; + /* - * nextHWND will help us maintain Z order. - * focusHWND will help us maintain focus, if we had it. + * nextHWND will help us maintain Z order. focusHWND will help us maintain + * focus, if we had it. */ + nextHWND = NULL; focusHWND = GetFocus(); if ((oldWrapper == NULL) || (oldWrapper != GetForegroundWindow())) { @@ -1950,13 +2095,13 @@ UpdateWrapper(winPtr) } else { /* - * Pick the decorative frame style. Override redirect windows get + * Pick the decorative frame style. Override redirect windows get * created as undecorated popups if they have no transient parent, - * otherwise they are children. This allows splash screens to operate + * otherwise they are children. This allows splash screens to operate * as an independent window, while having dropdows (like for a - * combobox) not grab focus away from their parent. Transient windows - * get a modal dialog frame. Neither override, nor transient windows - * appear in the Windows taskbar. Note that a transient window does + * combobox) not grab focus away from their parent. Transient windows + * get a modal dialog frame. Neither override, nor transient windows + * appear in the Windows taskbar. Note that a transient window does * not resize by default, so we need to explicitly add the * WS_THICKFRAME style if we want it to be resizeable. */ @@ -1964,13 +2109,20 @@ UpdateWrapper(winPtr) if (winPtr->atts.override_redirect) { wmPtr->style = WM_OVERRIDE_STYLE; wmPtr->exStyle = EX_OVERRIDE_STYLE; - /* parent must be desktop even if we have a transient parent */ + + /* + * Parent must be desktop even if we have a transient parent. + */ + parentHWND = GetDesktopWindow(); if (wmPtr->masterPtr) { wmPtr->style |= WS_CHILD; } else { wmPtr->style |= WS_POPUP; } + } else if (wmPtr->flags & WM_FULLSCREEN) { + wmPtr->style = WM_FULLSCREEN_STYLE; + wmPtr->exStyle = EX_FULLSCREEN_STYLE; } else if (wmPtr->masterPtr) { wmPtr->style = WM_TRANSIENT_STYLE; wmPtr->exStyle = EX_TRANSIENT_STYLE; @@ -1984,7 +2136,7 @@ UpdateWrapper(winPtr) wmPtr->exStyle = EX_TOPLEVEL_STYLE; } - wmPtr->style |= wmPtr->styleConfig; + wmPtr->style |= wmPtr->styleConfig; wmPtr->exStyle |= wmPtr->exStyleConfig; if ((wmPtr->flags & WM_WIDTH_NOT_RESIZABLE) @@ -1996,10 +2148,6 @@ UpdateWrapper(winPtr) * Compute the geometry of the parent and child windows. */ - if ((wmPtr->flags & WM_UPDATE_PENDING)) { - Tcl_CancelIdleCall(UpdateGeometryInfo, (ClientData) winPtr); - } - wmPtr->flags |= WM_CREATE_PENDING|WM_MOVE_PENDING; UpdateGeometryInfo((ClientData)winPtr); wmPtr->flags &= ~(WM_CREATE_PENDING|WM_MOVE_PENDING); @@ -2009,11 +2157,17 @@ UpdateWrapper(winPtr) /* * Set the initial position from the user or program specified - * location. If nothing has been specified, then let the system - * pick a location. + * location. If nothing has been specified, then let the system pick a + * location. In full screen mode the x,y origin is 0,0 and the window + * width and height match that of the screen. */ - if (!(wmPtr->sizeHintsFlags & (USPosition | PPosition)) + if (wmPtr->flags & WM_FULLSCREEN) { + x = 0; + y = 0; + width = WidthOfScreen(Tk_Screen(winPtr)); + height = HeightOfScreen(Tk_Screen(winPtr)); + } else if (!(wmPtr->sizeHintsFlags & (USPosition | PPosition)) && (wmPtr->flags & WM_NEVER_MAPPED)) { x = CW_USEDEFAULT; y = CW_USEDEFAULT; @@ -2023,14 +2177,16 @@ UpdateWrapper(winPtr) } /* - * Create the containing window, and set the user data to point - * to the TkWindow. + * Create the containing window, and set the user data to point to the + * TkWindow. */ tsdPtr->createWindow = winPtr; Tcl_WinUtfToTChar(((wmPtr->title != NULL) ? - wmPtr->title : winPtr->nameUid), -1, &titleString); + wmPtr->title : winPtr->nameUid), -1, &titleString); + Tcl_WinUtfToTChar(TK_WIN_TOPLEVEL_CLASS_NAME, -1, &classString); + wmPtr->wrapper = (*tkWinProcs->createWindowEx)(wmPtr->exStyle, (LPCTSTR) Tcl_DStringValue(&classString), (LPCTSTR) Tcl_DStringValue(&titleString), @@ -2038,23 +2194,20 @@ UpdateWrapper(winPtr) parentHWND, NULL, Tk_GetHINSTANCE(), NULL); Tcl_DStringFree(&classString); Tcl_DStringFree(&titleString); -#ifdef _WIN64 - SetWindowLongPtr(wmPtr->wrapper, GWLP_USERDATA, (LONG_PTR) winPtr); -#else - SetWindowLong(wmPtr->wrapper, GWL_USERDATA, (LONG) winPtr); -#endif + SetWindowLongPtr(wmPtr->wrapper, GWLP_USERDATA, (INT_PTR) winPtr); tsdPtr->createWindow = NULL; if ((wmPtr->exStyleConfig & WS_EX_LAYERED) && setLayeredWindowAttributesProc != NULL) { /* * The user supplies a double from [0..1], but Windows wants an - * int (transparent) 0..255 (opaque), so do the translation. - * Add the 0.5 to round the value. + * int (transparent) 0..255 (opaque), so do the translation. Add + * the 0.5 to round the value. */ + setLayeredWindowAttributesProc((HWND) wmPtr->wrapper, wmPtr->colorref, (BYTE) (wmPtr->alpha * 255 + 0.5), - LWA_ALPHA | (wmPtr->crefObj ? LWA_COLORKEY : 0)); + (unsigned)(LWA_ALPHA | (wmPtr->crefObj?LWA_COLORKEY:0))); } else { /* * Layering not used or supported. @@ -2071,9 +2224,8 @@ UpdateWrapper(winPtr) wmPtr->x = place.rcNormalPosition.left; wmPtr->y = place.rcNormalPosition.top; - if (!(winPtr->flags & TK_ALREADY_DEAD)) { + if( !(winPtr->flags & TK_ALREADY_DEAD) ) TkInstallFrameMenu((Tk_Window) winPtr); - } if (oldWrapper && (oldWrapper != wmPtr->wrapper) && !(wmPtr->exStyle & WS_EX_TOPMOST)) { @@ -2081,30 +2233,24 @@ UpdateWrapper(winPtr) * We will adjust wrapper to have the same Z order as oldWrapper * if it isn't a TOPMOST window. */ + nextHWND = GetNextWindow(oldWrapper, GW_HWNDPREV); } } /* - * Now we need to reparent the contained window and set its - * style appropriately. Be sure to update the style first so that - * Windows doesn't try to set the focus to the child window. + * Now we need to reparent the contained window and set its style + * appropriately. Be sure to update the style first so that Windows + * doesn't try to set the focus to the child window. */ -#ifdef _WIN64 SetWindowLongPtr(child, GWL_STYLE, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS); -#else - SetWindowLong(child, GWL_STYLE, - WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS); -#endif + if (winPtr->flags & TK_EMBEDDED) { -#ifdef _WIN64 - SetWindowLongPtr(child, GWLP_WNDPROC, (LONG_PTR) TopLevelProc); -#else - SetWindowLong(child, GWL_WNDPROC, (LONG) TopLevelProc); -#endif + SetWindowLongPtr(child, GWLP_WNDPROC, (INT_PTR) TopLevelProc); } + SetParent(child, wmPtr->wrapper); if (oldWrapper) { hSmallIcon = (HICON) SendMessage(oldWrapper, WM_GETICON, ICON_SMALL, @@ -2115,32 +2261,29 @@ UpdateWrapper(winPtr) if (oldWrapper && (oldWrapper != wmPtr->wrapper) && (oldWrapper != GetDesktopWindow())) { -#ifdef _WIN64 - SetWindowLongPtr(oldWrapper, GWLP_USERDATA, (LONG) NULL); -#else - SetWindowLong(oldWrapper, GWL_USERDATA, (LONG) NULL); -#endif + SetWindowLongPtr(oldWrapper, GWLP_USERDATA, (LONG) 0); if (wmPtr->numTransients > 0) { /* * Unset the current wrapper as the parent for all transient * children for whom this is the master */ + WmInfo *wmPtr2; - childStateInfo = (int *)ckalloc((unsigned) wmPtr->numTransients - * sizeof(int)); + childStateInfo = (int *) + ckalloc((unsigned) wmPtr->numTransients * sizeof(int)); state = 0; for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL; - wmPtr2 = wmPtr2->nextPtr) { - if (wmPtr2->masterPtr == winPtr) { - if (!(wmPtr2->flags & WM_NEVER_MAPPED)) { - childStateInfo[state++] = wmPtr2->hints.initial_state; - SetParent(TkWinGetHWND(wmPtr2->winPtr->window), NULL); - } + wmPtr2 = wmPtr2->nextPtr) { + if (wmPtr2->masterPtr == winPtr + && !(wmPtr2->flags & WM_NEVER_MAPPED)) { + childStateInfo[state++] = wmPtr2->hints.initial_state; + SetParent(TkWinGetHWND(wmPtr2->winPtr->window), NULL); } } } + /* * Remove the menubar before destroying the window so the menubar * isn't destroyed. @@ -2151,12 +2294,18 @@ UpdateWrapper(winPtr) } wmPtr->flags &= ~WM_NEVER_MAPPED; - SendMessage(wmPtr->wrapper, TK_ATTACHWINDOW, (WPARAM) child, 0); + if (winPtr->flags & TK_EMBEDDED + && SendMessage(wmPtr->wrapper, TK_ATTACHWINDOW, (WPARAM)child, 0)){ + SendMessage(wmPtr->wrapper, TK_GEOMETRYREQ, + Tk_ReqWidth((Tk_Window)winPtr), + Tk_ReqHeight((Tk_Window)winPtr)); + SendMessage(wmPtr->wrapper, TK_SETMENU, (WPARAM) wmPtr->hMenu, + (LPARAM) Tk_GetMenuHWND((Tk_Window) winPtr)); + } /* - * Force an initial transition from withdrawn to the real - * initial state. Set the Z order based on previous wrapper - * before we set the state. + * Force an initial transition from withdrawn to the real initial state. + * Set the Z order based on previous wrapper before we set the state. */ state = wmPtr->hints.initial_state; @@ -2167,6 +2316,7 @@ UpdateWrapper(winPtr) |SWP_NOOWNERZORDER); } TkpWmSetState(winPtr, state); + wmPtr->hints.initial_state = state; if (hSmallIcon != NULL) { SendMessage(wmPtr->wrapper,WM_SETICON,ICON_SMALL,(LPARAM)hSmallIcon); @@ -2176,15 +2326,18 @@ UpdateWrapper(winPtr) } /* - * If we are embedded then force a mapping of the window now, - * because we do not necessarily own the wrapper and may not - * get another opportunity to map ourselves. We should not be - * in either iconified or zoomed states when we get here, so - * it is safe to just check for TK_EMBEDDED without checking - * what state we are supposed to be in (default to NormalState). + * If we are embedded then force a mapping of the window now, because we + * do not necessarily own the wrapper and may not get another opportunity + * to map ourselves. We should not be in either iconified or zoomed states + * when we get here, so it is safe to just check for TK_EMBEDDED without + * checking what state we are supposed to be in (default to NormalState). */ if (winPtr->flags & TK_EMBEDDED) { + if(state+1 != SendMessage(wmPtr->wrapper, TK_STATE, state, 0)) { + TkpWmSetState(winPtr, NormalState); + wmPtr->hints.initial_state = NormalState; + } XMapWindow(winPtr->display, winPtr->window); } @@ -2193,7 +2346,7 @@ UpdateWrapper(winPtr) */ if (wmPtr->hMenu != NULL) { - wmPtr->flags = WM_SYNC_PENDING; + wmPtr->flags |= WM_SYNC_PENDING; SetMenu(wmPtr->wrapper, wmPtr->hMenu); wmPtr->flags &= ~WM_SYNC_PENDING; } @@ -2201,18 +2354,18 @@ UpdateWrapper(winPtr) if (childStateInfo) { if (wmPtr->numTransients > 0) { /* - * Reset all transient children for whom this is the master + * Reset all transient children for whom this is the master. */ + WmInfo *wmPtr2; state = 0; for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL; - wmPtr2 = wmPtr2->nextPtr) { - if (wmPtr2->masterPtr == winPtr) { - if (!(wmPtr2->flags & WM_NEVER_MAPPED)) { - UpdateWrapper(wmPtr2->winPtr); - TkpWmSetState(wmPtr2->winPtr, childStateInfo[state++]); - } + wmPtr2 = wmPtr2->nextPtr) { + if (wmPtr2->masterPtr == winPtr + && !(wmPtr2->flags & WM_NEVER_MAPPED)) { + UpdateWrapper(wmPtr2->winPtr); + TkpWmSetState(wmPtr2->winPtr, childStateInfo[state++]); } } } @@ -2221,11 +2374,11 @@ UpdateWrapper(winPtr) } /* - * If this is the first window created by the application, then - * we should activate the initial window. Otherwise, if this had - * the focus, we need to restore that. - * XXX: Rewrapping generates a <FocusOut> and <FocusIn> that would - * XXX: best be avoided, if we could safely mask them. + * If this is the first window created by the application, then we should + * activate the initial window. Otherwise, if this had the focus, we need + * to restore that. + * XXX: Rewrapping generates a <FocusOut> and <FocusIn> that would best be + * XXX: avoided, if we could safely mask them. */ if (tsdPtr->firstWindow) { @@ -2241,32 +2394,32 @@ UpdateWrapper(winPtr) * * TkWmMapWindow -- * - * This procedure is invoked to map a top-level window. This - * module gets a chance to update all window-manager-related - * information in properties before the window manager sees - * the map event and checks the properties. It also gets to - * decide whether or not to even map the window after all. + * This function is invoked to map a top-level window. This module gets a + * chance to update all window-manager-related information in properties + * before the window manager sees the map event and checks the + * properties. It also gets to decide whether or not to even map the + * window after all. * * Results: * None. * * Side effects: - * Properties of winPtr may get updated to provide up-to-date - * information to the window manager. The window may also get - * mapped, but it may not be if this procedure decides that - * isn't appropriate (e.g. because the window is withdrawn). + * Properties of winPtr may get updated to provide up-to-date information + * to the window manager. The window may also get mapped, but it may not + * be if this function decides that isn't appropriate (e.g. because the + * window is withdrawn). * *-------------------------------------------------------------- */ void -TkWmMapWindow(winPtr) - TkWindow *winPtr; /* Top-level window that's about to - * be mapped. */ +TkWmMapWindow( + TkWindow *winPtr) /* Top-level window that's about to be + * mapped. */ { register WmInfo *wmPtr = winPtr->wmInfoPtr; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) - Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); + Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (!tsdPtr->initialized) { InitWm(); @@ -2278,7 +2431,7 @@ TkWmMapWindow(winPtr) */ if (wmPtr->masterPtr != NULL && - !Tk_IsMapped(wmPtr->masterPtr)) { + !Tk_IsMapped(wmPtr->masterPtr)) { wmPtr->hints.initial_state = WithdrawnState; return; } @@ -2288,7 +2441,7 @@ TkWmMapWindow(winPtr) } /* - * Map the window in either the iconified or normal state. Note that + * Map the window in either the iconified or normal state. Note that * we only send a map event if the window is in the normal state. */ @@ -2296,9 +2449,8 @@ TkWmMapWindow(winPtr) } /* - * This is the first time this window has ever been mapped. - * Store all the window-manager-related information for the - * window. + * This is the first time this window has ever been mapped. Store all the + * window-manager-related information for the window. */ UpdateWrapper(winPtr); @@ -2309,9 +2461,9 @@ TkWmMapWindow(winPtr) * * TkWmUnmapWindow -- * - * This procedure is invoked to unmap a top-level window. The - * only thing it does special is unmap the decorative frame before - * unmapping the toplevel window. + * This function is invoked to unmap a top-level window. The only thing + * it does special is unmap the decorative frame before unmapping the + * toplevel window. * * Results: * None. @@ -2323,9 +2475,9 @@ TkWmMapWindow(winPtr) */ void -TkWmUnmapWindow(winPtr) - TkWindow *winPtr; /* Top-level window that's about to - * be unmapped. */ +TkWmUnmapWindow( + TkWindow *winPtr) /* Top-level window that's about to be + * unmapped. */ { TkpWmSetState(winPtr, WithdrawnState); } @@ -2335,8 +2487,8 @@ TkWmUnmapWindow(winPtr) * * TkpWmSetState -- * - * Sets the window manager state for the wrapper window of a - * given toplevel window. + * Sets the window manager state for the wrapper window of a given + * toplevel window. * * Results: * None. @@ -2348,13 +2500,13 @@ TkWmUnmapWindow(winPtr) */ void -TkpWmSetState(winPtr, state) - TkWindow *winPtr; /* Toplevel window to operate on. */ - int state; /* One of IconicState, ZoomState, NormalState, +TkpWmSetState( + TkWindow *winPtr, /* Toplevel window to operate on. */ + int state) /* One of IconicState, ZoomState, NormalState, * or WithdrawnState. */ { WmInfo *wmPtr = winPtr->wmInfoPtr; - int cmd = 0; + int cmd; if (wmPtr->flags & WM_NEVER_MAPPED) { wmPtr->hints.initial_state = state; @@ -2370,6 +2522,8 @@ TkpWmSetState(winPtr, state) cmd = SW_SHOWNOACTIVATE; } else if (state == ZoomState) { cmd = SW_SHOWMAXIMIZED; + } else { + return; } ShowWindow(wmPtr->wrapper, cmd); @@ -2377,13 +2531,103 @@ TkpWmSetState(winPtr, state) } /* + *---------------------------------------------------------------------- + * + * TkpWmSetFullScreen -- + * + * Sets the fullscreen state for a toplevel window. + * + * Results: + * The WM_FULLSCREEN flag is updated. + * + * Side effects: + * May create a new wrapper window and raise it. + * + *---------------------------------------------------------------------- + */ + +static void +TkpWmSetFullScreen( + TkWindow *winPtr, /* Toplevel window to operate on. */ + int full_screen_state) /* True if window should be full screen */ +{ + int changed = 0; + int full_screen = False; + WmInfo *wmPtr = winPtr->wmInfoPtr; + + if (full_screen_state) { + if (! (wmPtr->flags & WM_FULLSCREEN)) { + full_screen = True; + changed = 1; + } + } else { + if (wmPtr->flags & WM_FULLSCREEN) { + full_screen = False; + changed = 1; + } + } + + if (changed) { + if (full_screen) { + wmPtr->flags |= WM_FULLSCREEN; + wmPtr->configX = wmPtr->x; + wmPtr->configY = wmPtr->y; + } else { + wmPtr->flags &= ~WM_FULLSCREEN; + wmPtr->x = wmPtr->configX; + wmPtr->y = wmPtr->configY; + } + + /* + * If the window has been mapped, then we need to update the native + * wrapper window, and reset the focus to the widget that had it + * before. + */ + + if (!(wmPtr->flags & (WM_NEVER_MAPPED) + && !(winPtr->flags & TK_EMBEDDED))) { + TkWindow *focusWinPtr; + + UpdateWrapper(winPtr); + + focusWinPtr = TkGetFocusWin(winPtr); + if (focusWinPtr) { + TkSetFocusWin(focusWinPtr, 1); + } + } + } +} + +/* + *---------------------------------------------------------------------- + * + * TkpWinGetState -- + * + * This function returns state value of a toplevel window. + * + * Results: + * none + * + * Side effects: + * May deiconify the toplevel window. + * + *---------------------------------------------------------------------- + */ + +int +TkpWmGetState( + TkWindow *winPtr) +{ + return winPtr->wmInfoPtr->hints.initial_state; +} + +/* *-------------------------------------------------------------- * * TkWmDeadWindow -- * - * This procedure is invoked when a top-level window is - * about to be deleted. It cleans up the wm-related data - * structures for the window. + * This function is invoked when a top-level window is about to be + * deleted. It cleans up the wm-related data structures for the window. * * Results: * None. @@ -2395,8 +2639,8 @@ TkpWmSetState(winPtr, state) */ void -TkWmDeadWindow(winPtr) - TkWindow *winPtr; /* Top-level window that's being deleted. */ +TkWmDeadWindow( + TkWindow *winPtr) /* Top-level window that's being deleted. */ { register WmInfo *wmPtr = winPtr->wmInfoPtr; WmInfo *wmPtr2; @@ -2414,7 +2658,7 @@ TkWmDeadWindow(winPtr) } else { register WmInfo *prevPtr; for (prevPtr = winPtr->dispPtr->firstWmPtr; ; - prevPtr = prevPtr->nextPtr) { + prevPtr = prevPtr->nextPtr) { if (prevPtr == NULL) { Tcl_Panic("couldn't unlink window in TkWmDeadWindow"); } @@ -2434,8 +2678,8 @@ TkWmDeadWindow(winPtr) if (wmPtr2->masterPtr == winPtr) { wmPtr->numTransients--; Tk_DeleteEventHandler((Tk_Window) wmPtr2->masterPtr, - VisibilityChangeMask|StructureNotifyMask, - WmWaitVisibilityOrMapProc, (ClientData) wmPtr2->winPtr); + VisibilityChangeMask|StructureNotifyMask, + WmWaitVisibilityOrMapProc, (ClientData) wmPtr2->winPtr); wmPtr2->masterPtr = NULL; if ((wmPtr2->wrapper != None) && !(wmPtr2->flags & (WM_NEVER_MAPPED))) { @@ -2444,7 +2688,7 @@ TkWmDeadWindow(winPtr) } } if (wmPtr->numTransients != 0) - Tcl_Panic("numTransients should be 0"); + Tcl_Panic("numTransients should be 0"); if (wmPtr->title != NULL) { ckfree(wmPtr->title); @@ -2488,10 +2732,11 @@ TkWmDeadWindow(winPtr) } if (wmPtr->masterPtr != NULL) { wmPtr2 = wmPtr->masterPtr->wmInfoPtr; + /* - * If we had a master, tell them that we aren't tied - * to them anymore + * If we had a master, tell them that we aren't tied to them anymore. */ + if (wmPtr2 != NULL) { wmPtr2->numTransients--; } @@ -2512,17 +2757,22 @@ TkWmDeadWindow(winPtr) if (!(winPtr->flags & TK_EMBEDDED)) { if (wmPtr->wrapper != NULL) { DestroyWindow(wmPtr->wrapper); - } else { + } else if (winPtr->window) { DestroyWindow(Tk_GetHWND(winPtr->window)); } + } else { + if (wmPtr->wrapper != NULL) { + SendMessage(wmPtr->wrapper, TK_DETACHWINDOW, 0, 0); + } } if (wmPtr->iconPtr != NULL) { /* - * This may delete the icon resource data. I believe we - * should do this after destroying the decorative frame, - * because the decorative frame is using this icon. + * This may delete the icon resource data. I believe we should do this + * after destroying the decorative frame, because the decorative frame + * is using this icon. */ - DecrIconRefCount(wmPtr->iconPtr); + + DecrIconRefCount(wmPtr->iconPtr); } ckfree((char *) wmPtr); @@ -2534,11 +2784,10 @@ TkWmDeadWindow(winPtr) * * TkWmSetClass -- * - * This procedure is invoked whenever a top-level window's - * class is changed. If the window has been mapped then this - * procedure updates the window manager property for the - * class. If the window hasn't been mapped, the update is - * deferred until just before the first mapping. + * This function is invoked whenever a top-level window's class is + * changed. If the window has been mapped then this function updates the + * window manager property for the class. If the window hasn't been + * mapped, the update is deferred until just before the first mapping. * * Results: * None. @@ -2550,9 +2799,10 @@ TkWmDeadWindow(winPtr) */ void -TkWmSetClass(winPtr) - TkWindow *winPtr; /* Newly-created top-level window. */ +TkWmSetClass( + TkWindow *winPtr) /* Newly-created top-level window. */ { + /* Do nothing */ return; } @@ -2561,8 +2811,8 @@ TkWmSetClass(winPtr) * * Tk_WmObjCmd -- * - * This procedure is invoked to process the "wm" Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm" Tcl command. See the user + * documentation for details on what it does. * * Results: * A standard Tcl result. @@ -2575,49 +2825,51 @@ TkWmSetClass(winPtr) /* ARGSUSED */ int -Tk_WmObjCmd(clientData, interp, objc, objv) - ClientData clientData; /* Main window associated with - * interpreter. */ - Tcl_Interp *interp; /* Current interpreter. */ - int objc; /* Number of arguments. */ - Tcl_Obj *CONST objv[]; /* Argument objects. */ +Tk_WmObjCmd( + ClientData clientData, /* Main window associated with interpreter. */ + Tcl_Interp *interp, /* Current interpreter. */ + int objc, /* Number of arguments. */ + Tcl_Obj *CONST objv[]) /* Argument objects. */ { Tk_Window tkwin = (Tk_Window) clientData; static CONST char *optionStrings[] = { "aspect", "attributes", "client", "colormapwindows", - "command", "deiconify", "focusmodel", "frame", + "command", "deiconify", "focusmodel", "forget", "frame", "geometry", "grid", "group", "iconbitmap", "iconify", "iconmask", "iconname", "iconphoto", "iconposition", - "iconwindow", "maxsize", "minsize", "overrideredirect", - "positionfrom", "protocol", "resizable", "sizefrom", - "stackorder", "state", "title", "transient", - "withdraw", (char *) NULL }; + "iconwindow", "manage", "maxsize", "minsize", "overrideredirect", + "positionfrom", "protocol", "resizable", "sizefrom", + "stackorder", "state", "title", "transient", + "withdraw", NULL + }; enum options { - WMOPT_ASPECT, WMOPT_ATTRIBUTES, WMOPT_CLIENT, WMOPT_COLORMAPWINDOWS, - WMOPT_COMMAND, WMOPT_DEICONIFY, WMOPT_FOCUSMODEL, WMOPT_FRAME, + WMOPT_ASPECT, WMOPT_ATTRIBUTES, WMOPT_CLIENT, WMOPT_COLORMAPWINDOWS, + WMOPT_COMMAND, WMOPT_DEICONIFY, WMOPT_FOCUSMODEL, WMOPT_FORGET, WMOPT_FRAME, WMOPT_GEOMETRY, WMOPT_GRID, WMOPT_GROUP, WMOPT_ICONBITMAP, WMOPT_ICONIFY, WMOPT_ICONMASK, WMOPT_ICONNAME, WMOPT_ICONPHOTO, WMOPT_ICONPOSITION, - WMOPT_ICONWINDOW, WMOPT_MAXSIZE, WMOPT_MINSIZE, WMOPT_OVERRIDEREDIRECT, - WMOPT_POSITIONFROM, WMOPT_PROTOCOL, WMOPT_RESIZABLE, WMOPT_SIZEFROM, - WMOPT_STACKORDER, WMOPT_STATE, WMOPT_TITLE, WMOPT_TRANSIENT, - WMOPT_WITHDRAW }; + WMOPT_ICONWINDOW, WMOPT_MANAGE, WMOPT_MAXSIZE, WMOPT_MINSIZE, WMOPT_OVERRIDEREDIRECT, + WMOPT_POSITIONFROM, WMOPT_PROTOCOL, WMOPT_RESIZABLE, WMOPT_SIZEFROM, + WMOPT_STACKORDER, WMOPT_STATE, WMOPT_TITLE, WMOPT_TRANSIENT, + WMOPT_WITHDRAW + }; int index, length; char *argv1; - TkWindow *winPtr; + TkWindow *winPtr, **winPtrPtr = &winPtr; TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; if (objc < 2) { - wrongNumArgs: + wrongNumArgs: Tcl_WrongNumArgs(interp, 1, objv, "option window ?arg ...?"); return TCL_ERROR; } argv1 = Tcl_GetStringFromObj(objv[1], &length); - if ((argv1[0] == 't') && (strncmp(argv1, "tracing", length) == 0) + if ((argv1[0] == 't') && !strncmp(argv1, "tracing", (unsigned) length) && (length >= 3)) { int wmTracing; + if ((objc != 2) && (objc != 3)) { Tcl_WrongNumArgs(interp, 2, objv, "?boolean?"); return TCL_ERROR; @@ -2648,76 +2900,81 @@ Tk_WmObjCmd(clientData, interp, objc, objv) goto wrongNumArgs; } - if (TkGetWindowFromObj(interp, tkwin, objv[2], (Tk_Window *) &winPtr) + if (TkGetWindowFromObj(interp, tkwin, objv[2], (Tk_Window *) winPtrPtr) != TCL_OK) { return TCL_ERROR; } - if (!Tk_IsTopLevel(winPtr)) { + if (!Tk_IsTopLevel(winPtr) && + (index != WMOPT_MANAGE) && (index != WMOPT_FORGET)) { Tcl_AppendResult(interp, "window \"", winPtr->pathName, - "\" isn't a top-level window", (char *) NULL); + "\" isn't a top-level window", NULL); return TCL_ERROR; } switch ((enum options) index) { - case WMOPT_ASPECT: + case WMOPT_ASPECT: return WmAspectCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_ATTRIBUTES: + case WMOPT_ATTRIBUTES: return WmAttributesCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_CLIENT: + case WMOPT_CLIENT: return WmClientCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_COLORMAPWINDOWS: + case WMOPT_COLORMAPWINDOWS: return WmColormapwindowsCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_COMMAND: + case WMOPT_COMMAND: return WmCommandCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_DEICONIFY: + case WMOPT_DEICONIFY: return WmDeiconifyCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_FOCUSMODEL: + case WMOPT_FOCUSMODEL: return WmFocusmodelCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_FRAME: + case WMOPT_FORGET: + return WmForgetCmd(tkwin, winPtr, interp, objc, objv); + case WMOPT_FRAME: return WmFrameCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_GEOMETRY: + case WMOPT_GEOMETRY: return WmGeometryCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_GRID: + case WMOPT_GRID: return WmGridCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_GROUP: + case WMOPT_GROUP: return WmGroupCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_ICONBITMAP: + case WMOPT_ICONBITMAP: return WmIconbitmapCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_ICONIFY: + case WMOPT_ICONIFY: return WmIconifyCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_ICONMASK: + case WMOPT_ICONMASK: return WmIconmaskCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_ICONNAME: + case WMOPT_ICONNAME: return WmIconnameCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_ICONPHOTO: - return WmIconphotoCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_ICONPOSITION: + case WMOPT_ICONPHOTO: + return WmIconphotoCmd(tkwin, winPtr, interp, objc, objv); + case WMOPT_ICONPOSITION: return WmIconpositionCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_ICONWINDOW: + case WMOPT_ICONWINDOW: return WmIconwindowCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_MAXSIZE: + case WMOPT_MANAGE: + return WmManageCmd(tkwin, winPtr, interp, objc, objv); + case WMOPT_MAXSIZE: return WmMaxsizeCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_MINSIZE: + case WMOPT_MINSIZE: return WmMinsizeCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_OVERRIDEREDIRECT: + case WMOPT_OVERRIDEREDIRECT: return WmOverrideredirectCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_POSITIONFROM: + case WMOPT_POSITIONFROM: return WmPositionfromCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_PROTOCOL: + case WMOPT_PROTOCOL: return WmProtocolCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_RESIZABLE: + case WMOPT_RESIZABLE: return WmResizableCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_SIZEFROM: + case WMOPT_SIZEFROM: return WmSizefromCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_STACKORDER: + case WMOPT_STACKORDER: return WmStackorderCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_STATE: + case WMOPT_STATE: return WmStateCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_TITLE: + case WMOPT_TITLE: return WmTitleCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_TRANSIENT: + case WMOPT_TRANSIENT: return WmTransientCmd(tkwin, winPtr, interp, objc, objv); - case WMOPT_WITHDRAW: + case WMOPT_WITHDRAW: return WmWithdrawCmd(tkwin, winPtr, interp, objc, objv); } @@ -2730,8 +2987,8 @@ Tk_WmObjCmd(clientData, interp, objc, objv) * * WmAspectCmd -- * - * This procedure is invoked to process the "wm aspect" Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm aspect" Tcl command. See + * the user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -2743,12 +3000,12 @@ Tk_WmObjCmd(clientData, interp, objc, objv) */ static int -WmAspectCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmAspectCmd( + 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; int numer1, denom1, numer2, denom2; @@ -2778,10 +3035,8 @@ WmAspectCmd(tkwin, winPtr, interp, objc, objv) || (Tcl_GetIntFromObj(interp, objv[6], &denom2) != TCL_OK)) { return TCL_ERROR; } - if ((numer1 <= 0) || (denom1 <= 0) || (numer2 <= 0) || - (denom2 <= 0)) { - Tcl_SetResult(interp, "aspect number can't be <= 0", - TCL_STATIC); + if ((numer1 <= 0) || (denom1 <= 0) || (numer2 <= 0) || (denom2 <= 0)) { + Tcl_SetResult(interp, "aspect number can't be <= 0", TCL_STATIC); return TCL_ERROR; } wmPtr->minAspect.x = numer1; @@ -2799,7 +3054,7 @@ WmAspectCmd(tkwin, winPtr, interp, objc, objv) * * WmAttributesCmd -- * - * This procedure is invoked to process the "wm attributes" Tcl command. + * This function is invoked to process the "wm attributes" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -2812,31 +3067,34 @@ WmAspectCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmAttributesCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmAttributesCmd( + 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; - LONG style, exStyle, styleBit, *stylePtr; + LONG style, exStyle, styleBit, *stylePtr = NULL; char *string; - int i, boolean, length, updatewrapper = 0; + int i, boolean, length; + int config_fullscreen = 0, updatewrapper = 0; + int fullscreen_attr_changed = 0, fullscreen_attr = 0; if ((objc < 3) || ((objc > 5) && ((objc%2) == 0))) { - configArgs: + configArgs: Tcl_WrongNumArgs(interp, 2, objv, "window" " ?-alpha ?double??" " ?-transparentcolor ?color??" " ?-disabled ?bool??" + " ?-fullscreen ?bool??" " ?-toolwindow ?bool??" " ?-topmost ?bool??"); return TCL_ERROR; } exStyle = wmPtr->exStyleConfig; - style = wmPtr->styleConfig; + style = wmPtr->styleConfig; if (objc == 3) { Tcl_Obj *objPtr = Tcl_NewObj(); Tcl_ListObjAppendElement(NULL, objPtr, @@ -2851,6 +3109,10 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv) Tcl_ListObjAppendElement(NULL, objPtr, Tcl_NewBooleanObj((style & WS_DISABLED))); Tcl_ListObjAppendElement(NULL, objPtr, + Tcl_NewStringObj("-fullscreen", -1)); + Tcl_ListObjAppendElement(NULL, objPtr, + Tcl_NewBooleanObj((wmPtr->flags & WM_FULLSCREEN))); + Tcl_ListObjAppendElement(NULL, objPtr, Tcl_NewStringObj("-toolwindow", -1)); Tcl_ListObjAppendElement(NULL, objPtr, Tcl_NewBooleanObj((exStyle & WS_EX_TOOLWINDOW))); @@ -2866,16 +3128,19 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv) if ((length < 2) || (string[0] != '-')) { goto configArgs; } - if (strncmp(string, "-disabled", length) == 0) { + if (strncmp(string, "-disabled", (unsigned) length) == 0) { stylePtr = &style; styleBit = WS_DISABLED; - } else if ((strncmp(string, "-alpha", length) == 0) + } else if ((strncmp(string, "-alpha", (unsigned) length) == 0) || ((length > 2) && (strncmp(string, "-transparentcolor", - length) == 0))) { + (unsigned) length) == 0))) { stylePtr = &exStyle; styleBit = WS_EX_LAYERED; + } else if (strncmp(string, "-fullscreen", (unsigned) length) == 0) { + config_fullscreen = 1; + styleBit = 0; } else if ((length > 3) - && (strncmp(string, "-toolwindow", length) == 0)) { + && (strncmp(string, "-toolwindow", (unsigned) length) == 0)) { stylePtr = &exStyle; styleBit = WS_EX_TOOLWINDOW; if (objc != 4) { @@ -2885,13 +3150,12 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv) updatewrapper = 1; } } else if ((length > 3) - && (strncmp(string, "-topmost", length) == 0)) { + && (strncmp(string, "-topmost", (unsigned) length) == 0)) { stylePtr = &exStyle; styleBit = WS_EX_TOPMOST; if ((i < objc-1) && (winPtr->flags & TK_EMBEDDED)) { Tcl_AppendResult(interp, "can't set topmost flag on ", - winPtr->pathName, ": it is an embedded window", - (char *) NULL); + winPtr->pathName, ": it is an embedded window", NULL); return TCL_ERROR; } } else { @@ -2968,20 +3232,17 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv) * Set the window directly regardless of UpdateWrapper. * The user supplies a double from [0..1], but Windows * wants an int (transparent) 0..255 (opaque), so do the - * translation. Add the 0.5 to round the value. + * translation. Add the 0.5 to round the value. */ + if (!(wmPtr->exStyleConfig & WS_EX_LAYERED)) { -#ifdef _WIN64 SetWindowLongPtr(wmPtr->wrapper, GWL_EXSTYLE, *stylePtr); -#else - SetWindowLong(wmPtr->wrapper, GWL_EXSTYLE, - *stylePtr); -#endif } setLayeredWindowAttributesProc((HWND) wmPtr->wrapper, wmPtr->colorref, (BYTE) (wmPtr->alpha * 255 + 0.5), - LWA_ALPHA | (wmPtr->crefObj ? LWA_COLORKEY : 0)); + (unsigned) (LWA_ALPHA | + (wmPtr->crefObj ? LWA_COLORKEY : 0))); } } } else { @@ -2990,7 +3251,16 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv) != TCL_OK)) { return TCL_ERROR; } - if (objc == 4) { + if (config_fullscreen) { + if (objc == 4) { + Tcl_SetBooleanObj(Tcl_GetObjResult(interp), + (wmPtr->flags & WM_FULLSCREEN)); + } else { + fullscreen_attr_changed = 1; + fullscreen_attr = boolean; + } + config_fullscreen = 0; + } else if (objc == 4) { Tcl_SetIntObj(Tcl_GetObjResult(interp), ((*stylePtr & styleBit) != 0)); } else if (boolean) { @@ -3013,9 +3283,10 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv) } if (wmPtr->styleConfig != style) { /* - * Currently this means only WS_DISABLED changed, which we can - * effect with EnableWindow. + * Currently this means only WS_DISABLED changed, which we can effect + * with EnableWindow. */ + wmPtr->styleConfig = style; if ((wmPtr->exStyleConfig == exStyle) && !(wmPtr->flags & WM_NEVER_MAPPED)) { @@ -3029,11 +3300,43 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv) * UpdateWrapper ensure that all effects are properly handled, * such as TOOLWINDOW disappearing from the taskbar. */ + if (!(wmPtr->flags & WM_NEVER_MAPPED)) { UpdateWrapper(winPtr); } } } + if (fullscreen_attr_changed) { + if (fullscreen_attr) { + if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) { + Tcl_AppendResult(interp, + "can't set fullscreen attribute for \"", + winPtr->pathName, "\": override-redirect flag is set", + NULL); + return TCL_ERROR; + } + + /* + * Check max width and height if set by the user, don't worry + * about the default values since they will likely be smaller than + * screen width/height. + */ + + if (((wmPtr->maxWidth > 0) && + (WidthOfScreen(Tk_Screen(winPtr)) > wmPtr->maxWidth)) || + ((wmPtr->maxHeight > 0) && + (HeightOfScreen(Tk_Screen(winPtr)) > wmPtr->maxHeight))) { + Tcl_AppendResult(interp, + "can't set fullscreen attribute for \"", + winPtr->pathName, "\": max width/height is too small", + NULL); + return TCL_ERROR; + } + } + + TkpWmSetFullScreen(winPtr, fullscreen_attr); + } + return TCL_OK; } @@ -3042,8 +3345,8 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv) * * WmClientCmd -- * - * This procedure is invoked to process the "wm client" Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm client" Tcl command. See + * the user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -3055,12 +3358,12 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmClientCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmClientCmd( + 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; char *argv3; @@ -3083,8 +3386,7 @@ WmClientCmd(tkwin, winPtr, interp, objc, objv) wmPtr->clientMachine = NULL; if (!(wmPtr->flags & WM_NEVER_MAPPED)) { XDeleteProperty(winPtr->display, winPtr->window, - Tk_InternAtom((Tk_Window) winPtr, - "WM_CLIENT_MACHINE")); + Tk_InternAtom((Tk_Window) winPtr,"WM_CLIENT_MACHINE")); } } return TCL_OK; @@ -3097,6 +3399,7 @@ WmClientCmd(tkwin, winPtr, interp, objc, objv) strcpy(wmPtr->clientMachine, argv3); if (!(wmPtr->flags & WM_NEVER_MAPPED)) { XTextProperty textProp; + if (XStringListToTextProperty(&wmPtr->clientMachine, 1, &textProp) != 0) { XSetWMClientMachine(winPtr->display, winPtr->window, @@ -3112,9 +3415,8 @@ WmClientCmd(tkwin, winPtr, interp, objc, objv) * * WmColormapwindowsCmd -- * - * This procedure is invoked to process the "wm colormapwindows" - * Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm colormapwindows" Tcl + * command. See the user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -3126,16 +3428,16 @@ WmClientCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmColormapwindowsCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmColormapwindowsCmd( + 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; TkWindow **cmapList; - TkWindow *winPtr2; + TkWindow *winPtr2, **winPtr2Ptr = &winPtr2; int i, windowObjc, gotToplevel; Tcl_Obj **windowObjv; @@ -3163,8 +3465,7 @@ WmColormapwindowsCmd(tkwin, winPtr, interp, objc, objv) gotToplevel = 0; for (i = 0; i < windowObjc; i++) { if (TkGetWindowFromObj(interp, tkwin, windowObjv[i], - (Tk_Window *) &winPtr2) != TCL_OK) - { + (Tk_Window *) winPtr2Ptr) != TCL_OK) { ckfree((char *) cmapList); return TCL_ERROR; } @@ -3207,8 +3508,8 @@ WmColormapwindowsCmd(tkwin, winPtr, interp, objc, objv) * * WmCommandCmd -- * - * This procedure is invoked to process the "wm command" Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm command" Tcl command. See + * the user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -3220,12 +3521,12 @@ WmColormapwindowsCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmCommandCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmCommandCmd( + 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; char *argv3; @@ -3239,8 +3540,7 @@ WmCommandCmd(tkwin, winPtr, interp, objc, objv) if (objc == 3) { if (wmPtr->cmdArgv != NULL) { Tcl_SetResult(interp, - Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv), - TCL_DYNAMIC); + Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv), TCL_DYNAMIC); } return TCL_OK; } @@ -3275,7 +3575,7 @@ WmCommandCmd(tkwin, winPtr, interp, objc, objv) * * WmDeiconifyCmd -- * - * This procedure is invoked to process the "wm deiconify" Tcl command. + * This function is invoked to process the "wm deiconify" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -3288,12 +3588,12 @@ WmCommandCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmDeiconifyCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmDeiconifyCmd( + 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; @@ -3303,56 +3603,18 @@ WmDeiconifyCmd(tkwin, winPtr, interp, objc, objv) } 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); + ": it is an icon for ", Tk_PathName(wmPtr->iconFor), 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; - } - - wmPtr->flags &= ~WM_WITHDRAWN; - - /* - * If WM_UPDATE_PENDING is true, a pending UpdateGeometryInfo may - * need to be called first to update a withdrawn toplevel's geometry - * before it is deiconified by TkpWmSetState. - * Don't bother if we've never been mapped. - */ - if ((wmPtr->flags & WM_UPDATE_PENDING) && - !(wmPtr->flags & WM_NEVER_MAPPED)) { - Tcl_CancelIdleCall(UpdateGeometryInfo, (ClientData) winPtr); - UpdateGeometryInfo((ClientData) winPtr); - } - - /* - * If we were in the ZoomState (maximized), 'wm deiconify' - * should not cause the window to shrink - */ - if (wmPtr->hints.initial_state == ZoomState) { - TkpWmSetState(winPtr, ZoomState); - } else { - TkpWmSetState(winPtr, NormalState); - } - - /* - * An unmapped window will be mapped at idle time - * by a call to MapFrame. That calls CreateWrapper - * which sets the focus and raises the window. - */ - if (wmPtr->flags & WM_NEVER_MAPPED) { + if (!SendMessage(wmPtr->wrapper, TK_DEICONIFY, 0, 0)) { + Tcl_AppendResult(interp, "can't deiconify ", winPtr->pathName, + ": the container does not support the request", NULL); + return TCL_ERROR; + } return TCL_OK; } - - /* - * Follow Windows-like style here, raising the window to the top. - */ - TkWmRestackToplevel(winPtr, Above, NULL); - if (!(Tk_Attributes((Tk_Window) winPtr)->override_redirect)) { - TkSetFocusWin(winPtr, 1); - } + TkpWinToplevelDeiconify(winPtr); return TCL_OK; } @@ -3361,7 +3623,7 @@ WmDeiconifyCmd(tkwin, winPtr, interp, objc, objv) * * WmFocusmodelCmd -- * - * This procedure is invoked to process the "wm focusmodel" Tcl command. + * This function is invoked to process the "wm focusmodel" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -3374,18 +3636,20 @@ WmDeiconifyCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmFocusmodelCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmFocusmodelCmd( + 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; static CONST char *optionStrings[] = { - "active", "passive", (char *) NULL }; + "active", "passive", NULL + }; enum options { - OPT_ACTIVE, OPT_PASSIVE }; + OPT_ACTIVE, OPT_PASSIVE + }; int index; if ((objc != 3) && (objc != 4)) { @@ -3413,9 +3677,9 @@ WmFocusmodelCmd(tkwin, winPtr, interp, objc, objv) /* *---------------------------------------------------------------------- * - * WmFrameCmd -- + * WmForgetCmd -- * - * This procedure is invoked to process the "wm frame" Tcl command. + * This procedure is invoked to process the "wm forget" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -3428,13 +3692,54 @@ WmFocusmodelCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmFrameCmd(tkwin, winPtr, interp, objc, objv) +WmForgetCmd(tkwin, winPtr, interp, objc, objv) Tk_Window tkwin; /* Main window of the application. */ - TkWindow *winPtr; /* Toplevel to work with */ + TkWindow *winPtr; /* Toplevel or Frame to work with */ Tcl_Interp *interp; /* Current interpreter. */ int objc; /* Number of arguments. */ Tcl_Obj *CONST objv[]; /* Argument objects. */ { + register Tk_Window frameWin = (Tk_Window)winPtr; + + if (Tk_IsTopLevel(frameWin)) { + Tk_UnmapWindow(frameWin); + winPtr->flags &= ~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED); + Tk_MakeWindowExist((Tk_Window)winPtr->parentPtr); + RemapWindows(winPtr, Tk_GetHWND(winPtr->parentPtr->window)); + TkWmDeadWindow(winPtr); + /* flags (above) must be cleared before calling */ + /* TkMapTopFrame (below) */ + TkMapTopFrame(frameWin); + } else { + /* Already not managed by wm - ignore it */ + } + return TCL_OK; +} +/* + *---------------------------------------------------------------------- + * + * WmFrameCmd -- + * + * This function is invoked to process the "wm frame" Tcl command. See + * the user documentation for details on what it does. + * + * Results: + * A standard Tcl result. + * + * Side effects: + * See the user documentation. + * + *---------------------------------------------------------------------- + */ + +static int +WmFrameCmd( + 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; HWND hwnd; char buf[TCL_INTEGER_SPACE]; @@ -3450,7 +3755,7 @@ WmFrameCmd(tkwin, winPtr, interp, objc, objv) if (hwnd == NULL) { hwnd = Tk_GetHWND(Tk_WindowId((Tk_Window) winPtr)); } - sprintf(buf, "0x%x", (unsigned int) hwnd); + sprintf(buf, "0x%x", PTR2INT(hwnd)); Tcl_SetResult(interp, buf, TCL_VOLATILE); return TCL_OK; } @@ -3460,7 +3765,7 @@ WmFrameCmd(tkwin, winPtr, interp, objc, objv) * * WmGeometryCmd -- * - * This procedure is invoked to process the "wm geometry" Tcl command. + * This function is invoked to process the "wm geometry" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -3473,12 +3778,12 @@ WmFrameCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmGeometryCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmGeometryCmd( + 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; char xSign, ySign; @@ -3491,6 +3796,7 @@ WmGeometryCmd(tkwin, winPtr, interp, objc, objv) } if (objc == 3) { char buf[16 + TCL_INTEGER_SPACE * 4]; + int x, y; xSign = (wmPtr->flags & WM_NEGATIVE_X) ? '-' : '+'; ySign = (wmPtr->flags & WM_NEGATIVE_Y) ? '-' : '+'; @@ -3503,8 +3809,14 @@ WmGeometryCmd(tkwin, winPtr, interp, objc, objv) width = winPtr->changes.width; height = winPtr->changes.height; } - sprintf(buf, "%dx%d%c%d%c%d", width, height, xSign, wmPtr->x, - ySign, wmPtr->y); + if(winPtr->flags & TK_EMBEDDED) { + int result = SendMessage(wmPtr->wrapper, TK_MOVEWINDOW, -1, -1); + wmPtr->x = result >> 16; + wmPtr->y = result & 0x0000ffff; + } + x = wmPtr->x; + y = wmPtr->y; + sprintf(buf, "%dx%d%c%d%c%d", width, height, xSign, x, ySign, y); Tcl_SetResult(interp, buf, TCL_VOLATILE); return TCL_OK; } @@ -3523,8 +3835,8 @@ WmGeometryCmd(tkwin, winPtr, interp, objc, objv) * * WmGridCmd -- * - * This procedure is invoked to process the "wm grid" Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm grid" Tcl command. See the + * user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -3536,12 +3848,12 @@ WmGeometryCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmGridCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmGridCmd( + 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; int reqWidth, reqHeight, widthInc, heightInc; @@ -3564,8 +3876,8 @@ WmGridCmd(tkwin, winPtr, interp, objc, objv) } if (*Tcl_GetString(objv[3]) == '\0') { /* - * Turn off gridding and reset the width and height - * to make sense as ungridded numbers. + * Turn off gridding and reset the width and height to make sense as + * ungridded numbers. */ wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc); @@ -3612,8 +3924,8 @@ WmGridCmd(tkwin, winPtr, interp, objc, objv) * * WmGroupCmd -- * - * This procedure is invoked to process the "wm group" Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm group" Tcl command. See + * the user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -3625,12 +3937,12 @@ WmGridCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmGroupCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmGroupCmd( + 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; Tk_Window tkwin2; @@ -3675,7 +3987,7 @@ WmGroupCmd(tkwin, winPtr, interp, objc, objv) * * WmIconbitmapCmd -- * - * This procedure is invoked to process the "wm iconbitmap" Tcl command. + * This function is invoked to process the "wm iconbitmap" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -3688,12 +4000,12 @@ WmGroupCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmIconbitmapCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmIconbitmapCmd( + 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; TkWindow *useWinPtr = winPtr; /* window to apply to (NULL if -default) */ @@ -3703,17 +4015,23 @@ WmIconbitmapCmd(tkwin, winPtr, interp, objc, objv) Tcl_WrongNumArgs(interp, 2, objv, "window ?-default? ?image?"); return TCL_ERROR; } else if (objc == 5) { - /* If we have 5 arguments, we must have a '-default' flag */ + /* + * If we have 5 arguments, we must have a '-default' flag. + */ + char *argv3 = Tcl_GetString(objv[3]); + if (strcmp(argv3, "-default")) { - Tcl_AppendResult(interp, "illegal option \"", - argv3, "\" must be \"-default\"", - (char *) NULL); + Tcl_AppendResult(interp, "illegal option \"", argv3, + "\" must be \"-default\"", NULL); return TCL_ERROR; } useWinPtr = NULL; } else if (objc == 3) { - /* No arguments were given */ + /* + * No arguments were given. + */ + if (wmPtr->hints.flags & IconPixmapHint) { Tcl_SetResult(interp, (char *) Tk_NameOfBitmap(winPtr->display, wmPtr->hints.icon_pixmap), @@ -3735,42 +4053,46 @@ WmIconbitmapCmd(tkwin, winPtr, interp, objc, objv) } else { /* * In the future this block of code will use Tk's 'image' - * functionality to allow all supported image formats. - * However, this will require a change to the way icons are - * handled. We will need to add icon<->image conversions - * routines. + * functionality to allow all supported image formats. However, this + * will require a change to the way icons are handled. We will need to + * add icon<->image conversions routines. * - * Until that happens we simply try to find an icon in the - * given argument, and if that fails, we use the older - * bitmap code. We do things this way round (icon then - * bitmap), because the bitmap code actually seems to have - * no visible effect, so we want to give the icon code the - * first try at doing something. + * Until that happens we simply try to find an icon in the given + * argument, and if that fails, we use the older bitmap code. We do + * things this way round (icon then bitmap), because the bitmap code + * actually seems to have no visible effect, so we want to give the + * icon code the first try at doing something. */ /* - * Either return NULL, or return a valid titlebaricon with its - * ref count already incremented. + * Either return NULL, or return a valid titlebaricon with its ref + * count already incremented. */ + WinIconPtr titlebaricon = ReadIconFromFile(interp, objv[objc-1]); if (titlebaricon != NULL) { /* - * Try to set the icon for the window. If it is a '-default' - * icon, we must pass in NULL + * Try to set the icon for the window. If it is a '-default' icon, + * we must pass in NULL */ + if (WinSetIcon(interp, titlebaricon, (Tk_Window) useWinPtr) != TCL_OK) { - /* We didn't use the titlebaricon after all */ + /* + * We didn't use the titlebaricon after all. + */ + DecrIconRefCount(titlebaricon); titlebaricon = NULL; } } if (titlebaricon == NULL) { /* - * We didn't manage to handle the argument as a valid - * icon. Try as a bitmap. First we must clear the - * error message which was placed in the interpreter + * We didn't manage to handle the argument as a valid icon. Try as + * a bitmap. First we must clear the error message which was + * placed in the interpreter. */ + Pixmap pixmap; Tcl_ResetResult(interp); pixmap = Tk_GetBitmap(interp, (Tk_Window) winPtr, string); @@ -3780,13 +4102,14 @@ WmIconbitmapCmd(tkwin, winPtr, interp, objc, objv) wmPtr->hints.icon_pixmap = pixmap; wmPtr->hints.flags |= IconPixmapHint; titlebaricon = GetIconFromPixmap(Tk_Display(winPtr), pixmap); - if (titlebaricon != NULL) { - if (WinSetIcon(interp, titlebaricon, (Tk_Window) useWinPtr) - != TCL_OK) { - /* We didn't use the titlebaricon after all */ - DecrIconRefCount(titlebaricon); - titlebaricon = NULL; - } + if (titlebaricon != NULL && WinSetIcon(interp, titlebaricon, + (Tk_Window) useWinPtr) != TCL_OK) { + /* + * We didn't use the titlebaricon after all. + */ + + DecrIconRefCount(titlebaricon); + titlebaricon = NULL; } } } @@ -3798,8 +4121,8 @@ WmIconbitmapCmd(tkwin, winPtr, interp, objc, objv) * * WmIconifyCmd -- * - * This procedure is invoked to process the "wm iconify" Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm iconify" Tcl command. See + * the user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -3811,37 +4134,38 @@ WmIconbitmapCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmIconifyCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmIconifyCmd( + 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 (winPtr->flags & TK_EMBEDDED) { + if(!SendMessage(wmPtr->wrapper, TK_ICONIFY, 0, 0)) { + Tcl_AppendResult(interp, "can't iconify ", winPtr->pathName, + ": the container does not support the request", NULL); + return TCL_ERROR; + } + } if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) { Tcl_AppendResult(interp, "can't iconify \"", winPtr->pathName, - "\": override-redirect flag is set", (char *) NULL); + "\": override-redirect flag is set", NULL); return TCL_ERROR; } if (wmPtr->masterPtr != NULL) { Tcl_AppendResult(interp, "can't iconify \"", winPtr->pathName, - "\": it is a transient", (char *) NULL); + "\": it is a transient", NULL); return TCL_ERROR; } if (wmPtr->iconFor != NULL) { Tcl_AppendResult(interp, "can't iconify ", winPtr->pathName, - ": it is an icon for ", Tk_PathName(wmPtr->iconFor), - (char *) NULL); - return TCL_ERROR; - } - if (winPtr->flags & TK_EMBEDDED) { - Tcl_AppendResult(interp, "can't iconify ", winPtr->pathName, - ": it is an embedded window", (char *) NULL); + ": it is an icon for ", Tk_PathName(wmPtr->iconFor), NULL); return TCL_ERROR; } TkpWmSetState(winPtr, IconicState); @@ -3853,7 +4177,7 @@ WmIconifyCmd(tkwin, winPtr, interp, objc, objv) * * WmIconmaskCmd -- * - * This procedure is invoked to process the "wm iconmask" Tcl command. + * This function is invoked to process the "wm iconmask" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -3866,12 +4190,12 @@ WmIconifyCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmIconmaskCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmIconmaskCmd( + 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; Pixmap pixmap; @@ -3911,7 +4235,7 @@ WmIconmaskCmd(tkwin, winPtr, interp, objc, objv) * * WmIconnameCmd -- * - * This procedure is invoked to process the "wm iconname" Tcl command. + * This function is invoked to process the "wm iconname" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -3924,12 +4248,12 @@ WmIconmaskCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmIconnameCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmIconnameCmd( + 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; char *argv3; @@ -3963,8 +4287,7 @@ WmIconnameCmd(tkwin, winPtr, interp, objc, objv) * * WmIconphotoCmd -- * - * This procedure is invoked to process the "wm iconphoto" - * Tcl command. + * This function is invoked to process the "wm iconphoto" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -3977,30 +4300,36 @@ WmIconnameCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmIconphotoCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmIconphotoCmd( + 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. */ { TkWindow *useWinPtr = winPtr; /* window to apply to (NULL if -default) */ Tk_PhotoHandle photo; Tk_PhotoImageBlock block; - int i, size, width, height, idx, bufferSize, startObj = 3; - unsigned char *bgraPixelPtr; + int i, width, height, idx, bufferSize, startObj = 3; + union {unsigned char *ptr; void *voidPtr;} bgraPixel; + void *bgraMaskPtr; BlockOfIconImagesPtr lpIR; WinIconPtr titlebaricon = NULL; HICON hIcon; + unsigned size; + BITMAPINFO bmInfo; + ICONINFO iconInfo; if (objc < 4) { Tcl_WrongNumArgs(interp, 2, objv, "window ?-default? image1 ?image2 ...?"); return TCL_ERROR; } + /* * Iterate over all images to validate their existence. */ + if (strcmp(Tcl_GetString(objv[3]), "-default") == 0) { useWinPtr = NULL; startObj = 4; @@ -4014,58 +4343,120 @@ WmIconphotoCmd(tkwin, winPtr, interp, objc, objv) photo = Tk_FindPhoto(interp, Tcl_GetString(objv[i])); if (photo == NULL) { Tcl_AppendResult(interp, "can't use \"", Tcl_GetString(objv[i]), - "\" as iconphoto: not a photo image", (char *) NULL); + "\" as iconphoto: not a photo image", NULL); return TCL_ERROR; } } - /* We have calculated the size of the data. Try to allocate the needed - * memory space. */ - size = sizeof(BlockOfIconImages) - + (sizeof(ICONIMAGE) * (objc - (startObj+1))); - lpIR = (BlockOfIconImagesPtr) Tcl_AttemptAlloc(size); + + /* + * We have calculated the size of the data. Try to allocate the needed + * memory space. + */ + + size = sizeof(BlockOfIconImages) + (sizeof(ICONIMAGE) * (objc-startObj-1)); + lpIR = (BlockOfIconImagesPtr) attemptckalloc(size); if (lpIR == NULL) { return TCL_ERROR; } ZeroMemory(lpIR, size); lpIR->nNumImages = objc - startObj; + for (i = startObj; i < objc; i++) { photo = Tk_FindPhoto(interp, Tcl_GetString(objv[i])); Tk_PhotoGetSize(photo, &width, &height); Tk_PhotoGetImage(photo, &block); /* - * Convert the image data into BGRA format (RGBQUAD) and then - * encode the image data into an HICON. + * Don't use CreateIcon to create the icon, as it requires color + * bitmap data in device-dependent format. Instead we use + * CreateIconIndirect which takes device-independent bitmaps + * and converts them as required. Initialise icon info structure. + */ + + ZeroMemory( &iconInfo, sizeof iconInfo ); + iconInfo.fIcon = TRUE; + + /* + * Create device-independant color bitmap. + */ + ZeroMemory(&bmInfo,sizeof bmInfo); + bmInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmInfo.bmiHeader.biWidth = width; + bmInfo.bmiHeader.biHeight = -height; + bmInfo.bmiHeader.biPlanes = 1; + bmInfo.bmiHeader.biBitCount = 32; + bmInfo.bmiHeader.biCompression = BI_RGB; + + iconInfo.hbmColor = CreateDIBSection( NULL, &bmInfo, + DIB_RGB_COLORS, &bgraPixel.voidPtr, NULL, 0 ); + if ( !iconInfo.hbmColor ) { + ckfree((char *) lpIR); + Tcl_AppendResult(interp, "failed to create color bitmap for \"", + Tcl_GetString(objv[i]), "\"", NULL); + return TCL_ERROR; + } + + /* + * Convert the photo image data into BGRA format (RGBQUAD). */ - bufferSize = height * width * block.pixelSize; - bgraPixelPtr = (unsigned char *) ckalloc(bufferSize); + bufferSize = height * width * 4; for (idx = 0 ; idx < bufferSize ; idx += 4) { - bgraPixelPtr[idx] = block.pixelPtr[idx+2]; - bgraPixelPtr[idx+1] = block.pixelPtr[idx+1]; - bgraPixelPtr[idx+2] = block.pixelPtr[idx+0]; - bgraPixelPtr[idx+3] = block.pixelPtr[idx+3]; - } - hIcon = CreateIcon(Tk_GetHINSTANCE(), width, height, 1, 32, - NULL, (BYTE *) bgraPixelPtr); - ckfree((char *) bgraPixelPtr); + bgraPixel.ptr[idx] = block.pixelPtr[idx+2]; + bgraPixel.ptr[idx+1] = block.pixelPtr[idx+1]; + bgraPixel.ptr[idx+2] = block.pixelPtr[idx+0]; + bgraPixel.ptr[idx+3] = block.pixelPtr[idx+3]; + } + + /* + * Create a dummy mask bitmap. The contents of this don't + * appear to matter, as CreateIconIndirect will setup the icon + * mask based on the alpha channel in our color bitmap. + */ + bmInfo.bmiHeader.biBitCount = 1; + + iconInfo.hbmMask = CreateDIBSection( NULL, &bmInfo, + DIB_RGB_COLORS, &bgraMaskPtr, NULL, 0 ); + if ( !iconInfo.hbmMask ) { + DeleteObject(iconInfo.hbmColor); + ckfree((char *) lpIR); + Tcl_AppendResult(interp, "failed to create mask bitmap for \"", + Tcl_GetString(objv[i]), "\"", NULL); + return TCL_ERROR; + } + + ZeroMemory( bgraMaskPtr, width*height/8 ); + + /* + * Create an icon from the bitmaps. + */ + hIcon = CreateIconIndirect( &iconInfo); + DeleteObject(iconInfo.hbmColor); + DeleteObject(iconInfo.hbmMask); if (hIcon == NULL) { - /* XXX should free up created icons */ - Tcl_Free((char *) lpIR); + /* + * XXX should free up created icons. + */ + + ckfree((char *) lpIR); Tcl_AppendResult(interp, "failed to create icon for \"", - Tcl_GetString(objv[i]), "\"", (char *) NULL); + Tcl_GetString(objv[i]), "\"", NULL); return TCL_ERROR; } - lpIR->IconImages[i-startObj].Width = width; + lpIR->IconImages[i-startObj].Width = width; lpIR->IconImages[i-startObj].Height = height; lpIR->IconImages[i-startObj].Colors = 4; - lpIR->IconImages[i-startObj].hIcon = hIcon; + lpIR->IconImages[i-startObj].hIcon = hIcon; } + titlebaricon = (WinIconPtr) ckalloc(sizeof(WinIconInstance)); titlebaricon->iconBlock = lpIR; titlebaricon->refCount = 1; if (WinSetIcon(interp, titlebaricon, (Tk_Window) useWinPtr) != TCL_OK) { - /* We didn't use the titlebaricon after all */ + /* + * We didn't use the titlebaricon after all. + */ + DecrIconRefCount(titlebaricon); return TCL_ERROR; } @@ -4077,8 +4468,7 @@ WmIconphotoCmd(tkwin, winPtr, interp, objc, objv) * * WmIconpositionCmd -- * - * This procedure is invoked to process the "wm iconposition" - * Tcl command. + * This function is invoked to process the "wm iconposition" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -4091,12 +4481,12 @@ WmIconphotoCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmIconpositionCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmIconpositionCmd( + 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; int x, y; @@ -4134,7 +4524,7 @@ WmIconpositionCmd(tkwin, winPtr, interp, objc, objv) * * WmIconwindowCmd -- * - * This procedure is invoked to process the "wm iconwindow" Tcl command. + * This function is invoked to process the "wm iconwindow" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -4147,12 +4537,12 @@ WmIconpositionCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmIconwindowCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmIconwindowCmd( + 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; Tk_Window tkwin2; @@ -4173,8 +4563,8 @@ WmIconwindowCmd(tkwin, winPtr, interp, objc, objv) wmPtr->hints.flags &= ~IconWindowHint; if (wmPtr->icon != NULL) { /* - * Let the window use button events again, then remove - * it as icon window. + * Let the window use button events again, then remove it as icon + * window. */ atts.event_mask = Tk_Attributes(wmPtr->icon)->event_mask @@ -4191,14 +4581,14 @@ WmIconwindowCmd(tkwin, winPtr, interp, objc, objv) } if (!Tk_IsTopLevel(tkwin2)) { Tcl_AppendResult(interp, "can't use ", Tcl_GetString(objv[3]), - " as icon window: not at top level", (char *) NULL); + " as icon window: not at top level", NULL); return TCL_ERROR; } wmPtr2 = ((TkWindow *) tkwin2)->wmInfoPtr; if (wmPtr2->iconFor != NULL) { Tcl_AppendResult(interp, Tcl_GetString(objv[3]), - " is already an icon for ", - Tk_PathName(wmPtr2->iconFor), (char *) NULL); + " is already an icon for ", Tk_PathName(wmPtr2->iconFor), + NULL); return TCL_ERROR; } if (wmPtr->icon != NULL) { @@ -4215,10 +4605,9 @@ WmIconwindowCmd(tkwin, winPtr, interp, objc, objv) } /* - * Disable button events in the icon window: some window - * managers (like olvwm) want to get the events themselves, - * but X only allows one application at a time to receive - * button events for a window. + * Disable button events in the icon window: some window managers + * (like olvwm) want to get the events themselves, but X only allows + * one application at a time to receive button events for a window. */ atts.event_mask = Tk_Attributes(tkwin2)->event_mask @@ -4240,9 +4629,9 @@ WmIconwindowCmd(tkwin, winPtr, interp, objc, objv) /* *---------------------------------------------------------------------- * - * WmMaxsizeCmd -- + * WmManageCmd -- * - * This procedure is invoked to process the "wm maxsize" Tcl command. + * This procedure is invoked to process the "wm manage" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -4255,13 +4644,66 @@ WmIconwindowCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmMaxsizeCmd(tkwin, winPtr, interp, objc, objv) +WmManageCmd(tkwin, winPtr, interp, objc, objv) Tk_Window tkwin; /* Main window of the application. */ - TkWindow *winPtr; /* Toplevel to work with */ + TkWindow *winPtr; /* Toplevel or Frame to work with */ Tcl_Interp *interp; /* Current interpreter. */ int objc; /* Number of arguments. */ Tcl_Obj *CONST objv[]; /* Argument objects. */ { + register Tk_Window frameWin = (Tk_Window)winPtr; + register WmInfo *wmPtr = winPtr->wmInfoPtr; + + if (!Tk_IsTopLevel(frameWin)) { + if (!Tk_IsManageable(frameWin)) { + Tcl_AppendResult(interp, "window \"", + Tk_PathName(frameWin), "\" is not manageable: must be " + "a frame, labelframe or toplevel", NULL); + return TCL_ERROR; + } + TkFocusSplit(winPtr); + Tk_UnmapWindow(frameWin); + winPtr->flags |= TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED; + RemapWindows(winPtr, NULL); + if (wmPtr == NULL) { + TkWmNewWindow(winPtr); + } + wmPtr = winPtr->wmInfoPtr; + winPtr->flags &= ~TK_MAPPED; + /* flags (above) must be set before calling */ + /* TkMapTopFrame (below) */ + TkMapTopFrame (frameWin); + } else if (Tk_IsTopLevel(frameWin)) { + /* Already managed by wm - ignore it */ + } + return TCL_OK; +} + +/* + *---------------------------------------------------------------------- + * + * WmMaxsizeCmd -- + * + * This function is invoked to process the "wm maxsize" Tcl command. See + * the user documentation for details on what it does. + * + * Results: + * A standard Tcl result. + * + * Side effects: + * See the user documentation. + * + *---------------------------------------------------------------------- + */ + +static int +WmMaxsizeCmd( + 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; int width, height; @@ -4292,8 +4734,8 @@ WmMaxsizeCmd(tkwin, winPtr, interp, objc, objv) * * WmMinsizeCmd -- * - * This procedure is invoked to process the "wm minsize" Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm minsize" Tcl command. See + * the user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -4305,12 +4747,12 @@ WmMaxsizeCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmMinsizeCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmMinsizeCmd( + 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; int width, height; @@ -4342,9 +4784,8 @@ WmMinsizeCmd(tkwin, winPtr, interp, objc, objv) * * WmOverrideredirectCmd -- * - * This procedure is invoked to process the "wm overrideredirect" - * Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm overrideredirect" Tcl + * command. See the user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -4356,12 +4797,12 @@ WmMinsizeCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmOverrideredirectCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmOverrideredirectCmd( + 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; int boolean, curValue; @@ -4371,7 +4812,16 @@ WmOverrideredirectCmd(tkwin, winPtr, interp, objc, objv) Tcl_WrongNumArgs(interp, 2, objv, "window ?boolean?"); return TCL_ERROR; } - curValue = Tk_Attributes((Tk_Window) winPtr)->override_redirect; + if(winPtr->flags & TK_EMBEDDED) { + curValue = SendMessage(wmPtr->wrapper, TK_OVERRIDEREDIRECT, -1, -1)-1; + if (curValue < 0) { + Tcl_AppendResult(interp, + "Container does not support overrideredirect", NULL); + return TCL_ERROR; + } + } else { + curValue = Tk_Attributes((Tk_Window) winPtr)->override_redirect; + } if (objc == 3) { Tcl_SetBooleanObj(Tcl_GetObjResult(interp), curValue); return TCL_OK; @@ -4380,16 +4830,21 @@ WmOverrideredirectCmd(tkwin, winPtr, interp, objc, objv) return TCL_ERROR; } if (curValue != boolean) { - /* - * Only do this if we are really changing value, because it - * causes some funky stuff to occur - */ - atts.override_redirect = (boolean) ? True : False; - Tk_ChangeWindowAttributes((Tk_Window) winPtr, CWOverrideRedirect, - &atts); - if (!(wmPtr->flags & (WM_NEVER_MAPPED) - && !(winPtr->flags & TK_EMBEDDED))) { - UpdateWrapper(winPtr); + if(winPtr->flags & TK_EMBEDDED) { + SendMessage(wmPtr->wrapper, TK_OVERRIDEREDIRECT, boolean, 0); + } else { + /* + * Only do this if we are really changing value, because it causes + * some funky stuff to occur. + */ + + atts.override_redirect = (boolean) ? True : False; + Tk_ChangeWindowAttributes((Tk_Window) winPtr, CWOverrideRedirect, + &atts); + if (!(wmPtr->flags & (WM_NEVER_MAPPED)) + && !(winPtr->flags & TK_EMBEDDED)) { + UpdateWrapper(winPtr); + } } } return TCL_OK; @@ -4400,8 +4855,7 @@ WmOverrideredirectCmd(tkwin, winPtr, interp, objc, objv) * * WmPositionfromCmd -- * - * This procedure is invoked to process the "wm positionfrom" - * Tcl command. + * This function is invoked to process the "wm positionfrom" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -4414,18 +4868,20 @@ WmOverrideredirectCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmPositionfromCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmPositionfromCmd( + 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; static CONST char *optionStrings[] = { - "program", "user", (char *) NULL }; + "program", "user", NULL + }; enum options { - OPT_PROGRAM, OPT_USER }; + OPT_PROGRAM, OPT_USER + }; int index; if ((objc != 3) && (objc != 4)) { @@ -4464,7 +4920,7 @@ WmPositionfromCmd(tkwin, winPtr, interp, objc, objv) * * WmProtocolCmd -- * - * This procedure is invoked to process the "wm protocol" Tcl command. + * This function is invoked to process the "wm protocol" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -4477,12 +4933,12 @@ WmPositionfromCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmProtocolCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmProtocolCmd( + 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; register ProtocolHandler *protPtr, *prevPtr; @@ -4498,8 +4954,9 @@ WmProtocolCmd(tkwin, winPtr, interp, objc, objv) /* * Return a list of all defined protocols for the window. */ + for (protPtr = wmPtr->protPtr; protPtr != NULL; - protPtr = protPtr->nextPtr) { + protPtr = protPtr->nextPtr) { Tcl_AppendElement(interp, Tk_GetAtomName((Tk_Window) winPtr, protPtr->protocol)); } @@ -4510,8 +4967,9 @@ WmProtocolCmd(tkwin, winPtr, interp, objc, objv) /* * Return the command to handle a given protocol. */ + for (protPtr = wmPtr->protPtr; protPtr != NULL; - protPtr = protPtr->nextPtr) { + protPtr = protPtr->nextPtr) { if (protPtr->protocol == protocol) { Tcl_SetResult(interp, protPtr->command, TCL_STATIC); return TCL_OK; @@ -4521,13 +4979,12 @@ WmProtocolCmd(tkwin, winPtr, interp, objc, objv) } /* - * Delete any current protocol handler, then create a new - * one with the specified command, unless the command is - * empty. + * Delete any current protocol handler, then create a new one with the + * specified command, unless the command is empty. */ for (protPtr = wmPtr->protPtr, prevPtr = NULL; protPtr != NULL; - prevPtr = protPtr, protPtr = protPtr->nextPtr) { + prevPtr = protPtr, protPtr = protPtr->nextPtr) { if (protPtr->protocol == protocol) { if (prevPtr == NULL) { wmPtr->protPtr = protPtr->nextPtr; @@ -4555,7 +5012,7 @@ WmProtocolCmd(tkwin, winPtr, interp, objc, objv) * * WmResizableCmd -- * - * This procedure is invoked to process the "wm resizable" Tcl command. + * This function is invoked to process the "wm resizable" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -4568,12 +5025,12 @@ WmProtocolCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmResizableCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmResizableCmd( + 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; int width, height; @@ -4586,8 +5043,8 @@ WmResizableCmd(tkwin, winPtr, interp, objc, objv) char buf[TCL_INTEGER_SPACE * 2]; sprintf(buf, "%d %d", - (wmPtr->flags & WM_WIDTH_NOT_RESIZABLE) ? 0 : 1, - (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE) ? 0 : 1); + (wmPtr->flags & WM_WIDTH_NOT_RESIZABLE) ? 0 : 1, + (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE) ? 0 : 1); Tcl_SetResult(interp, buf, TCL_VOLATILE); return TCL_OK; } @@ -4618,7 +5075,7 @@ WmResizableCmd(tkwin, winPtr, interp, objc, objv) * * WmSizefromCmd -- * - * This procedure is invoked to process the "wm sizefrom" Tcl command. + * This function is invoked to process the "wm sizefrom" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -4631,18 +5088,20 @@ WmResizableCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmSizefromCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmSizefromCmd( + 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; static CONST char *optionStrings[] = { - "program", "user", (char *) NULL }; + "program", "user", NULL + }; enum options { - OPT_PROGRAM, OPT_USER }; + OPT_PROGRAM, OPT_USER + }; int index; if ((objc != 3) && (objc != 4)) { @@ -4682,7 +5141,7 @@ WmSizefromCmd(tkwin, winPtr, interp, objc, objv) * * WmStackorderCmd -- * - * This procedure is invoked to process the "wm stackorder" Tcl command. + * This function is invoked to process the "wm stackorder" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -4695,18 +5154,20 @@ WmSizefromCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmStackorderCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmStackorderCmd( + 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. */ { TkWindow **windows, **window_ptr; static CONST char *optionStrings[] = { - "isabove", "isbelow", (char *) NULL }; + "isabove", "isbelow", NULL + }; enum options { - OPT_ISABOVE, OPT_ISBELOW }; + OPT_ISABOVE, OPT_ISBELOW + }; int index; if ((objc != 3) && (objc != 5)) { @@ -4726,55 +5187,57 @@ WmStackorderCmd(tkwin, winPtr, interp, objc, objv) return TCL_OK; } } else { - TkWindow *winPtr2; + TkWindow *winPtr2, **winPtr2Ptr = &winPtr2; int index1=-1, index2=-1, result; - if (TkGetWindowFromObj(interp, tkwin, objv[4], (Tk_Window *) &winPtr2) - != TCL_OK) { + if (TkGetWindowFromObj(interp, tkwin, objv[4], + (Tk_Window *) winPtr2Ptr) != TCL_OK) { return TCL_ERROR; } if (!Tk_IsTopLevel(winPtr2)) { Tcl_AppendResult(interp, "window \"", winPtr2->pathName, - "\" isn't a top-level window", (char *) NULL); + "\" isn't a top-level window", NULL); return TCL_ERROR; } if (!Tk_IsMapped(winPtr)) { Tcl_AppendResult(interp, "window \"", winPtr->pathName, - "\" isn't mapped", (char *) NULL); + "\" isn't mapped", NULL); return TCL_ERROR; } if (!Tk_IsMapped(winPtr2)) { Tcl_AppendResult(interp, "window \"", winPtr2->pathName, - "\" isn't mapped", (char *) NULL); + "\" isn't mapped", NULL); return TCL_ERROR; } /* - * Lookup stacking order of all toplevels that are children - * of "." and find the position of winPtr and winPtr2 - * in the stacking order. + * Lookup stacking order of all toplevels that are children of "." and + * find the position of winPtr and winPtr2 in the stacking order. */ windows = TkWmStackorderToplevel(winPtr->mainPtr->winPtr); if (windows == NULL) { - Tcl_AppendResult(interp, "TkWmStackorderToplevel failed", - (char *) NULL); + Tcl_AppendResult(interp, "TkWmStackorderToplevel failed", NULL); return TCL_ERROR; } else { for (window_ptr = windows; *window_ptr ; window_ptr++) { - if (*window_ptr == winPtr) + if (*window_ptr == winPtr) { index1 = (window_ptr - windows); - if (*window_ptr == winPtr2) + } + if (*window_ptr == winPtr2) { index2 = (window_ptr - windows); + } } - if (index1 == -1) + if (index1 == -1) { Tcl_Panic("winPtr window not found"); - if (index2 == -1) + } + if (index2 == -1) { Tcl_Panic("winPtr2 window not found"); + } ckfree((char *) windows); } @@ -4799,8 +5262,8 @@ WmStackorderCmd(tkwin, winPtr, interp, objc, objv) * * WmStateCmd -- * - * This procedure is invoked to process the "wm state" Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm state" Tcl command. See + * the user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -4812,18 +5275,20 @@ WmStackorderCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmStateCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmStateCmd( + 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; static CONST char *optionStrings[] = { - "normal", "iconic", "withdrawn", "zoomed", (char *) NULL }; + "normal", "iconic", "withdrawn", "zoomed", NULL + }; enum options { - OPT_NORMAL, OPT_ICONIC, OPT_WITHDRAWN, OPT_ZOOMED }; + OPT_NORMAL, OPT_ICONIC, OPT_WITHDRAWN, OPT_ZOOMED + }; int index; if ((objc < 3) || (objc > 4)) { @@ -4833,15 +5298,12 @@ WmStateCmd(tkwin, winPtr, interp, objc, objv) if (objc == 4) { if (wmPtr->iconFor != NULL) { Tcl_AppendResult(interp, "can't change state of ", - Tcl_GetString(objv[2]), - ": it is an icon for ", Tk_PathName(wmPtr->iconFor), - (char *) NULL); + Tcl_GetString(objv[2]), ": it is an icon for ", + Tk_PathName(wmPtr->iconFor), NULL); return TCL_ERROR; } - if (winPtr->flags & TK_EMBEDDED) { - Tcl_AppendResult(interp, "can't change state of ", - winPtr->pathName, ": it is an embedded window", - (char *) NULL); + if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0, + &index) != TCL_OK) { return TCL_ERROR; } @@ -4850,25 +5312,52 @@ WmStateCmd(tkwin, winPtr, interp, objc, objv) return TCL_ERROR; } + if (winPtr->flags & TK_EMBEDDED) { + int state = 0; + + switch (index) { + case OPT_NORMAL: + state = NormalState; + break; + case OPT_ICONIC: + state = IconicState; + break; + case OPT_WITHDRAWN: + state = WithdrawnState; + break; + case OPT_ZOOMED: + state = ZoomState; + break; + default: + Tcl_Panic("unexpected index"); + } + + if (state+1 != SendMessage(wmPtr->wrapper, TK_STATE, state, 0)) { + Tcl_AppendResult(interp, "can't change state of ", + winPtr->pathName, + ": the container does not support the request", NULL); + return TCL_ERROR; + } + return TCL_OK; + } + if (index == OPT_NORMAL) { wmPtr->flags &= ~WM_WITHDRAWN; TkpWmSetState(winPtr, NormalState); + /* - * This varies from 'wm deiconify' because it does not - * force the window to be raised and receive focus + * This varies from 'wm deiconify' because it does not force the + * window to be raised and receive focus. */ } else if (index == OPT_ICONIC) { if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) { - Tcl_AppendResult(interp, "can't iconify \"", - winPtr->pathName, - "\": override-redirect flag is set", - (char *) NULL); + Tcl_AppendResult(interp, "can't iconify \"", winPtr->pathName, + "\": override-redirect flag is set", NULL); return TCL_ERROR; } if (wmPtr->masterPtr != NULL) { Tcl_AppendResult(interp, "can't iconify \"", - winPtr->pathName, - "\": it is a transient", (char *) NULL); + winPtr->pathName, "\": it is a transient", NULL); return TCL_ERROR; } TkpWmSetState(winPtr, IconicState); @@ -4884,17 +5373,24 @@ WmStateCmd(tkwin, winPtr, interp, objc, objv) if (wmPtr->iconFor != NULL) { Tcl_SetResult(interp, "icon", TCL_STATIC); } else { - switch (wmPtr->hints.initial_state) { - case NormalState: + int state; + + if (winPtr->flags & TK_EMBEDDED) { + state = SendMessage(wmPtr->wrapper, TK_STATE, -1, -1)-1; + } else { + state = wmPtr->hints.initial_state; + } + switch (state) { + case NormalState: Tcl_SetResult(interp, "normal", TCL_STATIC); break; - case IconicState: + case IconicState: Tcl_SetResult(interp, "iconic", TCL_STATIC); break; - case WithdrawnState: + case WithdrawnState: Tcl_SetResult(interp, "withdrawn", TCL_STATIC); break; - case ZoomState: + case ZoomState: Tcl_SetResult(interp, "zoomed", TCL_STATIC); break; } @@ -4908,8 +5404,8 @@ WmStateCmd(tkwin, winPtr, interp, objc, objv) * * WmTitleCmd -- * - * This procedure is invoked to process the "wm title" Tcl command. - * See the user documentation for details on what it does. + * This function is invoked to process the "wm title" Tcl command. See + * the user documentation for details on what it does. * * Results: * A standard Tcl result. @@ -4921,26 +5417,43 @@ WmStateCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmTitleCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmTitleCmd( + 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; char *argv3; int length; + HWND wrapper; if (objc > 4) { Tcl_WrongNumArgs(interp, 2, objv, "window ?newTitle?"); return TCL_ERROR; } + + if(winPtr->flags & TK_EMBEDDED) { + wrapper = (HWND)SendMessage(wmPtr->wrapper, TK_GETFRAMEWID, 0, 0); + } else { + wrapper = wmPtr->wrapper; + } if (objc == 3) { - Tcl_SetResult(interp, (char *) - ((wmPtr->title != NULL) ? wmPtr->title : winPtr->nameUid), - TCL_STATIC); - return TCL_OK; + if (wrapper) { + char buf[512]; + Tcl_DString titleString; + int size = tkWinProcs->useWide ? 256 : 512; + + (*tkWinProcs->getWindowText)(wrapper, (LPCTSTR)buf, size); + Tcl_WinTCharToUtf(buf, -1, &titleString); + Tcl_SetResult(interp, Tcl_DStringValue(&titleString),TCL_VOLATILE); + Tcl_DStringFree(&titleString); + } else { + Tcl_SetResult(interp, (char *) + ((wmPtr->title != NULL) ? wmPtr->title : winPtr->nameUid), + TCL_STATIC); + } } else { if (wmPtr->title != NULL) { ckfree((char *) wmPtr->title); @@ -4952,7 +5465,7 @@ WmTitleCmd(tkwin, winPtr, interp, objc, objv) if (!(wmPtr->flags & WM_NEVER_MAPPED) && wmPtr->wrapper != NULL) { Tcl_DString titleString; Tcl_WinUtfToTChar(wmPtr->title, -1, &titleString); - (*tkWinProcs->setWindowText)(wmPtr->wrapper, + (*tkWinProcs->setWindowText)(wrapper, (LPCTSTR) Tcl_DStringValue(&titleString)); Tcl_DStringFree(&titleString); } @@ -4965,7 +5478,7 @@ WmTitleCmd(tkwin, winPtr, interp, objc, objv) * * WmTransientCmd -- * - * This procedure is invoked to process the "wm transient" Tcl command. + * This function is invoked to process the "wm transient" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -4978,15 +5491,15 @@ WmTitleCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmTransientCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmTransientCmd( + 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; - TkWindow *masterPtr = wmPtr->masterPtr; + TkWindow *masterPtr = wmPtr->masterPtr, **masterPtrPtr = &masterPtr; WmInfo *wmPtr2; if ((objc != 3) && (objc != 4)) { @@ -5002,8 +5515,8 @@ WmTransientCmd(tkwin, winPtr, interp, objc, objv) if (Tcl_GetString(objv[3])[0] == '\0') { if (masterPtr != NULL) { /* - * If we had a master, tell them that we aren't tied - * to them anymore + * If we had a master, tell them that we aren't tied to them + * anymore. */ masterPtr->wmInfoPtr->numTransients--; @@ -5015,7 +5528,7 @@ WmTransientCmd(tkwin, winPtr, interp, objc, objv) wmPtr->masterPtr = NULL; } else { if (TkGetWindowFromObj(interp, tkwin, objv[3], - (Tk_Window *) &masterPtr) != TCL_OK) { + (Tk_Window *) masterPtrPtr) != TCL_OK) { return TCL_ERROR; } while (!Tk_TopWinHierarchy(masterPtr)) { @@ -5028,35 +5541,30 @@ WmTransientCmd(tkwin, winPtr, interp, objc, objv) Tk_MakeWindowExist((Tk_Window) masterPtr); if (wmPtr->iconFor != NULL) { - Tcl_AppendResult(interp, "can't make \"", - Tcl_GetString(objv[2]), + Tcl_AppendResult(interp, "can't make \"", Tcl_GetString(objv[2]), "\" a transient: it is an icon for ", - Tk_PathName(wmPtr->iconFor), - (char *) NULL); + Tk_PathName(wmPtr->iconFor), NULL); return TCL_ERROR; } wmPtr2 = masterPtr->wmInfoPtr; if (wmPtr2->iconFor != NULL) { - Tcl_AppendResult(interp, "can't make \"", - Tcl_GetString(objv[3]), + Tcl_AppendResult(interp, "can't make \"", Tcl_GetString(objv[3]), "\" a master: it is an icon for ", - Tk_PathName(wmPtr2->iconFor), - (char *) NULL); + Tk_PathName(wmPtr2->iconFor), NULL); return TCL_ERROR; } if (masterPtr == winPtr) { Tcl_AppendResult(interp, "can't make \"", Tk_PathName(winPtr), - "\" its own master", - (char *) NULL); + "\" its own master", NULL); return TCL_ERROR; } else if (masterPtr != wmPtr->masterPtr) { /* - * Remove old master map/unmap binding before setting - * the new master. The event handler will ensure that - * transient states reflect the state of the master. + * Remove old master map/unmap binding before setting the new + * master. The event handler will ensure that transient states + * reflect the state of the master. */ if (wmPtr->masterPtr != NULL) { @@ -5091,7 +5599,7 @@ WmTransientCmd(tkwin, winPtr, interp, objc, objv) * * WmWithdrawCmd -- * - * This procedure is invoked to process the "wm withdraw" Tcl command. + * This function is invoked to process the "wm withdraw" Tcl command. * See the user documentation for details on what it does. * * Results: @@ -5104,12 +5612,12 @@ WmTransientCmd(tkwin, winPtr, interp, objc, objv) */ static int -WmWithdrawCmd(tkwin, winPtr, interp, objc, objv) - 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. */ +WmWithdrawCmd( + 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; @@ -5119,23 +5627,32 @@ WmWithdrawCmd(tkwin, winPtr, interp, objc, objv) } if (wmPtr->iconFor != NULL) { Tcl_AppendResult(interp, "can't withdraw ", Tcl_GetString(objv[2]), - ": it is an icon for ", Tk_PathName(wmPtr->iconFor), - (char *) NULL); + ": it is an icon for ", Tk_PathName(wmPtr->iconFor), NULL); return TCL_ERROR; } - wmPtr->flags |= WM_WITHDRAWN; - TkpWmSetState(winPtr, WithdrawnState); + + if (winPtr->flags & TK_EMBEDDED) { + if (SendMessage(wmPtr->wrapper, TK_WITHDRAW, 0, 0) < 0) { + Tcl_AppendResult(interp, "can't withdraw", Tcl_GetString(objv[2]), + ": the container does not support the request", NULL); + return TCL_ERROR; + } + } else { + wmPtr->flags |= WM_WITHDRAWN; + TkpWmSetState(winPtr, WithdrawnState); + } return TCL_OK; } /* - * Invoked by those wm subcommands that affect geometry. - * Schedules a geometry update. + * Invoked by those wm subcommands that affect geometry. Schedules a geometry + * update. */ + static void -WmUpdateGeom(wmPtr, winPtr) - WmInfo *wmPtr; - TkWindow *winPtr; +WmUpdateGeom( + WmInfo *wmPtr, + TkWindow *winPtr) { if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) { Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr); @@ -5145,9 +5662,9 @@ WmUpdateGeom(wmPtr, winPtr) /*ARGSUSED*/ static void -WmWaitVisibilityOrMapProc(clientData, eventPtr) - ClientData clientData; /* Pointer to window. */ - XEvent *eventPtr; /* Information about event. */ +WmWaitVisibilityOrMapProc( + ClientData clientData, /* Pointer to window. */ + XEvent *eventPtr) /* Information about event. */ { TkWindow *winPtr = (TkWindow *) clientData; TkWindow *masterPtr = winPtr->wmInfoPtr->masterPtr; @@ -5156,8 +5673,9 @@ WmWaitVisibilityOrMapProc(clientData, eventPtr) return; if (eventPtr->type == MapNotify) { - if (!(winPtr->wmInfoPtr->flags & WM_WITHDRAWN)) + if (!(winPtr->wmInfoPtr->flags & WM_WITHDRAWN)) { TkpWmSetState(winPtr, NormalState); + } } else if (eventPtr->type == UnmapNotify) { TkpWmSetState(winPtr, WithdrawnState); } @@ -5179,34 +5697,34 @@ WmWaitVisibilityOrMapProc(clientData, eventPtr) * * Tk_SetGrid -- * - * This procedure is invoked by a widget when it wishes to set a grid - * coordinate system that controls the size of a top-level window. - * It provides a C interface equivalent to the "wm grid" command and - * is usually asscoiated with the -setgrid option. + * This function is invoked by a widget when it wishes to set a grid + * coordinate system that controls the size of a top-level window. It + * provides a C interface equivalent to the "wm grid" command and is + * usually asscoiated with the -setgrid option. * * Results: * None. * * Side effects: - * Grid-related information will be passed to the window manager, so - * that the top-level window associated with tkwin will resize on - * even grid units. If some other window already controls gridding - * for the top-level window then this procedure call has no effect. + * Grid-related information will be passed to the window manager, so that + * the top-level window associated with tkwin will resize on even grid + * units. If some other window already controls gridding for the + * top-level window then this function call has no effect. * *---------------------------------------------------------------------- */ void -Tk_SetGrid(tkwin, reqWidth, reqHeight, widthInc, heightInc) - Tk_Window tkwin; /* Token for window. New window mgr info - * will be posted for the top-level window +Tk_SetGrid( + Tk_Window tkwin, /* Token for window. New window mgr info will + * be posted for the top-level window * associated with this window. */ - int reqWidth; /* Width (in grid units) corresponding to - * the requested geometry for tkwin. */ - int reqHeight; /* Height (in grid units) corresponding to - * the requested geometry for tkwin. */ - int widthInc, heightInc; /* Pixel increments corresponding to a - * change of one grid unit. */ + int reqWidth, /* Width (in grid units) corresponding to the + * requested geometry for tkwin. */ + int reqHeight, /* Height (in grid units) corresponding to the + * requested geometry for tkwin. */ + int widthInc, int heightInc)/* Pixel increments corresponding to a change + * of one grid unit. */ { TkWindow *winPtr = (TkWindow *) tkwin; register WmInfo *wmPtr; @@ -5214,6 +5732,7 @@ Tk_SetGrid(tkwin, reqWidth, reqHeight, widthInc, heightInc) /* * Ensure widthInc and heightInc are greater than 0 */ + if (widthInc <= 0) { widthInc = 1; } @@ -5221,7 +5740,6 @@ Tk_SetGrid(tkwin, reqWidth, reqHeight, widthInc, heightInc) heightInc = 1; } - /* * Find the top-level window for tkwin, plus the window manager * information. @@ -5249,15 +5767,15 @@ Tk_SetGrid(tkwin, reqWidth, reqHeight, widthInc, heightInc) } /* - * If gridding was previously off, then forget about any window - * size requests made by the user or via "wm geometry": these are - * in pixel units and there's no easy way to translate them to - * grid units since the new requested size of the top-level window in - * pixels may not yet have been registered yet (it may filter up - * the hierarchy in DoWhenIdle handlers). However, if the window - * has never been mapped yet then just leave the window size alone: - * assume that it is intended to be in grid units but just happened - * to have been specified before this procedure was called. + * If gridding was previously off, then forget about any window size + * requests made by the user or via "wm geometry": these are in pixel + * units and there's no easy way to translate them to grid units since the + * new requested size of the top-level window in pixels may not yet have + * been registered yet (it may filter up the hierarchy in DoWhenIdle + * handlers). However, if the window has never been mapped yet then just + * leave the window size alone: assume that it is intended to be in grid + * units but just happened to have been specified before this function was + * called. */ if ((wmPtr->gridWin == NULL) && !(wmPtr->flags & WM_NEVER_MAPPED)) { @@ -5266,8 +5784,8 @@ Tk_SetGrid(tkwin, reqWidth, reqHeight, widthInc, heightInc) } /* - * Set the new gridding information, and start the process of passing - * all of this information to the window manager. + * Set the new gridding information, and start the process of passing all + * of this information to the window manager. */ wmPtr->gridWin = tkwin; @@ -5287,23 +5805,22 @@ Tk_SetGrid(tkwin, reqWidth, reqHeight, widthInc, heightInc) * * Tk_UnsetGrid -- * - * This procedure cancels the effect of a previous call - * to Tk_SetGrid. + * This function cancels the effect of a previous call to Tk_SetGrid. * * Results: * None. * * Side effects: * If tkwin currently controls gridding for its top-level window, - * gridding is cancelled for that top-level window; if some other - * window controls gridding then this procedure has no effect. + * gridding is cancelled for that top-level window; if some other window + * controls gridding then this function has no effect. * *---------------------------------------------------------------------- */ void -Tk_UnsetGrid(tkwin) - Tk_Window tkwin; /* Token for window that is currently +Tk_UnsetGrid( + Tk_Window tkwin) /* Token for window that is currently * controlling gridding. */ { TkWindow *winPtr = (TkWindow *) tkwin; @@ -5348,23 +5865,23 @@ Tk_UnsetGrid(tkwin) * * TopLevelEventProc -- * - * This procedure is invoked when a top-level (or other externally- - * managed window) is restructured in any way. + * This function is invoked when a top-level (or other externally-managed + * window) is restructured in any way. * * Results: * None. * * Side effects: - * Tk's internal data structures for the window get modified to - * reflect the structural change. + * Tk's internal data structures for the window get modified to reflect + * the structural change. * *---------------------------------------------------------------------- */ static void -TopLevelEventProc(clientData, eventPtr) - ClientData clientData; /* Window for which event occurred. */ - XEvent *eventPtr; /* Event that just happened. */ +TopLevelEventProc( + ClientData clientData, /* Window for which event occurred. */ + XEvent *eventPtr) /* Event that just happened. */ { register TkWindow *winPtr = (TkWindow *) clientData; @@ -5374,8 +5891,8 @@ TopLevelEventProc(clientData, eventPtr) if (!(winPtr->flags & TK_ALREADY_DEAD)) { /* * A top-level window was deleted externally (e.g., by the window - * manager). This is probably not a good thing, but cleanup as - * best we can. The error handler is needed because + * manager). This is probably not a good thing, but cleanup as + * best we can. The error handler is needed because * Tk_DestroyWindow will try to destroy the window, but of course * it's already gone. */ @@ -5386,16 +5903,6 @@ TopLevelEventProc(clientData, eventPtr) Tk_DeleteErrorHandler(handler); } } - else if (eventPtr->type == ConfigureNotify) { - WmInfo *wmPtr; - wmPtr = winPtr->wmInfoPtr; - - if (winPtr->flags & TK_EMBEDDED) { - Tk_Window tkwin = (Tk_Window)winPtr; - SendMessage(wmPtr->wrapper, TK_GEOMETRYREQ, Tk_ReqWidth(tkwin), - Tk_ReqHeight(tkwin)); - } - } } /* @@ -5403,36 +5910,38 @@ TopLevelEventProc(clientData, eventPtr) * * TopLevelReqProc -- * - * This procedure is invoked by the geometry manager whenever - * the requested size for a top-level window is changed. + * This function is invoked by the geometry manager whenever the + * requested size for a top-level window is changed. * * Results: * None. * * Side effects: - * Arrange for the window to be resized to satisfy the request - * (this happens as a when-idle action). + * Arrange for the window to be resized to satisfy the request (this + * happens as a when-idle action). * *---------------------------------------------------------------------- */ /* ARGSUSED */ static void -TopLevelReqProc(dummy, tkwin) - ClientData dummy; /* Not used. */ - Tk_Window tkwin; /* Information about window. */ +TopLevelReqProc( + ClientData dummy, /* Not used. */ + Tk_Window tkwin) /* Information about window. */ { TkWindow *winPtr = (TkWindow *) tkwin; WmInfo *wmPtr; wmPtr = winPtr->wmInfoPtr; - if ((winPtr->flags & TK_EMBEDDED) && (wmPtr->wrapper != NULL)) { - SendMessage(wmPtr->wrapper, TK_GEOMETRYREQ, Tk_ReqWidth(tkwin), - Tk_ReqHeight(tkwin)); - } - if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) { - Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr); - wmPtr->flags |= WM_UPDATE_PENDING; + if (wmPtr) { + if ((winPtr->flags & TK_EMBEDDED) && (wmPtr->wrapper != NULL)) { + SendMessage(wmPtr->wrapper, TK_GEOMETRYREQ, Tk_ReqWidth(tkwin), + Tk_ReqHeight(tkwin)); + } + if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) { + Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr); + wmPtr->flags |= WM_UPDATE_PENDING; + } } } @@ -5441,26 +5950,25 @@ TopLevelReqProc(dummy, tkwin) * * UpdateGeometryInfo -- * - * This procedure is invoked when a top-level window is first - * mapped, and also as a when-idle procedure, to bring the - * geometry and/or position of a top-level window back into - * line with what has been requested by the user and/or widgets. - * This procedure doesn't return until the system has + * This function is invoked when a top-level window is first mapped, and + * also as a when-idle function, to bring the geometry and/or position of + * a top-level window back into line with what has been requested by the + * user and/or widgets. This function doesn't return until the system has * responded to the geometry change. * * Results: * None. * * Side effects: - * The window's size and location may change, unless the WM prevents - * that from happening. + * The window's size and location may change, unless the WM prevents that + * from happening. * *---------------------------------------------------------------------- */ static void -UpdateGeometryInfo(clientData) - ClientData clientData; /* Pointer to the window's record. */ +UpdateGeometryInfo( + ClientData clientData) /* Pointer to the window's record. */ { int x, y; /* Position of border on desktop. */ int width, height; /* Size of client area. */ @@ -5472,24 +5980,23 @@ UpdateGeometryInfo(clientData) wmPtr->flags &= ~WM_UPDATE_PENDING; /* - * If the window is minimized or maximized, we should not update - * our geometry since it will end up with the wrong values. - * ConfigureToplevel will reschedule UpdateGeometryInfo when the - * state of the window changes. + * If the window is minimized or maximized, we should not update our + * geometry since it will end up with the wrong values. ConfigureToplevel + * will reschedule UpdateGeometryInfo when the state of the window + * changes. */ if (wmPtr->wrapper && (IsIconic(wmPtr->wrapper) || - IsZoomed(wmPtr->wrapper))) { + IsZoomed(wmPtr->wrapper) || (wmPtr->flags & WM_FULLSCREEN))) { return; } /* - * Compute the border size for the current window style. This - * size will include the resize handles, the title bar and the - * menubar. Note that this size will not be correct if the - * menubar spans multiple lines. The height will be off by a - * multiple of the menubar height. It really only measures the - * minimum size of the border. + * Compute the border size for the current window style. This size will + * include the resize handles, the title bar and the menubar. Note that + * this size will not be correct if the menubar spans multiple lines. The + * height will be off by a multiple of the menubar height. It really only + * measures the minimum size of the border. */ rect.left = rect.right = rect.top = rect.bottom = 0; @@ -5499,15 +6006,13 @@ UpdateGeometryInfo(clientData) wmPtr->borderHeight = rect.bottom - rect.top; /* - * Compute the new size for the top-level window. See the - * user documentation for details on this, but the size - * requested depends on (a) the size requested internally - * by the window's widgets, (b) the size requested by the - * user in a "wm geometry" command or via wm-based interactive - * resizing (if any), (c) whether or not the window is - * gridded, and (d) the current min or max size for - * the toplevel. Don't permit sizes <= 0 because this upsets - * the X server. + * Compute the new size for the top-level window. See the user + * documentation for details on this, but the size requested depends on + * (a) the size requested internally by the window's widgets, (b) the size + * requested by the user in a "wm geometry" command or via wm-based + * interactive resizing (if any), (c) whether or not the window is + * gridded, and (d) the current min or max size for the toplevel. Don't + * permit sizes <= 0 because this upsets the X server. */ if (wmPtr->width == -1) { @@ -5521,15 +6026,17 @@ UpdateGeometryInfo(clientData) if (width <= 0) { width = 1; } + /* * Account for window max/min width */ + if (wmPtr->gridWin != NULL) { min = winPtr->reqWidth + (wmPtr->minWidth - wmPtr->reqGridWidth)*wmPtr->widthInc; if (wmPtr->maxWidth > 0) { max = winPtr->reqWidth - + (wmPtr->maxWidth - wmPtr->reqGridWidth)*wmPtr->widthInc; + + (wmPtr->maxWidth - wmPtr->reqGridWidth)*wmPtr->widthInc; } else { max = 0; } @@ -5554,15 +6061,17 @@ UpdateGeometryInfo(clientData) if (height <= 0) { height = 1; } + /* * Account for window max/min height */ + if (wmPtr->gridWin != NULL) { min = winPtr->reqHeight + (wmPtr->minHeight - wmPtr->reqGridHeight)*wmPtr->heightInc; if (wmPtr->maxHeight > 0) { max = winPtr->reqHeight - + (wmPtr->maxHeight - wmPtr->reqGridHeight)*wmPtr->heightInc; + + (wmPtr->maxHeight-wmPtr->reqGridHeight)*wmPtr->heightInc; } else { max = 0; } @@ -5578,55 +6087,37 @@ UpdateGeometryInfo(clientData) /* * Compute the new position for the upper-left pixel of the window's - * decorative frame. This is tricky, because we need to include the - * border widths supplied by a reparented parent in this calculation, - * but can't use the parent's current overall size since that may - * change as a result of this code. + * decorative frame. This is tricky, because we need to include the border + * widths supplied by a reparented parent in this calculation, but can't + * use the parent's current overall size since that may change as a result + * of this code. */ if (wmPtr->flags & WM_NEGATIVE_X) { x = DisplayWidth(winPtr->display, winPtr->screenNum) - wmPtr->x - (width + wmPtr->borderWidth); } else { - x = wmPtr->x; + x = wmPtr->x; } if (wmPtr->flags & WM_NEGATIVE_Y) { y = DisplayHeight(winPtr->display, winPtr->screenNum) - wmPtr->y - (height + wmPtr->borderHeight); } else { - y = wmPtr->y; - } - - /* - * If this window is embedded and the container is also in this - * process, we don't need to do anything special about the - * geometry, except to make sure that the desired size is known - * by the container. Also, zero out any position information, - * since embedded windows are not allowed to move. - */ - - if (winPtr->flags & TK_BOTH_HALVES) { - TkWindow *childPtr = TkpGetOtherWindow(winPtr); - - wmPtr->x = wmPtr->y = 0; - wmPtr->flags &= ~(WM_NEGATIVE_X|WM_NEGATIVE_Y); - if (childPtr != NULL) { - Tk_GeometryRequest((Tk_Window) childPtr, width, height); - } - return; + y = wmPtr->y; } /* - * Reconfigure the window if it isn't already configured correctly. Base + * Reconfigure the window if it isn't already configured correctly. Base * the size check on what we *asked for* last time, not what we got. * Return immediately if there have been no changes in the requested * geometry of the toplevel. */ + /* TODO: need to add flag for possible menu size change */ - if (!((wmPtr->flags & WM_MOVE_PENDING) - || (width != wmPtr->configWidth) - || (height != wmPtr->configHeight))) { + if (!(wmPtr->flags & WM_MOVE_PENDING) + && (width == wmPtr->configWidth) + && (height == wmPtr->configHeight)) { return; } wmPtr->flags &= ~WM_MOVE_PENDING; @@ -5635,9 +6126,8 @@ UpdateGeometryInfo(clientData) wmPtr->configHeight = height; /* - * Don't bother moving the window if we are in the process of - * creating it. Just update the geometry info based on what - * we asked for. + * Don't bother moving the window if we are in the process of creating it. + * Just update the geometry info based on what we asked for. */ if (wmPtr->flags & WM_CREATE_PENDING) { @@ -5651,12 +6141,13 @@ UpdateGeometryInfo(clientData) wmPtr->flags |= WM_SYNC_PENDING; if (winPtr->flags & TK_EMBEDDED) { /* - * The wrapper window is in a different process, so we need - * to send it a geometry request. This protocol assumes that - * the other process understands this Tk message, otherwise - * our requested geometry will be ignored. + * The wrapper window is in a different process, so we need to send it + * a geometry request. This protocol assumes that the other process + * understands this Tk message, otherwise our requested geometry will + * be ignored. */ + SendMessage(wmPtr->wrapper, TK_MOVEWINDOW, x, y); SendMessage(wmPtr->wrapper, TK_GEOMETRYREQ, width, height); } else { int reqHeight, reqWidth; @@ -5665,15 +6156,13 @@ UpdateGeometryInfo(clientData) int newHeight; /* - * We have to keep resizing the window until we get the - * requested height in the client area. If the client - * area has zero height, then the window rect is too - * small by definition. Try increasing the border height - * and try again. Once we have a positive size, then - * we can adjust the height exactly. If the window - * rect comes back smaller than we requested, we have - * hit the maximum constraints that Windows imposes. - * Once we find a positive client size, the next size + * We have to keep resizing the window until we get the requested + * height in the client area. If the client area has zero height, then + * the window rect is too small by definition. Try increasing the + * border height and try again. Once we have a positive size, then we + * can adjust the height exactly. If the window rect comes back + * smaller than we requested, we have hit the maximum constraints that + * Windows imposes. Once we find a positive client size, the next size * is the one we try no matter what. */ @@ -5705,11 +6194,13 @@ UpdateGeometryInfo(clientData) /* * We're done. */ + break; } else if (newHeight > height) { /* * One last resize to get rid of the extra space. */ + menuInc = newHeight - height; reqHeight -= menuInc; if (wmPtr->flags & WM_NEGATIVE_Y) { @@ -5720,11 +6211,10 @@ UpdateGeometryInfo(clientData) } /* - * We didn't get enough space to satisfy our requested - * height, so the menu must have wrapped. Increase the - * size of the window by one menu height and move the - * window if it is positioned relative to the lower right - * corner of the screen. + * We didn't get enough space to satisfy our requested height, so + * the menu must have wrapped. Increase the size of the window by + * one menu height and move the window if it is positioned + * relative to the lower right corner of the screen. */ reqHeight += menuInc; @@ -5744,13 +6234,12 @@ UpdateGeometryInfo(clientData) * * ParseGeometry -- * - * This procedure parses a geometry string and updates - * information used to control the geometry of a top-level - * window. + * This function parses a geometry string and updates information used to + * control the geometry of a top-level window. * * Results: - * A standard Tcl return value, plus an error message in - * the interp's result if an error occurs. + * A standard Tcl return value, plus an error message in the interp's + * result if an error occurs. * * Side effects: * The size and/or location of winPtr may change. @@ -5759,12 +6248,12 @@ UpdateGeometryInfo(clientData) */ static int -ParseGeometry(interp, string, winPtr) - Tcl_Interp *interp; /* Used for error reporting. */ - char *string; /* String containing new geometry. Has the +ParseGeometry( + Tcl_Interp *interp, /* Used for error reporting. */ + char *string, /* String containing new geometry. Has the * standard form "=wxh+x+y". */ - TkWindow *winPtr; /* Pointer to top-level window whose - * geometry is to be changed. */ + TkWindow *winPtr) /* Pointer to top-level window whose geometry + * is to be changed. */ { register WmInfo *wmPtr = winPtr->wmInfoPtr; int x, y, width, height, flags; @@ -5780,9 +6269,9 @@ ParseGeometry(interp, string, winPtr) } /* - * Parse the width and height, if they are present. Don't - * actually update any of the fields of wmPtr until we've - * successfully parsed the entire geometry string. + * Parse the width and height, if they are present. Don't actually update + * any of the fields of wmPtr until we've successfully parsed the entire + * geometry string. */ width = wmPtr->width; @@ -5836,10 +6325,10 @@ ParseGeometry(interp, string, winPtr) } /* - * Assume that the geometry information came from the user, - * unless an explicit source has been specified. Otherwise - * most window managers assume that the size hints were - * program-specified and they ignore them. + * Assume that the geometry information came from the user, unless an + * explicit source has been specified. Otherwise most window managers + * assume that the size hints were program-specified and they ignore + * them. */ if ((wmPtr->sizeHintsFlags & (USPosition|PPosition)) == 0) { @@ -5848,9 +6337,9 @@ ParseGeometry(interp, string, winPtr) } /* - * Everything was parsed OK. Update the fields of *wmPtr and - * arrange for the appropriate information to be percolated out - * to the window manager at the next idle moment. + * Everything was parsed OK. Update the fields of *wmPtr and arrange for + * the appropriate information to be percolated out to the window manager + * at the next idle moment. */ wmPtr->width = width; @@ -5866,9 +6355,8 @@ ParseGeometry(interp, string, winPtr) } return TCL_OK; - error: - Tcl_AppendResult(interp, "bad geometry specifier \"", - string, "\"", (char *) NULL); + error: + Tcl_AppendResult(interp, "bad geometry specifier \"", string, "\"", NULL); return TCL_ERROR; } @@ -5877,13 +6365,13 @@ ParseGeometry(interp, string, winPtr) * * Tk_GetRootCoords -- * - * Given a token for a window, this procedure traces through the - * window's lineage to find the (virtual) root-window coordinates - * corresponding to point (0,0) in the window. + * Given a token for a window, this function traces through the window's + * lineage to find the (virtual) root-window coordinates corresponding to + * point (0,0) in the window. * * Results: - * The locations pointed to by xPtr and yPtr are filled in with - * the root coordinates of the (0,0) point in tkwin. + * The locations pointed to by xPtr and yPtr are filled in with the root + * coordinates of the (0,0) point in tkwin. * * Side effects: * None. @@ -5892,10 +6380,10 @@ ParseGeometry(interp, string, winPtr) */ void -Tk_GetRootCoords(tkwin, xPtr, yPtr) - Tk_Window tkwin; /* Token for window. */ - int *xPtr; /* Where to store x-displacement of (0,0). */ - int *yPtr; /* Where to store y-displacement of (0,0). */ +Tk_GetRootCoords( + Tk_Window tkwin, /* Token for window. */ + int *xPtr, /* Where to store x-displacement of (0,0). */ + int *yPtr) /* Where to store y-displacement of (0,0). */ { register TkWindow *winPtr = (TkWindow *) tkwin; @@ -5925,13 +6413,13 @@ Tk_GetRootCoords(tkwin, xPtr, yPtr) * * Tk_CoordsToWindow -- * - * Given the (virtual) root coordinates of a point, this procedure - * returns the token for the top-most window covering that point, - * if there exists such a window in this application. + * Given the (virtual) root coordinates of a point, this function returns + * the token for the top-most window covering that point, if there exists + * such a window in this application. * * Results: - * The return result is either a token for the window corresponding - * to rootX and rootY, or else NULL to indicate that there is no such + * The return result is either a token for the window corresponding to + * rootX and rootY, or else NULL to indicate that there is no such * window. * * Side effects: @@ -5941,13 +6429,13 @@ Tk_GetRootCoords(tkwin, xPtr, yPtr) */ Tk_Window -Tk_CoordsToWindow(rootX, rootY, tkwin) - int rootX, rootY; /* Coordinates of point in root window. If - * a virtual-root window manager is in use, +Tk_CoordsToWindow( + int rootX, int rootY, /* Coordinates of point in root window. If a + * virtual-root window manager is in use, * these coordinates refer to the virtual * root, not the real root. */ - Tk_Window tkwin; /* Token for any window in application; - * used to identify the display. */ + Tk_Window tkwin) /* Token for any window in application; used + * to identify the display. */ { POINT pos; HWND hwnd; @@ -5969,16 +6457,15 @@ Tk_CoordsToWindow(rootX, rootY, tkwin) * * Tk_GetVRootGeometry -- * - * This procedure returns information about the virtual root - * window corresponding to a particular Tk window. + * This function returns information about the virtual root window + * corresponding to a particular Tk window. * * Results: - * The values at xPtr, yPtr, widthPtr, and heightPtr are set - * with the offset and dimensions of the root window corresponding - * to tkwin. If tkwin is being managed by a virtual root window - * manager these values correspond to the virtual root window being - * used for tkwin; otherwise the offsets will be 0 and the - * dimensions will be those of the screen. + * The values at xPtr, yPtr, widthPtr, and heightPtr are set with the + * offset and dimensions of the root window corresponding to tkwin. If + * tkwin is being managed by a virtual root window manager these values + * correspond to the virtual root window being used for tkwin; otherwise + * the offsets will be 0 and the dimensions will be those of the screen. * * Side effects: * Vroot window information is refreshed if it is out of date. @@ -5987,12 +6474,13 @@ Tk_CoordsToWindow(rootX, rootY, tkwin) */ void -Tk_GetVRootGeometry(tkwin, xPtr, yPtr, widthPtr, heightPtr) - Tk_Window tkwin; /* Window whose virtual root is to be +Tk_GetVRootGeometry( + Tk_Window tkwin, /* Window whose virtual root is to be * queried. */ - int *xPtr, *yPtr; /* Store x and y offsets of virtual root + int *xPtr, int *yPtr, /* Store x and y offsets of virtual root * here. */ - int *widthPtr, *heightPtr; /* Store dimensions of virtual root here. */ + int *widthPtr, int *heightPtr) + /* Store dimensions of virtual root here. */ { *xPtr = GetSystemMetrics(SM_XVIRTUALSCREEN); *yPtr = GetSystemMetrics(SM_YVIRTUALSCREEN); @@ -6005,27 +6493,25 @@ Tk_GetVRootGeometry(tkwin, xPtr, yPtr, widthPtr, heightPtr) * * Tk_MoveToplevelWindow -- * - * This procedure is called instead of Tk_MoveWindow to adjust - * the x-y location of a top-level window. It delays the actual - * move to a later time and keeps window-manager information - * up-to-date with the move + * This function is called instead of Tk_MoveWindow to adjust the x-y + * location of a top-level window. It delays the actual move to a later + * time and keeps window-manager information up-to-date with the move * * Results: * None. * * Side effects: * The window is eventually moved so that its upper-left corner - * (actually, the upper-left corner of the window's decorative - * frame, if there is one) is at (x,y). + * (actually, the upper-left corner of the window's decorative frame, if + * there is one) is at (x,y). * *---------------------------------------------------------------------- */ void -Tk_MoveToplevelWindow(tkwin, x, y) - Tk_Window tkwin; /* Window to move. */ - int x, y; /* New location for window (within - * parent). */ +Tk_MoveToplevelWindow( + Tk_Window tkwin, /* Window to move. */ + int x, int y) /* New location for window (within parent). */ { TkWindow *winPtr = (TkWindow *) tkwin; register WmInfo *wmPtr = winPtr->wmInfoPtr; @@ -6043,9 +6529,8 @@ Tk_MoveToplevelWindow(tkwin, x, y) /* * If the window has already been mapped, must bring its geometry - * up-to-date immediately, otherwise an event might arrive from the - * server that would overwrite wmPtr->x and wmPtr->y and lose the - * new position. + * up-to-date immediately, otherwise an event might arrive from the server + * that would overwrite wmPtr->x and wmPtr->y and lose the new position. */ if (!(wmPtr->flags & WM_NEVER_MAPPED)) { @@ -6061,25 +6546,23 @@ Tk_MoveToplevelWindow(tkwin, x, y) * * 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. + * This function is called by the Tk_HandleEvent whenever a ClientMessage + * event arrives whose type is "WM_PROTOCOLS". This function 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. * *---------------------------------------------------------------------- */ void -TkWmProtocolEventProc(winPtr, eventPtr) - TkWindow *winPtr; /* Window to which the event was sent. */ - XEvent *eventPtr; /* X event. */ +TkWmProtocolEventProc( + TkWindow *winPtr, /* Window to which the event was sent. */ + XEvent *eventPtr) /* X event. */ { WmInfo *wmPtr; register ProtocolHandler *protPtr; @@ -6096,14 +6579,15 @@ TkWmProtocolEventProc(winPtr, eventPtr) protPtr = protPtr->nextPtr) { if (protocol == protPtr->protocol) { /* - * Cache atom name, as we might destroy the window as a - * result of the eval. + * Cache atom name, as we might destroy the window as a result of + * the eval. */ + CONST char *name = Tk_GetAtomName((Tk_Window) winPtr, protocol); Tcl_Preserve((ClientData) protPtr); - interp = protPtr->interp; - Tcl_Preserve((ClientData) interp); + interp = protPtr->interp; + Tcl_Preserve((ClientData) interp); result = Tcl_GlobalEval(interp, protPtr->command); if (result != TCL_OK) { Tcl_AddErrorInfo(interp, "\n (command for \""); @@ -6111,15 +6595,15 @@ TkWmProtocolEventProc(winPtr, eventPtr) Tcl_AddErrorInfo(interp, "\" window manager protocol)"); Tcl_BackgroundError(interp); } - Tcl_Release((ClientData) interp); + Tcl_Release((ClientData) interp); Tcl_Release((ClientData) 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")) { @@ -6132,9 +6616,8 @@ TkWmProtocolEventProc(winPtr, eventPtr) * * TkWmStackorderToplevelEnumProc -- * - * This procedure is invoked once for each HWND Window on the - * display as a result of calling EnumWindows from - * TkWmStackorderToplevel. + * This function is invoked once for each HWND Window on the display as a + * result of calling EnumWindows from TkWmStackorderToplevel. * * Results: * TRUE to request further iteration. @@ -6145,30 +6628,37 @@ TkWmProtocolEventProc(winPtr, eventPtr) *---------------------------------------------------------------------- */ -BOOL CALLBACK TkWmStackorderToplevelEnumProc(hwnd, lParam) - HWND hwnd; /* handle to parent window */ - LPARAM lParam; /* application-defined value */ +BOOL CALLBACK +TkWmStackorderToplevelEnumProc( + HWND hwnd, /* Handle to parent window */ + LPARAM lParam) /* Application-defined value */ { Tcl_HashEntry *hPtr; TkWindow *childWinPtr; TkWmStackorderToplevelPair *pair = - (TkWmStackorderToplevelPair *) lParam; + (TkWmStackorderToplevelPair *) lParam; /*fprintf(stderr, "Looking up HWND %d\n", hwnd);*/ hPtr = Tcl_FindHashEntry(pair->table, (char *) hwnd); if (hPtr != NULL) { - childWinPtr = (TkWindow *) Tcl_GetHashValue(hPtr); - /* Double check that same HWND does not get passed twice */ - if (childWinPtr == NULL) { - Tcl_Panic("duplicate HWND in TkWmStackorderToplevelEnumProc"); - } else { - Tcl_SetHashValue(hPtr, NULL); - } - /*fprintf(stderr, "Found mapped HWND %d -> %x (%s)\n", hwnd, - childWinPtr, childWinPtr->pathName);*/ - *(pair->window_ptr)-- = childWinPtr; + childWinPtr = (TkWindow *) Tcl_GetHashValue(hPtr); + + /* + * Double check that same HWND does not get passed twice. + */ + + if (childWinPtr == NULL) { + Tcl_Panic("duplicate HWND in TkWmStackorderToplevelEnumProc"); + } else { + Tcl_SetHashValue(hPtr, NULL); + } + /* + fprintf(stderr, "Found mapped HWND %d -> %x (%s)\n", hwnd, + childWinPtr, childWinPtr->pathName); + */ + *(pair->window_ptr)-- = childWinPtr; } return TRUE; } @@ -6178,8 +6668,8 @@ BOOL CALLBACK TkWmStackorderToplevelEnumProc(hwnd, lParam) * * TkWmStackorderToplevelWrapperMap -- * - * This procedure will create a table that maps the wrapper - * HWND id for a toplevel to the TkWindow structure that is wraps. + * This function will create a table that maps the wrapper HWND id for a + * toplevel to the TkWindow structure that is wraps. * * Results: * None. @@ -6191,10 +6681,10 @@ BOOL CALLBACK TkWmStackorderToplevelEnumProc(hwnd, lParam) */ static void -TkWmStackorderToplevelWrapperMap(winPtr, display, table) - TkWindow *winPtr; /* TkWindow to recurse on */ - Display *display; /* X display of parent window */ - Tcl_HashTable *table; /* Table to maps HWND to TkWindow */ +TkWmStackorderToplevelWrapperMap( + TkWindow *winPtr, /* TkWindow to recurse on */ + Display *display, /* X display of parent window */ + Tcl_HashTable *table) /* Table to maps HWND to TkWindow */ { TkWindow *childPtr; Tcl_HashEntry *hPtr; @@ -6202,20 +6692,21 @@ TkWmStackorderToplevelWrapperMap(winPtr, display, table) int newEntry; if (Tk_IsMapped(winPtr) && Tk_IsTopLevel(winPtr) && - !Tk_IsEmbedded(winPtr) && (winPtr->display == display)) { - wrapper = TkWinGetWrapperWindow((Tk_Window) winPtr); + !Tk_IsEmbedded(winPtr) && (winPtr->display == display)) { + wrapper = TkWinGetWrapperWindow((Tk_Window) winPtr); - /*fprintf(stderr, "Mapped HWND %d to %x (%s)\n", wrapper, - winPtr, winPtr->pathName);*/ + /* + fprintf(stderr, "Mapped HWND %d to %x (%s)\n", wrapper, + winPtr, winPtr->pathName); + */ - hPtr = Tcl_CreateHashEntry(table, - (char *) wrapper, &newEntry); - Tcl_SetHashValue(hPtr, winPtr); + hPtr = Tcl_CreateHashEntry(table, (char *) wrapper, &newEntry); + Tcl_SetHashValue(hPtr, winPtr); } for (childPtr = winPtr->childList; childPtr != NULL; - childPtr = childPtr->nextPtr) { - TkWmStackorderToplevelWrapperMap(childPtr, display, table); + childPtr = childPtr->nextPtr) { + TkWmStackorderToplevelWrapperMap(childPtr, display, table); } } /* @@ -6223,11 +6714,11 @@ TkWmStackorderToplevelWrapperMap(winPtr, display, table) * * TkWmStackorderToplevel -- * - * This procedure returns the stack order of toplevel windows. + * This function returns the stack order of toplevel windows. * * Results: - * An array of pointers to tk window objects in stacking order - * or else NULL if there was an error. + * An array of pointers to tk window objects in stacking order or else + * NULL if there was an error. * * Side effects: * None. @@ -6236,8 +6727,8 @@ TkWmStackorderToplevelWrapperMap(winPtr, display, table) */ TkWindow ** -TkWmStackorderToplevel(parentPtr) - TkWindow *parentPtr; /* Parent toplevel window. */ +TkWmStackorderToplevel( + TkWindow *parentPtr) /* Parent toplevel window. */ { TkWmStackorderToplevelPair pair; TkWindow **windows; @@ -6253,28 +6744,28 @@ TkWmStackorderToplevel(parentPtr) TkWmStackorderToplevelWrapperMap(parentPtr, parentPtr->display, &table); windows = (TkWindow **) ckalloc((table.numEntries+1) - * sizeof(TkWindow *)); + * sizeof(TkWindow *)); /* - * Special cases: If zero or one toplevels were mapped - * there is no need to call EnumWindows. + * Special cases: If zero or one toplevels were mapped there is no need to + * call EnumWindows. */ switch (table.numEntries) { case 0: - windows[0] = NULL; - goto done; + windows[0] = NULL; + goto done; case 1: - hPtr = Tcl_FirstHashEntry(&table, &search); - windows[0] = (TkWindow *) Tcl_GetHashValue(hPtr); - windows[1] = NULL; - goto done; + hPtr = Tcl_FirstHashEntry(&table, &search); + windows[0] = (TkWindow *) Tcl_GetHashValue(hPtr); + windows[1] = NULL; + goto done; } /* - * We will be inserting into the array starting at the end - * and working our way to the beginning since EnumWindows - * returns windows in highest to lowest order. + * We will be inserting into the array starting at the end and working our + * way to the beginning since EnumWindows returns windows in highest to + * lowest order. */ pair.table = &table; @@ -6283,14 +6774,13 @@ TkWmStackorderToplevel(parentPtr) if (EnumWindows((WNDENUMPROC) TkWmStackorderToplevelEnumProc, (LPARAM) &pair) == 0) { - ckfree((char *) windows); - windows = NULL; - } else { - if (pair.window_ptr != (windows-1)) - Tcl_Panic("num matched toplevel windows does not equal num children"); + ckfree((char *) windows); + windows = NULL; + } else if (pair.window_ptr != (windows-1)) { + Tcl_Panic("num matched toplevel windows does not equal num children"); } - done: + done: Tcl_DeleteHashTable(&table); return windows; } @@ -6300,33 +6790,33 @@ TkWmStackorderToplevel(parentPtr) * * TkWmRestackToplevel -- * - * This procedure restacks a top-level window. + * This function restacks a top-level window. * * Results: * None. * * Side effects: - * WinPtr gets restacked as specified by aboveBelow and otherPtr. - * This procedure doesn't return until the restack has taken - * effect and the ConfigureNotify event for it has been received. + * WinPtr gets restacked as specified by aboveBelow and otherPtr. This + * function doesn't return until the restack has taken effect and the + * ConfigureNotify event for it has been received. * *---------------------------------------------------------------------- */ void -TkWmRestackToplevel(winPtr, aboveBelow, otherPtr) - TkWindow *winPtr; /* Window to restack. */ - int aboveBelow; /* Gives relative position for restacking; +TkWmRestackToplevel( + TkWindow *winPtr, /* Window to restack. */ + int aboveBelow, /* Gives relative position for restacking; * must be Above or Below. */ - TkWindow *otherPtr; /* Window relative to which to restack; - * if NULL, then winPtr gets restacked - * above or below *all* siblings. */ + TkWindow *otherPtr) /* Window relative to which to restack; if + * NULL, then winPtr gets restacked above or + * below *all* siblings. */ { HWND hwnd, insertAfter; /* - * Can't set stacking order properly until the window is on the - * screen (mapping it may give it a reparent window). + * Can't set stacking order properly until the window is on the screen + * (mapping it may give it a reparent window). */ if (winPtr->window == None) { @@ -6346,12 +6836,17 @@ TkWmRestackToplevel(winPtr, aboveBelow, otherPtr) TkWmMapWindow(otherPtr); } insertAfter = (otherPtr->wmInfoPtr->wrapper != NULL) - ? otherPtr->wmInfoPtr->wrapper : Tk_GetHWND(otherPtr->window); + ? otherPtr->wmInfoPtr->wrapper : Tk_GetHWND(otherPtr->window); } else { insertAfter = NULL; } - TkWinSetWindowPos(hwnd, insertAfter, aboveBelow); + if (winPtr->flags & TK_EMBEDDED) { + SendMessage(winPtr->wmInfoPtr->wrapper, TK_RAISEWINDOW, + (WPARAM)insertAfter, aboveBelow); + } else { + TkWinSetWindowPos(hwnd, insertAfter, aboveBelow); + } } /* @@ -6359,28 +6854,27 @@ TkWmRestackToplevel(winPtr, aboveBelow, otherPtr) * * TkWmAddToColormapWindows -- * - * This procedure is called to add a given window to the - * WM_COLORMAP_WINDOWS property for its top-level, if it - * isn't already there. It is invoked by the Tk code that - * creates a new colormap, in order to make sure that colormap - * information is propagated to the window manager by default. + * This function is called to add a given window to the + * WM_COLORMAP_WINDOWS property for its top-level, if it isn't already + * there. It is invoked by the Tk code that creates a new colormap, in + * order to make sure that colormap information is propagated to the + * window manager by default. * * Results: * None. * * Side effects: - * WinPtr's window gets added to the WM_COLORMAP_WINDOWS - * property of its nearest top-level ancestor, unless the - * colormaps have been set explicitly with the - * "wm colormapwindows" command. + * WinPtr's window gets added to the WM_COLORMAP_WINDOWS property of its + * nearest top-level ancestor, unless the colormaps have been set + * explicitly with the "wm colormapwindows" command. * *---------------------------------------------------------------------- */ void -TkWmAddToColormapWindows(winPtr) - TkWindow *winPtr; /* Window with a non-default colormap. - * Should not be a top-level window. */ +TkWmAddToColormapWindows( + TkWindow *winPtr) /* Window with a non-default colormap. Should + * not be a top-level window. */ { TkWindow *topPtr; TkWindow **oldPtr, **newPtr; @@ -6393,7 +6887,7 @@ TkWmAddToColormapWindows(winPtr) for (topPtr = winPtr->parentPtr; ; topPtr = topPtr->parentPtr) { if (topPtr == NULL) { /* - * Window is being deleted. Skip the whole operation. + * Window is being deleted. Skip the whole operation. */ return; @@ -6425,8 +6919,7 @@ TkWmAddToColormapWindows(winPtr) /* * Make a new bigger array and use it to reset the property. - * Automatically add the toplevel itself as the last element - * of the list. + * Automatically add the toplevel itself as the last element of the list. */ newPtr = (TkWindow **) ckalloc((unsigned) ((count+2)*sizeof(TkWindow*))); @@ -6461,26 +6954,26 @@ TkWmAddToColormapWindows(winPtr) * * TkWmRemoveFromColormapWindows -- * - * This procedure is called to remove a given window from the - * WM_COLORMAP_WINDOWS property for its top-level. It is invoked - * when windows are deleted. + * This function is called to remove a given window from the + * WM_COLORMAP_WINDOWS property for its top-level. It is invoked when + * windows are deleted. * * Results: * None. * * Side effects: - * WinPtr's window gets removed from the WM_COLORMAP_WINDOWS - * property of its nearest top-level ancestor, unless the - * top-level itself is being deleted too. + * WinPtr's window gets removed from the WM_COLORMAP_WINDOWS property of + * its nearest top-level ancestor, unless the top-level itself is being + * deleted too. * *---------------------------------------------------------------------- */ void -TkWmRemoveFromColormapWindows(winPtr) - TkWindow *winPtr; /* Window that may be present in +TkWmRemoveFromColormapWindows( + TkWindow *winPtr) /* Window that may be present in * WM_COLORMAP_WINDOWS property for its - * top-level. Should not be a top-level + * top-level. Should not be a top-level * window. */ { TkWindow *topPtr; @@ -6502,8 +6995,8 @@ TkWmRemoveFromColormapWindows(winPtr) } if (topPtr->flags & TK_ALREADY_DEAD) { /* - * Top-level is being deleted, so there's no need to cleanup - * the WM_COLORMAP_WINDOWS property. + * Top-level is being deleted, so there's no need to cleanup the + * WM_COLORMAP_WINDOWS property. */ return; @@ -6514,8 +7007,7 @@ TkWmRemoveFromColormapWindows(winPtr) } /* - * Find the window and slide the following ones down to cover - * it up. + * Find the window and slide the following ones down to cover it up. */ count = topPtr->wmInfoPtr->cmapCount; @@ -6542,36 +7034,42 @@ TkWmRemoveFromColormapWindows(winPtr) * None. * * Side effects: - * The menu will end up being drawn in the window, and the geometry - * of the window will have to be changed. + * The menu will end up being drawn in the window, and the geometry of + * the window will have to be changed. * *---------------------------------------------------------------------- */ void -TkWinSetMenu(tkwin, hMenu) - Tk_Window tkwin; /* the window to put the menu in */ - HMENU hMenu; /* the menu to set */ +TkWinSetMenu( + Tk_Window tkwin, /* the window to put the menu in */ + HMENU hMenu) /* the menu to set */ { TkWindow *winPtr = (TkWindow *) tkwin; WmInfo *wmPtr = winPtr->wmInfoPtr; - wmPtr->hMenu = hMenu; + /* Could be a Frame (i.e. not a Toplevel) */ + if (wmPtr == NULL) + return; - if (!(wmPtr->flags & TK_EMBEDDED)) { - if (!(wmPtr->flags & WM_NEVER_MAPPED)) { - int syncPending = wmPtr->flags & WM_SYNC_PENDING; + wmPtr->hMenu = hMenu; + if (!(wmPtr->flags & WM_NEVER_MAPPED)) { + int syncPending = wmPtr->flags & WM_SYNC_PENDING; - wmPtr->flags |= WM_SYNC_PENDING; - SetMenu(wmPtr->wrapper, hMenu); - if (!syncPending) { - wmPtr->flags &= ~WM_SYNC_PENDING; - } + wmPtr->flags |= WM_SYNC_PENDING; + SetMenu(wmPtr->wrapper, hMenu); + if (!syncPending) { + wmPtr->flags &= ~WM_SYNC_PENDING; } + } + if (!(winPtr->flags & TK_EMBEDDED)) { if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) { Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr); wmPtr->flags |= WM_UPDATE_PENDING|WM_MOVE_PENDING; } + } else { + SendMessage(wmPtr->wrapper, TK_SETMENU, + (WPARAM)hMenu, (LPARAM)Tk_GetMenuHWND(tkwin)); } } @@ -6581,7 +7079,7 @@ TkWinSetMenu(tkwin, hMenu) * ConfigureTopLevel -- * * Generate a ConfigureNotify event based on the current position - * information. This procedure is called by TopLevelProc. + * information. This function is called by TopLevelProc. * * Results: * None. @@ -6593,12 +7091,12 @@ TkWinSetMenu(tkwin, hMenu) */ static void -ConfigureTopLevel(pos) - WINDOWPOS *pos; +ConfigureTopLevel( + WINDOWPOS *pos) { TkWindow *winPtr = GetTopLevel(pos->hwnd); WmInfo *wmPtr; - int state = 0; /* Current window state. */ + int state; /* Current window state. */ RECT rect; WINDOWPLACEMENT windowPos; @@ -6618,15 +7116,16 @@ ConfigureTopLevel(pos) windowPos.length = sizeof(WINDOWPLACEMENT); GetWindowPlacement(wmPtr->wrapper, &windowPos); switch (windowPos.showCmd) { - case SW_SHOWMAXIMIZED: - state = ZoomState; - break; - case SW_SHOWMINIMIZED: - state = IconicState; - break; - case SW_SHOWNORMAL: - state = NormalState; - break; + case SW_SHOWMAXIMIZED: + state = ZoomState; + break; + case SW_SHOWMINIMIZED: + state = IconicState; + break; + case SW_SHOWNORMAL: + default: + state = NormalState; + break; } } @@ -6638,27 +7137,26 @@ ConfigureTopLevel(pos) if (wmPtr->hints.initial_state != state) { wmPtr->hints.initial_state = state; switch (state) { - case WithdrawnState: - case IconicState: - XUnmapWindow(winPtr->display, winPtr->window); - break; + case WithdrawnState: + case IconicState: + XUnmapWindow(winPtr->display, winPtr->window); + break; - case NormalState: - /* - * Schedule a geometry update. Since we ignore geometry - * requests while in any other state, the geometry info - * may be stale. - */ + case NormalState: + /* + * Schedule a geometry update. Since we ignore geometry requests + * while in any other state, the geometry info may be stale. + */ - if (!(wmPtr->flags & WM_UPDATE_PENDING)) { - Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr); - wmPtr->flags |= WM_UPDATE_PENDING; - } - /* fall through */ - case ZoomState: - XMapWindow(winPtr->display, winPtr->window); - pos->flags |= SWP_NOMOVE | SWP_NOSIZE; - break; + if (!(wmPtr->flags & WM_UPDATE_PENDING)) { + Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr); + wmPtr->flags |= WM_UPDATE_PENDING; + } + /* fall through */ + case ZoomState: + XMapWindow(winPtr->display, winPtr->window); + pos->flags |= SWP_NOMOVE | SWP_NOSIZE; + break; } } @@ -6672,8 +7170,8 @@ ConfigureTopLevel(pos) /* - * Compute the current geometry of the client area, reshape the - * Tk window and generate a ConfigureNotify event. + * Compute the current geometry of the client area, reshape the Tk window + * and generate a ConfigureNotify event. */ GetClientRect(wmPtr->wrapper, &rect); @@ -6693,16 +7191,16 @@ ConfigureTopLevel(pos) if (state == NormalState) { /* - * Update size information from the event. There are a couple of + * Update size information from the event. There are a couple of * tricky points here: * * 1. If the user changed the size externally then set wmPtr->width * and wmPtr->height just as if a "wm geometry" command had been * invoked with the same information. - * 2. However, if the size is changing in response to a request - * coming from us (sync is set), then don't set - * wmPtr->width or wmPtr->height (otherwise the window will stop - * tracking geometry manager requests). + * 2. However, if the size is changing in response to a request coming + * from us (sync is set), then don't set wmPtr->width or + * wmPtr->height (otherwise the window will stop tracking geometry + * manager requests). */ if (!(wmPtr->flags & WM_SYNC_PENDING)) { @@ -6710,14 +7208,14 @@ ConfigureTopLevel(pos) if ((wmPtr->width == -1) && (winPtr->changes.width == winPtr->reqWidth)) { /* - * Don't set external width, since the user didn't - * change it from what the widgets asked for. + * Don't set external width, since the user didn't change + * it from what the widgets asked for. */ } else { if (wmPtr->gridWin != NULL) { wmPtr->width = wmPtr->reqGridWidth - + (winPtr->changes.width - winPtr->reqWidth) - / wmPtr->widthInc; + + (winPtr->changes.width - winPtr->reqWidth) + / wmPtr->widthInc; if (wmPtr->width < 0) { wmPtr->width = 0; } @@ -6734,8 +7232,8 @@ ConfigureTopLevel(pos) } else { if (wmPtr->gridWin != NULL) { wmPtr->height = wmPtr->reqGridHeight - + (winPtr->changes.height - winPtr->reqHeight) - / wmPtr->heightInc; + + (winPtr->changes.height - winPtr->reqHeight) + / wmPtr->heightInc; if (wmPtr->height < 0) { wmPtr->height = 0; } @@ -6746,9 +7244,10 @@ ConfigureTopLevel(pos) wmPtr->configWidth = winPtr->changes.width; wmPtr->configHeight = winPtr->changes.height; } + /* - * If the user moved the window, we should switch back - * to normal coordinates. + * If the user moved the window, we should switch back to normal + * coordinates. */ if (!(pos->flags & SWP_NOMOVE)) { @@ -6762,15 +7261,15 @@ ConfigureTopLevel(pos) if (wmPtr->flags & WM_NEGATIVE_X) { wmPtr->x = DisplayWidth(winPtr->display, winPtr->screenNum) - - winPtr->changes.x - (winPtr->changes.width - + wmPtr->borderWidth); + - winPtr->changes.x - (winPtr->changes.width + + wmPtr->borderWidth); } else { wmPtr->x = winPtr->changes.x; } if (wmPtr->flags & WM_NEGATIVE_Y) { wmPtr->y = DisplayHeight(winPtr->display, winPtr->screenNum) - - winPtr->changes.y - (winPtr->changes.height - + wmPtr->borderHeight); + - winPtr->changes.y - (winPtr->changes.height + + wmPtr->borderHeight); } else { wmPtr->y = winPtr->changes.y; } @@ -6782,8 +7281,8 @@ ConfigureTopLevel(pos) * * GenerateConfigureNotify -- * - * Generate a ConfigureNotify event from the current geometry - * information for the specified toplevel window. + * Generate a ConfigureNotify event from the current geometry information + * for the specified toplevel window. * * Results: * None. @@ -6795,8 +7294,8 @@ ConfigureTopLevel(pos) */ static void -GenerateConfigureNotify(winPtr) - TkWindow *winPtr; +GenerateConfigureNotify( + TkWindow *winPtr) { XEvent event; @@ -6825,8 +7324,8 @@ GenerateConfigureNotify(winPtr) * * InstallColormaps -- * - * Installs the colormaps associated with the toplevel which is - * currently active. + * Installs the colormaps associated with the toplevel which is currently + * active. * * Results: * None. @@ -6838,12 +7337,12 @@ GenerateConfigureNotify(winPtr) */ static int -InstallColormaps(hwnd, message, isForemost) - HWND hwnd; /* Toplevel wrapper window whose colormaps +InstallColormaps( + HWND hwnd, /* Toplevel wrapper window whose colormaps * should be installed. */ - int message; /* Either WM_PALETTECHANGED or + int message, /* Either WM_PALETTECHANGED or * WM_QUERYNEWPALETTE */ - int isForemost; /* 1 if window is foremost, else 0 */ + int isForemost) /* 1 if window is foremost, else 0 */ { int i; HDC dc; @@ -6851,7 +7350,7 @@ InstallColormaps(hwnd, message, isForemost) TkWindow *winPtr = GetTopLevel(hwnd); WmInfo *wmPtr; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) - Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); + Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (winPtr == NULL || (winPtr->flags & TK_ALREADY_DEAD) ) { return 0; @@ -6890,11 +7389,11 @@ InstallColormaps(hwnd, message, isForemost) } else { /* - * Window is being notified of a change in the system palette. - * If this window is the foreground window, then we should only - * install the secondary palettes, since the primary was installed - * in response to the WM_QUERYPALETTE message. Otherwise, install - * all of the palettes. + * Window is being notified of a change in the system palette. If this + * window is the foreground window, then we should only install the + * secondary palettes, since the primary was installed in response to + * the WM_QUERYPALETTE message. Otherwise, install all of the + * palettes. */ @@ -6936,11 +7435,10 @@ InstallColormaps(hwnd, message, isForemost) * * RefreshColormap -- * - * This function is called to force all of the windows that use - * a given colormap to redraw themselves. The quickest way to - * do this is to iterate over the toplevels, looking in the - * cmapList for matches. This will quickly eliminate subtrees - * that don't use a given colormap. + * This function is called to force all of the windows that use a given + * colormap to redraw themselves. The quickest way to do this is to + * iterate over the toplevels, looking in the cmapList for matches. This + * will quickly eliminate subtrees that don't use a given colormap. * * Results: * None. @@ -6952,9 +7450,9 @@ InstallColormaps(hwnd, message, isForemost) */ static void -RefreshColormap(colormap, dispPtr) - Colormap colormap; - TkDisplay *dispPtr; +RefreshColormap( + Colormap colormap, + TkDisplay *dispPtr) { WmInfo *wmPtr; int i; @@ -6979,9 +7477,9 @@ RefreshColormap(colormap, dispPtr) * * InvalidateSubTree -- * - * This function recursively generates damage for a window and - * all of its mapped children that belong to the same toplevel and - * are using the specified colormap. + * This function recursively generates damage for a window and all of its + * mapped children that belong to the same toplevel and are using the + * specified colormap. * * Results: * None. @@ -6993,15 +7491,15 @@ RefreshColormap(colormap, dispPtr) */ static void -InvalidateSubTree(winPtr, colormap) - TkWindow *winPtr; - Colormap colormap; +InvalidateSubTree( + TkWindow *winPtr, + Colormap colormap) { TkWindow *childPtr; /* - * Generate damage for the current window if it is using the - * specified colormap. + * Generate damage for the current window if it is using the specified + * colormap. */ if (winPtr->atts.colormap == colormap) { @@ -7011,8 +7509,7 @@ InvalidateSubTree(winPtr, colormap) for (childPtr = winPtr->childList; childPtr != NULL; childPtr = childPtr->nextPtr) { /* - * We can stop the descent when we hit an unmapped or - * toplevel window. + * We can stop the descent when we hit an unmapped or toplevel window. */ if (!Tk_TopWinHierarchy(childPtr) && Tk_IsMapped(childPtr)) { @@ -7026,8 +7523,8 @@ InvalidateSubTree(winPtr, colormap) * * InvalidateSubTreeDepth -- * - * This function recursively updates depth info for a window and - * all of its children that belong to the same toplevel. + * This function recursively updates depth info for a window and all of + * its children that belong to the same toplevel. * * Results: * None. @@ -7039,8 +7536,8 @@ InvalidateSubTree(winPtr, colormap) */ static void -InvalidateSubTreeDepth(winPtr) - TkWindow *winPtr; +InvalidateSubTreeDepth( + TkWindow *winPtr) { Display *display = Tk_Display(winPtr); int screenNum = Tk_ScreenNumber(winPtr); @@ -7050,10 +7547,10 @@ InvalidateSubTreeDepth(winPtr) #if 0 /* - * XXX: What other elements may require changes? Changing just - * the depth works for standard windows and 16/24/32-bpp changes. - * I suspect 8-bit (palettized) displays may require colormap and/or - * visual changes as well. + * XXX: What other elements may require changes? Changing just the depth + * works for standard windows and 16/24/32-bpp changes. I suspect 8-bit + * (palettized) displays may require colormap and/or visual changes as + * well. */ if (winPtr->window) { @@ -7065,13 +7562,13 @@ InvalidateSubTreeDepth(winPtr) #endif for (childPtr = winPtr->childList; childPtr != NULL; - childPtr = childPtr->nextPtr) { + childPtr = childPtr->nextPtr) { /* - * We can stop the descent when we hit a toplevel window, as it - * should get its own message. + * We can stop the descent when we hit a non-embedded toplevel window, + * as it should get its own message. */ - if (!Tk_TopWinHierarchy(childPtr)) { + if (childPtr->flags & TK_EMBEDDED || !Tk_TopWinHierarchy(childPtr)) { InvalidateSubTreeDepth(childPtr); } } @@ -7085,8 +7582,8 @@ InvalidateSubTreeDepth(winPtr) * Retrieves the currently installed foreground palette. * * Results: - * Returns the global foreground palette, if there is one. - * Otherwise, returns NULL. + * Returns the global foreground palette, if there is one. Otherwise, + * returns NULL. * * Side effects: * None. @@ -7095,10 +7592,10 @@ InvalidateSubTreeDepth(winPtr) */ HPALETTE -TkWinGetSystemPalette() +TkWinGetSystemPalette(void) { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) - Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); + Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); return tsdPtr->systemPalette; } @@ -7108,17 +7605,16 @@ TkWinGetSystemPalette() * * GetMinSize -- * - * This procedure computes the current minWidth and minHeight - * values for a window, taking into account the possibility - * that they may be defaulted. + * This function computes the current minWidth and minHeight values for a + * window, taking into account the possibility that they may be + * defaulted. * * Results: - * The values at *minWidthPtr and *minHeightPtr are filled - * in with the minimum allowable dimensions of wmPtr's window, - * in grid units. If the requested minimum is smaller than the - * system required minimum, then this procedure computes the - * smallest size that will satisfy both the system and the - * grid constraints. + * The values at *minWidthPtr and *minHeightPtr are filled in with the + * minimum allowable dimensions of wmPtr's window, in grid units. If the + * requested minimum is smaller than the system required minimum, then + * this function computes the smallest size that will satisfy both the + * system and the grid constraints. * * Side effects: * None. @@ -7127,21 +7623,21 @@ TkWinGetSystemPalette() */ static void -GetMinSize(wmPtr, minWidthPtr, minHeightPtr) - WmInfo *wmPtr; /* Window manager information for the +GetMinSize( + WmInfo *wmPtr, /* Window manager information for the * window. */ - int *minWidthPtr; /* Where to store the current minimum - * width of the window. */ - int *minHeightPtr; /* Where to store the current minimum - * height of the window. */ + int *minWidthPtr, /* Where to store the current minimum width of + * the window. */ + int *minHeightPtr) /* Where to store the current minimum height + * of the window. */ { int tmp, base; TkWindow *winPtr = wmPtr->winPtr; /* - * Compute the minimum width by taking the default client size - * and rounding it up to the nearest grid unit. Return the greater - * of the default minimum and the specified minimum. + * Compute the minimum width by taking the default client size and + * rounding it up to the nearest grid unit. Return the greater of the + * default minimum and the specified minimum. */ tmp = wmPtr->defMinWidth - wmPtr->borderWidth; @@ -7186,16 +7682,15 @@ GetMinSize(wmPtr, minWidthPtr, minHeightPtr) * * GetMaxSize -- * - * This procedure computes the current maxWidth and maxHeight - * values for a window, taking into account the possibility - * that they may be defaulted. + * This function computes the current maxWidth and maxHeight values for a + * window, taking into account the possibility that they may be + * defaulted. * * Results: - * The values at *maxWidthPtr and *maxHeightPtr are filled - * in with the maximum allowable dimensions of wmPtr's window, - * in grid units. If no maximum has been specified for the - * window, then this procedure computes the largest sizes that - * will fit on the screen. + * The values at *maxWidthPtr and *maxHeightPtr are filled in with the + * maximum allowable dimensions of wmPtr's window, in grid units. If no + * maximum has been specified for the window, then this function computes + * the largest sizes that will fit on the screen. * * Side effects: * None. @@ -7204,13 +7699,13 @@ GetMinSize(wmPtr, minWidthPtr, minHeightPtr) */ static void -GetMaxSize(wmPtr, maxWidthPtr, maxHeightPtr) - WmInfo *wmPtr; /* Window manager information for the +GetMaxSize( + WmInfo *wmPtr, /* Window manager information for the * window. */ - int *maxWidthPtr; /* Where to store the current maximum - * width of the window. */ - int *maxHeightPtr; /* Where to store the current maximum - * height of the window. */ + int *maxWidthPtr, /* Where to store the current maximum width of + * the window. */ + int *maxHeightPtr) /* Where to store the current maximum height + * of the window. */ { int tmp; @@ -7218,14 +7713,14 @@ GetMaxSize(wmPtr, maxWidthPtr, maxHeightPtr) *maxWidthPtr = wmPtr->maxWidth; } else { /* - * Must compute a default width. Fill up the display, leaving a - * bit of extra space for the window manager's borders. + * Must compute a default width. Fill up the display, leaving a bit of + * extra space for the window manager's borders. */ tmp = wmPtr->defMaxWidth - wmPtr->borderWidth; if (wmPtr->gridWin != NULL) { /* - * Gridding is turned on; convert from pixels to grid units. + * Gridding is turned on; convert from pixels to grid units. */ tmp = wmPtr->reqGridWidth @@ -7250,8 +7745,7 @@ GetMaxSize(wmPtr, maxWidthPtr, maxHeightPtr) * * TopLevelProc -- * - * Callback from Windows whenever an event occurs on a top level - * window. + * Callback from Windows whenever an event occurs on a top level window. * * Results: * Standard Windows return value. @@ -7263,13 +7757,13 @@ GetMaxSize(wmPtr, maxWidthPtr, maxHeightPtr) */ static LRESULT CALLBACK -TopLevelProc(hwnd, message, wParam, lParam) - HWND hwnd; - UINT message; - WPARAM wParam; - LPARAM lParam; +TopLevelProc( + HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) { - if (message == WM_WINDOWPOSCHANGED) { + if (message == WM_WINDOWPOSCHANGED || message == WM_WINDOWPOSCHANGING) { WINDOWPOS *pos = (WINDOWPOS *) lParam; TkWindow *winPtr = (TkWindow *) Tk_HWNDToWindow(pos->hwnd); @@ -7286,8 +7780,10 @@ TopLevelProc(hwnd, message, wParam, lParam) winPtr->changes.height = pos->cy; } if (!(pos->flags & SWP_NOMOVE)) { - winPtr->changes.x = pos->x; - winPtr->changes.y = pos->y; + long result = SendMessage(winPtr->wmInfoPtr->wrapper, + TK_MOVEWINDOW, -1, -1); + winPtr->wmInfoPtr->x = winPtr->changes.x = result >> 16; + winPtr->wmInfoPtr->y = winPtr->changes.y = result & 0xffff; } GenerateConfigureNotify(winPtr); @@ -7316,180 +7812,257 @@ TopLevelProc(hwnd, message, wParam, lParam) */ static LRESULT CALLBACK -WmProc(hwnd, message, wParam, lParam) - HWND hwnd; - UINT message; - WPARAM wParam; - LPARAM lParam; +WmProc( + HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) { static int inMoveSize = 0; - static int oldMode; /* This static is set upon entering move/size mode - * and is used to reset the service mode after - * leaving move/size mode. Note that this mechanism - * assumes move/size is only one level deep. */ - LRESULT result; + static int oldMode; /* This static is set upon entering move/size + * mode and is used to reset the service mode + * after leaving move/size mode. Note that + * this mechanism assumes move/size is only + * one level deep. */ + LRESULT result = 0; TkWindow *winPtr = NULL; - if (TkWinHandleMenuEvent(&hwnd, &message, &wParam, &lParam, &result)) { + switch (message) { + case WM_KILLFOCUS: + case WM_ERASEBKGND: + result = 0; goto done; - } - switch (message) { - case WM_KILLFOCUS: - case WM_ERASEBKGND: - result = 0; - goto done; + case WM_ENTERSIZEMOVE: + inMoveSize = 1; - case WM_ENTERSIZEMOVE: - inMoveSize = 1; + /* + * Cancel any current mouse timer. If the mouse timer fires during the + * size/move mouse capture, it will release the capture, which is + * wrong. + */ - /* - * Cancel any current mouse timer. If the mouse timer - * fires during the size/move mouse capture, it will - * release the capture, which is wrong. - */ + TkWinCancelMouseTimer(); - TkWinCancelMouseTimer(); + oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL); + break; - oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL); - break; + case WM_ACTIVATE: + if ( WA_ACTIVE == LOWORD(wParam) ) { + winPtr = GetTopLevel(hwnd); + if (winPtr && (TkGrabState(winPtr) == TK_GRAB_EXCLUDED)) { + /* + * There is a grab in progress so queue an Activate event + */ - case WM_ACTIVATE: - case WM_EXITSIZEMOVE: - if (inMoveSize) { - inMoveSize = 0; - Tcl_SetServiceMode(oldMode); + GenerateActivateEvent(winPtr, &inMoveSize); + result = 0; + goto done; } - break; + } + /* fall through */ + + case WM_EXITSIZEMOVE: + if (inMoveSize) { + inMoveSize = 0; + Tcl_SetServiceMode(oldMode); + } + break; - case WM_GETMINMAXINFO: - SetLimits(hwnd, (MINMAXINFO *) lParam); - result = 0; - goto done; + case WM_GETMINMAXINFO: + SetLimits(hwnd, (MINMAXINFO *) lParam); + result = 0; + goto done; - case WM_DISPLAYCHANGE: - /* display and/or color resolution changed */ - winPtr = GetTopLevel(hwnd); - if (winPtr) { - Screen *screen = Tk_Screen(winPtr); - if (screen->root_depth != (int) wParam) { - /* - * Color resolution changed, so do extensive rebuild of - * display parameters. This will affect the display for - * all Tk windows. We will receive this event for each - * toplevel, but this check makes us update only once, for - * the first toplevel that receives the message. - */ - TkWinDisplayChanged(Tk_Display(winPtr)); - } else { - HDC dc = GetDC(NULL); - screen->width = LOWORD(lParam); /* horizontal res */ - screen->height = HIWORD(lParam); /* vertical res */ - screen->mwidth = MulDiv(screen->width, 254, - GetDeviceCaps(dc, LOGPIXELSX) * 10); - screen->mheight = MulDiv(screen->height, 254, - GetDeviceCaps(dc, LOGPIXELSY) * 10); - ReleaseDC(NULL, dc); - } - if (Tk_Depth(winPtr) != (int) wParam) { - /* - * Defer the window depth check to here so that each - * toplevel will properly update depth info. - */ - InvalidateSubTreeDepth(winPtr); - } + case WM_DISPLAYCHANGE: + /* + * Display and/or color resolution changed. + */ + + winPtr = GetTopLevel(hwnd); + if (winPtr) { + Screen *screen = Tk_Screen(winPtr); + if (screen->root_depth != (int) wParam) { + /* + * Color resolution changed, so do extensive rebuild of + * display parameters. This will affect the display for all Tk + * windows. We will receive this event for each toplevel, but + * this check makes us update only once, for the first + * toplevel that receives the message. + */ + + TkWinDisplayChanged(Tk_Display(winPtr)); + } else { + HDC dc = GetDC(NULL); + + screen->width = LOWORD(lParam); /* horizontal res */ + screen->height = HIWORD(lParam); /* vertical res */ + screen->mwidth = MulDiv(screen->width, 254, + GetDeviceCaps(dc, LOGPIXELSX) * 10); + screen->mheight = MulDiv(screen->height, 254, + GetDeviceCaps(dc, LOGPIXELSY) * 10); + ReleaseDC(NULL, dc); } - result = 0; - goto done; + if (Tk_Depth(winPtr) != (int) wParam) { + /* + * Defer the window depth check to here so that each toplevel + * will properly update depth info. + */ - case WM_SYSCOLORCHANGE: - /* - * XXX: Called when system color changes. We need to - * update any widgets that use a system color. - */ - break; + InvalidateSubTreeDepth(winPtr); + } + } + result = 0; + goto done; - case WM_PALETTECHANGED: - result = InstallColormaps(hwnd, WM_PALETTECHANGED, - hwnd == (HWND)wParam); - goto done; + case WM_SYSCOLORCHANGE: + /* + * XXX: Called when system color changes. We need to update any + * widgets that use a system color. + */ - case WM_QUERYNEWPALETTE: - result = InstallColormaps(hwnd, WM_QUERYNEWPALETTE, TRUE); - goto done; + break; - case WM_WINDOWPOSCHANGED: - ConfigureTopLevel((WINDOWPOS *) lParam); - result = 0; - goto done; + case WM_PALETTECHANGED: + result = InstallColormaps(hwnd, WM_PALETTECHANGED, + hwnd == (HWND)wParam); + goto done; - case WM_NCHITTEST: { - winPtr = GetTopLevel(hwnd); - if (winPtr && (TkGrabState(winPtr) == TK_GRAB_EXCLUDED)) { - /* - * This window is outside the grab heirarchy, so don't let any - * of the normal non-client processing occur. Note that this - * implementation is not strictly correct because the grab - * might change between now and when the event would have been - * processed by Tk, but it's close enough. - */ + case WM_QUERYNEWPALETTE: + result = InstallColormaps(hwnd, WM_QUERYNEWPALETTE, TRUE); + goto done; - result = HTCLIENT; - goto done; - } - break; + case WM_SETTINGCHANGE: + if (wParam == SPI_SETNONCLIENTMETRICS) { + winPtr = GetTopLevel(hwnd); + TkWinSetupSystemFonts(winPtr->mainPtr); + result = 0; + goto done; } + break; - case WM_MOUSEACTIVATE: { - ActivateEvent *eventPtr; - winPtr = GetTopLevel((HWND) wParam); + case WM_WINDOWPOSCHANGED: + ConfigureTopLevel((WINDOWPOS *) lParam); + result = 0; + goto done; - if (winPtr && (TkGrabState(winPtr) != TK_GRAB_EXCLUDED)) { - /* - * This allows us to pass the message onto the - * native menus [Bug: 2272] - */ - result = (*tkWinProcs->defWindowProc)(hwnd, message, - wParam, lParam); - goto done; - } + case WM_NCHITTEST: { + winPtr = GetTopLevel(hwnd); + if (winPtr && (TkGrabState(winPtr) == TK_GRAB_EXCLUDED)) { + /* + * This window is outside the grab heirarchy, so don't let any of + * the normal non-client processing occur. Note that this + * implementation is not strictly correct because the grab might + * change between now and when the event would have been processed + * by Tk, but it's close enough. + */ + + result = HTCLIENT; + goto done; + } + break; + } + case WM_MOUSEACTIVATE: { + winPtr = GetTopLevel((HWND) wParam); + if (winPtr && (TkGrabState(winPtr) != TK_GRAB_EXCLUDED)) { /* - * Don't activate the window yet since there is a grab - * that takes precedence. Instead we need to queue - * an event so we can check the grab state right before we - * handle the mouse event. + * This allows us to pass the message onto the native menus [Bug: + * 2272] */ - if (winPtr) { - eventPtr = (ActivateEvent *)ckalloc(sizeof(ActivateEvent)); - eventPtr->ev.proc = ActivateWindow; - eventPtr->winPtr = winPtr; - Tcl_QueueEvent((Tcl_Event*)eventPtr, TCL_QUEUE_TAIL); - } - result = MA_NOACTIVATE; + result = (*tkWinProcs->defWindowProc)(hwnd, message, + wParam, lParam); goto done; } - case WM_QUERYENDSESSION: { - XEvent event; + /* + * Don't activate the window yet since there is a grab that takes + * precedence. Instead we need to queue an event so we can check the + * grab state right before we handle the mouse event. + */ - winPtr = GetTopLevel(hwnd); - event.xclient.message_type = - Tk_InternAtom((Tk_Window) winPtr, "WM_PROTOCOLS"); - event.xclient.data.l[0] = - Tk_InternAtom((Tk_Window) winPtr, "WM_SAVE_YOURSELF"); - TkWmProtocolEventProc(winPtr, &event); - break; + if (winPtr) { + GenerateActivateEvent(winPtr, &inMoveSize); } + result = MA_NOACTIVATE; + goto done; + } - default: - break; + case WM_QUERYENDSESSION: { + XEvent event; + + /* + * Synthesize WM_SAVE_YOURSELF wm protocol message on Windows logout + * or restart. + */ + winPtr = GetTopLevel(hwnd); + event.xclient.message_type = + Tk_InternAtom((Tk_Window) winPtr, "WM_PROTOCOLS"); + event.xclient.data.l[0] = + Tk_InternAtom((Tk_Window) winPtr, "WM_SAVE_YOURSELF"); + TkWmProtocolEventProc(winPtr, &event); + break; + } + + default: + break; } winPtr = GetTopLevel(hwnd); + switch(message) { + case WM_SYSCOMMAND: + /* + * If there is a grab in effect then ignore the minimize command + * unless the grab is on the main window (.). This is to permit + * applications that leave a grab on . to work normally. + * All other toplevels are deemed non-minimizable when a grab is + * present. + * If there is a grab in effect and this window is outside the + * grab tree then ignore all system commands. [Bug 1847002] + */ + + if (winPtr) { + int cmd = wParam & 0xfff0; + int grab = TkGrabState(winPtr); + if ((SC_MINIMIZE == cmd) + && (grab == TK_GRAB_IN_TREE || grab == TK_GRAB_ANCESTOR) + && (winPtr != winPtr->mainPtr->winPtr)) { + goto done; + } + if (grab == TK_GRAB_EXCLUDED + && !(SC_MOVE == cmd || SC_SIZE == cmd)) { + goto done; + } + } + /* fall through */ + + case WM_INITMENU: + case WM_COMMAND: + case WM_MENUCHAR: + case WM_MEASUREITEM: + case WM_DRAWITEM: + case WM_MENUSELECT: + case WM_ENTERIDLE: + case WM_INITMENUPOPUP: + if (winPtr) { + HWND hMenuHWnd = Tk_GetEmbeddedMenuHWND((Tk_Window)winPtr); + + if (hMenuHWnd) { + if (SendMessage(hMenuHWnd, message, wParam, lParam)) { + goto done; + } + } else if (TkWinHandleMenuEvent(&hwnd, &message, &wParam, &lParam, + &result)) { + goto done; + } + } + break; + } + if (winPtr && winPtr->window) { HWND child = Tk_GetHWND(winPtr->window); + if (message == WM_SETFOCUS) { SetFocus(child); result = 0; @@ -7502,7 +8075,7 @@ WmProc(hwnd, message, wParam, lParam) result = (*tkWinProcs->defWindowProc)(hwnd, message, wParam, lParam); } - done: + done: Tcl_ServiceAll(); return result; } @@ -7512,8 +8085,8 @@ WmProc(hwnd, message, wParam, lParam) * * TkpMakeMenuWindow -- * - * Configure the window to be either a pull-down (or pop-up) - * menu, or as a toplevel (torn-off) menu or palette. + * Configure the window to be either a pull-down (or pop-up) menu, or as + * a toplevel (torn-off) menu or palette. * * Results: * None. @@ -7525,12 +8098,12 @@ WmProc(hwnd, message, wParam, lParam) */ void -TkpMakeMenuWindow(tkwin, transient) - Tk_Window tkwin; /* New window. */ - int transient; /* 1 means menu is only posted briefly as - * a popup or pulldown or cascade. 0 means - * menu is always visible, e.g. as a torn-off - * menu. Determines whether save_under and +TkpMakeMenuWindow( + Tk_Window tkwin, /* New window. */ + int transient) /* 1 means menu is only posted briefly as a + * popup or pulldown or cascade. 0 means menu + * is always visible, e.g. as a torn-off menu. + * Determines whether save_under and * override_redirect should be set. */ { XSetWindowAttributes atts; @@ -7574,23 +8147,21 @@ TkWinGetWrapperWindow( TkWindow *winPtr = (TkWindow *)tkwin; return (winPtr->wmInfoPtr->wrapper); } - /* *---------------------------------------------------------------------- * * TkWmFocusToplevel -- * - * This is a utility procedure invoked by focus-management code. It - * exists because of the extra wrapper windows that exist under - * Unix; its job is to map from wrapper windows to the - * corresponding toplevel windows. On PCs and Macs there are no - * wrapper windows so no mapping is necessary; this procedure just - * determines whether a window is a toplevel or not. + * This is a utility function invoked by focus-management code. It exists + * because of the extra wrapper windows that exist under Unix; its job is + * to map from wrapper windows to the corresponding toplevel windows. On + * PCs and Macs there are no wrapper windows so no mapping is necessary; + * this function just determines whether a window is a toplevel or not. * * Results: - * If winPtr is a toplevel window, returns the pointer to the - * window; otherwise returns NULL. + * If winPtr is a toplevel window, returns the pointer to the window; + * otherwise returns NULL. * * Side effects: * None. @@ -7599,8 +8170,8 @@ TkWinGetWrapperWindow( */ TkWindow * -TkWmFocusToplevel(winPtr) - TkWindow *winPtr; /* Window that received a focus-related +TkWmFocusToplevel( + TkWindow *winPtr) /* Window that received a focus-related * event. */ { if (!(winPtr->flags & TK_TOP_HIERARCHY)) { @@ -7608,19 +8179,19 @@ TkWmFocusToplevel(winPtr) } return winPtr; } - + /* *---------------------------------------------------------------------- * * TkpGetWrapperWindow -- * - * This is a utility procedure invoked by focus-management code. It - * maps to the wrapper for a top-level, which is just the same - * as the top-level on Macs and PCs. + * This is a utility function invoked by focus-management code. It maps + * to the wrapper for a top-level, which is just the same as the + * top-level on Macs and PCs. * * Results: - * If winPtr is a toplevel window, returns the pointer to the - * window; otherwise returns NULL. + * If winPtr is a toplevel window, returns the pointer to the window; + * otherwise returns NULL. * * Side effects: * None. @@ -7642,6 +8213,26 @@ TkpGetWrapperWindow( /* *---------------------------------------------------------------------- * + * GenerateActivateEvent -- + * + * This function is called to activate a Tk window. + */ + +static void +GenerateActivateEvent(TkWindow * winPtr, const int *flagPtr) +{ + ActivateEvent *eventPtr; + eventPtr = (ActivateEvent *)ckalloc(sizeof(ActivateEvent)); + eventPtr->ev.proc = ActivateWindow; + eventPtr->winPtr = winPtr; + eventPtr->flagPtr = flagPtr; + eventPtr->hwnd = Tk_GetHWND(winPtr->window); + Tcl_QueueEvent((Tcl_Event *)eventPtr, TCL_QUEUE_TAIL); +} + +/* + *---------------------------------------------------------------------- + * * ActivateWindow -- * * This function is called when an ActivateEvent is processed. @@ -7660,39 +8251,65 @@ ActivateWindow( Tcl_Event *evPtr, /* Pointer to ActivateEvent. */ int flags) /* Notifier event mask. */ { - TkWindow *winPtr; + ActivateEvent *eventPtr = (ActivateEvent *)evPtr; + TkWindow *winPtr = eventPtr->winPtr; if (! (flags & TCL_WINDOW_EVENTS)) { return 0; } - winPtr = ((ActivateEvent *) evPtr)->winPtr; + /* + * Ensure the window has not been destroyed while we delayed + * processing the WM_ACTIVATE message [Bug 2899949]. + */ + + if (!IsWindow(eventPtr->hwnd)) { + return 1; + } + + /* + * If the toplevel is in the middle of a move or size operation then + * we must delay handling of this event to avoid stealing the focus + * while the window manage is in control. + */ + + if (eventPtr->flagPtr && *eventPtr->flagPtr) { + return 0; + } /* - * If the window is excluded by a grab, call SetFocus on the - * grabbed window instead. [Bug 220908] + * If the window is excluded by a grab, call SetFocus on the grabbed + * window instead. [Bug 220908] */ if (winPtr) { + Window window; if (TkGrabState(winPtr) != TK_GRAB_EXCLUDED) { - SetFocus(Tk_GetHWND(winPtr->window)); + window = winPtr->window; } else { - SetFocus(Tk_GetHWND(winPtr->dispPtr->grabWinPtr->window)); + window = winPtr->dispPtr->grabWinPtr->window; + } + + /* + * Ensure the window was not destroyed while we were postponing + * the activation [Bug 2799589] + */ + + if (window) { + SetFocus(Tk_GetHWND(window)); } } return 1; } - /* *---------------------------------------------------------------------- * * TkWinSetForegroundWindow -- * - * This function is a wrapper for SetForegroundWindow, calling - * it on the wrapper window because it has no affect on child - * windows. + * This function is a wrapper for SetForegroundWindow, calling it on the + * wrapper window because it has no affect on child windows. * * Results: * none @@ -7704,8 +8321,8 @@ ActivateWindow( */ void -TkWinSetForegroundWindow(winPtr) - TkWindow *winPtr; +TkWinSetForegroundWindow( + TkWindow *winPtr) { register WmInfo *wmPtr = winPtr->wmInfoPtr; @@ -7715,3 +8332,318 @@ TkWinSetForegroundWindow(winPtr) SetForegroundWindow(Tk_GetHWND(winPtr->window)); } } + +/* + *---------------------------------------------------------------------- + * + * TkpWinToplevelWithdraw -- + * + * This function is to be used by a window manage to withdraw a toplevel + * window. + * + * Results: + * none + * + * Side effects: + * May withdraw the toplevel window. + * + *---------------------------------------------------------------------- + */ + +void +TkpWinToplevelWithDraw( + TkWindow *winPtr) +{ + register WmInfo *wmPtr = winPtr->wmInfoPtr; + wmPtr->flags |= WM_WITHDRAWN; + TkpWmSetState(winPtr, WithdrawnState); +} + +/* + *---------------------------------------------------------------------- + * + * TkpWinToplevelIconify -- + * + * This function is to be used by a window manage to iconify a toplevel + * window. + * + * Results: + * none + * + * Side effects: + * May iconify the toplevel window. + * + *---------------------------------------------------------------------- + */ + +void +TkpWinToplevelIconify( + TkWindow *winPtr) +{ + TkpWmSetState(winPtr, IconicState); +} + +/* + *---------------------------------------------------------------------- + * + * TkpWinToplevelDeiconify -- + * + * This function is to be used by a window manage to deiconify a toplevel + * window. + * + * Results: + * none + * + * Side effects: + * May deiconify the toplevel window. + * + *---------------------------------------------------------------------- + */ + +void +TkpWinToplevelDeiconify( + TkWindow *winPtr) +{ + register WmInfo *wmPtr = winPtr->wmInfoPtr; + + wmPtr->flags &= ~WM_WITHDRAWN; + + /* + * If WM_UPDATE_PENDING is true, a pending UpdateGeometryInfo may need to + * be called first to update a withdrawn toplevel's geometry before it is + * deiconified by TkpWmSetState. Don't bother if we've never been mapped. + */ + + if ((wmPtr->flags & WM_UPDATE_PENDING) && + !(wmPtr->flags & WM_NEVER_MAPPED)) { + Tcl_CancelIdleCall(UpdateGeometryInfo, (ClientData) winPtr); + UpdateGeometryInfo((ClientData) winPtr); + } + + /* + * If we were in the ZoomState (maximized), 'wm deiconify' should not + * cause the window to shrink + */ + + if (wmPtr->hints.initial_state == ZoomState) { + TkpWmSetState(winPtr, ZoomState); + } else { + TkpWmSetState(winPtr, NormalState); + } + + /* + * An unmapped window will be mapped at idle time by a call to MapFrame. + * That calls CreateWrapper which sets the focus and raises the window. + */ + + if (wmPtr->flags & WM_NEVER_MAPPED) { + return; + } + + /* + * Follow Windows-like style here, raising the window to the top. + */ + + TkWmRestackToplevel(winPtr, Above, NULL); + if (!(Tk_Attributes((Tk_Window) winPtr)->override_redirect)) { + TkSetFocusWin(winPtr, 1); + } +} + +/* + *---------------------------------------------------------------------- + * + * TkpWinGeometryIsControlledByWm -- + * + * This function is to be used by a window manage to see if wm has + * canceled geometry control. + * + * Results: + * 0 - if the window manager has canceled its control + * 1 - if the window manager controls the geometry + * + * Side effects: + * None. + * + *---------------------------------------------------------------------- + */ + +long +TkpWinToplevelIsControlledByWm( + TkWindow *winPtr) +{ + register WmInfo *wmPtr = winPtr->wmInfoPtr; + + if (wmPtr) { + return ((wmPtr->width != -1) && (wmPtr->height != -1))? 1:0; + } else { + return 0; + } +} + +/* + *---------------------------------------------------------------------- + * + * TkpWinToplevelMove -- + * + * This function is to be used by a container to move an embedded window. + * + * Results: + * position of the upper left frame in a 32-bit long: + * 16-MSBits - x; 16-LSBits - y + * + * Side effects: + * May move the embedded window. + * + *---------------------------------------------------------------------- + */ + +long +TkpWinToplevelMove( + TkWindow *winPtr, + int x, int y) +{ + register WmInfo *wmPtr = winPtr->wmInfoPtr; + + if (wmPtr && x >= 0 && y >= 0 && !TkpWinToplevelIsControlledByWm(winPtr)) { + Tk_MoveToplevelWindow((Tk_Window)winPtr, x, y); + } + return ((winPtr->changes.x << 16) & 0xffff0000) + | (winPtr->changes.y & 0xffff); +} + +/* + *---------------------------------------------------------------------- + * + * TkpWinToplevelOverrideRedirect -- + * + * This function is to be used by a container to overrideredirect the + * contaner's frame window. + * + * Results: + * The current overrideredirect value + * + * Side effects: + * May change the overrideredirect value of the container window + * + *---------------------------------------------------------------------- + */ + +long +TkpWinToplevelOverrideRedirect( + TkWindow *winPtr, + int reqValue) +{ + int curValue; + register WmInfo *wmPtr = winPtr->wmInfoPtr; + + curValue = Tk_Attributes((Tk_Window) winPtr)->override_redirect; + if(reqValue < 0) return curValue; + + if (curValue != reqValue) { + XSetWindowAttributes atts; + + /* + * Only do this if we are really changing value, because it causes + * some funky stuff to occur + */ + + atts.override_redirect = reqValue ? True : False; + Tk_ChangeWindowAttributes((Tk_Window) winPtr, CWOverrideRedirect, + &atts); + if (!(wmPtr->flags & (WM_NEVER_MAPPED)) + && !(winPtr->flags & TK_EMBEDDED)) { + UpdateWrapper(winPtr); + } + } + return reqValue; +} + +/* + *---------------------------------------------------------------------- + * + * TkpWinToplevelDetachWindow -- + * + * This function is to be usd for changing a toplevel's wrapper or + * container. + * + * Results: + * The window's wrapper/container is removed. + * + * Side effects: + * None. + * + *---------------------------------------------------------------------- + */ + +void +TkpWinToplevelDetachWindow( + TkWindow *winPtr) +{ + register WmInfo *wmPtr = winPtr->wmInfoPtr; + + if (winPtr->flags & TK_EMBEDDED) { + int state = SendMessage(wmPtr->wrapper, TK_STATE, -1, -1) - 1; + + SendMessage(wmPtr->wrapper, TK_SETMENU, 0, 0); + SendMessage(wmPtr->wrapper, TK_DETACHWINDOW, 0, 0); + winPtr->flags &= ~TK_EMBEDDED; + winPtr->privatePtr = NULL; + wmPtr->wrapper = None; + if (state >= 0 && state <= 3) { + wmPtr->hints.initial_state = state; + } + } + if (winPtr->flags & TK_TOP_LEVEL) { + TkpWinToplevelOverrideRedirect(winPtr, 1); + } +} + +/* + *---------------------------------------------------------------------- + * + * RemapWindows + * + * Adjust parent/child relation ships of + * the given window hierarchy. + * + * Results: + * none + * + * Side effects: + * keeps windowing system happy + * + *---------------------------------------------------------------------- + */ + +static void +RemapWindows(winPtr, parentHWND) + TkWindow *winPtr; + HWND parentHWND; +{ + TkWindow *childPtr; + const char *className = Tk_Class(winPtr); + + /* Skip Menus as they are handled differently */ + if (className != NULL && strcmp(className, "Menu") == 0) { + return; + } + if (winPtr->window) { + SetParent(Tk_GetHWND(winPtr->window), parentHWND); + } + + /* Repeat for all the children */ + for (childPtr = winPtr->childList; childPtr != NULL; + childPtr = childPtr->nextPtr) { + RemapWindows(childPtr, + winPtr->window ? Tk_GetHWND(winPtr->window) : NULL); + } +} + +/* + * Local Variables: + * mode: c + * c-basic-offset: 4 + * fill-column: 78 + * End: + */ |