Mercurial > emacs
annotate src/disptab.h @ 94938:5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
conditionals. Don't check enable_font_backend. Delete all codes
used only when USE_FONT_BACKEND is not defined. Use
FONT_XXX_NAME_NUMERIC instead of face_numeric_xxx.
(QCfoundry, QCadstyle, QCregistry, QCspacing, QCsize, QCavgwidth)
(Qp): Extern them.
(clear_font_table, load_face_font, xlfd_lookup_field_contents):
Deleted.
(struct font_name): Deleted.
(xlfd_numeric_value, xlfd_symbolic_value): Deleted.
(compare_fonts_by_sort_order): New function.
(xlfd_numeric_slant, xlfd_symbolic_slant, xlfd_numeric_weight)
(xlfd_symbolic_weight, xlfd_numeric_swidth, xlfd_symbolic_swidth):
Deleted.
(Fx_family_fonts): Use font_list_entities, and sort fonts by
compare_fonts_by_sort_order.
(Fx_font_family_list): Call Ffont_family_list.
(face_numeric_value, face_numeric_weight, face_numeric_slant)
(face_numeric_swidth, face_symbolic_value, face_symbolic_weight)
(face_symbolic_slant, face_symbolic_swidth)
(split_font_name_into_vector, build_font_name_from_vector)
(xlfd_fixed_p, xlfd_point_size, pixel_point_size)
(font_rescale_ratio, split_font_name, build_font_name)
(free_font_names, sort_fonts, x_face_list_fonts)
(face_font_available_p, sorted_font_list, cmp_font_names)
(font_list_1, concat_font_list, font_list, remove_duplicates):
Deleted.
(Fx_list_fonts): Use Ffont_list.
(LFACE_AVGWIDTH): Deleted.
(check_lface_attrs): Don't check LFACE_AVGWIDTH. Check LFACE_FONT
by FONTP.
(lface_fully_specified_p): Don't check LFACE_AVGWIDTH.
(set_lface_from_font_name): Delete it.
(set_lface_from_font): Renamed from
set_lface_from_font_and_fontset. Caller changed. Don't set
LFACE_AVGWIDTH. Use FONT_XXX_FOR_FACE to get a symbol suitable
for face.
(merge_face_vectors): Copy font-spec if necessary. Clear
properties of the font-spec if necessary.
(merge_face_ref): Clear properties of the font-spec if necessary.
(Finternal_set_lisp_face_attribute): Likewise.
(set_font_frame_param): Use font_load_for_lface to load a
font-object, and call Fmodify_frame_parameters with it.
(x_update_menu_appearance): Don't check LFACE_AVGWIDTH. Get XLFD
font name by Ffont_xlfd_name.
(Finternal_lisp_face_attribute_values): Don't check QCweight,
QCslant, and QCwidth.
(Fface_font): Get a font name from font->props[FONT_NAME_INDEX].
(lface_same_font_attributes_p): Don't check LFACE_AVGWIDTH.
Compare fonts by EQ.
(lookup_non_ascii_face): Deleted.
(face_for_font): The 2nd argument changed.
(x_supports_face_attributes_p): Don't check LFACE_AVGWIDTH. Check
atomic font properties by case insensitive.
(realize_non_ascii_face): Set face->overstrike correctly.
(realize_x_face): Likewise. Check if LFACE_FONT is a font_object.
(dump_realized_face): Get font name from
font->props[FONT_NAME_INDEX]. Don't print font_info_id.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 14 May 2008 01:41:52 +0000 |
parents | d86b04f18152 |
children | 29adfc9354e7 |
rev | line source |
---|---|
484 | 1 /* Things for GLYPHS and glyph tables. |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
68651
diff
changeset
|
2 Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, |
79759 | 3 2006, 2007, 2008 Free Software Foundation, Inc. |
484 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
78260
922696f363b0
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75227
diff
changeset
|
9 the Free Software Foundation; either version 3, or (at your option) |
484 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
20 Boston, MA 02110-1301, USA. */ | |
484 | 21 |
22 /* Access the slots of a display-table, according to their purpose. */ | |
23 | |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
24 #define DISP_TABLE_P(obj) \ |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
25 (CHAR_TABLE_P (obj) \ |
17363
0fe9203c7a06
(DISP_TABLE_P): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17332
diff
changeset
|
26 && EQ (XCHAR_TABLE (obj)->purpose, Qdisplay_table) \ |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
27 && CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (obj)) == DISP_TABLE_EXTRA_SLOTS) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
28 |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
29 #define DISP_TABLE_EXTRA_SLOTS 6 |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
30 #define DISP_TRUNC_GLYPH(dp) ((dp)->extras[0]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
31 #define DISP_CONTINUE_GLYPH(dp) ((dp)->extras[1]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
32 #define DISP_ESCAPE_GLYPH(dp) ((dp)->extras[2]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
33 #define DISP_CTRL_GLYPH(dp) ((dp)->extras[3]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
34 #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
35 #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
36 |
20309
51fb1f36e614
Add prototypes. Remove declaration of obsolete
Andreas Schwab <schwab@suse.de>
parents:
17363
diff
changeset
|
37 extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int)); |
17332
35269345d9ef
(disp_char_vector): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
17183
diff
changeset
|
38 |
88370
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
39 #define DISP_CHAR_VECTOR(dp, c) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
40 (ASCII_CHAR_P(c) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
41 ? (NILP ((dp)->ascii) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
42 ? (dp)->defalt \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
43 : (SUB_CHAR_TABLE_P ((dp)->ascii) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
44 ? XSUB_CHAR_TABLE ((dp)->ascii)->contents[c] \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
45 : (dp)->ascii)) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
46 : disp_char_vector ((dp), (c))) |
484 | 47 |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
48 /* Defined in window.c. */ |
20309
51fb1f36e614
Add prototypes. Remove declaration of obsolete
Andreas Schwab <schwab@suse.de>
parents:
17363
diff
changeset
|
49 extern struct Lisp_Char_Table *window_display_table P_ ((struct window *)); |
484 | 50 |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
51 /* Defined in indent.c. */ |
20309
51fb1f36e614
Add prototypes. Remove declaration of obsolete
Andreas Schwab <schwab@suse.de>
parents:
17363
diff
changeset
|
52 extern struct Lisp_Char_Table *buffer_display_table P_ ((void)); |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
53 |
484 | 54 /* Display table to use for vectors that don't specify their own. */ |
55 extern Lisp_Object Vstandard_display_table; | |
56 | |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
57 /* This is the `purpose' slot of a display table. */ |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
58 extern Lisp_Object Qdisplay_table; |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
59 |
484 | 60 /* Vector of GLYPH definitions. Indexed by GLYPH number, |
61 the contents are a string which is how to output the GLYPH. */ | |
62 extern Lisp_Object Vglyph_table; | |
63 | |
64 /* Return the current length of the GLYPH table, | |
65 or 0 if the table isn't currently valid. */ | |
66 #define GLYPH_TABLE_LENGTH \ | |
9143
069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
67 ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->size : 0) |
484 | 68 |
69 /* Return the current base (for indexing) of the GLYPH table, | |
70 or 0 if the table isn't currently valid. */ | |
71 #define GLYPH_TABLE_BASE \ | |
9143
069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
72 ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->contents : 0) |
484 | 73 |
74 /* Given BASE and LEN returned by the two previous macros, | |
75 return nonzero if the GLYPH code G should be output as a single | |
76 character with code G. Return zero if G has a string in the table. */ | |
92277 | 77 #define GLYPH_SIMPLE_P(base,len,g) \ |
78 (GLYPH_FACE (g) != DEFAULT_FACE_ID || GLYPH_CHAR (g) >= (len) || !STRINGP (base[GLYPH_CHAR (g)])) | |
484 | 79 |
80 /* Given BASE and LEN returned by the two previous macros, | |
81 return nonzero if GLYPH code G is aliased to a different code. */ | |
92277 | 82 #define GLYPH_ALIAS_P(base,len,g) \ |
83 (GLYPH_FACE (g) == DEFAULT_FACE_ID && GLYPH_CHAR (g) < (len) && INTEGERP (base[GLYPH_CHAR (g)])) | |
484 | 84 |
2725
507115aff66d
* xdisp.c (display_text_line): Apply faces to characters according
Jim Blandy <jimb@redhat.com>
parents:
2012
diff
changeset
|
85 /* Follow all aliases for G in the glyph table given by (BASE, |
507115aff66d
* xdisp.c (display_text_line): Apply faces to characters according
Jim Blandy <jimb@redhat.com>
parents:
2012
diff
changeset
|
86 LENGTH), and set G to the final glyph. */ |
92277 | 87 #define GLYPH_FOLLOW_ALIASES(base, length, g) \ |
88 do { \ | |
89 while (GLYPH_ALIAS_P ((base), (length), (g))) \ | |
90 SET_GLYPH_CHAR ((g), XINT ((base)[GLYPH_CHAR (g)])); \ | |
91 if (!GLYPH_CHAR_VALID_P (g)) \ | |
92 SET_GLYPH_CHAR (g, ' '); \ | |
17183
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
93 } while (0) |
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
94 |
484 | 95 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0, |
96 return the length and the address of the character-sequence | |
97 used for outputting GLYPH G. */ | |
92277 | 98 #define GLYPH_LENGTH(base,g) SCHARS (base[GLYPH_CHAR (g)]) |
99 #define GLYPH_STRING(base,g) SDATA (base[GLYPH_CHAR (g)]) | |
484 | 100 |
101 /* GLYPH for a space character. */ | |
102 | |
103 #define SPACEGLYPH 040 | |
104 #define NULL_GLYPH 00 | |
105 | |
92277 | 106 #define SET_GLYPH_FROM_CHAR(glyph, c) \ |
107 SET_GLYPH (glyph, c, DEFAULT_FACE_ID) | |
52401 | 108 |
109 /* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349 | |
110 (do not change this comment) */ |