aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ. Scott Berg2020-10-17 20:30:56 +0300
committerEli Zaretskii2020-10-17 20:30:56 +0300
commit2c0cd900837e06a78402c05addf41838bd34b783 (patch)
tree2c7d99dc0f57bf0e453ddee95006870a606fe0d6 /src
parent7dd52bfd8e503316b4aa9c5767850d3985626b26 (diff)
downloademacs-2c0cd900837e06a78402c05addf41838bd34b783.tar.gz
emacs-2c0cd900837e06a78402c05addf41838bd34b783.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c13
1 files changed, 7 insertions, 6 deletions
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,
8949#endif 8949#endif
8950#ifdef USE_GTK 8950#ifdef USE_GTK
8951 if (!f 8951 if (!f
8952 && (f = any) 8952 && (f = any)
8953 && configureEvent.xconfigure.window == FRAME_X_WINDOW (f)) 8953 && configureEvent.xconfigure.window == FRAME_X_WINDOW (f)
8954 && FRAME_VISIBLE_P(f))
8954 { 8955 {
8955 block_input (); 8956 block_input ();
8956 if (FRAME_X_DOUBLE_BUFFERED_P (f)) 8957 if (FRAME_X_DOUBLE_BUFFERED_P (f))
@@ -8963,10 +8964,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
8963 configureEvent.xconfigure.height); 8964 configureEvent.xconfigure.height);
8964#endif 8965#endif
8965 f = 0; 8966 f = 0;
8966 } 8967 }
8967#endif 8968#endif
8968 if (f) 8969 if (f && FRAME_VISIBLE_P(f))
8969 { 8970 {
8970#ifdef USE_GTK 8971#ifdef USE_GTK
8971 /* For GTK+ don't call x_net_wm_state for the scroll bar 8972 /* For GTK+ don't call x_net_wm_state for the scroll bar
8972 window. (Bug#24963, Bug#25887) */ 8973 window. (Bug#24963, Bug#25887) */
@@ -9056,7 +9057,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
9056 xic_set_statusarea (f); 9057 xic_set_statusarea (f);
9057#endif 9058#endif
9058 9059
9059 } 9060 }
9060 goto OTHER; 9061 goto OTHER;
9061 9062
9062 case ButtonRelease: 9063 case ButtonRelease: