summaryrefslogtreecommitdiffstats
path: root/win/tkWinWindow.c
diff options
context:
space:
mode:
Diffstat (limited to 'win/tkWinWindow.c')
-rw-r--r--win/tkWinWindow.c192
1 files changed, 20 insertions, 172 deletions
diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c
index ade15bc..3dfc078 100644
--- a/win/tkWinWindow.c
+++ b/win/tkWinWindow.c
@@ -11,7 +11,6 @@
*/
#include "tkWinInt.h"
-#include "tkBusy.h"
typedef struct ThreadSpecificData {
int initialized; /* 0 means table below needs initializing. */
@@ -66,7 +65,7 @@ Tk_AttachHWND(
*/
if (twdPtr == NULL) {
- twdPtr = ckalloc(sizeof(TkWinDrawable));
+ twdPtr = (TkWinDrawable *) ckalloc(sizeof(TkWinDrawable));
twdPtr->type = TWD_WINDOW;
twdPtr->window.winPtr = (TkWindow *) tkwin;
} else if (twdPtr->window.handle != NULL) {
@@ -81,7 +80,7 @@ Tk_AttachHWND(
twdPtr->window.handle = hwnd;
entryPtr = Tcl_CreateHashEntry(&tsdPtr->windowTable, (char *)hwnd, &new);
- Tcl_SetHashValue(entryPtr, tkwin);
+ Tcl_SetHashValue(entryPtr, (ClientData)tkwin);
return (Window)twdPtr;
}
@@ -173,13 +172,12 @@ TkpPrintWindowId(
/*
* Use pointer representation, because Win64 is P64 (*not* LP64). Windows
* doesn't print the 0x for %p, so we do it.
- * Bug 2026405: cygwin does output 0x for %p so test and recover.
+ * bug #2026405: cygwin does output 0x for %p so test and recover.
*/
sprintf(buf, "0x%p", hwnd);
- if (buf[2] == '0' && buf[3] == 'x') {
+ if (buf[2] == '0' && buf[3] == 'x')
sprintf(buf, "%p", hwnd);
- }
}
/*
@@ -206,15 +204,12 @@ TkpPrintWindowId(
int
TkpScanWindowId(
Tcl_Interp *interp, /* Interpreter to use for error reporting. */
- const char *string, /* String containing a (possibly signed)
+ CONST char *string, /* String containing a (possibly signed)
* integer in a form acceptable to strtol. */
Window *idPtr) /* Place to store converted result. */
{
Tk_Window tkwin;
- union {
- HWND hwnd;
- int number;
- } win;
+ void *number, *numberPtr = &number;
/*
* We want sscanf for the 64-bit check, but if that doesn't work, then
@@ -223,13 +218,13 @@ TkpScanWindowId(
if (
#ifdef _WIN64
- (sscanf(string, "0x%p", &win.hwnd) != 1) &&
+ (sscanf(string, "0x%p", &number) != 1) &&
#endif
- Tcl_GetInt(interp, string, &win.number) != TCL_OK) {
+ Tcl_GetInt(interp, string, (int *) numberPtr) != TCL_OK) {
return TCL_ERROR;
}
- tkwin = Tk_HWNDToWindow(win.hwnd);
+ tkwin = Tk_HWNDToWindow((HWND) number);
if (tkwin) {
*idPtr = Tk_WindowId(tkwin);
} else {
@@ -328,7 +323,7 @@ XDestroyWindow(
Tcl_DeleteHashEntry(entryPtr);
}
- ckfree(twdPtr);
+ ckfree((char *)twdPtr);
/*
* Don't bother destroying the window if we are going to destroy the
@@ -799,174 +794,27 @@ TkWinSetWindowPos(
/*
*----------------------------------------------------------------------
*
- * TkpShowBusyWindow --
+ * TkpWindowWasRecentlyDeleted --
*
- * Makes a busy window "appear".
+ * Determines whether we know if the window given as argument was
+ * recently deleted. Called by the generic code error handler to handle
+ * BadWindow events.
*
* Results:
- * None.
+ * Always 0. We do not keep this information on Windows.
*
* Side effects:
- * Arranges for the busy window to start intercepting events and the
- * cursor to change to the configured "hey, I'm busy!" setting.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TkpShowBusyWindow(
- TkBusy busy)
-{
- Busy *busyPtr = (Busy *) busy;
- HWND hWnd;
- POINT point;
- Display *display;
- Window window;
-
- if (busyPtr->tkBusy != NULL) {
- Tk_MapWindow(busyPtr->tkBusy);
- window = Tk_WindowId(busyPtr->tkBusy);
- display = Tk_Display(busyPtr->tkBusy);
- hWnd = Tk_GetHWND(window);
- display->request++;
- SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
- }
-
- /*
- * Under Win32, cursors aren't associated with windows. Tk fakes this by
- * watching Motion events on its windows. So Tk will automatically change
- * the cursor when the pointer enters the Busy window. But Windows does
- * not immediately change the cursor; it waits for the cursor position to
- * change or a system call. We need to change the cursor before the
- * application starts processing, so set the cursor position redundantly
- * back to the current position.
- */
-
- GetCursorPos(&point);
- SetCursorPos(point.x, point.y);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TkpHideBusyWindow --
- *
- * Makes a busy window "disappear".
- *
- * Results:
* None.
*
- * Side effects:
- * Arranges for the busy window to stop intercepting events, and the
- * cursor to change back to its normal setting.
- *
*----------------------------------------------------------------------
*/
-void
-TkpHideBusyWindow(
- TkBusy busy)
-{
- Busy *busyPtr = (Busy *) busy;
- POINT point;
-
- if (busyPtr->tkBusy != NULL) {
- Tk_UnmapWindow(busyPtr->tkBusy);
- }
-
- /*
- * Under Win32, cursors aren't associated with windows. Tk fakes this by
- * watching Motion events on its windows. So Tk will automatically change
- * the cursor when the pointer enters the Busy window. But Windows does
- * not immediately change the cursor: it waits for the cursor position to
- * change or a system call. We need to change the cursor before the
- * application starts processing, so set the cursor position redundantly
- * back to the current position.
- */
-
- GetCursorPos(&point);
- SetCursorPos(point.x, point.y);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TkpMakeTransparentWindowExist --
- *
- * Construct the platform-specific resources for a transparent window.
- *
- * Results:
- * None.
- *
- * Side effects:
- * Moves the specified window in the stacking order.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TkpMakeTransparentWindowExist(
- Tk_Window tkwin, /* Token for window. */
- Window parent) /* Parent window. */
-{
- TkWindow *winPtr = (TkWindow *) tkwin;
- HWND hParent = (HWND) parent, hWnd;
- int style = WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
- DWORD exStyle = WS_EX_TRANSPARENT | WS_EX_TOPMOST;
-
- hWnd = CreateWindowEx(exStyle, TK_WIN_CHILD_CLASS_NAME, NULL, style,
- Tk_X(tkwin), Tk_Y(tkwin), Tk_Width(tkwin), Tk_Height(tkwin),
- hParent, NULL, Tk_GetHINSTANCE(), NULL);
- winPtr->window = Tk_AttachHWND(tkwin, hWnd);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TkpCreateBusy --
- *
- * Construct the platform-specific parts of a busy window. Note that this
- * postpones the actual creation of the window resource until later.
- *
- * Results:
- * None.
- *
- * Side effects:
- * Sets up part of the busy window structure.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TkpCreateBusy(
- Tk_FakeWin *winPtr,
- Tk_Window tkRef,
- Window *parentPtr,
- Tk_Window tkParent,
- TkBusy busy)
+int
+TkpWindowWasRecentlyDeleted(
+ Window win,
+ TkDisplay *dispPtr)
{
- Busy *busyPtr = (Busy *) busy;
-
- if (winPtr->flags & TK_REPARENTED) {
- /*
- * This works around a bug in the implementation of menubars for
- * non-Macintosh window systems (Win32 and X11). Tk doesn't reset the
- * pointers to the parent window when the menu is reparented
- * (winPtr->parentPtr points to the wrong window). We get around this
- * by determining the parent via the native API calls.
- */
-
- HWND hWnd = GetParent(Tk_GetHWND(Tk_WindowId(tkRef)));
- RECT rect;
-
- if (GetWindowRect(hWnd, &rect)) {
- busyPtr->width = rect.right - rect.left;
- busyPtr->height = rect.bottom - rect.top;
- }
- } else {
- *parentPtr = Tk_WindowId(tkParent);
- *parentPtr = (Window) Tk_GetHWND(*parentPtr);
- }
+ return 0;
}
/*
generated by cgit v0.12 at 2025-03-03 21:51:13 (GMT)