From 8af8355c3f72500986f6f10b62714b228d6f35ee Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Mon, 31 Aug 2015 11:09:22 +0200 Subject: [PATCH] Don't call do_pending_window_change in signal handlers (Bug#21380) * src/gtkutil.c (xg_frame_resized): * src/xterm.c (x_set_window_size): * src/w32term.c (x_set_window_size): Don't call do_pending_window_change. --- src/ChangeLog.13 | 7 +++---- src/gtkutil.c | 2 -- src/w32term.c | 2 -- src/xterm.c | 2 -- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog.13 b/src/ChangeLog.13 index 196bd8e0d6d..ac2162830c4 100644 --- a/src/ChangeLog.13 +++ b/src/ChangeLog.13 @@ -5245,8 +5245,7 @@ (xg_set_toolkit_horizontal_scroll_bar_thumb) (xg_get_default_scrollbar_height) (xg_clear_under_internal_border): Extern. - * gtkutil.c (xg_frame_resized): Don't call - do_pending_window_change. + * gtkutil.c (xg_frame_resized): Call do_pending_window_change. (xg_frame_set_char_size): Use adjust_frame_size. (style_changed_cb): Call update_theme_scrollbar_height and x_set_scroll_bar_default_height. @@ -5367,7 +5366,7 @@ build without toolkit. Always clear under internal border. (x_set_window_size): Don't check frame size or recompute fringes. Reset fullscreen status before applying sizes. - Always resize as requested by pixelwise argument. Don't call + Always resize as requested by pixelwise argument. Call do_pending_window_change. (x_wm_set_size_hint): Add call for FRAME_SCROLL_BAR_AREA_HEIGHT. (w32_initialize_display_info): Initialize dpyinfo's @@ -5519,7 +5518,7 @@ Call x_net_wm_state. (x_set_window_size_1, x_wm_set_size_hint): Don't call check_frame_size. - (x_set_window_size): Don't call check_frame_size and + (x_set_window_size): Don't call check_frame_size. Call do_pending_window_change. (x_term_init): Init horizontal_scroll_bar_cursor display info. (x_create_terminal): Add set_horizontal_scroll_bar_hook. diff --git a/src/gtkutil.c b/src/gtkutil.c index 89647ee8d97..725e3306c82 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -920,8 +920,6 @@ xg_frame_resized (struct frame *f, int pixelwidth, int pixelheight) change_frame_size (f, width, height, 0, 1, 0, 1); SET_FRAME_GARBAGED (f); cancel_mouse_face (f); - - do_pending_window_change (0); } } diff --git a/src/w32term.c b/src/w32term.c index fbd31b15de2..82b05bffffe 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6202,8 +6202,6 @@ x_set_window_size (struct frame *f, bool change_gravity, } unblock_input (); - - do_pending_window_change (0); } /* Mouse warping. */ diff --git a/src/xterm.c b/src/xterm.c index 4eb777f9dc3..9ee76e967e1 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10515,8 +10515,6 @@ x_set_window_size (struct frame *f, bool change_gravity, cancel_mouse_face (f); unblock_input (); - - do_pending_window_change (false); } /* Move the mouse to position pixel PIX_X, PIX_Y relative to frame F. */ -- 2.39.2