emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 2c0cd90: Fix bad dimensions of initial frame on VcXsrv


From: Eli Zaretskii
Subject: master 2c0cd90: Fix bad dimensions of initial frame on VcXsrv
Date: Sat, 17 Oct 2020 13:32:05 -0400 (EDT)

branch: master
commit 2c0cd900837e06a78402c05addf41838bd34b783
Author: J. Scott Berg <jsberg-bnl@outlook.com>
Commit: Eli Zaretskii <eliz@gnu.org>

    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
---
 src/xterm.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index 2e0407a..98bb0ea 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:



reply via email to

[Prev in Thread] Current Thread [Next in Thread]