* changes: Add note about new transient behavior.

	* tests/unixWm.test: Check that the WM_TRANSIENT_FOR
	property for a transient window is being cleared
	when the master is destroyed.
	* tests/wm.test: Source defs.tcl instead of using
	tcltest to match the rest of Tk's test files.
	Add new tests that ensure that a transient's state
	mirrors the state of the master.
	* unix/tkUnixWm.c (WmInfo, TkWmNewWindow, TkWmMapWindow,
	TkWmDeadWindow, Tk_WmCmd, WmWaitMapProc): Add numTransients
	member to WmInfo structure. Keep state of master and
	transient in sync using a callback that tracks MapNotify
	and UnmapNotify events. When the master is mapped, map
	the transient. When the master is unmapped or iconified,
	withdraw the transient.
	* win/tkWinWm.c (TkWmMapWindow, TkpWmSetState,
	TkWmDeadWindow, Tk_WmCmd, WmWaitVisibilityOrMapProc):
	Keep state of master and transient in sync using a
	callback that tracks MapNotify and UnmapNotify events.
	Move masterPtr check from TkpWmSetState into TkWmMapWindow
	to deal with WM_NEVER_MAPPED transients. Cleanup
	numTransients and the callback in TkWmDeadWindow.
	Cleanup numTransients and the callback only after
	deleting a master in wm transient command to avoid
	deleting the callback when an error is raised.
	Add support for MapNotify and UnmapNotify events
	to the master callback.

2 files changed, 143 insertions, 5 deletions

diff --git a/tests/unixWm.test b/tests/unixWm.test
index ae675a4..f22ab67 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixWm.test,v 1.15 2002/05/24 09:50:11 mdejong Exp $
+# RCS: @(#) $Id: unixWm.test,v 1.16 2002/06/12 19:02:49 mdejong Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -1279,7 +1279,18 @@ test unixWm-37.3 {Tk_WmCmd procedure, "transient" option} {unixOnly} {
     destroy .t2
     set result
 } {{} {} .t 0 {} 0x0}
-test unixWm-37.4 {Tk_WmCmd procedure, "transient" option, create master wrapper} {unixOnly} {
+test unixWm-37.4 {TkWmDeadWindow, destroy on master should clear transient} {unixOnly} {
+    catch {destroy .t2}
+    toplevel .t2
+    catch {destroy .t3}
+    toplevel .t3
+    wm transient .t2 .t3
+    update
+    destroy .t3
+    update
+    list [wm transient .t2] [testprop [testwrapper .t2] WM_TRANSIENT_FOR]
+} {{} 0x0}
+test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create master wrapper} {unixOnly} {
     catch {destroy .t2}
     catch {destroy .t3}
     toplevel .t2 -width 120 -height 300
diff --git a/tests/wm.test b/tests/wm.test
index 14cce6b..f6df2ab 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -7,15 +7,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: wm.test,v 1.8 2002/05/27 22:54:42 mdejong Exp $
+# RCS: @(#) $Id: wm.test,v 1.9 2002/06/12 19:02:49 mdejong Exp $
 
 # This file tests window manager interactions that work across
 # platforms. Window manager tests that only work on a specific
 # platform should be placed in unixWm.test or winWm.test.
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
-    package require tcltest
-    namespace import -force ::tcltest::*
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
 proc deleteWindows {} {
@@ -381,6 +380,134 @@ test wm-transient-2.2 { first toplevel parent of
     wm transient .subject
 } {.master}
 
+test wm-transient-3.1 { transient toplevel is withdrawn
+        when mapped if master is withdrawn } {
+    deleteWindows
+    toplevel .master
+    wm withdraw .master
+    update
+    toplevel .subject
+    wm transient .subject .master
+    update
+    list [wm state .subject] [winfo ismapped .subject]
+} {withdrawn 0}
+
+test wm-transient-3.2 { already mapped transient toplevel
+        takes on withdrawn state of master } {
+    deleteWindows
+    toplevel .master
+    wm withdraw .master
+    update
+    toplevel .subject
+    update
+    wm transient .subject .master
+    update
+    list [wm state .subject] [winfo ismapped .subject]
+} {withdrawn 0}
+
+test wm-transient-3.3 { withdraw/deiconify on the master
+        also does a withdraw/deiconify on the transient } {
+    deleteWindows
+    set results [list]
+    toplevel .master
+    toplevel .subject
+    update
+    wm transient .subject .master
+    wm withdraw .master
+    update
+    lappend results [wm state .subject] \
+        [winfo ismapped .subject]
+    wm deiconify .master
+    update
+    lappend results [wm state .subject] \
+        [winfo ismapped .subject]
+    set results
+} {withdrawn 0 normal 1}
+
+test wm-transient-4.1 { transient toplevel is withdrawn
+        when mapped if master is iconic } {
+    deleteWindows
+    toplevel .master
+    wm iconify .master
+    update
+    toplevel .subject
+    wm transient .subject .master
+    update
+    list [wm state .subject] [winfo ismapped .subject]
+} {withdrawn 0}
+
+test wm-transient-4.2 { already mapped transient toplevel
+        is withdrawn if master is iconic } {
+    deleteWindows
+    toplevel .master
+    wm iconify .master
+    update
+    toplevel .subject
+    update
+    wm transient .subject .master
+    update
+    list [wm state .subject] [winfo ismapped .subject]
+} {withdrawn 0}
+
+test wm-transient-4.3 { iconify/deiconify on the master
+        does a withdraw/deiconify on the transient } {
+    deleteWindows
+    set results [list]
+    toplevel .master
+    toplevel .subject
+    update
+    wm transient .subject .master
+    wm iconify .master
+    update
+    lappend results [wm state .subject] \
+        [winfo ismapped .subject]
+    wm deiconify .master
+    update
+    lappend results [wm state .subject] \
+        [winfo ismapped .subject]
+    set results
+} {withdrawn 0 normal 1}
+
+test wm-transient-5.1 { an error during transient command should not
+        cause the map/unmap binding to be deleted } {
+    deleteWindows
+    set results [list]
+    toplevel .master
+    toplevel .subject
+    update
+    wm transient .subject .master
+    # Expect a bad window path error here
+    lappend results [catch {wm transient .subject .bad}]
+    wm withdraw .master
+    update
+    lappend results [wm state .subject]
+    wm deiconify .master
+    update
+    lappend results [wm state .subject]
+    set results
+} {1 withdrawn normal}
+
+test wm-transient-5.2 { remove transient property when master
+        is destroyed } {
+    deleteWindows
+    toplevel .master
+    toplevel .subject
+    wm transient .subject .master
+    update
+    destroy .master
+    update
+    wm transient .subject
+} {}
+
+test wm-transient-5.3 { remove transient property from window
+        that had never been mapped when master is destroyed } {
+    deleteWindows
+    toplevel .master
+    toplevel .subject
+    wm transient .subject .master
+    destroy .master
+    wm transient .subject
+} {}
 
 
 test wm-state-1.1 {usage} {