diff options
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 64 |
1 files changed, 11 insertions, 53 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 7426c03b5e..26e0bb61f1 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1,7 +1,6 @@ /* Interface definitions for display code. - Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + +Copyright (C) 1985, 1993-1994, 1997-2011 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1145,12 +1144,6 @@ extern struct window *updated_window; extern struct glyph_row *updated_row; extern int updated_area; -/* Non-zero means reading single-character input with prompt so put - cursor on mini-buffer after the prompt. Positive means at end of - text in echo area; negative means at beginning of line. */ - -extern int cursor_in_echo_area; - /* Non-zero means last display completed. Zero means it was preempted. */ @@ -2178,6 +2171,12 @@ struct it OVERLAY_STRING_CHUNK_SIZE. */ int n_overlay_strings; + /* The charpos where n_overlay_strings was calculated. This should + be set at the same time as n_overlay_strings. It is needed + because we show before-strings at the start of invisible text; + see handle_invisible_prop in xdisp.c. */ + int overlay_strings_charpos; + /* Vector of overlays to process. Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE at a time. */ #define OVERLAY_STRING_CHUNK_SIZE 16 @@ -2875,7 +2874,8 @@ enum tool_bar_item_idx /* The binding. */ TOOL_BAR_ITEM_BINDING, - /* Button type. One of nil, `:radio' or `:toggle'. */ + /* Button type. One of nil (default button), t (a separator), + `:radio', or `:toggle'. The latter two currently do nothing. */ TOOL_BAR_ITEM_TYPE, /* Help string. */ @@ -2907,23 +2907,8 @@ enum tool_bar_item_image TOOL_BAR_IMAGE_DISABLED_DESELECTED }; -/* Margin around tool-bar buttons in pixels. */ - -extern Lisp_Object Vtool_bar_button_margin; - -/* Tool bar style */ - -extern Lisp_Object Vtool_bar_style; - -/* Maximum number of characters a label can have to be shown. */ - -extern EMACS_INT tool_bar_max_label_size; #define DEFAULT_TOOL_BAR_LABEL_SIZE 14 -/* Thickness of relief to draw around tool-bar buttons. */ - -extern EMACS_INT tool_bar_button_relief; - /* Default values of the above variables. */ #define DEFAULT_TOOL_BAR_BUTTON_MARGIN 4 @@ -3013,8 +2998,6 @@ int in_display_vector_p (struct it *); int frame_mode_line_height (struct frame *); void highlight_trailing_whitespace (struct frame *, struct glyph_row *); extern Lisp_Object Qtool_bar; -extern Lisp_Object Vshow_trailing_whitespace; -extern int mode_line_in_non_selected_windows; extern int redisplaying_p; extern int help_echo_showing_p; extern int current_mode_line_height, current_header_line_height; @@ -3023,11 +3006,6 @@ extern Lisp_Object help_echo_object, previous_help_echo_string; extern EMACS_INT help_echo_pos; extern struct frame *last_mouse_frame; extern int last_tool_bar_item; -extern Lisp_Object Vmouse_autoselect_window; -extern int unibyte_display_via_language_environment; -extern EMACS_INT underline_minimum_offset; -extern Lisp_Object Vglyphless_char_display; - extern void reseat_at_previous_visible_line_start (struct it *); extern Lisp_Object lookup_glyphless_char_display (int, struct it *); extern int calc_pixel_width_or_height (double *, struct it *, Lisp_Object, @@ -3047,7 +3025,6 @@ extern void x_write_glyphs (struct glyph *, int); extern void x_insert_glyphs (struct glyph *, int len); extern void x_clear_end_of_line (int); -extern int x_stretch_cursor_p; extern struct cursor_pos output_cursor; extern void x_fix_overlapping_area (struct window *, struct glyph_row *, @@ -3098,9 +3075,6 @@ extern void tty_draw_row_with_mouse_face (struct window *, struct glyph_row *, #define TRY_WINDOW_CHECK_MARGINS (1 << 0) #define TRY_WINDOW_IGNORE_FONTS_CHANGE (1 << 1) -/* Defined in fringe.c */ - -extern Lisp_Object Voverflow_newline_into_fringe; int lookup_fringe_bitmap (Lisp_Object); void draw_fringe_bitmap (struct window *, struct glyph_row *, int); void draw_row_fringe_bitmaps (struct window *, struct glyph_row *); @@ -3124,7 +3098,7 @@ extern int x_create_bitmap_from_data (struct frame *, char *, unsigned int, unsigned int); extern int x_create_bitmap_from_file (struct frame *, Lisp_Object); #if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) -extern int x_create_bitmap_from_xpm_data (struct frame *f, char **bits); +extern int x_create_bitmap_from_xpm_data (struct frame *f, const char **bits); #endif #ifndef x_destroy_bitmap extern void x_destroy_bitmap (struct frame *, int); @@ -3206,8 +3180,6 @@ extern Lisp_Object Qforeground_color, Qbackground_color; extern Lisp_Object Qframe_set_background_mode; extern char unspecified_fg[], unspecified_bg[]; -extern Lisp_Object Vface_remapping_alist; - /* Defined in xfns.c */ #ifdef HAVE_X_WINDOWS @@ -3224,12 +3196,10 @@ void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object); extern Lisp_Object tip_frame; extern Window tip_window; -EXFUN (Fx_show_tip, 6); EXFUN (Fx_hide_tip, 0); extern void start_hourglass (void); extern void cancel_hourglass (void); extern int hourglass_started (void); -extern int display_hourglass_p; extern int hourglass_shown_p; struct atimer; /* Defined in atimer.h. */ /* If non-null, an asynchronous timer that, when it expires, displays @@ -3265,11 +3235,6 @@ extern void hide_hourglass (void); int popup_activated (void); -/* Defined in dispnew.c */ - -extern int inverse_video; -extern int required_matrix_width (struct window *); -extern int required_matrix_height (struct window *); extern Lisp_Object buffer_posn_from_coords (struct window *, int *, int *, struct display_pos *, @@ -3287,7 +3252,6 @@ extern void redraw_frame (struct frame *); extern void redraw_garbaged_frames (void); extern void cancel_line (int, struct frame *); extern void init_desired_glyphs (struct frame *); -extern int scroll_frame_lines (struct frame *, int, int, int, int); extern int update_frame (struct frame *, int, int); extern int scrolling (struct frame *); extern void bitch_at_user (void); @@ -3309,7 +3273,6 @@ void increment_row_positions (struct glyph_row *, EMACS_INT, EMACS_INT); void enable_glyph_matrix_rows (struct glyph_matrix *, int, int, int); void clear_glyph_row (struct glyph_row *); void prepare_desired_row (struct glyph_row *); -int line_hash_code (struct glyph_row *); void set_window_update_flags (struct window *, int); void update_single_window (struct window *, int); void do_pending_window_change (int); @@ -3386,9 +3349,6 @@ enum resource_types extern Lisp_Object x_get_arg (Display_Info *, Lisp_Object, Lisp_Object, const char *, const char *class, enum resource_types); -extern Lisp_Object x_frame_get_arg (struct frame *, Lisp_Object, - Lisp_Object, const char *, const char *, - enum resource_types); extern Lisp_Object x_frame_get_and_record_arg (struct frame *, Lisp_Object, Lisp_Object, const char *, const char *, @@ -3402,5 +3362,3 @@ extern Lisp_Object x_default_parameter (struct frame *, Lisp_Object, #endif /* not DISPEXTERN_H_INCLUDED */ -/* arch-tag: c65c475f-1c1e-4534-8795-990b8509fd65 - (do not change this comment) */ |