[Emacs-commit] emacs/src frame.h

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <address@hidden>   03/05/24 17:58:07

Modified files:
        src            : frame.h 

Log message:
        (struct frame): Rename members height to text_lines,
        width to text_cols, window_height to total_lines, window_width to
        total_cols, new_height to new_text_lines, new_width to
        new_text_cols.  All uses changed.
        (struct frame): New members which consolidate common members of
        x_output, w32_output, and mac_output structures: left_pos,
        top_pos, pixel_height, pixel_width, x_pixels_diff, y_pixels_diff,
        win_gravity, size_hint_flags, border_width, internal_border_width,
        line_height, fringe_cols, left_fringe_width, right_fringe_width,
        want_fullscreen.  All uses changed.
        (struct frame): New member column_width contaning the canonical
        column width, analogue to line_height.  All uses changed.
        (struct frame): Rename members scroll_bar_pixel_width to
        config_scroll_bar_width, and scroll_bar_cols to
        config_scroll_bar_cols.  All uses changed.
        (struct frame): New member scroll_bar_actual_width which
        consolidates and renames the vertical_scroll_bar_extra member of
        x_output, w32_output, and mac_output structures.  All uses changed.
        (FRAME_PIXEL_HEIGHT): Renamed from PIXEL_HEIGHT and moved
        from x/w32/macterm.h files.  All uses changed.  Also change code
        which referred to f->output_data...->pixel_height.
        (FRAME_PIXEL_WIDTH): Renamed from PIXEL_WIDTH and moved
        from x/w32/macterm.h files.  All uses changed.  Also change code
        which referred to f->output_data...->pixel_width.
        (FRAME_LINES): Renamed from FRAME_HEIGHT.  All uses changed.
        Also change code which referred to f->height.
        (FRAME_COLS): Renamed from FRAME_WIDTH.  All uses changed.
        Also change code which referred to f->width.
        (FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses
        to update new_text_lines and new_text_cols members directly.
        (FRAME_CONFIG_SCROLL_BAR_WIDTH): Renamed from
        FRAME_SCROLL_BAR_PIXEL_WIDTH.  All uses changed.
        (FRAME_CONFIG_SCROLL_BAR_COLS): Renamed from
        FRAME_SCROLL_BAR_COLS.  All uses changed.
        (FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS):
        Renamed from FRAME_LEFT_SCROLL_BAR_WIDTH and
        FRAME_RIGHT_SCROLL_BAR_WIDTH, resp.  All uses changed.
        (FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
        (FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros.
        (FRAME_TOTAL_COLS): Renamed from FRAME_WINDOW_WIDTH.
        (SET_FRAME_COLS): Renamed from SET_FRAME_WIDTH.
        (FRAME_TOTAL_COLS_ARG): Renamed from FRAME_WINDOW_WIDTH_ARG.
        (WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro.
        (WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro.
        (FRAME_LINE_HEIGHT): Renamed from CANON_Y_UNIT.  Unconditionally
        return line_height member (it now has proper value also for
        non-window frames).
        (FRAME_COLUMN_WIDTH): Renamed from CANON_X_UNIT.  Unconditionally
        return new column_width member (rather than the default font width).
        (FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH)
        (FRAME_RIGHT_FRINGE_WIDTH): Renamed from FRAME_X_... and moved
        from x/w32/macterm.h files.  Unconditionally return corresponding
        member of frame structure (they now have proper values also for
        non-window frames).
        (FRAME_TOTAL_FRINGE_WIDTH): Renamed from FRAME_FRINGE_WIDTH.
        Calculate return value from left and right widths.
        (FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return
        internal_border_width member (has proper value for non-window frame).
        (FRAME_PIXEL_X_FROM_CANON_X): Renamed from PIXEL_X_FROM_CANON_X.
        (FRAME_PIXEL_Y_FROM_CANON_Y): Renamed from PIXEL_Y_FROM_CANON_Y.
        (FRAME_CANON_X_FROM_PIXEL_X): Renamed from CANON_X_FROM_PIXEL_X.
        (FRAME_CANON_Y_FROM_PIXEL_Y): Renamed from CANON_Y_FROM_PIXEL_Y.
        (FRAME_LINE_TO_PIXEL_Y): Renamed from CHAR_TO_PIXEL_ROW,
        consolidated from xterm.h, macterm.h, and w32term.h.
        (FRAME_COL_TO_PIXEL_X): Renamed from CHAR_TO_PIXEL_COL,
        consolidated from xterm.h, macterm.h, and w32term.h.
        (FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Renamed from
        CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h.
        (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Renamed from
        CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h.
        (FRAME_PIXEL_Y_TO_LINE): Renamed from PIXEL_TO_CHAR_ROW
        consolidated from x/mac/w32term.h.
        (FRAME_PIXEL_X_TO_COL): Renamed from PIXEL_TO_CHAR_COL
        consolidated from x/mac/w32term.h.
        (FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Renamed from
        PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h.
        (FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Renamed from
        PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h.

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