]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix frame creation on X when tool bar is disabled
authorEli Zaretskii <eliz@gnu.org>
Mon, 21 Dec 2020 17:27:02 +0000 (19:27 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 21 Dec 2020 17:27:02 +0000 (19:27 +0200)
* src/xterm.c (handle_one_xevent): Restrict the fix for bug#44002
to situations when we are asked by the WM to create a window with
bogus 1x1 dimensions.  (Bug#44794)

src/xterm.c

index 3de0d2e73c0e0a812526790f953f1285412ad563..7f8728e47c446960700a1c6b1b60f3d5cd12f047 100644 (file)
@@ -8947,7 +8947,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
       if (!f
          && (f = any)
          && configureEvent.xconfigure.window == FRAME_X_WINDOW (f)
-         && FRAME_VISIBLE_P(f))
+         && (FRAME_VISIBLE_P(f)
+             || !(configureEvent.xconfigure.width <= 1
+                  && configureEvent.xconfigure.height <= 1)))
         {
           block_input ();
           if (FRAME_X_DOUBLE_BUFFERED_P (f))
@@ -8962,7 +8964,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
           f = 0;
        }
 #endif
-      if (f && FRAME_VISIBLE_P(f))
+      if (f
+         && (FRAME_VISIBLE_P(f)
+             || !(configureEvent.xconfigure.width <= 1
+                  && configureEvent.xconfigure.height <= 1)))
        {
 #ifdef USE_GTK
          /* For GTK+ don't call x_net_wm_state for the scroll bar