xemacs-beta: src/redisplay.h comparison

comparison src/redisplay.h @ 442:abe6d1db359e r21-2-36

Import from CVS: tag r21-2-36

author	cvs
date	Mon, 13 Aug 2007 11:35:02 +0200
parents	8de8e3f6228a
children	1ccc32a20af4

comparison

equal deleted inserted replaced

-:72a7cfa4a488
+:abe6d1db359e
 Redisplay commentary: Everything in redisplay is tied very tightly
 to the things that are being displayed, and the context,
 e.g. buffers and windows. According to Chuck this is so that we can
 get speed, which seems fine to me, however this usage is extended
-too far down the redispay routines IMO. At some level there should
+too far down the redisplay routines IMO. At some level there should
 be functions that know how to display strings with extents and
 faces, regardless of buffer etc. After all the window system does
 not care. <andy@xemacs.org> */
 typedef struct display_line display_line;
 layout_bounds bounds;			/* line boundary positions */
 char modeline;			/* t if this line is a modeline */
+char line_continuation;		/* t if this line continues to
+next display line. */
 /* Dynamic array of display blocks */
 display_block_dynarr *display_blocks;
 /* Dynamic arrays of left and right glyph blocks */
 glyph_block_dynarr *left_glyphs;
 appropriate flag.
 If any of these flags are set, redisplay will look more carefully
 to see if anything has really changed. */
-/* non-nil if the contents of a buffer have changed since the last time
+/* Nonzero if the contents of a buffer have changed since the last time
-redisplay completed */
+redisplay completed. */
 extern int buffers_changed;
 extern int buffers_changed_set;
 /* Nonzero if head_clip or tail_clip of a buffer has changed
-since last redisplay that finished */
+since last redisplay that finished. */
 extern int clip_changed;
 extern int clip_changed_set;
-/* non-nil if any extent has changed since the last time redisplay completed */
+/* Nonzero if any extent has changed since the last time redisplay completed. */
 extern int extents_changed;
 extern int extents_changed_set;
-/* non-nil if any face has changed since the last time redisplay completed */
+/* Nonzero if any face has changed since the last time redisplay completed. */
 extern int faces_changed;
-/* Nonzero means one or more frames have been marked as garbaged */
+/* Nonzero means one or more frames have been marked as garbaged. */
 extern int frame_changed;
 /* True if any of the builtin display glyphs (continuation,
 hscroll, control-arrow, etc) is in need of updating
 somewhere. */
 /* True if a menubar is in need of updating somewhere. */
 extern int menubar_changed;
 extern int menubar_changed_set;
-/* true iff we should redraw the modelines on the next redisplay */
+/* True iff we should redraw the modelines on the next redisplay. */
 extern int modeline_changed;
 extern int modeline_changed_set;
-/* non-nil if point has changed in some buffer since the last time
+/* Nonzero if point has changed in some buffer since the last time
-redisplay completed */
+redisplay completed. */
 extern int point_changed;
 extern int point_changed_set;
-/* non-nil if some frame has changed its size */
+/* Nonzero if some frame has changed its size. */
 extern int size_changed;
-/* non-nil if some device has signaled that it wants to change size */
+/* Nonzero if some device has signaled that it wants to change size. */
 extern int asynch_device_change_pending;
-/* non-nil if any toolbar has changed */
+/* Nonzero if any toolbar has changed. */
 extern int toolbar_changed;
 extern int toolbar_changed_set;
-/* non-nil if any gutter has changed */
+/* Nonzero if any gutter has changed. */
 extern int gutter_changed;
 extern int gutter_changed_set;
-/* non-nil if any window has changed since the last time redisplay completed */
+/* Nonzero if any window has changed since the last time redisplay completed */
 extern int windows_changed;
-/* non-nil if any frame's window structure has changed since the last
+/* Nonzero if any frame's window structure has changed since the last
-time redisplay completed */
+time redisplay completed. */
 extern int windows_structure_changed;
 /* These macros can be relatively expensive.  Since they are often
 called numerous times between each call to redisplay, we keep track
 if each has already been called and don't bother doing most of the
 #define GLOBAL_RESET_CHANGED_FLAGS do {		\
 buffers_changed = 0;				\
 clip_changed = 0;				\
 extents_changed = 0;				\
-faces_changed = 0;				\
 frame_changed = 0;				\
 icon_changed = 0;				\
 menubar_changed = 0;				\
 modeline_changed = 0;				\
 point_changed = 0;				\
 toolbar_changed = 0;				\
 gutter_changed = 0;				\
 glyphs_changed = 0;				\
 subwindows_changed = 0;			\
-subwindows_state_changed = 0;		\
+subwindows_state_changed = 0;			\
 windows_changed = 0;				\
 windows_structure_changed = 0;		\
 } while (0)
 #define CLASS_REDISPLAY_FLAGS_CHANGEDP(p)	\
 (p)->modeline_changed ||			\
 (p)->point_changed ||			\
 (p)->toolbar_changed ||			\
 (p)->gutter_changed ||			\
 (p)->glyphs_changed ||			\
-(p)->size_changed ||				\
+(p)->size_changed ||			\
 (p)->subwindows_changed ||			\
 (p)->subwindows_state_changed ||		\
 (p)->windows_changed ||			\
 (p)->windows_structure_changed )
 /* Nonzero means no need to redraw the entire frame on resuming
 a suspended Emacs.  This is useful on terminals with multiple pages,
 where one page is used for Emacs and another for all else. */
 extern int no_redraw_on_reenter;
-/* Nonzero means flash the frame instead of ringing the bell.  */
+/* Non-nil means flash the frame instead of ringing the bell.  */
-extern int visible_bell;
+extern Lisp_Object Vvisible_bell;
 /* Thickness of shadow border around 3D modelines. */
 extern Lisp_Object Vmodeline_shadow_thickness;
 /* Scroll if point lands on the bottom line and that line is partially
 /* If non-zero, a window-system was specified on the command line.
 Defined in emacs.c. */
 extern int display_arg;
 /* Type of display specified.  Defined in emacs.c. */
-extern CONST char *display_use;
+extern const char *display_use;
 /* Nonzero means reading single-character input with prompt
 so put cursor on minibuffer after the prompt.  */
 extern int cursor_in_echo_area;
 extern Lisp_Object Qbar_cursor, Qcursor_in_echo_area, Vwindow_system;
+extern Lisp_Object Qtop_bottom;
 /*************************************************************************/
 /*                     redisplay exported functions                      */
 /*************************************************************************/
 int redisplay_frame_text_width_string (struct frame *f,
 				       Lisp_Object face,
 				       Bufbyte *nonreloc,
 				       Lisp_Object reloc,
 				       Bytecount offset, Bytecount len);
+int redisplay_frame (struct frame *f, int preemption_check);
 void redisplay (void);
 struct display_block *get_display_block_from_line (struct display_line *dl,
 						   enum display_type type);
 layout_bounds calculate_display_line_boundaries (struct window *w,
 						 int modeline);
 int line_at_center (struct window *w, int type, Bufpos start, Bufpos point);
 int window_half_pixpos (struct window *w);
 void redisplay_echo_area (void);
 void free_display_structs (struct window_mirror *mir);
 void free_display_lines (display_line_dynarr *dla);
+void mark_redisplay_structs (display_line_dynarr *dla);
 void generate_displayable_area (struct window *w, Lisp_Object disp_string,
 				int xpos, int ypos, int width, int height,
 				display_line_dynarr* dl,
 				Bufpos start_pos, face_index default_face);
 /* `generate_title_string' in frame.c needs this */
 /* defined in redisplay-output.c */
 int get_next_display_block (layout_bounds bounds,
 			    display_block_dynarr *dba, int start_pos,
 			    int *next_start);
-void redisplay_output_layout (struct window *w,
+void redisplay_output_layout (Lisp_Object domain,
 			      Lisp_Object image_instance,
 			      struct display_box* db, struct display_glyph_area* dga,
 			      face_index findex, int cursor_start, int cursor_width,
 			      int cursor_height);
 void redisplay_output_subwindow (struct window *w,
 			   int no_output_end);
 void redisplay_redraw_cursor (struct frame *f, int run_begin_end_meths);
 void output_display_line (struct window *w, display_line_dynarr *cdla,
 			  display_line_dynarr *ddla, int line,
 			  int force_start, int force_end);
+void sync_display_line_structs (struct window *w, int line, int do_blocks,
+				display_line_dynarr *cdla,
+				display_line_dynarr *ddla);
 #endif /* INCLUDED_redisplay_h_ */

Mercurial > hg > xemacs-beta

comparison src/redisplay.h @ 442:abe6d1db359e r21-2-36