Mercurial > hg > xemacs-beta
annotate src/fontcolor-impl.h @ 5652:cc6f0266bc36
Avoid #'delq in core Lisp, for the sake of style, a very slightly smaller binary
lisp/ChangeLog addition:
2012-05-01 Aidan Kehoe <kehoea@parhasard.net>
Avoid #'delq in core code, for the sake of style and a (very
slightly) smaller binary.
* behavior.el (disable-behavior):
* behavior.el (compute-behavior-group-children):
* buff-menu.el (buffers-tab-items):
* byte-optimize.el (byte-optimize-delay-constants-math):
* byte-optimize.el (byte-optimize-logmumble):
* byte-optimize.el (byte-decompile-bytecode-1):
* byte-optimize.el (byte-optimize-lapcode):
* bytecomp.el:
* bytecomp.el (byte-compile-arglist-warn):
* bytecomp.el (byte-compile-warn-about-unresolved-functions):
* bytecomp.el (byte-compile-lambda):
* bytecomp.el (byte-compile-out-toplevel):
* bytecomp.el (byte-compile-insert):
* bytecomp.el (byte-compile-defalias-warn):
* cl-macs.el (cl-upcase-arg):
* cl-macs.el (cl-transform-lambda):
* cl-macs.el (cl-do-proclaim):
* cl-macs.el (defstruct):
* cl-macs.el (cl-make-type-test):
* cl-macs.el (define-compiler-macro):
* cl-macs.el (delete-duplicates):
* cus-edit.el (widget-face-value-delete):
* cus-edit.el (face-history):
* easymenu.el (easy-menu-remove):
* files.el (files-fetch-hook-value):
* files.el (file-expand-wildcards):
* font-lock.el (font-lock-update-removed-keyword-alist):
* font-lock.el (font-lock-remove-keywords):
* frame.el (frame-initialize):
* frame.el (frame-notice-user-settings):
* frame.el (set-frame-font):
* frame.el (delete-other-frames):
* frame.el (get-frame-for-buffer-noselect):
* gnuserv.el (gnuserv-kill-buffer-function):
* gnuserv.el (gnuserv-check-device):
* gnuserv.el (gnuserv-kill-client):
* gnuserv.el (gnuserv-buffer-done-1):
* gtk-font-menu.el (gtk-reset-device-font-menus):
* gutter-items.el (buffers-tab-items):
* gutter.el (set-gutter-element-visible-p):
* info.el (Info-find-file-node):
* info.el (Info-history-add):
* info.el (Info-build-annotation-completions):
* info.el (Info-index):
* info.el (Info-reannotate-node):
* itimer.el (delete-itimer):
* itimer.el (start-itimer):
* lib-complete.el (lib-complete:cache-completions):
* loadhist.el (unload-feature):
* menubar-items.el (build-buffers-menu-internal):
* menubar.el (delete-menu-item):
* menubar.el (relabel-menu-item):
* msw-font-menu.el (mswindows-reset-device-font-menus):
* mule/make-coding-system.el (fixed-width-generate-helper):
* next-error.el (next-error-find-buffer):
* obsolete.el:
* obsolete.el (find-non-ascii-charset-string):
* obsolete.el (find-non-ascii-charset-region):
* occur.el (multi-occur-by-filename-regexp):
* occur.el (occur-1):
* packages.el (packages-package-hierarchy-directory-names):
* packages.el (package-get-key-1):
* process.el (setenv):
* simple.el (undo):
* simple.el (handle-pre-motion-command-current-command-is-motion):
* sound.el (load-sound-file):
* wid-edit.el (widget-field-value-delete):
* wid-edit.el (widget-checklist-match-inline):
* wid-edit.el (widget-checklist-match-find):
* wid-edit.el (widget-editable-list-delete-at):
* wid-edit.el (widget-editable-list-entry-create):
* window.el (quit-window):
* x-font-menu.el (x-reset-device-font-menus-core):
1. Replace (delq nil (mapcar ....)) with analogous (mapcan ...)
forms; this is in non-dumped files, it was done previously in
dumped files.
2. Replace (delq FOO (copy-sequence BAR)) with (remove* FOO BAR),
where #'eq and #'eql are equivalent
3. Replace (delq FOO BAR) with (delete* FOO BAR), where FOO is not
a non-fixnum number. Saves a little space in the dumped file
(since the compiler macro adds :test #'eq to the delete* call if
it's not clear that FOO is not a non-fixnum number).
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Tue, 01 May 2012 16:17:42 +0100 |
parents | 308d34e9f07d |
children |
rev | line source |
---|---|
872 | 1 /* Generic object functions -- header implementation. |
2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
3 Copyright (C) 1995, 1996, 2002 Ben Wing. | |
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
4 Copyright (C) 2010 Didier Verna |
872 | 5 |
6 This file is part of XEmacs. | |
7 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5178
diff
changeset
|
8 XEmacs is free software: you can redistribute it and/or modify it |
872 | 9 under the terms of the GNU General Public License as published by the |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5178
diff
changeset
|
10 Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5178
diff
changeset
|
11 option) any later version. |
872 | 12 |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5178
diff
changeset
|
19 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
872 | 20 |
21 /* Synched up with: Not in FSF. */ | |
22 | |
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
3094
diff
changeset
|
23 #ifndef INCLUDED_fontcolor_impl_h_ |
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
3094
diff
changeset
|
24 #define INCLUDED_fontcolor_impl_h_ |
872 | 25 |
26 #include "specifier.h" | |
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
3094
diff
changeset
|
27 #include "fontcolor.h" |
872 | 28 |
29 /***************************************************************************** | |
30 * Color Specifier Object * | |
31 *****************************************************************************/ | |
32 | |
33 struct color_specifier | |
34 { | |
35 Lisp_Object face; /* face this is attached to, or nil */ | |
36 Lisp_Object face_property; /* property of that face */ | |
37 }; | |
38 | |
39 #define COLOR_SPECIFIER_DATA(g) SPECIFIER_TYPE_DATA (g, color) | |
40 #define COLOR_SPECIFIER_FACE(g) (COLOR_SPECIFIER_DATA (g)->face) | |
41 #define COLOR_SPECIFIER_FACE_PROPERTY(g) \ | |
42 (COLOR_SPECIFIER_DATA (g)->face_property) | |
43 | |
44 DECLARE_SPECIFIER_TYPE (color); | |
45 #define XCOLOR_SPECIFIER(x) XSPECIFIER_TYPE (x, color) | |
46 #define COLOR_SPECIFIERP(x) SPECIFIER_TYPEP (x, color) | |
47 #define CHECK_COLOR_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, color) | |
48 #define CONCHECK_COLOR_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, color) | |
49 | |
50 /***************************************************************************** | |
51 * Font Specifier Object * | |
52 *****************************************************************************/ | |
53 | |
54 struct font_specifier | |
55 { | |
56 Lisp_Object face; /* face this is attached to, or nil */ | |
57 Lisp_Object face_property; /* property of that face */ | |
58 }; | |
59 | |
60 #define FONT_SPECIFIER_DATA(g) SPECIFIER_TYPE_DATA (g, font) | |
61 #define FONT_SPECIFIER_FACE(g) (FONT_SPECIFIER_DATA (g)->face) | |
62 #define FONT_SPECIFIER_FACE_PROPERTY(g) \ | |
63 (FONT_SPECIFIER_DATA (g)->face_property) | |
64 | |
65 DECLARE_SPECIFIER_TYPE (font); | |
66 #define XFONT_SPECIFIER(x) XSPECIFIER_TYPE (x, font) | |
67 #define FONT_SPECIFIERP(x) SPECIFIER_TYPEP (x, font) | |
68 #define CHECK_FONT_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, font) | |
69 #define CONCHECK_FONT_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, font) | |
70 | |
71 /***************************************************************************** | |
72 * Face Boolean Specifier Object * | |
73 *****************************************************************************/ | |
74 | |
75 struct face_boolean_specifier | |
76 { | |
77 Lisp_Object face; /* face this is attached to, or nil */ | |
78 Lisp_Object face_property; /* property of that face */ | |
79 }; | |
80 | |
81 #define FACE_BOOLEAN_SPECIFIER_DATA(g) SPECIFIER_TYPE_DATA (g, face_boolean) | |
82 #define FACE_BOOLEAN_SPECIFIER_FACE(g) (FACE_BOOLEAN_SPECIFIER_DATA (g)->face) | |
83 #define FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY(g) \ | |
84 (FACE_BOOLEAN_SPECIFIER_DATA (g)->face_property) | |
85 | |
86 DECLARE_SPECIFIER_TYPE (face_boolean); | |
87 extern Lisp_Object Qface_boolean; | |
88 #define XFACE_BOOLEAN_SPECIFIER(x) XSPECIFIER_TYPE (x, face_boolean) | |
89 #define FACE_BOOLEAN_SPECIFIERP(x) SPECIFIER_TYPEP (x, face_boolean) | |
90 #define CHECK_FACE_BOOLEAN_SPECIFIER(x) \ | |
91 CHECK_SPECIFIER_TYPE (x, face_boolean) | |
92 #define CONCHECK_FACE_BOOLEAN_SPECIFIER(x) \ | |
93 CONCHECK_SPECIFIER_TYPE (x, face_boolean) | |
94 | |
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
95 /***************************************************************************** |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
96 * Background Placement Specifier Object * |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
97 *****************************************************************************/ |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
98 |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
99 struct face_background_placement_specifier |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
100 { |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
101 Lisp_Object face; /* face this is attached to, or nil */ |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
102 }; |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
103 |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
104 #define FACE_BACKGROUND_PLACEMENT_SPECIFIER_DATA(g) \ |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
105 SPECIFIER_TYPE_DATA (g, face_background_placement) |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
106 #define FACE_BACKGROUND_PLACEMENT_SPECIFIER_FACE(g) \ |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
107 (FACE_BACKGROUND_PLACEMENT_SPECIFIER_DATA (g)->face) |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
108 |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
109 DECLARE_SPECIFIER_TYPE (face_background_placement); |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
110 extern Lisp_Object Qface_background_placement, Qabsolute, Qrelative; |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
111 #define XFACE_BACKGROUND_PLACEMENT_SPECIFIER(x) \ |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
112 XSPECIFIER_TYPE (x, face_background_placement) |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
113 #define FACE_BACKGROUND_PLACEMENT_SPECIFIERP(x) \ |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
114 SPECIFIER_TYPEP (x, face_background_placement) |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
115 #define CHECK_FACE_BACKGROUND_PLACEMENT_SPECIFIER(x) \ |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
116 CHECK_SPECIFIER_TYPE (x, face_background_placement) |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
117 #define CONCHECK_FACE_BACKGROUND_PLACEMENT_SPECIFIER(x) \ |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
118 CONCHECK_SPECIFIER_TYPE (x, face_background_placement) |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
3094
diff
changeset
|
119 |
872 | 120 /**************************************************************************** |
121 * Color Instance Object * | |
122 ****************************************************************************/ | |
123 | |
124 struct Lisp_Color_Instance | |
125 { | |
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
126 NORMAL_LISP_OBJECT_HEADER header; |
872 | 127 Lisp_Object name; |
128 Lisp_Object device; | |
129 | |
1204 | 130 /* See comment in struct console about console variants. */ |
934 | 131 enum console_variant color_instance_type; |
132 | |
872 | 133 /* console-type-specific data */ |
134 void *data; | |
135 }; | |
136 | |
137 #define COLOR_INSTANCE_NAME(c) ((c)->name) | |
138 #define COLOR_INSTANCE_DEVICE(c) ((c)->device) | |
139 | |
140 /**************************************************************************** | |
141 * Font Instance Object * | |
142 ****************************************************************************/ | |
143 | |
144 struct Lisp_Font_Instance | |
145 { | |
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
146 NORMAL_LISP_OBJECT_HEADER header; |
872 | 147 Lisp_Object name; /* the instantiator used to create the font instance */ |
148 Lisp_Object truename; /* used by the device-specific methods; we need to | |
149 call them to get the truename (#### in reality, | |
150 they all probably just store the truename here | |
151 if they know it, and nil otherwise; we should | |
3094 | 152 check this and enforce it as a general policy |
153 X and GTK do this, except that when they don't | |
154 know they return NAME and don't update TRUENAME. | |
155 MS Windows initializes TRUENAME when the font is | |
156 initialized. TTY doesn't do truename.) */ | |
872 | 157 Lisp_Object device; |
3094 | 158 Lisp_Object charset; /* Mule charset, or whatever */ |
872 | 159 |
1204 | 160 /* See comment in struct console about console variants. */ |
934 | 161 enum console_variant font_instance_type; |
162 | |
872 | 163 unsigned short ascent; /* extracted from `font', or made up */ |
164 unsigned short descent; | |
165 unsigned short width; | |
166 unsigned short height; | |
167 int proportional_p; | |
168 | |
169 /* console-type-specific data */ | |
170 void *data; | |
171 }; | |
172 | |
173 #define FONT_INSTANCE_NAME(f) ((f)->name) | |
3094 | 174 #define FONT_INSTANCE_TRUENAME(f) ((f)->truename) |
175 #define FONT_INSTANCE_CHARSET(f) ((f)->charset) | |
872 | 176 #define FONT_INSTANCE_DEVICE(f) ((f)->device) |
177 #define FONT_INSTANCE_ASCENT(f) ((f)->ascent) | |
178 #define FONT_INSTANCE_DESCENT(f) ((f)->descent) | |
179 #define FONT_INSTANCE_WIDTH(f) ((f)->width) | |
180 #define FONT_INSTANCE_HEIGHT(f) ((f)->height) | |
181 | |
182 #define XFONT_INSTANCE_NAME(f) FONT_INSTANCE_NAME (XFONT_INSTANCE (f)) | |
183 #define XFONT_INSTANCE_TRUENAME(f) FONT_INSTANCE_TRUENAME (XFONT_INSTANCE (f)) | |
3094 | 184 #define XFONT_INSTANCE_CHARSET(f) FONT_INSTANCE_CHARSET (XFONT_INSTANCE (f)) |
872 | 185 #define XFONT_INSTANCE_DEVICE(f) FONT_INSTANCE_DEVICE (XFONT_INSTANCE (f)) |
186 #define XFONT_INSTANCE_ASCENT(f) FONT_INSTANCE_ASCENT (XFONT_INSTANCE (f)) | |
187 #define XFONT_INSTANCE_DESCENT(f) FONT_INSTANCE_DESCENT (XFONT_INSTANCE (f)) | |
188 #define XFONT_INSTANCE_WIDTH(f) FONT_INSTANCE_WIDTH (XFONT_INSTANCE (f)) | |
189 #define XFONT_INSTANCE_HEIGHT(f) FONT_INSTANCE_HEIGHT (XFONT_INSTANCE (f)) | |
190 | |
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
3094
diff
changeset
|
191 #endif /* INCLUDED_fontcolor_impl_h_ */ |