Mercurial > hg > xemacs-beta

comparison src/faces.h @ 5619:75ad4969a16d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace the 'flush face property with the opposite 'shrink one. lisp/ChangeLog addition: 2011-12-26 Didier Verna <didier@xemacs.org> * cl-macs.el (face-flush-p): Removed. * cl-macs.el (face-shrink-p): New. * faces.el (face-flush-p): Removed. * faces.el (face-shrink-p): New. * faces.el (set-face-flush-p): Removed. * faces.el (set-face-shrink-p): New. * cus-face.el (custom-face-attributes): * faces.el (set-face-property): * faces.el (face-equal): * x-faces.el (x-init-face-from-resources): * x-faces.el (make-face-x-resource-internal): Replace the 'flush property with the opposite 'shrink one. src/ChangeLog addition: 2011-12-26 Didier Verna <didier@xemacs.org> * lisp.h: * 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): * faces.c (syms_of_faces): * faces.c (vars_of_faces): * faces.c (complex_vars_of_faces): * faces.h (struct Lisp_Face): * faces.h (struct face_cachel): * faces.h (WINDOW_FACE_CACHEL_SHRINK_P): * faces.h (FACE_SHRINK_P): * fontcolor.c (face_boolean_validate): Replace the 'flush property with the opposite 'shrink one. * redisplay.c (create_text_block): * redisplay.c (create_string_text_block): Ditto. Invert the logic for storing a new clear_findex in the display lines.
author Didier Verna <didier@xemacs.org>
date Mon, 26 Dec 2011 15:04:25 +0100
parents b0d712bbc2a6
children c39052c921b5
comparison
equal deleted inserted replaced
5618:cc1ec4c93a67 5619:75ad4969a16d
52 Lisp_Object strikethru; 52 Lisp_Object strikethru;
53 Lisp_Object highlight; 53 Lisp_Object highlight;
54 Lisp_Object dim; 54 Lisp_Object dim;
55 Lisp_Object blinking; 55 Lisp_Object blinking;
56 Lisp_Object reverse; 56 Lisp_Object reverse;
57 Lisp_Object flush; 57 Lisp_Object shrink;
58 58
59 Lisp_Object plist; 59 Lisp_Object plist;
60 60
61 Lisp_Object charsets_warned_about; 61 Lisp_Object charsets_warned_about;
62 }; 62 };
179 unsigned int strikethru :1; 179 unsigned int strikethru :1;
180 unsigned int highlight :1; 180 unsigned int highlight :1;
181 unsigned int dim :1; 181 unsigned int dim :1;
182 unsigned int blinking :1; 182 unsigned int blinking :1;
183 unsigned int reverse :1; 183 unsigned int reverse :1;
184 unsigned int flush :1; 184 unsigned int shrink :1;
185 185
186 /* Used when merging to tell if the above field represents an actual 186 /* Used when merging to tell if the above field represents an actual
187 value of this face or a fallback value. */ 187 value of this face or a fallback value. */
188 DECLARE_INLINE_LISP_BIT_VECTOR(NUM_LEADING_BYTES) font_specified; 188 DECLARE_INLINE_LISP_BIT_VECTOR(NUM_LEADING_BYTES) font_specified;
189 189
197 unsigned int underline_specified :1; 197 unsigned int underline_specified :1;
198 unsigned int highlight_specified :1; 198 unsigned int highlight_specified :1;
199 unsigned int dim_specified :1; 199 unsigned int dim_specified :1;
200 unsigned int blinking_specified :1; 200 unsigned int blinking_specified :1;
201 unsigned int reverse_specified :1; 201 unsigned int reverse_specified :1;
202 unsigned int flush_specified :1; 202 unsigned int shrink_specified :1;
203 203
204 /* The updated flag is set after we calculate the values for the 204 /* The updated flag is set after we calculate the values for the
205 face cachel and cleared whenever a face changes, to indicate 205 face cachel and cleared whenever a face changes, to indicate
206 that the values stored here might be wrong. The next time 206 that the values stored here might be wrong. The next time
207 we go to access the values, we recompute them; if any values 207 we go to access the values, we recompute them; if any values
357 (WINDOW_FACE_CACHEL (window, index)->dim) 357 (WINDOW_FACE_CACHEL (window, index)->dim)
358 #define WINDOW_FACE_CACHEL_BLINKING_P(window, index) \ 358 #define WINDOW_FACE_CACHEL_BLINKING_P(window, index) \
359 (WINDOW_FACE_CACHEL (window, index)->blinking) 359 (WINDOW_FACE_CACHEL (window, index)->blinking)
360 #define WINDOW_FACE_CACHEL_REVERSE_P(window, index) \ 360 #define WINDOW_FACE_CACHEL_REVERSE_P(window, index) \
361 (WINDOW_FACE_CACHEL (window, index)->reverse) 361 (WINDOW_FACE_CACHEL (window, index)->reverse)
362 #define WINDOW_FACE_CACHEL_FLUSH_P(window, index) \ 362 #define WINDOW_FACE_CACHEL_SHRINK_P(window, index) \
363 (WINDOW_FACE_CACHEL (window, index)->flush) 363 (WINDOW_FACE_CACHEL (window, index)->shrink)
364 364
365 #define FACE_PROPERTY_SPECIFIER(face, property) Fget (face, property, Qnil) 365 #define FACE_PROPERTY_SPECIFIER(face, property) Fget (face, property, Qnil)
366 366
367 #define FACE_PROPERTY_INSTANCE_1(face, property, domain, errb, no_fallback, depth) \ 367 #define FACE_PROPERTY_INSTANCE_1(face, property, domain, errb, no_fallback, depth) \
368 specifier_instance (FACE_PROPERTY_SPECIFIER (face, property), Qunbound, \ 368 specifier_instance (FACE_PROPERTY_SPECIFIER (face, property), Qunbound, \
420 (!NILP (FACE_PROPERTY_INSTANCE (face, Qdim, domain, 0, Qzero))) 420 (!NILP (FACE_PROPERTY_INSTANCE (face, Qdim, domain, 0, Qzero)))
421 #define FACE_BLINKING_P(face, domain) \ 421 #define FACE_BLINKING_P(face, domain) \
422 (!NILP (FACE_PROPERTY_INSTANCE (face, Qblinking, domain, 0, Qzero))) 422 (!NILP (FACE_PROPERTY_INSTANCE (face, Qblinking, domain, 0, Qzero)))
423 #define FACE_REVERSE_P(face, domain) \ 423 #define FACE_REVERSE_P(face, domain) \
424 (!NILP (FACE_PROPERTY_INSTANCE (face, Qreverse, domain, 0, Qzero))) 424 (!NILP (FACE_PROPERTY_INSTANCE (face, Qreverse, domain, 0, Qzero)))
425 #define FACE_FLUSH_P(face, domain) \ 425 #define FACE_SHRINK_P(face, domain) \
426 (!NILP (FACE_PROPERTY_INSTANCE (face, Qflush, domain, 0, Qzero))) 426 (!NILP (FACE_PROPERTY_INSTANCE (face, Qshrink, domain, 0, Qzero)))
427 427
428 #endif /* INCLUDED_faces_h_ */ 428 #endif /* INCLUDED_faces_h_ */