comparison src/redisplay-output.c @ 5624:c39052c921b5

New "foreback" face property. -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2011-12-27 Didier Verna <didier@xemacs.org> * cl-macs.el (face-foreback): New defsetf. * faces.el (set-face-property): Document the foreback property. * faces.el (face-foreback): * faces.el (face-foreback-instance): * faces.el (face-foreback-name): * faces.el (set-face-foreback): New functions. * faces.el (face-equal): * faces.el (init-other-random-faces): * cus-face.el (custom-face-attributes): * x-faces.el (x-init-face-from-resources): Handle the foreback property. src/ChangeLog addition: 2011-12-27 Didier Verna <didier@xemacs.org> * faces.h (struct Lisp_Face): New 'foreback slot. * faces.h (struct face_cachel): New 'foreback and 'foreback_specified slots. * faces.h (WINDOW_FACE_CACHEL_FOREBACK): * faces.h (FACE_FOREBACK): New macros. * faces.c: Declare Qforeback. * 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 (mark_face_cachels): * faces.c (update_face_cachel_data): * faces.c (merge_face_cachel_data): * faces.c (reset_face_cachel): * faces.c (face_property_was_changed): * faces.c (Fcopy_face): * fontcolor.c (face_color_validate): Handle the foreback property. * redisplay-msw.c (mswindows_output_blank): * redisplay-msw.c (mswindows_output_string): * redisplay-output.c (redisplay_clear_region): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay-xlike-inc.c (XLIKE_output_blank): Use the face's foreback color instead of the foreground one for drawing a background bitmap.
author Didier Verna <didier@xemacs.org>
date Tue, 27 Dec 2011 17:07:23 +0100
parents b0d712bbc2a6
children
comparison
equal deleted inserted replaced
5623:444713e89160 5624:c39052c921b5
1787 if (!UNBOUNDP (background_pixmap) 1787 if (!UNBOUNDP (background_pixmap)
1788 && XIMAGE_INSTANCE_PIXMAP_DEPTH (background_pixmap) == 0) 1788 && XIMAGE_INSTANCE_PIXMAP_DEPTH (background_pixmap) == 0)
1789 { 1789 {
1790 if (w) 1790 if (w)
1791 { 1791 {
1792 fcolor = WINDOW_FACE_CACHEL_FOREGROUND (w, findex); 1792 fcolor = WINDOW_FACE_CACHEL_FOREBACK (w, findex);
1793 bcolor = WINDOW_FACE_CACHEL_BACKGROUND (w, findex); 1793 bcolor = WINDOW_FACE_CACHEL_BACKGROUND (w, findex);
1794 } 1794 }
1795 else 1795 else
1796 { 1796 {
1797 fcolor = FACE_FOREGROUND (Vdefault_face, locale); 1797 fcolor = FACE_FOREBACK (Vdefault_face, locale);
1798 bcolor = FACE_BACKGROUND (Vdefault_face, locale); 1798 bcolor = FACE_BACKGROUND (Vdefault_face, locale);
1799 } 1799 }
1800 } 1800 }
1801 else 1801 else
1802 { 1802 {