aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2015-08-31 11:09:22 +0200
committerMartin Rudalics2015-08-31 11:09:22 +0200
commit8af8355c3f72500986f6f10b62714b228d6f35ee (patch)
tree28e9c0569c376a89d56a36c2d32b0c8bddca9b4c /src
parent6cd2629bd1b3ce77d29ac28e29237c94a4197116 (diff)
downloademacs-8af8355c3f72500986f6f10b62714b228d6f35ee.tar.gz
emacs-8af8355c3f72500986f6f10b62714b228d6f35ee.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.137
-rw-r--r--src/gtkutil.c2
-rw-r--r--src/w32term.c2
-rw-r--r--src/xterm.c2
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 @@
5245 (xg_set_toolkit_horizontal_scroll_bar_thumb) 5245 (xg_set_toolkit_horizontal_scroll_bar_thumb)
5246 (xg_get_default_scrollbar_height) 5246 (xg_get_default_scrollbar_height)
5247 (xg_clear_under_internal_border): Extern. 5247 (xg_clear_under_internal_border): Extern.
5248 * gtkutil.c (xg_frame_resized): Don't call 5248 * gtkutil.c (xg_frame_resized): Call do_pending_window_change.
5249 do_pending_window_change.
5250 (xg_frame_set_char_size): Use adjust_frame_size. 5249 (xg_frame_set_char_size): Use adjust_frame_size.
5251 (style_changed_cb): Call update_theme_scrollbar_height and 5250 (style_changed_cb): Call update_theme_scrollbar_height and
5252 x_set_scroll_bar_default_height. 5251 x_set_scroll_bar_default_height.
@@ -5367,7 +5366,7 @@
5367 build without toolkit. Always clear under internal border. 5366 build without toolkit. Always clear under internal border.
5368 (x_set_window_size): Don't check frame size or recompute 5367 (x_set_window_size): Don't check frame size or recompute
5369 fringes. Reset fullscreen status before applying sizes. 5368 fringes. Reset fullscreen status before applying sizes.
5370 Always resize as requested by pixelwise argument. Don't call 5369 Always resize as requested by pixelwise argument. Call
5371 do_pending_window_change. 5370 do_pending_window_change.
5372 (x_wm_set_size_hint): Add call for FRAME_SCROLL_BAR_AREA_HEIGHT. 5371 (x_wm_set_size_hint): Add call for FRAME_SCROLL_BAR_AREA_HEIGHT.
5373 (w32_initialize_display_info): Initialize dpyinfo's 5372 (w32_initialize_display_info): Initialize dpyinfo's
@@ -5519,7 +5518,7 @@
5519 Call x_net_wm_state. 5518 Call x_net_wm_state.
5520 (x_set_window_size_1, x_wm_set_size_hint): Don't call 5519 (x_set_window_size_1, x_wm_set_size_hint): Don't call
5521 check_frame_size. 5520 check_frame_size.
5522 (x_set_window_size): Don't call check_frame_size and 5521 (x_set_window_size): Don't call check_frame_size. Call
5523 do_pending_window_change. 5522 do_pending_window_change.
5524 (x_term_init): Init horizontal_scroll_bar_cursor display info. 5523 (x_term_init): Init horizontal_scroll_bar_cursor display info.
5525 (x_create_terminal): Add set_horizontal_scroll_bar_hook. 5524 (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)
920 change_frame_size (f, width, height, 0, 1, 0, 1); 920 change_frame_size (f, width, height, 0, 1, 0, 1);
921 SET_FRAME_GARBAGED (f); 921 SET_FRAME_GARBAGED (f);
922 cancel_mouse_face (f); 922 cancel_mouse_face (f);
923
924 do_pending_window_change (0);
925 } 923 }
926} 924}
927 925
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,
6202 } 6202 }
6203 6203
6204 unblock_input (); 6204 unblock_input ();
6205
6206 do_pending_window_change (0);
6207} 6205}
6208 6206
6209/* Mouse warping. */ 6207/* 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,
10515 cancel_mouse_face (f); 10515 cancel_mouse_face (f);
10516 10516
10517 unblock_input (); 10517 unblock_input ();
10518
10519 do_pending_window_change (false);
10520} 10518}
10521 10519
10522/* Move the mouse to position pixel PIX_X, PIX_Y relative to frame F. */ 10520/* Move the mouse to position pixel PIX_X, PIX_Y relative to frame F. */