Mercurial > hg > xemacs-beta
annotate src/glyphs-gtk.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 | b3ce27ca7647 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 462 | 1 /* Gtk-specific glyphs and related. |
| 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 4 Copyright (C) 1995, 1996 Ben Wing | |
| 5 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
| 9 XEmacs is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 11 Free Software Foundation; either version 2, or (at your option) any | |
| 12 later version. | |
| 13 | |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 20 along with XEmacs; see the file COPYING. If not, write to | |
| 21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 Boston, MA 02111-1307, USA. */ | |
| 23 | |
| 24 /* Synched up with: Not in FSF. */ | |
| 25 /* Gtk version by William Perry */ | |
| 26 | |
| 27 #ifndef _XEMACS_GLYPHS_GTK_H_ | |
| 28 #define _XEMACS_GLYPHS_GTK_H_ | |
| 29 | |
| 30 #include "glyphs.h" | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
3087
diff
changeset
|
31 #include "sysgtk.h" |
| 462 | 32 |
| 33 #ifdef HAVE_GTK | |
| 34 | |
| 35 /**************************************************************************** | |
| 36 * Image-Instance Object * | |
| 37 ****************************************************************************/ | |
| 38 | |
| 39 struct gtk_image_instance_data | |
| 40 { | |
| 41 GdkPixmap **pixmaps; | |
| 42 GdkCursor *cursor; | |
| 43 | |
| 44 /* If depth>0, then that means that other colors were allocated when | |
| 45 this pixmap was loaded. These are they; we need to free them when | |
| 46 finalizing the image instance. */ | |
| 47 GdkColormap *colormap; | |
| 48 unsigned long *pixels; | |
| 49 int npixels; | |
| 50 | |
| 51 /* Should we hang on to the extra info from the XpmAttributes, like | |
| 52 the textual color table and the comments? Is that useful? */ | |
| 53 }; | |
| 54 | |
| 55 struct gtk_subwindow_data | |
| 56 { | |
| 57 union | |
| 58 { | |
| 59 struct | |
| 60 { | |
| 61 GtkWidget *parent_window; | |
| 62 GtkWidget *clip_window; | |
| 63 } sub; | |
| 64 struct | |
| 65 { | |
| 66 GtkWidget *clip_window; | |
| 67 Lisp_Object widget; | |
| 68 guint x_offset; | |
| 69 guint y_offset; | |
| 70 gboolean added_to_fixed; | |
| 71 } wid; | |
| 72 } data; | |
| 73 }; | |
| 74 | |
| 75 void init_image_instance_from_gdk_pixmap (struct Lisp_Image_Instance *ii, | |
| 76 struct device *device, | |
| 77 GdkPixmap *gdk_pixmap, | |
| 78 int dest_mask, | |
| 79 Lisp_Object instantiator); | |
| 80 | |
| 81 #define GTK_IMAGE_INSTANCE_DATA(i) ((struct gtk_image_instance_data *) (i)->data) | |
| 82 | |
| 83 #define IMAGE_INSTANCE_GTK_PIXMAP(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps[0]) | |
| 84 #define IMAGE_INSTANCE_GTK_PIXMAP_SLICE(i,slice) \ | |
| 85 (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps[slice]) | |
| 86 #define IMAGE_INSTANCE_GTK_PIXMAP_SLICES(i) \ | |
| 87 (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps) | |
| 3087 | 88 #define IMAGE_INSTANCE_GTK_MASK(i) ((GdkPixmap*)(IMAGE_INSTANCE_PIXMAP_MASK (i))) |
| 462 | 89 #define IMAGE_INSTANCE_GTK_CURSOR(i) (GTK_IMAGE_INSTANCE_DATA (i)->cursor) |
| 90 #define IMAGE_INSTANCE_GTK_COLORMAP(i) (GTK_IMAGE_INSTANCE_DATA (i)->colormap) | |
| 91 #define IMAGE_INSTANCE_GTK_PIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixels) | |
| 92 #define IMAGE_INSTANCE_GTK_NPIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->npixels) | |
| 93 | |
| 94 #define XIMAGE_INSTANCE_GTK_PIXMAP(i) \ | |
| 95 IMAGE_INSTANCE_GTK_PIXMAP (XIMAGE_INSTANCE (i)) | |
| 96 #define XIMAGE_INSTANCE_GTK_PIXMAP_SLICE(i) \ | |
| 97 IMAGE_INSTANCE_GTK_PIXMAP_SLICE (XIMAGE_INSTANCE (i)) | |
| 98 #define XIMAGE_INSTANCE_GTK_PIXMAP_SLICES(i) \ | |
| 99 IMAGE_INSTANCE_GTK_PIXMAP_SLICES (XIMAGE_INSTANCE (i)) | |
| 100 #define XIMAGE_INSTANCE_GTK_MASK(i) \ | |
| 101 IMAGE_INSTANCE_GTK_MASK (XIMAGE_INSTANCE (i)) | |
| 102 #define XIMAGE_INSTANCE_GTK_CURSOR(i) \ | |
| 103 IMAGE_INSTANCE_GTK_CURSOR (XIMAGE_INSTANCE (i)) | |
| 104 #define XIMAGE_INSTANCE_GTK_PIXELS(i) \ | |
| 105 IMAGE_INSTANCE_GTK_PIXELS (XIMAGE_INSTANCE (i)) | |
| 106 #define XIMAGE_INSTANCE_GTK_NPIXELS(i) \ | |
| 107 IMAGE_INSTANCE_GTK_NPIXELS (XIMAGE_INSTANCE (i)) | |
| 108 | |
| 109 /* Subwindow / widget stuff */ | |
| 110 #define GTK_SUBWINDOW_INSTANCE_DATA(i) ((struct gtk_subwindow_data *) (i)->data) | |
| 111 | |
| 112 #define IMAGE_INSTANCE_GTK_SUBWINDOW_PARENT(i) \ | |
| 113 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.sub.parent_window) | |
| 114 #define IMAGE_INSTANCE_GTK_CLIPWINDOW(i) \ | |
| 115 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.sub.clip_window) | |
| 116 #define IMAGE_INSTANCE_GTK_WIDGET_XOFFSET(i) \ | |
| 117 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.x_offset) | |
| 118 #define IMAGE_INSTANCE_GTK_WIDGET_YOFFSET(i) \ | |
| 119 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.y_offset) | |
| 120 #define IMAGE_INSTANCE_GTK_WIDGET_LWID(i) \ | |
| 121 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.id) | |
| 122 #define IMAGE_INSTANCE_GTK_CLIPWIDGET(i) \ | |
| 123 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.clip_window) | |
| 124 #define IMAGE_INSTANCE_GTK_ALREADY_PUT(i) \ | |
| 125 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.added_to_fixed) | |
| 126 #define IMAGE_INSTANCE_GTK_SUBWINDOW_ID(i) \ | |
| 127 ((GdkWindow *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
| 128 #define IMAGE_INSTANCE_GTK_WIDGET_ID(i) \ | |
| 129 ((GtkWidget *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
| 130 | |
| 131 #define XIMAGE_INSTANCE_GTK_SUBWINDOW_PARENT(i) \ | |
| 132 IMAGE_INSTANCE_GTK_SUBWINDOW_PARENT (XIMAGE_INSTANCE (i)) | |
| 133 #define XIMAGE_INSTANCE_GTK_SUBWINDOW_DISPLAY(i) \ | |
| 134 IMAGE_INSTANCE_GTK_SUBWINDOW_DISPLAY (XIMAGE_INSTANCE (i)) | |
| 135 #define XIMAGE_INSTANCE_GTK_WIDGET_XOFFSET(i) \ | |
| 136 IMAGE_INSTANCE_GTK_WIDGET_XOFFSET (XIMAGE_INSTANCE (i)) | |
| 137 #define XIMAGE_INSTANCE_GTK_WIDGET_YOFFSET(i) \ | |
| 138 IMAGE_INSTANCE_GTK_WIDGET_YOFFSET (XIMAGE_INSTANCE (i)) | |
| 139 #define XIMAGE_INSTANCE_GTK_WIDGET_LWID(i) \ | |
| 140 IMAGE_INSTANCE_GTK_WIDGET_LWID (XIMAGE_INSTANCE (i)) | |
| 141 #define XIMAGE_INSTANCE_GTK_CLIPWIDGET(i) \ | |
| 142 IMAGE_INSTANCE_GTK_CLIPWIDGET (XIMAGE_INSTANCE (i)) | |
| 143 #define XIMAGE_INSTANCE_GTK_CLIPWINDOW(i) \ | |
| 144 IMAGE_INSTANCE_GTK_CLIPWINDOW (XIMAGE_INSTANCE (i)) | |
| 145 #define XIMAGE_INSTANCE_GTK_WIDGET_ID(i) \ | |
| 146 IMAGE_INSTANCE_GTK_WIDGET_ID (XIMAGE_INSTANCE (i)) | |
| 147 | |
| 148 #define DOMAIN_GTK_WIDGET(domain) \ | |
| 149 ((IMAGE_INSTANCEP (domain) && \ | |
| 150 GTK_SUBWINDOW_INSTANCE_DATA (XIMAGE_INSTANCE (domain))) ? \ | |
| 151 XIMAGE_INSTANCE_GTK_WIDGET_ID (domain) : \ | |
| 152 FRAME_GTK_CONTAINER_WIDGET (f) (DOMAIN_XFRAME (domain))) | |
| 153 | |
| 154 #endif /* HAVE_GTK */ | |
| 155 #endif /* _XEMACS_GLYPHS_GTK_H_ */ |