Commit: 2a39e44375124dffde9d899594a9cccabded8ceb - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Révision: 2a39e44375124dffde9d899594a9cccabded8ceb (tree)
• l'heure: 1999-08-10 00:08:29
• Auteur: john <john>
• Commiter: john

Message de Log

some magic to make the w->reparenting work when called from
Fset_window_frame

Change Summary

• modified: src/events.c
• modified: src/windows.c

Modification

--- a/src/events.c
+++ b/src/events.c
@@ -349,19 +349,22 @@ reparent_notify (XEvent *ev)
 {
     Lisp_Window *w = find_window_by_id (ev->xreparent.window);
     if (w != 0 && ev->xreparent.window == w->id)
-	w->reparenting = FALSE;
+	w->reparenting--;
 }
 
 static void
 map_notify (XEvent *ev)
 {
     Lisp_Window *w = find_window_by_id (ev->xmap.window);
-    if (w != 0 && ev->xmap.window == w->id && !w->reparenting)
+    if (w != 0 && ev->xmap.window == w->id)
     {
-	install_window_frame (w);
 	w->mapped = TRUE;
-	if (w->visible)
-	    XMapWindow (dpy, w->frame);
+	if (!w->reparenting)
+	{
+	    install_window_frame (w);
+	    if (w->visible)
+		XMapWindow (dpy, w->frame);
+	}
 	Fcall_window_hook (Qmap_notify_hook, rep_VAL(w), Qnil, Qnil);
     }
 }
@@ -370,15 +373,18 @@ static void
 unmap_notify (XEvent *ev)
 {
     Lisp_Window *w = find_window_by_id (ev->xunmap.window);
-    if (w != 0 && ev->xunmap.window == w->id && !w->reparenting)
+    if (w != 0 && ev->xunmap.window == w->id)
     {
-	w->mapped = FALSE;
-	if (w->visible)
-	    XUnmapWindow (dpy, w->frame);
-	/* Removing the frame reparents the client window back to
-	   the root. This means that we receive the next MapRequest
-	   for the window. */
-	remove_window_frame (w);
+	if (!w->reparenting)
+	{
+	    w->mapped = FALSE;
+	    if (w->visible)
+		XUnmapWindow (dpy, w->frame);
+	    /* Removing the frame reparents the client window back to
+	       the root. This means that we receive the next MapRequest
+	       for the window. */
+	    remove_window_frame (w);
+	}
 	Fcall_window_hook (Qunmap_notify_hook, rep_VAL(w), Qnil, Qnil);
     }
 }

--- a/src/windows.c
+++ b/src/windows.c
@@ -185,7 +185,7 @@ install_window_frame (Lisp_Window *w)
 
 	XReparentWindow (dpy, w->id, w->frame, -w->frame_x, -w->frame_y);
 	w->reparented = TRUE;
-	w->reparenting = TRUE;
+	w->reparenting++;
 	DB(("  reparented to %lx [%dx%d%+d%+d]\n",
 	    w->frame, w->frame_width, w->frame_height,
 	    w->frame_x, w->frame_y));
@@ -201,7 +201,7 @@ remove_window_frame (Lisp_Window *w)
 	/* reparent the subwindow back to the root window */
 	XReparentWindow (dpy, w->id, root_window, w->attr.x, w->attr.y);
 	w->reparented = FALSE;
-	w->reparenting = TRUE;
+	w->reparenting++;
     }
 }