[Emacs-commit] emacs/src window.h

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <address@hidden>   03/05/24 18:08:20

Modified files:
        src            : window.h 

Log message:
        (struct window): Rename members left to left_col,
        top to top_line, height to total_lines, width to total_cols,
        left_margin_width to left_margin_cols, right_margin_width to
        right_margin_cols, orig_height to orig_total_lines, orig_top to
        orig_top_line.  All uses changed.
        (struct window): New members left_fringe_width, right_fringe_width,
        fringes_outside_margins, scroll_bar_width, vertical_scroll_bar_type.
        (WINDOW_XFRAME, WINDOW_FRAME_COLUMN_WIDTH, WINDOW_FRAME_LINE_HEIGHT):
        New macros primarily used to simplify other macros.
        (WINDOW_TOTAL_COLS): New macro.  Change relevant code that
        referred to XINT (w->width).
        (WINDOW_TOTAL_LINES): New macro.  Change relevant code that
        referred to XINT (w->height).
        (WINDOW_TOTAL_WIDTH): New macro.  Change relevant code that
        referred to XINT (w->width) * canon_x_unit.
        (WINDOW_TOTAL_HEIGHT): New macro.  Change relevant code that
        referred to XINT (w->height) * canon_y_unit.
        (WINDOW_LEFT_EDGE_COL): New macro.  Change relevant code that
        referred to XINT (w->left).
        (WINDOW_RIGHT_EDGE_COL): Renamed from WINDOW_RIGHT_EDGE.  Change
        all uses and code that referred to XINT (w->left) + XINT (w->width).
        (WINDOW_TOP_EDGE_LINE): New macro.  Change relevant code that
        referred to XINT (w->top).
        (WINDOW_BOTTOM_EDGE_LINE): New macro.  Change relevant code that
        referred to XINT (w->top) + XINT (w->height).
        (WINDOW_LEFT_EDGE_X): New macro.  Change relevant code that
        referred to XINT (w->left) * canon_x_unit.
        (WINDOW_RIGHT_EDGE_X): New macro.  Change relevant code that
        referred to (XINT (w->left) + XINT (w->width)) * canon_x_unit.
        (WINDOW_TOP_EDGE_Y): New macro.  Change relevant code that
        referred to XINT (w->top) * canon_y_unit.
        (WINDOW_BOTTOM_EDGE_Y): New macro.  Change relevant code that
        referred to (XINT (w->top) + XINT (w->height)) * canon_y_unit.
        (WINDOW_LEFTMOST_P): New macro.
        (WINDOW_BOX_LEFT_EDGE_COL): Renamed from WINDOW_LEFT_MARGIN.
        All uses changed.
        (WINDOW_BOX_RIGHT_EDGE_COL): Renamed from WINDOW_RIGHT_MARGIN.
        All uses changed.
        (WINDOW_BOX_LEFT_EDGE_X): Renamed from
        WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X, moved from dispextern.h.
        Do not exclude left fringe width.
        (WINDOW_BOX_RIGHT_EDGE_X): Renamed from
        WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X, moved from dispextern.h.
        Do not exclude fringe widths.
        (WINDOW_LEFT_FRINGE_WIDTH, WINDOW_RIGHT_FRINGE_WIDTH)
        (WINDOW_FRINGE_COLS, WINDOW_TOTAL_FRINGE_WIDTH): New macros.
        Change relevant code that referred to FRAME_LEFT_FRINGE_WIDTH,
        FRAME_RIGHT_FRINGE_WIDTH, FRAME_FRINGE_COLS, and
        FRAME_TOTAL_FRINGE_WIDTH to allow per-window fringe settings.
        (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS): New macro.
        (WINDOW_VERTICAL_SCROLL_BAR_TYPE, WINDOW_HAS_VERTICAL_SCROLL_BAR)
        (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT)
        (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT)
        (WINDOW_CONFIG_SCROLL_BAR_WIDTH, WINDOW_CONFIG_SCROLL_BAR_COLS):
        New macros.  Change code which referenced corresponding
        FRAME_VERTICAL_SCROLL_BAR_TYPE, FRAME_HAS_VERTICAL_SCROLL_BARS,
        FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT,
        FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT,
        FRAME_SCROLL_BAR_PIXEL_WIDTH, and FRAME_SCROLL_BAR_COLS macros to
        allow per-window scroll-bar settings.
        (WINDOW_LEFT_SCROLL_BAR_COLS, WINDOW_RIGHT_SCROLL_BAR_COLS): New macros.
        (WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH): New macro.  Change code that
        referred to FRAME_LEFT_SCROLL_BAR_WIDTH.
        (WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH): New macro.  Change code
        that referred to FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT and
        FRAME_SCROLL_BAR_WIDTH.
        (WINDOW_SCROLL_BAR_COLS, WINDOW_SCROLL_BAR_AREA_WIDTH)
        (WINDOW_SCROLL_BAR_AREA_X): New macros.
        (WINDOW_HEADER_LINE_HEIGHT): Renamed from
        WINDOW_DISPLAY_HEADER_LINE_HEIGHT, moved from dispextern.h.
        (WINDOW_BOX_HEIGHT_NO_MODE_LINE): Renamed from
        WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE, moved from dispextern.h.
        (WINDOW_BOX_TEXT_HEIGHT): Renamed from
        WINDOW_DISPLAY_PIXEL_WIDTH, moved from dispextern.h.
        (WINDOW_TO_FRAME_PIXEL_X, WINDOW_TO_FRAME_PIXEL_Y)
        (FRAME_TO_WINDOW_PIXEL_X, FRAME_TO_WINDOW_PIXEL_Y)
        (WINDOW_TEXT_TO_FRAME_PIXEL_X): Moved here from dispextern.h.
        (WINDOW_LEFT_MARGIN_WIDTH): Renamed from
        WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH, moved from dispextern.h.
        (WINDOW_RIGHT_MARGIN_WIDTH): Renamed from
        WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH, moved from dispextern.h.
        (window_from_coordinates): Update prototype.
        (Fset_window_buffer): Update EXFUN.
        (set_window_buffer): Update prototype.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/window.h.diff?tr1=1.55&tr2=1.56&r1=text&r2=text