From: J. Scott Berg <jsberg-bnl@outlook.com>
Date: Sat, 17 Oct 2020 17:30:56 +0000 (+0300)
Subject: Fix bad dimensions of initial frame on VcXsrv
X-Git-Tag: emacs-28.0.90~5570
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c0cd900837e06a78402c05addf41838bd34b783;p=emacs.git

Fix bad dimensions of initial frame on VcXsrv

* src/xterm.c (handle_one_xevent) [USE_GTK]: Don't obey
ConfigureNotify events if the frame is not visible.  (Bug#44002)

Copyright-paperwork-exempt: yes
---

diff --git a/src/xterm.c b/src/xterm.c
index 2e0407aff40..98bb0ea8917 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8949,8 +8949,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #endif
 #ifdef USE_GTK
       if (!f
-          && (f = any)
-          && configureEvent.xconfigure.window == FRAME_X_WINDOW (f))
+	  && (f = any)
+	  && configureEvent.xconfigure.window == FRAME_X_WINDOW (f)
+	  && FRAME_VISIBLE_P(f))
         {
           block_input ();
           if (FRAME_X_DOUBLE_BUFFERED_P (f))
@@ -8963,10 +8964,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 					    configureEvent.xconfigure.height);
 #endif
           f = 0;
-        }
+	}
 #endif
-      if (f)
-        {
+      if (f && FRAME_VISIBLE_P(f))
+	{
 #ifdef USE_GTK
 	  /* For GTK+ don't call x_net_wm_state for the scroll bar
 	     window.  (Bug#24963, Bug#25887) */
@@ -9056,7 +9057,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
             xic_set_statusarea (f);
 #endif
 
-        }
+	}
       goto OTHER;
 
     case ButtonRelease: