diff src/redisplay-output.c @ 5617:b0d712bbc2a6

The "flush" face property. -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2011-12-23 Didier Verna <didier@xemacs.org> * faces.h (struct Lisp_Face): New 'flush slot. * faces.h (struct face_cachel): New 'flush and 'flush_specified flags. * faces.h (WINDOW_FACE_CACHEL_FLUSH_P): * faces.h (FACE_FLUSH_P): New macros. * faces.c: Declare Qflush. * lisp.h: Externalize it. * faces.c (syms_of_faces): Define it. * faces.c (vars_of_faces): Update built-in face specifiers. * faces.c (complex_vars_of_faces): Update specifier fallbacks. * faces.c (mark_face): * faces.c (face_equal): * faces.c (face_getprop): * faces.c (face_putprop): * faces.c (face_remprop): * faces.c (face_plist): * faces.c (reset_face): * faces.c (update_face_inheritance_mapper): * faces.c (Fmake_face): * faces.c (update_face_cachel_data): * faces.c (merge_face_cachel_data): * faces.c (Fcopy_face): * fontcolor.c (face_boolean_validate): Handle the flush property. * redisplay.h (struct display_line): Rename 'default_findex slot to clearer name 'clear_findex. * redisplay.h (DISPLAY_LINE_INIT): Update accordingly. * redisplay-output.c (compare_display_blocks): * redisplay-output.c (output_display_line): * redisplay-output.c (redisplay_output_window): * redisplay.c (regenerate_window_extents_only_changed): * redisplay.c (regenerate_window_incrementally): Update the comparison tests between the current and desired display lines to cope for different 'clear_findex values. * redisplay.c (create_text_block): Initialize the display line's 'clear_findex slot to DEFAULT_INDEX. Record a new 'clear_findex value when we encounter a newline character displayed in a flushed face. * redisplay.c (create_string_text_block): Record a new 'clear_findex value when we encounter a newline character displayed in a flushed face. lisp/ChangeLog addition: 2011-12-23 Didier Verna <didier@xemacs.org> * cl-macs.el (face-flush-p): New defsetf. * faces.el (set-face-property): Document the flush property. * faces.el (face-flush-p): New function. * faces.el (set-face-flush-p): New function. * faces.el (face-equal): * cus-face.el (custom-face-attributes): * x-faces.el (x-init-face-from-resources): * x-faces.el (make-face-x-resource-internal): Handle the flush property.
author Didier Verna <didier@xemacs.org>
date Fri, 23 Dec 2011 10:56:16 +0100
parents 56144c8593a8
children c39052c921b5
line wrap: on
line diff
--- a/src/redisplay-output.c	Thu Dec 22 15:02:02 2011 +0000
+++ b/src/redisplay-output.c	Fri Dec 23 10:56:16 2011 +0100
@@ -556,6 +556,7 @@
       cdl->ascent != ddl->ascent ||
       cdl->descent != ddl->descent ||
       cdl->clip != ddl->clip ||
+      cdl->clear_findex != ddl->clear_findex ||
       force)
     {
       start_pos = 0;
@@ -788,7 +789,8 @@
 			   cdl->ascent != ddl->ascent ||
 			   cdl->descent != ddl->descent ||
 			   cdl->top_clip != ddl->top_clip ||
-			   cdl->clip != ddl->clip)))
+			   cdl->clip != ddl->clip ||
+			   cdl->clear_findex != ddl->clear_findex)))
 		{
 		  int x, y, width, height;
 		  face_index findex;
@@ -807,8 +809,8 @@
 		    }
 		  else if (x < ddl->bounds.right_in)
 		    {
-		      findex = (ddl->default_findex >= DEFAULT_INDEX) ?
-			ddl->default_findex
+		      findex = (ddl->clear_findex >= DEFAULT_INDEX) ?
+			ddl->clear_findex
 			: DEFAULT_INDEX;
 		    }
 		  else if (x < ddl->bounds.right_out)
@@ -2425,7 +2427,8 @@
 	  else if (cdl->ypos != ddl->ypos ||
 		   cdl->ascent != ddl->ascent ||
 		   cdl->descent != ddl->descent ||
-		   cdl->clip != ddl->clip)
+		   cdl->clip != ddl->clip ||
+		   cdl->clear_findex != ddl->clear_findex)
 	    need_to_clear_bottom = 1;
 
 	  /* #### This kludge is to make sure the modeline shadows get