Mercurial > hg > xemacs-beta
view 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 |
line wrap: on
line source
/* Gtk-specific glyphs and related. Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995, 1996 Ben Wing Copyright (C) 1995 Sun Microsystems, Inc. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Gtk version by William Perry */ #ifndef _XEMACS_GLYPHS_GTK_H_ #define _XEMACS_GLYPHS_GTK_H_ #include "glyphs.h" #include "sysgtk.h" #ifdef HAVE_GTK /**************************************************************************** * Image-Instance Object * ****************************************************************************/ struct gtk_image_instance_data { GdkPixmap **pixmaps; GdkCursor *cursor; /* If depth>0, then that means that other colors were allocated when this pixmap was loaded. These are they; we need to free them when finalizing the image instance. */ GdkColormap *colormap; unsigned long *pixels; int npixels; /* Should we hang on to the extra info from the XpmAttributes, like the textual color table and the comments? Is that useful? */ }; struct gtk_subwindow_data { union { struct { GtkWidget *parent_window; GtkWidget *clip_window; } sub; struct { GtkWidget *clip_window; Lisp_Object widget; guint x_offset; guint y_offset; gboolean added_to_fixed; } wid; } data; }; void init_image_instance_from_gdk_pixmap (struct Lisp_Image_Instance *ii, struct device *device, GdkPixmap *gdk_pixmap, int dest_mask, Lisp_Object instantiator); #define GTK_IMAGE_INSTANCE_DATA(i) ((struct gtk_image_instance_data *) (i)->data) #define IMAGE_INSTANCE_GTK_PIXMAP(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps[0]) #define IMAGE_INSTANCE_GTK_PIXMAP_SLICE(i,slice) \ (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps[slice]) #define IMAGE_INSTANCE_GTK_PIXMAP_SLICES(i) \ (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps) #define IMAGE_INSTANCE_GTK_MASK(i) ((GdkPixmap*)(IMAGE_INSTANCE_PIXMAP_MASK (i))) #define IMAGE_INSTANCE_GTK_CURSOR(i) (GTK_IMAGE_INSTANCE_DATA (i)->cursor) #define IMAGE_INSTANCE_GTK_COLORMAP(i) (GTK_IMAGE_INSTANCE_DATA (i)->colormap) #define IMAGE_INSTANCE_GTK_PIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixels) #define IMAGE_INSTANCE_GTK_NPIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->npixels) #define XIMAGE_INSTANCE_GTK_PIXMAP(i) \ IMAGE_INSTANCE_GTK_PIXMAP (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_PIXMAP_SLICE(i) \ IMAGE_INSTANCE_GTK_PIXMAP_SLICE (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_PIXMAP_SLICES(i) \ IMAGE_INSTANCE_GTK_PIXMAP_SLICES (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_MASK(i) \ IMAGE_INSTANCE_GTK_MASK (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_CURSOR(i) \ IMAGE_INSTANCE_GTK_CURSOR (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_PIXELS(i) \ IMAGE_INSTANCE_GTK_PIXELS (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_NPIXELS(i) \ IMAGE_INSTANCE_GTK_NPIXELS (XIMAGE_INSTANCE (i)) /* Subwindow / widget stuff */ #define GTK_SUBWINDOW_INSTANCE_DATA(i) ((struct gtk_subwindow_data *) (i)->data) #define IMAGE_INSTANCE_GTK_SUBWINDOW_PARENT(i) \ (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.sub.parent_window) #define IMAGE_INSTANCE_GTK_CLIPWINDOW(i) \ (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.sub.clip_window) #define IMAGE_INSTANCE_GTK_WIDGET_XOFFSET(i) \ (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.x_offset) #define IMAGE_INSTANCE_GTK_WIDGET_YOFFSET(i) \ (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.y_offset) #define IMAGE_INSTANCE_GTK_WIDGET_LWID(i) \ (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.id) #define IMAGE_INSTANCE_GTK_CLIPWIDGET(i) \ (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.clip_window) #define IMAGE_INSTANCE_GTK_ALREADY_PUT(i) \ (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.added_to_fixed) #define IMAGE_INSTANCE_GTK_SUBWINDOW_ID(i) \ ((GdkWindow *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) #define IMAGE_INSTANCE_GTK_WIDGET_ID(i) \ ((GtkWidget *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) #define XIMAGE_INSTANCE_GTK_SUBWINDOW_PARENT(i) \ IMAGE_INSTANCE_GTK_SUBWINDOW_PARENT (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_SUBWINDOW_DISPLAY(i) \ IMAGE_INSTANCE_GTK_SUBWINDOW_DISPLAY (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_WIDGET_XOFFSET(i) \ IMAGE_INSTANCE_GTK_WIDGET_XOFFSET (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_WIDGET_YOFFSET(i) \ IMAGE_INSTANCE_GTK_WIDGET_YOFFSET (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_WIDGET_LWID(i) \ IMAGE_INSTANCE_GTK_WIDGET_LWID (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_CLIPWIDGET(i) \ IMAGE_INSTANCE_GTK_CLIPWIDGET (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_CLIPWINDOW(i) \ IMAGE_INSTANCE_GTK_CLIPWINDOW (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_GTK_WIDGET_ID(i) \ IMAGE_INSTANCE_GTK_WIDGET_ID (XIMAGE_INSTANCE (i)) #define DOMAIN_GTK_WIDGET(domain) \ ((IMAGE_INSTANCEP (domain) && \ GTK_SUBWINDOW_INSTANCE_DATA (XIMAGE_INSTANCE (domain))) ? \ XIMAGE_INSTANCE_GTK_WIDGET_ID (domain) : \ FRAME_GTK_CONTAINER_WIDGET (f) (DOMAIN_XFRAME (domain))) #endif /* HAVE_GTK */ #endif /* _XEMACS_GLYPHS_GTK_H_ */