Mercurial > emacs
annotate src/composite.c @ 111794:d276c036caef
EMACS_UNIBYTE trivia.
* make-dist: Remove EMACS_UNIBYTE unsetting; it does nothing.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 02 Dec 2010 18:54:34 -0800 |
parents | 9c63d46e000c |
children | 417b1e4d63cd |
rev | line source |
---|---|
26848 | 1 /* Composite sequence support. |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
67658
diff
changeset
|
2 Copyright (C) 2001, 2002, 2003, 2004, 2005, |
106815 | 3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
4 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | |
67658 | 5 National Institute of Advanced Industrial Science and Technology (AIST) |
6 Registration Number H14PRO021 | |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
7 Copyright (C) 2003, 2006 |
88366
97f11940f06a
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41001
diff
changeset
|
8 National Institute of Advanced Industrial Science and Technology (AIST) |
97f11940f06a
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41001
diff
changeset
|
9 Registration Number H13PRO009 |
26848 | 10 |
11 This file is part of GNU Emacs. | |
12 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94922
diff
changeset
|
13 GNU Emacs is free software: you can redistribute it and/or modify |
26848 | 14 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94922
diff
changeset
|
15 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94922
diff
changeset
|
16 (at your option) any later version. |
26848 | 17 |
18 GNU Emacs is distributed in the hope that it will be useful, | |
19 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 GNU General Public License for more details. | |
22 | |
23 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94922
diff
changeset
|
24 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
26848 | 25 |
26 #include <config.h> | |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
102726
diff
changeset
|
27 #include <setjmp.h> |
26848 | 28 #include "lisp.h" |
29 #include "buffer.h" | |
88366
97f11940f06a
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41001
diff
changeset
|
30 #include "character.h" |
101775
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
31 #include "coding.h" |
26848 | 32 #include "intervals.h" |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
33 #include "window.h" |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
34 #include "frame.h" |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
35 #include "dispextern.h" |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
36 #include "font.h" |
101775
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
37 #include "termhooks.h" |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
38 |
26848 | 39 |
40 /* Emacs uses special text property `composition' to support character | |
41 composition. A sequence of characters that have the same (i.e. eq) | |
42 `composition' property value is treated as a single composite | |
43 sequence (we call it just `composition' here after). Characters in | |
44 a composition are all composed somehow on the screen. | |
45 | |
46 The property value has this form when the composition is made: | |
47 ((LENGTH . COMPONENTS) . MODIFICATION-FUNC) | |
48 then turns to this form: | |
49 (COMPOSITION-ID . (LENGTH COMPONENTS-VEC . MODIFICATION-FUNC)) | |
50 when the composition is registered in composition_hash_table and | |
51 composition_table. These rather peculiar structures were designed | |
52 to make it easy to distinguish them quickly (we can do that by | |
53 checking only the first element) and to extract LENGTH (from the | |
54 former form) and COMPOSITION-ID (from the latter form). | |
55 | |
56 We register a composition when it is displayed, or when the width | |
57 is required (for instance, to calculate columns). | |
58 | |
59 LENGTH -- Length of the composition. This information is used to | |
60 check the validity of the composition. | |
61 | |
62 COMPONENTS -- Character, string, vector, list, or nil. | |
63 | |
64 If it is nil, characters in the text are composed relatively | |
65 according to their metrics in font glyphs. | |
66 | |
67 If it is a character or a string, the character or characters | |
68 in the string are composed relatively. | |
69 | |
70 If it is a vector or list of integers, the element is a | |
71 character or an encoded composition rule. The characters are | |
72 composed according to the rules. (2N)th elements are | |
73 characters to be composed and (2N+1)th elements are | |
74 composition rules to tell how to compose (2N+2)th element with | |
75 the previously composed 2N glyphs. | |
76 | |
108107
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
77 COMPONENTS-VEC -- Vector of integers. In a relative composition, |
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
78 the elements are the characters to be composed. In a rule-base |
26848 | 79 composition, the elements are characters or encoded |
80 composition rules. | |
81 | |
82 MODIFICATION-FUNC -- If non nil, it is a function to call when the | |
83 composition gets invalid after a modification in a buffer. If | |
84 it is nil, a function in `composition-function-table' of the | |
85 first character in the sequence is called. | |
86 | |
87 COMPOSITION-ID --Identification number of the composition. It is | |
88 used as an index to composition_table for the composition. | |
89 | |
90 When Emacs has to display a composition or has to know its | |
91 displaying width, the function get_composition_id is called. It | |
92 returns COMPOSITION-ID so that the caller can access the | |
93 information about the composition through composition_table. If a | |
94 COMPOSITION-ID has not yet been assigned to the composition, | |
95 get_composition_id checks the validity of `composition' property, | |
96 and, if valid, assigns a new ID, registers the information in | |
97 composition_hash_table and composition_table, and changes the form | |
108107
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
98 of the property value. If the property is invalid, |
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
99 get_composition_id returns -1 without changing the property value. |
26848 | 100 |
108107
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
101 We use two tables to keep the information about composition; |
26848 | 102 composition_hash_table and composition_table. |
103 | |
108107
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
104 The former is a hash table whose keys are COMPONENTS-VECs and |
26848 | 105 values are the corresponding COMPOSITION-IDs. This hash table is |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
106 weak, but as each key (COMPONENTS-VEC) is also kept as a value of the |
26848 | 107 `composition' property, it won't be collected as garbage until all |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
108 bits of text that have the same COMPONENTS-VEC are deleted. |
26848 | 109 |
110 The latter is a table of pointers to `struct composition' indexed | |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
111 by COMPOSITION-ID. This structure keeps the other information (see |
26848 | 112 composite.h). |
113 | |
114 In general, a text property holds information about individual | |
115 characters. But, a `composition' property holds information about | |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
116 a sequence of characters (in this sense, it is like the `intangible' |
26848 | 117 property). That means that we should not share the property value |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
118 in adjacent compositions -- we can't distinguish them if they have the |
26848 | 119 same property. So, after any changes, we call |
120 `update_compositions' and change a property of one of adjacent | |
121 compositions to a copy of it. This function also runs a proper | |
122 composition modification function to make a composition that gets | |
123 invalid by the change valid again. | |
124 | |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
125 As the value of the `composition' property holds information about a |
26848 | 126 specific range of text, the value gets invalid if we change the |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
127 text in the range. We treat the `composition' property as always |
26848 | 128 rear-nonsticky (currently by setting default-text-properties to |
129 (rear-nonsticky (composition))) and we never make properties of | |
130 adjacent compositions identical. Thus, any such changes make the | |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
131 range just shorter. So, we can check the validity of the `composition' |
26848 | 132 property by comparing LENGTH information with the actual length of |
133 the composition. | |
134 | |
135 */ | |
136 | |
137 | |
138 Lisp_Object Qcomposition; | |
139 | |
140 /* Table of pointers to the structure `composition' indexed by | |
141 COMPOSITION-ID. This structure is for storing information about | |
142 each composition except for COMPONENTS-VEC. */ | |
143 struct composition **composition_table; | |
144 | |
145 /* The current size of `composition_table'. */ | |
146 static int composition_table_size; | |
147 | |
148 /* Number of compositions currently made. */ | |
149 int n_compositions; | |
150 | |
151 /* Hash table for compositions. The key is COMPONENTS-VEC of | |
152 `composition' property. The value is the corresponding | |
153 COMPOSITION-ID. */ | |
154 Lisp_Object composition_hash_table; | |
155 | |
156 /* Function to call to adjust composition. */ | |
157 Lisp_Object Vcompose_chars_after_function; | |
158 | |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
159 Lisp_Object Qauto_composed; |
106812
23c562723a8d
Make auto-composition work on all buffers even if they are fundamental mode.
Kenichi Handa <handa@m17n.org>
parents:
106799
diff
changeset
|
160 Lisp_Object Vauto_composition_mode; |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
161 Lisp_Object Vauto_composition_function; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
162 Lisp_Object Qauto_composition_function; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
163 Lisp_Object Vcomposition_function_table; |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
164 |
108107
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
165 /* Maximum number of characters to look back for |
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
166 auto-compositions. */ |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
167 #define MAX_AUTO_COMPOSITION_LOOKBACK 3 |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
168 |
89546
c380df3cc4df
(Fremove_list_of_text_properties): Declare.
Dave Love <fx@gnu.org>
parents:
89509
diff
changeset
|
169 EXFUN (Fremove_list_of_text_properties, 4); |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
170 |
26848 | 171 /* Temporary variable used in macros COMPOSITION_XXX. */ |
172 Lisp_Object composition_temp; | |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
173 |
26848 | 174 |
175 /* Return COMPOSITION-ID of a composition at buffer position | |
176 CHARPOS/BYTEPOS and length NCHARS. The `composition' property of | |
177 the sequence is PROP. STRING, if non-nil, is a string that | |
178 contains the composition instead of the current buffer. | |
179 | |
180 If the composition is invalid, return -1. */ | |
181 | |
182 int | |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
183 get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars, |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
184 Lisp_Object prop, Lisp_Object string) |
26848 | 185 { |
186 Lisp_Object id, length, components, key, *key_contents; | |
187 int glyph_len; | |
188 struct Lisp_Hash_Table *hash_table = XHASH_TABLE (composition_hash_table); | |
189 int hash_index; | |
190 unsigned hash_code; | |
191 struct composition *cmp; | |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
192 EMACS_INT i; |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
193 int ch; |
26848 | 194 |
195 /* PROP should be | |
196 Form-A: ((LENGTH . COMPONENTS) . MODIFICATION-FUNC) | |
197 or | |
198 Form-B: (COMPOSITION-ID . (LENGTH COMPONENTS-VEC . MODIFICATION-FUNC)) | |
199 */ | |
200 if (nchars == 0 || !CONSP (prop)) | |
201 goto invalid_composition; | |
202 | |
203 id = XCAR (prop); | |
204 if (INTEGERP (id)) | |
205 { | |
206 /* PROP should be Form-B. */ | |
207 if (XINT (id) < 0 || XINT (id) >= n_compositions) | |
208 goto invalid_composition; | |
209 return XINT (id); | |
210 } | |
211 | |
212 /* PROP should be Form-A. | |
213 Thus, ID should be (LENGTH . COMPONENTS). */ | |
214 if (!CONSP (id)) | |
215 goto invalid_composition; | |
216 length = XCAR (id); | |
217 if (!INTEGERP (length) || XINT (length) != nchars) | |
218 goto invalid_composition; | |
219 | |
220 components = XCDR (id); | |
221 | |
222 /* Check if the same composition has already been registered or not | |
223 by consulting composition_hash_table. The key for this table is | |
224 COMPONENTS (converted to a vector COMPONENTS-VEC) or, if it is | |
225 nil, vector of characters in the composition range. */ | |
226 if (INTEGERP (components)) | |
227 key = Fmake_vector (make_number (1), components); | |
228 else if (STRINGP (components) || CONSP (components)) | |
229 key = Fvconcat (1, &components); | |
230 else if (VECTORP (components)) | |
231 key = components; | |
232 else if (NILP (components)) | |
233 { | |
234 key = Fmake_vector (make_number (nchars), Qnil); | |
235 if (STRINGP (string)) | |
236 for (i = 0; i < nchars; i++) | |
237 { | |
238 FETCH_STRING_CHAR_ADVANCE (ch, string, charpos, bytepos); | |
239 XVECTOR (key)->contents[i] = make_number (ch); | |
240 } | |
241 else | |
242 for (i = 0; i < nchars; i++) | |
243 { | |
244 FETCH_CHAR_ADVANCE (ch, charpos, bytepos); | |
245 XVECTOR (key)->contents[i] = make_number (ch); | |
246 } | |
247 } | |
248 else | |
249 goto invalid_composition; | |
250 | |
251 hash_index = hash_lookup (hash_table, key, &hash_code); | |
252 if (hash_index >= 0) | |
253 { | |
254 /* We have already registered the same composition. Change PROP | |
255 from Form-A above to Form-B while replacing COMPONENTS with | |
256 COMPONENTS-VEC stored in the hash table. We can directly | |
257 modify the cons cell of PROP because it is not shared. */ | |
258 key = HASH_KEY (hash_table, hash_index); | |
259 id = HASH_VALUE (hash_table, hash_index); | |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39046
diff
changeset
|
260 XSETCAR (prop, id); |
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39046
diff
changeset
|
261 XSETCDR (prop, Fcons (make_number (nchars), Fcons (key, XCDR (prop)))); |
26848 | 262 return XINT (id); |
263 } | |
264 | |
265 /* This composition is a new one. We must register it. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
266 |
26848 | 267 /* Check if we have sufficient memory to store this information. */ |
268 if (composition_table_size == 0) | |
269 { | |
270 composition_table_size = 256; | |
271 composition_table | |
272 = (struct composition **) xmalloc (sizeof (composition_table[0]) | |
273 * composition_table_size); | |
274 } | |
275 else if (composition_table_size <= n_compositions) | |
276 { | |
277 composition_table_size += 256; | |
278 composition_table | |
279 = (struct composition **) xrealloc (composition_table, | |
280 sizeof (composition_table[0]) | |
281 * composition_table_size); | |
282 } | |
283 | |
284 key_contents = XVECTOR (key)->contents; | |
285 | |
286 /* Check if the contents of COMPONENTS are valid if COMPONENTS is a | |
287 vector or a list. It should be a sequence of: | |
288 char1 rule1 char2 rule2 char3 ... ruleN charN+1 */ | |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
289 |
94922
181a3677061e
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92028
diff
changeset
|
290 if (VECTORP (components) |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
291 && ASIZE (components) >= 2 |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
292 && VECTORP (AREF (components, 0))) |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
293 { |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
294 /* COMPONENTS is a glyph-string. */ |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
295 EMACS_UINT len = ASIZE (key); |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
296 |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
297 for (i = 1; i < len; i++) |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
298 if (! VECTORP (AREF (key, i))) |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
299 goto invalid_composition; |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
300 } |
94922
181a3677061e
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92028
diff
changeset
|
301 else if (VECTORP (components) || CONSP (components)) |
26848 | 302 { |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
303 EMACS_UINT len = XVECTOR (key)->size; |
26848 | 304 |
305 /* The number of elements should be odd. */ | |
306 if ((len % 2) == 0) | |
307 goto invalid_composition; | |
308 /* All elements should be integers (character or encoded | |
309 composition rule). */ | |
310 for (i = 0; i < len; i++) | |
311 { | |
312 if (!INTEGERP (key_contents[i])) | |
313 goto invalid_composition; | |
314 } | |
315 } | |
316 | |
317 /* Change PROP from Form-A above to Form-B. We can directly modify | |
318 the cons cell of PROP because it is not shared. */ | |
319 XSETFASTINT (id, n_compositions); | |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39046
diff
changeset
|
320 XSETCAR (prop, id); |
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39046
diff
changeset
|
321 XSETCDR (prop, Fcons (make_number (nchars), Fcons (key, XCDR (prop)))); |
26848 | 322 |
323 /* Register the composition in composition_hash_table. */ | |
324 hash_index = hash_put (hash_table, key, id, hash_code); | |
325 | |
326 /* Register the composition in composition_table. */ | |
327 cmp = (struct composition *) xmalloc (sizeof (struct composition)); | |
328 | |
329 cmp->method = (NILP (components) | |
330 ? COMPOSITION_RELATIVE | |
331 : ((INTEGERP (components) || STRINGP (components)) | |
332 ? COMPOSITION_WITH_ALTCHARS | |
333 : COMPOSITION_WITH_RULE_ALTCHARS)); | |
334 cmp->hash_index = hash_index; | |
335 glyph_len = (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS | |
336 ? (XVECTOR (key)->size + 1) / 2 | |
337 : XVECTOR (key)->size); | |
338 cmp->glyph_len = glyph_len; | |
339 cmp->offsets = (short *) xmalloc (sizeof (short) * glyph_len * 2); | |
340 cmp->font = NULL; | |
341 | |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
342 if (cmp->method != COMPOSITION_WITH_RULE_ALTCHARS) |
26848 | 343 { |
344 /* Relative composition. */ | |
345 cmp->width = 0; | |
346 for (i = 0; i < glyph_len; i++) | |
347 { | |
348 int this_width; | |
349 ch = XINT (key_contents[i]); | |
96413
b38a7de9af46
(get_composition_id): Fix the width calculation for TAB.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
350 this_width = (ch == '\t' ? 1 : CHAR_WIDTH (ch)); |
26848 | 351 if (cmp->width < this_width) |
352 cmp->width = this_width; | |
353 } | |
354 } | |
355 else | |
356 { | |
357 /* Rule-base composition. */ | |
358 float leftmost = 0.0, rightmost; | |
359 | |
360 ch = XINT (key_contents[0]); | |
90618
b7ce72709298
(get_composition_id): Pay attention to TAB
Kenichi Handa <handa@m17n.org>
parents:
90405
diff
changeset
|
361 rightmost = ch != '\t' ? CHAR_WIDTH (ch) : 1; |
26848 | 362 |
363 for (i = 1; i < glyph_len; i += 2) | |
364 { | |
89726
2660b0974edb
(get_composition_id): Handle xoff and yoff in a
Kenichi Handa <handa@m17n.org>
parents:
89706
diff
changeset
|
365 int rule, gref, nref, xoff, yoff; |
26848 | 366 int this_width; |
367 float this_left; | |
368 | |
369 rule = XINT (key_contents[i]); | |
370 ch = XINT (key_contents[i + 1]); | |
90618
b7ce72709298
(get_composition_id): Pay attention to TAB
Kenichi Handa <handa@m17n.org>
parents:
90405
diff
changeset
|
371 this_width = ch != '\t' ? CHAR_WIDTH (ch) : 1; |
26848 | 372 |
373 /* A composition rule is specified by an integer value | |
374 that encodes global and new reference points (GREF and | |
375 NREF). GREF and NREF are specified by numbers as | |
376 below: | |
377 0---1---2 -- ascent | |
378 | | | |
379 | | | |
380 | | | |
381 9--10--11 -- center | |
382 | | | |
383 ---3---4---5--- baseline | |
384 | | | |
385 6---7---8 -- descent | |
386 */ | |
89726
2660b0974edb
(get_composition_id): Handle xoff and yoff in a
Kenichi Handa <handa@m17n.org>
parents:
89706
diff
changeset
|
387 COMPOSITION_DECODE_RULE (rule, gref, nref, xoff, yoff); |
26848 | 388 this_left = (leftmost |
389 + (gref % 3) * (rightmost - leftmost) / 2.0 | |
390 - (nref % 3) * this_width / 2.0); | |
391 | |
392 if (this_left < leftmost) | |
393 leftmost = this_left; | |
394 if (this_left + this_width > rightmost) | |
395 rightmost = this_left + this_width; | |
396 } | |
397 | |
398 cmp->width = rightmost - leftmost; | |
399 if (cmp->width < (rightmost - leftmost)) | |
400 /* To get a ceiling integer value. */ | |
401 cmp->width++; | |
402 } | |
403 | |
404 composition_table[n_compositions] = cmp; | |
405 | |
406 return n_compositions++; | |
407 | |
408 invalid_composition: | |
409 /* Would it be better to remove this `composition' property? */ | |
410 return -1; | |
411 } | |
412 | |
413 | |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
414 /* Find a static composition at or nearest to position POS of OBJECT |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
415 (buffer or string). |
26848 | 416 |
417 OBJECT defaults to the current buffer. If there's a composition at | |
418 POS, set *START and *END to the start and end of the sequence, | |
419 *PROP to the `composition' property, and return 1. | |
420 | |
421 If there's no composition at POS and LIMIT is negative, return 0. | |
422 | |
423 Otherwise, search for a composition forward (LIMIT > POS) or | |
424 backward (LIMIT < POS). In this case, LIMIT bounds the search. | |
425 | |
426 If a composition is found, set *START, *END, and *PROP as above, | |
427 and return 1, else return 0. | |
428 | |
429 This doesn't check the validity of composition. */ | |
430 | |
431 int | |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
432 find_composition (EMACS_INT pos, EMACS_INT limit, |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
433 EMACS_INT *start, EMACS_INT *end, |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
434 Lisp_Object *prop, Lisp_Object object) |
26848 | 435 { |
436 Lisp_Object val; | |
437 | |
438 if (get_property_and_range (pos, Qcomposition, prop, start, end, object)) | |
439 return 1; | |
440 | |
441 if (limit < 0 || limit == pos) | |
442 return 0; | |
443 | |
444 if (limit > pos) /* search forward */ | |
34933
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
445 { |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
446 val = Fnext_single_property_change (make_number (pos), Qcomposition, |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
447 object, make_number (limit)); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
448 pos = XINT (val); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
449 if (pos == limit) |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
450 return 0; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
451 } |
26848 | 452 else /* search backward */ |
34933
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
453 { |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
454 if (get_property_and_range (pos - 1, Qcomposition, prop, start, end, |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
455 object)) |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
456 return 1; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
457 val = Fprevious_single_property_change (make_number (pos), Qcomposition, |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
458 object, make_number (limit)); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
459 pos = XINT (val); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
460 if (pos == limit) |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
461 return 0; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
462 pos--; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
463 } |
26848 | 464 get_property_and_range (pos, Qcomposition, prop, start, end, object); |
465 return 1; | |
466 } | |
467 | |
468 /* Run a proper function to adjust the composition sitting between | |
469 FROM and TO with property PROP. */ | |
470 | |
471 static void | |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
472 run_composition_function (EMACS_INT from, EMACS_INT to, Lisp_Object prop) |
26848 | 473 { |
34958
e3133339e30c
(run_composition_function): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents:
34933
diff
changeset
|
474 Lisp_Object func; |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
475 EMACS_INT start, end; |
26848 | 476 |
477 func = COMPOSITION_MODIFICATION_FUNC (prop); | |
478 /* If an invalid composition precedes or follows, try to make them | |
479 valid too. */ | |
480 if (from > BEGV | |
481 && find_composition (from - 1, -1, &start, &end, &prop, Qnil) | |
482 && !COMPOSITION_VALID_P (start, end, prop)) | |
483 from = start; | |
484 if (to < ZV | |
485 && find_composition (to, -1, &start, &end, &prop, Qnil) | |
486 && !COMPOSITION_VALID_P (start, end, prop)) | |
487 to = end; | |
46940 | 488 if (!NILP (Ffboundp (func))) |
26848 | 489 call2 (func, make_number (from), make_number (to)); |
490 } | |
491 | |
492 /* Make invalid compositions adjacent to or inside FROM and TO valid. | |
493 CHECK_MASK is bitwise `or' of mask bits defined by macros | |
494 CHECK_XXX (see the comment in composite.h). | |
495 | |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
diff
changeset
|
496 It also resets the text-property `auto-composed' to a proper region |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
497 so that automatic character composition works correctly later while |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
498 displaying the region. |
89483 | 499 |
26848 | 500 This function is called when a buffer text is changed. If the |
501 change is deletion, FROM == TO. Otherwise, FROM < TO. */ | |
502 | |
503 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
504 update_compositions (EMACS_INT from, EMACS_INT to, int check_mask) |
26848 | 505 { |
34958
e3133339e30c
(run_composition_function): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents:
34933
diff
changeset
|
506 Lisp_Object prop; |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
507 EMACS_INT start, end; |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
508 /* The beginning and end of the region to set the property |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
509 `auto-composed' to nil. */ |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
510 EMACS_INT min_pos = from, max_pos = to; |
26848 | 511 |
39046
a61b3d907098
(update_compositions): Do nothing if
Gerd Moellmann <gerd@gnu.org>
parents:
38116
diff
changeset
|
512 if (inhibit_modification_hooks) |
a61b3d907098
(update_compositions): Do nothing if
Gerd Moellmann <gerd@gnu.org>
parents:
38116
diff
changeset
|
513 return; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
514 |
28581
151b7ae3b21f
(update_compositions): If FROM and TO is not in a
Kenichi Handa <handa@m17n.org>
parents:
28472
diff
changeset
|
515 /* If FROM and TO are not in a valid range, do nothing. */ |
151b7ae3b21f
(update_compositions): If FROM and TO is not in a
Kenichi Handa <handa@m17n.org>
parents:
28472
diff
changeset
|
516 if (! (BEGV <= from && from <= to && to <= ZV)) |
151b7ae3b21f
(update_compositions): If FROM and TO is not in a
Kenichi Handa <handa@m17n.org>
parents:
28472
diff
changeset
|
517 return; |
151b7ae3b21f
(update_compositions): If FROM and TO is not in a
Kenichi Handa <handa@m17n.org>
parents:
28472
diff
changeset
|
518 |
26848 | 519 if (check_mask & CHECK_HEAD) |
520 { | |
521 /* FROM should be at composition boundary. But, insertion or | |
522 deletion will make two compositions adjacent and | |
523 indistinguishable when they have same (eq) property. To | |
524 avoid it, in such a case, we change the property of the | |
525 latter to the copy of it. */ | |
526 if (from > BEGV | |
78011
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
527 && find_composition (from - 1, -1, &start, &end, &prop, Qnil) |
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
528 && COMPOSITION_VALID_P (start, end, prop)) |
26848 | 529 { |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
530 min_pos = start; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
531 if (end > to) |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
532 max_pos = end; |
26848 | 533 if (from < end) |
534 Fput_text_property (make_number (from), make_number (end), | |
535 Qcomposition, | |
536 Fcons (XCAR (prop), XCDR (prop)), Qnil); | |
537 run_composition_function (start, end, prop); | |
538 from = end; | |
539 } | |
37242
029c8c1b451d
(update_compositions) <check_mask & CHECK_HEAD>: Fix
Dave Love <fx@gnu.org>
parents:
34958
diff
changeset
|
540 else if (from < ZV |
78011
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
541 && find_composition (from, -1, &start, &from, &prop, Qnil) |
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
542 && COMPOSITION_VALID_P (start, from, prop)) |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
543 { |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
544 if (from > to) |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
545 max_pos = from; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
546 run_composition_function (start, from, prop); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
547 } |
26848 | 548 } |
549 | |
550 if (check_mask & CHECK_INSIDE) | |
551 { | |
552 /* In this case, we are sure that (check & CHECK_TAIL) is also | |
553 nonzero. Thus, here we should check only compositions before | |
554 (to - 1). */ | |
555 while (from < to - 1 | |
556 && find_composition (from, to, &start, &from, &prop, Qnil) | |
78011
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
557 && COMPOSITION_VALID_P (start, from, prop) |
26848 | 558 && from < to - 1) |
559 run_composition_function (start, from, prop); | |
560 } | |
561 | |
562 if (check_mask & CHECK_TAIL) | |
563 { | |
564 if (from < to | |
78011
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
565 && find_composition (to - 1, -1, &start, &end, &prop, Qnil) |
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
566 && COMPOSITION_VALID_P (start, end, prop)) |
26848 | 567 { |
568 /* TO should be also at composition boundary. But, | |
569 insertion or deletion will make two compositions adjacent | |
570 and indistinguishable when they have same (eq) property. | |
571 To avoid it, in such a case, we change the property of | |
572 the former to the copy of it. */ | |
573 if (to < end) | |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
574 { |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
575 Fput_text_property (make_number (start), make_number (to), |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
576 Qcomposition, |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
577 Fcons (XCAR (prop), XCDR (prop)), Qnil); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
578 max_pos = end; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
579 } |
26848 | 580 run_composition_function (start, end, prop); |
581 } | |
582 else if (to < ZV | |
78011
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
583 && find_composition (to, -1, &start, &end, &prop, Qnil) |
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
584 && COMPOSITION_VALID_P (start, end, prop)) |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
585 { |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
586 run_composition_function (start, end, prop); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
587 max_pos = end; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
588 } |
26848 | 589 } |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
590 if (min_pos < max_pos) |
89633
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
591 { |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
592 int count = SPECPDL_INDEX (); |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
593 |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
594 specbind (Qinhibit_read_only, Qt); |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
595 specbind (Qinhibit_modification_hooks, Qt); |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
596 specbind (Qinhibit_point_motion_hooks, Qt); |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
597 Fremove_list_of_text_properties (make_number (min_pos), |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
598 make_number (max_pos), |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
599 Fcons (Qauto_composed, Qnil), Qnil); |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
600 unbind_to (count, Qnil); |
26848 | 601 } |
602 } | |
603 | |
30022
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
604 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
605 /* Modify composition property values in LIST destructively. LIST is |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
606 a list as returned from text_property_list. Change values to the |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
607 top-level copies of them so that none of them are `eq'. */ |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
608 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
609 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
610 make_composition_value_copy (Lisp_Object list) |
30022
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
611 { |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
612 Lisp_Object plist, val; |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
613 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
614 for (; CONSP (list); list = XCDR (list)) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
615 { |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
616 plist = XCAR (XCDR (XCDR (XCAR (list)))); |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
617 while (CONSP (plist) && CONSP (XCDR (plist))) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
618 { |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
619 if (EQ (XCAR (plist), Qcomposition) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
620 && (val = XCAR (XCDR (plist)), CONSP (val))) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39046
diff
changeset
|
621 XSETCAR (XCDR (plist), Fcons (XCAR (val), XCDR (val))); |
30022
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
622 plist = XCDR (XCDR (plist)); |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
623 } |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
624 } |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
625 } |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
626 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
627 |
26848 | 628 /* Make text in the region between START and END a composition that |
629 has COMPONENTS and MODIFICATION-FUNC. | |
630 | |
631 If STRING is non-nil, then operate on characters contained between | |
632 indices START and END in STRING. */ | |
633 | |
634 void | |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
635 compose_text (EMACS_INT start, EMACS_INT end, Lisp_Object components, |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
636 Lisp_Object modification_func, Lisp_Object string) |
26848 | 637 { |
638 Lisp_Object prop; | |
639 | |
640 prop = Fcons (Fcons (make_number (end - start), components), | |
641 modification_func); | |
642 Fput_text_property (make_number (start), make_number (end), | |
643 Qcomposition, prop, string); | |
644 } | |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
645 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
646 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108881
diff
changeset
|
647 static Lisp_Object autocmp_chars (Lisp_Object, EMACS_INT, EMACS_INT, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108881
diff
changeset
|
648 EMACS_INT, struct window *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108881
diff
changeset
|
649 struct face *, Lisp_Object); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
650 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
651 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
652 /* Lisp glyph-string handlers */ |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
653 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
654 /* Hash table for automatic composition. The key is a header of a |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
655 lgstring (Lispy glyph-string), and the value is a body of a |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
656 lgstring. */ |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
657 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
658 static Lisp_Object gstring_hash_table; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
659 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108881
diff
changeset
|
660 static Lisp_Object gstring_lookup_cache (Lisp_Object); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
661 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
662 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
663 gstring_lookup_cache (Lisp_Object header) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
664 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
665 struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
666 int i = hash_lookup (h, header, NULL); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
667 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
668 return (i >= 0 ? HASH_VALUE (h, i) : Qnil); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
669 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
670 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
671 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
672 composition_gstring_put_cache (Lisp_Object gstring, int len) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
673 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
674 struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
675 unsigned hash; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
676 Lisp_Object header, copy; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
677 int i; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
678 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
679 header = LGSTRING_HEADER (gstring); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
680 hash = h->hashfn (h, header); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
681 if (len < 0) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
682 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
683 len = LGSTRING_GLYPH_LEN (gstring); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
684 for (i = 0; i < len; i++) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
685 if (NILP (LGSTRING_GLYPH (gstring, i))) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
686 break; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
687 len = i; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
688 } |
102726
93ad3a5a4f75
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
101967
diff
changeset
|
689 |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
690 copy = Fmake_vector (make_number (len + 2), Qnil); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
691 LGSTRING_SET_HEADER (copy, Fcopy_sequence (header)); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
692 for (i = 0; i < len; i++) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
693 LGSTRING_SET_GLYPH (copy, i, Fcopy_sequence (LGSTRING_GLYPH (gstring, i))); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
694 i = hash_put (h, LGSTRING_HEADER (copy), copy, hash); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
695 LGSTRING_SET_ID (copy, make_number (i)); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
696 return copy; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
697 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
698 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
699 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
700 composition_gstring_from_id (int id) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
701 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
702 struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
703 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
704 return HASH_VALUE (h, id); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
705 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
706 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108881
diff
changeset
|
707 static Lisp_Object fill_gstring_header (Lisp_Object, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108881
diff
changeset
|
708 Lisp_Object, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108881
diff
changeset
|
709 Lisp_Object); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
710 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
711 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
712 composition_gstring_p (Lisp_Object gstring) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
713 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
714 Lisp_Object header; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
715 int i; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
716 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
717 if (! VECTORP (gstring) || ASIZE (gstring) < 2) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
718 return 0; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
719 header = LGSTRING_HEADER (gstring); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
720 if (! VECTORP (header) || ASIZE (header) < 2) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
721 return 0; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
722 if (! NILP (LGSTRING_FONT (gstring)) |
101775
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
723 && (! FONT_OBJECT_P (LGSTRING_FONT (gstring)) |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
724 && ! CODING_SYSTEM_P (LGSTRING_FONT (gstring)))) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
725 return 0; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
726 for (i = 1; i < ASIZE (LGSTRING_HEADER (gstring)); i++) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
727 if (! NATNUMP (AREF (LGSTRING_HEADER (gstring), i))) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
728 return 0; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
729 if (! NILP (LGSTRING_ID (gstring)) && ! NATNUMP (LGSTRING_ID (gstring))) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
730 return 0; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
731 for (i = 0; i < LGSTRING_GLYPH_LEN (gstring); i++) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
732 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
733 Lisp_Object glyph = LGSTRING_GLYPH (gstring, i); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
734 if (NILP (glyph)) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
735 break; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
736 if (! VECTORP (glyph) || ASIZE (glyph) != LGLYPH_SIZE) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
737 return 0; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
738 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
739 return 1; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
740 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
741 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
742 int |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
743 composition_gstring_width (Lisp_Object gstring, EMACS_INT from, EMACS_INT to, |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
744 struct font_metrics *metrics) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
745 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
746 Lisp_Object *glyph; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
747 int width = 0; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
748 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
749 if (metrics) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
750 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
751 Lisp_Object font_object = LGSTRING_FONT (gstring); |
101775
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
752 |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
753 if (FONT_OBJECT_P (font_object)) |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
754 { |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
755 struct font *font = XFONT_OBJECT (font_object); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
756 |
101775
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
757 metrics->ascent = font->ascent; |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
758 metrics->descent = font->descent; |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
759 } |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
760 else |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
761 { |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
762 metrics->ascent = 1; |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
763 metrics->descent = 0; |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
764 } |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
765 metrics->width = metrics->lbearing = metrics->rbearing = 0; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
766 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
767 for (glyph = &LGSTRING_GLYPH (gstring, from); from < to; from++, glyph++) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
768 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
769 int x; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
770 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
771 if (NILP (LGLYPH_ADJUSTMENT (*glyph))) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
772 width += LGLYPH_WIDTH (*glyph); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
773 else |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
774 width += LGLYPH_WADJUST (*glyph); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
775 if (metrics) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
776 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
777 x = metrics->width + LGLYPH_LBEARING (*glyph) + LGLYPH_XOFF (*glyph); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
778 if (metrics->lbearing > x) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
779 metrics->lbearing = x; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
780 x = metrics->width + LGLYPH_RBEARING (*glyph) + LGLYPH_XOFF (*glyph); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
781 if (metrics->rbearing < x) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
782 metrics->rbearing = x; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
783 metrics->width = width; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
784 x = LGLYPH_ASCENT (*glyph) - LGLYPH_YOFF (*glyph); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
785 if (metrics->ascent < x) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
786 metrics->ascent = x; |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
787 x = LGLYPH_DESCENT (*glyph) + LGLYPH_YOFF (*glyph); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
788 if (metrics->descent < x) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
789 metrics->descent = x; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
790 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
791 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
792 return width; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
793 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
794 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
795 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
796 static Lisp_Object gstring_work; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
797 static Lisp_Object gstring_work_headers; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
798 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
799 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
800 fill_gstring_header (Lisp_Object header, Lisp_Object start, Lisp_Object end, Lisp_Object font_object, Lisp_Object string) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
801 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
802 EMACS_INT from, to, from_byte; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
803 EMACS_INT len, i; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
804 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
805 if (NILP (string)) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
806 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
807 if (NILP (current_buffer->enable_multibyte_characters)) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
808 error ("Attempt to shape unibyte text"); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
809 validate_region (&start, &end); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
810 from = XFASTINT (start); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
811 to = XFASTINT (end); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
812 from_byte = CHAR_TO_BYTE (from); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
813 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
814 else |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
815 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
816 CHECK_STRING (string); |
99301
ef372a9c4197
(fill_gstring_header): Fix copy/paste typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
98369
diff
changeset
|
817 if (! STRING_MULTIBYTE (string)) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
818 error ("Attempt to shape unibyte text"); |
98214
5803b1114219
(fill_gstring_header): Don't check FROM and TO here.
Kenichi Handa <handa@m17n.org>
parents:
98213
diff
changeset
|
819 /* FROM and TO are checked by the caller. */ |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
820 from = XINT (start); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
821 to = XINT (end); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
822 if (from < 0 || from > to || to > SCHARS (string)) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
823 args_out_of_range_3 (string, start, end); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
824 from_byte = string_char_to_byte (string, from); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
825 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
826 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
827 len = to - from; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
828 if (len == 0) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
829 error ("Attempt to shape zero-length text"); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
830 if (VECTORP (header)) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
831 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
832 if (ASIZE (header) != len + 1) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
833 args_out_of_range (header, make_number (len + 1)); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
834 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
835 else |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
836 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
837 if (len <= 8) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
838 header = AREF (gstring_work_headers, len - 1); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
839 else |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
840 header = Fmake_vector (make_number (len + 1), Qnil); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
841 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
842 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
843 ASET (header, 0, font_object); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
844 for (i = 0; i < len; i++) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
845 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
846 int c; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
847 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
848 if (NILP (string)) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
849 FETCH_CHAR_ADVANCE_NO_CHECK (c, from, from_byte); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
850 else |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
851 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string, from, from_byte); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
852 ASET (header, i + 1, make_number (c)); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
853 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
854 return header; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
855 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
856 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
857 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
858 fill_gstring_body (Lisp_Object gstring) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
859 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
860 Lisp_Object font_object = LGSTRING_FONT (gstring); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
861 Lisp_Object header = AREF (gstring, 0); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
862 EMACS_INT len = LGSTRING_CHAR_LEN (gstring); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
863 EMACS_INT i; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
864 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
865 for (i = 0; i < len; i++) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
866 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
867 Lisp_Object g = LGSTRING_GLYPH (gstring, i); |
97854
a361f652d863
(fill_gstring_body): Avoid compiler warnings.
Eli Zaretskii <eliz@gnu.org>
parents:
97819
diff
changeset
|
868 EMACS_INT c = XINT (AREF (header, i + 1)); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
869 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
870 if (NILP (g)) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
871 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
872 g = LGLYPH_NEW (); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
873 LGSTRING_SET_GLYPH (gstring, i, g); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
874 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
875 LGLYPH_SET_FROM (g, i); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
876 LGLYPH_SET_TO (g, i); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
877 LGLYPH_SET_CHAR (g, c); |
101775
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
878 if (FONT_OBJECT_P (font_object)) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
879 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
880 font_fill_lglyph_metrics (g, font_object); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
881 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
882 else |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
883 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
884 int width = XFASTINT (CHAR_TABLE_REF (Vchar_width_table, c)); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
885 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
886 LGLYPH_SET_CODE (g, c); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
887 LGLYPH_SET_LBEARING (g, 0); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
888 LGLYPH_SET_RBEARING (g, width); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
889 LGLYPH_SET_WIDTH (g, width); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
890 LGLYPH_SET_ASCENT (g, 1); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
891 LGLYPH_SET_DESCENT (g, 0); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
892 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
893 LGLYPH_SET_ADJUSTMENT (g, Qnil); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
894 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
895 if (i < LGSTRING_GLYPH_LEN (gstring)) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
896 LGSTRING_SET_GLYPH (gstring, i, Qnil); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
897 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
898 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
899 |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
900 /* Try to compose the characters at CHARPOS according to composition |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
901 rule RULE ([PATTERN PREV-CHARS FUNC]). LIMIT limits the characters |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
902 to compose. STRING, if not nil, is a target string. WIN is a |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
903 window where the characters are being displayed. If characters are |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
904 successfully composed, return the composition as a glyph-string |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
905 object. Otherwise return nil. */ |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
906 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
907 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
908 autocmp_chars (Lisp_Object rule, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT limit, struct window *win, struct face *face, Lisp_Object string) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
909 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
910 int count = SPECPDL_INDEX (); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
911 FRAME_PTR f = XFRAME (win->frame); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
912 Lisp_Object pos = make_number (charpos); |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
913 EMACS_INT to; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
914 EMACS_INT pt = PT, pt_byte = PT_BYTE; |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
915 Lisp_Object re, font_object, lgstring; |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
916 EMACS_INT len; |
102726
93ad3a5a4f75
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
101967
diff
changeset
|
917 |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
918 record_unwind_save_match_data (); |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
919 re = AREF (rule, 0); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
920 if (NILP (re)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
921 len = 1; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
922 else if (! STRINGP (re)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
923 return unbind_to (count, Qnil); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
924 else if ((len = fast_looking_at (re, charpos, bytepos, limit, -1, string)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
925 > 0) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
926 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
927 if (NILP (string)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
928 len = BYTE_TO_CHAR (bytepos + len) - charpos; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
929 else |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
930 len = string_byte_to_char (string, bytepos + len) - charpos; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
931 } |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
932 if (len <= 0) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
933 return unbind_to (count, Qnil); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
934 to = limit = charpos + len; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
935 #ifdef HAVE_WINDOW_SYSTEM |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
936 if (FRAME_WINDOW_P (f)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
937 { |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
938 font_object = font_range (charpos, &to, win, face, string); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
939 if (! FONT_OBJECT_P (font_object) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
940 || (! NILP (re) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
941 && to < limit |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
942 && (fast_looking_at (re, charpos, bytepos, to, -1, string) <= 0))) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
943 return unbind_to (count, Qnil); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
944 } |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
945 else |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
946 #endif /* not HAVE_WINDOW_SYSTEM */ |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
947 font_object = win->frame; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
948 lgstring = Fcomposition_get_gstring (pos, make_number (to), font_object, |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
949 string); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
950 if (NILP (LGSTRING_ID (lgstring))) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
951 { |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
952 Lisp_Object args[6]; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
953 |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
954 /* Save point as marker before calling out to lisp. */ |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
955 if (NILP (string)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
956 { |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
957 Lisp_Object m = Fmake_marker (); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
958 set_marker_both (m, Qnil, pt, pt_byte); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
959 record_unwind_protect (restore_point_unwind, m); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
960 } |
108361 | 961 |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
962 args[0] = Vauto_composition_function; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
963 args[1] = AREF (rule, 2); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
964 args[2] = pos; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
965 args[3] = make_number (to); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
966 args[4] = font_object; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
967 args[5] = string; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
968 lgstring = safe_call (6, args); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
969 if (NILP (string)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
970 TEMP_SET_PT_BOTH (pt, pt_byte); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
971 } |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
972 return unbind_to (count, lgstring); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
973 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
974 |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
975 static Lisp_Object _work_val; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
976 static int _work_char; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
977 |
109976
26e31bcc4b06
Allow composition striding over PT.
Kenichi Handa <handa@m17n.org>
parents:
109972
diff
changeset
|
978 /* 1 iff the character C is composable. Characters of general |
26e31bcc4b06
Allow composition striding over PT.
Kenichi Handa <handa@m17n.org>
parents:
109972
diff
changeset
|
979 category Z? or C? are not composable except for ZWNJ and ZWJ. */ |
26e31bcc4b06
Allow composition striding over PT.
Kenichi Handa <handa@m17n.org>
parents:
109972
diff
changeset
|
980 |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
981 #define CHAR_COMPOSABLE_P(C) \ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
982 ((C) == 0x200C || (C) == 0x200D \ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
983 || (_work_val = CHAR_TABLE_REF (Vunicode_category_table, (C)), \ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
984 (SYMBOLP (_work_val) \ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
985 && (_work_char = SDATA (SYMBOL_NAME (_work_val))[0]) != 'C' \ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
986 && _work_char != 'Z'))) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
987 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
988 /* Update cmp_it->stop_pos to the next position after CHARPOS (and |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
989 BYTEPOS) where character composition may happen. If BYTEPOS is |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
990 negative, compute it. ENDPOS is a limit of searching. If it is |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
991 less than CHARPOS, search backward to ENDPOS+1 assuming that |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
992 set_iterator_to_next works in reverse order. In this case, if a |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
993 composition closest to CHARPOS is found, set cmp_it->stop_pos to |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
994 the last character of the composition. |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
995 |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
996 If no composition is found, set cmp_it->ch to -2. If a static |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
997 composition is found, set cmp_it->ch to -1. Otherwise, set |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
998 cmp_it->ch to the character that triggers the automatic |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
999 composition. */ |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1000 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1001 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1002 composition_compute_stop_pos (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT endpos, Lisp_Object string) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1003 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1004 EMACS_INT start, end, c; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1005 Lisp_Object prop, val; |
98107
77ec19652e4d
(composition_compute_stop_pos): Limit the search of composition to
Kenichi Handa <handa@m17n.org>
parents:
98100
diff
changeset
|
1006 /* This is from forward_to_next_line_start in xdisp.c. */ |
77ec19652e4d
(composition_compute_stop_pos): Limit the search of composition to
Kenichi Handa <handa@m17n.org>
parents:
98100
diff
changeset
|
1007 const int MAX_NEWLINE_DISTANCE = 500; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1008 |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1009 if (charpos < endpos) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1010 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1011 if (endpos > charpos + MAX_NEWLINE_DISTANCE) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1012 endpos = charpos + MAX_NEWLINE_DISTANCE; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1013 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1014 else if (endpos < charpos) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1015 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1016 /* We search backward for a position to check composition. */ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1017 if (endpos < 0) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1018 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1019 /* But we don't know where to stop the searching. */ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1020 endpos = NILP (string) ? BEGV - 1 : -1; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1021 /* Usually we don't reach ENDPOS because we stop searching |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1022 at an uncomposable character (NL, LRE, etc). */ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1023 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1024 } |
98128
092123c2b01a
(composition_compute_stop_pos): Reset cmp_it->id to -1 at first.
Kenichi Handa <handa@m17n.org>
parents:
98115
diff
changeset
|
1025 cmp_it->id = -1; |
98115
463a86221cdd
(composition_compute_stop_pos): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98107
diff
changeset
|
1026 cmp_it->ch = -2; |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1027 cmp_it->reversed_p = 0; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1028 cmp_it->stop_pos = endpos; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1029 if (charpos == endpos) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1030 return; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1031 /* FIXME: Bidi is not yet handled well in static composition. */ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1032 if (charpos < endpos |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1033 && find_composition (charpos, endpos, &start, &end, &prop, string) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1034 && COMPOSITION_VALID_P (start, end, prop)) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1035 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1036 cmp_it->stop_pos = endpos = start; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1037 cmp_it->ch = -1; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1038 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1039 if (NILP (current_buffer->enable_multibyte_characters) |
106812
23c562723a8d
Make auto-composition work on all buffers even if they are fundamental mode.
Kenichi Handa <handa@m17n.org>
parents:
106799
diff
changeset
|
1040 || NILP (Vauto_composition_mode)) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1041 return; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1042 if (bytepos < 0) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1043 { |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1044 if (NILP (string)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1045 bytepos = CHAR_TO_BYTE (charpos); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1046 else |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1047 bytepos = string_char_to_byte (string, charpos); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1048 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1049 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1050 start = charpos; |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1051 if (charpos < endpos) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1052 { |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1053 /* Forward search. */ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1054 while (charpos < endpos) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1055 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1056 if (STRINGP (string)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1057 FETCH_STRING_CHAR_ADVANCE (c, string, charpos, bytepos); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1058 else |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1059 FETCH_CHAR_ADVANCE (c, charpos, bytepos); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1060 if (c == '\n') |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1061 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1062 cmp_it->ch = -2; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1063 break; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1064 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1065 val = CHAR_TABLE_REF (Vcomposition_function_table, c); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1066 if (! NILP (val)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1067 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1068 Lisp_Object elt; |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1069 int ridx; |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1070 |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1071 for (ridx = 0; CONSP (val); val = XCDR (val), ridx++) |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1072 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1073 elt = XCAR (val); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1074 if (VECTORP (elt) && ASIZE (elt) == 3 |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1075 && NATNUMP (AREF (elt, 1)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1076 && charpos - 1 - XFASTINT (AREF (elt, 1)) >= start) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1077 break; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1078 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1079 if (CONSP (val)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1080 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1081 cmp_it->rule_idx = ridx; |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1082 cmp_it->lookback = XFASTINT (AREF (elt, 1)); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1083 cmp_it->stop_pos = charpos - 1 - cmp_it->lookback; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1084 cmp_it->ch = c; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1085 return; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1086 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1087 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1088 } |
109972
7a86ccf3260e
Fix finding a stop position for composition.
Kenichi Handa <handa@m17n.org>
parents:
109573
diff
changeset
|
1089 if (charpos == endpos) |
7a86ccf3260e
Fix finding a stop position for composition.
Kenichi Handa <handa@m17n.org>
parents:
109573
diff
changeset
|
1090 { |
7a86ccf3260e
Fix finding a stop position for composition.
Kenichi Handa <handa@m17n.org>
parents:
109573
diff
changeset
|
1091 /* We couldn't find a composition point before ENDPOS. But, |
7a86ccf3260e
Fix finding a stop position for composition.
Kenichi Handa <handa@m17n.org>
parents:
109573
diff
changeset
|
1092 some character after ENDPOS may be composed with |
7a86ccf3260e
Fix finding a stop position for composition.
Kenichi Handa <handa@m17n.org>
parents:
109573
diff
changeset
|
1093 characters before ENDPOS. So, we should stop at the safe |
7a86ccf3260e
Fix finding a stop position for composition.
Kenichi Handa <handa@m17n.org>
parents:
109573
diff
changeset
|
1094 point. */ |
7a86ccf3260e
Fix finding a stop position for composition.
Kenichi Handa <handa@m17n.org>
parents:
109573
diff
changeset
|
1095 charpos = endpos - MAX_AUTO_COMPOSITION_LOOKBACK; |
7a86ccf3260e
Fix finding a stop position for composition.
Kenichi Handa <handa@m17n.org>
parents:
109573
diff
changeset
|
1096 if (charpos < start) |
7a86ccf3260e
Fix finding a stop position for composition.
Kenichi Handa <handa@m17n.org>
parents:
109573
diff
changeset
|
1097 charpos = start; |
7a86ccf3260e
Fix finding a stop position for composition.
Kenichi Handa <handa@m17n.org>
parents:
109573
diff
changeset
|
1098 } |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1099 } |
108784
009ef331a2bc
Fix for finding a static composition.
Kenichi Handa <handa@etlken>
parents:
108759
diff
changeset
|
1100 else if (charpos > endpos) |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1101 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1102 /* Search backward for a pattern that may be composed and the |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1103 position of (possibly) the last character of the match is |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1104 closest to (but not after) START. The reason for the last |
108570
dce075eda1bf
Fix comments from revno 100276.
Eli Zaretskii <eliz@gnu.org>
parents:
108552
diff
changeset
|
1105 character is that set_iterator_to_next works in reverse order, |
dce075eda1bf
Fix comments from revno 100276.
Eli Zaretskii <eliz@gnu.org>
parents:
108552
diff
changeset
|
1106 and thus we must stop at the last character for composition |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1107 check. */ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1108 unsigned char *p; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1109 int len; |
108570
dce075eda1bf
Fix comments from revno 100276.
Eli Zaretskii <eliz@gnu.org>
parents:
108552
diff
changeset
|
1110 /* Limit byte position used in fast_looking_at. This is the |
dce075eda1bf
Fix comments from revno 100276.
Eli Zaretskii <eliz@gnu.org>
parents:
108552
diff
changeset
|
1111 byte position of the character after START. */ |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1112 EMACS_INT limit; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1113 |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1114 if (NILP (string)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1115 p = BYTE_POS_ADDR (bytepos); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1116 else |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1117 p = SDATA (string) + bytepos; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1118 c = STRING_CHAR_AND_LENGTH (p, len); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1119 limit = bytepos + len; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1120 while (CHAR_COMPOSABLE_P (c)) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1121 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1122 val = CHAR_TABLE_REF (Vcomposition_function_table, c); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1123 if (! NILP (val)) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1124 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1125 Lisp_Object elt; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1126 int ridx, back, len; |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1127 |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1128 for (ridx = 0; CONSP (val); val = XCDR (val), ridx++) |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1129 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1130 elt = XCAR (val); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1131 if (VECTORP (elt) && ASIZE (elt) == 3 |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1132 && NATNUMP (AREF (elt, 1)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1133 && charpos - (back = XFASTINT (AREF (elt, 1))) > endpos) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1134 { |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1135 EMACS_INT cpos = charpos - back, bpos; |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1136 |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1137 if (back == 0) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1138 bpos = bytepos; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1139 else |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1140 bpos = (NILP (string) ? CHAR_TO_BYTE (cpos) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1141 : string_char_to_byte (string, cpos)); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1142 if (STRINGP (AREF (elt, 0))) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1143 len = fast_looking_at (AREF (elt, 0), cpos, bpos, |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1144 start + 1, limit, string); |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1145 else |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1146 len = 1; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1147 if (len > 0) |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1148 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1149 /* Make CPOS point to the last character of |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1150 match. Note that LEN is byte-length. */ |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1151 if (len > 1) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1152 { |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1153 bpos += len; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1154 if (NILP (string)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1155 cpos = BYTE_TO_CHAR (bpos) - 1; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1156 else |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1157 cpos = string_byte_to_char (string, bpos) - 1; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1158 } |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1159 back = cpos - (charpos - back); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1160 if (cmp_it->stop_pos < cpos |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1161 || (cmp_it->stop_pos == cpos |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1162 && cmp_it->lookback < back)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1163 { |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1164 cmp_it->rule_idx = ridx; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1165 cmp_it->stop_pos = cpos; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1166 cmp_it->ch = c; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1167 cmp_it->lookback = back; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1168 cmp_it->nchars = back + 1; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1169 } |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1170 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1171 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1172 } |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1173 } |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1174 if (charpos - 1 == endpos) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1175 break; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1176 if (STRINGP (string)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1177 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1178 p--, bytepos--; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1179 while (! CHAR_HEAD_P (*p)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1180 p--, bytepos--; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1181 charpos--; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1182 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1183 else |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1184 { |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1185 DEC_BOTH (charpos, bytepos); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1186 p = BYTE_POS_ADDR (bytepos); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1187 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1188 c = STRING_CHAR (p); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1189 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1190 if (cmp_it->ch >= 0) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1191 /* We found a position to check. */ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1192 return; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1193 /* Skip all uncomposable characters. */ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1194 if (NILP (string)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1195 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1196 while (charpos - 1 > endpos && ! CHAR_COMPOSABLE_P (c)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1197 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1198 DEC_BOTH (charpos, bytepos); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1199 c = FETCH_MULTIBYTE_CHAR (bytepos); |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1200 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1201 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1202 else |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1203 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1204 while (charpos - 1 > endpos && ! CHAR_COMPOSABLE_P (c)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1205 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1206 p--; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1207 while (! CHAR_HEAD_P (*p)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1208 p--; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1209 charpos--; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1210 c = STRING_CHAR (p); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1211 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1212 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1213 } |
98115
463a86221cdd
(composition_compute_stop_pos): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98107
diff
changeset
|
1214 cmp_it->stop_pos = charpos; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1215 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1216 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1217 /* Check if the character at CHARPOS (and BYTEPOS) is composed |
99512
0ba1e475119f
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
99301
diff
changeset
|
1218 (possibly with the following characters) on window W. ENDPOS limits |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1219 characters to be composed. FACE, in non-NULL, is a base face of |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1220 the character. If STRING is not nil, it is a string containing the |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1221 character to check, and CHARPOS and BYTEPOS are indices in the |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1222 string. In that case, FACE must not be NULL. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1223 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1224 If the character is composed, setup members of CMP_IT (id, nglyphs, |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1225 from, to, reversed_p), and return 1. Otherwise, update |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1226 CMP_IT->stop_pos, and return 0. */ |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1227 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1228 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1229 composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT endpos, struct window *w, struct face *face, Lisp_Object string) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1230 { |
109976
26e31bcc4b06
Allow composition striding over PT.
Kenichi Handa <handa@m17n.org>
parents:
109972
diff
changeset
|
1231 if (endpos < 0) |
26e31bcc4b06
Allow composition striding over PT.
Kenichi Handa <handa@m17n.org>
parents:
109972
diff
changeset
|
1232 endpos = NILP (string) ? BEGV : 0; |
106632
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1233 |
98107
77ec19652e4d
(composition_compute_stop_pos): Limit the search of composition to
Kenichi Handa <handa@m17n.org>
parents:
98100
diff
changeset
|
1234 if (cmp_it->ch == -2) |
77ec19652e4d
(composition_compute_stop_pos): Limit the search of composition to
Kenichi Handa <handa@m17n.org>
parents:
98100
diff
changeset
|
1235 { |
77ec19652e4d
(composition_compute_stop_pos): Limit the search of composition to
Kenichi Handa <handa@m17n.org>
parents:
98100
diff
changeset
|
1236 composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string); |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1237 if (cmp_it->ch == -2 || cmp_it->stop_pos != charpos) |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1238 /* The current position is not composed. */ |
98107
77ec19652e4d
(composition_compute_stop_pos): Limit the search of composition to
Kenichi Handa <handa@m17n.org>
parents:
98100
diff
changeset
|
1239 return 0; |
77ec19652e4d
(composition_compute_stop_pos): Limit the search of composition to
Kenichi Handa <handa@m17n.org>
parents:
98100
diff
changeset
|
1240 } |
77ec19652e4d
(composition_compute_stop_pos): Limit the search of composition to
Kenichi Handa <handa@m17n.org>
parents:
98100
diff
changeset
|
1241 |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1242 if (cmp_it->ch < 0) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1243 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1244 /* We are looking at a static composition. */ |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1245 EMACS_INT start, end; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1246 Lisp_Object prop; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1247 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1248 find_composition (charpos, -1, &start, &end, &prop, string); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1249 cmp_it->id = get_composition_id (charpos, bytepos, end - start, |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1250 prop, string); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1251 if (cmp_it->id < 0) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1252 goto no_composition; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1253 cmp_it->nchars = end - start; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1254 cmp_it->nglyphs = composition_table[cmp_it->id]->glyph_len; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1255 } |
98156
464ec62a612c
(composition_reseat_it): If the current buffer is
Kenichi Handa <handa@m17n.org>
parents:
98128
diff
changeset
|
1256 else if (w) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1257 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1258 Lisp_Object lgstring = Qnil; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1259 Lisp_Object val, elt, re; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1260 int len, i; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1261 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1262 val = CHAR_TABLE_REF (Vcomposition_function_table, cmp_it->ch); |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1263 for (i = 0; i < cmp_it->rule_idx; i++, val = XCDR (val)); |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1264 if (charpos < endpos) |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1265 { |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1266 for (; CONSP (val); val = XCDR (val)) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1267 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1268 elt = XCAR (val); |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1269 if (! VECTORP (elt) || ASIZE (elt) != 3 |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1270 || ! INTEGERP (AREF (elt, 1))) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1271 continue; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1272 if (XFASTINT (AREF (elt, 1)) != cmp_it->lookback) |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108784
diff
changeset
|
1273 goto no_composition; |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1274 lgstring = autocmp_chars (elt, charpos, bytepos, endpos, |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1275 w, face, string); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1276 if (composition_gstring_p (lgstring)) |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1277 break; |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1278 lgstring = Qnil; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1279 /* Composition failed perhaps because the font doesn't |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1280 support sufficient range of characters. Try the |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1281 other composition rules if any. */ |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1282 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1283 cmp_it->reversed_p = 0; |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1284 } |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1285 else |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1286 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1287 EMACS_INT cpos = charpos, bpos = bytepos; |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1288 |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1289 while (1) |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1290 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1291 elt = XCAR (val); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1292 if (cmp_it->lookback > 0) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1293 { |
109976
26e31bcc4b06
Allow composition striding over PT.
Kenichi Handa <handa@m17n.org>
parents:
109972
diff
changeset
|
1294 cpos = charpos - cmp_it->lookback; |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1295 if (STRINGP (string)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1296 bpos = string_char_to_byte (string, cpos); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1297 else |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1298 bpos = CHAR_TO_BYTE (cpos); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1299 } |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1300 lgstring = autocmp_chars (elt, cpos, bpos, charpos + 1, w, face, |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1301 string); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1302 if (composition_gstring_p (lgstring) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1303 && cpos + LGSTRING_CHAR_LEN (lgstring) - 1 == charpos) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1304 break; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1305 /* Composition failed or didn't cover the current |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1306 character. */ |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1307 if (cmp_it->lookback == 0) |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1308 goto no_composition; |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1309 lgstring = Qnil; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1310 /* Try to find a shorter compostion that starts after CPOS. */ |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1311 composition_compute_stop_pos (cmp_it, charpos, bytepos, cpos, |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1312 string); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1313 if (cmp_it->ch == -2 || cmp_it->stop_pos < charpos) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1314 goto no_composition; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1315 val = CHAR_TABLE_REF (Vcomposition_function_table, cmp_it->ch); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1316 for (i = 0; i < cmp_it->rule_idx; i++, val = XCDR (val)); |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1317 } |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1318 cmp_it->reversed_p = 1; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1319 } |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1320 if (NILP (lgstring)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1321 goto no_composition; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1322 if (NILP (LGSTRING_ID (lgstring))) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1323 lgstring = composition_gstring_put_cache (lgstring, -1); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1324 cmp_it->id = XINT (LGSTRING_ID (lgstring)); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1325 for (i = 0; i < LGSTRING_GLYPH_LEN (lgstring); i++) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1326 if (NILP (LGSTRING_GLYPH (lgstring, i))) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1327 break; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1328 cmp_it->nglyphs = i; |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1329 cmp_it->from = 0; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1330 cmp_it->to = i; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1331 } |
98156
464ec62a612c
(composition_reseat_it): If the current buffer is
Kenichi Handa <handa@m17n.org>
parents:
98128
diff
changeset
|
1332 else |
464ec62a612c
(composition_reseat_it): If the current buffer is
Kenichi Handa <handa@m17n.org>
parents:
98128
diff
changeset
|
1333 goto no_composition; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1334 return 1; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1335 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1336 no_composition: |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1337 if (charpos == endpos) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1338 return 0; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1339 if (charpos < endpos) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1340 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1341 charpos++; |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1342 if (NILP (string)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1343 INC_POS (bytepos); |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1344 else |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108784
diff
changeset
|
1345 bytepos += BYTES_BY_CHAR_HEAD (*(SDATA (string) + bytepos)); |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1346 } |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1347 else |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1348 { |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1349 charpos--; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1350 /* BYTEPOS is calculated in composition_compute_stop_pos */ |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1351 bytepos = -1; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1352 } |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1353 composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1354 return 0; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1355 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1356 |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1357 /* Update charpos, nchars, nbytes, and width of the current grapheme |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1358 cluster. |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1359 |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1360 If the composition is static or automatic in L2R context, the |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1361 cluster is identified by CMP_IT->from, and CHARPOS is the position |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1362 of the first character of the cluster. In this case, update |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1363 CMP_IT->to too. |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1364 |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1365 If the composition is automatic in R2L context, the cluster is |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1366 identified by CMP_IT->to, and CHARPOS is the position of the last |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1367 character of the cluster. In this case, update CMP_IT->from too. |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1368 |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1369 The return value is the character code of the first character of |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1370 the cluster, or -1 if the composition is somehow broken. */ |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1371 |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1372 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1373 composition_update_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, Lisp_Object string) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1374 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1375 int i, c; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1376 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1377 if (cmp_it->ch < 0) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1378 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1379 /* static composition */ |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1380 struct composition *cmp = composition_table[cmp_it->id]; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1381 |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1382 cmp_it->charpos = charpos; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1383 cmp_it->to = cmp_it->nglyphs; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1384 if (cmp_it->nglyphs == 0) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1385 c = -1; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1386 else |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1387 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1388 for (i = 0; i < cmp->glyph_len; i++) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1389 if ((c = COMPOSITION_GLYPH (cmp, i)) != '\t') |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1390 break; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1391 if (c == '\t') |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1392 c = ' '; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1393 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1394 cmp_it->width = cmp->width; |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1395 charpos += cmp_it->nchars; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1396 if (STRINGP (string)) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1397 cmp_it->nbytes = string_char_to_byte (string, charpos) - bytepos; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1398 else |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1399 cmp_it->nbytes = CHAR_TO_BYTE (charpos) - bytepos; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1400 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1401 else |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1402 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1403 /* automatic composition */ |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1404 Lisp_Object gstring = composition_gstring_from_id (cmp_it->id); |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1405 Lisp_Object glyph; |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
1406 EMACS_INT from; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1407 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1408 if (cmp_it->nglyphs == 0) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1409 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1410 cmp_it->nchars = LGSTRING_CHAR_LEN (gstring); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1411 cmp_it->width = 0; |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1412 cmp_it->from = cmp_it->to = 0; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1413 return -1; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1414 } |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1415 if (! cmp_it->reversed_p) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1416 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1417 glyph = LGSTRING_GLYPH (gstring, cmp_it->from); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1418 from = LGLYPH_FROM (glyph); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1419 for (cmp_it->to = cmp_it->from + 1; cmp_it->to < cmp_it->nglyphs; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1420 cmp_it->to++) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1421 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1422 glyph = LGSTRING_GLYPH (gstring, cmp_it->to); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1423 if (LGLYPH_FROM (glyph) != from) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1424 break; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1425 } |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1426 cmp_it->charpos = charpos; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1427 } |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1428 else |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1429 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1430 glyph = LGSTRING_GLYPH (gstring, cmp_it->to - 1); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1431 from = LGLYPH_FROM (glyph); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1432 cmp_it->charpos = charpos - (LGLYPH_TO (glyph) - from); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1433 for (cmp_it->from = cmp_it->to - 1; cmp_it->from > 0; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1434 cmp_it->from--) |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1435 { |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1436 glyph = LGSTRING_GLYPH (gstring, cmp_it->from - 1); |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1437 if (LGLYPH_FROM (glyph) != from) |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1438 break; |
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1439 } |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1440 } |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1441 glyph = LGSTRING_GLYPH (gstring, cmp_it->from); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1442 cmp_it->nchars = LGLYPH_TO (glyph) + 1 - from; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1443 cmp_it->nbytes = 0; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1444 cmp_it->width = 0; |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1445 for (i = cmp_it->nchars - 1; i >= 0; i--) |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1446 { |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1447 c = XINT (LGSTRING_CHAR (gstring, i)); |
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1448 cmp_it->nbytes += CHAR_BYTES (c); |
110020
e42c7e9e39ad
composite.c (composition_update_it): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
110019
diff
changeset
|
1449 cmp_it->width += CHAR_WIDTH (c); |
108552
03ab6621f67d
Fix bidi-composition interaction.
Kenichi Handa <handa@etlken>
parents:
108375
diff
changeset
|
1450 } |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1451 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1452 return c; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1453 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1454 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1455 |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1456 struct position_record |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1457 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1458 EMACS_INT pos, pos_byte; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1459 unsigned char *p; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1460 }; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1461 |
108107
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
1462 /* Update the members of POSITION to the next character boundary. */ |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1463 #define FORWARD_CHAR(POSITION, STOP) \ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1464 do { \ |
98068
9723eb0d11ab
(FORWARD_CHAR): Check STOP after incrementing (POSITION).pos.
Kenichi Handa <handa@m17n.org>
parents:
97982
diff
changeset
|
1465 (POSITION).pos++; \ |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1466 if ((POSITION).pos == (STOP)) \ |
98068
9723eb0d11ab
(FORWARD_CHAR): Check STOP after incrementing (POSITION).pos.
Kenichi Handa <handa@m17n.org>
parents:
97982
diff
changeset
|
1467 { \ |
9723eb0d11ab
(FORWARD_CHAR): Check STOP after incrementing (POSITION).pos.
Kenichi Handa <handa@m17n.org>
parents:
97982
diff
changeset
|
1468 (POSITION).p = GAP_END_ADDR; \ |
9723eb0d11ab
(FORWARD_CHAR): Check STOP after incrementing (POSITION).pos.
Kenichi Handa <handa@m17n.org>
parents:
97982
diff
changeset
|
1469 (POSITION).pos_byte = GPT_BYTE; \ |
9723eb0d11ab
(FORWARD_CHAR): Check STOP after incrementing (POSITION).pos.
Kenichi Handa <handa@m17n.org>
parents:
97982
diff
changeset
|
1470 } \ |
9723eb0d11ab
(FORWARD_CHAR): Check STOP after incrementing (POSITION).pos.
Kenichi Handa <handa@m17n.org>
parents:
97982
diff
changeset
|
1471 else \ |
9723eb0d11ab
(FORWARD_CHAR): Check STOP after incrementing (POSITION).pos.
Kenichi Handa <handa@m17n.org>
parents:
97982
diff
changeset
|
1472 { \ |
98100
2eda9a0daa3e
(FORWARD_CHAR): Fix calculation of (POSITION).pos_byte.
Kenichi Handa <handa@m17n.org>
parents:
98068
diff
changeset
|
1473 (POSITION).pos_byte += BYTES_BY_CHAR_HEAD (*((POSITION).p)); \ |
98068
9723eb0d11ab
(FORWARD_CHAR): Check STOP after incrementing (POSITION).pos.
Kenichi Handa <handa@m17n.org>
parents:
97982
diff
changeset
|
1474 (POSITION).p += BYTES_BY_CHAR_HEAD (*((POSITION).p)); \ |
9723eb0d11ab
(FORWARD_CHAR): Check STOP after incrementing (POSITION).pos.
Kenichi Handa <handa@m17n.org>
parents:
97982
diff
changeset
|
1475 } \ |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1476 } while (0) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1477 |
108107
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
1478 /* Update the members of POSITION to the previous character boundary. */ |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1479 #define BACKWARD_CHAR(POSITION, STOP) \ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1480 do { \ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1481 if ((POSITION).pos == STOP) \ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1482 (POSITION).p = GPT_ADDR; \ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1483 do { \ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1484 (POSITION).pos_byte--; \ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1485 (POSITION).p--; \ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1486 } while (! CHAR_HEAD_P (*((POSITION).p))); \ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1487 (POSITION).pos--; \ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1488 } while (0) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1489 |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1490 /* This is like find_composition, but find an automatic composition |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1491 instead. If found, set *GSTRING to the glyph-string representing |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1492 the composition, and return 1. Otherwise, return 0. */ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1493 |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1494 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1495 find_automatic_composition (EMACS_INT pos, EMACS_INT limit, EMACS_INT *start, EMACS_INT *end, Lisp_Object *gstring, Lisp_Object string) |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1496 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1497 EMACS_INT head, tail, stop; |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1498 /* Limit to check a composition after POS. */ |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1499 EMACS_INT fore_check_limit; |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1500 struct position_record orig, cur, check, prev; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1501 Lisp_Object check_val, val, elt; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1502 int check_lookback; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1503 int c; |
98156
464ec62a612c
(composition_reseat_it): If the current buffer is
Kenichi Handa <handa@m17n.org>
parents:
98128
diff
changeset
|
1504 Lisp_Object window; |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1505 struct window *w; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1506 |
98158
f9f157d63fd1
(find_automatic_composition): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98157
diff
changeset
|
1507 window = Fget_buffer_window (Fcurrent_buffer (), Qnil); |
98156
464ec62a612c
(composition_reseat_it): If the current buffer is
Kenichi Handa <handa@m17n.org>
parents:
98128
diff
changeset
|
1508 if (NILP (window)) |
464ec62a612c
(composition_reseat_it): If the current buffer is
Kenichi Handa <handa@m17n.org>
parents:
98128
diff
changeset
|
1509 return 0; |
464ec62a612c
(composition_reseat_it): If the current buffer is
Kenichi Handa <handa@m17n.org>
parents:
98128
diff
changeset
|
1510 w = XWINDOW (window); |
464ec62a612c
(composition_reseat_it): If the current buffer is
Kenichi Handa <handa@m17n.org>
parents:
98128
diff
changeset
|
1511 |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1512 orig.pos = pos; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1513 if (NILP (string)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1514 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1515 head = BEGV, tail = ZV, stop = GPT; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1516 orig.pos_byte = CHAR_TO_BYTE (orig.pos); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1517 orig.p = BYTE_POS_ADDR (orig.pos_byte); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1518 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1519 else |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1520 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1521 head = 0, tail = SCHARS (string), stop = -1; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1522 orig.pos_byte = string_char_to_byte (string, orig.pos); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1523 orig.p = SDATA (string) + orig.pos_byte; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1524 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1525 if (limit < pos) |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1526 fore_check_limit = min (tail, pos + MAX_AUTO_COMPOSITION_LOOKBACK); |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1527 else |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1528 fore_check_limit = min (tail, limit + MAX_AUTO_COMPOSITION_LOOKBACK); |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1529 cur = orig; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1530 |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1531 retry: |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1532 check_val = Qnil; |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1533 /* At first, check if POS is composable. */ |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1534 c = STRING_CHAR (cur.p); |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1535 if (! CHAR_COMPOSABLE_P (c)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1536 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1537 if (limit < 0) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1538 return 0; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1539 if (limit >= cur.pos) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1540 goto search_forward; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1541 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1542 else |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1543 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1544 val = CHAR_TABLE_REF (Vcomposition_function_table, c); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1545 if (! NILP (val)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1546 check_val = val, check = cur; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1547 else |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1548 while (cur.pos + 1 < fore_check_limit) |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1549 { |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1550 EMACS_INT b, e; |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1551 |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1552 FORWARD_CHAR (cur, stop); |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1553 if (get_property_and_range (cur.pos, Qcomposition, &val, &b, &e, |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1554 Qnil) |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1555 && COMPOSITION_VALID_P (b, e, val)) |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1556 { |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1557 fore_check_limit = cur.pos; |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1558 break; |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1559 } |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1560 c = STRING_CHAR (cur.p); |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1561 if (! CHAR_COMPOSABLE_P (c)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1562 break; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1563 val = CHAR_TABLE_REF (Vcomposition_function_table, c); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1564 if (NILP (val)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1565 continue; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1566 check_val = val, check = cur; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1567 break; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1568 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1569 cur = orig; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1570 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1571 /* Rewind back to the position where we can safely search forward |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1572 for compositions. */ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1573 while (cur.pos > head) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1574 { |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1575 EMACS_INT b, e; |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1576 |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1577 BACKWARD_CHAR (cur, stop); |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1578 if (get_property_and_range (cur.pos, Qcomposition, &val, &b, &e, Qnil) |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1579 && COMPOSITION_VALID_P (b, e, val)) |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1580 break; |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1581 c = STRING_CHAR (cur.p); |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1582 if (! CHAR_COMPOSABLE_P (c)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1583 break; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1584 val = CHAR_TABLE_REF (Vcomposition_function_table, c); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1585 if (! NILP (val)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1586 check_val = val, check = cur; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1587 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1588 prev = cur; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1589 /* Now search forward. */ |
102726
93ad3a5a4f75
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
101967
diff
changeset
|
1590 search_forward: |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1591 *gstring = Qnil; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1592 if (! NILP (check_val) || limit >= orig.pos) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1593 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1594 if (NILP (check_val)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1595 cur = orig; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1596 else |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1597 cur = check; |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1598 while (cur.pos < fore_check_limit) |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1599 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1600 int need_adjustment = 0; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1601 |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1602 if (NILP (check_val)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1603 { |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1604 c = STRING_CHAR (cur.p); |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1605 check_val = CHAR_TABLE_REF (Vcomposition_function_table, c); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1606 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1607 for (; CONSP (check_val); check_val = XCDR (check_val)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1608 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1609 elt = XCAR (check_val); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1610 if (VECTORP (elt) && ASIZE (elt) == 3 && NATNUMP (AREF (elt, 1)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1611 && cur.pos - XFASTINT (AREF (elt, 1)) >= head) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1612 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1613 check.pos = cur.pos - XFASTINT (AREF (elt, 1)); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1614 if (check.pos == cur.pos) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1615 check.pos_byte = cur.pos_byte; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1616 else |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1617 check.pos_byte = CHAR_TO_BYTE (check.pos); |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
1618 val = autocmp_chars (elt, check.pos, check.pos_byte, |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1619 tail, w, NULL, string); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1620 need_adjustment = 1; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1621 if (! NILP (val)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1622 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1623 *gstring = val; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1624 *start = check.pos; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1625 *end = check.pos + LGSTRING_CHAR_LEN (*gstring); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1626 if (*start <= orig.pos ? *end > orig.pos |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1627 : limit >= orig.pos) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1628 return 1; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1629 cur.pos = *end; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1630 cur.pos_byte = CHAR_TO_BYTE (cur.pos); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1631 break; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1632 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1633 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1634 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1635 if (need_adjustment) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1636 { |
108107
ad640fcce53a
Fix typos in comments of composite.c
Eli Zaretskii <eliz@gnu.org>
parents:
108105
diff
changeset
|
1637 /* As we have called Lisp, there's a possibility that |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1638 buffer/string is relocated. */ |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1639 if (NILP (string)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1640 cur.p = BYTE_POS_ADDR (cur.pos_byte); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1641 else |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1642 cur.p = SDATA (string) + cur.pos_byte; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1643 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1644 if (! CONSP (check_val)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1645 FORWARD_CHAR (cur, stop); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1646 check_val = Qnil; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1647 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1648 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1649 if (! NILP (*gstring)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1650 return (limit >= 0 || (*start <= orig.pos && *end > orig.pos)); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1651 if (limit >= 0 && limit < orig.pos && prev.pos > head) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1652 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1653 cur = prev; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1654 BACKWARD_CHAR (cur, stop); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1655 orig = cur; |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1656 fore_check_limit = orig.pos; |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1657 goto retry; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1658 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1659 return 0; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1660 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1661 |
106632
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1662 /* Return the adjusted point provided that point is moved from LAST_PT |
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1663 to NEW_PT. */ |
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1664 |
110559
9c63d46e000c
Fix int/EMACS_INT use in keyboard.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110504
diff
changeset
|
1665 EMACS_INT |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1666 composition_adjust_point (EMACS_INT last_pt, EMACS_INT new_pt) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1667 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1668 EMACS_INT charpos, bytepos, startpos, beg, end, pos; |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1669 Lisp_Object val; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1670 int i; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1671 |
106632
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1672 if (new_pt == BEGV || new_pt == ZV) |
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1673 return new_pt; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1674 |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1675 /* At first check the static composition. */ |
106632
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1676 if (get_property_and_range (new_pt, Qcomposition, &val, &beg, &end, Qnil) |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1677 && COMPOSITION_VALID_P (beg, end, val)) |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1678 { |
106632
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1679 if (beg < new_pt /* && end > new_pt <- It's always the case. */ |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1680 && (last_pt <= beg || last_pt >= end)) |
106632
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1681 return (new_pt < last_pt ? beg : end); |
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1682 return new_pt; |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
1683 } |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1684 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1685 if (NILP (current_buffer->enable_multibyte_characters) |
106812
23c562723a8d
Make auto-composition work on all buffers even if they are fundamental mode.
Kenichi Handa <handa@m17n.org>
parents:
106799
diff
changeset
|
1686 || NILP (Vauto_composition_mode)) |
106632
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1687 return new_pt; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1688 |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1689 /* Next check the automatic composition. */ |
106632
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1690 if (! find_automatic_composition (new_pt, (EMACS_INT) -1, &beg, &end, &val, |
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1691 Qnil) |
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1692 || beg == new_pt) |
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1693 return new_pt; |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1694 for (i = 0; i < LGSTRING_GLYPH_LEN (val); i++) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1695 { |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1696 Lisp_Object glyph = LGSTRING_GLYPH (val, i); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1697 |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1698 if (NILP (glyph)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1699 break; |
106632
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1700 if (beg + LGLYPH_FROM (glyph) == new_pt) |
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1701 return new_pt; |
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1702 if (beg + LGLYPH_TO (glyph) >= new_pt) |
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1703 return (new_pt < last_pt |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1704 ? beg + LGLYPH_FROM (glyph) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1705 : beg + LGLYPH_TO (glyph) + 1); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1706 } |
106632
484702d8c582
(composition_reseat_it): Don't make a composition
Kenichi Handa <handa@m17n.org>
parents:
106185
diff
changeset
|
1707 return new_pt; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1708 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1709 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1710 DEFUN ("composition-get-gstring", Fcomposition_get_gstring, |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1711 Scomposition_get_gstring, 4, 4, 0, |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1712 doc: /* Return a glyph-string for characters between FROM and TO. |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1713 If the glyph string is for graphic display, FONT-OBJECT must be |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1714 a font-object to use for those characters. |
101775
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1715 Otherwise (for terminal display), FONT-OBJECT must be a terminal ID, a |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1716 frame, or nil for the selected frame's terminal device. |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1717 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1718 If the optional 4th argument STRING is not nil, it is a string |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1719 containing the target characters between indices FROM and TO. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1720 |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1721 A glyph-string is a vector containing information about how to display |
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1722 a specific character sequence. The format is: |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1723 [HEADER ID GLYPH ...] |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1724 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1725 HEADER is a vector of this form: |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1726 [FONT-OBJECT CHAR ...] |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1727 where |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1728 FONT-OBJECT is a font-object for all glyphs in the glyph-string, |
101775
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1729 or the terminal coding system of the specified terminal. |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1730 CHARs are characters to be composed by GLYPHs. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1731 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1732 ID is an identification number of the glyph-string. It may be nil if |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1733 not yet shaped. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1734 |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1735 GLYPH is a vector whose elements have this form: |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1736 [ FROM-IDX TO-IDX C CODE WIDTH LBEARING RBEARING ASCENT DESCENT |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1737 [ [X-OFF Y-OFF WADJUST] | nil] ] |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1738 where |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1739 FROM-IDX and TO-IDX are used internally and should not be touched. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1740 C is the character of the glyph. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1741 CODE is the glyph-code of C in FONT-OBJECT. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1742 WIDTH thru DESCENT are the metrics (in pixels) of the glyph. |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1743 X-OFF and Y-OFF are offsets to the base position for the glyph. |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1744 WADJUST is the adjustment to the normal width of the glyph. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1745 |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1746 If GLYPH is nil, the remaining elements of the glyph-string vector |
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1747 should be ignored. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1748 (Lisp_Object from, Lisp_Object to, Lisp_Object font_object, Lisp_Object string) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1749 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1750 Lisp_Object gstring, header; |
98213
52d26067a946
(Fcomposition_get_gstring): Yet another int/Lisp_Oject mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
98209
diff
changeset
|
1751 EMACS_INT frompos, topos; |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1752 |
98214
5803b1114219
(fill_gstring_header): Don't check FROM and TO here.
Kenichi Handa <handa@m17n.org>
parents:
98213
diff
changeset
|
1753 CHECK_NATNUM (from); |
5803b1114219
(fill_gstring_header): Don't check FROM and TO here.
Kenichi Handa <handa@m17n.org>
parents:
98213
diff
changeset
|
1754 CHECK_NATNUM (to); |
101775
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1755 if (! FONT_OBJECT_P (font_object)) |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1756 { |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1757 struct coding_system *coding; |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1758 struct terminal *terminal = get_terminal (font_object, 1); |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1759 |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1760 coding = ((TERMINAL_TERMINAL_CODING (terminal)->common_flags |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1761 & CODING_REQUIRE_ENCODING_MASK) |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1762 ? TERMINAL_TERMINAL_CODING (terminal) : &safe_terminal_coding); |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1763 font_object = CODING_ID_NAME (coding->id); |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1764 } |
250ce1fa6aed
Include coding.h and termhooks.h.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1765 |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1766 header = fill_gstring_header (Qnil, from, to, font_object, string); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1767 gstring = gstring_lookup_cache (header); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1768 if (! NILP (gstring)) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1769 return gstring; |
98213
52d26067a946
(Fcomposition_get_gstring): Yet another int/Lisp_Oject mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
98209
diff
changeset
|
1770 |
98214
5803b1114219
(fill_gstring_header): Don't check FROM and TO here.
Kenichi Handa <handa@m17n.org>
parents:
98213
diff
changeset
|
1771 frompos = XINT (from); |
5803b1114219
(fill_gstring_header): Don't check FROM and TO here.
Kenichi Handa <handa@m17n.org>
parents:
98213
diff
changeset
|
1772 topos = XINT (to); |
98213
52d26067a946
(Fcomposition_get_gstring): Yet another int/Lisp_Oject mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
98209
diff
changeset
|
1773 if (LGSTRING_GLYPH_LEN (gstring_work) < topos - frompos) |
52d26067a946
(Fcomposition_get_gstring): Yet another int/Lisp_Oject mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
98209
diff
changeset
|
1774 gstring_work = Fmake_vector (make_number (topos - frompos + 2), Qnil); |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1775 LGSTRING_SET_HEADER (gstring_work, header); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1776 LGSTRING_SET_ID (gstring_work, Qnil); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1777 fill_gstring_body (gstring_work); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1778 return gstring_work; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1779 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1780 |
26848 | 1781 |
1782 /* Emacs Lisp APIs. */ | |
1783 | |
1784 DEFUN ("compose-region-internal", Fcompose_region_internal, | |
1785 Scompose_region_internal, 2, 4, 0, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1786 doc: /* Internal use only. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1787 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1788 Compose text in the region between START and END. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1789 Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1790 for the composition. See `compose-region' for more details. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1791 (Lisp_Object start, Lisp_Object end, Lisp_Object components, Lisp_Object modification_func) |
26848 | 1792 { |
1793 validate_region (&start, &end); | |
1794 if (!NILP (components) | |
1795 && !INTEGERP (components) | |
1796 && !CONSP (components) | |
1797 && !STRINGP (components)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1798 CHECK_VECTOR (components); |
26848 | 1799 |
64574
5c90d9a42573
(Fcompose_region_internal, Fcompose_string_internal):
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
1800 compose_text (XINT (start), XINT (end), components, modification_func, Qnil); |
26848 | 1801 return Qnil; |
1802 } | |
1803 | |
1804 DEFUN ("compose-string-internal", Fcompose_string_internal, | |
1805 Scompose_string_internal, 3, 5, 0, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1806 doc: /* Internal use only. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1807 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1808 Compose text between indices START and END of STRING. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1809 Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1810 for the composition. See `compose-string' for more details. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1811 (Lisp_Object string, Lisp_Object start, Lisp_Object end, Lisp_Object components, Lisp_Object modification_func) |
26848 | 1812 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1813 CHECK_STRING (string); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1814 CHECK_NUMBER (start); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1815 CHECK_NUMBER (end); |
26848 | 1816 |
1817 if (XINT (start) < 0 || | |
1818 XINT (start) > XINT (end) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1819 || XINT (end) > SCHARS (string)) |
26848 | 1820 args_out_of_range (start, end); |
1821 | |
64574
5c90d9a42573
(Fcompose_region_internal, Fcompose_string_internal):
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
1822 compose_text (XINT (start), XINT (end), components, modification_func, string); |
26848 | 1823 return string; |
1824 } | |
1825 | |
1826 DEFUN ("find-composition-internal", Ffind_composition_internal, | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
1827 Sfind_composition_internal, 4, 4, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1828 doc: /* Internal use only. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1829 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1830 Return information about composition at or nearest to position POS. |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1831 See `find-composition' for more details. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1832 (Lisp_Object pos, Lisp_Object limit, Lisp_Object string, Lisp_Object detail_p) |
26848 | 1833 { |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1834 Lisp_Object prop, tail, gstring; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1835 EMACS_INT start, end, from, to; |
26848 | 1836 int id; |
1837 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1838 CHECK_NUMBER_COERCE_MARKER (pos); |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1839 from = XINT (pos); |
26848 | 1840 if (!NILP (limit)) |
1841 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1842 CHECK_NUMBER_COERCE_MARKER (limit); |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1843 to = XINT (limit); |
26848 | 1844 } |
1845 else | |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1846 to = -1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
1847 |
26848 | 1848 if (!NILP (string)) |
38097
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
1849 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1850 CHECK_STRING (string); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1851 if (XINT (pos) < 0 || XINT (pos) > SCHARS (string)) |
38097
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
1852 args_out_of_range (string, pos); |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
1853 } |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
1854 else |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
1855 { |
38116
a85b9df3dffb
(Ffind_composition_internal): Accept ZV
Gerd Moellmann <gerd@gnu.org>
parents:
38098
diff
changeset
|
1856 if (XINT (pos) < BEGV || XINT (pos) > ZV) |
38097
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
1857 args_out_of_range (Fcurrent_buffer (), pos); |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
1858 } |
26848 | 1859 |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1860 if (!find_composition (from, to, &start, &end, &prop, string)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1861 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1862 if (!NILP (current_buffer->enable_multibyte_characters) |
106812
23c562723a8d
Make auto-composition work on all buffers even if they are fundamental mode.
Kenichi Handa <handa@m17n.org>
parents:
106799
diff
changeset
|
1863 && ! NILP (Vauto_composition_mode) |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1864 && find_automatic_composition (from, to, &start, &end, &gstring, |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1865 string)) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1866 return list3 (make_number (start), make_number (end), gstring); |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1867 return Qnil; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1868 } |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1869 if ((end <= XINT (pos) || start > XINT (pos))) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1870 { |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1871 EMACS_INT s, e; |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1872 |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1873 if (find_automatic_composition (from, to, &s, &e, &gstring, string) |
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1874 && (e <= XINT (pos) ? e > end : s < start)) |
108117
fb2072139c80
composite.c (Ffind_composition_internal): Fix the return value for an automatic composition.
Kenichi Handa <handa@etlken>
parents:
108107
diff
changeset
|
1875 return list3 (make_number (s), make_number (e), gstring); |
97982
59bcf1726f2c
(autocmp_chars): Check lookback count.
Kenichi Handa <handa@m17n.org>
parents:
97887
diff
changeset
|
1876 } |
26848 | 1877 if (!COMPOSITION_VALID_P (start, end, prop)) |
1878 return Fcons (make_number (start), Fcons (make_number (end), | |
1879 Fcons (Qnil, Qnil))); | |
1880 if (NILP (detail_p)) | |
1881 return Fcons (make_number (start), Fcons (make_number (end), | |
1882 Fcons (Qt, Qnil))); | |
1883 | |
1884 if (COMPOSITION_REGISTERD_P (prop)) | |
1885 id = COMPOSITION_ID (prop); | |
1886 else | |
1887 { | |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
1888 EMACS_INT start_byte = (NILP (string) |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
1889 ? CHAR_TO_BYTE (start) |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110020
diff
changeset
|
1890 : string_char_to_byte (string, start)); |
26848 | 1891 id = get_composition_id (start, start_byte, end - start, prop, string); |
1892 } | |
1893 | |
1894 if (id >= 0) | |
1895 { | |
1896 Lisp_Object components, relative_p, mod_func; | |
1897 enum composition_method method = COMPOSITION_METHOD (prop); | |
1898 int width = composition_table[id]->width; | |
1899 | |
1900 components = Fcopy_sequence (COMPOSITION_COMPONENTS (prop)); | |
1901 relative_p = (method == COMPOSITION_WITH_RULE_ALTCHARS | |
1902 ? Qnil : Qt); | |
1903 mod_func = COMPOSITION_MODIFICATION_FUNC (prop); | |
1904 tail = Fcons (components, | |
1905 Fcons (relative_p, | |
1906 Fcons (mod_func, | |
1907 Fcons (make_number (width), Qnil)))); | |
1908 } | |
1909 else | |
1910 tail = Qnil; | |
1911 | |
1912 return Fcons (make_number (start), Fcons (make_number (end), tail)); | |
1913 } | |
1914 | |
1915 | |
1916 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1917 syms_of_composite (void) |
26848 | 1918 { |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1919 int i; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1920 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1921 Qcomposition = intern_c_string ("composition"); |
26848 | 1922 staticpro (&Qcomposition); |
1923 | |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1924 /* Make a hash table for static composition. */ |
26848 | 1925 { |
28472
bae9218986ac
* composite.c (run_composite_function): Use NILP when checking for nil.
Ken Raeburn <raeburn@raeburn.org>
parents:
26848
diff
changeset
|
1926 Lisp_Object args[6]; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
1927 |
26848 | 1928 args[0] = QCtest; |
1929 args[1] = Qequal; | |
1930 args[2] = QCweakness; | |
53316 | 1931 /* We used to make the hash table weak so that unreferenced |
92028 | 1932 compositions can be garbage-collected. But, usually once |
53316 | 1933 created compositions are repeatedly used in an Emacs session, |
1934 and thus it's not worth to save memory in such a way. So, we | |
1935 make the table not weak. */ | |
53221
94ae4d74b7e0
(syms_of_composite): Don't make the compostion hash table week.
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1936 args[3] = Qnil; |
26848 | 1937 args[4] = QCsize; |
1938 args[5] = make_number (311); | |
28472
bae9218986ac
* composite.c (run_composite_function): Use NILP when checking for nil.
Ken Raeburn <raeburn@raeburn.org>
parents:
26848
diff
changeset
|
1939 composition_hash_table = Fmake_hash_table (6, args); |
26848 | 1940 staticpro (&composition_hash_table); |
1941 } | |
1942 | |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1943 /* Make a hash table for glyph-string. */ |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1944 { |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1945 Lisp_Object args[6]; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1946 args[0] = QCtest; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1947 args[1] = Qequal; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1948 args[2] = QCweakness; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1949 args[3] = Qnil; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1950 args[4] = QCsize; |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1951 args[5] = make_number (311); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1952 gstring_hash_table = Fmake_hash_table (6, args); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1953 staticpro (&gstring_hash_table); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1954 } |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1955 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1956 staticpro (&gstring_work_headers); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1957 gstring_work_headers = Fmake_vector (make_number (8), Qnil); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1958 for (i = 0; i < 8; i++) |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1959 ASET (gstring_work_headers, i, Fmake_vector (make_number (i + 2), Qnil)); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1960 staticpro (&gstring_work); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1961 gstring_work = Fmake_vector (make_number (10), Qnil); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
1962 |
26848 | 1963 /* Text property `composition' should be nonsticky by default. */ |
1964 Vtext_property_default_nonsticky | |
1965 = Fcons (Fcons (Qcomposition, Qt), Vtext_property_default_nonsticky); | |
1966 | |
1967 DEFVAR_LISP ("compose-chars-after-function", &Vcompose_chars_after_function, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1968 doc: /* Function to adjust composition of buffer text. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1969 |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1970 This function is called with three arguments: FROM, TO, and OBJECT. |
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1971 FROM and TO specify the range of text whose composition should be |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1972 adjusted. OBJECT, if non-nil, is a string that contains the text. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1973 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1974 This function is called after a text with `composition' property is |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1975 inserted or deleted to keep `composition' property of buffer text |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1976 valid. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1977 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1978 The default value is the function `compose-chars-after'. */); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1979 Vcompose_chars_after_function = intern_c_string ("compose-chars-after"); |
26848 | 1980 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1981 Qauto_composed = intern_c_string ("auto-composed"); |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
1982 staticpro (&Qauto_composed); |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
1983 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1984 Qauto_composition_function = intern_c_string ("auto-composition-function"); |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
1985 staticpro (&Qauto_composition_function); |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
1986 |
106812
23c562723a8d
Make auto-composition work on all buffers even if they are fundamental mode.
Kenichi Handa <handa@m17n.org>
parents:
106799
diff
changeset
|
1987 DEFVAR_LISP ("auto-composition-mode", &Vauto_composition_mode, |
23c562723a8d
Make auto-composition work on all buffers even if they are fundamental mode.
Kenichi Handa <handa@m17n.org>
parents:
106799
diff
changeset
|
1988 doc: /* Non-nil if Auto-Composition mode is enabled. |
23c562723a8d
Make auto-composition work on all buffers even if they are fundamental mode.
Kenichi Handa <handa@m17n.org>
parents:
106799
diff
changeset
|
1989 Use the command `auto-composition-mode' to change this variable. */); |
23c562723a8d
Make auto-composition work on all buffers even if they are fundamental mode.
Kenichi Handa <handa@m17n.org>
parents:
106799
diff
changeset
|
1990 Vauto_composition_mode = Qt; |
23c562723a8d
Make auto-composition work on all buffers even if they are fundamental mode.
Kenichi Handa <handa@m17n.org>
parents:
106799
diff
changeset
|
1991 |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
1992 DEFVAR_LISP ("auto-composition-function", &Vauto_composition_function, |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
1993 doc: /* Function to call to compose characters automatically. |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
1994 This function is called from the display routine with four arguments: |
91287
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
1995 FROM, TO, WINDOW, and STRING. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1996 |
91287
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
1997 If STRING is nil, the function must compose characters in the region |
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
1998 between FROM and TO in the current buffer. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
1999 |
91287
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
2000 Otherwise, STRING is a string, and FROM and TO are indices into the |
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
2001 string. In this case, the function must compose characters in the |
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
2002 string. */); |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
2003 Vauto_composition_function = Qnil; |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
2004 |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2005 DEFVAR_LISP ("composition-function-table", &Vcomposition_function_table, |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
2006 doc: /* Char-table of functions for automatic character composition. |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2007 For each character that has to be composed automatically with |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2008 preceding and/or following characters, this char-table contains |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2009 a function to call to compose that character. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2010 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2011 The element at index C in the table, if non-nil, is a list of |
108759
0bb727f1d547
Fix bidi-composition interaction in backward scanning..
Kenichi Handa <handa@etlken>
parents:
108570
diff
changeset
|
2012 composition rules of this form: ([PATTERN PREV-CHARS FUNC] ...) |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2013 |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
2014 PATTERN is a regular expression which C and the surrounding |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2015 characters must match. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2016 |
101967
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
2017 PREV-CHARS is a non-negative integer (less than 4) specifying how many |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
2018 characters before C to check the matching with PATTERN. If it is 0, |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
2019 PATTERN must match C and the following characters. If it is 1, |
1127170a5c39
(MAX_AUTO_COMPOSITION_LOOKBACK): New macro.
Kenichi Handa <handa@m17n.org>
parents:
101775
diff
changeset
|
2020 PATTERN must match a character before C and the following characters. |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2021 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2022 If PREV-CHARS is 0, PATTERN can be nil, which means that the |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2023 single character C should be composed. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2024 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2025 FUNC is a function to return a glyph-string representing a |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
2026 composition of the characters that match PATTERN. It is |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2027 called with one argument GSTRING. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2028 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2029 GSTRING is a template of a glyph-string to return. It is already |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2030 filled with a proper header for the characters to compose, and |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2031 glyphs corresponding to those characters one by one. The |
98369
690a23ccfcf9
(Fcomposition_get_gstring, Fcompose_region_internal, Fcompose_string_internal)
Eli Zaretskii <eliz@gnu.org>
parents:
98214
diff
changeset
|
2032 function must return a new glyph-string with the same header as |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2033 GSTRING, or modify GSTRING itself and return it. |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2034 |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2035 See also the documentation of `auto-composition-mode'. */); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2036 Vcomposition_function_table = Fmake_char_table (Qnil, Qnil); |
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2037 |
26848 | 2038 defsubr (&Scompose_region_internal); |
2039 defsubr (&Scompose_string_internal); | |
2040 defsubr (&Sfind_composition_internal); | |
97819
23390849e8b8
Include window.h, frame.h, dispextern.h font.h.
Kenichi Handa <handa@m17n.org>
parents:
96413
diff
changeset
|
2041 defsubr (&Scomposition_get_gstring); |
26848 | 2042 } |
52401 | 2043 |
2044 /* arch-tag: 79cefaf8-ca48-4eed-97e5-d5afb290d272 | |
2045 (do not change this comment) */ |