Some more tinkering with Bug#16051.

* window.c (resize_frame_windows): Don't let the size of the
root window drop below the frame's default character size.
Never ever delete any subwindows - let the window manager do the
clipping.

* w32fns.c (x_set_tool_bar_lines): Rewrite calculation of number
of toolbar lines needed when they exceed the height of the root
window.
(unwind_create_frame_1): New function.
(Fx_create_frame): Generally inhibit calling the window
configuration change hook here.  Remove extra call to
change_frame_size - it's not needed when we don't run the
configuration change hook.

1 files changed, 24 insertions, 19 deletions

diff --git a/src/window.c b/src/window.c
index 9939ec1d8fc..9bc95224f7c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4040,31 +4040,34 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
   int old_pixel_size = horflag ? r->pixel_width : r->pixel_height;
   /* new_size is the new size of the frame's root window.  */
   int new_size, new_pixel_size;
+  int unit = horflag ? FRAME_COLUMN_WIDTH (f) : FRAME_LINE_HEIGHT (f);
 
+  /* Don't let the size drop below one unit.  This is more comforting
+     when we are called from x_set_tool_bar_lines since the latter may
+     have implicitly given us a zero or negative height.  */
   if (pixelwise)
     {
-      new_pixel_size
-        = (horflag
-           ? size
-           : (size
-              - FRAME_TOP_MARGIN_HEIGHT (f)
-              - ((FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f))
-                 ? FRAME_LINE_HEIGHT (f) : 0)));
-      new_size = new_pixel_size / (horflag
-                                   ? FRAME_COLUMN_WIDTH (f)
-                                   : FRAME_LINE_HEIGHT (f));
+      new_pixel_size = max (horflag
+                            ? size
+                            : (size
+                               - FRAME_TOP_MARGIN_HEIGHT (f)
+                               - ((FRAME_HAS_MINIBUF_P (f)
+                                   && !FRAME_MINIBUF_ONLY_P (f))
+                                  ? FRAME_LINE_HEIGHT (f) : 0)),
+                            unit);
+      new_size = new_pixel_size / unit;
     }
   else
     {
-      new_size= (horflag
-                 ? size
-                 : (size
-                    - FRAME_TOP_MARGIN (f)
-                    - ((FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f))
-                       ? 1 : 0)));
-      new_pixel_size = new_size * (horflag
-                                   ? FRAME_COLUMN_WIDTH (f)
-                                   : FRAME_LINE_HEIGHT (f));
+      new_size = max (horflag
+                      ? size
+                      : (size
+                         - FRAME_TOP_MARGIN (f)
+                         - ((FRAME_HAS_MINIBUF_P (f)
+                             && !FRAME_MINIBUF_ONLY_P (f))
+                            ? 1 : 0)),
+                      1);
+      new_pixel_size = new_size * unit;
     }
 
   r->top_line = FRAME_TOP_MARGIN (f);
@@ -4124,6 +4127,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
                   window_resize_apply (r, horflag);
                   window_pixel_to_total (r->frame, horflag ? Qt : Qnil);
                 }
+#if 0 /* Let's try without killing other windows.  */
               else
                 {
                   /* We lost.  Delete all windows but the frame's
@@ -4141,6 +4145,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
                       XWINDOW (root)->pixel_height = new_pixel_size;
                     }
                 }
+#endif /* 0 */
             }
         }
     }