#include "w32gui.h"
#endif
+#ifdef macintosh
+#include "macterm.h"
+#endif
/* Structure forward declarations. Some are here because function
prototypes below reference structure types before their definition
/* Non-zero means window displayed in this matrix has a top mode
line. */
- unsigned top_line_p : 1;
+ unsigned header_line_p : 1;
#ifdef GLYPH_DEBUG
/* A string identifying the method used to display the matrix. */
This is always the first row in MATRIX because that's the only
way that works in frame-based redisplay. */
-#define MATRIX_TOP_LINE_ROW(MATRIX) (MATRIX)->rows
+#define MATRIX_HEADER_LINE_ROW(MATRIX) (MATRIX)->rows
/* Return a pointer to first row in MATRIX used for text display. */
#define MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P(W, ROW) \
(MATRIX_ROW_PARTIALLY_VISIBLE_P ((ROW)) \
- && (ROW)->y < WINDOW_DISPLAY_TOP_LINE_HEIGHT ((W)))
+ && (ROW)->y < WINDOW_DISPLAY_HEADER_LINE_HEIGHT ((W)))
/* Non-zero if ROW is partially visible at the bottom of window W. */
if not known. This macro is called under circumstances where
MATRIX might not have been allocated yet. */
-#define MATRIX_TOP_LINE_HEIGHT(MATRIX) \
+#define MATRIX_HEADER_LINE_HEIGHT(MATRIX) \
((MATRIX) && (MATRIX)->rows \
- ? MATRIX_TOP_LINE_ROW (MATRIX)->height \
+ ? MATRIX_HEADER_LINE_ROW (MATRIX)->height \
: 0)
/* Return the current height of the mode line of window W. If not
known from W's current glyph matrix, return an estimation based on
the height of the font of the face `top-line'. */
-#define CURRENT_TOP_LINE_HEIGHT(W) \
- (MATRIX_TOP_LINE_HEIGHT ((W)->current_matrix) \
- ? MATRIX_TOP_LINE_HEIGHT ((W)->current_matrix) \
- : estimate_mode_line_height (XFRAME ((W)->frame), TOP_LINE_FACE_ID))
+#define CURRENT_HEADER_LINE_HEIGHT(W) \
+ (MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix) \
+ ? MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix) \
+ : estimate_mode_line_height (XFRAME ((W)->frame), HEADER_LINE_FACE_ID))
/* Return the height of the desired mode line of window W. */
/* Return the height of the desired top line of window W. */
-#define DESIRED_TOP_LINE_HEIGHT(W) \
- MATRIX_TOP_LINE_HEIGHT ((W)->desired_matrix)
+#define DESIRED_HEADER_LINE_HEIGHT(W) \
+ MATRIX_HEADER_LINE_HEIGHT ((W)->desired_matrix)
/* Like FRAME_INTERNAL_BORDER_WIDTH but checks whether frame F is a
window-system frame. */
/* Height in pixels of the top line. Zero if W doesn't have a top
line. */
-#define WINDOW_DISPLAY_TOP_LINE_HEIGHT(W) \
- (WINDOW_WANTS_TOP_LINE_P ((W)) \
- ? CURRENT_TOP_LINE_HEIGHT (W) \
+#define WINDOW_DISPLAY_HEADER_LINE_HEIGHT(W) \
+ (WINDOW_WANTS_HEADER_LINE_P ((W)) \
+ ? CURRENT_HEADER_LINE_HEIGHT (W) \
: 0)
/* Pixel height of window W without mode line. */
#define WINDOW_DISPLAY_TEXT_HEIGHT(W) \
(WINDOW_DISPLAY_PIXEL_HEIGHT ((W)) \
- WINDOW_DISPLAY_MODE_LINE_HEIGHT ((W)) \
- - WINDOW_DISPLAY_TOP_LINE_HEIGHT ((W)))
+ - WINDOW_DISPLAY_HEADER_LINE_HEIGHT ((W)))
/* Left edge of W in pixels relative to its frame. */
/* Value is non-zero if window W wants a top line. */
-#define WINDOW_WANTS_TOP_LINE_P(W) \
+#define WINDOW_WANTS_HEADER_LINE_P(W) \
(!MINI_WINDOW_P (W) \
&& !(W)->pseudo_window_p \
&& FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME (W))) \
- && !NILP (XBUFFER ((W)->buffer)->top_line_format))
+ && !NILP (XBUFFER ((W)->buffer)->header_line_format))
\f
/***********************************************************************
{
DEFAULT_FACE_ID,
MODE_LINE_FACE_ID,
- TOOLBAR_FACE_ID,
+ TOOL_BAR_FACE_ID,
BITMAP_AREA_FACE_ID,
- TOP_LINE_FACE_ID,
+ HEADER_LINE_FACE_ID,
+ SCROLL_BAR_FACE_ID,
+ BORDER_FACE_ID,
+ CURSOR_FACE_ID,
+ MOUSE_FACE_ID,
BASIC_FACE_ID_SENTINEL
};
unsigned multibyte_p : 1;
/* 1 means window has a mode line at its top. */
- unsigned top_line_p : 1;
+ unsigned header_line_p : 1;
/* 1 means `string' is the value of a `display' property.
Don't handle some `display' properties in these strings. */
unsigned overlay_strings_at_end_processed_p : 1;
/* The ID of the default face to use. One of DEFAULT_FACE_ID,
- MODE_LINE_FACE_ID, or TOOLBAR_FACE_ID, depending on what we
+ MODE_LINE_FACE_ID, or TOOL_BAR_FACE_ID, depending on what we
are displaying. */
int base_face_id;
\f
/***********************************************************************
- Toolbars
+ Tool-bars
***********************************************************************/
-/* Enumeration defining where to find toolbar item information in
- toolbar items vectors stored with frames. Each toolbar item
- occupies TOOLBAR_ITEM_NSLOTS elements in such a vector. */
+/* Enumeration defining where to find tool-bar item information in
+ tool-bar items vectors stored with frames. Each tool-bar item
+ occupies TOOL_BAR_ITEM_NSLOTS elements in such a vector. */
-enum toolbar_item_idx
+enum tool_bar_item_idx
{
- /* The key of the toolbar item. Used to remove items when a binding
+ /* The key of the tool-bar item. Used to remove items when a binding
for `undefined' is found. */
- TOOLBAR_ITEM_KEY,
+ TOOL_BAR_ITEM_KEY,
/* Non-nil if item is enabled. */
- TOOLBAR_ITEM_ENABLED_P,
+ TOOL_BAR_ITEM_ENABLED_P,
/* Non-nil if item is selected (pressed). */
- TOOLBAR_ITEM_SELECTED_P,
+ TOOL_BAR_ITEM_SELECTED_P,
/* Caption. */
- TOOLBAR_ITEM_CAPTION,
+ TOOL_BAR_ITEM_CAPTION,
/* Image(s) to display. This is either a single image specification
or a vector of specifications. */
- TOOLBAR_ITEM_IMAGES,
+ TOOL_BAR_ITEM_IMAGES,
/* The binding. */
- TOOLBAR_ITEM_BINDING,
+ TOOL_BAR_ITEM_BINDING,
/* Button type. One of nil, `:radio' or `:toggle'. */
- TOOLBAR_ITEM_TYPE,
+ TOOL_BAR_ITEM_TYPE,
/* Help string. */
- TOOLBAR_ITEM_HELP,
+ TOOL_BAR_ITEM_HELP,
- /* Sentinel = number of slots in toolbar_items occupied by one
- toolbar item. */
- TOOLBAR_ITEM_NSLOTS
+ /* Sentinel = number of slots in tool_bar_items occupied by one
+ tool-bar item. */
+ TOOL_BAR_ITEM_NSLOTS
};
/* An enumeration for the different images that can be specified
- for a toolbar item. */
+ for a tool-bar item. */
-enum toolbar_item_image
+enum tool_bar_item_image
{
- TOOLBAR_IMAGE_ENABLED_SELECTED,
- TOOLBAR_IMAGE_ENABLED_DESELECTED,
- TOOLBAR_IMAGE_DISABLED_SELECTED,
- TOOLBAR_IMAGE_DISABLED_DESELECTED
+ TOOL_BAR_IMAGE_ENABLED_SELECTED,
+ TOOL_BAR_IMAGE_ENABLED_DESELECTED,
+ TOOL_BAR_IMAGE_DISABLED_SELECTED,
+ TOOL_BAR_IMAGE_DISABLED_DESELECTED
};
-/* Non-zero means raise toolbar buttons when the mouse moves over them. */
+/* Non-zero means raise tool-bar buttons when the mouse moves over them. */
-extern int auto_raise_toolbar_buttons_p;
+extern int auto_raise_tool_bar_buttons_p;
-/* Margin around toolbar buttons in pixels. */
+/* Margin around tool-bar buttons in pixels. */
-extern int toolbar_button_margin;
+extern int tool_bar_button_margin;
-/* Thickness of relief to draw around toolbar buttons. */
+/* Thickness of relief to draw around tool-bar buttons. */
-extern int toolbar_button_relief;
+extern int tool_bar_button_relief;
\f
/* Defined in xdisp.c */
-int resize_mini_window P_ ((struct window *));
+void resize_echo_area_axactly P_ ((void));
+int resize_mini_window P_ ((struct window *, int));
int try_window P_ ((Lisp_Object, struct text_pos));
void window_box P_ ((struct window *, int, int *, int *, int *, int *));
int window_box_height P_ ((struct window *));
void move_it_by_lines P_ ((struct it *, int, int));
int frame_mode_line_height P_ ((struct frame *));
void highlight_trailing_whitespace P_ ((struct frame *, struct glyph_row *));
-int toolbar_item_info P_ ((struct frame *, struct glyph *, int *));
-extern Lisp_Object Qtoolbar;
+int tool_bar_item_info P_ ((struct frame *, struct glyph *, int *));
+extern Lisp_Object Qtool_bar;
extern Lisp_Object Vshow_trailing_whitespace;
extern int redisplaying_p;
/* Defined in xface.c */
+void update_face_from_frame_parameter P_ ((struct frame *, Lisp_Object,
+ Lisp_Object));
char *x_charset_registry P_ ((int));
void clear_face_cache P_ ((int));
unsigned long load_color P_ ((struct frame *, struct face *, Lisp_Object,