Mercurial > emacs
comparison src/xfns.c @ 25153:fc8435c2ae0e
(x_set_internal_border_width):
Call do_pending_window_change. Don't block input, don't call XFlush.
(x_set_vertical_scroll_bars): Call do_pending_window_change.
(x_set_scroll_bar_width, x_set_font): Likewise.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 02 Aug 1999 00:10:19 +0000 |
parents | ba6bf065b287 |
children | 8ab4da818dc0 |
comparison
equal
deleted
inserted
replaced
25152:1e90b09cc90e | 25153:fc8435c2ae0e |
---|---|
1751 recompute_basic_faces (f); | 1751 recompute_basic_faces (f); |
1752 } | 1752 } |
1753 else | 1753 else |
1754 abort (); | 1754 abort (); |
1755 | 1755 |
1756 do_pending_window_change (); | |
1757 | |
1756 /* Don't call `face-set-after-frame-default' when faces haven't been | 1758 /* Don't call `face-set-after-frame-default' when faces haven't been |
1757 initialized yet. This is the case when called from | 1759 initialized yet. This is the case when called from |
1758 Fx_create_frame. In that case, the X widget or window doesn't | 1760 Fx_create_frame. In that case, the X widget or window doesn't |
1759 exist either, and we can end up in x_report_frame_params with a | 1761 exist either, and we can end up in x_report_frame_params with a |
1760 null widget which gives a segfault. */ | 1762 null widget which gives a segfault. */ |
1801 if (f->output_data.x->internal_border_width == old) | 1803 if (f->output_data.x->internal_border_width == old) |
1802 return; | 1804 return; |
1803 | 1805 |
1804 if (FRAME_X_WINDOW (f) != 0) | 1806 if (FRAME_X_WINDOW (f) != 0) |
1805 { | 1807 { |
1806 BLOCK_INPUT; | |
1807 x_set_window_size (f, 0, f->width, f->height); | 1808 x_set_window_size (f, 0, f->width, f->height); |
1808 #if 0 | |
1809 x_set_resize_hint (f); | |
1810 #endif | |
1811 XFlush (FRAME_X_DISPLAY (f)); | |
1812 UNBLOCK_INPUT; | |
1813 SET_FRAME_GARBAGED (f); | 1809 SET_FRAME_GARBAGED (f); |
1810 do_pending_window_change (); | |
1814 } | 1811 } |
1815 } | 1812 } |
1816 | 1813 |
1817 void | 1814 void |
1818 x_set_visibility (f, value, oldval) | 1815 x_set_visibility (f, value, oldval) |
2226 frame, so we can get the geometry right from the start. | 2223 frame, so we can get the geometry right from the start. |
2227 However, if the window hasn't been created yet, we shouldn't | 2224 However, if the window hasn't been created yet, we shouldn't |
2228 call x_set_window_size. */ | 2225 call x_set_window_size. */ |
2229 if (FRAME_X_WINDOW (f)) | 2226 if (FRAME_X_WINDOW (f)) |
2230 x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f)); | 2227 x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f)); |
2228 do_pending_window_change (); | |
2231 } | 2229 } |
2232 } | 2230 } |
2233 | 2231 |
2234 void | 2232 void |
2235 x_set_scroll_bar_width (f, arg, oldval) | 2233 x_set_scroll_bar_width (f, arg, oldval) |
2255 FRAME_SCROLL_BAR_PIXEL_WIDTH (f) = 0; | 2253 FRAME_SCROLL_BAR_PIXEL_WIDTH (f) = 0; |
2256 #endif | 2254 #endif |
2257 | 2255 |
2258 if (FRAME_X_WINDOW (f)) | 2256 if (FRAME_X_WINDOW (f)) |
2259 x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f)); | 2257 x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f)); |
2258 do_pending_window_change (); | |
2260 } | 2259 } |
2261 else if (INTEGERP (arg) && XINT (arg) > 0 | 2260 else if (INTEGERP (arg) && XINT (arg) > 0 |
2262 && XFASTINT (arg) != FRAME_SCROLL_BAR_PIXEL_WIDTH (f)) | 2261 && XFASTINT (arg) != FRAME_SCROLL_BAR_PIXEL_WIDTH (f)) |
2263 { | 2262 { |
2264 if (XFASTINT (arg) <= 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM) | 2263 if (XFASTINT (arg) <= 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM) |