diff lisp/x-faces.el @ 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 308d34e9f07d
children 75ad4969a16d
line wrap: on
line diff
--- a/lisp/x-faces.el	Thu Dec 22 15:02:02 2011 +0000
+++ b/lisp/x-faces.el	Fri Dec 23 10:56:16 2011 +0100
@@ -714,6 +714,10 @@
 	       (concat name ".attributeStrikethru")
 	       "Face.AttributeStrikethru"
 	       'boolean locale))
+	 (fp (x-get-resource-and-maybe-bogosity-check
+	      (concat name ".attributeFlush")
+	      "Face.AttributeFlush"
+	      'boolean locale))
 	 ;; we still resource for these TTY-only resources so that you can
 	 ;; specify resources for TTY frames/devices. This is useful when you
 	 ;; start up your XEmacs on an X display and later open some TTY
@@ -879,6 +883,22 @@
 	(remove-specifier (face-property face 'reverse) locale
 			  tty-tag-set nil))
       (set-face-reverse-p face rp locale our-tag-set append))
+    (when fp
+      (cond (device-class
+	     (remove-specifier-specs-matching-tag-set-cdrs (face-property
+							    face 'flush)
+							   locale
+							   tty-tag-set)
+	     (remove-specifier-specs-matching-tag-set-cdrs (face-property
+							    face 'flush)
+							   locale
+							   x-tag-set))
+	    (t
+	     (remove-specifier (face-property face 'flush) locale
+			       tty-tag-set nil)
+	     (remove-specifier (face-property face 'flush) locale
+			       x-tag-set nil)))
+      (set-face-flush-p face fp locale our-tag-set append))
     ))
 
 ;; GNU Emacs compatibility. (move to obsolete.el?)