GitLab

Comment fixes. Use renamed symbols.
(fringes_extra): Renamed from flags_areas_extra.
(FRAME_FRINGE_BITMAP_WIDTH): Renamed from FRAME_FLAGS_BITMAP_WIDTH.
(FRAME_FRINGE_BITMAP_HEIGHT): Renamed from FRAME_FLAGS_BITMAP_HEIGHT.
(FRAME_X_FRINGE_COLS): Renamed from FRAME_X_FLAGS_AREA_COLS.
(FRAME_X_FRINGE_WIDTH): Renamed from FRAME_X_FLAGS_AREA_WIDTH.
(FRAME_X_LEFT_FRINGE_WIDTH): Renamed from FRAME_X_LEFT_FLAGS_AREA_WIDTH.
(FRAME_X_RIGHT_FRINGE_WIDTH): Renamed from
FRAME_X_RIGHT_FLAGS_AREA_WIDTH.

scroll_bar_bottom_shadow_pixel fields.

hourglass_cursor, busy_window to hourglass_window, busy_p to
hourglass_p.

removed.
(SCROLL_BAR_X_WIDGET): Get the widget via XtWindowToWidget.
Take the X display as additional argument.
(SET_SCROLL_BAR_X_WIDGET): Store the window of the widget, since
`Widget' is a pointer type that's not easily stored in Lisp_Object
form in a portable way.

(x_query_color, x_query_colors): Add prototype.

x_set_tool_bar_lines.

(struct image): Ditto.
(image_ascent): Add prototype.

(FRAME_X_COLORMAP, FRAME_X_VISUAL): New macros.

and `xim_styles'.
(struct x_output) [HAVE_X_I18N]: Remove member `xim', add
`xic_style' and `xic_xfs'.
(FRAME_MENUBAR_HEIGHT, FRAME_X_XIM, FRAME_X_XIM_STYLES)
(FRAME_XIC_STYLE, FRAME_XIC_FONTSET): New macros.
(FRAME_XIM): Removed.

baseline_offset.

to frame.h.

of both margins.
(FRAME_X_FLAGS_AREA_WIDTH): Likewise.
(FRAME_X_LEFT_FLAGS_AREA_WIDTH): New.
(FRAME_X_RIGHT_FLAGS_AREA_WIDTH): New.

busy_window.  Remove cursor, computed_faces etc.  Add
white_relief_pixel, black_relief_pixel, white_allocated_p,
black_allocated_p, relief_background.
(struct x_display_info): Add gray pixmap, scroll_bar_pixel,
Xatom_Scrollbar, DONE, PAGE, image cache, resx, rey, smallest_char_width,
smallest_font_height.
(scroll_bar): Add x_widget_low and x_widget_high.
(FRAME_X_IMAGE_CACHE): New.
(FRAME_SMALLEST_CHAR_WIDTH): New.
(FRAME_SMALLEST_FONT_HEIGHT): New.
(struct relief): New.
(VERTICAL_SCROLL_BAR_PIXEL_HEIGHT): Removed.
(text_cursor_kinds): New.
(FRAME_FLAGS_BITMAP_HEIGHT): New.
(FRAME_FLAGS_BITMAP_WIDTH): New.
(FRAME_X_FLAGS_AREA_COLS): New.
(FRAME_MODE_LINE_BORDER_WIDTH): Removed.
(FRAME_MODE_LINE_HEIGHT): Removed.
(CHAR_TO_PIXEL_WIDTH): Rrwritten.
(PIXEL_TO_CHAR_WIDTH): Ditto.
(WINDOW_COL_PIXEL_X etc.) Removed.

unibyte_display_via_language_environment.

fontset.h.
(struct x_display_info): New members Xatom_PIXEL_SIZE,
Xatom_MULE_BASELINE_OFFSET, Xatom_RELATIVE_COMPOSE, and null_pixel.
(x_list_fonts, x_get_font_info, x_load_font, x_query_font):
Declare external.
(struct x_output): New members font_baseline and fontset.
(FRAME_FONTSET, FRAME_X_FONT_TABLE): New macros.