summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authormdejong <mdejong>2002-08-08 23:45:01 (GMT)
committermdejong <mdejong>2002-08-08 23:45:01 (GMT)
commit00a9090dae24f29b7c6f950ce0ee494c89261256 (patch)
tree0349046d5679ea073feae010b6ee97d347737d10 /unix
parente6119ff8e2695b362e38523181634e8ad31537d3 (diff)
downloadtk-00a9090dae24f29b7c6f950ce0ee494c89261256.zip
tk-00a9090dae24f29b7c6f950ce0ee494c89261256.tar.gz
tk-00a9090dae24f29b7c6f950ce0ee494c89261256.tar.bz2
* tests/wm.test: Add deleteWindows at start of
new transient tests so they do not fail if the toplevels already exist. * unix/tkUnixWm.c: Revert patch for Tk Bug #592201 which incorrectly removed numTransients member.
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixWm.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 227103b..ee920b9 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixWm.c,v 1.31 2002/08/08 22:32:11 jenglish Exp $
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.32 2002/08/08 23:45:01 mdejong Exp $
*/
#include "tkPort.h"
@@ -197,6 +197,7 @@ typedef struct TkWmInfo {
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 */
struct TkWmInfo *nextPtr; /* Next in list of all top-level windows. */
} WmInfo;
@@ -527,6 +528,7 @@ TkWmNewWindow(winPtr)
wmPtr->winPtr = winPtr;
wmPtr->reparent = None;
wmPtr->masterPtr = NULL;
+ wmPtr->numTransients = 0;
wmPtr->hints.flags = InputHint | StateHint;
wmPtr->hints.input = True;
wmPtr->hints.initial_state = NormalState;
@@ -855,6 +857,7 @@ TkWmDeadWindow(winPtr)
for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
wmPtr2 = wmPtr2->nextPtr) {
if (wmPtr2->masterPtr == winPtr) {
+ wmPtr->numTransients--;
Tk_DeleteEventHandler((Tk_Window) wmPtr2->masterPtr,
StructureNotifyMask,
WmWaitMapProc, (ClientData) wmPtr2->winPtr);
@@ -868,12 +871,18 @@ TkWmDeadWindow(winPtr)
}
}
}
+ if (wmPtr->numTransients != 0)
+ panic("numTransients should be 0");
if (wmPtr->masterPtr != NULL) {
wmPtr2 = wmPtr->masterPtr->wmInfoPtr;
/*
- * If we had a master, remove old map/unmap binding
+ * If we had a master, tell them that we aren't tied
+ * to them anymore
*/
+ if (wmPtr2 != NULL) {
+ wmPtr2->numTransients--;
+ }
Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
StructureNotifyMask,
WmWaitMapProc, (ClientData) winPtr);
@@ -2990,8 +2999,11 @@ WmTransientCmd(tkwin, winPtr, interp, objc, objv)
if (Tcl_GetString(objv[3])[0] == '\0') {
if (masterPtr != NULL) {
/*
- * If we had a master, remove old map/unmap binding
+ * If we had a master, tell them that we aren't tied
+ * to them anymore
*/
+
+ masterPtr->wmInfoPtr->numTransients--;
Tk_DeleteEventHandler((Tk_Window) masterPtr,
StructureNotifyMask,
WmWaitMapProc, (ClientData) winPtr);
@@ -3051,7 +3063,9 @@ WmTransientCmd(tkwin, winPtr, interp, objc, objv)
* transient states reflect the state of the master.
*/
- if (wmPtr->masterPtr != NULL) {
+ if (wmPtr->masterPtr == NULL) {
+ masterPtr->wmInfoPtr->numTransients++;
+ } else {
Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
StructureNotifyMask,
WmWaitMapProc, (ClientData) winPtr);