Mercurial > hg > xemacs-beta
annotate src/glyphs-gtk.h @ 4908:b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* compiler.h:
Create a USED() macro to force unused-var warnings to go away,
in certain cases where it's inconvenient to do otherwise (e.g.
when THIS_IS_GTK in redisplay-xlike-inc.c).
* console-x.h:
Remove unneeded decls, make some static.
* redisplay-xlike-inc.c:
* console-xlike-inc.h: New file. Include defns from
redisplay-xlike-inc.c that may be useful in other XLIKE files.
Correct the handling of colors and font-style setting functions
in the xlike defns. Lots of fixes in the GTK-specific defns.
* depend: Regenerate.
* event-xlike-inc.c:
* event-xlike-inc.c (USE_UNICODE_MAP):
* event-xlike-inc.c (endif):
* gccache-gtk.c:
* gtk-glue.c (xemacs_list_to_gtklist):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-glue.c (FROB):
* gtk-glue.c (face_to_gc):
* gtk-glue.c (face_to_style):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.h (struct _GtkXEmacs):
* gtk-xemacs.h (struct _GtkXEmacsClass):
* objects-xlike-inc.c:
Cosmetic, comment fixes.
* glyphs.c (pixmap_to_lisp_data):
Unused var fixes.
* gtk-glue.c:
* gccache-gtk.c:
* gtk-xemacs.c:
* gtk-xemacs.h:
* objects-xlike-inc.c:
* ui-gtk.c:
* ui-gtk.h:
* xgccache.c:
* xgccache.c (GC_CACHE_SIZE):
* xgccache.h:
Misc include-file fixes.
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xlistfonts_checking_charset):
Combine some ifdeffed stuff using defs in console-xlike-inc.h.
* redisplay-gtk.c:
* redisplay-gtk.c (THIS_IS_GTK):
* redisplay-gtk.c (XLIKE_bevel_area):
* redisplay-gtk.c (XLIKE_ring_bell):
* redisplay-gtk.c (gdk_draw_text_image):
Fix numerous compile problems. Delete gtk_output_shadows(),
which mostly duplicates generic bevel_modeline(). Fix up
gtk_bevel_modeline() into XLIKE_bevel_area() and make use of
the style var properly to set the appropriate GTK constant.
* redisplay-x.c:
* redisplay-x.c (XLIKE_window_output_begin):
* redisplay-x.c (XLIKE_window_output_end):
* redisplay-x.c (XLIKE_bevel_area):
* redisplay-x.c (x_output_shadows):
* redisplay-x.c (XLIKE_ring_bell):
Make x_output_shadows be static. Change the defn of various
functions to look like XLIKE_foo() so it matches the calling
convention elsewhere.
* redisplay-xlike-inc.c:
* redisplay-xlike-inc.c (NEED_GCCACHE_H):
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_get_gc):
* redisplay-xlike-inc.c (XLIKE_text_width_single_run):
* redisplay-xlike-inc.c (XFT_FROB_LISP_COLOR):
* redisplay-xlike-inc.c (XLIKE_output_xlike_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_vertical_divider):
* redisplay-xlike-inc.c (XLIKE_flash):
Lots of header fixes. Lots of stuff moved to console-xlike-inc.h.
Use XFUN() to generate function names instead of directly
calling XLIKE_PASTE(). Remove unnecessary prototypes.
Unify calls to text_width funs. Make XLIKE_get_gc non-static
since it's called from gtk. Change the color-function calls
and fill-style-setting calls to match the changes in
console-xlike-inc.h. Use USED() to avoid some warnings.
* symsinit.h:
Sort the prototypes, and add a fun `sort-symsinit' in a comment
that does the sorting (using sort-regexp-fields).
* symsinit.h (init_number):
* sysgtk.h: New file, wraps the various GTK headers.
* sysgdkx.h: New file, wraps <gtk/gdkx.h>. Keep this separate to
* event-gtk.h: Delete. Combine stuff into console-gtk.h.
help isolate X-specific code from GTK.
* device-gtk.c:
* event-gtk.c:
* console-gtk.h:
* frame-gtk.c:
* gccache-gtk.c:
* gccache-gtk.h:
* glyphs-gtk.c (gtk_colorize_image_instance):
* glyphs-gtk.h:
* gtk-xemacs.h:
* objects-gtk.c:
* objects-gtk.c (MAX_FONT_COUNT):
* ui-gtk.h:
Use sysgtk.h or sysgdkx.h instead of directly including GTK
headers. Don't include event-gtk.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 01 Feb 2010 02:15:28 -0600 |
| parents | dbd2a866e38a |
| 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_ */ |