1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 13:10:57 -08:00
Commit graph

444 commits

Author SHA1 Message Date
Kim F. Storm
a530382071 (coordinates_in_window): Convert X and Y to window
relative coordinates inside mode-line and header-line parts.
Convert X and Y to margin area relative coordinates inside left
and right display margin parts.
2003-06-05 00:36:28 +00:00
Richard M. Stallman
c99a9eb33f (Fwindow_edges): Doc fix.
(Fwindow_pixel_edges, Fwindow_inside_edges)
(Fwindow_inside_pixel_edges): New functions.
(syms_of_window): defsubr them.
2003-06-03 11:12:48 +00:00
Stefan Monnier
56613f06dc (Fset_window_buffer): Add type of `keep_margins' argument.
(Fset_window_fringes, Fset_window_scroll_bars): Declare before use.
2003-05-25 17:49:55 +00:00
Juanma Barranquero
79fd290eeb (Fset_window_scroll_bars): Fix typo in argument name.
(Fwindow_scroll_bars): Fix typo in docstring.
2003-05-25 02:11:24 +00:00
Kim F. Storm
949cf20fe5 Make (many) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
(make_window): Initialize new members
left_margin_cols, right_margin_cols, left_fringe_width,
right_fringe_width, fringes_outside_margins, scroll_bar_width,
and vertical_scroll_bar_type.
(coordinates_in_window): Adapted to new fringe/margin positions
and per-window fringes and scroll-bars.
Fix bug related to incorrectly adjusting coordinates by
frame's internal_border_width (the effect normally negible since
the internal_border_width is typically 0 or 1 pixel, but very
noticeable for an internal_border_width of e.g. 25 pixels).
Upon successful return (other than ON_NOTHING), the coordinates
are now always properly converted to window relative for the
given display element.
(window_from_coordinates): Add new parameters wx and wy to
return the window relative x and y position in the returned
window and part.  A null arg means, don't return the position.
All callers changed.
(adjust_window_margins): New function which may reduce the width
of the display margins if a window's text area is too small after
resizing or splitting windows.
(size_window): Fix bug that did not account for display margin
widths when checking the minimum width of a window; use
adjust_window_margins.
(set_window_buffer): Call Fset_window_fringes and
Fset_window_scroll_bars to setup per-window elements.
Add new arg KEEP_MARGINS_P.  Non-nil means to keep window's
existing display margin, fringe widths, and scroll bar settings
(e.g. after splitting a window or resizing the frame).  All
callers changed.
(Fset_window_buffer): New arg KEEP_MARGINS.  All callers changed.
(Fsplit_window): Duplicate original window's display margin,
fringe, and scroll-bar settings; then call Fset_window_buffer with
KEEP_MARGINS non-nil.  This fixes a bug which caused a split
window to only preserve the display margins in one of the windows.
When splitting horisontally, call adjust_window_margins	on both
windows to ensure that the text area of the new windows is non too
narrow.  This fixes a bug which could cause emacs to trap if the
width of the split window was less than the width of the display
margins.
(window_box_text_cols): Renamed from window_internal_width.  All
uses changed.  Adapt to per-window fringes and scroll bars.
Fix bug that caused vertical separator to be subtracted also on
window frames.  Fix another bug that did not reduce the returned
value by the columns used for display margins.
(window_scroll_line_based): Fix bug related to scrolling too much
when display margins are present (implicitly fixed by the fix to
window_box_text_cols).
(scroll_left, scroll_right): Fix bug related to scrolling too far
by default when display margins are present (implicitly fixed by
the fix to window_box_text_cols).
(struct saved_window): Rename members left to left_col, top to
top_line, width to total_cols, height to total_lines, orig_top to
orig_top_line, orig_height to orig_total_lines.  All uses changed.
New members left_margin_cols, right_margin_cols,
left_fringe_width, right_fringe_width, fringes_outside_margins,
scroll_bar_width, and vertical_scroll_bar_type for saving
per-window display elements.
(Fset_window_configuration): Restore display margins, fringes,
and scroll bar settings.  This fixes a bug which caused display
margins to be discarded when saving and restoring a window
configuration.
(save_window_save): Save display margins, fringes, and scroll bar
settings.  This fixes a bug which caused display margins to be
discarded when saving and restoring a window configuration.
(Fset_window_margins): Do nothing if display margins are not
really changed.  Otherwise, call adjust_window_margins to ensure
the text area doesn't get too narrow.  This fixes a bug which
could cause emacs to trap if setting display margins wider than
the width of the window.
(Fset_window_fringes): New defun to allow user to specifically set
this window's fringe widths and position vs. display margins.
(Fwindow_fringes): New defun to return window's actual fringe
settings.
(Fset_window_scroll_bars): New defun to allow user to specifically
set this window's scroll bar width and position.
(Fwindow_scroll_bars): New defun to return window's actual scroll
bar settings.
(compare_window_configurations): Also compare display margins,
fringes, and scroll bar settings.
(syms_of_window): Defsubr new defuns for fringe and scroll bars.
2003-05-24 22:07:51 +00:00
Stefan Monnier
14d87dc9ed (Fselect_window): Add optional `norecord' arg.
(select_window_1): Fold into Fselect_window.
(select_window_norecord): New function.
(temp_output_buffer_show): Use it.  Preserve current buffer.
(delete_window, Fother_window, Fset_window_configuration):
Pass nil as new arg to Fselect_window.
2003-05-17 21:19:55 +00:00
Kim F. Storm
cdbc7fec13 Remove extern decl for frame parameter vars.
(change_window_heights): New generic function;
replaces x_change_window_heights.  All users changed.
2003-03-31 20:35:51 +00:00
Kim F. Storm
341f385808 * window.c (enum window_part): Move to dispextern.h.
(coordinates_in_window): Use enum window_part member names
instead of numbers to describe return value.
(struct check_window_data): Change part member to window_part.
(check_window_containing): Return window_part unaltered.
(window_from_coordinates): Change part arg from int to enum
window_part.  Allow part arg to be null.  All users changed.
2003-03-21 13:52:06 +00:00
Andreas Schwab
e68def1e59 (window_scroll_pixel_based): Move outside a
multi-glyph character before setting new window start.
2003-02-18 00:18:04 +00:00
Juanma Barranquero
177c0ea743 Trailing whitespace deleted. 2003-02-04 14:56:31 +00:00
Richard M. Stallman
96ae58c8ac (window_scroll_pixel_based): Partially undo last change. 2003-01-01 17:00:34 +00:00
Richard M. Stallman
07ce8b53ea (window_scroll_pixel_based): Fix check for reaching BEGV.
Don't try to make last line fully visible if it is past end of window.
2002-12-23 18:04:45 +00:00
Richard M. Stallman
d17551171b (select_window_1): Undo 9/21 change. 2002-12-22 21:57:05 +00:00
David Kastrup
73cadfc195 (Fset_window_configuration): Set old_point to correct
value when new_current_buffer == current_buffer.
2002-12-19 16:26:29 +00:00
Stefan Monnier
a5731348b5 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Only ignore truly dedicated windows.  For UNSHOW_BUFFER, delete the
window if it is dedicated.
(Fshrink_window): Add preserve_before as was done for enlarge_window.
(Vspecial_display_function): Update docstring.
2002-10-22 19:28:17 +00:00
Richard M. Stallman
cba59f7786 (window_scroll): Set immediate_quit. 2002-10-14 01:30:53 +00:00
Richard M. Stallman
282f783156 (select_window_1): Don't select frame.
Set frame's selected window only when frame itself is selected.
(Fselect_window): Doc fix.
2002-09-21 18:37:16 +00:00
Richard M. Stallman
1de65f5131 (displayed_window_lines): Correct for one-off bug
in HEIGHT on non-window displays.
2002-09-05 02:36:22 +00:00
Richard M. Stallman
06be4f8589 (temp_output_buffer_show): Don't set prevent_redisplay_optimizations_p. 2002-07-16 13:39:41 +00:00
Ken Raeburn
d5db40779d Most uses of XSTRING combined with STRING_BYTES or indirection changed to
SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references
left unchanged for now.
2002-07-15 00:01:34 +00:00
Juanma Barranquero
aed1337830 Use macro SPECPDL_INDEX. 2002-07-11 14:18:02 +00:00
Juanma Barranquero
331379bfa7 Rename BINDING_STACK_SIZE to SPECPDL_INDEX. 2002-07-10 08:45:24 +00:00
Juanma Barranquero
cb795ec4c2 *** empty log message *** 2002-07-09 09:46:38 +00:00
Richard M. Stallman
95605b1b7a (Frecenter): With arg, set optional_new_start. 2002-07-01 08:00:07 +00:00
Richard M. Stallman
8ce9dfc1c8 (Frecenter): Don't set force_start flag. 2002-06-26 08:44:49 +00:00
Stefan Monnier
18787f5e9e (Fset_window_configuration): Lisp_Object/int mixup. 2002-06-17 18:45:01 +00:00
Richard M. Stallman
72695e4715 (Fset_window_configuration): Explicitly preserve
the point value that new_current_buffer had at the start.
2002-06-15 14:20:52 +00:00
Eli Zaretskii
ebadb1e47f (Fset_window_hscroll): Doc fix. 2002-06-05 17:02:15 +00:00
Richard M. Stallman
243a5ce664 (Fset_window_configuration): Correct the handling
of point in current buffer, to work with multiple windows.
2002-05-30 17:04:59 +00:00
Richard M. Stallman
dad67609c8 (window_scroll_pixel_based): Don't call Fbolp;
instead, see if the new start pos is at beginning of line.
2002-05-28 20:26:34 +00:00
Andrew Choi
e0f712ba55 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
lisp/ChangeLog, and src/ChangeLog for list of changes.
2002-04-26 23:39:06 +00:00
Richard M. Stallman
6b448755e6 (make_window): Initialize height_fixed_p,
last_cursor_off_p, and p->cursor_off_p slots.
2002-04-22 15:57:25 +00:00
Eli Zaretskii
ac431108e3 (coordinates_in_window): Don't report on margin area if its width is zero. 2002-04-17 10:36:37 +00:00
Gerd Moellmann
49b996e77a (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
(Qleft_margin, Qright_margin): Declare.
(coordinates_in_window, (Fcoordinates_in_window_p): Deal with
margins.
2002-04-12 09:36:21 +00:00
Richard M. Stallman
e9b2c9617c (window_scroll_pixel_based): Exit the move_it_by_lines
loop whenever it stops making progress.
2002-03-30 23:49:39 +00:00
Richard M. Stallman
079d288f1a (Fdisplay_buffer): Doc fix. 2002-03-26 09:09:56 +00:00
Stefan Monnier
31ade731e6 Change defvar_int def and vars to use EMACS_INT instead of just int. 2002-03-04 23:41:00 +00:00
Kim F. Storm
fa83226125 (Fminibuffer_selected_window): New function.
(syms_of_window): Defsubr it.
2002-03-01 23:50:12 +00:00
Kim F. Storm
4b26579e72 (make_window, replace_window): Initialize phys_cursor_width. 2002-03-01 22:37:16 +00:00
Kim F. Storm
8bfb170b05 (syms_of_window): Initialize minibuf_selected_window. 2002-02-28 22:15:45 +00:00
Kim F. Storm
3dbab091cb (minibuf_selected_window): Renamed from
Vminibuf_selected_window.  Users changed.
(syms_of_window): Staticpro it.
2002-02-28 22:07:45 +00:00
Kim F. Storm
3f49fddcb9 (Vminibuf_selected_window): New variable.
(struct save_window_data): New member minibuf_selected_window.
(Fset_window_configuration): Restore Vminibuf_selected_window.
(Fcurrent_window_configuration): Save Vminibuf_selected_window.
Set minibuf_scroll_window member to nil if minibuf_level is 0.
(compare_window_configurations): Compare minibuf_selected_window.
2002-02-26 22:50:55 +00:00
Kim F. Storm
cc91894c70 (Vmode_line_in_non_selected_windows): Removed.
(mode_line_in_non_selected_windows): New variable.
(syms_of_window): DEFVAR_BOOL it.
2002-02-13 22:41:12 +00:00
Kim F. Storm
26124d5e03 (Vmode_line_in_non_selected_windows): New variable.
(syms_of_window): DEFVAR_LISP it.
2002-02-11 14:42:16 +00:00
Richard M. Stallman
54b8bcb515 (check_frame_size): Fix minimum height calculation. 2002-01-21 08:53:42 +00:00
Richard M. Stallman
dc1ab1eece (MIN_SAFE_WINDOW_HEIGHT): Value now 1. 2002-01-20 23:09:45 +00:00
Richard M. Stallman
daf516d34f (enlarge_window): When exceeding size of parent,
directly delete all the siblings instead of trying to resize it.
2002-01-18 03:50:50 +00:00
Richard M. Stallman
192c313134 (delete_window): Rewrite the code for changing the
selected window to handle the case where WINDOW is not a leaf.
2002-01-08 05:41:37 +00:00
Ken Raeburn
1ab964d755 * window.c (enlarge_window): In new preserve_before code, convert CURBEG from
lisp object to integer before doing arithmetic.
2001-12-27 05:49:33 +00:00
Richard M. Stallman
f95284d2b4 (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
(Fenlarge_window): New arg PRESERVE_BEFORE.
2001-12-25 10:36:08 +00:00