Mercurial > hg > xemacs-beta

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
5616:79e9934779c1 5617:b0d712bbc2a6
554 f->faces_changed || 554 f->faces_changed ||
555 cdl->ypos != ddl->ypos || 555 cdl->ypos != ddl->ypos ||
556 cdl->ascent != ddl->ascent || 556 cdl->ascent != ddl->ascent ||
557 cdl->descent != ddl->descent || 557 cdl->descent != ddl->descent ||
558 cdl->clip != ddl->clip || 558 cdl->clip != ddl->clip ||
559 cdl->clear_findex != ddl->clear_findex ||
559 force) 560 force)
560 { 561 {
561 start_pos = 0; 562 start_pos = 0;
562 force = 1; 563 force = 1;
563 } 564 }
786 force || 787 force ||
787 (cdl && (cdl->ypos != ddl->ypos || 788 (cdl && (cdl->ypos != ddl->ypos ||
788 cdl->ascent != ddl->ascent || 789 cdl->ascent != ddl->ascent ||
789 cdl->descent != ddl->descent || 790 cdl->descent != ddl->descent ||
790 cdl->top_clip != ddl->top_clip || 791 cdl->top_clip != ddl->top_clip ||
791 cdl->clip != ddl->clip))) 792 cdl->clip != ddl->clip ||
793 cdl->clear_findex != ddl->clear_findex)))
792 { 794 {
793 int x, y, width, height; 795 int x, y, width, height;
794 face_index findex; 796 face_index findex;
795 797
796 must_sync = 1; 798 must_sync = 1;
805 ddl->left_margin_findex 807 ddl->left_margin_findex
806 : get_builtin_face_cache_index (w, Vleft_margin_face); 808 : get_builtin_face_cache_index (w, Vleft_margin_face);
807 } 809 }
808 else if (x < ddl->bounds.right_in) 810 else if (x < ddl->bounds.right_in)
809 { 811 {
810 findex = (ddl->default_findex >= DEFAULT_INDEX) ? 812 findex = (ddl->clear_findex >= DEFAULT_INDEX) ?
811 ddl->default_findex 813 ddl->clear_findex
812 : DEFAULT_INDEX; 814 : DEFAULT_INDEX;
813 } 815 }
814 else if (x < ddl->bounds.right_out) 816 else if (x < ddl->bounds.right_out)
815 { 817 {
816 findex = (ddl->right_margin_findex > DEFAULT_INDEX) ? 818 findex = (ddl->right_margin_findex > DEFAULT_INDEX) ?
2423 || (cdl->modeline && !ddl->modeline)) 2425 || (cdl->modeline && !ddl->modeline))
2424 need_to_clear_bottom = 1; 2426 need_to_clear_bottom = 1;
2425 else if (cdl->ypos != ddl->ypos || 2427 else if (cdl->ypos != ddl->ypos ||
2426 cdl->ascent != ddl->ascent || 2428 cdl->ascent != ddl->ascent ||
2427 cdl->descent != ddl->descent || 2429 cdl->descent != ddl->descent ||
2428 cdl->clip != ddl->clip) 2430 cdl->clip != ddl->clip ||
2431 cdl->clear_findex != ddl->clear_findex)
2429 need_to_clear_bottom = 1; 2432 need_to_clear_bottom = 1;
2430 2433
2431 /* #### This kludge is to make sure the modeline shadows get 2434 /* #### This kludge is to make sure the modeline shadows get
2432 redrawn if the modeline position shifts. */ 2435 redrawn if the modeline position shifts. */
2433 if (need_to_clear_bottom) 2436 if (need_to_clear_bottom)