Mercurial > hg > xemacs-beta

comparison src/faces.h @ 5080:5502045ec510

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The background-placement face property. -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-02-25 Didier Verna <didier@xemacs.org> The background-placement face property. * cl-macs.el (face-background-placement): New defsetf. * cus-face.el (custom-face-attributes): * faces.el (face-interactive): * faces.el (set-face-property): * faces.el (face-equal): * faces.el (init-other-random-faces): Update. * faces.el (face-background-placement): * faces.el (set-face-background-placement): * faces.el (face-background-placement-instance): * faces.el (face-background-placement-instance-p): * frame.el (set-frame-background-placement): * frame.el (frame-background-placement): * frame.el (frame-background-placement-instance): * objects.el (make-face-background-placement-specifier): New. man/ChangeLog addition: 2010-02-25 Didier Verna <didier@xemacs.org> The background-placement face property. * xemacs/custom.texi (Faces): Document it. src/ChangeLog addition: 2010-02-25 Didier Verna <didier@xemacs.org> The background-placement face property. * console-x-impl.h (struct x_frame): Add new slots x and y. * console-x-impl.h (FRAME_X_X, FRAME_X_Y): New slot accessors. * console-gtk-impl.h: Fake something similar for potential port. * frame-x.c (x_get_frame_text_position): New function. * frame-x.c (x_init_frame_3): Use it. * event-Xt.c (emacs_Xt_handle_magic_event): Eat spurious ConfigureNotify events, get the frame position and mark frame faces changed. * objects-impl.h: The face_background_placement_specifier structure and its accessors. * objects.c: New symbols Qabsolute and Qrelative. * objects.c (face_background_placement_create): * objects.c (face_background_placement_mark): * objects.c (face_background_placement_instantiate): * objects.c (face_background_placement_validate): * objects.c (face_background_placement_after_change): * objects.c (set_face_background_placement_attached_to): New. * objects.h (set_face_background_palcement_attached_to): Declare the one above. * objects.c (syms_of_objects): * objects.c (specifier_type_create_objects): * objects.c (reinit_specifier_type_create_objects): * objects.c (reinit_vars_of_objects): Update for the modifications above. * console-xlike-inc.h (XLIKE_GC_TS_X_ORIGIN, XLIKE_GC_TS_X_ORIGIN): New X11/Gtk compatibility macros. * redisplay-xlike-inc.c (XLIKE_get_gc): Add a background placement argument and handle it. * gtk-glue.c (face_to_gc): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay-xlike-inc.c (XLIKE_output_pixmap): * redisplay-xlike-inc.c (XLIKE_output_blank): * redisplay-xlike-inc.c (XLIKE_output_horizontal_line): * redisplay-xlike-inc.c (XLIKE_output_eol_cursor): Update accordingly. * console-impl.h (struct console_methods): Add a background placement (Lisp_Object) argument to the clear_region method. * console-stream.c (stream_clear_region): * redisplay-tty.c (tty_clear_region): * redisplay-msw.c (mswindows_clear_region): * redisplay-xlike-inc.c (XLIKE_clear_region): Update accordingly. * redisplay-output.c (redisplay_clear_region): Handle the background placement property and update the call to the clear_region method. * faces.h (struct Lisp_Face): * faces.h (struct face_cachel): Add a background placement slot. * faces.h (WINDOW_FACE_CACHEL_BACKGROUND_PLACEMENT): New accessor. * 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 (mark_face_cachels): * faces.c (update_face_cachel_data): * faces.c (merge_face_cachel_data): * faces.c (reset_face_cachel): * faces.c (Fmake_face): * faces.c (Fcopy_face): Handle the background placement property. * faces.c (syms_of_faces): * faces.c (vars_of_faces): * faces.c (complex_vars_of_faces): Update accordingly.
author Didier Verna <didier@lrde.epita.fr>
date Thu, 25 Feb 2010 16:19:01 +0100
parents 07dcc7000bbf
children 7be849cb8828
comparison
equal deleted inserted replaced
5079:aa4cae427255 5080:5502045ec510
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) \