• Kim F. Storm's avatar
    Make (many) trivial substitutions for renamed and · 949cf20f
    Kim F. Storm authored
    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.
    949cf20f
window.c 193 KB