Mercurial > hg > xemacs-beta

comparison src/faces.h @ 5128:7be849cb8828 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Sun, 07 Mar 2010 02:09:59 -0600
parents a9c41067dd88 5502045ec510
children 1fae11d56ad2
comparison
equal deleted inserted replaced
5127:a9c41067dd88 5128:7be849cb8828
1 /* Face data structures. 1 /* Face data structures.
2 Copyright (C) 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1995, 2002, 2010 Ben Wing 3 Copyright (C) 1995, 2002, 2010 Ben Wing
4 Copyright (C) 2010 Didier Verna
4 5
5 This file is part of XEmacs. 6 This file is part of XEmacs.
6 7
7 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
45 Lisp_Object background; 46 Lisp_Object background;
46 Lisp_Object font; 47 Lisp_Object font;
47 48
48 Lisp_Object display_table; 49 Lisp_Object display_table;
49 Lisp_Object background_pixmap; 50 Lisp_Object background_pixmap;
51 Lisp_Object background_placement;
50 52
51 Lisp_Object underline; 53 Lisp_Object underline;
52 Lisp_Object strikethru; 54 Lisp_Object strikethru;
53 Lisp_Object highlight; 55 Lisp_Object highlight;
54 Lisp_Object dim; 56 Lisp_Object dim;
170 Could be reduced to maybe 50KB. */ 172 Could be reduced to maybe 50KB. */
171 Lisp_Object font[NUM_LEADING_BYTES]; 173 Lisp_Object font[NUM_LEADING_BYTES];
172 174
173 Lisp_Object display_table; 175 Lisp_Object display_table;
174 Lisp_Object background_pixmap; 176 Lisp_Object background_pixmap;
177 Lisp_Object background_placement;
175 178
176 unsigned int underline :1; 179 unsigned int underline :1;
177 unsigned int strikethru :1; 180 unsigned int strikethru :1;
178 unsigned int highlight :1; 181 unsigned int highlight :1;
179 unsigned int dim :1; 182 unsigned int dim :1;
186 189
187 unsigned int foreground_specified :1; 190 unsigned int foreground_specified :1;
188 unsigned int background_specified :1; 191 unsigned int background_specified :1;
189 unsigned int display_table_specified :1; 192 unsigned int display_table_specified :1;
190 unsigned int background_pixmap_specified :1; 193 unsigned int background_pixmap_specified :1;
194 unsigned int background_placement_specified :1;
191 195
192 unsigned int strikethru_specified :1; 196 unsigned int strikethru_specified :1;
193 unsigned int underline_specified :1; 197 unsigned int underline_specified :1;
194 unsigned int highlight_specified :1; 198 unsigned int highlight_specified :1;
195 unsigned int dim_specified :1; 199 unsigned int dim_specified :1;
338 : Qnil) 342 : Qnil)
339 #define WINDOW_FACE_CACHEL_DISPLAY_TABLE(window, index) \ 343 #define WINDOW_FACE_CACHEL_DISPLAY_TABLE(window, index) \
340 (WINDOW_FACE_CACHEL (window, index)->display_table) 344 (WINDOW_FACE_CACHEL (window, index)->display_table)
341 #define WINDOW_FACE_CACHEL_BACKGROUND_PIXMAP(window, index) \ 345 #define WINDOW_FACE_CACHEL_BACKGROUND_PIXMAP(window, index) \
342 (WINDOW_FACE_CACHEL (window, index)->background_pixmap) 346 (WINDOW_FACE_CACHEL (window, index)->background_pixmap)
347 #define WINDOW_FACE_CACHEL_BACKGROUND_PLACEMENT(window, index) \
348 (WINDOW_FACE_CACHEL (window, index)->background_placement)
343 #define WINDOW_FACE_CACHEL_DIRTY(window, index) \ 349 #define WINDOW_FACE_CACHEL_DIRTY(window, index) \
344 (WINDOW_FACE_CACHEL (window, index)->dirty) 350 (WINDOW_FACE_CACHEL (window, index)->dirty)
345 #define WINDOW_FACE_CACHEL_UNDERLINE_P(window, index) \ 351 #define WINDOW_FACE_CACHEL_UNDERLINE_P(window, index) \
346 (WINDOW_FACE_CACHEL (window, index)->underline) 352 (WINDOW_FACE_CACHEL (window, index)->underline)
347 #define WINDOW_FACE_CACHEL_HIGHLIGHT_P(window, index) \ 353 #define WINDOW_FACE_CACHEL_HIGHLIGHT_P(window, index) \
394 STAGE_INITIAL) 400 STAGE_INITIAL)
395 #define FACE_DISPLAY_TABLE(face, domain) \ 401 #define FACE_DISPLAY_TABLE(face, domain) \
396 FACE_PROPERTY_INSTANCE (face, Qdisplay_table, domain, 0, Qzero) 402 FACE_PROPERTY_INSTANCE (face, Qdisplay_table, domain, 0, Qzero)
397 #define FACE_BACKGROUND_PIXMAP(face, domain) \ 403 #define FACE_BACKGROUND_PIXMAP(face, domain) \
398 FACE_PROPERTY_INSTANCE (face, Qbackground_pixmap, domain, 0, Qzero) 404 FACE_PROPERTY_INSTANCE (face, Qbackground_pixmap, domain, 0, Qzero)
405
406 extern Lisp_Object Qbackground_placement;
407 #define FACE_BACKGROUND_PLACEMENT(face, domain) \
408 FACE_PROPERTY_INSTANCE (face, Qbackground_placement, domain, 0, Qzero)
409
399 #define FACE_UNDERLINE_P(face, domain) \ 410 #define FACE_UNDERLINE_P(face, domain) \
400 (!NILP (FACE_PROPERTY_INSTANCE (face, Qunderline, domain, 0, Qzero))) 411 (!NILP (FACE_PROPERTY_INSTANCE (face, Qunderline, domain, 0, Qzero)))
401 #define FACE_STRIKETHRU_P(face, domain) \ 412 #define FACE_STRIKETHRU_P(face, domain) \
402 (!NILP (FACE_PROPERTY_INSTANCE (face, Qstrikethru, domain, 0, Qzero))) 413 (!NILP (FACE_PROPERTY_INSTANCE (face, Qstrikethru, domain, 0, Qzero)))
403 #define FACE_HIGHLIGHT_P(face, domain) \ 414 #define FACE_HIGHLIGHT_P(face, domain) \