コミット: 9dfc3ce68fc30bcaa9846cb53402193f925449c9 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

コミットメタ情報

• リビジョン: 9dfc3ce68fc30bcaa9846cb53402193f925449c9 (tree)
• 日時: 2001-02-20 10:32:13
• 作者: John Harper <jsh@src....>
• コミッター: John Harper

ログメッセージ

only do the reparenting if the window hasn't been destroyed

* windows.c (install_window_frame, remove_window_frame): only
do the reparenting if the window hasn't been destroyed

* stacking-list.c (restack_window): just return immediately if
the window has already been destroyed

変更サマリ

• modified: src/ChangeLog
• modified: src/stacking-list.c
• modified: src/windows.c

差分

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,12 @@
 
 	* version 0.37.3
 
+	* windows.c (install_window_frame, remove_window_frame): only
+	do the reparenting if the window hasn't been destroyed
+
+	* stacking-list.c (restack_window): just return immediately if
+	the window has already been destroyed
+
 	* stacking-list.c (window_in_stacking_list_p): new predicate,
 	used to replace the assert_window_[not_]in_stacking_list
 	functions (which have been deleted)

--- a/src/stacking-list.c
+++ b/src/stacking-list.c
@@ -178,27 +178,29 @@ stackable_window_id (Lisp_Window *w)
 void
 restack_window (Lisp_Window *w)
 {
-    XWindowChanges wc;
-    u_int mask = 0;
-
-    assert (!WINDOW_IS_GONE_P (w));
-    assert (window_in_stacking_list_p (w));
-
-    if (w->above != 0)
-    {
-	wc.stack_mode = Below;
-	wc.sibling = stackable_window_id (w->above);
-	mask = CWStackMode | CWSibling;
-    }
-    else if (w->below != 0)
+    if (!WINDOW_IS_GONE_P (w))
     {
-	wc.stack_mode = Above;
-	wc.sibling = stackable_window_id (w->below);
-	mask = CWStackMode | CWSibling;
+	XWindowChanges wc;
+	u_int mask = 0;
+
+	assert (window_in_stacking_list_p (w));
+
+	if (w->above != 0)
+	{
+	    wc.stack_mode = Below;
+	    wc.sibling = stackable_window_id (w->above);
+	    mask = CWStackMode | CWSibling;
+	}
+	else if (w->below != 0)
+	{
+	    wc.stack_mode = Above;
+	    wc.sibling = stackable_window_id (w->below);
+	    mask = CWStackMode | CWSibling;
+	}
+
+	if (mask != 0)
+	    XConfigureWindow (dpy, stackable_window_id (w), mask, &wc);
     }
-
-    if (mask != 0)
-	XConfigureWindow (dpy, stackable_window_id (w), mask, &wc);
 }
 
 

--- a/src/windows.c
+++ b/src/windows.c
@@ -245,7 +245,7 @@ void
 install_window_frame (Lisp_Window *w)
 {
     DB(("install_window_frame (%s)\n", rep_STR(w->name)));
-    if (!w->reparented && w->frame != 0)
+    if (!w->reparented && w->frame != 0 && !WINDOW_IS_GONE_P (w))
     {
 	XSelectInput (dpy, w->frame, FRAME_EVENTS);
 
@@ -269,7 +269,7 @@ void
 remove_window_frame (Lisp_Window *w)
 {
     DB(("remove_window_frame (%s)\n", rep_STR(w->name)));
-    if (w->reparented)
+    if (w->reparented && !WINDOW_IS_GONE_P (w))
     {
 	/* reparent the subwindow back to the root window */