Mercurial > hg > xemacs-beta

comparison src/fontcolor-impl.h @ 5176:8b2f75cecb89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename objects* (.c, .h and .el files) to fontcolor* -------------------- ChangeLog entries follow: -------------------- etc/ChangeLog addition: 2010-02-22 Ben Wing <ben@xemacs.org> * dbxrc.in: Rename objects.c -> fontcolor.c. lisp/ChangeLog addition: 2010-02-22 Ben Wing <ben@xemacs.org> * dumped-lisp.el (preloaded-file-list): * font.el (font-tty-find-closest-color): * fontcolor.el: * fontcolor.el (ws-object-property-1): Removed. * fontcolor.el (fontcolor-property-1): New. * fontcolor.el (font-name): * fontcolor.el (font-ascent): * fontcolor.el (font-descent): * fontcolor.el (font-width): * fontcolor.el (font-height): * fontcolor.el (font-proportional-p): * fontcolor.el (font-properties): * fontcolor.el (font-truename): * fontcolor.el (color-name): * fontcolor.el (color-rgb-components): * x-faces.el: Rename objects.el -> fontcolor.el. lwlib/ChangeLog addition: 2010-02-22 Ben Wing <ben@xemacs.org> * lwlib-colors.h: objects*.h -> fontcolor*.h. man/ChangeLog addition: 2010-02-22 Ben Wing <ben@xemacs.org> * internals/internals.texi (A Summary of the Various XEmacs Modules): * internals/internals.texi (Modules for other Display-Related Lisp Objects): objects*.[ch] -> fontcolor*.[ch]. nt/ChangeLog addition: 2010-02-22 Ben Wing <ben@xemacs.org> * xemacs.dsp: * xemacs.mak: * xemacs.mak (OPT_OBJS): objects*.[ch] -> fontcolor*.[ch]. src/ChangeLog addition: 2010-02-22 Ben Wing <ben@xemacs.org> * EmacsFrame.c: * Makefile.in.in (x_objs): * Makefile.in.in (mswindows_objs): * Makefile.in.in (tty_objs): * Makefile.in.in (gtk_objs): * Makefile.in.in (objs): * console-tty.h: * console-x-impl.h: * console-x-impl.h (struct x_device): * console-x.h: * console-xlike-inc.h: * depend: * device-gtk.c: * device-msw.c: * device-x.c: * device-x.c (x_init_device): * device-x.c (x_finish_init_device): * device.c: * devslots.h (MARKED_SLOT): * emacs.c (main_1): * event-Xt.c: * event-gtk.c: * event-msw.c: * faces.c: * font-mgr.c: * fontcolor-gtk-impl.h: * fontcolor-gtk.c: * fontcolor-gtk.c (syms_of_fontcolor_gtk): * fontcolor-gtk.c (console_type_create_fontcolor_gtk): * fontcolor-gtk.c (vars_of_fontcolor_gtk): * fontcolor-gtk.h: * fontcolor-impl.h: * fontcolor-msw-impl.h: * fontcolor-msw.c: * fontcolor-msw.c (syms_of_fontcolor_mswindows): * fontcolor-msw.c (console_type_create_fontcolor_mswindows): * fontcolor-msw.c (reinit_vars_of_fontcolor_mswindows): * fontcolor-msw.c (vars_of_fontcolor_mswindows): * fontcolor-msw.h: * fontcolor-msw.h (mswindows_color_to_string): * fontcolor-tty-impl.h: * fontcolor-tty.c: * fontcolor-tty.c (syms_of_fontcolor_tty): * fontcolor-tty.c (console_type_create_fontcolor_tty): * fontcolor-tty.c (vars_of_fontcolor_tty): * fontcolor-tty.h: * fontcolor-x-impl.h: * fontcolor-x.c: * fontcolor-x.c (syms_of_fontcolor_x): * fontcolor-x.c (console_type_create_fontcolor_x): * fontcolor-x.c (vars_of_fontcolor_x): * fontcolor-x.c (Xatoms_of_fontcolor_x): * fontcolor-x.h: * fontcolor.c: * fontcolor.c (syms_of_fontcolor): * fontcolor.c (specifier_type_create_fontcolor): * fontcolor.c (reinit_specifier_type_create_fontcolor): * fontcolor.c (reinit_vars_of_fontcolor): * fontcolor.c (vars_of_fontcolor): * fontcolor.h: * fontcolor.h (set_face_boolean_attached_to): * frame-gtk.c: * frame-x.c: * glyphs-eimage.c: * glyphs-gtk.c: * glyphs-msw.c: * glyphs-widget.c: * glyphs-x.c: * glyphs.c: * gtk-glue.c: * gtk-glue.c (xemacs_type_register): * gtk-xemacs.c: * inline.c: * intl-win32.c: * lisp.h: * lrecord.h: * mule-charset.c: * native-gtk-toolbar.c: * redisplay-msw.c: * redisplay-tty.c: * redisplay.c: * select-x.c: * select.c: * symsinit.h: * toolbar-msw.c: * toolbar-msw.c (TOOLBAR_ITEM_ID_BITS): * toolbar-x.c: * ui-gtk.c: * window.c: Rename objects*.[ch] -> fontcolor*.[ch]. Fix up all references to the old files (e.g. in #include statements, Makefiles, functions like syms_of_objects_x(), etc.). tests/ChangeLog addition: 2010-02-22 Ben Wing <ben@xemacs.org> * reproduce-crashes.el (8): objects*.[ch] -> fontcolor*.[ch].
author Ben Wing <ben@xemacs.org>
date Mon, 22 Feb 2010 06:49:30 -0600
parents src/objects-impl.h@ad2f4ae9895b
children 97eb4942aec8
comparison
equal deleted inserted replaced
5175:dc94bf0afa37 5176:8b2f75cecb89
1 /* Generic object functions -- header implementation.
2 Copyright (C) 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1995, 1996, 2002 Ben Wing.
4
5 This file is part of XEmacs.
6
7 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the
9 Free Software Foundation; either version 2, or (at your option) any
10 later version.
11
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 for more details.
16
17 You should have received a copy of the GNU General Public License
18 along with XEmacs; see the file COPYING. If not, write to
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
20 Boston, MA 02111-1307, USA. */
21
22 /* Synched up with: Not in FSF. */
23
24 #ifndef INCLUDED_fontcolor_impl_h_
25 #define INCLUDED_fontcolor_impl_h_
26
27 #include "specifier.h"
28 #include "fontcolor.h"
29
30 /*****************************************************************************
31 * Color Specifier Object *
32 *****************************************************************************/
33
34 struct color_specifier
35 {
36 Lisp_Object face; /* face this is attached to, or nil */
37 Lisp_Object face_property; /* property of that face */
38 };
39
40 #define COLOR_SPECIFIER_DATA(g) SPECIFIER_TYPE_DATA (g, color)
41 #define COLOR_SPECIFIER_FACE(g) (COLOR_SPECIFIER_DATA (g)->face)
42 #define COLOR_SPECIFIER_FACE_PROPERTY(g) \
43 (COLOR_SPECIFIER_DATA (g)->face_property)
44
45 DECLARE_SPECIFIER_TYPE (color);
46 #define XCOLOR_SPECIFIER(x) XSPECIFIER_TYPE (x, color)
47 #define COLOR_SPECIFIERP(x) SPECIFIER_TYPEP (x, color)
48 #define CHECK_COLOR_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, color)
49 #define CONCHECK_COLOR_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, color)
50
51 /*****************************************************************************
52 * Font Specifier Object *
53 *****************************************************************************/
54
55 struct font_specifier
56 {
57 Lisp_Object face; /* face this is attached to, or nil */
58 Lisp_Object face_property; /* property of that face */
59 };
60
61 #define FONT_SPECIFIER_DATA(g) SPECIFIER_TYPE_DATA (g, font)
62 #define FONT_SPECIFIER_FACE(g) (FONT_SPECIFIER_DATA (g)->face)
63 #define FONT_SPECIFIER_FACE_PROPERTY(g) \
64 (FONT_SPECIFIER_DATA (g)->face_property)
65
66 DECLARE_SPECIFIER_TYPE (font);
67 #define XFONT_SPECIFIER(x) XSPECIFIER_TYPE (x, font)
68 #define FONT_SPECIFIERP(x) SPECIFIER_TYPEP (x, font)
69 #define CHECK_FONT_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, font)
70 #define CONCHECK_FONT_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, font)
71
72 /*****************************************************************************
73 * Face Boolean Specifier Object *
74 *****************************************************************************/
75
76 struct face_boolean_specifier
77 {
78 Lisp_Object face; /* face this is attached to, or nil */
79 Lisp_Object face_property; /* property of that face */
80 };
81
82 #define FACE_BOOLEAN_SPECIFIER_DATA(g) SPECIFIER_TYPE_DATA (g, face_boolean)
83 #define FACE_BOOLEAN_SPECIFIER_FACE(g) (FACE_BOOLEAN_SPECIFIER_DATA (g)->face)
84 #define FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY(g) \
85 (FACE_BOOLEAN_SPECIFIER_DATA (g)->face_property)
86
87 DECLARE_SPECIFIER_TYPE (face_boolean);
88 extern Lisp_Object Qface_boolean;
89 #define XFACE_BOOLEAN_SPECIFIER(x) XSPECIFIER_TYPE (x, face_boolean)
90 #define FACE_BOOLEAN_SPECIFIERP(x) SPECIFIER_TYPEP (x, face_boolean)
91 #define CHECK_FACE_BOOLEAN_SPECIFIER(x) \
92 CHECK_SPECIFIER_TYPE (x, face_boolean)
93 #define CONCHECK_FACE_BOOLEAN_SPECIFIER(x) \
94 CONCHECK_SPECIFIER_TYPE (x, face_boolean)
95
96 /****************************************************************************
97 * Color Instance Object *
98 ****************************************************************************/
99
100 struct Lisp_Color_Instance
101 {
102 struct LCRECORD_HEADER header;
103 Lisp_Object name;
104 Lisp_Object device;
105
106 /* See comment in struct console about console variants. */
107 enum console_variant color_instance_type;
108
109 /* console-type-specific data */
110 void *data;
111 };
112
113 #define COLOR_INSTANCE_NAME(c) ((c)->name)
114 #define COLOR_INSTANCE_DEVICE(c) ((c)->device)
115
116 /****************************************************************************
117 * Font Instance Object *
118 ****************************************************************************/
119
120 struct Lisp_Font_Instance
121 {
122 struct LCRECORD_HEADER header;
123 Lisp_Object name; /* the instantiator used to create the font instance */
124 Lisp_Object truename; /* used by the device-specific methods; we need to
125 call them to get the truename (#### in reality,
126 they all probably just store the truename here
127 if they know it, and nil otherwise; we should
128 check this and enforce it as a general policy
129 X and GTK do this, except that when they don't
130 know they return NAME and don't update TRUENAME.
131 MS Windows initializes TRUENAME when the font is
132 initialized. TTY doesn't do truename.) */
133 Lisp_Object device;
134 Lisp_Object charset; /* Mule charset, or whatever */
135
136 /* See comment in struct console about console variants. */
137 enum console_variant font_instance_type;
138
139 unsigned short ascent; /* extracted from `font', or made up */
140 unsigned short descent;
141 unsigned short width;
142 unsigned short height;
143 int proportional_p;
144
145 /* console-type-specific data */
146 void *data;
147 };
148
149 #define FONT_INSTANCE_NAME(f) ((f)->name)
150 #define FONT_INSTANCE_TRUENAME(f) ((f)->truename)
151 #define FONT_INSTANCE_CHARSET(f) ((f)->charset)
152 #define FONT_INSTANCE_DEVICE(f) ((f)->device)
153 #define FONT_INSTANCE_ASCENT(f) ((f)->ascent)
154 #define FONT_INSTANCE_DESCENT(f) ((f)->descent)
155 #define FONT_INSTANCE_WIDTH(f) ((f)->width)
156 #define FONT_INSTANCE_HEIGHT(f) ((f)->height)
157
158 #define XFONT_INSTANCE_NAME(f) FONT_INSTANCE_NAME (XFONT_INSTANCE (f))
159 #define XFONT_INSTANCE_TRUENAME(f) FONT_INSTANCE_TRUENAME (XFONT_INSTANCE (f))
160 #define XFONT_INSTANCE_CHARSET(f) FONT_INSTANCE_CHARSET (XFONT_INSTANCE (f))
161 #define XFONT_INSTANCE_DEVICE(f) FONT_INSTANCE_DEVICE (XFONT_INSTANCE (f))
162 #define XFONT_INSTANCE_ASCENT(f) FONT_INSTANCE_ASCENT (XFONT_INSTANCE (f))
163 #define XFONT_INSTANCE_DESCENT(f) FONT_INSTANCE_DESCENT (XFONT_INSTANCE (f))
164 #define XFONT_INSTANCE_WIDTH(f) FONT_INSTANCE_WIDTH (XFONT_INSTANCE (f))
165 #define XFONT_INSTANCE_HEIGHT(f) FONT_INSTANCE_HEIGHT (XFONT_INSTANCE (f))
166
167 #endif /* INCLUDED_fontcolor_impl_h_ */