comparison src/console-x-impl.h @ 5080:5502045ec510

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 a6c778975d7d
children 7be849cb8828
comparison
equal deleted inserted replaced
5079:aa4cae427255 5080:5502045ec510
1 /* Define X specific console, device, and frame object for XEmacs. 1 /* Define X specific console, device, and frame object for XEmacs.
2 Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. 2 Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1996, 2002, 2003 Ben Wing. 4 Copyright (C) 1996, 2002, 2003 Ben Wing.
5 Copyright (C) 2010 Didier Verna
5 6
6 This file is part of XEmacs. 7 This file is part of XEmacs.
7 8
8 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 10 under the terms of the GNU General Public License as published by the
263 Widget menubar_widget; 264 Widget menubar_widget;
264 265
265 /* The widget of the edit portion of this frame; this is an EmacsFrame, 266 /* The widget of the edit portion of this frame; this is an EmacsFrame,
266 and the window of this widget is what the redisplay code draws on. */ 267 and the window of this widget is what the redisplay code draws on. */
267 Widget edit_widget; 268 Widget edit_widget;
269 /* Position of the edit widget above, for absolute background placement. */
270 int x, y;
268 271
269 /* Lists the widgets above the text area, in the proper order. 272 /* Lists the widgets above the text area, in the proper order.
270 Used by the EmacsManager. */ 273 Used by the EmacsManager. */
271 Widget top_widgets[MAX_CONCURRENT_TOP_WIDGETS]; 274 Widget top_widgets[MAX_CONCURRENT_TOP_WIDGETS];
272 int num_top_widgets; 275 int num_top_widgets;
358 #define wrap_x_frame(p) wrap_record (p, x_frame) 361 #define wrap_x_frame(p) wrap_record (p, x_frame)
359 #define X_FRAME_P(x) RECORDP (x, x_frame) 362 #define X_FRAME_P(x) RECORDP (x, x_frame)
360 #endif /* NEW_GC */ 363 #endif /* NEW_GC */
361 #define FRAME_X_DATA(f) FRAME_TYPE_DATA (f, x) 364 #define FRAME_X_DATA(f) FRAME_TYPE_DATA (f, x)
362 365
366 #define FRAME_X_X(f) (FRAME_X_DATA (f)->x)
367 #define FRAME_X_Y(f) (FRAME_X_DATA (f)->y)
363 #define FRAME_X_SHELL_WIDGET(f) (FRAME_X_DATA (f)->widget) 368 #define FRAME_X_SHELL_WIDGET(f) (FRAME_X_DATA (f)->widget)
364 #define FRAME_X_CONTAINER_WIDGET(f) (FRAME_X_DATA (f)->container) 369 #define FRAME_X_CONTAINER_WIDGET(f) (FRAME_X_DATA (f)->container)
365 #define FRAME_X_MENUBAR_WIDGET(f) (FRAME_X_DATA (f)->menubar_widget) 370 #define FRAME_X_MENUBAR_WIDGET(f) (FRAME_X_DATA (f)->menubar_widget)
366 #define FRAME_X_TEXT_WIDGET(f) (FRAME_X_DATA (f)->edit_widget) 371 #define FRAME_X_TEXT_WIDGET(f) (FRAME_X_DATA (f)->edit_widget)
367 #define FRAME_X_TOP_WIDGETS(f) (FRAME_X_DATA (f)->top_widgets) 372 #define FRAME_X_TOP_WIDGETS(f) (FRAME_X_DATA (f)->top_widgets)
405 #endif /* XIM_XLIB */ 410 #endif /* XIM_XLIB */
406 #endif /* HAVE_XIM */ 411 #endif /* HAVE_XIM */
407 412
408 extern struct console_type *x_console_type; 413 extern struct console_type *x_console_type;
409 414
415 void x_get_frame_text_position (struct frame *);
416
410 #endif /* HAVE_X_WINDOWS */ 417 #endif /* HAVE_X_WINDOWS */
411 418
412 #endif /* INCLUDED_console_x_impl_h_ */ 419 #endif /* INCLUDED_console_x_impl_h_ */