Mercurial > hg > xemacs-beta

annotate src/xgccache.h @ 4908:b3ce27ca7647

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ad2f4ae9895b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2587
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
1 /* Efficient caching of X GCs (graphics contexts).
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
2 Copyright (C) 1993 Free Software Foundation, Inc.
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
3
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
4
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
5 This file is part of XEmacs.
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
6
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
7 XEmacs is free software; you can redistribute it and/or modify it
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
9 Free Software Foundation; either version 2, or (at your option) any
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
10 later version.
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
11
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
15 for more details.
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
16
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
18 along with XEmacs; see the file COPYING. If not, write to
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
20 Boston, MA 02111-1307, USA. */
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
21
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
22 /* Synched up with: Not in FSF. */
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
23
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
24 /* Written by jwz, 14 jun 93 */
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
25
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
26 #ifndef INCLUDED_xgccache_h_
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
27 #define INCLUDED_xgccache_h_
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
28
4908
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents: 3094
diff changeset
29 #include <X11/Xlib.h>
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents: 3094
diff changeset
30
2587
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
31 struct gc_cache;
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
32 struct gc_cache *make_gc_cache (Display *, Window);
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
33 void free_gc_cache (struct gc_cache *cache);
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
34 GC gc_cache_lookup (struct gc_cache *, XGCValues *, unsigned long mask);
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
35
3094
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
36 #define XE_GCONTEXT(cell) (XGContextFromGC(cell->gc))
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
37
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
38 #ifdef DEBUG_XEMACS
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
39
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
40 void describe_gc_cache (struct gc_cache *cache, int flags);
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
41
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
42 #define DGCCFLAG_DISABLE 0
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
43 #define DGCCFLAG_SUMMARY 1 << 0
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
44 #define DGCCFLAG_LIST_CELLS 1 << 1
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
45 #define DGCCFLAG_CELL_DETAILS 1 << 2
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
46 /* A combination of the flags above. */
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
47 #define DGCCFLAG_DEFAULT DGCCFLAG_SUMMARY | DGCCFLAG_LIST_CELLS
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
48 #endif
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 2587
diff changeset
49
2587
1e2a3710564c [xemacs-hg @ 2005-02-15 03:17:07 by ben]
ben
parents:
diff changeset
50 #endif /* INCLUDED_xgccache_h_ */