aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann1999-08-21 19:30:35 +0000
committerGerd Moellmann1999-08-21 19:30:35 +0000
commit2b6538062cc74db6e18f6dce36721b93d3d32924 (patch)
tree9eff08051a410f9e18106693f5d4aa52a1d7f86f /src
parent0788646cc2f1b65a6aabf8a2a9b0fa3488e0f560 (diff)
downloademacs-2b6538062cc74db6e18f6dce36721b93d3d32924.tar.gz
emacs-2b6538062cc74db6e18f6dce36721b93d3d32924.zip
Call change_frame_size and do_pending_window_change with
new parameter.
Diffstat (limited to 'src')
-rw-r--r--src/process.c6
-rw-r--r--src/widget.c6
-rw-r--r--src/window.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/process.c b/src/process.c
index b4eaa9ca28f..d3f54fd5e0a 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2581,7 +2581,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
2581 clear_waiting_for_input (); 2581 clear_waiting_for_input ();
2582 2582
2583 /* If we woke up due to SIGWINCH, actually change size now. */ 2583 /* If we woke up due to SIGWINCH, actually change size now. */
2584 do_pending_window_change (); 2584 do_pending_window_change (0);
2585 2585
2586 if (time_limit && nfds == 0 && ! timeout_reduced_for_timers) 2586 if (time_limit && nfds == 0 && ! timeout_reduced_for_timers)
2587 /* We wanted the full specified time, so return now. */ 2587 /* We wanted the full specified time, so return now. */
@@ -2705,7 +2705,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
2705 /* If checking input just got us a size-change event from X, 2705 /* If checking input just got us a size-change event from X,
2706 obey it now if we should. */ 2706 obey it now if we should. */
2707 if (XINT (read_kbd) || wait_for_cell) 2707 if (XINT (read_kbd) || wait_for_cell)
2708 do_pending_window_change (); 2708 do_pending_window_change (0);
2709 2709
2710 /* Check for data from a process. */ 2710 /* Check for data from a process. */
2711 /* Really FIRST_PROC_DESC should be 0 on Unix, 2711 /* Really FIRST_PROC_DESC should be 0 on Unix,
@@ -4881,7 +4881,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
4881 clear_waiting_for_input (); 4881 clear_waiting_for_input ();
4882 4882
4883 /* If we woke up due to SIGWINCH, actually change size now. */ 4883 /* If we woke up due to SIGWINCH, actually change size now. */
4884 do_pending_window_change (); 4884 do_pending_window_change (0);
4885 4885
4886 if (time_limit && nfds == 0 && ! timeout_reduced_for_timers) 4886 if (time_limit && nfds == 0 && ! timeout_reduced_for_timers)
4887 /* We waited the full specified time, so return now. */ 4887 /* We waited the full specified time, so return now. */
diff --git a/src/widget.c b/src/widget.c
index 447fc260e00..2ab11fa1a5f 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -448,7 +448,7 @@ set_frame_size (ew)
448 frame->output_data.x->flags_areas_extra 448 frame->output_data.x->flags_areas_extra
449 = 2 * FRAME_FLAGS_AREA_WIDTH (frame); 449 = 2 * FRAME_FLAGS_AREA_WIDTH (frame);
450 450
451 change_frame_size (frame, h, w, 1, 0); 451 change_frame_size (frame, h, w, 1, 0, 0);
452 char_to_pixel_size (ew, w, h, &pixel_width, &pixel_height); 452 char_to_pixel_size (ew, w, h, &pixel_width, &pixel_height);
453 ew->core.width = pixel_width; 453 ew->core.width = pixel_width;
454 ew->core.height = pixel_height; 454 ew->core.height = pixel_height;
@@ -783,7 +783,7 @@ EmacsFrameResize (widget)
783 int rows; 783 int rows;
784 784
785 pixel_to_char_size (ew, ew->core.width, ew->core.height, &columns, &rows); 785 pixel_to_char_size (ew, ew->core.width, ew->core.height, &columns, &rows);
786 change_frame_size (f, rows, columns, 0, 1); 786 change_frame_size (f, rows, columns, 0, 1, 0);
787 update_wm_hints (ew); 787 update_wm_hints (ew);
788 update_various_frame_slots (ew); 788 update_various_frame_slots (ew);
789 789
@@ -841,7 +841,7 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2)
841 new->core.height = pixel_height; 841 new->core.height = pixel_height;
842 842
843 change_frame_size (new->emacs_frame.frame, char_height, char_width, 843 change_frame_size (new->emacs_frame.frame, char_height, char_width,
844 1, 0); 844 1, 0, 0);
845 needs_a_refresh = True; 845 needs_a_refresh = True;
846 } 846 }
847 847
diff --git a/src/window.c b/src/window.c
index c18566dd841..b2f2bc08a69 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4092,7 +4092,7 @@ the return value is nil. Otherwise the value is t.")
4092 if (XFASTINT (data->frame_height) != previous_frame_height 4092 if (XFASTINT (data->frame_height) != previous_frame_height
4093 || XFASTINT (data->frame_width) != previous_frame_width) 4093 || XFASTINT (data->frame_width) != previous_frame_width)
4094 change_frame_size (f, XFASTINT (data->frame_height), 4094 change_frame_size (f, XFASTINT (data->frame_height),
4095 XFASTINT (data->frame_width), 0, 0); 4095 XFASTINT (data->frame_width), 0, 0, 0);
4096#if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS) 4096#if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS)
4097 if (XFASTINT (data->frame_menu_bar_lines) 4097 if (XFASTINT (data->frame_menu_bar_lines)
4098 != previous_frame_menu_bar_lines) 4098 != previous_frame_menu_bar_lines)
@@ -4259,7 +4259,7 @@ the return value is nil. Otherwise the value is t.")
4259 if (previous_frame_height != FRAME_HEIGHT (f) 4259 if (previous_frame_height != FRAME_HEIGHT (f)
4260 || previous_frame_width != FRAME_WIDTH (f)) 4260 || previous_frame_width != FRAME_WIDTH (f))
4261 change_frame_size (f, previous_frame_height, previous_frame_width, 4261 change_frame_size (f, previous_frame_height, previous_frame_width,
4262 0, 0); 4262 0, 0, 0);
4263#if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS) 4263#if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS)
4264 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) 4264 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f))
4265 x_set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines), 4265 x_set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines),