aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2020-12-21 19:27:02 +0200
committerEli Zaretskii2020-12-21 19:27:02 +0200
commite352abeac16725c226c1246e3c83f71b8d3fa689 (patch)
tree19da41e2a30b423f35b1c9b86fe87982745e4784
parent2d19dbdd522feec8dde5c3339357b32f040a29dd (diff)
downloademacs-e352abeac16725c226c1246e3c83f71b8d3fa689.tar.gz
emacs-e352abeac16725c226c1246e3c83f71b8d3fa689.zip
Fix frame creation on X when tool bar is disabled
* 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)
-rw-r--r--src/xterm.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 3de0d2e73c0..7f8728e47c4 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8947,7 +8947,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
8947 if (!f 8947 if (!f
8948 && (f = any) 8948 && (f = any)
8949 && configureEvent.xconfigure.window == FRAME_X_WINDOW (f) 8949 && configureEvent.xconfigure.window == FRAME_X_WINDOW (f)
8950 && FRAME_VISIBLE_P(f)) 8950 && (FRAME_VISIBLE_P(f)
8951 || !(configureEvent.xconfigure.width <= 1
8952 && configureEvent.xconfigure.height <= 1)))
8951 { 8953 {
8952 block_input (); 8954 block_input ();
8953 if (FRAME_X_DOUBLE_BUFFERED_P (f)) 8955 if (FRAME_X_DOUBLE_BUFFERED_P (f))
@@ -8962,7 +8964,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
8962 f = 0; 8964 f = 0;
8963 } 8965 }
8964#endif 8966#endif
8965 if (f && FRAME_VISIBLE_P(f)) 8967 if (f
8968 && (FRAME_VISIBLE_P(f)
8969 || !(configureEvent.xconfigure.width <= 1
8970 && configureEvent.xconfigure.height <= 1)))
8966 { 8971 {
8967#ifdef USE_GTK 8972#ifdef USE_GTK
8968 /* For GTK+ don't call x_net_wm_state for the scroll bar 8973 /* For GTK+ don't call x_net_wm_state for the scroll bar