Mercurial > vim
annotate src/mbyte.c @ 15178:5c3ca8f7adea v8.1.0599
patch 8.1.0599: without the +eval feature the indent tests don't work
commit https://github.com/vim/vim/commit/eeed665b0ecd917e88e3475c9615d52546aa124d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Dec 15 17:43:42 2018 +0100
patch 8.1.0599: without the +eval feature the indent tests don't work
Problem: Without the +eval feature the indent tests don't work.
Solution: Skip the body of the tests.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 15 Dec 2018 17:45:04 +0100 |
parents | 27b9a84395b5 |
children | 55ccc2d353bd |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9495
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7 | 2 * |
3 * VIM - Vi IMproved by Bram Moolenaar | |
4 * Multibyte extensions partly by Sung-Hoon Baek | |
5 * | |
6 * Do ":help uganda" in Vim to read copying and usage conditions. | |
7 * Do ":help credits" in Vim to see a list of people who contributed. | |
8 * See README.txt for an overview of the Vim source code. | |
9 */ | |
10 /* | |
11 * mbyte.c: Code specifically for handling multi-byte characters. | |
12 * | |
13 * The encoding used in the core is set with 'encoding'. When 'encoding' is | |
14 * changed, the following four variables are set (for speed). | |
15 * Currently these types of character encodings are supported: | |
16 * | |
17 * "enc_dbcs" When non-zero it tells the type of double byte character | |
18 * encoding (Chinese, Korean, Japanese, etc.). | |
19 * The cell width on the display is equal to the number of | |
20 * bytes. (exception: DBCS_JPNU with first byte 0x8e) | |
21 * Recognizing the first or second byte is difficult, it | |
22 * requires checking a byte sequence from the start. | |
23 * "enc_utf8" When TRUE use Unicode characters in UTF-8 encoding. | |
24 * The cell width on the display needs to be determined from | |
25 * the character value. | |
26 * Recognizing bytes is easy: 0xxx.xxxx is a single-byte | |
27 * char, 10xx.xxxx is a trailing byte, 11xx.xxxx is a leading | |
28 * byte of a multi-byte character. | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
29 * To make things complicated, up to six composing characters |
7 | 30 * are allowed. These are drawn on top of the first char. |
31 * For most editing the sequence of bytes with composing | |
32 * characters included is considered to be one character. | |
33 * "enc_unicode" When 2 use 16-bit Unicode characters (or UTF-16). | |
34 * When 4 use 32-but Unicode characters. | |
35 * Internally characters are stored in UTF-8 encoding to | |
36 * avoid NUL bytes. Conversion happens when doing I/O. | |
37 * "enc_utf8" will also be TRUE. | |
38 * | |
39 * "has_mbyte" is set when "enc_dbcs" or "enc_utf8" is non-zero. | |
40 * | |
41 * If none of these is TRUE, 8-bit bytes are used for a character. The | |
42 * encoding isn't currently specified (TODO). | |
43 * | |
44 * 'encoding' specifies the encoding used in the core. This is in registers, | |
45 * text manipulation, buffers, etc. Conversion has to be done when characters | |
46 * in another encoding are received or send: | |
47 * | |
48 * clipboard | |
49 * ^ | |
50 * | (2) | |
51 * V | |
52 * +---------------+ | |
53 * (1) | | (3) | |
54 * keyboard ----->| core |-----> display | |
55 * | | | |
56 * +---------------+ | |
57 * ^ | |
58 * | (4) | |
59 * V | |
60 * file | |
61 * | |
62 * (1) Typed characters arrive in the current locale. Conversion is to be | |
63 * done when 'encoding' is different from 'termencoding'. | |
64 * (2) Text will be made available with the encoding specified with | |
65 * 'encoding'. If this is not sufficient, system-specific conversion | |
66 * might be required. | |
67 * (3) For the GUI the correct font must be selected, no conversion done. | |
68 * Otherwise, conversion is to be done when 'encoding' differs from | |
69 * 'termencoding'. (Different in the GTK+ 2 port -- 'termencoding' | |
70 * is always used for both input and output and must always be set to | |
71 * "utf-8". gui_mch_init() does this automatically.) | |
72 * (4) The encoding of the file is specified with 'fileencoding'. Conversion | |
73 * is to be done when it's different from 'encoding'. | |
74 * | |
75 * The viminfo file is a special case: Only text is converted, not file names. | |
76 * Vim scripts may contain an ":encoding" command. This has an effect for | |
77 * some commands, like ":menutrans" | |
78 */ | |
79 | |
80 #include "vim.h" | |
81 | |
82 #ifdef WIN32UNIX | |
83 # ifndef WIN32_LEAN_AND_MEAN | |
84 # define WIN32_LEAN_AND_MEAN | |
85 # endif | |
5602 | 86 # if defined(FEAT_GUI) || defined(FEAT_XCLIPBOARD) |
87 # include <X11/Xwindows.h> | |
88 # define WINBYTE wBYTE | |
89 # else | |
90 # include <windows.h> | |
91 # define WINBYTE BYTE | |
92 # endif | |
7 | 93 # ifdef WIN32 |
94 # undef WIN32 /* Some windows.h define WIN32, we don't want that here. */ | |
95 # endif | |
5602 | 96 #else |
97 # define WINBYTE BYTE | |
7 | 98 #endif |
99 | |
100 #if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__) | |
101 # include <winnls.h> | |
102 #endif | |
103 | |
104 #ifdef FEAT_GUI_X11 | |
105 # include <X11/Intrinsic.h> | |
106 #endif | |
107 #ifdef X_LOCALE | |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
108 # include <X11/Xlocale.h> |
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
109 # if !defined(HAVE_MBLEN) && !defined(mblen) |
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
110 # define mblen _Xmblen |
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
111 # endif |
7 | 112 #endif |
113 | |
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
114 #if defined(FEAT_GUI_GTK) && defined(FEAT_XIM) |
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
115 # if GTK_CHECK_VERSION(3,0,0) |
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
116 # include <gdk/gdkkeysyms-compat.h> |
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
117 # else |
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
118 # include <gdk/gdkkeysyms.h> |
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
119 # endif |
7 | 120 # ifdef WIN3264 |
121 # include <gdk/gdkwin32.h> | |
122 # else | |
123 # include <gdk/gdkx.h> | |
124 # endif | |
125 #endif | |
126 | |
127 #ifdef HAVE_WCHAR_H | |
128 # include <wchar.h> | |
129 #endif | |
130 | |
131 #if 0 | |
132 /* This has been disabled, because several people reported problems with the | |
133 * wcwidth() and iswprint() library functions, esp. for Hebrew. */ | |
134 # ifdef __STDC_ISO_10646__ | |
135 # define USE_WCHAR_FUNCTIONS | |
136 # endif | |
137 #endif | |
138 | |
139 #if defined(FEAT_MBYTE) || defined(PROTO) | |
140 | |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
141 static int dbcs_char2len(int c); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
142 static int dbcs_char2bytes(int c, char_u *buf); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
143 static int dbcs_ptr2len(char_u *p); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
144 static int dbcs_ptr2len_len(char_u *p, int size); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
145 static int utf_ptr2cells_len(char_u *p, int size); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
146 static int dbcs_char2cells(int c); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
147 static int dbcs_ptr2cells_len(char_u *p, int size); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
148 static int dbcs_ptr2char(char_u *p); |
7 | 149 |
2015 | 150 /* |
151 * Lookup table to quickly get the length in bytes of a UTF-8 character from | |
152 * the first byte of a UTF-8 string. | |
153 * Bytes which are illegal when used as the first byte have a 1. | |
154 * The NUL byte has length 1. | |
155 */ | |
7 | 156 static char utf8len_tab[256] = |
157 { | |
158 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
159 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
160 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
161 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
2015 | 162 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, |
163 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
7 | 164 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, |
165 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1, | |
166 }; | |
167 | |
168 /* | |
2015 | 169 * Like utf8len_tab above, but using a zero for illegal lead bytes. |
170 */ | |
171 static char utf8len_tab_zero[256] = | |
172 { | |
173 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
174 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
175 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
176 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
177 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, | |
178 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, | |
179 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, | |
180 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0, | |
181 }; | |
182 | |
183 /* | |
7 | 184 * XIM often causes trouble. Define XIM_DEBUG to get a log of XIM callbacks |
185 * in the "xim.log" file. | |
186 */ | |
187 /* #define XIM_DEBUG */ | |
188 #ifdef XIM_DEBUG | |
189 static void | |
190 xim_log(char *s, ...) | |
191 { | |
192 va_list arglist; | |
193 static FILE *fd = NULL; | |
194 | |
195 if (fd == (FILE *)-1) | |
196 return; | |
197 if (fd == NULL) | |
198 { | |
531 | 199 fd = mch_fopen("xim.log", "w"); |
7 | 200 if (fd == NULL) |
201 { | |
202 EMSG("Cannot open xim.log"); | |
203 fd = (FILE *)-1; | |
204 return; | |
205 } | |
206 } | |
207 | |
208 va_start(arglist, s); | |
209 vfprintf(fd, s, arglist); | |
210 va_end(arglist); | |
211 } | |
212 #endif | |
213 | |
214 #endif | |
215 | |
216 #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) || defined(PROTO) | |
217 /* | |
218 * Canonical encoding names and their properties. | |
219 * "iso-8859-n" is handled by enc_canonize() directly. | |
220 */ | |
221 static struct | |
222 { char *name; int prop; int codepage;} | |
223 enc_canon_table[] = | |
224 { | |
225 #define IDX_LATIN_1 0 | |
226 {"latin1", ENC_8BIT + ENC_LATIN1, 1252}, | |
227 #define IDX_ISO_2 1 | |
228 {"iso-8859-2", ENC_8BIT, 0}, | |
229 #define IDX_ISO_3 2 | |
230 {"iso-8859-3", ENC_8BIT, 0}, | |
231 #define IDX_ISO_4 3 | |
232 {"iso-8859-4", ENC_8BIT, 0}, | |
233 #define IDX_ISO_5 4 | |
234 {"iso-8859-5", ENC_8BIT, 0}, | |
235 #define IDX_ISO_6 5 | |
236 {"iso-8859-6", ENC_8BIT, 0}, | |
237 #define IDX_ISO_7 6 | |
238 {"iso-8859-7", ENC_8BIT, 0}, | |
407 | 239 #define IDX_ISO_8 7 |
7 | 240 {"iso-8859-8", ENC_8BIT, 0}, |
407 | 241 #define IDX_ISO_9 8 |
7 | 242 {"iso-8859-9", ENC_8BIT, 0}, |
407 | 243 #define IDX_ISO_10 9 |
7 | 244 {"iso-8859-10", ENC_8BIT, 0}, |
407 | 245 #define IDX_ISO_11 10 |
7 | 246 {"iso-8859-11", ENC_8BIT, 0}, |
407 | 247 #define IDX_ISO_13 11 |
7 | 248 {"iso-8859-13", ENC_8BIT, 0}, |
407 | 249 #define IDX_ISO_14 12 |
7 | 250 {"iso-8859-14", ENC_8BIT, 0}, |
407 | 251 #define IDX_ISO_15 13 |
26 | 252 {"iso-8859-15", ENC_8BIT + ENC_LATIN9, 0}, |
407 | 253 #define IDX_KOI8_R 14 |
7 | 254 {"koi8-r", ENC_8BIT, 0}, |
407 | 255 #define IDX_KOI8_U 15 |
7 | 256 {"koi8-u", ENC_8BIT, 0}, |
407 | 257 #define IDX_UTF8 16 |
7 | 258 {"utf-8", ENC_UNICODE, 0}, |
407 | 259 #define IDX_UCS2 17 |
7 | 260 {"ucs-2", ENC_UNICODE + ENC_ENDIAN_B + ENC_2BYTE, 0}, |
407 | 261 #define IDX_UCS2LE 18 |
7 | 262 {"ucs-2le", ENC_UNICODE + ENC_ENDIAN_L + ENC_2BYTE, 0}, |
407 | 263 #define IDX_UTF16 19 |
7 | 264 {"utf-16", ENC_UNICODE + ENC_ENDIAN_B + ENC_2WORD, 0}, |
407 | 265 #define IDX_UTF16LE 20 |
7 | 266 {"utf-16le", ENC_UNICODE + ENC_ENDIAN_L + ENC_2WORD, 0}, |
407 | 267 #define IDX_UCS4 21 |
7 | 268 {"ucs-4", ENC_UNICODE + ENC_ENDIAN_B + ENC_4BYTE, 0}, |
407 | 269 #define IDX_UCS4LE 22 |
7 | 270 {"ucs-4le", ENC_UNICODE + ENC_ENDIAN_L + ENC_4BYTE, 0}, |
407 | 271 |
272 /* For debugging DBCS encoding on Unix. */ | |
273 #define IDX_DEBUG 23 | |
7 | 274 {"debug", ENC_DBCS, DBCS_DEBUG}, |
407 | 275 #define IDX_EUC_JP 24 |
7 | 276 {"euc-jp", ENC_DBCS, DBCS_JPNU}, |
407 | 277 #define IDX_SJIS 25 |
7 | 278 {"sjis", ENC_DBCS, DBCS_JPN}, |
407 | 279 #define IDX_EUC_KR 26 |
7 | 280 {"euc-kr", ENC_DBCS, DBCS_KORU}, |
407 | 281 #define IDX_EUC_CN 27 |
7 | 282 {"euc-cn", ENC_DBCS, DBCS_CHSU}, |
407 | 283 #define IDX_EUC_TW 28 |
7 | 284 {"euc-tw", ENC_DBCS, DBCS_CHTU}, |
407 | 285 #define IDX_BIG5 29 |
7 | 286 {"big5", ENC_DBCS, DBCS_CHT}, |
407 | 287 |
288 /* MS-DOS and MS-Windows codepages are included here, so that they can be | |
289 * used on Unix too. Most of them are similar to ISO-8859 encodings, but | |
290 * not exactly the same. */ | |
291 #define IDX_CP437 30 | |
292 {"cp437", ENC_8BIT, 437}, /* like iso-8859-1 */ | |
293 #define IDX_CP737 31 | |
294 {"cp737", ENC_8BIT, 737}, /* like iso-8859-7 */ | |
295 #define IDX_CP775 32 | |
296 {"cp775", ENC_8BIT, 775}, /* Baltic */ | |
297 #define IDX_CP850 33 | |
298 {"cp850", ENC_8BIT, 850}, /* like iso-8859-4 */ | |
299 #define IDX_CP852 34 | |
300 {"cp852", ENC_8BIT, 852}, /* like iso-8859-1 */ | |
301 #define IDX_CP855 35 | |
302 {"cp855", ENC_8BIT, 855}, /* like iso-8859-2 */ | |
303 #define IDX_CP857 36 | |
304 {"cp857", ENC_8BIT, 857}, /* like iso-8859-5 */ | |
305 #define IDX_CP860 37 | |
306 {"cp860", ENC_8BIT, 860}, /* like iso-8859-9 */ | |
307 #define IDX_CP861 38 | |
308 {"cp861", ENC_8BIT, 861}, /* like iso-8859-1 */ | |
309 #define IDX_CP862 39 | |
310 {"cp862", ENC_8BIT, 862}, /* like iso-8859-1 */ | |
311 #define IDX_CP863 40 | |
312 {"cp863", ENC_8BIT, 863}, /* like iso-8859-8 */ | |
313 #define IDX_CP865 41 | |
314 {"cp865", ENC_8BIT, 865}, /* like iso-8859-1 */ | |
315 #define IDX_CP866 42 | |
316 {"cp866", ENC_8BIT, 866}, /* like iso-8859-5 */ | |
317 #define IDX_CP869 43 | |
318 {"cp869", ENC_8BIT, 869}, /* like iso-8859-7 */ | |
319 #define IDX_CP874 44 | |
320 {"cp874", ENC_8BIT, 874}, /* Thai */ | |
321 #define IDX_CP932 45 | |
322 {"cp932", ENC_DBCS, DBCS_JPN}, | |
323 #define IDX_CP936 46 | |
324 {"cp936", ENC_DBCS, DBCS_CHS}, | |
325 #define IDX_CP949 47 | |
326 {"cp949", ENC_DBCS, DBCS_KOR}, | |
327 #define IDX_CP950 48 | |
328 {"cp950", ENC_DBCS, DBCS_CHT}, | |
329 #define IDX_CP1250 49 | |
330 {"cp1250", ENC_8BIT, 1250}, /* Czech, Polish, etc. */ | |
331 #define IDX_CP1251 50 | |
332 {"cp1251", ENC_8BIT, 1251}, /* Cyrillic */ | |
333 /* cp1252 is considered to be equal to latin1 */ | |
334 #define IDX_CP1253 51 | |
335 {"cp1253", ENC_8BIT, 1253}, /* Greek */ | |
336 #define IDX_CP1254 52 | |
337 {"cp1254", ENC_8BIT, 1254}, /* Turkish */ | |
338 #define IDX_CP1255 53 | |
339 {"cp1255", ENC_8BIT, 1255}, /* Hebrew */ | |
340 #define IDX_CP1256 54 | |
341 {"cp1256", ENC_8BIT, 1256}, /* Arabic */ | |
342 #define IDX_CP1257 55 | |
343 {"cp1257", ENC_8BIT, 1257}, /* Baltic */ | |
344 #define IDX_CP1258 56 | |
345 {"cp1258", ENC_8BIT, 1258}, /* Vietnamese */ | |
346 | |
347 #define IDX_MACROMAN 57 | |
348 {"macroman", ENC_8BIT + ENC_MACROMAN, 0}, /* Mac OS */ | |
890 | 349 #define IDX_DECMCS 58 |
350 {"dec-mcs", ENC_8BIT, 0}, /* DEC MCS */ | |
351 #define IDX_HPROMAN8 59 | |
352 {"hp-roman8", ENC_8BIT, 0}, /* HP Roman8 */ | |
353 #define IDX_COUNT 60 | |
7 | 354 }; |
355 | |
356 /* | |
357 * Aliases for encoding names. | |
358 */ | |
359 static struct | |
360 { char *name; int canon;} | |
361 enc_alias_table[] = | |
362 { | |
363 {"ansi", IDX_LATIN_1}, | |
364 {"iso-8859-1", IDX_LATIN_1}, | |
365 {"latin2", IDX_ISO_2}, | |
366 {"latin3", IDX_ISO_3}, | |
367 {"latin4", IDX_ISO_4}, | |
368 {"cyrillic", IDX_ISO_5}, | |
369 {"arabic", IDX_ISO_6}, | |
370 {"greek", IDX_ISO_7}, | |
371 #ifdef WIN3264 | |
372 {"hebrew", IDX_CP1255}, | |
373 #else | |
374 {"hebrew", IDX_ISO_8}, | |
375 #endif | |
376 {"latin5", IDX_ISO_9}, | |
377 {"turkish", IDX_ISO_9}, /* ? */ | |
378 {"latin6", IDX_ISO_10}, | |
379 {"nordic", IDX_ISO_10}, /* ? */ | |
380 {"thai", IDX_ISO_11}, /* ? */ | |
381 {"latin7", IDX_ISO_13}, | |
382 {"latin8", IDX_ISO_14}, | |
383 {"latin9", IDX_ISO_15}, | |
384 {"utf8", IDX_UTF8}, | |
385 {"unicode", IDX_UCS2}, | |
386 {"ucs2", IDX_UCS2}, | |
387 {"ucs2be", IDX_UCS2}, | |
388 {"ucs-2be", IDX_UCS2}, | |
389 {"ucs2le", IDX_UCS2LE}, | |
390 {"utf16", IDX_UTF16}, | |
391 {"utf16be", IDX_UTF16}, | |
392 {"utf-16be", IDX_UTF16}, | |
393 {"utf16le", IDX_UTF16LE}, | |
394 {"ucs4", IDX_UCS4}, | |
395 {"ucs4be", IDX_UCS4}, | |
396 {"ucs-4be", IDX_UCS4}, | |
397 {"ucs4le", IDX_UCS4LE}, | |
1540 | 398 {"utf32", IDX_UCS4}, |
399 {"utf-32", IDX_UCS4}, | |
400 {"utf32be", IDX_UCS4}, | |
401 {"utf-32be", IDX_UCS4}, | |
402 {"utf32le", IDX_UCS4LE}, | |
403 {"utf-32le", IDX_UCS4LE}, | |
7 | 404 {"932", IDX_CP932}, |
405 {"949", IDX_CP949}, | |
406 {"936", IDX_CP936}, | |
932 | 407 {"gbk", IDX_CP936}, |
7 | 408 {"950", IDX_CP950}, |
409 {"eucjp", IDX_EUC_JP}, | |
410 {"unix-jis", IDX_EUC_JP}, | |
411 {"ujis", IDX_EUC_JP}, | |
412 {"shift-jis", IDX_SJIS}, | |
6377 | 413 {"pck", IDX_SJIS}, /* Sun: PCK */ |
7 | 414 {"euckr", IDX_EUC_KR}, |
415 {"5601", IDX_EUC_KR}, /* Sun: KS C 5601 */ | |
416 {"euccn", IDX_EUC_CN}, | |
417 {"gb2312", IDX_EUC_CN}, | |
418 {"euctw", IDX_EUC_TW}, | |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
419 #if defined(WIN3264) || defined(WIN32UNIX) || defined(MACOS_X) |
7 | 420 {"japan", IDX_CP932}, |
421 {"korea", IDX_CP949}, | |
422 {"prc", IDX_CP936}, | |
423 {"chinese", IDX_CP936}, | |
424 {"taiwan", IDX_CP950}, | |
425 {"big5", IDX_CP950}, | |
426 #else | |
427 {"japan", IDX_EUC_JP}, | |
428 {"korea", IDX_EUC_KR}, | |
429 {"prc", IDX_EUC_CN}, | |
430 {"chinese", IDX_EUC_CN}, | |
431 {"taiwan", IDX_EUC_TW}, | |
432 {"cp950", IDX_BIG5}, | |
433 {"950", IDX_BIG5}, | |
434 #endif | |
435 {"mac", IDX_MACROMAN}, | |
890 | 436 {"mac-roman", IDX_MACROMAN}, |
7 | 437 {NULL, 0} |
438 }; | |
439 | |
440 #ifndef CP_UTF8 | |
441 # define CP_UTF8 65001 /* magic number from winnls.h */ | |
442 #endif | |
443 | |
444 /* | |
445 * Find encoding "name" in the list of canonical encoding names. | |
446 * Returns -1 if not found. | |
447 */ | |
448 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
449 enc_canon_search(char_u *name) |
7 | 450 { |
451 int i; | |
452 | |
453 for (i = 0; i < IDX_COUNT; ++i) | |
454 if (STRCMP(name, enc_canon_table[i].name) == 0) | |
455 return i; | |
456 return -1; | |
457 } | |
458 | |
459 #endif | |
460 | |
461 #if defined(FEAT_MBYTE) || defined(PROTO) | |
462 | |
463 /* | |
464 * Find canonical encoding "name" in the list and return its properties. | |
465 * Returns 0 if not found. | |
466 */ | |
467 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
468 enc_canon_props(char_u *name) |
7 | 469 { |
470 int i; | |
471 | |
472 i = enc_canon_search(name); | |
473 if (i >= 0) | |
474 return enc_canon_table[i].prop; | |
475 #ifdef WIN3264 | |
476 if (name[0] == 'c' && name[1] == 'p' && VIM_ISDIGIT(name[2])) | |
477 { | |
478 CPINFO cpinfo; | |
479 | |
480 /* Get info on this codepage to find out what it is. */ | |
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
481 if (GetCPInfo(atoi((char *)name + 2), &cpinfo) != 0) |
7 | 482 { |
483 if (cpinfo.MaxCharSize == 1) /* some single-byte encoding */ | |
484 return ENC_8BIT; | |
485 if (cpinfo.MaxCharSize == 2 | |
486 && (cpinfo.LeadByte[0] != 0 || cpinfo.LeadByte[1] != 0)) | |
487 /* must be a DBCS encoding */ | |
488 return ENC_DBCS; | |
489 } | |
490 return 0; | |
491 } | |
492 #endif | |
493 if (STRNCMP(name, "2byte-", 6) == 0) | |
494 return ENC_DBCS; | |
495 if (STRNCMP(name, "8bit-", 5) == 0 || STRNCMP(name, "iso-8859-", 9) == 0) | |
496 return ENC_8BIT; | |
497 return 0; | |
498 } | |
499 | |
500 /* | |
501 * Set up for using multi-byte characters. | |
502 * Called in three cases: | |
503 * - by main() to initialize (p_enc == NULL) | |
504 * - by set_init_1() after 'encoding' was set to its default. | |
505 * - by do_set() when 'encoding' has been set. | |
506 * p_enc must have been passed through enc_canonize() already. | |
507 * Sets the "enc_unicode", "enc_utf8", "enc_dbcs" and "has_mbyte" flags. | |
508 * Fills mb_bytelen_tab[] and returns NULL when there are no problems. | |
509 * When there is something wrong: Returns an error message and doesn't change | |
510 * anything. | |
511 */ | |
512 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
513 mb_init(void) |
7 | 514 { |
515 int i; | |
516 int idx; | |
517 int n; | |
518 int enc_dbcs_new = 0; | |
519 #if defined(USE_ICONV) && !defined(WIN3264) && !defined(WIN32UNIX) \ | |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
520 && !defined(MACOS_CONVERT) |
7 | 521 # define LEN_FROM_CONV |
522 vimconv_T vimconv; | |
523 char_u *p; | |
524 #endif | |
525 | |
526 if (p_enc == NULL) | |
527 { | |
528 /* Just starting up: set the whole table to one's. */ | |
529 for (i = 0; i < 256; ++i) | |
530 mb_bytelen_tab[i] = 1; | |
531 input_conv.vc_type = CONV_NONE; | |
532 input_conv.vc_factor = 1; | |
533 output_conv.vc_type = CONV_NONE; | |
534 return NULL; | |
535 } | |
536 | |
537 #ifdef WIN3264 | |
538 if (p_enc[0] == 'c' && p_enc[1] == 'p' && VIM_ISDIGIT(p_enc[2])) | |
539 { | |
540 CPINFO cpinfo; | |
541 | |
542 /* Get info on this codepage to find out what it is. */ | |
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
543 if (GetCPInfo(atoi((char *)p_enc + 2), &cpinfo) != 0) |
7 | 544 { |
545 if (cpinfo.MaxCharSize == 1) | |
546 { | |
547 /* some single-byte encoding */ | |
548 enc_unicode = 0; | |
549 enc_utf8 = FALSE; | |
550 } | |
551 else if (cpinfo.MaxCharSize == 2 | |
552 && (cpinfo.LeadByte[0] != 0 || cpinfo.LeadByte[1] != 0)) | |
553 { | |
554 /* must be a DBCS encoding, check below */ | |
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
555 enc_dbcs_new = atoi((char *)p_enc + 2); |
7 | 556 } |
557 else | |
558 goto codepage_invalid; | |
559 } | |
560 else if (GetLastError() == ERROR_INVALID_PARAMETER) | |
561 { | |
562 codepage_invalid: | |
563 return (char_u *)N_("E543: Not a valid codepage"); | |
564 } | |
565 } | |
566 #endif | |
567 else if (STRNCMP(p_enc, "8bit-", 5) == 0 | |
568 || STRNCMP(p_enc, "iso-8859-", 9) == 0) | |
569 { | |
570 /* Accept any "8bit-" or "iso-8859-" name. */ | |
571 enc_unicode = 0; | |
572 enc_utf8 = FALSE; | |
573 } | |
574 else if (STRNCMP(p_enc, "2byte-", 6) == 0) | |
575 { | |
576 #ifdef WIN3264 | |
577 /* Windows: accept only valid codepage numbers, check below. */ | |
578 if (p_enc[6] != 'c' || p_enc[7] != 'p' | |
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
579 || (enc_dbcs_new = atoi((char *)p_enc + 8)) == 0) |
7 | 580 return e_invarg; |
581 #else | |
582 /* Unix: accept any "2byte-" name, assume current locale. */ | |
583 enc_dbcs_new = DBCS_2BYTE; | |
584 #endif | |
585 } | |
586 else if ((idx = enc_canon_search(p_enc)) >= 0) | |
587 { | |
588 i = enc_canon_table[idx].prop; | |
589 if (i & ENC_UNICODE) | |
590 { | |
591 /* Unicode */ | |
592 enc_utf8 = TRUE; | |
593 if (i & (ENC_2BYTE | ENC_2WORD)) | |
594 enc_unicode = 2; | |
595 else if (i & ENC_4BYTE) | |
596 enc_unicode = 4; | |
597 else | |
598 enc_unicode = 0; | |
599 } | |
600 else if (i & ENC_DBCS) | |
601 { | |
602 /* 2byte, handle below */ | |
603 enc_dbcs_new = enc_canon_table[idx].codepage; | |
604 } | |
605 else | |
606 { | |
607 /* Must be 8-bit. */ | |
608 enc_unicode = 0; | |
609 enc_utf8 = FALSE; | |
610 } | |
611 } | |
612 else /* Don't know what encoding this is, reject it. */ | |
613 return e_invarg; | |
614 | |
615 if (enc_dbcs_new != 0) | |
616 { | |
617 #ifdef WIN3264 | |
618 /* Check if the DBCS code page is OK. */ | |
619 if (!IsValidCodePage(enc_dbcs_new)) | |
620 goto codepage_invalid; | |
621 #endif | |
622 enc_unicode = 0; | |
623 enc_utf8 = FALSE; | |
624 } | |
625 enc_dbcs = enc_dbcs_new; | |
626 has_mbyte = (enc_dbcs != 0 || enc_utf8); | |
627 | |
4168 | 628 #if defined(WIN3264) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD) |
7 | 629 enc_codepage = encname2codepage(p_enc); |
26 | 630 enc_latin9 = (STRCMP(p_enc, "iso-8859-15") == 0); |
7 | 631 #endif |
632 | |
492 | 633 /* Detect an encoding that uses latin1 characters. */ |
634 enc_latin1like = (enc_utf8 || STRCMP(p_enc, "latin1") == 0 | |
635 || STRCMP(p_enc, "iso-8859-15") == 0); | |
636 | |
7 | 637 /* |
638 * Set the function pointers. | |
639 */ | |
640 if (enc_utf8) | |
641 { | |
474 | 642 mb_ptr2len = utfc_ptr2len; |
1903 | 643 mb_ptr2len_len = utfc_ptr2len_len; |
7 | 644 mb_char2len = utf_char2len; |
645 mb_char2bytes = utf_char2bytes; | |
646 mb_ptr2cells = utf_ptr2cells; | |
1903 | 647 mb_ptr2cells_len = utf_ptr2cells_len; |
7 | 648 mb_char2cells = utf_char2cells; |
649 mb_off2cells = utf_off2cells; | |
650 mb_ptr2char = utf_ptr2char; | |
651 mb_head_off = utf_head_off; | |
652 } | |
653 else if (enc_dbcs != 0) | |
654 { | |
474 | 655 mb_ptr2len = dbcs_ptr2len; |
1903 | 656 mb_ptr2len_len = dbcs_ptr2len_len; |
7 | 657 mb_char2len = dbcs_char2len; |
658 mb_char2bytes = dbcs_char2bytes; | |
659 mb_ptr2cells = dbcs_ptr2cells; | |
1903 | 660 mb_ptr2cells_len = dbcs_ptr2cells_len; |
7 | 661 mb_char2cells = dbcs_char2cells; |
662 mb_off2cells = dbcs_off2cells; | |
663 mb_ptr2char = dbcs_ptr2char; | |
664 mb_head_off = dbcs_head_off; | |
665 } | |
666 else | |
667 { | |
474 | 668 mb_ptr2len = latin_ptr2len; |
1903 | 669 mb_ptr2len_len = latin_ptr2len_len; |
7 | 670 mb_char2len = latin_char2len; |
671 mb_char2bytes = latin_char2bytes; | |
672 mb_ptr2cells = latin_ptr2cells; | |
1903 | 673 mb_ptr2cells_len = latin_ptr2cells_len; |
7 | 674 mb_char2cells = latin_char2cells; |
675 mb_off2cells = latin_off2cells; | |
676 mb_ptr2char = latin_ptr2char; | |
677 mb_head_off = latin_head_off; | |
678 } | |
679 | |
680 /* | |
681 * Fill the mb_bytelen_tab[] for MB_BYTE2LEN(). | |
682 */ | |
683 #ifdef LEN_FROM_CONV | |
684 /* When 'encoding' is different from the current locale mblen() won't | |
685 * work. Use conversion to "utf-8" instead. */ | |
686 vimconv.vc_type = CONV_NONE; | |
687 if (enc_dbcs) | |
688 { | |
689 p = enc_locale(); | |
690 if (p == NULL || STRCMP(p, p_enc) != 0) | |
691 { | |
692 convert_setup(&vimconv, p_enc, (char_u *)"utf-8"); | |
693 vimconv.vc_fail = TRUE; | |
694 } | |
695 vim_free(p); | |
696 } | |
697 #endif | |
698 | |
699 for (i = 0; i < 256; ++i) | |
700 { | |
701 /* Our own function to reliably check the length of UTF-8 characters, | |
702 * independent of mblen(). */ | |
703 if (enc_utf8) | |
704 n = utf8len_tab[i]; | |
705 else if (enc_dbcs == 0) | |
706 n = 1; | |
707 else | |
708 { | |
709 #if defined(WIN3264) || defined(WIN32UNIX) | |
710 /* enc_dbcs is set by setting 'fileencoding'. It becomes a Windows | |
711 * CodePage identifier, which we can pass directly in to Windows | |
712 * API */ | |
5602 | 713 n = IsDBCSLeadByteEx(enc_dbcs, (WINBYTE)i) ? 2 : 1; |
7 | 714 #else |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
715 # if defined(__amigaos4__) || defined(__ANDROID__) || \ |
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
716 !(defined(HAVE_MBLEN) || defined(X_LOCALE)) |
7 | 717 /* |
718 * if mblen() is not available, character which MSB is turned on | |
719 * are treated as leading byte character. (note : This assumption | |
720 * is not always true.) | |
721 */ | |
722 n = (i & 0x80) ? 2 : 1; | |
723 # else | |
3549 | 724 char buf[MB_MAXBYTES + 1]; |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
725 |
7 | 726 if (i == NUL) /* just in case mblen() can't handle "" */ |
727 n = 1; | |
728 else | |
729 { | |
730 buf[0] = i; | |
731 buf[1] = 0; | |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
732 # ifdef LEN_FROM_CONV |
7 | 733 if (vimconv.vc_type != CONV_NONE) |
734 { | |
735 /* | |
736 * string_convert() should fail when converting the first | |
737 * byte of a double-byte character. | |
738 */ | |
739 p = string_convert(&vimconv, (char_u *)buf, NULL); | |
740 if (p != NULL) | |
741 { | |
742 vim_free(p); | |
743 n = 1; | |
744 } | |
745 else | |
746 n = 2; | |
747 } | |
748 else | |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
749 # endif |
7 | 750 { |
751 /* | |
752 * mblen() should return -1 for invalid (means the leading | |
753 * multibyte) character. However there are some platforms | |
754 * where mblen() returns 0 for invalid character. | |
755 * Therefore, following condition includes 0. | |
756 */ | |
14730
193471015e1a
patch 8.1.0377: xdiff doesn't use the Vim memory allocation functions
Christian Brabandt <cb@256bit.org>
parents:
14712
diff
changeset
|
757 vim_ignored = mblen(NULL, 0); // First reset the state. |
7 | 758 if (mblen(buf, (size_t)1) <= 0) |
759 n = 2; | |
760 else | |
761 n = 1; | |
762 } | |
763 } | |
764 # endif | |
765 #endif | |
766 } | |
767 | |
768 mb_bytelen_tab[i] = n; | |
769 } | |
770 | |
771 #ifdef LEN_FROM_CONV | |
772 convert_setup(&vimconv, NULL, NULL); | |
773 #endif | |
774 | |
775 /* The cell width depends on the type of multi-byte characters. */ | |
776 (void)init_chartab(); | |
777 | |
778 /* When enc_utf8 is set or reset, (de)allocate ScreenLinesUC[] */ | |
779 screenalloc(FALSE); | |
780 | |
781 /* When using Unicode, set default for 'fileencodings'. */ | |
782 if (enc_utf8 && !option_was_set((char_u *)"fencs")) | |
783 set_string_option_direct((char_u *)"fencs", -1, | |
694 | 784 (char_u *)"ucs-bom,utf-8,default,latin1", OPT_FREE, 0); |
785 | |
7 | 786 #if defined(HAVE_BIND_TEXTDOMAIN_CODESET) && defined(FEAT_GETTEXT) |
787 /* GNU gettext 0.10.37 supports this feature: set the codeset used for | |
788 * translated messages independently from the current locale. */ | |
789 (void)bind_textdomain_codeset(VIMPACKAGE, | |
790 enc_utf8 ? "utf-8" : (char *)p_enc); | |
791 #endif | |
792 | |
23 | 793 #ifdef WIN32 |
794 /* When changing 'encoding' while starting up, then convert the command | |
795 * line arguments from the active codepage to 'encoding'. */ | |
796 if (starting != 0) | |
797 fix_arg_enc(); | |
798 #endif | |
799 | |
7 | 800 /* Fire an autocommand to let people do custom font setup. This must be |
801 * after Vim has been setup for the new encoding. */ | |
802 apply_autocmds(EVENT_ENCODINGCHANGED, NULL, (char_u *)"", FALSE, curbuf); | |
803 | |
740 | 804 #ifdef FEAT_SPELL |
236 | 805 /* Need to reload spell dictionaries */ |
806 spell_reload(); | |
807 #endif | |
808 | |
7 | 809 return NULL; |
810 } | |
811 | |
812 /* | |
813 * Return the size of the BOM for the current buffer: | |
814 * 0 - no BOM | |
815 * 2 - UCS-2 or UTF-16 BOM | |
816 * 4 - UCS-4 BOM | |
817 * 3 - UTF-8 BOM | |
818 */ | |
819 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
820 bomb_size(void) |
7 | 821 { |
822 int n = 0; | |
823 | |
824 if (curbuf->b_p_bomb && !curbuf->b_p_bin) | |
825 { | |
826 if (*curbuf->b_p_fenc == NUL) | |
827 { | |
828 if (enc_utf8) | |
829 { | |
830 if (enc_unicode != 0) | |
831 n = enc_unicode; | |
832 else | |
833 n = 3; | |
834 } | |
835 } | |
836 else if (STRCMP(curbuf->b_p_fenc, "utf-8") == 0) | |
837 n = 3; | |
838 else if (STRNCMP(curbuf->b_p_fenc, "ucs-2", 5) == 0 | |
839 || STRNCMP(curbuf->b_p_fenc, "utf-16", 6) == 0) | |
840 n = 2; | |
841 else if (STRNCMP(curbuf->b_p_fenc, "ucs-4", 5) == 0) | |
842 n = 4; | |
843 } | |
844 return n; | |
845 } | |
846 | |
847 /* | |
3002 | 848 * Remove all BOM from "s" by moving remaining text. |
849 */ | |
850 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
851 remove_bom(char_u *s) |
3002 | 852 { |
853 if (enc_utf8) | |
854 { | |
855 char_u *p = s; | |
856 | |
857 while ((p = vim_strbyte(p, 0xef)) != NULL) | |
858 { | |
859 if (p[1] == 0xbb && p[2] == 0xbf) | |
860 STRMOVE(p, p + 3); | |
861 else | |
862 ++p; | |
863 } | |
864 } | |
865 } | |
866 | |
867 /* | |
7 | 868 * Get class of pointer: |
869 * 0 for blank or NUL | |
870 * 1 for punctuation | |
871 * 2 for an (ASCII) word character | |
872 * >2 for other word characters | |
873 */ | |
874 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
875 mb_get_class(char_u *p) |
7 | 876 { |
4069 | 877 return mb_get_class_buf(p, curbuf); |
878 } | |
879 | |
880 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
881 mb_get_class_buf(char_u *p, buf_T *buf) |
4069 | 882 { |
7 | 883 if (MB_BYTE2LEN(p[0]) == 1) |
884 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
885 if (p[0] == NUL || VIM_ISWHITE(p[0])) |
7 | 886 return 0; |
4069 | 887 if (vim_iswordc_buf(p[0], buf)) |
7 | 888 return 2; |
889 return 1; | |
890 } | |
891 if (enc_dbcs != 0 && p[0] != NUL && p[1] != NUL) | |
892 return dbcs_class(p[0], p[1]); | |
893 if (enc_utf8) | |
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
894 return utf_class_buf(utf_ptr2char(p), buf); |
7 | 895 return 0; |
896 } | |
897 | |
898 /* | |
899 * Get class of a double-byte character. This always returns 3 or bigger. | |
900 * TODO: Should return 1 for punctuation. | |
901 */ | |
902 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
903 dbcs_class(unsigned lead, unsigned trail) |
7 | 904 { |
905 switch (enc_dbcs) | |
906 { | |
4352 | 907 /* please add classify routine for your language in here */ |
7 | 908 |
909 case DBCS_JPNU: /* ? */ | |
910 case DBCS_JPN: | |
911 { | |
912 /* JIS code classification */ | |
913 unsigned char lb = lead; | |
914 unsigned char tb = trail; | |
915 | |
916 /* convert process code to JIS */ | |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
917 # if defined(WIN3264) || defined(WIN32UNIX) || defined(MACOS_X) |
7 | 918 /* process code is SJIS */ |
919 if (lb <= 0x9f) | |
920 lb = (lb - 0x81) * 2 + 0x21; | |
921 else | |
922 lb = (lb - 0xc1) * 2 + 0x21; | |
923 if (tb <= 0x7e) | |
924 tb -= 0x1f; | |
925 else if (tb <= 0x9e) | |
926 tb -= 0x20; | |
927 else | |
928 { | |
929 tb -= 0x7e; | |
930 lb += 1; | |
931 } | |
932 # else | |
933 /* | |
934 * XXX: Code page identification can not use with all | |
935 * system! So, some other encoding information | |
936 * will be needed. | |
937 * In japanese: SJIS,EUC,UNICODE,(JIS) | |
938 * Note that JIS-code system don't use as | |
939 * process code in most system because it uses | |
940 * escape sequences(JIS is context depend encoding). | |
941 */ | |
942 /* assume process code is JAPANESE-EUC */ | |
943 lb &= 0x7f; | |
944 tb &= 0x7f; | |
945 # endif | |
946 /* exceptions */ | |
947 switch (lb << 8 | tb) | |
948 { | |
949 case 0x2121: /* ZENKAKU space */ | |
950 return 0; | |
5477 | 951 case 0x2122: /* TOU-TEN (Japanese comma) */ |
952 case 0x2123: /* KU-TEN (Japanese period) */ | |
7 | 953 case 0x2124: /* ZENKAKU comma */ |
954 case 0x2125: /* ZENKAKU period */ | |
955 return 1; | |
956 case 0x213c: /* prolongedsound handled as KATAKANA */ | |
957 return 13; | |
958 } | |
959 /* sieved by KU code */ | |
960 switch (lb) | |
961 { | |
962 case 0x21: | |
963 case 0x22: | |
964 /* special symbols */ | |
965 return 10; | |
966 case 0x23: | |
967 /* alpha-numeric */ | |
968 return 11; | |
969 case 0x24: | |
970 /* hiragana */ | |
971 return 12; | |
972 case 0x25: | |
973 /* katakana */ | |
974 return 13; | |
975 case 0x26: | |
976 /* greek */ | |
977 return 14; | |
978 case 0x27: | |
979 /* russian */ | |
980 return 15; | |
981 case 0x28: | |
982 /* lines */ | |
983 return 16; | |
984 default: | |
985 /* kanji */ | |
986 return 17; | |
987 } | |
988 } | |
989 | |
990 case DBCS_KORU: /* ? */ | |
991 case DBCS_KOR: | |
992 { | |
993 /* KS code classification */ | |
994 unsigned char c1 = lead; | |
995 unsigned char c2 = trail; | |
996 | |
997 /* | |
998 * 20 : Hangul | |
999 * 21 : Hanja | |
1000 * 22 : Symbols | |
1001 * 23 : Alpha-numeric/Roman Letter (Full width) | |
1002 * 24 : Hangul Letter(Alphabet) | |
1003 * 25 : Roman Numeral/Greek Letter | |
1004 * 26 : Box Drawings | |
1005 * 27 : Unit Symbols | |
1006 * 28 : Circled/Parenthesized Letter | |
4352 | 1007 * 29 : Hiragana/Katakana |
7 | 1008 * 30 : Cyrillic Letter |
1009 */ | |
1010 | |
1011 if (c1 >= 0xB0 && c1 <= 0xC8) | |
1012 /* Hangul */ | |
1013 return 20; | |
1014 #if defined(WIN3264) || defined(WIN32UNIX) | |
1015 else if (c1 <= 0xA0 || c2 <= 0xA0) | |
1016 /* Extended Hangul Region : MS UHC(Unified Hangul Code) */ | |
1017 /* c1: 0x81-0xA0 with c2: 0x41-0x5A, 0x61-0x7A, 0x81-0xFE | |
1018 * c1: 0xA1-0xC6 with c2: 0x41-0x5A, 0x61-0x7A, 0x81-0xA0 | |
1019 */ | |
1020 return 20; | |
1021 #endif | |
1022 | |
1023 else if (c1 >= 0xCA && c1 <= 0xFD) | |
1024 /* Hanja */ | |
1025 return 21; | |
1026 else switch (c1) | |
1027 { | |
1028 case 0xA1: | |
1029 case 0xA2: | |
1030 /* Symbols */ | |
1031 return 22; | |
1032 case 0xA3: | |
1033 /* Alpha-numeric */ | |
1034 return 23; | |
1035 case 0xA4: | |
1036 /* Hangul Letter(Alphabet) */ | |
1037 return 24; | |
1038 case 0xA5: | |
1039 /* Roman Numeral/Greek Letter */ | |
1040 return 25; | |
1041 case 0xA6: | |
1042 /* Box Drawings */ | |
1043 return 26; | |
1044 case 0xA7: | |
1045 /* Unit Symbols */ | |
1046 return 27; | |
1047 case 0xA8: | |
1048 case 0xA9: | |
1049 if (c2 <= 0xAF) | |
1050 return 25; /* Roman Letter */ | |
1051 else if (c2 >= 0xF6) | |
1052 return 22; /* Symbols */ | |
1053 else | |
1054 /* Circled/Parenthesized Letter */ | |
1055 return 28; | |
1056 case 0xAA: | |
1057 case 0xAB: | |
4352 | 1058 /* Hiragana/Katakana */ |
7 | 1059 return 29; |
1060 case 0xAC: | |
1061 /* Cyrillic Letter */ | |
1062 return 30; | |
1063 } | |
1064 } | |
1065 default: | |
1066 break; | |
1067 } | |
1068 return 3; | |
1069 } | |
1070 | |
1071 /* | |
1072 * mb_char2len() function pointer. | |
1073 * Return length in bytes of character "c". | |
1074 * Returns 1 for a single-byte character. | |
1075 */ | |
1076 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1077 latin_char2len(int c UNUSED) |
7 | 1078 { |
1079 return 1; | |
1080 } | |
1081 | |
1082 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1083 dbcs_char2len( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1084 int c) |
7 | 1085 { |
1086 if (c >= 0x100) | |
1087 return 2; | |
1088 return 1; | |
1089 } | |
1090 | |
1091 /* | |
1092 * mb_char2bytes() function pointer. | |
1093 * Convert a character to its bytes. | |
1094 * Returns the length in bytes. | |
1095 */ | |
1096 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1097 latin_char2bytes(int c, char_u *buf) |
7 | 1098 { |
1099 buf[0] = c; | |
1100 return 1; | |
1101 } | |
1102 | |
1103 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1104 dbcs_char2bytes(int c, char_u *buf) |
7 | 1105 { |
1106 if (c >= 0x100) | |
1107 { | |
1108 buf[0] = (unsigned)c >> 8; | |
1109 buf[1] = c; | |
221 | 1110 /* Never use a NUL byte, it causes lots of trouble. It's an invalid |
1111 * character anyway. */ | |
1112 if (buf[1] == NUL) | |
1113 buf[1] = '\n'; | |
7 | 1114 return 2; |
1115 } | |
1116 buf[0] = c; | |
1117 return 1; | |
1118 } | |
1119 | |
1120 /* | |
474 | 1121 * mb_ptr2len() function pointer. |
7 | 1122 * Get byte length of character at "*p" but stop at a NUL. |
1123 * For UTF-8 this includes following composing characters. | |
1124 * Returns 0 when *p is NUL. | |
1125 */ | |
1126 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1127 latin_ptr2len(char_u *p) |
7 | 1128 { |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1129 return MB_BYTE2LEN(*p); |
7 | 1130 } |
1131 | |
1132 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1133 dbcs_ptr2len( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1134 char_u *p) |
7 | 1135 { |
1136 int len; | |
1137 | |
1138 /* Check if second byte is not missing. */ | |
1139 len = MB_BYTE2LEN(*p); | |
1140 if (len == 2 && p[1] == NUL) | |
1141 len = 1; | |
1142 return len; | |
1143 } | |
1144 | |
1903 | 1145 /* |
1146 * mb_ptr2len_len() function pointer. | |
1147 * Like mb_ptr2len(), but limit to read "size" bytes. | |
1148 * Returns 0 for an empty string. | |
1149 * Returns 1 for an illegal char or an incomplete byte sequence. | |
1150 */ | |
1151 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1152 latin_ptr2len_len(char_u *p, int size) |
1903 | 1153 { |
1154 if (size < 1 || *p == NUL) | |
1155 return 0; | |
1156 return 1; | |
1157 } | |
1158 | |
1159 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1160 dbcs_ptr2len_len(char_u *p, int size) |
1903 | 1161 { |
1162 int len; | |
1163 | |
1164 if (size < 1 || *p == NUL) | |
1165 return 0; | |
1166 if (size == 1) | |
1167 return 1; | |
1168 /* Check that second byte is not missing. */ | |
1169 len = MB_BYTE2LEN(*p); | |
1170 if (len == 2 && p[1] == NUL) | |
1171 len = 1; | |
1172 return len; | |
1173 } | |
1174 | |
7 | 1175 struct interval |
1176 { | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1177 long first; |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1178 long last; |
7 | 1179 }; |
1180 | |
1181 /* | |
1182 * Return TRUE if "c" is in "table[size / sizeof(struct interval)]". | |
1183 */ | |
1184 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1185 intable(struct interval *table, size_t size, int c) |
7 | 1186 { |
1187 int mid, bot, top; | |
1188 | |
1189 /* first quick check for Latin1 etc. characters */ | |
1190 if (c < table[0].first) | |
1191 return FALSE; | |
1192 | |
1193 /* binary search in table */ | |
1194 bot = 0; | |
835 | 1195 top = (int)(size / sizeof(struct interval) - 1); |
7 | 1196 while (top >= bot) |
1197 { | |
1198 mid = (bot + top) / 2; | |
1199 if (table[mid].last < c) | |
1200 bot = mid + 1; | |
1201 else if (table[mid].first > c) | |
1202 top = mid - 1; | |
1203 else | |
1204 return TRUE; | |
1205 } | |
1206 return FALSE; | |
1207 } | |
1208 | |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1209 /* Sorted list of non-overlapping intervals of East Asian Ambiguous |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1210 * characters, generated with ../runtime/tools/unicode.vim. */ |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1211 static struct interval ambiguous[] = |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1212 { |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1213 {0x00a1, 0x00a1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1214 {0x00a4, 0x00a4}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1215 {0x00a7, 0x00a8}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1216 {0x00aa, 0x00aa}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1217 {0x00ad, 0x00ae}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1218 {0x00b0, 0x00b4}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1219 {0x00b6, 0x00ba}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1220 {0x00bc, 0x00bf}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1221 {0x00c6, 0x00c6}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1222 {0x00d0, 0x00d0}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1223 {0x00d7, 0x00d8}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1224 {0x00de, 0x00e1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1225 {0x00e6, 0x00e6}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1226 {0x00e8, 0x00ea}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1227 {0x00ec, 0x00ed}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1228 {0x00f0, 0x00f0}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1229 {0x00f2, 0x00f3}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1230 {0x00f7, 0x00fa}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1231 {0x00fc, 0x00fc}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1232 {0x00fe, 0x00fe}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1233 {0x0101, 0x0101}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1234 {0x0111, 0x0111}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1235 {0x0113, 0x0113}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1236 {0x011b, 0x011b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1237 {0x0126, 0x0127}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1238 {0x012b, 0x012b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1239 {0x0131, 0x0133}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1240 {0x0138, 0x0138}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1241 {0x013f, 0x0142}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1242 {0x0144, 0x0144}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1243 {0x0148, 0x014b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1244 {0x014d, 0x014d}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1245 {0x0152, 0x0153}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1246 {0x0166, 0x0167}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1247 {0x016b, 0x016b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1248 {0x01ce, 0x01ce}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1249 {0x01d0, 0x01d0}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1250 {0x01d2, 0x01d2}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1251 {0x01d4, 0x01d4}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1252 {0x01d6, 0x01d6}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1253 {0x01d8, 0x01d8}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1254 {0x01da, 0x01da}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1255 {0x01dc, 0x01dc}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1256 {0x0251, 0x0251}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1257 {0x0261, 0x0261}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1258 {0x02c4, 0x02c4}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1259 {0x02c7, 0x02c7}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1260 {0x02c9, 0x02cb}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1261 {0x02cd, 0x02cd}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1262 {0x02d0, 0x02d0}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1263 {0x02d8, 0x02db}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1264 {0x02dd, 0x02dd}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1265 {0x02df, 0x02df}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1266 {0x0300, 0x036f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1267 {0x0391, 0x03a1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1268 {0x03a3, 0x03a9}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1269 {0x03b1, 0x03c1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1270 {0x03c3, 0x03c9}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1271 {0x0401, 0x0401}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1272 {0x0410, 0x044f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1273 {0x0451, 0x0451}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1274 {0x2010, 0x2010}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1275 {0x2013, 0x2016}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1276 {0x2018, 0x2019}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1277 {0x201c, 0x201d}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1278 {0x2020, 0x2022}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1279 {0x2024, 0x2027}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1280 {0x2030, 0x2030}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1281 {0x2032, 0x2033}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1282 {0x2035, 0x2035}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1283 {0x203b, 0x203b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1284 {0x203e, 0x203e}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1285 {0x2074, 0x2074}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1286 {0x207f, 0x207f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1287 {0x2081, 0x2084}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1288 {0x20ac, 0x20ac}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1289 {0x2103, 0x2103}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1290 {0x2105, 0x2105}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1291 {0x2109, 0x2109}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1292 {0x2113, 0x2113}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1293 {0x2116, 0x2116}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1294 {0x2121, 0x2122}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1295 {0x2126, 0x2126}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1296 {0x212b, 0x212b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1297 {0x2153, 0x2154}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1298 {0x215b, 0x215e}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1299 {0x2160, 0x216b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1300 {0x2170, 0x2179}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1301 {0x2189, 0x2189}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1302 {0x2190, 0x2199}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1303 {0x21b8, 0x21b9}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1304 {0x21d2, 0x21d2}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1305 {0x21d4, 0x21d4}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1306 {0x21e7, 0x21e7}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1307 {0x2200, 0x2200}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1308 {0x2202, 0x2203}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1309 {0x2207, 0x2208}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1310 {0x220b, 0x220b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1311 {0x220f, 0x220f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1312 {0x2211, 0x2211}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1313 {0x2215, 0x2215}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1314 {0x221a, 0x221a}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1315 {0x221d, 0x2220}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1316 {0x2223, 0x2223}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1317 {0x2225, 0x2225}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1318 {0x2227, 0x222c}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1319 {0x222e, 0x222e}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1320 {0x2234, 0x2237}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1321 {0x223c, 0x223d}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1322 {0x2248, 0x2248}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1323 {0x224c, 0x224c}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1324 {0x2252, 0x2252}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1325 {0x2260, 0x2261}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1326 {0x2264, 0x2267}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1327 {0x226a, 0x226b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1328 {0x226e, 0x226f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1329 {0x2282, 0x2283}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1330 {0x2286, 0x2287}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1331 {0x2295, 0x2295}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1332 {0x2299, 0x2299}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1333 {0x22a5, 0x22a5}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1334 {0x22bf, 0x22bf}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1335 {0x2312, 0x2312}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1336 {0x2460, 0x24e9}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1337 {0x24eb, 0x254b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1338 {0x2550, 0x2573}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1339 {0x2580, 0x258f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1340 {0x2592, 0x2595}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1341 {0x25a0, 0x25a1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1342 {0x25a3, 0x25a9}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1343 {0x25b2, 0x25b3}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1344 {0x25b6, 0x25b7}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1345 {0x25bc, 0x25bd}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1346 {0x25c0, 0x25c1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1347 {0x25c6, 0x25c8}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1348 {0x25cb, 0x25cb}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1349 {0x25ce, 0x25d1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1350 {0x25e2, 0x25e5}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1351 {0x25ef, 0x25ef}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1352 {0x2605, 0x2606}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1353 {0x2609, 0x2609}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1354 {0x260e, 0x260f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1355 {0x261c, 0x261c}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1356 {0x261e, 0x261e}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1357 {0x2640, 0x2640}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1358 {0x2642, 0x2642}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1359 {0x2660, 0x2661}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1360 {0x2663, 0x2665}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1361 {0x2667, 0x266a}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1362 {0x266c, 0x266d}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1363 {0x266f, 0x266f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1364 {0x269e, 0x269f}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1365 {0x26bf, 0x26bf}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1366 {0x26c6, 0x26cd}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1367 {0x26cf, 0x26d3}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1368 {0x26d5, 0x26e1}, |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1369 {0x26e3, 0x26e3}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1370 {0x26e8, 0x26e9}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1371 {0x26eb, 0x26f1}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1372 {0x26f4, 0x26f4}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1373 {0x26f6, 0x26f9}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1374 {0x26fb, 0x26fc}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1375 {0x26fe, 0x26ff}, |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1376 {0x273d, 0x273d}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1377 {0x2776, 0x277f}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1378 {0x2b56, 0x2b59}, |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1379 {0x3248, 0x324f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1380 {0xe000, 0xf8ff}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1381 {0xfe00, 0xfe0f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1382 {0xfffd, 0xfffd}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1383 {0x1f100, 0x1f10a}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1384 {0x1f110, 0x1f12d}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1385 {0x1f130, 0x1f169}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1386 {0x1f170, 0x1f18d}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1387 {0x1f18f, 0x1f190}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1388 {0x1f19b, 0x1f1ac}, |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1389 {0xe0100, 0xe01ef}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1390 {0xf0000, 0xffffd}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1391 {0x100000, 0x10fffd} |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1392 }; |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1393 |
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1394 #if defined(FEAT_TERMINAL) || defined(PROTO) |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1395 /* |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1396 * utf_char2cells() with different argument type for libvterm. |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1397 */ |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1398 int |
12269
d2373927d76d
patch 8.0.1014: old compiler doesn't know uint32_t
Christian Brabandt <cb@256bit.org>
parents:
12210
diff
changeset
|
1399 utf_uint2cells(UINT32_T c) |
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1400 { |
12650
f58755eb453e
patch 8.0.1203: terminal window mistreats composing characters
Christian Brabandt <cb@256bit.org>
parents:
12547
diff
changeset
|
1401 if (c >= 0x100 && utf_iscomposing((int)c)) |
f58755eb453e
patch 8.0.1203: terminal window mistreats composing characters
Christian Brabandt <cb@256bit.org>
parents:
12547
diff
changeset
|
1402 return 0; |
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1403 return utf_char2cells((int)c); |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1404 } |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1405 #endif |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1406 |
7 | 1407 /* |
1408 * For UTF-8 character "c" return 2 for a double-width character, 1 for others. | |
1409 * Returns 4 or 6 for an unprintable character. | |
1410 * Is only correct for characters >= 0x80. | |
1411 * When p_ambw is "double", return 2 for a character with East Asian Width | |
1412 * class 'A'(mbiguous). | |
1413 */ | |
1414 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1415 utf_char2cells(int c) |
7 | 1416 { |
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1417 /* Sorted list of non-overlapping intervals of East Asian double width |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1418 * characters, generated with ../runtime/tools/unicode.vim. */ |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1419 static struct interval doublewidth[] = |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1420 { |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1421 {0x1100, 0x115f}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1422 {0x231a, 0x231b}, |
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1423 {0x2329, 0x232a}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1424 {0x23e9, 0x23ec}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1425 {0x23f0, 0x23f0}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1426 {0x23f3, 0x23f3}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1427 {0x25fd, 0x25fe}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1428 {0x2614, 0x2615}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1429 {0x2648, 0x2653}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1430 {0x267f, 0x267f}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1431 {0x2693, 0x2693}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1432 {0x26a1, 0x26a1}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1433 {0x26aa, 0x26ab}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1434 {0x26bd, 0x26be}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1435 {0x26c4, 0x26c5}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1436 {0x26ce, 0x26ce}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1437 {0x26d4, 0x26d4}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1438 {0x26ea, 0x26ea}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1439 {0x26f2, 0x26f3}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1440 {0x26f5, 0x26f5}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1441 {0x26fa, 0x26fa}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1442 {0x26fd, 0x26fd}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1443 {0x2705, 0x2705}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1444 {0x270a, 0x270b}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1445 {0x2728, 0x2728}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1446 {0x274c, 0x274c}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1447 {0x274e, 0x274e}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1448 {0x2753, 0x2755}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1449 {0x2757, 0x2757}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1450 {0x2795, 0x2797}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1451 {0x27b0, 0x27b0}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1452 {0x27bf, 0x27bf}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1453 {0x2b1b, 0x2b1c}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1454 {0x2b50, 0x2b50}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1455 {0x2b55, 0x2b55}, |
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1456 {0x2e80, 0x2e99}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1457 {0x2e9b, 0x2ef3}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1458 {0x2f00, 0x2fd5}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1459 {0x2ff0, 0x2ffb}, |
6495 | 1460 {0x3000, 0x303e}, |
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1461 {0x3041, 0x3096}, |
6495 | 1462 {0x3099, 0x30ff}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
1463 {0x3105, 0x312f}, |
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1464 {0x3131, 0x318e}, |
6495 | 1465 {0x3190, 0x31ba}, |
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1466 {0x31c0, 0x31e3}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1467 {0x31f0, 0x321e}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1468 {0x3220, 0x3247}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1469 {0x3250, 0x32fe}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1470 {0x3300, 0x4dbf}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1471 {0x4e00, 0xa48c}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1472 {0xa490, 0xa4c6}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1473 {0xa960, 0xa97c}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1474 {0xac00, 0xd7a3}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1475 {0xf900, 0xfaff}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1476 {0xfe10, 0xfe19}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1477 {0xfe30, 0xfe52}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1478 {0xfe54, 0xfe66}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1479 {0xfe68, 0xfe6b}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1480 {0xff01, 0xff60}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1481 {0xffe0, 0xffe6}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1482 {0x16fe0, 0x16fe1}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
1483 {0x17000, 0x187f1}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1484 {0x18800, 0x18af2}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1485 {0x1b000, 0x1b11e}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1486 {0x1b170, 0x1b2fb}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1487 {0x1f004, 0x1f004}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1488 {0x1f0cf, 0x1f0cf}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1489 {0x1f18e, 0x1f18e}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1490 {0x1f191, 0x1f19a}, |
8682
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
1491 {0x1f200, 0x1f202}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1492 {0x1f210, 0x1f23b}, |
8682
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
1493 {0x1f240, 0x1f248}, |
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
1494 {0x1f250, 0x1f251}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1495 {0x1f260, 0x1f265}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1496 {0x1f300, 0x1f320}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1497 {0x1f32d, 0x1f335}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1498 {0x1f337, 0x1f37c}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1499 {0x1f37e, 0x1f393}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1500 {0x1f3a0, 0x1f3ca}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1501 {0x1f3cf, 0x1f3d3}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1502 {0x1f3e0, 0x1f3f0}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1503 {0x1f3f4, 0x1f3f4}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1504 {0x1f3f8, 0x1f43e}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1505 {0x1f440, 0x1f440}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1506 {0x1f442, 0x1f4fc}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1507 {0x1f4ff, 0x1f53d}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1508 {0x1f54b, 0x1f54e}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1509 {0x1f550, 0x1f567}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1510 {0x1f57a, 0x1f57a}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1511 {0x1f595, 0x1f596}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1512 {0x1f5a4, 0x1f5a4}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1513 {0x1f5fb, 0x1f64f}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1514 {0x1f680, 0x1f6c5}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1515 {0x1f6cc, 0x1f6cc}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1516 {0x1f6d0, 0x1f6d2}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1517 {0x1f6eb, 0x1f6ec}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
1518 {0x1f6f4, 0x1f6f9}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1519 {0x1f910, 0x1f93e}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
1520 {0x1f940, 0x1f970}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
1521 {0x1f973, 0x1f976}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
1522 {0x1f97a, 0x1f97a}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
1523 {0x1f97c, 0x1f9a2}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
1524 {0x1f9b0, 0x1f9b9}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
1525 {0x1f9c0, 0x1f9c2}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
1526 {0x1f9d0, 0x1f9ff}, |
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1527 {0x20000, 0x2fffd}, |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1528 {0x30000, 0x3fffd} |
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1529 }; |
6495 | 1530 |
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1531 /* Sorted list of non-overlapping intervals of Emoji characters that don't |
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1532 * have ambiguous or double width, |
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1533 * based on http://unicode.org/emoji/charts/emoji-list.html */ |
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1534 static struct interval emoji_width[] = |
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1535 { |
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1536 {0x1f1e6, 0x1f1ff}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1537 {0x1f321, 0x1f321}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1538 {0x1f324, 0x1f32c}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1539 {0x1f336, 0x1f336}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1540 {0x1f37d, 0x1f37d}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1541 {0x1f396, 0x1f397}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1542 {0x1f399, 0x1f39b}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1543 {0x1f39e, 0x1f39f}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1544 {0x1f3cb, 0x1f3ce}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1545 {0x1f3d4, 0x1f3df}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1546 {0x1f3f3, 0x1f3f5}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1547 {0x1f3f7, 0x1f3f7}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1548 {0x1f43f, 0x1f43f}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1549 {0x1f441, 0x1f441}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1550 {0x1f4fd, 0x1f4fd}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1551 {0x1f549, 0x1f54a}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1552 {0x1f56f, 0x1f570}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1553 {0x1f573, 0x1f579}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1554 {0x1f587, 0x1f587}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1555 {0x1f58a, 0x1f58d}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1556 {0x1f590, 0x1f590}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1557 {0x1f5a5, 0x1f5a5}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1558 {0x1f5a8, 0x1f5a8}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1559 {0x1f5b1, 0x1f5b2}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1560 {0x1f5bc, 0x1f5bc}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1561 {0x1f5c2, 0x1f5c4}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1562 {0x1f5d1, 0x1f5d3}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1563 {0x1f5dc, 0x1f5de}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1564 {0x1f5e1, 0x1f5e1}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1565 {0x1f5e3, 0x1f5e3}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1566 {0x1f5e8, 0x1f5e8}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1567 {0x1f5ef, 0x1f5ef}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1568 {0x1f5f3, 0x1f5f3}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1569 {0x1f5fa, 0x1f5fa}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1570 {0x1f6cb, 0x1f6cf}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1571 {0x1f6e0, 0x1f6e5}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1572 {0x1f6e9, 0x1f6e9}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1573 {0x1f6f0, 0x1f6f0}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1574 {0x1f6f3, 0x1f6f3} |
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1575 }; |
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1576 |
7 | 1577 if (c >= 0x100) |
1578 { | |
1579 #ifdef USE_WCHAR_FUNCTIONS | |
1580 /* | |
1581 * Assume the library function wcwidth() works better than our own | |
1582 * stuff. It should return 1 for ambiguous width chars! | |
1583 */ | |
1584 int n = wcwidth(c); | |
1585 | |
1586 if (n < 0) | |
1587 return 6; /* unprintable, displays <xxxx> */ | |
1588 if (n > 1) | |
1589 return n; | |
1590 #else | |
1591 if (!utf_printable(c)) | |
1592 return 6; /* unprintable, displays <xxxx> */ | |
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1593 if (intable(doublewidth, sizeof(doublewidth), c)) |
7 | 1594 return 2; |
1595 #endif | |
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1596 if (p_emoji && intable(emoji_width, sizeof(emoji_width), c)) |
8629
54ac275e3fc4
commit https://github.com/vim/vim/commit/3848e00e0177abdb31bc600234967863ec487233
Christian Brabandt <cb@256bit.org>
parents:
8218
diff
changeset
|
1597 return 2; |
7 | 1598 } |
1599 | |
1600 /* Characters below 0x100 are influenced by 'isprint' option */ | |
1601 else if (c >= 0x80 && !vim_isprintc(c)) | |
1602 return 4; /* unprintable, displays <xx> */ | |
1603 | |
1604 if (c >= 0x80 && *p_ambw == 'd' && intable(ambiguous, sizeof(ambiguous), c)) | |
1605 return 2; | |
1606 | |
1607 return 1; | |
1608 } | |
1609 | |
1610 /* | |
1611 * mb_ptr2cells() function pointer. | |
1612 * Return the number of display cells character at "*p" occupies. | |
1613 * This doesn't take care of unprintable characters, use ptr2cells() for that. | |
1614 */ | |
1615 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1616 latin_ptr2cells(char_u *p UNUSED) |
7 | 1617 { |
1618 return 1; | |
1619 } | |
1620 | |
1621 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1622 utf_ptr2cells( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1623 char_u *p) |
7 | 1624 { |
1625 int c; | |
1626 | |
1627 /* Need to convert to a wide character. */ | |
1628 if (*p >= 0x80) | |
1629 { | |
1630 c = utf_ptr2char(p); | |
1631 /* An illegal byte is displayed as <xx>. */ | |
474 | 1632 if (utf_ptr2len(p) == 1 || c == NUL) |
7 | 1633 return 4; |
1634 /* If the char is ASCII it must be an overlong sequence. */ | |
1635 if (c < 0x80) | |
1636 return char2cells(c); | |
1637 return utf_char2cells(c); | |
1638 } | |
1639 return 1; | |
1640 } | |
1641 | |
1642 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1643 dbcs_ptr2cells(char_u *p) |
7 | 1644 { |
1645 /* Number of cells is equal to number of bytes, except for euc-jp when | |
1646 * the first byte is 0x8e. */ | |
1647 if (enc_dbcs == DBCS_JPNU && *p == 0x8e) | |
1648 return 1; | |
1649 return MB_BYTE2LEN(*p); | |
1650 } | |
1651 | |
1652 /* | |
1903 | 1653 * mb_ptr2cells_len() function pointer. |
1654 * Like mb_ptr2cells(), but limit string length to "size". | |
1655 * For an empty string or truncated character returns 1. | |
1656 */ | |
1657 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1658 latin_ptr2cells_len(char_u *p UNUSED, int size UNUSED) |
1903 | 1659 { |
1660 return 1; | |
1661 } | |
1662 | |
1663 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1664 utf_ptr2cells_len(char_u *p, int size) |
1903 | 1665 { |
1666 int c; | |
1667 | |
1668 /* Need to convert to a wide character. */ | |
1669 if (size > 0 && *p >= 0x80) | |
1670 { | |
1671 if (utf_ptr2len_len(p, size) < utf8len_tab[*p]) | |
2015 | 1672 return 1; /* truncated */ |
1903 | 1673 c = utf_ptr2char(p); |
1674 /* An illegal byte is displayed as <xx>. */ | |
1675 if (utf_ptr2len(p) == 1 || c == NUL) | |
1676 return 4; | |
1677 /* If the char is ASCII it must be an overlong sequence. */ | |
1678 if (c < 0x80) | |
1679 return char2cells(c); | |
1680 return utf_char2cells(c); | |
1681 } | |
1682 return 1; | |
1683 } | |
1684 | |
1685 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1686 dbcs_ptr2cells_len(char_u *p, int size) |
1903 | 1687 { |
1688 /* Number of cells is equal to number of bytes, except for euc-jp when | |
1689 * the first byte is 0x8e. */ | |
1690 if (size <= 1 || (enc_dbcs == DBCS_JPNU && *p == 0x8e)) | |
1691 return 1; | |
1692 return MB_BYTE2LEN(*p); | |
1693 } | |
1694 | |
1695 /* | |
7 | 1696 * mb_char2cells() function pointer. |
1697 * Return the number of display cells character "c" occupies. | |
1698 * Only takes care of multi-byte chars, not "^C" and such. | |
1699 */ | |
1700 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1701 latin_char2cells(int c UNUSED) |
7 | 1702 { |
1703 return 1; | |
1704 } | |
1705 | |
1706 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1707 dbcs_char2cells(int c) |
7 | 1708 { |
1709 /* Number of cells is equal to number of bytes, except for euc-jp when | |
1710 * the first byte is 0x8e. */ | |
1711 if (enc_dbcs == DBCS_JPNU && ((unsigned)c >> 8) == 0x8e) | |
1712 return 1; | |
1713 /* use the first byte */ | |
1714 return MB_BYTE2LEN((unsigned)c >> 8); | |
1715 } | |
1716 | |
1717 /* | |
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1718 * Return the number of cells occupied by string "p". |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1719 * Stop at a NUL character. When "len" >= 0 stop at character "p[len]". |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1720 */ |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1721 int |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1722 mb_string2cells(char_u *p, int len) |
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1723 { |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1724 int i; |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1725 int clen = 0; |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1726 |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1727 for (i = 0; (len < 0 || i < len) && p[i] != NUL; i += (*mb_ptr2len)(p + i)) |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1728 clen += (*mb_ptr2cells)(p + i); |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1729 return clen; |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1730 } |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1731 |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1732 /* |
7 | 1733 * mb_off2cells() function pointer. |
1734 * Return number of display cells for char at ScreenLines[off]. | |
1378 | 1735 * We make sure that the offset used is less than "max_off". |
7 | 1736 */ |
1737 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1738 latin_off2cells(unsigned off UNUSED, unsigned max_off UNUSED) |
7 | 1739 { |
1740 return 1; | |
1741 } | |
1742 | |
1743 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1744 dbcs_off2cells(unsigned off, unsigned max_off) |
7 | 1745 { |
1378 | 1746 /* never check beyond end of the line */ |
1747 if (off >= max_off) | |
1748 return 1; | |
1749 | |
7 | 1750 /* Number of cells is equal to number of bytes, except for euc-jp when |
1751 * the first byte is 0x8e. */ | |
1752 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
1753 return 1; | |
1754 return MB_BYTE2LEN(ScreenLines[off]); | |
1755 } | |
1756 | |
1757 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1758 utf_off2cells(unsigned off, unsigned max_off) |
7 | 1759 { |
1378 | 1760 return (off + 1 < max_off && ScreenLines[off + 1] == 0) ? 2 : 1; |
7 | 1761 } |
1762 | |
1763 /* | |
1764 * mb_ptr2char() function pointer. | |
1765 * Convert a byte sequence into a character. | |
1766 */ | |
1767 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1768 latin_ptr2char(char_u *p) |
7 | 1769 { |
1770 return *p; | |
1771 } | |
1772 | |
1773 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1774 dbcs_ptr2char(char_u *p) |
7 | 1775 { |
1776 if (MB_BYTE2LEN(*p) > 1 && p[1] != NUL) | |
1777 return (p[0] << 8) + p[1]; | |
1778 return *p; | |
1779 } | |
1780 | |
1781 /* | |
1782 * Convert a UTF-8 byte sequence to a wide character. | |
1783 * If the sequence is illegal or truncated by a NUL the first byte is | |
1784 * returned. | |
13117
cfaa513efa3f
patch 8.0.1433: illegal memory access after undo
Christian Brabandt <cb@256bit.org>
parents:
12948
diff
changeset
|
1785 * For an overlong sequence this may return zero. |
7 | 1786 * Does not include composing characters, of course. |
1787 */ | |
1788 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1789 utf_ptr2char(char_u *p) |
7 | 1790 { |
1791 int len; | |
1792 | |
1793 if (p[0] < 0x80) /* be quick for ASCII */ | |
1794 return p[0]; | |
1795 | |
2015 | 1796 len = utf8len_tab_zero[p[0]]; |
1658 | 1797 if (len > 1 && (p[1] & 0xc0) == 0x80) |
7 | 1798 { |
1799 if (len == 2) | |
1800 return ((p[0] & 0x1f) << 6) + (p[1] & 0x3f); | |
1801 if ((p[2] & 0xc0) == 0x80) | |
1802 { | |
1803 if (len == 3) | |
1804 return ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) | |
1805 + (p[2] & 0x3f); | |
1806 if ((p[3] & 0xc0) == 0x80) | |
1807 { | |
1808 if (len == 4) | |
1809 return ((p[0] & 0x07) << 18) + ((p[1] & 0x3f) << 12) | |
1810 + ((p[2] & 0x3f) << 6) + (p[3] & 0x3f); | |
1811 if ((p[4] & 0xc0) == 0x80) | |
1812 { | |
1813 if (len == 5) | |
1814 return ((p[0] & 0x03) << 24) + ((p[1] & 0x3f) << 18) | |
1815 + ((p[2] & 0x3f) << 12) + ((p[3] & 0x3f) << 6) | |
1816 + (p[4] & 0x3f); | |
1817 if ((p[5] & 0xc0) == 0x80 && len == 6) | |
1818 return ((p[0] & 0x01) << 30) + ((p[1] & 0x3f) << 24) | |
1819 + ((p[2] & 0x3f) << 18) + ((p[3] & 0x3f) << 12) | |
1820 + ((p[4] & 0x3f) << 6) + (p[5] & 0x3f); | |
1821 } | |
1822 } | |
1823 } | |
1824 } | |
1825 /* Illegal value, just return the first byte */ | |
1826 return p[0]; | |
1827 } | |
1828 | |
1829 /* | |
2961 | 1830 * Convert a UTF-8 byte sequence to a wide character. |
1831 * String is assumed to be terminated by NUL or after "n" bytes, whichever | |
1832 * comes first. | |
1833 * The function is safe in the sense that it never accesses memory beyond the | |
1834 * first "n" bytes of "s". | |
1835 * | |
1836 * On success, returns decoded codepoint, advances "s" to the beginning of | |
1837 * next character and decreases "n" accordingly. | |
1838 * | |
1839 * If end of string was reached, returns 0 and, if "n" > 0, advances "s" past | |
1840 * NUL byte. | |
1841 * | |
1842 * If byte sequence is illegal or incomplete, returns -1 and does not advance | |
1843 * "s". | |
1844 */ | |
1845 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1846 utf_safe_read_char_adv(char_u **s, size_t *n) |
2961 | 1847 { |
1848 int c, k; | |
1849 | |
1850 if (*n == 0) /* end of buffer */ | |
1851 return 0; | |
1852 | |
1853 k = utf8len_tab_zero[**s]; | |
1854 | |
1855 if (k == 1) | |
1856 { | |
1857 /* ASCII character or NUL */ | |
1858 (*n)--; | |
1859 return *(*s)++; | |
1860 } | |
1861 | |
1862 if ((size_t)k <= *n) | |
1863 { | |
1864 /* We have a multibyte sequence and it isn't truncated by buffer | |
1865 * limits so utf_ptr2char() is safe to use. Or the first byte is | |
1866 * illegal (k=0), and it's also safe to use utf_ptr2char(). */ | |
1867 c = utf_ptr2char(*s); | |
1868 | |
1869 /* On failure, utf_ptr2char() returns the first byte, so here we | |
1870 * check equality with the first byte. The only non-ASCII character | |
1871 * which equals the first byte of its own UTF-8 representation is | |
1872 * U+00C3 (UTF-8: 0xC3 0x83), so need to check that special case too. | |
1873 * It's safe even if n=1, else we would have k=2 > n. */ | |
1874 if (c != (int)(**s) || (c == 0xC3 && (*s)[1] == 0x83)) | |
1875 { | |
1876 /* byte sequence was successfully decoded */ | |
1877 *s += k; | |
1878 *n -= k; | |
1879 return c; | |
1880 } | |
1881 } | |
1882 | |
1883 /* byte sequence is incomplete or illegal */ | |
1884 return -1; | |
1885 } | |
1886 | |
1887 /* | |
7 | 1888 * Get character at **pp and advance *pp to the next character. |
1889 * Note: composing characters are skipped! | |
1890 */ | |
1891 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1892 mb_ptr2char_adv(char_u **pp) |
7 | 1893 { |
1894 int c; | |
1895 | |
1896 c = (*mb_ptr2char)(*pp); | |
474 | 1897 *pp += (*mb_ptr2len)(*pp); |
1898 return c; | |
1899 } | |
1900 | |
1901 /* | |
1902 * Get character at **pp and advance *pp to the next character. | |
1903 * Note: composing characters are returned as separate characters. | |
1904 */ | |
1905 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1906 mb_cptr2char_adv(char_u **pp) |
474 | 1907 { |
1908 int c; | |
1909 | |
1910 c = (*mb_ptr2char)(*pp); | |
1911 if (enc_utf8) | |
1912 *pp += utf_ptr2len(*pp); | |
1913 else | |
1914 *pp += (*mb_ptr2len)(*pp); | |
7 | 1915 return c; |
1916 } | |
1917 | |
1918 #if defined(FEAT_ARABIC) || defined(PROTO) | |
1919 /* | |
1920 * Check whether we are dealing with Arabic combining characters. | |
1921 * Note: these are NOT really composing characters! | |
1922 */ | |
1923 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1924 arabic_combine( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1925 int one, /* first character */ |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1926 int two) /* character just after "one" */ |
7 | 1927 { |
1928 if (one == a_LAM) | |
1929 return arabic_maycombine(two); | |
1930 return FALSE; | |
1931 } | |
1932 | |
1933 /* | |
1934 * Check whether we are dealing with a character that could be regarded as an | |
1935 * Arabic combining character, need to check the character before this. | |
1936 */ | |
1937 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1938 arabic_maycombine(int two) |
7 | 1939 { |
1940 if (p_arshape && !p_tbidi) | |
1941 return (two == a_ALEF_MADDA | |
1942 || two == a_ALEF_HAMZA_ABOVE | |
1943 || two == a_ALEF_HAMZA_BELOW | |
1944 || two == a_ALEF); | |
1945 return FALSE; | |
1946 } | |
1947 | |
1948 /* | |
1949 * Check if the character pointed to by "p2" is a composing character when it | |
1950 * comes after "p1". For Arabic sometimes "ab" is replaced with "c", which | |
1951 * behaves like a composing character. | |
1952 */ | |
1953 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1954 utf_composinglike(char_u *p1, char_u *p2) |
7 | 1955 { |
1956 int c2; | |
1957 | |
1958 c2 = utf_ptr2char(p2); | |
1959 if (utf_iscomposing(c2)) | |
1960 return TRUE; | |
1961 if (!arabic_maycombine(c2)) | |
1962 return FALSE; | |
1963 return arabic_combine(utf_ptr2char(p1), c2); | |
1964 } | |
1965 #endif | |
1966 | |
1967 /* | |
1205 | 1968 * Convert a UTF-8 byte string to a wide character. Also get up to MAX_MCO |
7 | 1969 * composing characters. |
1970 */ | |
1971 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1972 utfc_ptr2char( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1973 char_u *p, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1974 int *pcc) /* return: composing chars, last one is 0 */ |
7 | 1975 { |
1976 int len; | |
1977 int c; | |
1978 int cc; | |
714 | 1979 int i = 0; |
7 | 1980 |
1981 c = utf_ptr2char(p); | |
474 | 1982 len = utf_ptr2len(p); |
714 | 1983 |
7 | 1984 /* Only accept a composing char when the first char isn't illegal. */ |
1985 if ((len > 1 || *p < 0x80) | |
1986 && p[len] >= 0x80 | |
1987 && UTF_COMPOSINGLIKE(p, p + len)) | |
1988 { | |
714 | 1989 cc = utf_ptr2char(p + len); |
1990 for (;;) | |
1991 { | |
1992 pcc[i++] = cc; | |
1993 if (i == MAX_MCO) | |
1994 break; | |
1995 len += utf_ptr2len(p + len); | |
1996 if (p[len] < 0x80 || !utf_iscomposing(cc = utf_ptr2char(p + len))) | |
1997 break; | |
1998 } | |
7 | 1999 } |
714 | 2000 |
2001 if (i < MAX_MCO) /* last composing char must be 0 */ | |
2002 pcc[i] = 0; | |
2003 | |
7 | 2004 return c; |
2005 } | |
2006 | |
2007 /* | |
1205 | 2008 * Convert a UTF-8 byte string to a wide character. Also get up to MAX_MCO |
7 | 2009 * composing characters. Use no more than p[maxlen]. |
2010 */ | |
2011 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2012 utfc_ptr2char_len( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2013 char_u *p, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2014 int *pcc, /* return: composing chars, last one is 0 */ |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2015 int maxlen) |
7 | 2016 { |
2017 int len; | |
2018 int c; | |
2019 int cc; | |
714 | 2020 int i = 0; |
7 | 2021 |
2022 c = utf_ptr2char(p); | |
474 | 2023 len = utf_ptr2len_len(p, maxlen); |
7 | 2024 /* Only accept a composing char when the first char isn't illegal. */ |
2025 if ((len > 1 || *p < 0x80) | |
2026 && len < maxlen | |
2027 && p[len] >= 0x80 | |
2028 && UTF_COMPOSINGLIKE(p, p + len)) | |
2029 { | |
714 | 2030 cc = utf_ptr2char(p + len); |
2031 for (;;) | |
2032 { | |
2033 pcc[i++] = cc; | |
2034 if (i == MAX_MCO) | |
2035 break; | |
2036 len += utf_ptr2len_len(p + len, maxlen - len); | |
2037 if (len >= maxlen | |
2038 || p[len] < 0x80 | |
2039 || !utf_iscomposing(cc = utf_ptr2char(p + len))) | |
2040 break; | |
2041 } | |
7 | 2042 } |
714 | 2043 |
2044 if (i < MAX_MCO) /* last composing char must be 0 */ | |
2045 pcc[i] = 0; | |
2046 | |
7 | 2047 return c; |
2048 } | |
2049 | |
2050 /* | |
2051 * Convert the character at screen position "off" to a sequence of bytes. | |
2052 * Includes the composing characters. | |
3549 | 2053 * "buf" must at least have the length MB_MAXBYTES + 1. |
2154
7c8c7c95a865
First step in the Vim 7.3 branch. Changed version numbers.
Bram Moolenaar <bram@zimbu.org>
parents:
2063
diff
changeset
|
2054 * Only to be used when ScreenLinesUC[off] != 0. |
7 | 2055 * Returns the produced number of bytes. |
2056 */ | |
2057 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2058 utfc_char2bytes(int off, char_u *buf) |
7 | 2059 { |
2060 int len; | |
714 | 2061 int i; |
7 | 2062 |
2063 len = utf_char2bytes(ScreenLinesUC[off], buf); | |
714 | 2064 for (i = 0; i < Screen_mco; ++i) |
7 | 2065 { |
714 | 2066 if (ScreenLinesC[i][off] == 0) |
2067 break; | |
2068 len += utf_char2bytes(ScreenLinesC[i][off], buf + len); | |
7 | 2069 } |
2070 return len; | |
2071 } | |
2072 | |
2073 /* | |
2074 * Get the length of a UTF-8 byte sequence, not including any following | |
2075 * composing characters. | |
2076 * Returns 0 for "". | |
2077 * Returns 1 for an illegal byte sequence. | |
2078 */ | |
2079 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2080 utf_ptr2len(char_u *p) |
7 | 2081 { |
2082 int len; | |
2083 int i; | |
2084 | |
2085 if (*p == NUL) | |
2086 return 0; | |
2087 len = utf8len_tab[*p]; | |
2088 for (i = 1; i < len; ++i) | |
2089 if ((p[i] & 0xc0) != 0x80) | |
2090 return 1; | |
2091 return len; | |
2092 } | |
2093 | |
2094 /* | |
2095 * Return length of UTF-8 character, obtained from the first byte. | |
2096 * "b" must be between 0 and 255! | |
2015 | 2097 * Returns 1 for an invalid first byte value. |
7 | 2098 */ |
2099 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2100 utf_byte2len(int b) |
7 | 2101 { |
2102 return utf8len_tab[b]; | |
2103 } | |
2104 | |
2105 /* | |
2106 * Get the length of UTF-8 byte sequence "p[size]". Does not include any | |
2107 * following composing characters. | |
2108 * Returns 1 for "". | |
1487 | 2109 * Returns 1 for an illegal byte sequence (also in incomplete byte seq.). |
7 | 2110 * Returns number > "size" for an incomplete byte sequence. |
2015 | 2111 * Never returns zero. |
7 | 2112 */ |
2113 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2114 utf_ptr2len_len(char_u *p, int size) |
7 | 2115 { |
2116 int len; | |
2117 int i; | |
1487 | 2118 int m; |
7 | 2119 |
2015 | 2120 len = utf8len_tab[*p]; |
2121 if (len == 1) | |
2122 return 1; /* NUL, ascii or illegal lead byte */ | |
7 | 2123 if (len > size) |
1487 | 2124 m = size; /* incomplete byte sequence. */ |
2015 | 2125 else |
2126 m = len; | |
1487 | 2127 for (i = 1; i < m; ++i) |
7 | 2128 if ((p[i] & 0xc0) != 0x80) |
2129 return 1; | |
2130 return len; | |
2131 } | |
2132 | |
2133 /* | |
2134 * Return the number of bytes the UTF-8 encoding of the character at "p" takes. | |
2135 * This includes following composing characters. | |
2136 */ | |
2137 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2138 utfc_ptr2len(char_u *p) |
7 | 2139 { |
2140 int len; | |
318 | 2141 int b0 = *p; |
7 | 2142 #ifdef FEAT_ARABIC |
2143 int prevlen; | |
2144 #endif | |
2145 | |
318 | 2146 if (b0 == NUL) |
7 | 2147 return 0; |
318 | 2148 if (b0 < 0x80 && p[1] < 0x80) /* be quick for ASCII */ |
7 | 2149 return 1; |
2150 | |
2151 /* Skip over first UTF-8 char, stopping at a NUL byte. */ | |
474 | 2152 len = utf_ptr2len(p); |
7 | 2153 |
2154 /* Check for illegal byte. */ | |
318 | 2155 if (len == 1 && b0 >= 0x80) |
7 | 2156 return 1; |
2157 | |
2158 /* | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2159 * Check for composing characters. We can handle only the first six, but |
7 | 2160 * skip all of them (otherwise the cursor would get stuck). |
2161 */ | |
2162 #ifdef FEAT_ARABIC | |
2163 prevlen = 0; | |
2164 #endif | |
2165 for (;;) | |
2166 { | |
2167 if (p[len] < 0x80 || !UTF_COMPOSINGLIKE(p + prevlen, p + len)) | |
2168 return len; | |
2169 | |
2170 /* Skip over composing char */ | |
2171 #ifdef FEAT_ARABIC | |
2172 prevlen = len; | |
2173 #endif | |
474 | 2174 len += utf_ptr2len(p + len); |
7 | 2175 } |
2176 } | |
2177 | |
2178 /* | |
2179 * Return the number of bytes the UTF-8 encoding of the character at "p[size]" | |
2180 * takes. This includes following composing characters. | |
1903 | 2181 * Returns 0 for an empty string. |
7 | 2182 * Returns 1 for an illegal char or an incomplete byte sequence. |
2183 */ | |
2184 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2185 utfc_ptr2len_len(char_u *p, int size) |
7 | 2186 { |
2187 int len; | |
2188 #ifdef FEAT_ARABIC | |
2189 int prevlen; | |
2190 #endif | |
2191 | |
1903 | 2192 if (size < 1 || *p == NUL) |
7 | 2193 return 0; |
2194 if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */ | |
2195 return 1; | |
2196 | |
2197 /* Skip over first UTF-8 char, stopping at a NUL byte. */ | |
474 | 2198 len = utf_ptr2len_len(p, size); |
7 | 2199 |
2200 /* Check for illegal byte and incomplete byte sequence. */ | |
2201 if ((len == 1 && p[0] >= 0x80) || len > size) | |
2202 return 1; | |
2203 | |
2204 /* | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2205 * Check for composing characters. We can handle only the first six, but |
7 | 2206 * skip all of them (otherwise the cursor would get stuck). |
2207 */ | |
2208 #ifdef FEAT_ARABIC | |
2209 prevlen = 0; | |
2210 #endif | |
2211 while (len < size) | |
2212 { | |
1658 | 2213 int len_next_char; |
2214 | |
2215 if (p[len] < 0x80) | |
2216 break; | |
2217 | |
2218 /* | |
2219 * Next character length should not go beyond size to ensure that | |
2220 * UTF_COMPOSINGLIKE(...) does not read beyond size. | |
2221 */ | |
2222 len_next_char = utf_ptr2len_len(p + len, size - len); | |
2223 if (len_next_char > size - len) | |
2224 break; | |
2225 | |
2226 if (!UTF_COMPOSINGLIKE(p + prevlen, p + len)) | |
7 | 2227 break; |
2228 | |
2229 /* Skip over composing char */ | |
2230 #ifdef FEAT_ARABIC | |
2231 prevlen = len; | |
2232 #endif | |
1658 | 2233 len += len_next_char; |
7 | 2234 } |
2235 return len; | |
2236 } | |
2237 | |
2238 /* | |
2239 * Return the number of bytes the UTF-8 encoding of character "c" takes. | |
2240 * This does not include composing characters. | |
2241 */ | |
2242 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2243 utf_char2len(int c) |
7 | 2244 { |
2245 if (c < 0x80) | |
2246 return 1; | |
2247 if (c < 0x800) | |
2248 return 2; | |
2249 if (c < 0x10000) | |
2250 return 3; | |
2251 if (c < 0x200000) | |
2252 return 4; | |
2253 if (c < 0x4000000) | |
2254 return 5; | |
2255 return 6; | |
2256 } | |
2257 | |
2258 /* | |
2259 * Convert Unicode character "c" to UTF-8 string in "buf[]". | |
2260 * Returns the number of bytes. | |
2261 */ | |
2262 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2263 utf_char2bytes(int c, char_u *buf) |
7 | 2264 { |
2265 if (c < 0x80) /* 7 bits */ | |
2266 { | |
2267 buf[0] = c; | |
2268 return 1; | |
2269 } | |
2270 if (c < 0x800) /* 11 bits */ | |
2271 { | |
2272 buf[0] = 0xc0 + ((unsigned)c >> 6); | |
2273 buf[1] = 0x80 + (c & 0x3f); | |
2274 return 2; | |
2275 } | |
2276 if (c < 0x10000) /* 16 bits */ | |
2277 { | |
2278 buf[0] = 0xe0 + ((unsigned)c >> 12); | |
2279 buf[1] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
2280 buf[2] = 0x80 + (c & 0x3f); | |
2281 return 3; | |
2282 } | |
2283 if (c < 0x200000) /* 21 bits */ | |
2284 { | |
2285 buf[0] = 0xf0 + ((unsigned)c >> 18); | |
2286 buf[1] = 0x80 + (((unsigned)c >> 12) & 0x3f); | |
2287 buf[2] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
2288 buf[3] = 0x80 + (c & 0x3f); | |
2289 return 4; | |
2290 } | |
2291 if (c < 0x4000000) /* 26 bits */ | |
2292 { | |
2293 buf[0] = 0xf8 + ((unsigned)c >> 24); | |
2294 buf[1] = 0x80 + (((unsigned)c >> 18) & 0x3f); | |
2295 buf[2] = 0x80 + (((unsigned)c >> 12) & 0x3f); | |
2296 buf[3] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
2297 buf[4] = 0x80 + (c & 0x3f); | |
2298 return 5; | |
2299 } | |
2300 /* 31 bits */ | |
2301 buf[0] = 0xfc + ((unsigned)c >> 30); | |
2302 buf[1] = 0x80 + (((unsigned)c >> 24) & 0x3f); | |
2303 buf[2] = 0x80 + (((unsigned)c >> 18) & 0x3f); | |
2304 buf[3] = 0x80 + (((unsigned)c >> 12) & 0x3f); | |
2305 buf[4] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
2306 buf[5] = 0x80 + (c & 0x3f); | |
2307 return 6; | |
2308 } | |
2309 | |
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2310 #if defined(FEAT_TERMINAL) || defined(PROTO) |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2311 /* |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2312 * utf_iscomposing() with different argument type for libvterm. |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2313 */ |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2314 int |
12269
d2373927d76d
patch 8.0.1014: old compiler doesn't know uint32_t
Christian Brabandt <cb@256bit.org>
parents:
12210
diff
changeset
|
2315 utf_iscomposing_uint(UINT32_T c) |
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2316 { |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2317 return utf_iscomposing((int)c); |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2318 } |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2319 #endif |
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2320 |
7 | 2321 /* |
2322 * Return TRUE if "c" is a composing UTF-8 character. This means it will be | |
2323 * drawn on top of the preceding character. | |
2324 * Based on code from Markus Kuhn. | |
2325 */ | |
2326 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2327 utf_iscomposing(int c) |
7 | 2328 { |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2329 /* Sorted list of non-overlapping intervals. |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2330 * Generated by ../runtime/tools/unicode.vim. */ |
7 | 2331 static struct interval combining[] = |
2332 { | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2333 {0x0300, 0x036f}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2334 {0x0483, 0x0489}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2335 {0x0591, 0x05bd}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2336 {0x05bf, 0x05bf}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2337 {0x05c1, 0x05c2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2338 {0x05c4, 0x05c5}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2339 {0x05c7, 0x05c7}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2340 {0x0610, 0x061a}, |
6495 | 2341 {0x064b, 0x065f}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2342 {0x0670, 0x0670}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2343 {0x06d6, 0x06dc}, |
6495 | 2344 {0x06df, 0x06e4}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2345 {0x06e7, 0x06e8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2346 {0x06ea, 0x06ed}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2347 {0x0711, 0x0711}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2348 {0x0730, 0x074a}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2349 {0x07a6, 0x07b0}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2350 {0x07eb, 0x07f3}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2351 {0x07fd, 0x07fd}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2352 {0x0816, 0x0819}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2353 {0x081b, 0x0823}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2354 {0x0825, 0x0827}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2355 {0x0829, 0x082d}, |
6495 | 2356 {0x0859, 0x085b}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2357 {0x08d3, 0x08e1}, |
6864 | 2358 {0x08e3, 0x0903}, |
6495 | 2359 {0x093a, 0x093c}, |
2360 {0x093e, 0x094f}, | |
2361 {0x0951, 0x0957}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2362 {0x0962, 0x0963}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2363 {0x0981, 0x0983}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2364 {0x09bc, 0x09bc}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2365 {0x09be, 0x09c4}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2366 {0x09c7, 0x09c8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2367 {0x09cb, 0x09cd}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2368 {0x09d7, 0x09d7}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2369 {0x09e2, 0x09e3}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2370 {0x09fe, 0x09fe}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2371 {0x0a01, 0x0a03}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2372 {0x0a3c, 0x0a3c}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2373 {0x0a3e, 0x0a42}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2374 {0x0a47, 0x0a48}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2375 {0x0a4b, 0x0a4d}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2376 {0x0a51, 0x0a51}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2377 {0x0a70, 0x0a71}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2378 {0x0a75, 0x0a75}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2379 {0x0a81, 0x0a83}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2380 {0x0abc, 0x0abc}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2381 {0x0abe, 0x0ac5}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2382 {0x0ac7, 0x0ac9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2383 {0x0acb, 0x0acd}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2384 {0x0ae2, 0x0ae3}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2385 {0x0afa, 0x0aff}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2386 {0x0b01, 0x0b03}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2387 {0x0b3c, 0x0b3c}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2388 {0x0b3e, 0x0b44}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2389 {0x0b47, 0x0b48}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2390 {0x0b4b, 0x0b4d}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2391 {0x0b56, 0x0b57}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2392 {0x0b62, 0x0b63}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2393 {0x0b82, 0x0b82}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2394 {0x0bbe, 0x0bc2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2395 {0x0bc6, 0x0bc8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2396 {0x0bca, 0x0bcd}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2397 {0x0bd7, 0x0bd7}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2398 {0x0c00, 0x0c04}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2399 {0x0c3e, 0x0c44}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2400 {0x0c46, 0x0c48}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2401 {0x0c4a, 0x0c4d}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2402 {0x0c55, 0x0c56}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2403 {0x0c62, 0x0c63}, |
6495 | 2404 {0x0c81, 0x0c83}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2405 {0x0cbc, 0x0cbc}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2406 {0x0cbe, 0x0cc4}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2407 {0x0cc6, 0x0cc8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2408 {0x0cca, 0x0ccd}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2409 {0x0cd5, 0x0cd6}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2410 {0x0ce2, 0x0ce3}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2411 {0x0d00, 0x0d03}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2412 {0x0d3b, 0x0d3c}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2413 {0x0d3e, 0x0d44}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2414 {0x0d46, 0x0d48}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2415 {0x0d4a, 0x0d4d}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2416 {0x0d57, 0x0d57}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2417 {0x0d62, 0x0d63}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2418 {0x0d82, 0x0d83}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2419 {0x0dca, 0x0dca}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2420 {0x0dcf, 0x0dd4}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2421 {0x0dd6, 0x0dd6}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2422 {0x0dd8, 0x0ddf}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2423 {0x0df2, 0x0df3}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2424 {0x0e31, 0x0e31}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2425 {0x0e34, 0x0e3a}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2426 {0x0e47, 0x0e4e}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2427 {0x0eb1, 0x0eb1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2428 {0x0eb4, 0x0eb9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2429 {0x0ebb, 0x0ebc}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2430 {0x0ec8, 0x0ecd}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2431 {0x0f18, 0x0f19}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2432 {0x0f35, 0x0f35}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2433 {0x0f37, 0x0f37}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2434 {0x0f39, 0x0f39}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2435 {0x0f3e, 0x0f3f}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2436 {0x0f71, 0x0f84}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2437 {0x0f86, 0x0f87}, |
6495 | 2438 {0x0f8d, 0x0f97}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2439 {0x0f99, 0x0fbc}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2440 {0x0fc6, 0x0fc6}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2441 {0x102b, 0x103e}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2442 {0x1056, 0x1059}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2443 {0x105e, 0x1060}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2444 {0x1062, 0x1064}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2445 {0x1067, 0x106d}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2446 {0x1071, 0x1074}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2447 {0x1082, 0x108d}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2448 {0x108f, 0x108f}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2449 {0x109a, 0x109d}, |
6495 | 2450 {0x135d, 0x135f}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2451 {0x1712, 0x1714}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2452 {0x1732, 0x1734}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2453 {0x1752, 0x1753}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2454 {0x1772, 0x1773}, |
6495 | 2455 {0x17b4, 0x17d3}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2456 {0x17dd, 0x17dd}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2457 {0x180b, 0x180d}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2458 {0x1885, 0x1886}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2459 {0x18a9, 0x18a9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2460 {0x1920, 0x192b}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2461 {0x1930, 0x193b}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2462 {0x1a17, 0x1a1b}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2463 {0x1a55, 0x1a5e}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2464 {0x1a60, 0x1a7c}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2465 {0x1a7f, 0x1a7f}, |
6495 | 2466 {0x1ab0, 0x1abe}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2467 {0x1b00, 0x1b04}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2468 {0x1b34, 0x1b44}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2469 {0x1b6b, 0x1b73}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2470 {0x1b80, 0x1b82}, |
6495 | 2471 {0x1ba1, 0x1bad}, |
2472 {0x1be6, 0x1bf3}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2473 {0x1c24, 0x1c37}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2474 {0x1cd0, 0x1cd2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2475 {0x1cd4, 0x1ce8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2476 {0x1ced, 0x1ced}, |
6495 | 2477 {0x1cf2, 0x1cf4}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2478 {0x1cf7, 0x1cf9}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2479 {0x1dc0, 0x1df9}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2480 {0x1dfb, 0x1dff}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2481 {0x20d0, 0x20f0}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2482 {0x2cef, 0x2cf1}, |
6495 | 2483 {0x2d7f, 0x2d7f}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2484 {0x2de0, 0x2dff}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2485 {0x302a, 0x302f}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2486 {0x3099, 0x309a}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2487 {0xa66f, 0xa672}, |
6495 | 2488 {0xa674, 0xa67d}, |
6864 | 2489 {0xa69e, 0xa69f}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2490 {0xa6f0, 0xa6f1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2491 {0xa802, 0xa802}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2492 {0xa806, 0xa806}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2493 {0xa80b, 0xa80b}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2494 {0xa823, 0xa827}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2495 {0xa880, 0xa881}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2496 {0xa8b4, 0xa8c5}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2497 {0xa8e0, 0xa8f1}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2498 {0xa8ff, 0xa8ff}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2499 {0xa926, 0xa92d}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2500 {0xa947, 0xa953}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2501 {0xa980, 0xa983}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2502 {0xa9b3, 0xa9c0}, |
6495 | 2503 {0xa9e5, 0xa9e5}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2504 {0xaa29, 0xaa36}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2505 {0xaa43, 0xaa43}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2506 {0xaa4c, 0xaa4d}, |
6495 | 2507 {0xaa7b, 0xaa7d}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2508 {0xaab0, 0xaab0}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2509 {0xaab2, 0xaab4}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2510 {0xaab7, 0xaab8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2511 {0xaabe, 0xaabf}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2512 {0xaac1, 0xaac1}, |
6495 | 2513 {0xaaeb, 0xaaef}, |
2514 {0xaaf5, 0xaaf6}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2515 {0xabe3, 0xabea}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2516 {0xabec, 0xabed}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2517 {0xfb1e, 0xfb1e}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2518 {0xfe00, 0xfe0f}, |
6864 | 2519 {0xfe20, 0xfe2f}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2520 {0x101fd, 0x101fd}, |
6495 | 2521 {0x102e0, 0x102e0}, |
2522 {0x10376, 0x1037a}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2523 {0x10a01, 0x10a03}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2524 {0x10a05, 0x10a06}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2525 {0x10a0c, 0x10a0f}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2526 {0x10a38, 0x10a3a}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2527 {0x10a3f, 0x10a3f}, |
6495 | 2528 {0x10ae5, 0x10ae6}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2529 {0x10d24, 0x10d27}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2530 {0x10f46, 0x10f50}, |
6495 | 2531 {0x11000, 0x11002}, |
2532 {0x11038, 0x11046}, | |
2533 {0x1107f, 0x11082}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2534 {0x110b0, 0x110ba}, |
6495 | 2535 {0x11100, 0x11102}, |
2536 {0x11127, 0x11134}, | |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2537 {0x11145, 0x11146}, |
6495 | 2538 {0x11173, 0x11173}, |
2539 {0x11180, 0x11182}, | |
2540 {0x111b3, 0x111c0}, | |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2541 {0x111c9, 0x111cc}, |
6495 | 2542 {0x1122c, 0x11237}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2543 {0x1123e, 0x1123e}, |
6495 | 2544 {0x112df, 0x112ea}, |
6864 | 2545 {0x11300, 0x11303}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2546 {0x1133b, 0x1133c}, |
6495 | 2547 {0x1133e, 0x11344}, |
2548 {0x11347, 0x11348}, | |
2549 {0x1134b, 0x1134d}, | |
2550 {0x11357, 0x11357}, | |
2551 {0x11362, 0x11363}, | |
2552 {0x11366, 0x1136c}, | |
2553 {0x11370, 0x11374}, | |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2554 {0x11435, 0x11446}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2555 {0x1145e, 0x1145e}, |
6495 | 2556 {0x114b0, 0x114c3}, |
2557 {0x115af, 0x115b5}, | |
2558 {0x115b8, 0x115c0}, | |
6864 | 2559 {0x115dc, 0x115dd}, |
6495 | 2560 {0x11630, 0x11640}, |
2561 {0x116ab, 0x116b7}, | |
6864 | 2562 {0x1171d, 0x1172b}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2563 {0x1182c, 0x1183a}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2564 {0x11a01, 0x11a0a}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2565 {0x11a33, 0x11a39}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2566 {0x11a3b, 0x11a3e}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2567 {0x11a47, 0x11a47}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2568 {0x11a51, 0x11a5b}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2569 {0x11a8a, 0x11a99}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2570 {0x11c2f, 0x11c36}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2571 {0x11c38, 0x11c3f}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2572 {0x11c92, 0x11ca7}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2573 {0x11ca9, 0x11cb6}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2574 {0x11d31, 0x11d36}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2575 {0x11d3a, 0x11d3a}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2576 {0x11d3c, 0x11d3d}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2577 {0x11d3f, 0x11d45}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2578 {0x11d47, 0x11d47}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2579 {0x11d8a, 0x11d8e}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2580 {0x11d90, 0x11d91}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2581 {0x11d93, 0x11d97}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2582 {0x11ef3, 0x11ef6}, |
6495 | 2583 {0x16af0, 0x16af4}, |
2584 {0x16b30, 0x16b36}, | |
2585 {0x16f51, 0x16f7e}, | |
2586 {0x16f8f, 0x16f92}, | |
2587 {0x1bc9d, 0x1bc9e}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2588 {0x1d165, 0x1d169}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2589 {0x1d16d, 0x1d172}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2590 {0x1d17b, 0x1d182}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2591 {0x1d185, 0x1d18b}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2592 {0x1d1aa, 0x1d1ad}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2593 {0x1d242, 0x1d244}, |
6864 | 2594 {0x1da00, 0x1da36}, |
2595 {0x1da3b, 0x1da6c}, | |
2596 {0x1da75, 0x1da75}, | |
2597 {0x1da84, 0x1da84}, | |
2598 {0x1da9b, 0x1da9f}, | |
2599 {0x1daa1, 0x1daaf}, | |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2600 {0x1e000, 0x1e006}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2601 {0x1e008, 0x1e018}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2602 {0x1e01b, 0x1e021}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2603 {0x1e023, 0x1e024}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2604 {0x1e026, 0x1e02a}, |
6495 | 2605 {0x1e8d0, 0x1e8d6}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2606 {0x1e944, 0x1e94a}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2607 {0xe0100, 0xe01ef} |
7 | 2608 }; |
2609 | |
2610 return intable(combining, sizeof(combining), c); | |
2611 } | |
2612 | |
2613 /* | |
2614 * Return TRUE for characters that can be displayed in a normal way. | |
2615 * Only for characters of 0x100 and above! | |
2616 */ | |
2617 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2618 utf_printable(int c) |
7 | 2619 { |
2620 #ifdef USE_WCHAR_FUNCTIONS | |
2621 /* | |
2622 * Assume the iswprint() library function works better than our own stuff. | |
2623 */ | |
2624 return iswprint(c); | |
2625 #else | |
2626 /* Sorted list of non-overlapping intervals. | |
2627 * 0xd800-0xdfff is reserved for UTF-16, actually illegal. */ | |
2628 static struct interval nonprint[] = | |
2629 { | |
2630 {0x070f, 0x070f}, {0x180b, 0x180e}, {0x200b, 0x200f}, {0x202a, 0x202e}, | |
2631 {0x206a, 0x206f}, {0xd800, 0xdfff}, {0xfeff, 0xfeff}, {0xfff9, 0xfffb}, | |
2632 {0xfffe, 0xffff} | |
2633 }; | |
2634 | |
2635 return !intable(nonprint, sizeof(nonprint), c); | |
2636 #endif | |
2637 } | |
2638 | |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2639 /* Sorted list of non-overlapping intervals of all Emoji characters, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2640 * based on http://unicode.org/emoji/charts/emoji-list.html */ |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2641 static struct interval emoji_all[] = |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2642 { |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2643 {0x203c, 0x203c}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2644 {0x2049, 0x2049}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2645 {0x2122, 0x2122}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2646 {0x2139, 0x2139}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2647 {0x2194, 0x2199}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2648 {0x21a9, 0x21aa}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2649 {0x231a, 0x231b}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2650 {0x2328, 0x2328}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2651 {0x23cf, 0x23cf}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2652 {0x23e9, 0x23f3}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2653 {0x23f8, 0x23fa}, |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2654 {0x24c2, 0x24c2}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2655 {0x25aa, 0x25ab}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2656 {0x25b6, 0x25b6}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2657 {0x25c0, 0x25c0}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2658 {0x25fb, 0x25fe}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2659 {0x2600, 0x2604}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2660 {0x260e, 0x260e}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2661 {0x2611, 0x2611}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2662 {0x2614, 0x2615}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2663 {0x2618, 0x2618}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2664 {0x261d, 0x261d}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2665 {0x2620, 0x2620}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2666 {0x2622, 0x2623}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2667 {0x2626, 0x2626}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2668 {0x262a, 0x262a}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2669 {0x262e, 0x262f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2670 {0x2638, 0x263a}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2671 {0x2640, 0x2640}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2672 {0x2642, 0x2642}, |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2673 {0x2648, 0x2653}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2674 {0x265f, 0x2660}, |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2675 {0x2663, 0x2663}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2676 {0x2665, 0x2666}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2677 {0x2668, 0x2668}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2678 {0x267b, 0x267b}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2679 {0x267e, 0x267f}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2680 {0x2692, 0x2697}, |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2681 {0x2699, 0x2699}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2682 {0x269b, 0x269c}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2683 {0x26a0, 0x26a1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2684 {0x26aa, 0x26ab}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2685 {0x26b0, 0x26b1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2686 {0x26bd, 0x26be}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2687 {0x26c4, 0x26c5}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2688 {0x26c8, 0x26c8}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2689 {0x26ce, 0x26cf}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2690 {0x26d1, 0x26d1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2691 {0x26d3, 0x26d4}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2692 {0x26e9, 0x26ea}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2693 {0x26f0, 0x26f5}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2694 {0x26f7, 0x26fa}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2695 {0x26fd, 0x26fd}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2696 {0x2702, 0x2702}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2697 {0x2705, 0x2705}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2698 {0x2708, 0x270d}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2699 {0x270f, 0x270f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2700 {0x2712, 0x2712}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2701 {0x2714, 0x2714}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2702 {0x2716, 0x2716}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2703 {0x271d, 0x271d}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2704 {0x2721, 0x2721}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2705 {0x2728, 0x2728}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2706 {0x2733, 0x2734}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2707 {0x2744, 0x2744}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2708 {0x2747, 0x2747}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2709 {0x274c, 0x274c}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2710 {0x274e, 0x274e}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2711 {0x2753, 0x2755}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2712 {0x2757, 0x2757}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2713 {0x2763, 0x2764}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2714 {0x2795, 0x2797}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2715 {0x27a1, 0x27a1}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2716 {0x27b0, 0x27b0}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2717 {0x27bf, 0x27bf}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2718 {0x2934, 0x2935}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2719 {0x2b05, 0x2b07}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2720 {0x2b1b, 0x2b1c}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2721 {0x2b50, 0x2b50}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2722 {0x2b55, 0x2b55}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2723 {0x3030, 0x3030}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2724 {0x303d, 0x303d}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2725 {0x3297, 0x3297}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2726 {0x3299, 0x3299}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2727 {0x1f004, 0x1f004}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2728 {0x1f0cf, 0x1f0cf}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2729 {0x1f170, 0x1f171}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2730 {0x1f17e, 0x1f17f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2731 {0x1f18e, 0x1f18e}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2732 {0x1f191, 0x1f19a}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2733 {0x1f1e6, 0x1f1ff}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2734 {0x1f201, 0x1f202}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2735 {0x1f21a, 0x1f21a}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2736 {0x1f22f, 0x1f22f}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2737 {0x1f232, 0x1f23a}, |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2738 {0x1f250, 0x1f251}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2739 {0x1f300, 0x1f321}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2740 {0x1f324, 0x1f393}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2741 {0x1f396, 0x1f397}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2742 {0x1f399, 0x1f39b}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2743 {0x1f39e, 0x1f3f0}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2744 {0x1f3f3, 0x1f3f5}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2745 {0x1f3f7, 0x1f4fd}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2746 {0x1f4ff, 0x1f53d}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2747 {0x1f549, 0x1f54e}, |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2748 {0x1f550, 0x1f567}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2749 {0x1f56f, 0x1f570}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2750 {0x1f573, 0x1f57a}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2751 {0x1f587, 0x1f587}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2752 {0x1f58a, 0x1f58d}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2753 {0x1f590, 0x1f590}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2754 {0x1f595, 0x1f596}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2755 {0x1f5a4, 0x1f5a5}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2756 {0x1f5a8, 0x1f5a8}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2757 {0x1f5b1, 0x1f5b2}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2758 {0x1f5bc, 0x1f5bc}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2759 {0x1f5c2, 0x1f5c4}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2760 {0x1f5d1, 0x1f5d3}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2761 {0x1f5dc, 0x1f5de}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2762 {0x1f5e1, 0x1f5e1}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2763 {0x1f5e3, 0x1f5e3}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2764 {0x1f5e8, 0x1f5e8}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2765 {0x1f5ef, 0x1f5ef}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2766 {0x1f5f3, 0x1f5f3}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2767 {0x1f5fa, 0x1f64f}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2768 {0x1f680, 0x1f6c5}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2769 {0x1f6cb, 0x1f6d2}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2770 {0x1f6e0, 0x1f6e5}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2771 {0x1f6e9, 0x1f6e9}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2772 {0x1f6eb, 0x1f6ec}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2773 {0x1f6f0, 0x1f6f0}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2774 {0x1f6f3, 0x1f6f9}, |
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2775 {0x1f910, 0x1f93a}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2776 {0x1f93c, 0x1f93e}, |
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2777 {0x1f940, 0x1f945}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2778 {0x1f947, 0x1f970}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2779 {0x1f973, 0x1f976}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2780 {0x1f97a, 0x1f97a}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2781 {0x1f97c, 0x1f9a2}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2782 {0x1f9b0, 0x1f9b9}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2783 {0x1f9c0, 0x1f9c2}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
2784 {0x1f9d0, 0x1f9ff} |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2785 }; |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2786 |
7 | 2787 /* |
2788 * Get class of a Unicode character. | |
2789 * 0: white space | |
2790 * 1: punctuation | |
2791 * 2 or bigger: some class of word character. | |
2792 */ | |
2793 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2794 utf_class(int c) |
7 | 2795 { |
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2796 return utf_class_buf(c, curbuf); |
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2797 } |
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2798 |
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2799 int |
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2800 utf_class_buf(int c, buf_T *buf) |
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2801 { |
7 | 2802 /* sorted list of non-overlapping intervals */ |
2803 static struct clinterval | |
2804 { | |
5477 | 2805 unsigned int first; |
2806 unsigned int last; | |
2807 unsigned int class; | |
7 | 2808 } classes[] = |
2809 { | |
2810 {0x037e, 0x037e, 1}, /* Greek question mark */ | |
2811 {0x0387, 0x0387, 1}, /* Greek ano teleia */ | |
2812 {0x055a, 0x055f, 1}, /* Armenian punctuation */ | |
2813 {0x0589, 0x0589, 1}, /* Armenian full stop */ | |
2814 {0x05be, 0x05be, 1}, | |
2815 {0x05c0, 0x05c0, 1}, | |
2816 {0x05c3, 0x05c3, 1}, | |
2817 {0x05f3, 0x05f4, 1}, | |
2818 {0x060c, 0x060c, 1}, | |
2819 {0x061b, 0x061b, 1}, | |
2820 {0x061f, 0x061f, 1}, | |
2821 {0x066a, 0x066d, 1}, | |
2822 {0x06d4, 0x06d4, 1}, | |
2823 {0x0700, 0x070d, 1}, /* Syriac punctuation */ | |
2824 {0x0964, 0x0965, 1}, | |
2825 {0x0970, 0x0970, 1}, | |
2826 {0x0df4, 0x0df4, 1}, | |
2827 {0x0e4f, 0x0e4f, 1}, | |
2828 {0x0e5a, 0x0e5b, 1}, | |
2829 {0x0f04, 0x0f12, 1}, | |
2830 {0x0f3a, 0x0f3d, 1}, | |
2831 {0x0f85, 0x0f85, 1}, | |
2832 {0x104a, 0x104f, 1}, /* Myanmar punctuation */ | |
2833 {0x10fb, 0x10fb, 1}, /* Georgian punctuation */ | |
2834 {0x1361, 0x1368, 1}, /* Ethiopic punctuation */ | |
2835 {0x166d, 0x166e, 1}, /* Canadian Syl. punctuation */ | |
2836 {0x1680, 0x1680, 0}, | |
2837 {0x169b, 0x169c, 1}, | |
2838 {0x16eb, 0x16ed, 1}, | |
2839 {0x1735, 0x1736, 1}, | |
2840 {0x17d4, 0x17dc, 1}, /* Khmer punctuation */ | |
2841 {0x1800, 0x180a, 1}, /* Mongolian punctuation */ | |
2842 {0x2000, 0x200b, 0}, /* spaces */ | |
2843 {0x200c, 0x2027, 1}, /* punctuation and symbols */ | |
2844 {0x2028, 0x2029, 0}, | |
2845 {0x202a, 0x202e, 1}, /* punctuation and symbols */ | |
2846 {0x202f, 0x202f, 0}, | |
2847 {0x2030, 0x205e, 1}, /* punctuation and symbols */ | |
2848 {0x205f, 0x205f, 0}, | |
2849 {0x2060, 0x27ff, 1}, /* punctuation and symbols */ | |
2850 {0x2070, 0x207f, 0x2070}, /* superscript */ | |
1593 | 2851 {0x2080, 0x2094, 0x2080}, /* subscript */ |
2852 {0x20a0, 0x27ff, 1}, /* all kinds of symbols */ | |
2853 {0x2800, 0x28ff, 0x2800}, /* braille */ | |
2854 {0x2900, 0x2998, 1}, /* arrows, brackets, etc. */ | |
7 | 2855 {0x29d8, 0x29db, 1}, |
2856 {0x29fc, 0x29fd, 1}, | |
6218 | 2857 {0x2e00, 0x2e7f, 1}, /* supplemental punctuation */ |
7 | 2858 {0x3000, 0x3000, 0}, /* ideographic space */ |
2859 {0x3001, 0x3020, 1}, /* ideographic punctuation */ | |
2860 {0x3030, 0x3030, 1}, | |
2861 {0x303d, 0x303d, 1}, | |
2862 {0x3040, 0x309f, 0x3040}, /* Hiragana */ | |
2863 {0x30a0, 0x30ff, 0x30a0}, /* Katakana */ | |
2864 {0x3300, 0x9fff, 0x4e00}, /* CJK Ideographs */ | |
2865 {0xac00, 0xd7a3, 0xac00}, /* Hangul Syllables */ | |
2866 {0xf900, 0xfaff, 0x4e00}, /* CJK Ideographs */ | |
2867 {0xfd3e, 0xfd3f, 1}, | |
2868 {0xfe30, 0xfe6b, 1}, /* punctuation forms */ | |
2869 {0xff00, 0xff0f, 1}, /* half/fullwidth ASCII */ | |
2870 {0xff1a, 0xff20, 1}, /* half/fullwidth ASCII */ | |
2871 {0xff3b, 0xff40, 1}, /* half/fullwidth ASCII */ | |
2872 {0xff5b, 0xff65, 1}, /* half/fullwidth ASCII */ | |
5477 | 2873 {0x20000, 0x2a6df, 0x4e00}, /* CJK Ideographs */ |
2874 {0x2a700, 0x2b73f, 0x4e00}, /* CJK Ideographs */ | |
2875 {0x2b740, 0x2b81f, 0x4e00}, /* CJK Ideographs */ | |
2876 {0x2f800, 0x2fa1f, 0x4e00}, /* CJK Ideographs */ | |
7 | 2877 }; |
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
2878 |
7 | 2879 int bot = 0; |
2880 int top = sizeof(classes) / sizeof(struct clinterval) - 1; | |
2881 int mid; | |
2882 | |
2883 /* First quick check for Latin1 characters, use 'iskeyword'. */ | |
2884 if (c < 0x100) | |
2885 { | |
335 | 2886 if (c == ' ' || c == '\t' || c == NUL || c == 0xa0) |
7 | 2887 return 0; /* blank */ |
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2888 if (vim_iswordc_buf(c, buf)) |
7 | 2889 return 2; /* word character */ |
2890 return 1; /* punctuation */ | |
2891 } | |
2892 | |
2893 /* binary search in table */ | |
2894 while (top >= bot) | |
2895 { | |
2896 mid = (bot + top) / 2; | |
5477 | 2897 if (classes[mid].last < (unsigned int)c) |
7 | 2898 bot = mid + 1; |
5477 | 2899 else if (classes[mid].first > (unsigned int)c) |
7 | 2900 top = mid - 1; |
2901 else | |
2902 return (int)classes[mid].class; | |
2903 } | |
2904 | |
8661
a931160ffc41
commit https://github.com/vim/vim/commit/4077b33a8370afb3d5ae74e556a0119cf51fe294
Christian Brabandt <cb@256bit.org>
parents:
8629
diff
changeset
|
2905 /* emoji */ |
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
2906 if (intable(emoji_all, sizeof(emoji_all), c)) |
8661
a931160ffc41
commit https://github.com/vim/vim/commit/4077b33a8370afb3d5ae74e556a0119cf51fe294
Christian Brabandt <cb@256bit.org>
parents:
8629
diff
changeset
|
2907 return 3; |
a931160ffc41
commit https://github.com/vim/vim/commit/4077b33a8370afb3d5ae74e556a0119cf51fe294
Christian Brabandt <cb@256bit.org>
parents:
8629
diff
changeset
|
2908 |
7 | 2909 /* most other characters are "word" characters */ |
2910 return 2; | |
2911 } | |
2912 | |
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2913 int |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2914 utf_ambiguous_width(int c) |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2915 { |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2916 return c >= 0x80 && (intable(ambiguous, sizeof(ambiguous), c) |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2917 || intable(emoji_all, sizeof(emoji_all), c)); |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2918 } |
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2919 |
7 | 2920 /* |
2921 * Code for Unicode case-dependent operations. Based on notes in | |
2922 * http://www.unicode.org/Public/UNIDATA/CaseFolding.txt | |
2923 * This code uses simple case folding, not full case folding. | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2924 * Last updated for Unicode 5.2. |
7 | 2925 */ |
2926 | |
2927 /* | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2928 * The following tables are built by ../runtime/tools/unicode.vim. |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2929 * They must be in numeric order, because we use binary search. |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2930 * An entry such as {0x41,0x5a,1,32} means that Unicode characters in the |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2931 * range from 0x41 to 0x5a inclusive, stepping by 1, are changed to |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2932 * folded/upper/lower by adding 32. |
7 | 2933 */ |
2934 typedef struct | |
2935 { | |
2936 int rangeStart; | |
2937 int rangeEnd; | |
2938 int step; | |
2939 int offset; | |
2940 } convertStruct; | |
2941 | |
297 | 2942 static convertStruct foldCase[] = |
7 | 2943 { |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2944 {0x41,0x5a,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2945 {0xb5,0xb5,-1,775}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2946 {0xc0,0xd6,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2947 {0xd8,0xde,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2948 {0x100,0x12e,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2949 {0x132,0x136,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2950 {0x139,0x147,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2951 {0x14a,0x176,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2952 {0x178,0x178,-1,-121}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2953 {0x179,0x17d,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2954 {0x17f,0x17f,-1,-268}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2955 {0x181,0x181,-1,210}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2956 {0x182,0x184,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2957 {0x186,0x186,-1,206}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2958 {0x187,0x187,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2959 {0x189,0x18a,1,205}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2960 {0x18b,0x18b,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2961 {0x18e,0x18e,-1,79}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2962 {0x18f,0x18f,-1,202}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2963 {0x190,0x190,-1,203}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2964 {0x191,0x191,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2965 {0x193,0x193,-1,205}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2966 {0x194,0x194,-1,207}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2967 {0x196,0x196,-1,211}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2968 {0x197,0x197,-1,209}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2969 {0x198,0x198,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2970 {0x19c,0x19c,-1,211}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2971 {0x19d,0x19d,-1,213}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2972 {0x19f,0x19f,-1,214}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2973 {0x1a0,0x1a4,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2974 {0x1a6,0x1a6,-1,218}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2975 {0x1a7,0x1a7,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2976 {0x1a9,0x1a9,-1,218}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2977 {0x1ac,0x1ac,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2978 {0x1ae,0x1ae,-1,218}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2979 {0x1af,0x1af,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2980 {0x1b1,0x1b2,1,217}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2981 {0x1b3,0x1b5,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2982 {0x1b7,0x1b7,-1,219}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2983 {0x1b8,0x1bc,4,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2984 {0x1c4,0x1c4,-1,2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2985 {0x1c5,0x1c5,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2986 {0x1c7,0x1c7,-1,2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2987 {0x1c8,0x1c8,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2988 {0x1ca,0x1ca,-1,2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2989 {0x1cb,0x1db,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2990 {0x1de,0x1ee,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2991 {0x1f1,0x1f1,-1,2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2992 {0x1f2,0x1f4,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2993 {0x1f6,0x1f6,-1,-97}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2994 {0x1f7,0x1f7,-1,-56}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2995 {0x1f8,0x21e,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2996 {0x220,0x220,-1,-130}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2997 {0x222,0x232,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2998 {0x23a,0x23a,-1,10795}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2999 {0x23b,0x23b,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3000 {0x23d,0x23d,-1,-163}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3001 {0x23e,0x23e,-1,10792}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3002 {0x241,0x241,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3003 {0x243,0x243,-1,-195}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3004 {0x244,0x244,-1,69}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3005 {0x245,0x245,-1,71}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3006 {0x246,0x24e,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3007 {0x345,0x345,-1,116}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3008 {0x370,0x372,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3009 {0x376,0x376,-1,1}, |
6495 | 3010 {0x37f,0x37f,-1,116}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3011 {0x386,0x386,-1,38}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3012 {0x388,0x38a,1,37}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3013 {0x38c,0x38c,-1,64}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3014 {0x38e,0x38f,1,63}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3015 {0x391,0x3a1,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3016 {0x3a3,0x3ab,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3017 {0x3c2,0x3c2,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3018 {0x3cf,0x3cf,-1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3019 {0x3d0,0x3d0,-1,-30}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3020 {0x3d1,0x3d1,-1,-25}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3021 {0x3d5,0x3d5,-1,-15}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3022 {0x3d6,0x3d6,-1,-22}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3023 {0x3d8,0x3ee,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3024 {0x3f0,0x3f0,-1,-54}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3025 {0x3f1,0x3f1,-1,-48}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3026 {0x3f4,0x3f4,-1,-60}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3027 {0x3f5,0x3f5,-1,-64}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3028 {0x3f7,0x3f7,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3029 {0x3f9,0x3f9,-1,-7}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3030 {0x3fa,0x3fa,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3031 {0x3fd,0x3ff,1,-130}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3032 {0x400,0x40f,1,80}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3033 {0x410,0x42f,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3034 {0x460,0x480,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3035 {0x48a,0x4be,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3036 {0x4c0,0x4c0,-1,15}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3037 {0x4c1,0x4cd,2,1}, |
6495 | 3038 {0x4d0,0x52e,2,1}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3039 {0x531,0x556,1,48}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3040 {0x10a0,0x10c5,1,7264}, |
6495 | 3041 {0x10c7,0x10cd,6,7264}, |
6864 | 3042 {0x13f8,0x13fd,1,-8}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3043 {0x1c80,0x1c80,-1,-6222}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3044 {0x1c81,0x1c81,-1,-6221}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3045 {0x1c82,0x1c82,-1,-6212}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3046 {0x1c83,0x1c84,1,-6210}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3047 {0x1c85,0x1c85,-1,-6211}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3048 {0x1c86,0x1c86,-1,-6204}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3049 {0x1c87,0x1c87,-1,-6180}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3050 {0x1c88,0x1c88,-1,35267}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3051 {0x1c90,0x1cba,1,-3008}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3052 {0x1cbd,0x1cbf,1,-3008}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3053 {0x1e00,0x1e94,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3054 {0x1e9b,0x1e9b,-1,-58}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3055 {0x1e9e,0x1e9e,-1,-7615}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3056 {0x1ea0,0x1efe,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3057 {0x1f08,0x1f0f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3058 {0x1f18,0x1f1d,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3059 {0x1f28,0x1f2f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3060 {0x1f38,0x1f3f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3061 {0x1f48,0x1f4d,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3062 {0x1f59,0x1f5f,2,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3063 {0x1f68,0x1f6f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3064 {0x1f88,0x1f8f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3065 {0x1f98,0x1f9f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3066 {0x1fa8,0x1faf,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3067 {0x1fb8,0x1fb9,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3068 {0x1fba,0x1fbb,1,-74}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3069 {0x1fbc,0x1fbc,-1,-9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3070 {0x1fbe,0x1fbe,-1,-7173}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3071 {0x1fc8,0x1fcb,1,-86}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3072 {0x1fcc,0x1fcc,-1,-9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3073 {0x1fd8,0x1fd9,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3074 {0x1fda,0x1fdb,1,-100}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3075 {0x1fe8,0x1fe9,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3076 {0x1fea,0x1feb,1,-112}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3077 {0x1fec,0x1fec,-1,-7}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3078 {0x1ff8,0x1ff9,1,-128}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3079 {0x1ffa,0x1ffb,1,-126}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3080 {0x1ffc,0x1ffc,-1,-9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3081 {0x2126,0x2126,-1,-7517}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3082 {0x212a,0x212a,-1,-8383}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3083 {0x212b,0x212b,-1,-8262}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3084 {0x2132,0x2132,-1,28}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3085 {0x2160,0x216f,1,16}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3086 {0x2183,0x2183,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3087 {0x24b6,0x24cf,1,26}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3088 {0x2c00,0x2c2e,1,48}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3089 {0x2c60,0x2c60,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3090 {0x2c62,0x2c62,-1,-10743}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3091 {0x2c63,0x2c63,-1,-3814}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3092 {0x2c64,0x2c64,-1,-10727}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3093 {0x2c67,0x2c6b,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3094 {0x2c6d,0x2c6d,-1,-10780}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3095 {0x2c6e,0x2c6e,-1,-10749}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3096 {0x2c6f,0x2c6f,-1,-10783}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3097 {0x2c70,0x2c70,-1,-10782}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3098 {0x2c72,0x2c75,3,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3099 {0x2c7e,0x2c7f,1,-10815}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3100 {0x2c80,0x2ce2,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3101 {0x2ceb,0x2ced,2,1}, |
6495 | 3102 {0x2cf2,0xa640,31054,1}, |
3103 {0xa642,0xa66c,2,1}, | |
3104 {0xa680,0xa69a,2,1}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3105 {0xa722,0xa72e,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3106 {0xa732,0xa76e,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3107 {0xa779,0xa77b,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3108 {0xa77d,0xa77d,-1,-35332}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3109 {0xa77e,0xa786,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3110 {0xa78b,0xa78b,-1,1}, |
6495 | 3111 {0xa78d,0xa78d,-1,-42280}, |
3112 {0xa790,0xa792,2,1}, | |
3113 {0xa796,0xa7a8,2,1}, | |
3114 {0xa7aa,0xa7aa,-1,-42308}, | |
3115 {0xa7ab,0xa7ab,-1,-42319}, | |
3116 {0xa7ac,0xa7ac,-1,-42315}, | |
3117 {0xa7ad,0xa7ad,-1,-42305}, | |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3118 {0xa7ae,0xa7ae,-1,-42308}, |
6495 | 3119 {0xa7b0,0xa7b0,-1,-42258}, |
3120 {0xa7b1,0xa7b1,-1,-42282}, | |
6864 | 3121 {0xa7b2,0xa7b2,-1,-42261}, |
3122 {0xa7b3,0xa7b3,-1,928}, | |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3123 {0xa7b4,0xa7b8,2,1}, |
6864 | 3124 {0xab70,0xabbf,1,-38864}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3125 {0xff21,0xff3a,1,32}, |
6495 | 3126 {0x10400,0x10427,1,40}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3127 {0x104b0,0x104d3,1,40}, |
6864 | 3128 {0x10c80,0x10cb2,1,64}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3129 {0x118a0,0x118bf,1,32}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3130 {0x16e40,0x16e5f,1,32}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3131 {0x1e900,0x1e921,1,34} |
7 | 3132 }; |
3133 | |
3134 /* | |
3135 * Generic conversion function for case operations. | |
3136 * Return the converted equivalent of "a", which is a UCS-4 character. Use | |
3137 * the given conversion "table". Uses binary search on "table". | |
3138 */ | |
3139 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3140 utf_convert( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3141 int a, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3142 convertStruct table[], |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3143 int tableSize) |
7 | 3144 { |
3145 int start, mid, end; /* indices into table */ | |
3190 | 3146 int entries = tableSize / sizeof(convertStruct); |
7 | 3147 |
3148 start = 0; | |
3190 | 3149 end = entries; |
7 | 3150 while (start < end) |
3151 { | |
3152 /* need to search further */ | |
3190 | 3153 mid = (end + start) / 2; |
7 | 3154 if (table[mid].rangeEnd < a) |
3155 start = mid + 1; | |
3156 else | |
3157 end = mid; | |
3158 } | |
3190 | 3159 if (start < entries |
3160 && table[start].rangeStart <= a | |
3161 && a <= table[start].rangeEnd | |
7 | 3162 && (a - table[start].rangeStart) % table[start].step == 0) |
3163 return (a + table[start].offset); | |
3164 else | |
3165 return a; | |
3166 } | |
3167 | |
3168 /* | |
3169 * Return the folded-case equivalent of "a", which is a UCS-4 character. Uses | |
3170 * simple case folding. | |
3171 */ | |
3172 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3173 utf_fold(int a) |
7 | 3174 { |
9477
045543df0c28
commit https://github.com/vim/vim/commit/c4a927ca8dc383190d5df2cacd3f966698b6190c
Christian Brabandt <cb@256bit.org>
parents:
9357
diff
changeset
|
3175 if (a < 0x80) |
045543df0c28
commit https://github.com/vim/vim/commit/c4a927ca8dc383190d5df2cacd3f966698b6190c
Christian Brabandt <cb@256bit.org>
parents:
9357
diff
changeset
|
3176 /* be fast for ASCII */ |
045543df0c28
commit https://github.com/vim/vim/commit/c4a927ca8dc383190d5df2cacd3f966698b6190c
Christian Brabandt <cb@256bit.org>
parents:
9357
diff
changeset
|
3177 return a >= 0x41 && a <= 0x5a ? a + 32 : a; |
3190 | 3178 return utf_convert(a, foldCase, (int)sizeof(foldCase)); |
7 | 3179 } |
3180 | |
297 | 3181 static convertStruct toLower[] = |
7 | 3182 { |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3183 {0x41,0x5a,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3184 {0xc0,0xd6,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3185 {0xd8,0xde,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3186 {0x100,0x12e,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3187 {0x130,0x130,-1,-199}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3188 {0x132,0x136,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3189 {0x139,0x147,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3190 {0x14a,0x176,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3191 {0x178,0x178,-1,-121}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3192 {0x179,0x17d,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3193 {0x181,0x181,-1,210}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3194 {0x182,0x184,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3195 {0x186,0x186,-1,206}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3196 {0x187,0x187,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3197 {0x189,0x18a,1,205}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3198 {0x18b,0x18b,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3199 {0x18e,0x18e,-1,79}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3200 {0x18f,0x18f,-1,202}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3201 {0x190,0x190,-1,203}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3202 {0x191,0x191,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3203 {0x193,0x193,-1,205}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3204 {0x194,0x194,-1,207}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3205 {0x196,0x196,-1,211}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3206 {0x197,0x197,-1,209}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3207 {0x198,0x198,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3208 {0x19c,0x19c,-1,211}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3209 {0x19d,0x19d,-1,213}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3210 {0x19f,0x19f,-1,214}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3211 {0x1a0,0x1a4,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3212 {0x1a6,0x1a6,-1,218}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3213 {0x1a7,0x1a7,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3214 {0x1a9,0x1a9,-1,218}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3215 {0x1ac,0x1ac,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3216 {0x1ae,0x1ae,-1,218}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3217 {0x1af,0x1af,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3218 {0x1b1,0x1b2,1,217}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3219 {0x1b3,0x1b5,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3220 {0x1b7,0x1b7,-1,219}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3221 {0x1b8,0x1bc,4,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3222 {0x1c4,0x1c4,-1,2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3223 {0x1c5,0x1c5,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3224 {0x1c7,0x1c7,-1,2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3225 {0x1c8,0x1c8,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3226 {0x1ca,0x1ca,-1,2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3227 {0x1cb,0x1db,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3228 {0x1de,0x1ee,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3229 {0x1f1,0x1f1,-1,2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3230 {0x1f2,0x1f4,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3231 {0x1f6,0x1f6,-1,-97}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3232 {0x1f7,0x1f7,-1,-56}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3233 {0x1f8,0x21e,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3234 {0x220,0x220,-1,-130}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3235 {0x222,0x232,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3236 {0x23a,0x23a,-1,10795}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3237 {0x23b,0x23b,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3238 {0x23d,0x23d,-1,-163}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3239 {0x23e,0x23e,-1,10792}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3240 {0x241,0x241,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3241 {0x243,0x243,-1,-195}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3242 {0x244,0x244,-1,69}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3243 {0x245,0x245,-1,71}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3244 {0x246,0x24e,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3245 {0x370,0x372,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3246 {0x376,0x376,-1,1}, |
6495 | 3247 {0x37f,0x37f,-1,116}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3248 {0x386,0x386,-1,38}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3249 {0x388,0x38a,1,37}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3250 {0x38c,0x38c,-1,64}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3251 {0x38e,0x38f,1,63}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3252 {0x391,0x3a1,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3253 {0x3a3,0x3ab,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3254 {0x3cf,0x3cf,-1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3255 {0x3d8,0x3ee,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3256 {0x3f4,0x3f4,-1,-60}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3257 {0x3f7,0x3f7,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3258 {0x3f9,0x3f9,-1,-7}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3259 {0x3fa,0x3fa,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3260 {0x3fd,0x3ff,1,-130}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3261 {0x400,0x40f,1,80}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3262 {0x410,0x42f,1,32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3263 {0x460,0x480,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3264 {0x48a,0x4be,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3265 {0x4c0,0x4c0,-1,15}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3266 {0x4c1,0x4cd,2,1}, |
6495 | 3267 {0x4d0,0x52e,2,1}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3268 {0x531,0x556,1,48}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3269 {0x10a0,0x10c5,1,7264}, |
6495 | 3270 {0x10c7,0x10cd,6,7264}, |
6864 | 3271 {0x13a0,0x13ef,1,38864}, |
3272 {0x13f0,0x13f5,1,8}, | |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3273 {0x1c90,0x1cba,1,-3008}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3274 {0x1cbd,0x1cbf,1,-3008}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3275 {0x1e00,0x1e94,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3276 {0x1e9e,0x1e9e,-1,-7615}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3277 {0x1ea0,0x1efe,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3278 {0x1f08,0x1f0f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3279 {0x1f18,0x1f1d,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3280 {0x1f28,0x1f2f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3281 {0x1f38,0x1f3f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3282 {0x1f48,0x1f4d,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3283 {0x1f59,0x1f5f,2,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3284 {0x1f68,0x1f6f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3285 {0x1f88,0x1f8f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3286 {0x1f98,0x1f9f,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3287 {0x1fa8,0x1faf,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3288 {0x1fb8,0x1fb9,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3289 {0x1fba,0x1fbb,1,-74}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3290 {0x1fbc,0x1fbc,-1,-9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3291 {0x1fc8,0x1fcb,1,-86}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3292 {0x1fcc,0x1fcc,-1,-9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3293 {0x1fd8,0x1fd9,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3294 {0x1fda,0x1fdb,1,-100}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3295 {0x1fe8,0x1fe9,1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3296 {0x1fea,0x1feb,1,-112}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3297 {0x1fec,0x1fec,-1,-7}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3298 {0x1ff8,0x1ff9,1,-128}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3299 {0x1ffa,0x1ffb,1,-126}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3300 {0x1ffc,0x1ffc,-1,-9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3301 {0x2126,0x2126,-1,-7517}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3302 {0x212a,0x212a,-1,-8383}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3303 {0x212b,0x212b,-1,-8262}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3304 {0x2132,0x2132,-1,28}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3305 {0x2160,0x216f,1,16}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3306 {0x2183,0x2183,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3307 {0x24b6,0x24cf,1,26}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3308 {0x2c00,0x2c2e,1,48}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3309 {0x2c60,0x2c60,-1,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3310 {0x2c62,0x2c62,-1,-10743}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3311 {0x2c63,0x2c63,-1,-3814}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3312 {0x2c64,0x2c64,-1,-10727}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3313 {0x2c67,0x2c6b,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3314 {0x2c6d,0x2c6d,-1,-10780}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3315 {0x2c6e,0x2c6e,-1,-10749}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3316 {0x2c6f,0x2c6f,-1,-10783}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3317 {0x2c70,0x2c70,-1,-10782}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3318 {0x2c72,0x2c75,3,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3319 {0x2c7e,0x2c7f,1,-10815}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3320 {0x2c80,0x2ce2,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3321 {0x2ceb,0x2ced,2,1}, |
6495 | 3322 {0x2cf2,0xa640,31054,1}, |
3323 {0xa642,0xa66c,2,1}, | |
3324 {0xa680,0xa69a,2,1}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3325 {0xa722,0xa72e,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3326 {0xa732,0xa76e,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3327 {0xa779,0xa77b,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3328 {0xa77d,0xa77d,-1,-35332}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3329 {0xa77e,0xa786,2,1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3330 {0xa78b,0xa78b,-1,1}, |
6495 | 3331 {0xa78d,0xa78d,-1,-42280}, |
3332 {0xa790,0xa792,2,1}, | |
3333 {0xa796,0xa7a8,2,1}, | |
3334 {0xa7aa,0xa7aa,-1,-42308}, | |
3335 {0xa7ab,0xa7ab,-1,-42319}, | |
3336 {0xa7ac,0xa7ac,-1,-42315}, | |
3337 {0xa7ad,0xa7ad,-1,-42305}, | |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3338 {0xa7ae,0xa7ae,-1,-42308}, |
6495 | 3339 {0xa7b0,0xa7b0,-1,-42258}, |
3340 {0xa7b1,0xa7b1,-1,-42282}, | |
6864 | 3341 {0xa7b2,0xa7b2,-1,-42261}, |
3342 {0xa7b3,0xa7b3,-1,928}, | |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3343 {0xa7b4,0xa7b8,2,1}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3344 {0xff21,0xff3a,1,32}, |
6495 | 3345 {0x10400,0x10427,1,40}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3346 {0x104b0,0x104d3,1,40}, |
6864 | 3347 {0x10c80,0x10cb2,1,64}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3348 {0x118a0,0x118bf,1,32}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3349 {0x16e40,0x16e5f,1,32}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3350 {0x1e900,0x1e921,1,34} |
7 | 3351 }; |
3352 | |
297 | 3353 static convertStruct toUpper[] = |
7 | 3354 { |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3355 {0x61,0x7a,1,-32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3356 {0xb5,0xb5,-1,743}, |
6495 | 3357 {0xe0,0xf6,1,-32}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3358 {0xf8,0xfe,1,-32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3359 {0xff,0xff,-1,121}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3360 {0x101,0x12f,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3361 {0x131,0x131,-1,-232}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3362 {0x133,0x137,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3363 {0x13a,0x148,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3364 {0x14b,0x177,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3365 {0x17a,0x17e,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3366 {0x17f,0x17f,-1,-300}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3367 {0x180,0x180,-1,195}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3368 {0x183,0x185,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3369 {0x188,0x18c,4,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3370 {0x192,0x192,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3371 {0x195,0x195,-1,97}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3372 {0x199,0x199,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3373 {0x19a,0x19a,-1,163}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3374 {0x19e,0x19e,-1,130}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3375 {0x1a1,0x1a5,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3376 {0x1a8,0x1ad,5,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3377 {0x1b0,0x1b4,4,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3378 {0x1b6,0x1b9,3,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3379 {0x1bd,0x1bd,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3380 {0x1bf,0x1bf,-1,56}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3381 {0x1c5,0x1c5,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3382 {0x1c6,0x1c6,-1,-2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3383 {0x1c8,0x1c8,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3384 {0x1c9,0x1c9,-1,-2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3385 {0x1cb,0x1cb,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3386 {0x1cc,0x1cc,-1,-2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3387 {0x1ce,0x1dc,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3388 {0x1dd,0x1dd,-1,-79}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3389 {0x1df,0x1ef,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3390 {0x1f2,0x1f2,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3391 {0x1f3,0x1f3,-1,-2}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3392 {0x1f5,0x1f9,4,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3393 {0x1fb,0x21f,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3394 {0x223,0x233,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3395 {0x23c,0x23c,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3396 {0x23f,0x240,1,10815}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3397 {0x242,0x247,5,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3398 {0x249,0x24f,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3399 {0x250,0x250,-1,10783}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3400 {0x251,0x251,-1,10780}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3401 {0x252,0x252,-1,10782}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3402 {0x253,0x253,-1,-210}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3403 {0x254,0x254,-1,-206}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3404 {0x256,0x257,1,-205}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3405 {0x259,0x259,-1,-202}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3406 {0x25b,0x25b,-1,-203}, |
6495 | 3407 {0x25c,0x25c,-1,42319}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3408 {0x260,0x260,-1,-205}, |
6495 | 3409 {0x261,0x261,-1,42315}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3410 {0x263,0x263,-1,-207}, |
6495 | 3411 {0x265,0x265,-1,42280}, |
3412 {0x266,0x266,-1,42308}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3413 {0x268,0x268,-1,-209}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3414 {0x269,0x269,-1,-211}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3415 {0x26a,0x26a,-1,42308}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3416 {0x26b,0x26b,-1,10743}, |
6495 | 3417 {0x26c,0x26c,-1,42305}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3418 {0x26f,0x26f,-1,-211}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3419 {0x271,0x271,-1,10749}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3420 {0x272,0x272,-1,-213}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3421 {0x275,0x275,-1,-214}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3422 {0x27d,0x27d,-1,10727}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3423 {0x280,0x283,3,-218}, |
6495 | 3424 {0x287,0x287,-1,42282}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3425 {0x288,0x288,-1,-218}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3426 {0x289,0x289,-1,-69}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3427 {0x28a,0x28b,1,-217}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3428 {0x28c,0x28c,-1,-71}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3429 {0x292,0x292,-1,-219}, |
6864 | 3430 {0x29d,0x29d,-1,42261}, |
6495 | 3431 {0x29e,0x29e,-1,42258}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3432 {0x345,0x345,-1,84}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3433 {0x371,0x373,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3434 {0x377,0x377,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3435 {0x37b,0x37d,1,130}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3436 {0x3ac,0x3ac,-1,-38}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3437 {0x3ad,0x3af,1,-37}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3438 {0x3b1,0x3c1,1,-32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3439 {0x3c2,0x3c2,-1,-31}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3440 {0x3c3,0x3cb,1,-32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3441 {0x3cc,0x3cc,-1,-64}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3442 {0x3cd,0x3ce,1,-63}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3443 {0x3d0,0x3d0,-1,-62}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3444 {0x3d1,0x3d1,-1,-57}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3445 {0x3d5,0x3d5,-1,-47}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3446 {0x3d6,0x3d6,-1,-54}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3447 {0x3d7,0x3d7,-1,-8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3448 {0x3d9,0x3ef,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3449 {0x3f0,0x3f0,-1,-86}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3450 {0x3f1,0x3f1,-1,-80}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3451 {0x3f2,0x3f2,-1,7}, |
6495 | 3452 {0x3f3,0x3f3,-1,-116}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3453 {0x3f5,0x3f5,-1,-96}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3454 {0x3f8,0x3fb,3,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3455 {0x430,0x44f,1,-32}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3456 {0x450,0x45f,1,-80}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3457 {0x461,0x481,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3458 {0x48b,0x4bf,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3459 {0x4c2,0x4ce,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3460 {0x4cf,0x4cf,-1,-15}, |
6495 | 3461 {0x4d1,0x52f,2,-1}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3462 {0x561,0x586,1,-48}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3463 {0x10d0,0x10fa,1,3008}, |
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3464 {0x10fd,0x10ff,1,3008}, |
6864 | 3465 {0x13f8,0x13fd,1,-8}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3466 {0x1c80,0x1c80,-1,-6254}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3467 {0x1c81,0x1c81,-1,-6253}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3468 {0x1c82,0x1c82,-1,-6244}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3469 {0x1c83,0x1c84,1,-6242}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3470 {0x1c85,0x1c85,-1,-6243}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3471 {0x1c86,0x1c86,-1,-6236}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3472 {0x1c87,0x1c87,-1,-6181}, |
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3473 {0x1c88,0x1c88,-1,35266}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3474 {0x1d79,0x1d79,-1,35332}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3475 {0x1d7d,0x1d7d,-1,3814}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3476 {0x1e01,0x1e95,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3477 {0x1e9b,0x1e9b,-1,-59}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3478 {0x1ea1,0x1eff,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3479 {0x1f00,0x1f07,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3480 {0x1f10,0x1f15,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3481 {0x1f20,0x1f27,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3482 {0x1f30,0x1f37,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3483 {0x1f40,0x1f45,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3484 {0x1f51,0x1f57,2,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3485 {0x1f60,0x1f67,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3486 {0x1f70,0x1f71,1,74}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3487 {0x1f72,0x1f75,1,86}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3488 {0x1f76,0x1f77,1,100}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3489 {0x1f78,0x1f79,1,128}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3490 {0x1f7a,0x1f7b,1,112}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3491 {0x1f7c,0x1f7d,1,126}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3492 {0x1f80,0x1f87,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3493 {0x1f90,0x1f97,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3494 {0x1fa0,0x1fa7,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3495 {0x1fb0,0x1fb1,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3496 {0x1fb3,0x1fb3,-1,9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3497 {0x1fbe,0x1fbe,-1,-7205}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3498 {0x1fc3,0x1fc3,-1,9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3499 {0x1fd0,0x1fd1,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3500 {0x1fe0,0x1fe1,1,8}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3501 {0x1fe5,0x1fe5,-1,7}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3502 {0x1ff3,0x1ff3,-1,9}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3503 {0x214e,0x214e,-1,-28}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3504 {0x2170,0x217f,1,-16}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3505 {0x2184,0x2184,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3506 {0x24d0,0x24e9,1,-26}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3507 {0x2c30,0x2c5e,1,-48}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3508 {0x2c61,0x2c61,-1,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3509 {0x2c65,0x2c65,-1,-10795}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3510 {0x2c66,0x2c66,-1,-10792}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3511 {0x2c68,0x2c6c,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3512 {0x2c73,0x2c76,3,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3513 {0x2c81,0x2ce3,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3514 {0x2cec,0x2cee,2,-1}, |
6495 | 3515 {0x2cf3,0x2cf3,-1,-1}, |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3516 {0x2d00,0x2d25,1,-7264}, |
6495 | 3517 {0x2d27,0x2d2d,6,-7264}, |
3518 {0xa641,0xa66d,2,-1}, | |
3519 {0xa681,0xa69b,2,-1}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3520 {0xa723,0xa72f,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3521 {0xa733,0xa76f,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3522 {0xa77a,0xa77c,2,-1}, |
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3523 {0xa77f,0xa787,2,-1}, |
6495 | 3524 {0xa78c,0xa791,5,-1}, |
3525 {0xa793,0xa797,4,-1}, | |
3526 {0xa799,0xa7a9,2,-1}, | |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3527 {0xa7b5,0xa7b9,2,-1}, |
6864 | 3528 {0xab53,0xab53,-1,-928}, |
3529 {0xab70,0xabbf,1,-38864}, | |
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3530 {0xff41,0xff5a,1,-32}, |
6495 | 3531 {0x10428,0x1044f,1,-40}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3532 {0x104d8,0x104fb,1,-40}, |
6864 | 3533 {0x10cc0,0x10cf2,1,-64}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3534 {0x118c0,0x118df,1,-32}, |
14333
65ded7626193
patch 8.1.0182: Unicode standard was updated
Christian Brabandt <cb@256bit.org>
parents:
14075
diff
changeset
|
3535 {0x16e60,0x16e7f,1,-32}, |
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3536 {0x1e922,0x1e943,1,-34} |
7 | 3537 }; |
8682
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
3538 |
7 | 3539 /* |
3540 * Return the upper-case equivalent of "a", which is a UCS-4 character. Use | |
3541 * simple case folding. | |
3542 */ | |
3543 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3544 utf_toupper(int a) |
7 | 3545 { |
3546 /* If 'casemap' contains "keepascii" use ASCII style toupper(). */ | |
3547 if (a < 128 && (cmp_flags & CMP_KEEPASCII)) | |
3548 return TOUPPER_ASC(a); | |
3549 | |
856 | 3550 #if defined(HAVE_TOWUPPER) && defined(__STDC_ISO_10646__) |
3551 /* If towupper() is available and handles Unicode, use it. */ | |
7 | 3552 if (!(cmp_flags & CMP_INTERNAL)) |
3553 return towupper(a); | |
3554 #endif | |
3555 | |
3556 /* For characters below 128 use locale sensitive toupper(). */ | |
3557 if (a < 128) | |
3558 return TOUPPER_LOC(a); | |
3559 | |
3560 /* For any other characters use the above mapping table. */ | |
3190 | 3561 return utf_convert(a, toUpper, (int)sizeof(toUpper)); |
7 | 3562 } |
3563 | |
3564 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3565 utf_islower(int a) |
7 | 3566 { |
3551 | 3567 /* German sharp s is lower case but has no upper case equivalent. */ |
3568 return (utf_toupper(a) != a) || a == 0xdf; | |
7 | 3569 } |
3570 | |
3571 /* | |
3572 * Return the lower-case equivalent of "a", which is a UCS-4 character. Use | |
3573 * simple case folding. | |
3574 */ | |
3575 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3576 utf_tolower(int a) |
7 | 3577 { |
3578 /* If 'casemap' contains "keepascii" use ASCII style tolower(). */ | |
3579 if (a < 128 && (cmp_flags & CMP_KEEPASCII)) | |
3580 return TOLOWER_ASC(a); | |
3581 | |
856 | 3582 #if defined(HAVE_TOWLOWER) && defined(__STDC_ISO_10646__) |
257 | 3583 /* If towlower() is available and handles Unicode, use it. */ |
7 | 3584 if (!(cmp_flags & CMP_INTERNAL)) |
3585 return towlower(a); | |
3586 #endif | |
3587 | |
3588 /* For characters below 128 use locale sensitive tolower(). */ | |
3589 if (a < 128) | |
3590 return TOLOWER_LOC(a); | |
3591 | |
3592 /* For any other characters use the above mapping table. */ | |
3190 | 3593 return utf_convert(a, toLower, (int)sizeof(toLower)); |
7 | 3594 } |
3595 | |
3596 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3597 utf_isupper(int a) |
7 | 3598 { |
3599 return (utf_tolower(a) != a); | |
3600 } | |
3601 | |
2961 | 3602 static int |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3603 utf_strnicmp( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3604 char_u *s1, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3605 char_u *s2, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3606 size_t n1, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3607 size_t n2) |
2961 | 3608 { |
3609 int c1, c2, cdiff; | |
3610 char_u buffer[6]; | |
3611 | |
3612 for (;;) | |
3613 { | |
3614 c1 = utf_safe_read_char_adv(&s1, &n1); | |
3615 c2 = utf_safe_read_char_adv(&s2, &n2); | |
3616 | |
3617 if (c1 <= 0 || c2 <= 0) | |
3618 break; | |
3619 | |
3620 if (c1 == c2) | |
3621 continue; | |
3622 | |
3623 cdiff = utf_fold(c1) - utf_fold(c2); | |
3624 if (cdiff != 0) | |
3625 return cdiff; | |
3626 } | |
3627 | |
3628 /* some string ended or has an incomplete/illegal character sequence */ | |
3629 | |
3630 if (c1 == 0 || c2 == 0) | |
3631 { | |
3632 /* some string ended. shorter string is smaller */ | |
3633 if (c1 == 0 && c2 == 0) | |
3634 return 0; | |
3635 return c1 == 0 ? -1 : 1; | |
3636 } | |
3637 | |
3638 /* Continue with bytewise comparison to produce some result that | |
3639 * would make comparison operations involving this function transitive. | |
3640 * | |
3641 * If only one string had an error, comparison should be made with | |
3642 * folded version of the other string. In this case it is enough | |
3643 * to fold just one character to determine the result of comparison. */ | |
3644 | |
3645 if (c1 != -1 && c2 == -1) | |
3646 { | |
3647 n1 = utf_char2bytes(utf_fold(c1), buffer); | |
3648 s1 = buffer; | |
3649 } | |
3650 else if (c2 != -1 && c1 == -1) | |
3651 { | |
3652 n2 = utf_char2bytes(utf_fold(c2), buffer); | |
3653 s2 = buffer; | |
3654 } | |
3655 | |
3656 while (n1 > 0 && n2 > 0 && *s1 != NUL && *s2 != NUL) | |
3657 { | |
3658 cdiff = (int)(*s1) - (int)(*s2); | |
3659 if (cdiff != 0) | |
3660 return cdiff; | |
3661 | |
3662 s1++; | |
3663 s2++; | |
3664 n1--; | |
3665 n2--; | |
3666 } | |
3667 | |
3668 if (n1 > 0 && *s1 == NUL) | |
3669 n1 = 0; | |
3670 if (n2 > 0 && *s2 == NUL) | |
3671 n2 = 0; | |
3672 | |
3673 if (n1 == 0 && n2 == 0) | |
3674 return 0; | |
3675 return n1 == 0 ? -1 : 1; | |
3676 } | |
3677 | |
7 | 3678 /* |
3679 * Version of strnicmp() that handles multi-byte characters. | |
4025 | 3680 * Needed for Big5, Shift-JIS and UTF-8 encoding. Other DBCS encodings can |
7 | 3681 * probably use strnicmp(), because there are no ASCII characters in the |
3682 * second byte. | |
3683 * Returns zero if s1 and s2 are equal (ignoring case), the difference between | |
3684 * two characters otherwise. | |
3685 */ | |
3686 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3687 mb_strnicmp(char_u *s1, char_u *s2, size_t nn) |
7 | 3688 { |
2961 | 3689 int i, l; |
7 | 3690 int cdiff; |
835 | 3691 int n = (int)nn; |
7 | 3692 |
2961 | 3693 if (enc_utf8) |
7 | 3694 { |
2961 | 3695 return utf_strnicmp(s1, s2, nn, nn); |
3696 } | |
3697 else | |
3698 { | |
3699 for (i = 0; i < n; i += l) | |
7 | 3700 { |
2961 | 3701 if (s1[i] == NUL && s2[i] == NUL) /* both strings end */ |
3702 return 0; | |
3703 | |
474 | 3704 l = (*mb_ptr2len)(s1 + i); |
7 | 3705 if (l <= 1) |
3706 { | |
3707 /* Single byte: first check normally, then with ignore case. */ | |
3708 if (s1[i] != s2[i]) | |
3709 { | |
1347 | 3710 cdiff = MB_TOLOWER(s1[i]) - MB_TOLOWER(s2[i]); |
7 | 3711 if (cdiff != 0) |
3712 return cdiff; | |
3713 } | |
3714 } | |
3715 else | |
3716 { | |
3717 /* For non-Unicode multi-byte don't ignore case. */ | |
3718 if (l > n - i) | |
3719 l = n - i; | |
3720 cdiff = STRNCMP(s1 + i, s2 + i, l); | |
3721 if (cdiff != 0) | |
3722 return cdiff; | |
3723 } | |
3724 } | |
3725 } | |
3726 return 0; | |
3727 } | |
3728 | |
3729 /* | |
3730 * "g8": show bytes of the UTF-8 char under the cursor. Doesn't matter what | |
3731 * 'encoding' has been set to. | |
3732 */ | |
3733 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3734 show_utf8(void) |
7 | 3735 { |
3736 int len; | |
273 | 3737 int rlen = 0; |
7 | 3738 char_u *line; |
3739 int clen; | |
3740 int i; | |
3741 | |
3742 /* Get the byte length of the char under the cursor, including composing | |
3743 * characters. */ | |
3744 line = ml_get_cursor(); | |
474 | 3745 len = utfc_ptr2len(line); |
7 | 3746 if (len == 0) |
3747 { | |
3748 MSG("NUL"); | |
3749 return; | |
3750 } | |
3751 | |
3752 clen = 0; | |
3753 for (i = 0; i < len; ++i) | |
3754 { | |
3755 if (clen == 0) | |
3756 { | |
3757 /* start of (composing) character, get its length */ | |
3758 if (i > 0) | |
273 | 3759 { |
3760 STRCPY(IObuff + rlen, "+ "); | |
3761 rlen += 2; | |
3762 } | |
474 | 3763 clen = utf_ptr2len(line + i); |
7 | 3764 } |
2205
54605ada811b
"g8" doesn't work properly on a NUL.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
3765 sprintf((char *)IObuff + rlen, "%02x ", |
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
3766 (line[i] == NL) ? NUL : line[i]); /* NUL is stored as NL */ |
7 | 3767 --clen; |
835 | 3768 rlen += (int)STRLEN(IObuff + rlen); |
273 | 3769 if (rlen > IOSIZE - 20) |
3770 break; | |
7 | 3771 } |
3772 | |
3773 msg(IObuff); | |
3774 } | |
3775 | |
3776 /* | |
3777 * mb_head_off() function pointer. | |
3778 * Return offset from "p" to the first byte of the character it points into. | |
2015 | 3779 * If "p" points to the NUL at the end of the string return 0. |
7 | 3780 * Returns 0 when already at the first byte of a character. |
3781 */ | |
3782 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3783 latin_head_off(char_u *base UNUSED, char_u *p UNUSED) |
7 | 3784 { |
3785 return 0; | |
3786 } | |
3787 | |
3788 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3789 dbcs_head_off(char_u *base, char_u *p) |
7 | 3790 { |
3791 char_u *q; | |
3792 | |
3793 /* It can't be a trailing byte when not using DBCS, at the start of the | |
3794 * string or the previous byte can't start a double-byte. */ | |
2015 | 3795 if (p <= base || MB_BYTE2LEN(p[-1]) == 1 || *p == NUL) |
7 | 3796 return 0; |
3797 | |
3798 /* This is slow: need to start at the base and go forward until the | |
3799 * byte we are looking for. Return 1 when we went past it, 0 otherwise. */ | |
3800 q = base; | |
3801 while (q < p) | |
474 | 3802 q += dbcs_ptr2len(q); |
7 | 3803 return (q == p) ? 0 : 1; |
3804 } | |
3805 | |
3806 /* | |
3807 * Special version of dbcs_head_off() that works for ScreenLines[], where | |
3808 * single-width DBCS_JPNU characters are stored separately. | |
3809 */ | |
3810 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3811 dbcs_screen_head_off(char_u *base, char_u *p) |
7 | 3812 { |
3813 char_u *q; | |
3814 | |
3815 /* It can't be a trailing byte when not using DBCS, at the start of the | |
3816 * string or the previous byte can't start a double-byte. | |
3817 * For euc-jp an 0x8e byte in the previous cell always means we have a | |
3818 * lead byte in the current cell. */ | |
3819 if (p <= base | |
3820 || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e) | |
2015 | 3821 || MB_BYTE2LEN(p[-1]) == 1 |
3822 || *p == NUL) | |
7 | 3823 return 0; |
3824 | |
3825 /* This is slow: need to start at the base and go forward until the | |
3826 * byte we are looking for. Return 1 when we went past it, 0 otherwise. | |
3827 * For DBCS_JPNU look out for 0x8e, which means the second byte is not | |
3828 * stored as the next byte. */ | |
3829 q = base; | |
3830 while (q < p) | |
3831 { | |
3832 if (enc_dbcs == DBCS_JPNU && *q == 0x8e) | |
3833 ++q; | |
3834 else | |
474 | 3835 q += dbcs_ptr2len(q); |
7 | 3836 } |
3837 return (q == p) ? 0 : 1; | |
3838 } | |
3839 | |
3840 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3841 utf_head_off(char_u *base, char_u *p) |
7 | 3842 { |
3843 char_u *q; | |
3844 char_u *s; | |
3845 int c; | |
2015 | 3846 int len; |
7 | 3847 #ifdef FEAT_ARABIC |
3848 char_u *j; | |
3849 #endif | |
3850 | |
3851 if (*p < 0x80) /* be quick for ASCII */ | |
3852 return 0; | |
3853 | |
3854 /* Skip backwards over trailing bytes: 10xx.xxxx | |
3855 * Skip backwards again if on a composing char. */ | |
3856 for (q = p; ; --q) | |
3857 { | |
3858 /* Move s to the last byte of this char. */ | |
3859 for (s = q; (s[1] & 0xc0) == 0x80; ++s) | |
3860 ; | |
3861 /* Move q to the first byte of this char. */ | |
3862 while (q > base && (*q & 0xc0) == 0x80) | |
3863 --q; | |
3864 /* Check for illegal sequence. Do allow an illegal byte after where we | |
3865 * started. */ | |
2015 | 3866 len = utf8len_tab[*q]; |
3867 if (len != (int)(s - q + 1) && len != (int)(p - q + 1)) | |
7 | 3868 return 0; |
3869 | |
3870 if (q <= base) | |
3871 break; | |
3872 | |
3873 c = utf_ptr2char(q); | |
3874 if (utf_iscomposing(c)) | |
3875 continue; | |
3876 | |
3877 #ifdef FEAT_ARABIC | |
3878 if (arabic_maycombine(c)) | |
3879 { | |
3880 /* Advance to get a sneak-peak at the next char */ | |
3881 j = q; | |
3882 --j; | |
3883 /* Move j to the first byte of this char. */ | |
3884 while (j > base && (*j & 0xc0) == 0x80) | |
3885 --j; | |
3886 if (arabic_combine(utf_ptr2char(j), c)) | |
3887 continue; | |
3888 } | |
3889 #endif | |
3890 break; | |
3891 } | |
3892 | |
3893 return (int)(p - q); | |
3894 } | |
3895 | |
3896 /* | |
99 | 3897 * Copy a character from "*fp" to "*tp" and advance the pointers. |
3898 */ | |
3899 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3900 mb_copy_char(char_u **fp, char_u **tp) |
99 | 3901 { |
474 | 3902 int l = (*mb_ptr2len)(*fp); |
99 | 3903 |
3904 mch_memmove(*tp, *fp, (size_t)l); | |
3905 *tp += l; | |
3906 *fp += l; | |
3907 } | |
3908 | |
3909 /* | |
7 | 3910 * Return the offset from "p" to the first byte of a character. When "p" is |
3911 * at the start of a character 0 is returned, otherwise the offset to the next | |
3912 * character. Can start anywhere in a stream of bytes. | |
3913 */ | |
3914 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3915 mb_off_next(char_u *base, char_u *p) |
7 | 3916 { |
3917 int i; | |
3918 int j; | |
3919 | |
3920 if (enc_utf8) | |
3921 { | |
3922 if (*p < 0x80) /* be quick for ASCII */ | |
3923 return 0; | |
3924 | |
3925 /* Find the next character that isn't 10xx.xxxx */ | |
3926 for (i = 0; (p[i] & 0xc0) == 0x80; ++i) | |
3927 ; | |
3928 if (i > 0) | |
3929 { | |
3930 /* Check for illegal sequence. */ | |
3931 for (j = 0; p - j > base; ++j) | |
3932 if ((p[-j] & 0xc0) != 0x80) | |
3933 break; | |
3934 if (utf8len_tab[p[-j]] != i + j) | |
3935 return 0; | |
3936 } | |
3937 return i; | |
3938 } | |
3939 | |
3940 /* Only need to check if we're on a trail byte, it doesn't matter if we | |
3941 * want the offset to the next or current character. */ | |
3942 return (*mb_head_off)(base, p); | |
3943 } | |
3944 | |
3945 /* | |
3946 * Return the offset from "p" to the last byte of the character it points | |
3947 * into. Can start anywhere in a stream of bytes. | |
3948 */ | |
3949 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3950 mb_tail_off(char_u *base, char_u *p) |
7 | 3951 { |
3952 int i; | |
3953 int j; | |
3954 | |
3955 if (*p == NUL) | |
3956 return 0; | |
3957 | |
3958 if (enc_utf8) | |
3959 { | |
3960 /* Find the last character that is 10xx.xxxx */ | |
3961 for (i = 0; (p[i + 1] & 0xc0) == 0x80; ++i) | |
3962 ; | |
3963 /* Check for illegal sequence. */ | |
3964 for (j = 0; p - j > base; ++j) | |
3965 if ((p[-j] & 0xc0) != 0x80) | |
3966 break; | |
3967 if (utf8len_tab[p[-j]] != i + j + 1) | |
3968 return 0; | |
3969 return i; | |
3970 } | |
3971 | |
3972 /* It can't be the first byte if a double-byte when not using DBCS, at the | |
3973 * end of the string or the byte can't start a double-byte. */ | |
3974 if (enc_dbcs == 0 || p[1] == NUL || MB_BYTE2LEN(*p) == 1) | |
3975 return 0; | |
3976 | |
3977 /* Return 1 when on the lead byte, 0 when on the tail byte. */ | |
3978 return 1 - dbcs_head_off(base, p); | |
3979 } | |
3980 | |
776 | 3981 /* |
3982 * Find the next illegal byte sequence. | |
3983 */ | |
3984 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3985 utf_find_illegal(void) |
776 | 3986 { |
3987 pos_T pos = curwin->w_cursor; | |
3988 char_u *p; | |
3989 int len; | |
3990 vimconv_T vimconv; | |
3991 char_u *tofree = NULL; | |
3992 | |
3993 vimconv.vc_type = CONV_NONE; | |
3994 if (enc_utf8 && (enc_canon_props(curbuf->b_p_fenc) & ENC_8BIT)) | |
3995 { | |
3996 /* 'encoding' is "utf-8" but we are editing a 8-bit encoded file, | |
3997 * possibly a utf-8 file with illegal bytes. Setup for conversion | |
3998 * from utf-8 to 'fileencoding'. */ | |
3999 convert_setup(&vimconv, p_enc, curbuf->b_p_fenc); | |
4000 } | |
4001 | |
4002 #ifdef FEAT_VIRTUALEDIT | |
4003 curwin->w_cursor.coladd = 0; | |
4004 #endif | |
4005 for (;;) | |
4006 { | |
4007 p = ml_get_cursor(); | |
4008 if (vimconv.vc_type != CONV_NONE) | |
4009 { | |
4010 vim_free(tofree); | |
4011 tofree = string_convert(&vimconv, p, NULL); | |
4012 if (tofree == NULL) | |
4013 break; | |
4014 p = tofree; | |
4015 } | |
4016 | |
4017 while (*p != NUL) | |
4018 { | |
4019 /* Illegal means that there are not enough trail bytes (checked by | |
4020 * utf_ptr2len()) or too many of them (overlong sequence). */ | |
4021 len = utf_ptr2len(p); | |
4022 if (*p >= 0x80 && (len == 1 | |
4023 || utf_char2len(utf_ptr2char(p)) != len)) | |
4024 { | |
4025 if (vimconv.vc_type == CONV_NONE) | |
835 | 4026 curwin->w_cursor.col += (colnr_T)(p - ml_get_cursor()); |
776 | 4027 else |
4028 { | |
4029 int l; | |
4030 | |
835 | 4031 len = (int)(p - tofree); |
776 | 4032 for (p = ml_get_cursor(); *p != NUL && len-- > 0; p += l) |
4033 { | |
4034 l = utf_ptr2len(p); | |
4035 curwin->w_cursor.col += l; | |
4036 } | |
4037 } | |
4038 goto theend; | |
4039 } | |
4040 p += len; | |
4041 } | |
4042 if (curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
4043 break; | |
4044 ++curwin->w_cursor.lnum; | |
4045 curwin->w_cursor.col = 0; | |
4046 } | |
4047 | |
4048 /* didn't find it: don't move and beep */ | |
4049 curwin->w_cursor = pos; | |
4050 beep_flush(); | |
4051 | |
4052 theend: | |
4053 vim_free(tofree); | |
4054 convert_setup(&vimconv, NULL, NULL); | |
4055 } | |
4056 | |
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
4057 #if defined(FEAT_GUI_GTK) || defined(PROTO) |
26 | 4058 /* |
4059 * Return TRUE if string "s" is a valid utf-8 string. | |
4060 * When "end" is NULL stop at the first NUL. | |
4061 * When "end" is positive stop there. | |
4062 */ | |
4063 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4064 utf_valid_string(char_u *s, char_u *end) |
26 | 4065 { |
4066 int l; | |
4067 char_u *p = s; | |
4068 | |
4069 while (end == NULL ? *p != NUL : p < end) | |
4070 { | |
2015 | 4071 l = utf8len_tab_zero[*p]; |
4072 if (l == 0) | |
26 | 4073 return FALSE; /* invalid lead byte */ |
4074 if (end != NULL && p + l > end) | |
4075 return FALSE; /* incomplete byte sequence */ | |
4076 ++p; | |
4077 while (--l > 0) | |
4078 if ((*p++ & 0xc0) != 0x80) | |
4079 return FALSE; /* invalid trail byte */ | |
4080 } | |
4081 return TRUE; | |
4082 } | |
4083 #endif | |
4084 | |
7 | 4085 #if defined(FEAT_GUI) || defined(PROTO) |
4086 /* | |
4087 * Special version of mb_tail_off() for use in ScreenLines[]. | |
4088 */ | |
4089 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4090 dbcs_screen_tail_off(char_u *base, char_u *p) |
7 | 4091 { |
4092 /* It can't be the first byte if a double-byte when not using DBCS, at the | |
4093 * end of the string or the byte can't start a double-byte. | |
4094 * For euc-jp an 0x8e byte always means we have a lead byte in the current | |
4095 * cell. */ | |
4096 if (*p == NUL || p[1] == NUL | |
4097 || (enc_dbcs == DBCS_JPNU && *p == 0x8e) | |
4098 || MB_BYTE2LEN(*p) == 1) | |
4099 return 0; | |
4100 | |
4101 /* Return 1 when on the lead byte, 0 when on the tail byte. */ | |
4102 return 1 - dbcs_screen_head_off(base, p); | |
4103 } | |
4104 #endif | |
4105 | |
4106 /* | |
4107 * If the cursor moves on an trail byte, set the cursor on the lead byte. | |
4108 * Thus it moves left if necessary. | |
4109 * Return TRUE when the cursor was adjusted. | |
4110 */ | |
4111 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4112 mb_adjust_cursor(void) |
7 | 4113 { |
2933 | 4114 mb_adjustpos(curbuf, &curwin->w_cursor); |
7 | 4115 } |
4116 | |
4117 /* | |
4118 * Adjust position "*lp" to point to the first byte of a multi-byte character. | |
4119 * If it points to a tail byte it's moved backwards to the head byte. | |
4120 */ | |
4121 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4122 mb_adjustpos(buf_T *buf, pos_T *lp) |
7 | 4123 { |
4124 char_u *p; | |
4125 | |
4126 if (lp->col > 0 | |
4127 #ifdef FEAT_VIRTUALEDIT | |
4128 || lp->coladd > 1 | |
4129 #endif | |
4130 ) | |
4131 { | |
2933 | 4132 p = ml_get_buf(buf, lp->lnum, FALSE); |
13117
cfaa513efa3f
patch 8.0.1433: illegal memory access after undo
Christian Brabandt <cb@256bit.org>
parents:
12948
diff
changeset
|
4133 if (*p == NUL || (int)STRLEN(p) < lp->col) |
cfaa513efa3f
patch 8.0.1433: illegal memory access after undo
Christian Brabandt <cb@256bit.org>
parents:
12948
diff
changeset
|
4134 lp->col = 0; |
cfaa513efa3f
patch 8.0.1433: illegal memory access after undo
Christian Brabandt <cb@256bit.org>
parents:
12948
diff
changeset
|
4135 else |
cfaa513efa3f
patch 8.0.1433: illegal memory access after undo
Christian Brabandt <cb@256bit.org>
parents:
12948
diff
changeset
|
4136 lp->col -= (*mb_head_off)(p, p + lp->col); |
7 | 4137 #ifdef FEAT_VIRTUALEDIT |
4138 /* Reset "coladd" when the cursor would be on the right half of a | |
4139 * double-wide character. */ | |
4140 if (lp->coladd == 1 | |
4141 && p[lp->col] != TAB | |
4142 && vim_isprintc((*mb_ptr2char)(p + lp->col)) | |
4143 && ptr2cells(p + lp->col) > 1) | |
4144 lp->coladd = 0; | |
4145 #endif | |
4146 } | |
4147 } | |
4148 | |
4149 /* | |
4150 * Return a pointer to the character before "*p", if there is one. | |
4151 */ | |
4152 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4153 mb_prevptr( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4154 char_u *line, /* start of the string */ |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4155 char_u *p) |
7 | 4156 { |
4157 if (p > line) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10724
diff
changeset
|
4158 MB_PTR_BACK(line, p); |
7 | 4159 return p; |
4160 } | |
4161 | |
4162 /* | |
474 | 4163 * Return the character length of "str". Each multi-byte character (with |
4164 * following composing characters) counts as one. | |
7 | 4165 */ |
4166 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4167 mb_charlen(char_u *str) |
7 | 4168 { |
500 | 4169 char_u *p = str; |
4170 int count; | |
4171 | |
4172 if (p == NULL) | |
7 | 4173 return 0; |
4174 | |
500 | 4175 for (count = 0; *p != NUL; count++) |
4176 p += (*mb_ptr2len)(p); | |
7 | 4177 |
4178 return count; | |
4179 } | |
4180 | |
740 | 4181 #if defined(FEAT_SPELL) || defined(PROTO) |
500 | 4182 /* |
4183 * Like mb_charlen() but for a string with specified length. | |
4184 */ | |
4185 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4186 mb_charlen_len(char_u *str, int len) |
500 | 4187 { |
4188 char_u *p = str; | |
4189 int count; | |
4190 | |
4191 for (count = 0; *p != NUL && p < str + len; count++) | |
4192 p += (*mb_ptr2len)(p); | |
4193 | |
4194 return count; | |
4195 } | |
4196 #endif | |
4197 | |
7 | 4198 /* |
4199 * Try to un-escape a multi-byte character. | |
4200 * Used for the "to" and "from" part of a mapping. | |
4201 * Return the un-escaped string if it is a multi-byte character, and advance | |
4202 * "pp" to just after the bytes that formed it. | |
4203 * Return NULL if no multi-byte char was found. | |
4204 */ | |
4205 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4206 mb_unescape(char_u **pp) |
7 | 4207 { |
3812 | 4208 static char_u buf[6]; |
4209 int n; | |
4210 int m = 0; | |
7 | 4211 char_u *str = *pp; |
4212 | |
4213 /* Must translate K_SPECIAL KS_SPECIAL KE_FILLER to K_SPECIAL and CSI | |
3812 | 4214 * KS_EXTRA KE_CSI to CSI. |
4215 * Maximum length of a utf-8 character is 4 bytes. */ | |
4216 for (n = 0; str[n] != NUL && m < 4; ++n) | |
7 | 4217 { |
4218 if (str[n] == K_SPECIAL | |
4219 && str[n + 1] == KS_SPECIAL | |
4220 && str[n + 2] == KE_FILLER) | |
4221 { | |
4222 buf[m++] = K_SPECIAL; | |
4223 n += 2; | |
4224 } | |
1495 | 4225 else if ((str[n] == K_SPECIAL |
7 | 4226 # ifdef FEAT_GUI |
1495 | 4227 || str[n] == CSI |
4228 # endif | |
4229 ) | |
7 | 4230 && str[n + 1] == KS_EXTRA |
4231 && str[n + 2] == (int)KE_CSI) | |
4232 { | |
4233 buf[m++] = CSI; | |
4234 n += 2; | |
4235 } | |
4236 else if (str[n] == K_SPECIAL | |
4237 # ifdef FEAT_GUI | |
4238 || str[n] == CSI | |
4239 # endif | |
4240 ) | |
4241 break; /* a special key can't be a multibyte char */ | |
4242 else | |
4243 buf[m++] = str[n]; | |
4244 buf[m] = NUL; | |
4245 | |
4246 /* Return a multi-byte character if it's found. An illegal sequence | |
4247 * will result in a 1 here. */ | |
474 | 4248 if ((*mb_ptr2len)(buf) > 1) |
7 | 4249 { |
4250 *pp = str + n + 1; | |
4251 return buf; | |
4252 } | |
3812 | 4253 |
4254 /* Bail out quickly for ASCII. */ | |
4255 if (buf[0] < 128) | |
4256 break; | |
7 | 4257 } |
4258 return NULL; | |
4259 } | |
4260 | |
4261 /* | |
4262 * Return TRUE if the character at "row"/"col" on the screen is the left side | |
4263 * of a double-width character. | |
4264 * Caller must make sure "row" and "col" are not invalid! | |
4265 */ | |
4266 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4267 mb_lefthalve(int row, int col) |
7 | 4268 { |
4269 #ifdef FEAT_HANGULIN | |
4270 if (composing_hangul) | |
4271 return TRUE; | |
4272 #endif | |
1378 | 4273 return (*mb_off2cells)(LineOffset[row] + col, |
4274 LineOffset[row] + screen_Columns) > 1; | |
7 | 4275 } |
4276 | |
4277 /* | |
1698 | 4278 * Correct a position on the screen, if it's the right half of a double-wide |
4279 * char move it to the left half. Returns the corrected column. | |
7 | 4280 */ |
4281 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4282 mb_fix_col(int col, int row) |
7 | 4283 { |
4284 col = check_col(col); | |
4285 row = check_row(row); | |
4286 if (has_mbyte && ScreenLines != NULL && col > 0 | |
4287 && ((enc_dbcs | |
4288 && ScreenLines[LineOffset[row] + col] != NUL | |
4289 && dbcs_screen_head_off(ScreenLines + LineOffset[row], | |
4290 ScreenLines + LineOffset[row] + col)) | |
4291 || (enc_utf8 && ScreenLines[LineOffset[row] + col] == 0))) | |
1620 | 4292 return col - 1; |
7 | 4293 return col; |
4294 } | |
4295 #endif | |
4296 | |
4297 #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) || defined(PROTO) | |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
4298 static int enc_alias_search(char_u *name); |
7 | 4299 |
4300 /* | |
4301 * Skip the Vim specific head of a 'encoding' name. | |
4302 */ | |
4303 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4304 enc_skip(char_u *p) |
7 | 4305 { |
4306 if (STRNCMP(p, "2byte-", 6) == 0) | |
4307 return p + 6; | |
4308 if (STRNCMP(p, "8bit-", 5) == 0) | |
4309 return p + 5; | |
4310 return p; | |
4311 } | |
4312 | |
4313 /* | |
4314 * Find the canonical name for encoding "enc". | |
4315 * When the name isn't recognized, returns "enc" itself, but with all lower | |
4316 * case characters and '_' replaced with '-'. | |
4317 * Returns an allocated string. NULL for out-of-memory. | |
4318 */ | |
4319 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4320 enc_canonize(char_u *enc) |
7 | 4321 { |
4322 char_u *r; | |
4323 char_u *p, *s; | |
4324 int i; | |
4325 | |
39 | 4326 # ifdef FEAT_MBYTE |
4327 if (STRCMP(enc, "default") == 0) | |
4328 { | |
4329 /* Use the default encoding as it's found by set_init_1(). */ | |
4330 r = get_encoding_default(); | |
4331 if (r == NULL) | |
4332 r = (char_u *)"latin1"; | |
4333 return vim_strsave(r); | |
4334 } | |
4335 # endif | |
4336 | |
1205 | 4337 /* copy "enc" to allocated memory, with room for two '-' */ |
7 | 4338 r = alloc((unsigned)(STRLEN(enc) + 3)); |
4339 if (r != NULL) | |
4340 { | |
4341 /* Make it all lower case and replace '_' with '-'. */ | |
4342 p = r; | |
4343 for (s = enc; *s != NUL; ++s) | |
4344 { | |
4345 if (*s == '_') | |
4346 *p++ = '-'; | |
4347 else | |
4348 *p++ = TOLOWER_ASC(*s); | |
4349 } | |
4350 *p = NUL; | |
4351 | |
4352 /* Skip "2byte-" and "8bit-". */ | |
4353 p = enc_skip(r); | |
4354 | |
481 | 4355 /* Change "microsoft-cp" to "cp". Used in some spell files. */ |
4356 if (STRNCMP(p, "microsoft-cp", 12) == 0) | |
1620 | 4357 STRMOVE(p, p + 10); |
481 | 4358 |
7 | 4359 /* "iso8859" -> "iso-8859" */ |
4360 if (STRNCMP(p, "iso8859", 7) == 0) | |
4361 { | |
1620 | 4362 STRMOVE(p + 4, p + 3); |
7 | 4363 p[3] = '-'; |
4364 } | |
4365 | |
4366 /* "iso-8859n" -> "iso-8859-n" */ | |
4367 if (STRNCMP(p, "iso-8859", 8) == 0 && p[8] != '-') | |
4368 { | |
1620 | 4369 STRMOVE(p + 9, p + 8); |
7 | 4370 p[8] = '-'; |
4371 } | |
4372 | |
4373 /* "latin-N" -> "latinN" */ | |
4374 if (STRNCMP(p, "latin-", 6) == 0) | |
1620 | 4375 STRMOVE(p + 5, p + 6); |
7 | 4376 |
4377 if (enc_canon_search(p) >= 0) | |
4378 { | |
4379 /* canonical name can be used unmodified */ | |
4380 if (p != r) | |
1620 | 4381 STRMOVE(r, p); |
7 | 4382 } |
4383 else if ((i = enc_alias_search(p)) >= 0) | |
4384 { | |
4385 /* alias recognized, get canonical name */ | |
4386 vim_free(r); | |
4387 r = vim_strsave((char_u *)enc_canon_table[i].name); | |
4388 } | |
4389 } | |
4390 return r; | |
4391 } | |
4392 | |
4393 /* | |
4394 * Search for an encoding alias of "name". | |
4395 * Returns -1 when not found. | |
4396 */ | |
4397 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4398 enc_alias_search(char_u *name) |
7 | 4399 { |
4400 int i; | |
4401 | |
4402 for (i = 0; enc_alias_table[i].name != NULL; ++i) | |
4403 if (STRCMP(name, enc_alias_table[i].name) == 0) | |
4404 return enc_alias_table[i].canon; | |
4405 return -1; | |
4406 } | |
4407 #endif | |
4408 | |
4409 #if defined(FEAT_MBYTE) || defined(PROTO) | |
4410 | |
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4411 # ifdef HAVE_LANGINFO_H |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4412 # include <langinfo.h> |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4413 # endif |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4414 |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4415 # ifndef FEAT_GUI_W32 |
7 | 4416 /* |
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4417 * Get the canonicalized encoding from the specified locale string "locale" |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4418 * or from the environment variables LC_ALL, LC_CTYPE and LANG. |
7 | 4419 * Returns an allocated string when successful, NULL when not. |
4420 */ | |
4421 char_u * | |
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4422 enc_locale_env(char *locale) |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4423 { |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4424 char *s = locale; |
7 | 4425 char *p; |
4426 int i; | |
4427 char buf[50]; | |
4428 | |
4429 if (s == NULL || *s == NUL) | |
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4430 if ((s = getenv("LC_ALL")) == NULL || *s == NUL) |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4431 if ((s = getenv("LC_CTYPE")) == NULL || *s == NUL) |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4432 s = getenv("LANG"); |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4433 |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4434 if (s == NULL || *s == NUL) |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4435 return NULL; |
7 | 4436 |
4437 /* The most generic locale format is: | |
4438 * language[_territory][.codeset][@modifier][+special][,[sponsor][_revision]] | |
4439 * If there is a '.' remove the part before it. | |
4440 * if there is something after the codeset, remove it. | |
4441 * Make the name lowercase and replace '_' with '-'. | |
4442 * Exception: "ja_JP.EUC" == "euc-jp", "zh_CN.EUC" = "euc-cn", | |
4443 * "ko_KR.EUC" == "euc-kr" | |
4444 */ | |
4445 if ((p = (char *)vim_strchr((char_u *)s, '.')) != NULL) | |
4446 { | |
4447 if (p > s + 2 && STRNICMP(p + 1, "EUC", 3) == 0 | |
4448 && !isalnum((int)p[4]) && p[4] != '-' && p[-3] == '_') | |
4449 { | |
4450 /* copy "XY.EUC" to "euc-XY" to buf[10] */ | |
4451 STRCPY(buf + 10, "euc-"); | |
4452 buf[14] = p[-2]; | |
4453 buf[15] = p[-1]; | |
4454 buf[16] = 0; | |
4455 s = buf + 10; | |
4456 } | |
4457 else | |
4458 s = p + 1; | |
4459 } | |
9495
c086632cca2e
commit https://github.com/vim/vim/commit/5498a41f5a62c3877fee0185adf3bf7245a9a547
Christian Brabandt <cb@256bit.org>
parents:
9477
diff
changeset
|
4460 for (i = 0; i < (int)sizeof(buf) - 1 && s[i] != NUL; ++i) |
7 | 4461 { |
4462 if (s[i] == '_' || s[i] == '-') | |
4463 buf[i] = '-'; | |
4464 else if (isalnum((int)s[i])) | |
4465 buf[i] = TOLOWER_ASC(s[i]); | |
4466 else | |
4467 break; | |
4468 } | |
4469 buf[i] = NUL; | |
4470 | |
4471 return enc_canonize((char_u *)buf); | |
4472 } | |
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4473 # endif |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4474 |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4475 /* |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4476 * Get the canonicalized encoding of the current locale. |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4477 * Returns an allocated string when successful, NULL when not. |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4478 */ |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4479 char_u * |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4480 enc_locale(void) |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4481 { |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4482 # ifdef WIN3264 |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4483 char buf[50]; |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4484 long acp = GetACP(); |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4485 |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4486 if (acp == 1200) |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4487 STRCPY(buf, "ucs-2le"); |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4488 else if (acp == 1252) /* cp1252 is used as latin1 */ |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4489 STRCPY(buf, "latin1"); |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4490 else |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4491 sprintf(buf, "cp%ld", acp); |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4492 |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4493 return enc_canonize((char_u *)buf); |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4494 # else |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4495 char *s; |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4496 |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4497 # ifdef HAVE_NL_LANGINFO_CODESET |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4498 if ((s = nl_langinfo(CODESET)) == NULL || *s == NUL) |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4499 # endif |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4500 # if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4501 if ((s = setlocale(LC_CTYPE, NULL)) == NULL || *s == NUL) |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4502 # endif |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4503 s = NULL; |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4504 |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4505 return enc_locale_env(s); |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4506 # endif |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4507 } |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4508 |
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4509 # if defined(WIN3264) || defined(PROTO) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD) |
7 | 4510 /* |
4511 * Convert an encoding name to an MS-Windows codepage. | |
4512 * Returns zero if no codepage can be figured out. | |
4513 */ | |
4514 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4515 encname2codepage(char_u *name) |
7 | 4516 { |
4517 int cp; | |
4518 char_u *p = name; | |
4519 int idx; | |
4520 | |
4521 if (STRNCMP(p, "8bit-", 5) == 0) | |
4522 p += 5; | |
4523 else if (STRNCMP(p_enc, "2byte-", 6) == 0) | |
4524 p += 6; | |
4525 | |
4526 if (p[0] == 'c' && p[1] == 'p') | |
5136
28e6f5f88968
updated for version 7.3.1311
Bram Moolenaar <bram@vim.org>
parents:
5025
diff
changeset
|
4527 cp = atoi((char *)p + 2); |
7 | 4528 else if ((idx = enc_canon_search(p)) >= 0) |
4529 cp = enc_canon_table[idx].codepage; | |
4530 else | |
4531 return 0; | |
4532 if (IsValidCodePage(cp)) | |
4533 return cp; | |
4534 return 0; | |
4535 } | |
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4536 # endif |
7 | 4537 |
4538 # if defined(USE_ICONV) || defined(PROTO) | |
4539 | |
4540 /* | |
4541 * Call iconv_open() with a check if iconv() works properly (there are broken | |
4542 * versions). | |
4543 * Returns (void *)-1 if failed. | |
4544 * (should return iconv_t, but that causes problems with prototypes). | |
4545 */ | |
4546 void * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4547 my_iconv_open(char_u *to, char_u *from) |
7 | 4548 { |
4549 iconv_t fd; | |
4550 #define ICONV_TESTLEN 400 | |
4551 char_u tobuf[ICONV_TESTLEN]; | |
4552 char *p; | |
4553 size_t tolen; | |
4554 static int iconv_ok = -1; | |
4555 | |
4556 if (iconv_ok == FALSE) | |
4557 return (void *)-1; /* detected a broken iconv() previously */ | |
4558 | |
4559 #ifdef DYNAMIC_ICONV | |
4560 /* Check if the iconv.dll can be found. */ | |
4561 if (!iconv_enabled(TRUE)) | |
4562 return (void *)-1; | |
4563 #endif | |
4564 | |
4565 fd = iconv_open((char *)enc_skip(to), (char *)enc_skip(from)); | |
4566 | |
4567 if (fd != (iconv_t)-1 && iconv_ok == -1) | |
4568 { | |
4569 /* | |
4570 * Do a dummy iconv() call to check if it actually works. There is a | |
4571 * version of iconv() on Linux that is broken. We can't ignore it, | |
4572 * because it's wide-spread. The symptoms are that after outputting | |
4573 * the initial shift state the "to" pointer is NULL and conversion | |
4574 * stops for no apparent reason after about 8160 characters. | |
4575 */ | |
4576 p = (char *)tobuf; | |
4577 tolen = ICONV_TESTLEN; | |
4578 (void)iconv(fd, NULL, NULL, &p, &tolen); | |
4579 if (p == NULL) | |
4580 { | |
4581 iconv_ok = FALSE; | |
4582 iconv_close(fd); | |
4583 fd = (iconv_t)-1; | |
4584 } | |
4585 else | |
4586 iconv_ok = TRUE; | |
4587 } | |
4588 | |
4589 return (void *)fd; | |
4590 } | |
4591 | |
4592 /* | |
4593 * Convert the string "str[slen]" with iconv(). | |
4594 * If "unconvlenp" is not NULL handle the string ending in an incomplete | |
4595 * sequence and set "*unconvlenp" to the length of it. | |
4596 * Returns the converted string in allocated memory. NULL for an error. | |
1904 | 4597 * If resultlenp is not NULL, sets it to the result length in bytes. |
7 | 4598 */ |
4599 static char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4600 iconv_string( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4601 vimconv_T *vcp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4602 char_u *str, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4603 int slen, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4604 int *unconvlenp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4605 int *resultlenp) |
7 | 4606 { |
4607 const char *from; | |
4608 size_t fromlen; | |
4609 char *to; | |
4610 size_t tolen; | |
4611 size_t len = 0; | |
4612 size_t done = 0; | |
4613 char_u *result = NULL; | |
4614 char_u *p; | |
4615 int l; | |
4616 | |
4617 from = (char *)str; | |
4618 fromlen = slen; | |
4619 for (;;) | |
4620 { | |
4621 if (len == 0 || ICONV_ERRNO == ICONV_E2BIG) | |
4622 { | |
4623 /* Allocate enough room for most conversions. When re-allocating | |
4624 * increase the buffer size. */ | |
4625 len = len + fromlen * 2 + 40; | |
4626 p = alloc((unsigned)len); | |
4627 if (p != NULL && done > 0) | |
4628 mch_memmove(p, result, done); | |
4629 vim_free(result); | |
4630 result = p; | |
4631 if (result == NULL) /* out of memory */ | |
4632 break; | |
4633 } | |
4634 | |
4635 to = (char *)result + done; | |
4636 tolen = len - done - 2; | |
4637 /* Avoid a warning for systems with a wrong iconv() prototype by | |
4638 * casting the second argument to void *. */ | |
4639 if (iconv(vcp->vc_fd, (void *)&from, &fromlen, &to, &tolen) | |
4640 != (size_t)-1) | |
4641 { | |
4642 /* Finished, append a NUL. */ | |
4643 *to = NUL; | |
4644 break; | |
4645 } | |
4646 | |
4647 /* Check both ICONV_EINVAL and EINVAL, because the dynamically loaded | |
4648 * iconv library may use one of them. */ | |
4649 if (!vcp->vc_fail && unconvlenp != NULL | |
4650 && (ICONV_ERRNO == ICONV_EINVAL || ICONV_ERRNO == EINVAL)) | |
4651 { | |
4652 /* Handle an incomplete sequence at the end. */ | |
4653 *to = NUL; | |
835 | 4654 *unconvlenp = (int)fromlen; |
7 | 4655 break; |
4656 } | |
4657 | |
4658 /* Check both ICONV_EILSEQ and EILSEQ, because the dynamically loaded | |
4659 * iconv library may use one of them. */ | |
4660 else if (!vcp->vc_fail | |
4661 && (ICONV_ERRNO == ICONV_EILSEQ || ICONV_ERRNO == EILSEQ | |
4662 || ICONV_ERRNO == ICONV_EINVAL || ICONV_ERRNO == EINVAL)) | |
4663 { | |
4664 /* Can't convert: insert a '?' and skip a character. This assumes | |
4665 * conversion from 'encoding' to something else. In other | |
4666 * situations we don't know what to skip anyway. */ | |
4667 *to++ = '?'; | |
4668 if ((*mb_ptr2cells)((char_u *)from) > 1) | |
4669 *to++ = '?'; | |
221 | 4670 if (enc_utf8) |
835 | 4671 l = utfc_ptr2len_len((char_u *)from, (int)fromlen); |
221 | 4672 else |
4673 { | |
474 | 4674 l = (*mb_ptr2len)((char_u *)from); |
227 | 4675 if (l > (int)fromlen) |
835 | 4676 l = (int)fromlen; |
221 | 4677 } |
7 | 4678 from += l; |
4679 fromlen -= l; | |
4680 } | |
4681 else if (ICONV_ERRNO != ICONV_E2BIG) | |
4682 { | |
4683 /* conversion failed */ | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13117
diff
changeset
|
4684 VIM_CLEAR(result); |
7 | 4685 break; |
4686 } | |
4687 /* Not enough room or skipping illegal sequence. */ | |
4688 done = to - (char *)result; | |
4689 } | |
1904 | 4690 |
2766 | 4691 if (resultlenp != NULL && result != NULL) |
1904 | 4692 *resultlenp = (int)(to - (char *)result); |
7 | 4693 return result; |
4694 } | |
4695 | |
4696 # if defined(DYNAMIC_ICONV) || defined(PROTO) | |
4697 /* | |
4698 * Dynamically load the "iconv.dll" on Win32. | |
4699 */ | |
4700 | |
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4701 # ifndef DYNAMIC_ICONV /* must be generating prototypes */ |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4702 # define HINSTANCE int |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4703 # endif |
297 | 4704 static HINSTANCE hIconvDLL = 0; |
4705 static HINSTANCE hMsvcrtDLL = 0; | |
7 | 4706 |
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4707 # ifndef DYNAMIC_ICONV_DLL |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4708 # define DYNAMIC_ICONV_DLL "iconv.dll" |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4709 # define DYNAMIC_ICONV_DLL_ALT1 "libiconv.dll" |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4710 # define DYNAMIC_ICONV_DLL_ALT2 "libiconv2.dll" |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4711 # define DYNAMIC_ICONV_DLL_ALT3 "libiconv-2.dll" |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4712 # endif |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4713 # ifndef DYNAMIC_MSVCRT_DLL |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4714 # define DYNAMIC_MSVCRT_DLL "msvcrt.dll" |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4715 # endif |
7 | 4716 |
4717 /* | |
4718 * Try opening the iconv.dll and return TRUE if iconv() can be used. | |
4719 */ | |
4720 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4721 iconv_enabled(int verbose) |
7 | 4722 { |
4723 if (hIconvDLL != 0 && hMsvcrtDLL != 0) | |
4724 return TRUE; | |
7162
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4725 |
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4726 /* The iconv DLL file goes under different names, try them all. |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4727 * Do the "2" version first, it's newer. */ |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4728 #ifdef DYNAMIC_ICONV_DLL_ALT2 |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4729 if (hIconvDLL == 0) |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4730 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT2); |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4731 #endif |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4732 #ifdef DYNAMIC_ICONV_DLL_ALT3 |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4733 if (hIconvDLL == 0) |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4734 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT3); |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4735 #endif |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4736 if (hIconvDLL == 0) |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4737 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL); |
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4738 #ifdef DYNAMIC_ICONV_DLL_ALT1 |
7162
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4739 if (hIconvDLL == 0) |
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4740 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT1); |
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4741 #endif |
7162
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4742 |
7 | 4743 if (hIconvDLL != 0) |
2612 | 4744 hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL); |
7 | 4745 if (hIconvDLL == 0 || hMsvcrtDLL == 0) |
4746 { | |
4747 /* Only give the message when 'verbose' is set, otherwise it might be | |
4748 * done whenever a conversion is attempted. */ | |
4749 if (verbose && p_verbose > 0) | |
292 | 4750 { |
4751 verbose_enter(); | |
7 | 4752 EMSG2(_(e_loadlib), |
4753 hIconvDLL == 0 ? DYNAMIC_ICONV_DLL : DYNAMIC_MSVCRT_DLL); | |
292 | 4754 verbose_leave(); |
4755 } | |
7 | 4756 iconv_end(); |
4757 return FALSE; | |
4758 } | |
4759 | |
344 | 4760 iconv = (void *)GetProcAddress(hIconvDLL, "libiconv"); |
4761 iconv_open = (void *)GetProcAddress(hIconvDLL, "libiconv_open"); | |
4762 iconv_close = (void *)GetProcAddress(hIconvDLL, "libiconv_close"); | |
4763 iconvctl = (void *)GetProcAddress(hIconvDLL, "libiconvctl"); | |
10571
b726d3ea70bc
patch 8.0.0175: setting language on MS-Windows does not always work
Christian Brabandt <cb@256bit.org>
parents:
10460
diff
changeset
|
4764 iconv_errno = get_dll_import_func(hIconvDLL, "_errno"); |
4025 | 4765 if (iconv_errno == NULL) |
4766 iconv_errno = (void *)GetProcAddress(hMsvcrtDLL, "_errno"); | |
7 | 4767 if (iconv == NULL || iconv_open == NULL || iconv_close == NULL |
4768 || iconvctl == NULL || iconv_errno == NULL) | |
4769 { | |
4770 iconv_end(); | |
4771 if (verbose && p_verbose > 0) | |
292 | 4772 { |
4773 verbose_enter(); | |
7 | 4774 EMSG2(_(e_loadfunc), "for libiconv"); |
292 | 4775 verbose_leave(); |
4776 } | |
7 | 4777 return FALSE; |
4778 } | |
4779 return TRUE; | |
4780 } | |
4781 | |
4782 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4783 iconv_end(void) |
7 | 4784 { |
4785 /* Don't use iconv() when inputting or outputting characters. */ | |
4786 if (input_conv.vc_type == CONV_ICONV) | |
4787 convert_setup(&input_conv, NULL, NULL); | |
4788 if (output_conv.vc_type == CONV_ICONV) | |
4789 convert_setup(&output_conv, NULL, NULL); | |
4790 | |
4791 if (hIconvDLL != 0) | |
4792 FreeLibrary(hIconvDLL); | |
4793 if (hMsvcrtDLL != 0) | |
4794 FreeLibrary(hMsvcrtDLL); | |
4795 hIconvDLL = 0; | |
4796 hMsvcrtDLL = 0; | |
4797 } | |
4798 # endif /* DYNAMIC_ICONV */ | |
4799 # endif /* USE_ICONV */ | |
4800 | |
4801 #endif /* FEAT_MBYTE */ | |
4802 | |
12936
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
4803 #ifdef FEAT_GUI |
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
4804 # define USE_IMACTIVATEFUNC (!gui.in_use && *p_imaf != NUL) |
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
4805 # define USE_IMSTATUSFUNC (!gui.in_use && *p_imsf != NUL) |
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
4806 #else |
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
4807 # define USE_IMACTIVATEFUNC (*p_imaf != NUL) |
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
4808 # define USE_IMSTATUSFUNC (*p_imsf != NUL) |
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
4809 #endif |
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
4810 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13353
diff
changeset
|
4811 #if defined(FEAT_EVAL) && defined(FEAT_MBYTE) \ |
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13353
diff
changeset
|
4812 && (defined(FEAT_XIM) || defined(IME_WITHOUT_XIM)) |
12920
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
4813 static void |
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
4814 call_imactivatefunc(int active) |
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
4815 { |
14071
c1fcfafa8d1a
patch 8.1.0053: first argument of 'completefunc' has inconsistent type
Christian Brabandt <cb@256bit.org>
parents:
13958
diff
changeset
|
4816 typval_T argv[2]; |
c1fcfafa8d1a
patch 8.1.0053: first argument of 'completefunc' has inconsistent type
Christian Brabandt <cb@256bit.org>
parents:
13958
diff
changeset
|
4817 |
c1fcfafa8d1a
patch 8.1.0053: first argument of 'completefunc' has inconsistent type
Christian Brabandt <cb@256bit.org>
parents:
13958
diff
changeset
|
4818 argv[0].v_type = VAR_NUMBER; |
c1fcfafa8d1a
patch 8.1.0053: first argument of 'completefunc' has inconsistent type
Christian Brabandt <cb@256bit.org>
parents:
13958
diff
changeset
|
4819 argv[0].vval.v_number = active ? 1 : 0; |
14075
320956bddcef
patch 8.1.0055: complete test has wrong order of arguments
Christian Brabandt <cb@256bit.org>
parents:
14071
diff
changeset
|
4820 argv[1].v_type = VAR_UNKNOWN; |
14439
e4c553e9132b
patch 8.1.0233: "safe" argument of call_vim_function() is always FALSE
Christian Brabandt <cb@256bit.org>
parents:
14333
diff
changeset
|
4821 (void)call_func_retnr(p_imaf, 1, argv); |
12920
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
4822 } |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4823 |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4824 static int |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4825 call_imstatusfunc(void) |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4826 { |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4827 int is_active; |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4828 |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4829 /* FIXME: Don't execute user function in unsafe situation. */ |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13353
diff
changeset
|
4830 if (exiting || is_autocmd_blocked()) |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4831 return FALSE; |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4832 /* FIXME: :py print 'xxx' is shown duplicate result. |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4833 * Use silent to avoid it. */ |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4834 ++msg_silent; |
14439
e4c553e9132b
patch 8.1.0233: "safe" argument of call_vim_function() is always FALSE
Christian Brabandt <cb@256bit.org>
parents:
14333
diff
changeset
|
4835 is_active = call_func_retnr(p_imsf, 0, NULL); |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4836 --msg_silent; |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4837 return (is_active > 0); |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4838 } |
12920
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
4839 #endif |
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
4840 |
7 | 4841 #if defined(FEAT_XIM) || defined(PROTO) |
4842 | |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
4843 # if defined(FEAT_GUI_GTK) || defined(PROTO) |
7 | 4844 static int xim_has_preediting INIT(= FALSE); /* IM current status */ |
4845 | |
4846 /* | |
4847 * Set preedit_start_col to the current cursor position. | |
4848 */ | |
4849 static void | |
4850 init_preedit_start_col(void) | |
4851 { | |
4852 if (State & CMDLINE) | |
4853 preedit_start_col = cmdline_getvcol_cursor(); | |
7330
8ab712f2c3b8
commit https://github.com/vim/vim/commit/9ec021a2b0dd35ba744a8e2a9430a643c85b922a
Christian Brabandt <cb@256bit.org>
parents:
7162
diff
changeset
|
4854 else if (curwin != NULL && curwin->w_buffer != NULL) |
7 | 4855 getvcol(curwin, &curwin->w_cursor, &preedit_start_col, NULL, NULL); |
4856 /* Prevent that preediting marks the buffer as changed. */ | |
4857 xim_changed_while_preediting = curbuf->b_changed; | |
4858 } | |
4859 | |
4860 static int im_is_active = FALSE; /* IM is enabled for current mode */ | |
1668 | 4861 static int preedit_is_active = FALSE; |
7 | 4862 static int im_preedit_cursor = 0; /* cursor offset in characters */ |
4863 static int im_preedit_trailing = 0; /* number of characters after cursor */ | |
4864 | |
4865 static unsigned long im_commit_handler_id = 0; | |
4866 static unsigned int im_activatekey_keyval = GDK_VoidSymbol; | |
4867 static unsigned int im_activatekey_state = 0; | |
4868 | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4869 static GtkWidget *preedit_window = NULL; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4870 static GtkWidget *preedit_label = NULL; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4871 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4872 static void im_preedit_window_set_position(void); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4873 |
7 | 4874 void |
4875 im_set_active(int active) | |
4876 { | |
4877 int was_active; | |
4878 | |
5008
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4879 was_active = !!im_get_status(); |
7 | 4880 im_is_active = (active && !p_imdisable); |
4881 | |
4882 if (im_is_active != was_active) | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
4883 xim_reset(); |
7 | 4884 } |
4885 | |
4886 void | |
4887 xim_set_focus(int focus) | |
4888 { | |
4889 if (xic != NULL) | |
4890 { | |
4891 if (focus) | |
4892 gtk_im_context_focus_in(xic); | |
4893 else | |
4894 gtk_im_context_focus_out(xic); | |
4895 } | |
4896 } | |
4897 | |
4898 void | |
4899 im_set_position(int row, int col) | |
4900 { | |
4901 if (xic != NULL) | |
4902 { | |
4903 GdkRectangle area; | |
4904 | |
4905 area.x = FILL_X(col); | |
4906 area.y = FILL_Y(row); | |
4907 area.width = gui.char_width * (mb_lefthalve(row, col) ? 2 : 1); | |
4908 area.height = gui.char_height; | |
4909 | |
4910 gtk_im_context_set_cursor_location(xic, &area); | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4911 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4912 if (p_imst == IM_OVER_THE_SPOT) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4913 im_preedit_window_set_position(); |
7 | 4914 } |
4915 } | |
4916 | |
4917 # if 0 || defined(PROTO) /* apparently only used in gui_x11.c */ | |
4918 void | |
4919 xim_set_preedit(void) | |
4920 { | |
4921 im_set_position(gui.row, gui.col); | |
4922 } | |
4923 # endif | |
4924 | |
4925 static void | |
4926 im_add_to_input(char_u *str, int len) | |
4927 { | |
4928 /* Convert from 'termencoding' (always "utf-8") to 'encoding' */ | |
4929 if (input_conv.vc_type != CONV_NONE) | |
4930 { | |
4931 str = string_convert(&input_conv, str, &len); | |
4932 g_return_if_fail(str != NULL); | |
4933 } | |
4934 | |
4935 add_to_input_buf_csi(str, len); | |
4936 | |
4937 if (input_conv.vc_type != CONV_NONE) | |
4938 vim_free(str); | |
4939 | |
4940 if (p_mh) /* blank out the pointer if necessary */ | |
4941 gui_mch_mousehide(TRUE); | |
4942 } | |
4943 | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4944 static void |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4945 im_preedit_window_set_position(void) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4946 { |
14575
f8cd07a1cbb5
patch 8.1.0301: GTK: input method popup displayed on wrong screen.
Christian Brabandt <cb@256bit.org>
parents:
14439
diff
changeset
|
4947 int x, y, width, height; |
f8cd07a1cbb5
patch 8.1.0301: GTK: input method popup displayed on wrong screen.
Christian Brabandt <cb@256bit.org>
parents:
14439
diff
changeset
|
4948 int screen_x, screen_y, screen_width, screen_height; |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4949 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4950 if (preedit_window == NULL) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4951 return; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4952 |
14575
f8cd07a1cbb5
patch 8.1.0301: GTK: input method popup displayed on wrong screen.
Christian Brabandt <cb@256bit.org>
parents:
14439
diff
changeset
|
4953 gui_gtk_get_screen_geom_of_win(gui.drawarea, |
f8cd07a1cbb5
patch 8.1.0301: GTK: input method popup displayed on wrong screen.
Christian Brabandt <cb@256bit.org>
parents:
14439
diff
changeset
|
4954 &screen_x, &screen_y, &screen_width, &screen_height); |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4955 gdk_window_get_origin(gtk_widget_get_window(gui.drawarea), &x, &y); |
14575
f8cd07a1cbb5
patch 8.1.0301: GTK: input method popup displayed on wrong screen.
Christian Brabandt <cb@256bit.org>
parents:
14439
diff
changeset
|
4956 gtk_window_get_size(GTK_WINDOW(preedit_window), &width, &height); |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4957 x = x + FILL_X(gui.col); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4958 y = y + FILL_Y(gui.row); |
14575
f8cd07a1cbb5
patch 8.1.0301: GTK: input method popup displayed on wrong screen.
Christian Brabandt <cb@256bit.org>
parents:
14439
diff
changeset
|
4959 if (x + width > screen_x + screen_width) |
f8cd07a1cbb5
patch 8.1.0301: GTK: input method popup displayed on wrong screen.
Christian Brabandt <cb@256bit.org>
parents:
14439
diff
changeset
|
4960 x = screen_x + screen_width - width; |
f8cd07a1cbb5
patch 8.1.0301: GTK: input method popup displayed on wrong screen.
Christian Brabandt <cb@256bit.org>
parents:
14439
diff
changeset
|
4961 if (y + height > screen_y + screen_height) |
f8cd07a1cbb5
patch 8.1.0301: GTK: input method popup displayed on wrong screen.
Christian Brabandt <cb@256bit.org>
parents:
14439
diff
changeset
|
4962 y = screen_y + screen_height - height; |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4963 gtk_window_move(GTK_WINDOW(preedit_window), x, y); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4964 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4965 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4966 static void |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4967 im_preedit_window_open() |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4968 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4969 char *preedit_string; |
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4970 #if !GTK_CHECK_VERSION(3,16,0) |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4971 char buf[8]; |
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4972 #endif |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4973 PangoAttrList *attr_list; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4974 PangoLayout *layout; |
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4975 #if GTK_CHECK_VERSION(3,0,0) |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4976 # if !GTK_CHECK_VERSION(3,16,0) |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4977 GdkRGBA color; |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4978 # endif |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4979 #else |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4980 GdkColor color; |
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4981 #endif |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4982 gint w, h; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4983 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4984 if (preedit_window == NULL) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4985 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4986 preedit_window = gtk_window_new(GTK_WINDOW_POPUP); |
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4987 gtk_window_set_transient_for(GTK_WINDOW(preedit_window), |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4988 GTK_WINDOW(gui.mainwin)); |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4989 preedit_label = gtk_label_new(""); |
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4990 gtk_widget_set_name(preedit_label, "vim-gui-preedit-area"); |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4991 gtk_container_add(GTK_CONTAINER(preedit_window), preedit_label); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4992 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4993 |
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4994 #if GTK_CHECK_VERSION(3,16,0) |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4995 { |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4996 GtkStyleContext * const context |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4997 = gtk_widget_get_style_context(gui.drawarea); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4998 GtkCssProvider * const provider = gtk_css_provider_new(); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4999 gchar *css = NULL; |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5000 const char * const fontname |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5001 = pango_font_description_get_family(gui.norm_font); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5002 gint fontsize |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5003 = pango_font_description_get_size(gui.norm_font) / PANGO_SCALE; |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5004 gchar *fontsize_propval = NULL; |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5005 |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5006 if (!pango_font_description_get_size_is_absolute(gui.norm_font)) |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5007 { |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5008 /* fontsize was given in points. Convert it into that in pixels |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5009 * to use with CSS. */ |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5010 GdkScreen * const screen |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5011 = gdk_window_get_screen(gtk_widget_get_window(gui.mainwin)); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5012 const gdouble dpi = gdk_screen_get_resolution(screen); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5013 fontsize = dpi * fontsize / 72; |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5014 } |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5015 if (fontsize > 0) |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5016 fontsize_propval = g_strdup_printf("%dpx", fontsize); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5017 else |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5018 fontsize_propval = g_strdup_printf("inherit"); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5019 |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5020 css = g_strdup_printf( |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5021 "widget#vim-gui-preedit-area {\n" |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5022 " font-family: %s,monospace;\n" |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5023 " font-size: %s;\n" |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5024 " color: #%.2lx%.2lx%.2lx;\n" |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5025 " background-color: #%.2lx%.2lx%.2lx;\n" |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5026 "}\n", |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5027 fontname != NULL ? fontname : "inherit", |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5028 fontsize_propval, |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5029 (gui.norm_pixel >> 16) & 0xff, |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5030 (gui.norm_pixel >> 8) & 0xff, |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5031 gui.norm_pixel & 0xff, |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5032 (gui.back_pixel >> 16) & 0xff, |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5033 (gui.back_pixel >> 8) & 0xff, |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5034 gui.back_pixel & 0xff); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5035 |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5036 gtk_css_provider_load_from_data(provider, css, -1, NULL); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5037 gtk_style_context_add_provider(context, |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5038 GTK_STYLE_PROVIDER(provider), G_MAXUINT); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5039 |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5040 g_free(css); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5041 g_free(fontsize_propval); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5042 g_object_unref(provider); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5043 } |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5044 #elif GTK_CHECK_VERSION(3,0,0) |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5045 gtk_widget_override_font(preedit_label, gui.norm_font); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5046 |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5047 vim_snprintf(buf, sizeof(buf), "#%06X", gui.norm_pixel); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5048 gdk_rgba_parse(&color, buf); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5049 gtk_widget_override_color(preedit_label, GTK_STATE_FLAG_NORMAL, &color); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5050 |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5051 vim_snprintf(buf, sizeof(buf), "#%06X", gui.back_pixel); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5052 gdk_rgba_parse(&color, buf); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5053 gtk_widget_override_background_color(preedit_label, GTK_STATE_FLAG_NORMAL, |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5054 &color); |
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5055 #else |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5056 gtk_widget_modify_font(preedit_label, gui.norm_font); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5057 |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5058 vim_snprintf(buf, sizeof(buf), "#%06X", (unsigned)gui.norm_pixel); |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5059 gdk_color_parse(buf, &color); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5060 gtk_widget_modify_fg(preedit_label, GTK_STATE_NORMAL, &color); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5061 |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5062 vim_snprintf(buf, sizeof(buf), "#%06X", (unsigned)gui.back_pixel); |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5063 gdk_color_parse(buf, &color); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5064 gtk_widget_modify_bg(preedit_window, GTK_STATE_NORMAL, &color); |
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5065 #endif |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5066 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5067 gtk_im_context_get_preedit_string(xic, &preedit_string, &attr_list, NULL); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5068 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5069 if (preedit_string[0] != NUL) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5070 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5071 gtk_label_set_text(GTK_LABEL(preedit_label), preedit_string); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5072 gtk_label_set_attributes(GTK_LABEL(preedit_label), attr_list); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5073 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5074 layout = gtk_label_get_layout(GTK_LABEL(preedit_label)); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5075 pango_layout_get_pixel_size(layout, &w, &h); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5076 h = MAX(h, gui.char_height); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5077 gtk_window_resize(GTK_WINDOW(preedit_window), w, h); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5078 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5079 gtk_widget_show_all(preedit_window); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5080 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5081 im_preedit_window_set_position(); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5082 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5083 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5084 g_free(preedit_string); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5085 pango_attr_list_unref(attr_list); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5086 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5087 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5088 static void |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5089 im_preedit_window_close() |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5090 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5091 if (preedit_window != NULL) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5092 gtk_widget_hide(preedit_window); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5093 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5094 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5095 static void |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5096 im_show_preedit() |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5097 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5098 im_preedit_window_open(); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5099 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5100 if (p_mh) /* blank out the pointer if necessary */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5101 gui_mch_mousehide(TRUE); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5102 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5103 |
7 | 5104 static void |
5105 im_delete_preedit(void) | |
5106 { | |
5107 char_u bskey[] = {CSI, 'k', 'b'}; | |
5108 char_u delkey[] = {CSI, 'k', 'D'}; | |
5109 | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5110 if (p_imst == IM_OVER_THE_SPOT) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5111 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5112 im_preedit_window_close(); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5113 return; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5114 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5115 |
12361
d3175a3bd8cd
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
5116 if (State & NORMAL |
d3175a3bd8cd
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
5117 #ifdef FEAT_TERMINAL |
d3175a3bd8cd
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
5118 && !term_use_loop() |
d3175a3bd8cd
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
5119 #endif |
d3175a3bd8cd
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
5120 ) |
7 | 5121 { |
5122 im_preedit_cursor = 0; | |
5123 return; | |
5124 } | |
5125 for (; im_preedit_cursor > 0; --im_preedit_cursor) | |
5126 add_to_input_buf(bskey, (int)sizeof(bskey)); | |
5127 | |
5128 for (; im_preedit_trailing > 0; --im_preedit_trailing) | |
5129 add_to_input_buf(delkey, (int)sizeof(delkey)); | |
5130 } | |
5131 | |
941 | 5132 /* |
5133 * Move the cursor left by "num_move_back" characters. | |
5134 * Note that ins_left() checks im_is_preediting() to avoid breaking undo for | |
5135 * these K_LEFT keys. | |
5136 */ | |
7 | 5137 static void |
5138 im_correct_cursor(int num_move_back) | |
5139 { | |
5140 char_u backkey[] = {CSI, 'k', 'l'}; | |
5141 | |
5142 if (State & NORMAL) | |
5143 return; | |
5144 # ifdef FEAT_RIGHTLEFT | |
5145 if ((State & CMDLINE) == 0 && curwin != NULL && curwin->w_p_rl) | |
5146 backkey[2] = 'r'; | |
5147 # endif | |
5148 for (; num_move_back > 0; --num_move_back) | |
5149 add_to_input_buf(backkey, (int)sizeof(backkey)); | |
5150 } | |
5151 | |
5152 static int xim_expected_char = NUL; | |
5153 static int xim_ignored_char = FALSE; | |
5154 | |
5155 /* | |
5156 * Update the mode and cursor while in an IM callback. | |
5157 */ | |
5158 static void | |
5159 im_show_info(void) | |
5160 { | |
5161 int old_vgetc_busy; | |
822 | 5162 |
7 | 5163 old_vgetc_busy = vgetc_busy; |
5164 vgetc_busy = TRUE; | |
5165 showmode(); | |
5166 vgetc_busy = old_vgetc_busy; | |
3402 | 5167 if ((State & NORMAL) || (State & INSERT)) |
5168 setcursor(); | |
7 | 5169 out_flush(); |
5170 } | |
5171 | |
5172 /* | |
5173 * Callback invoked when the user finished preediting. | |
5174 * Put the final string into the input buffer. | |
5175 */ | |
5176 static void | |
1883 | 5177 im_commit_cb(GtkIMContext *context UNUSED, |
5178 const gchar *str, | |
5179 gpointer data UNUSED) | |
7 | 5180 { |
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5181 int slen = (int)STRLEN(str); |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5182 int add_to_input = TRUE; |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5183 int clen; |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5184 int len = slen; |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5185 int commit_with_preedit = TRUE; |
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5186 char_u *im_str; |
7 | 5187 |
5188 #ifdef XIM_DEBUG | |
5189 xim_log("im_commit_cb(): %s\n", str); | |
5190 #endif | |
5191 | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5192 if (p_imst == IM_ON_THE_SPOT) |
7 | 5193 { |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5194 /* The imhangul module doesn't reset the preedit string before |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5195 * committing. Call im_delete_preedit() to work around that. */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5196 im_delete_preedit(); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5197 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5198 /* Indicate that preediting has finished. */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5199 if (preedit_start_col == MAXCOL) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5200 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5201 init_preedit_start_col(); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5202 commit_with_preedit = FALSE; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5203 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5204 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5205 /* The thing which setting "preedit_start_col" to MAXCOL means that |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5206 * "preedit_start_col" will be set forcedly when calling |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5207 * preedit_changed_cb() next time. |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5208 * "preedit_start_col" should not reset with MAXCOL on this part. Vim |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5209 * is simulating the preediting by using add_to_input_str(). when |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5210 * preedit begin immediately before committed, the typebuf is not |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5211 * flushed to screen, then it can't get correct "preedit_start_col". |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5212 * Thus, it should calculate the cells by adding cells of the committed |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5213 * string. */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5214 if (input_conv.vc_type != CONV_NONE) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5215 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5216 im_str = string_convert(&input_conv, (char_u *)str, &len); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5217 g_return_if_fail(im_str != NULL); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5218 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5219 else |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5220 im_str = (char_u *)str; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5221 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5222 clen = mb_string2cells(im_str, len); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5223 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5224 if (input_conv.vc_type != CONV_NONE) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5225 vim_free(im_str); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5226 preedit_start_col += clen; |
7 | 5227 } |
5228 | |
5229 /* Is this a single character that matches a keypad key that's just | |
5230 * been pressed? If so, we don't want it to be entered as such - let | |
5231 * us carry on processing the raw keycode so that it may be used in | |
5232 * mappings as <kSomething>. */ | |
5233 if (xim_expected_char != NUL) | |
5234 { | |
5235 /* We're currently processing a keypad or other special key */ | |
5236 if (slen == 1 && str[0] == xim_expected_char) | |
5237 { | |
5238 /* It's a match - don't do it here */ | |
5239 xim_ignored_char = TRUE; | |
5240 add_to_input = FALSE; | |
5241 } | |
5242 else | |
5243 { | |
5244 /* Not a match */ | |
5245 xim_ignored_char = FALSE; | |
5246 } | |
5247 } | |
5248 | |
5249 if (add_to_input) | |
5250 im_add_to_input((char_u *)str, slen); | |
5251 | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5252 if (p_imst == IM_ON_THE_SPOT) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5253 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5254 /* Inserting chars while "im_is_active" is set does not cause a |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5255 * change of buffer. When the chars are committed the buffer must be |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5256 * marked as changed. */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5257 if (!commit_with_preedit) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5258 preedit_start_col = MAXCOL; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5259 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5260 /* This flag is used in changed() at next call. */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5261 xim_changed_while_preediting = TRUE; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5262 } |
7 | 5263 |
5264 if (gtk_main_level() > 0) | |
5265 gtk_main_quit(); | |
5266 } | |
5267 | |
5268 /* | |
5269 * Callback invoked after start to the preedit. | |
5270 */ | |
5271 static void | |
1883 | 5272 im_preedit_start_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) |
7 | 5273 { |
5274 #ifdef XIM_DEBUG | |
5275 xim_log("im_preedit_start_cb()\n"); | |
5276 #endif | |
5277 | |
5278 im_is_active = TRUE; | |
1668 | 5279 preedit_is_active = TRUE; |
7 | 5280 gui_update_cursor(TRUE, FALSE); |
1668 | 5281 im_show_info(); |
7 | 5282 } |
5283 | |
5284 /* | |
5285 * Callback invoked after end to the preedit. | |
5286 */ | |
5287 static void | |
1883 | 5288 im_preedit_end_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) |
7 | 5289 { |
5290 #ifdef XIM_DEBUG | |
5291 xim_log("im_preedit_end_cb()\n"); | |
5292 #endif | |
5293 im_delete_preedit(); | |
5294 | |
5295 /* Indicate that preediting has finished */ | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5296 if (p_imst == IM_ON_THE_SPOT) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5297 preedit_start_col = MAXCOL; |
7 | 5298 xim_has_preediting = FALSE; |
5299 | |
1620 | 5300 #if 0 |
5301 /* Removal of this line suggested by Takuhiro Nishioka. Fixes that IM was | |
1668 | 5302 * switched off unintentionally. We now use preedit_is_active (added by |
5303 * SungHyun Nam). */ | |
7 | 5304 im_is_active = FALSE; |
1620 | 5305 #endif |
1668 | 5306 preedit_is_active = FALSE; |
7 | 5307 gui_update_cursor(TRUE, FALSE); |
5308 im_show_info(); | |
5309 } | |
5310 | |
5311 /* | |
5312 * Callback invoked after changes to the preedit string. If the preedit | |
5313 * string was empty before, remember the preedit start column so we know | |
5314 * where to apply feedback attributes. Delete the previous preedit string | |
5315 * if there was one, save the new preedit cursor offset, and put the new | |
5316 * string into the input buffer. | |
5317 * | |
5318 * TODO: The pragmatic "put into input buffer" approach used here has | |
5319 * several fundamental problems: | |
5320 * | |
5321 * - The characters in the preedit string are subject to remapping. | |
5322 * That's broken, only the finally committed string should be remapped. | |
5323 * | |
5324 * - There is a race condition involved: The retrieved value for the | |
5325 * current cursor position will be wrong if any unprocessed characters | |
5326 * are still queued in the input buffer. | |
5327 * | |
5328 * - Due to the lack of synchronization between the file buffer in memory | |
5329 * and any typed characters, it's practically impossible to implement the | |
5330 * "retrieve_surrounding" and "delete_surrounding" signals reliably. IM | |
5331 * modules for languages such as Thai are likely to rely on this feature | |
5332 * for proper operation. | |
5333 * | |
5334 * Conclusions: I think support for preediting needs to be moved to the | |
5335 * core parts of Vim. Ideally, until it has been committed, the preediting | |
5336 * string should only be displayed and not affect the buffer content at all. | |
5337 * The question how to deal with the synchronization issue still remains. | |
5338 * Circumventing the input buffer is probably not desirable. Anyway, I think | |
5339 * implementing "retrieve_surrounding" is the only hard problem. | |
5340 * | |
5341 * One way to solve all of this in a clean manner would be to queue all key | |
5342 * press/release events "as is" in the input buffer, and apply the IM filtering | |
5343 * at the receiving end of the queue. This, however, would have a rather large | |
5344 * impact on the code base. If there is an easy way to force processing of all | |
5345 * remaining input from within the "retrieve_surrounding" signal handler, this | |
5346 * might not be necessary. Gotta ask on vim-dev for opinions. | |
5347 */ | |
5348 static void | |
1883 | 5349 im_preedit_changed_cb(GtkIMContext *context, gpointer data UNUSED) |
7 | 5350 { |
5351 char *preedit_string = NULL; | |
5352 int cursor_index = 0; | |
5353 int num_move_back = 0; | |
5354 char_u *str; | |
5355 char_u *p; | |
5356 int i; | |
5357 | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5358 if (p_imst == IM_ON_THE_SPOT) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5359 gtk_im_context_get_preedit_string(context, |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5360 &preedit_string, NULL, |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5361 &cursor_index); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5362 else |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5363 gtk_im_context_get_preedit_string(context, |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5364 &preedit_string, NULL, |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5365 NULL); |
7 | 5366 |
5367 #ifdef XIM_DEBUG | |
5368 xim_log("im_preedit_changed_cb(): %s\n", preedit_string); | |
5369 #endif | |
5370 | |
5371 g_return_if_fail(preedit_string != NULL); /* just in case */ | |
5372 | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5373 if (p_imst == IM_OVER_THE_SPOT) |
7 | 5374 { |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5375 if (preedit_string[0] == NUL) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5376 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5377 xim_has_preediting = FALSE; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5378 im_delete_preedit(); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5379 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5380 else |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5381 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5382 xim_has_preediting = TRUE; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5383 im_show_preedit(); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5384 } |
7 | 5385 } |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5386 else |
7 | 5387 { |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5388 /* If preedit_start_col is MAXCOL set it to the current cursor position. */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5389 if (preedit_start_col == MAXCOL && preedit_string[0] != '\0') |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5390 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5391 xim_has_preediting = TRUE; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5392 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5393 /* Urgh, this breaks if the input buffer isn't empty now */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5394 init_preedit_start_col(); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5395 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5396 else if (cursor_index == 0 && preedit_string[0] == '\0') |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5397 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5398 xim_has_preediting = FALSE; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5399 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5400 /* If at the start position (after typing backspace) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5401 * preedit_start_col must be reset. */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5402 preedit_start_col = MAXCOL; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5403 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5404 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5405 im_delete_preedit(); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5406 |
7 | 5407 /* |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5408 * Compute the end of the preediting area: "preedit_end_col". |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5409 * According to the documentation of gtk_im_context_get_preedit_string(), |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5410 * the cursor_pos output argument returns the offset in bytes. This is |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5411 * unfortunately not true -- real life shows the offset is in characters, |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5412 * and the GTK+ source code agrees with me. Will file a bug later. |
7 | 5413 */ |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5414 if (preedit_start_col != MAXCOL) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5415 preedit_end_col = preedit_start_col; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5416 str = (char_u *)preedit_string; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5417 for (p = str, i = 0; *p != NUL; p += utf_byte2len(*p), ++i) |
7 | 5418 { |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5419 int is_composing; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5420 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5421 is_composing = ((*p & 0x80) != 0 && utf_iscomposing(utf_ptr2char(p))); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5422 /* |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5423 * These offsets are used as counters when generating <BS> and <Del> |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5424 * to delete the preedit string. So don't count composing characters |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5425 * unless 'delcombine' is enabled. |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5426 */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5427 if (!is_composing || p_deco) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5428 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5429 if (i < cursor_index) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5430 ++im_preedit_cursor; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5431 else |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5432 ++im_preedit_trailing; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5433 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5434 if (!is_composing && i >= cursor_index) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5435 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5436 /* This is essentially the same as im_preedit_trailing, except |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5437 * composing characters are not counted even if p_deco is set. */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5438 ++num_move_back; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5439 } |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5440 if (preedit_start_col != MAXCOL) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5441 preedit_end_col += utf_ptr2cells(p); |
7 | 5442 } |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5443 |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5444 if (p > str) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5445 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5446 im_add_to_input(str, (int)(p - str)); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5447 im_correct_cursor(num_move_back); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5448 } |
7 | 5449 } |
5450 | |
5451 g_free(preedit_string); | |
5452 | |
5453 if (gtk_main_level() > 0) | |
5454 gtk_main_quit(); | |
5455 } | |
5456 | |
5457 /* | |
5458 * Translate the Pango attributes at iter to Vim highlighting attributes. | |
5459 * Ignore attributes not supported by Vim highlighting. This shouldn't have | |
5460 * too much impact -- right now we handle even more attributes than necessary | |
5461 * for the IM modules I tested with. | |
5462 */ | |
5463 static int | |
5464 translate_pango_attributes(PangoAttrIterator *iter) | |
5465 { | |
5466 PangoAttribute *attr; | |
5467 int char_attr = HL_NORMAL; | |
5468 | |
5469 attr = pango_attr_iterator_get(iter, PANGO_ATTR_UNDERLINE); | |
5470 if (attr != NULL && ((PangoAttrInt *)attr)->value | |
5471 != (int)PANGO_UNDERLINE_NONE) | |
5472 char_attr |= HL_UNDERLINE; | |
5473 | |
5474 attr = pango_attr_iterator_get(iter, PANGO_ATTR_WEIGHT); | |
5475 if (attr != NULL && ((PangoAttrInt *)attr)->value >= (int)PANGO_WEIGHT_BOLD) | |
5476 char_attr |= HL_BOLD; | |
5477 | |
5478 attr = pango_attr_iterator_get(iter, PANGO_ATTR_STYLE); | |
5479 if (attr != NULL && ((PangoAttrInt *)attr)->value | |
5480 != (int)PANGO_STYLE_NORMAL) | |
5481 char_attr |= HL_ITALIC; | |
5482 | |
5483 attr = pango_attr_iterator_get(iter, PANGO_ATTR_BACKGROUND); | |
5484 if (attr != NULL) | |
5485 { | |
5486 const PangoColor *color = &((PangoAttrColor *)attr)->color; | |
5487 | |
5488 /* Assume inverse if black background is requested */ | |
5489 if ((color->red | color->green | color->blue) == 0) | |
5490 char_attr |= HL_INVERSE; | |
5491 } | |
5492 | |
5493 return char_attr; | |
5494 } | |
5495 | |
5496 /* | |
5497 * Retrieve the highlighting attributes at column col in the preedit string. | |
5498 * Return -1 if not in preediting mode or if col is out of range. | |
5499 */ | |
5500 int | |
5501 im_get_feedback_attr(int col) | |
5502 { | |
5503 char *preedit_string = NULL; | |
5504 PangoAttrList *attr_list = NULL; | |
5505 int char_attr = -1; | |
5506 | |
5507 if (xic == NULL) | |
5508 return char_attr; | |
5509 | |
5510 gtk_im_context_get_preedit_string(xic, &preedit_string, &attr_list, NULL); | |
5511 | |
5512 if (preedit_string != NULL && attr_list != NULL) | |
5513 { | |
944 | 5514 int idx; |
7 | 5515 |
5516 /* Get the byte index as used by PangoAttrIterator */ | |
944 | 5517 for (idx = 0; col > 0 && preedit_string[idx] != '\0'; --col) |
5518 idx += utfc_ptr2len((char_u *)preedit_string + idx); | |
5519 | |
5520 if (preedit_string[idx] != '\0') | |
7 | 5521 { |
5522 PangoAttrIterator *iter; | |
5523 int start, end; | |
5524 | |
5525 char_attr = HL_NORMAL; | |
5526 iter = pango_attr_list_get_iterator(attr_list); | |
5527 | |
5528 /* Extract all relevant attributes from the list. */ | |
5529 do | |
5530 { | |
5531 pango_attr_iterator_range(iter, &start, &end); | |
5532 | |
944 | 5533 if (idx >= start && idx < end) |
7 | 5534 char_attr |= translate_pango_attributes(iter); |
5535 } | |
5536 while (pango_attr_iterator_next(iter)); | |
5537 | |
5538 pango_attr_iterator_destroy(iter); | |
5539 } | |
5540 } | |
5541 | |
5542 if (attr_list != NULL) | |
5543 pango_attr_list_unref(attr_list); | |
5544 g_free(preedit_string); | |
5545 | |
5546 return char_attr; | |
5547 } | |
5548 | |
5549 void | |
5550 xim_init(void) | |
5551 { | |
5552 #ifdef XIM_DEBUG | |
5553 xim_log("xim_init()\n"); | |
5554 #endif | |
5555 | |
5556 g_return_if_fail(gui.drawarea != NULL); | |
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5557 g_return_if_fail(gtk_widget_get_window(gui.drawarea) != NULL); |
7 | 5558 |
5559 xic = gtk_im_multicontext_new(); | |
5560 g_object_ref(xic); | |
5561 | |
5562 im_commit_handler_id = g_signal_connect(G_OBJECT(xic), "commit", | |
5563 G_CALLBACK(&im_commit_cb), NULL); | |
5564 g_signal_connect(G_OBJECT(xic), "preedit_changed", | |
5565 G_CALLBACK(&im_preedit_changed_cb), NULL); | |
5566 g_signal_connect(G_OBJECT(xic), "preedit_start", | |
5567 G_CALLBACK(&im_preedit_start_cb), NULL); | |
5568 g_signal_connect(G_OBJECT(xic), "preedit_end", | |
5569 G_CALLBACK(&im_preedit_end_cb), NULL); | |
5570 | |
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5571 gtk_im_context_set_client_window(xic, gtk_widget_get_window(gui.drawarea)); |
7 | 5572 } |
5573 | |
5574 void | |
5575 im_shutdown(void) | |
5576 { | |
5577 #ifdef XIM_DEBUG | |
5578 xim_log("im_shutdown()\n"); | |
5579 #endif | |
5580 | |
5581 if (xic != NULL) | |
5582 { | |
5583 gtk_im_context_focus_out(xic); | |
5584 g_object_unref(xic); | |
5585 xic = NULL; | |
5586 } | |
5587 im_is_active = FALSE; | |
5588 im_commit_handler_id = 0; | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5589 if (p_imst == IM_ON_THE_SPOT) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5590 preedit_start_col = MAXCOL; |
7 | 5591 xim_has_preediting = FALSE; |
5592 } | |
5593 | |
5594 /* | |
5595 * Convert the string argument to keyval and state for GdkEventKey. | |
5596 * If str is valid return TRUE, otherwise FALSE. | |
5597 * | |
5598 * See 'imactivatekey' for documentation of the format. | |
5599 */ | |
5600 static int | |
5601 im_string_to_keyval(const char *str, unsigned int *keyval, unsigned int *state) | |
5602 { | |
5603 const char *mods_end; | |
5604 unsigned tmp_keyval; | |
5605 unsigned tmp_state = 0; | |
5606 | |
5607 mods_end = strrchr(str, '-'); | |
5608 mods_end = (mods_end != NULL) ? mods_end + 1 : str; | |
5609 | |
5610 /* Parse modifier keys */ | |
5611 while (str < mods_end) | |
5612 switch (*str++) | |
5613 { | |
5614 case '-': break; | |
5615 case 'S': case 's': tmp_state |= (unsigned)GDK_SHIFT_MASK; break; | |
5616 case 'L': case 'l': tmp_state |= (unsigned)GDK_LOCK_MASK; break; | |
5617 case 'C': case 'c': tmp_state |= (unsigned)GDK_CONTROL_MASK;break; | |
5618 case '1': tmp_state |= (unsigned)GDK_MOD1_MASK; break; | |
5619 case '2': tmp_state |= (unsigned)GDK_MOD2_MASK; break; | |
5620 case '3': tmp_state |= (unsigned)GDK_MOD3_MASK; break; | |
5621 case '4': tmp_state |= (unsigned)GDK_MOD4_MASK; break; | |
5622 case '5': tmp_state |= (unsigned)GDK_MOD5_MASK; break; | |
5623 default: | |
5624 return FALSE; | |
5625 } | |
5626 | |
5627 tmp_keyval = gdk_keyval_from_name(str); | |
5628 | |
5629 if (tmp_keyval == 0 || tmp_keyval == GDK_VoidSymbol) | |
5630 return FALSE; | |
5631 | |
5632 if (keyval != NULL) | |
5633 *keyval = tmp_keyval; | |
5634 if (state != NULL) | |
5635 *state = tmp_state; | |
5636 | |
5637 return TRUE; | |
5638 } | |
5639 | |
5640 /* | |
5641 * Return TRUE if p_imak is valid, otherwise FALSE. As a special case, an | |
5642 * empty string is also regarded as valid. | |
5643 * | |
5644 * Note: The numerical key value of p_imak is cached if it was valid; thus | |
5645 * boldly assuming im_xim_isvalid_imactivate() will always be called whenever | |
5646 * 'imak' changes. This is currently the case but not obvious -- should | |
5647 * probably rename the function for clarity. | |
5648 */ | |
5649 int | |
5650 im_xim_isvalid_imactivate(void) | |
5651 { | |
5652 if (p_imak[0] == NUL) | |
5653 { | |
5654 im_activatekey_keyval = GDK_VoidSymbol; | |
5655 im_activatekey_state = 0; | |
5656 return TRUE; | |
5657 } | |
5658 | |
5659 return im_string_to_keyval((const char *)p_imak, | |
5660 &im_activatekey_keyval, | |
5661 &im_activatekey_state); | |
5662 } | |
5663 | |
5664 static void | |
5665 im_synthesize_keypress(unsigned int keyval, unsigned int state) | |
5666 { | |
5667 GdkEventKey *event; | |
5668 | |
5669 event = (GdkEventKey *)gdk_event_new(GDK_KEY_PRESS); | |
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5670 g_object_ref(gtk_widget_get_window(gui.drawarea)); |
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5671 /* unreffed by gdk_event_free() */ |
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5672 event->window = gtk_widget_get_window(gui.drawarea); |
7 | 5673 event->send_event = TRUE; |
5674 event->time = GDK_CURRENT_TIME; | |
5675 event->state = state; | |
5676 event->keyval = keyval; | |
5677 event->hardware_keycode = /* needed for XIM */ | |
5678 XKeysymToKeycode(GDK_WINDOW_XDISPLAY(event->window), (KeySym)keyval); | |
5679 event->length = 0; | |
5680 event->string = NULL; | |
5681 | |
5682 gtk_im_context_filter_keypress(xic, event); | |
5683 | |
5684 /* For consistency, also send the corresponding release event. */ | |
5685 event->type = GDK_KEY_RELEASE; | |
5686 event->send_event = FALSE; | |
5687 gtk_im_context_filter_keypress(xic, event); | |
5688 | |
5689 gdk_event_free((GdkEvent *)event); | |
5690 } | |
5691 | |
5692 void | |
5693 xim_reset(void) | |
5694 { | |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13353
diff
changeset
|
5695 # ifdef FEAT_EVAL |
12936
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
5696 if (USE_IMACTIVATEFUNC) |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5697 call_imactivatefunc(im_is_active); |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5698 else |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13353
diff
changeset
|
5699 # endif |
7 | 5700 if (xic != NULL) |
5701 { | |
5702 gtk_im_context_reset(xic); | |
5703 | |
5704 if (p_imdisable) | |
5705 im_shutdown(); | |
5706 else | |
5707 { | |
5708 xim_set_focus(gui.in_focus); | |
5709 | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5710 if (im_activatekey_keyval != GDK_VoidSymbol) |
7 | 5711 { |
5712 if (im_is_active) | |
5713 { | |
5714 g_signal_handler_block(xic, im_commit_handler_id); | |
5715 im_synthesize_keypress(im_activatekey_keyval, | |
5716 im_activatekey_state); | |
5717 g_signal_handler_unblock(xic, im_commit_handler_id); | |
5718 } | |
5719 } | |
5720 else | |
5721 { | |
5722 im_shutdown(); | |
5723 xim_init(); | |
5724 xim_set_focus(gui.in_focus); | |
5725 } | |
5726 } | |
5727 } | |
5728 | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5729 if (p_imst == IM_ON_THE_SPOT) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5730 preedit_start_col = MAXCOL; |
7 | 5731 xim_has_preediting = FALSE; |
5732 } | |
5733 | |
5734 int | |
5735 xim_queue_key_press_event(GdkEventKey *event, int down) | |
5736 { | |
5737 if (down) | |
5738 { | |
5739 /* | |
5740 * Workaround GTK2 XIM 'feature' that always converts keypad keys to | |
5741 * chars., even when not part of an IM sequence (ref. feature of | |
5742 * gdk/gdkkeyuni.c). | |
5743 * Flag any keypad keys that might represent a single char. | |
5744 * If this (on its own - i.e., not part of an IM sequence) is | |
5745 * committed while we're processing one of these keys, we can ignore | |
5746 * that commit and go ahead & process it ourselves. That way we can | |
5747 * still distinguish keypad keys for use in mappings. | |
1620 | 5748 * Also add GDK_space to make <S-Space> work. |
7 | 5749 */ |
5750 switch (event->keyval) | |
5751 { | |
5752 case GDK_KP_Add: xim_expected_char = '+'; break; | |
5753 case GDK_KP_Subtract: xim_expected_char = '-'; break; | |
5754 case GDK_KP_Divide: xim_expected_char = '/'; break; | |
5755 case GDK_KP_Multiply: xim_expected_char = '*'; break; | |
5756 case GDK_KP_Decimal: xim_expected_char = '.'; break; | |
5757 case GDK_KP_Equal: xim_expected_char = '='; break; | |
5758 case GDK_KP_0: xim_expected_char = '0'; break; | |
5759 case GDK_KP_1: xim_expected_char = '1'; break; | |
5760 case GDK_KP_2: xim_expected_char = '2'; break; | |
5761 case GDK_KP_3: xim_expected_char = '3'; break; | |
5762 case GDK_KP_4: xim_expected_char = '4'; break; | |
5763 case GDK_KP_5: xim_expected_char = '5'; break; | |
5764 case GDK_KP_6: xim_expected_char = '6'; break; | |
5765 case GDK_KP_7: xim_expected_char = '7'; break; | |
5766 case GDK_KP_8: xim_expected_char = '8'; break; | |
5767 case GDK_KP_9: xim_expected_char = '9'; break; | |
1620 | 5768 case GDK_space: xim_expected_char = ' '; break; |
7 | 5769 default: xim_expected_char = NUL; |
5770 } | |
5771 xim_ignored_char = FALSE; | |
5772 } | |
5773 | |
5774 /* | |
5775 * When typing fFtT, XIM may be activated. Thus it must pass | |
5776 * gtk_im_context_filter_keypress() in Normal mode. | |
5777 * And while doing :sh too. | |
5778 */ | |
5779 if (xic != NULL && !p_imdisable | |
5780 && (State & (INSERT | CMDLINE | NORMAL | EXTERNCMD)) != 0) | |
5781 { | |
5782 /* | |
5783 * Filter 'imactivatekey' and map it to CTRL-^. This way, Vim is | |
5784 * always aware of the current status of IM, and can even emulate | |
5785 * the activation key for modules that don't support one. | |
5786 */ | |
5787 if (event->keyval == im_activatekey_keyval | |
5788 && (event->state & im_activatekey_state) == im_activatekey_state) | |
5789 { | |
5790 unsigned int state_mask; | |
5791 | |
5792 /* Require the state of the 3 most used modifiers to match exactly. | |
5793 * Otherwise e.g. <S-C-space> would be unusable for other purposes | |
5794 * if the IM activate key is <S-space>. */ | |
5795 state_mask = im_activatekey_state; | |
5796 state_mask |= ((int)GDK_SHIFT_MASK | (int)GDK_CONTROL_MASK | |
5797 | (int)GDK_MOD1_MASK); | |
5798 | |
5799 if ((event->state & state_mask) != im_activatekey_state) | |
5800 return FALSE; | |
5801 | |
5802 /* Don't send it a second time on GDK_KEY_RELEASE. */ | |
5803 if (event->type != GDK_KEY_PRESS) | |
5804 return TRUE; | |
5805 | |
781 | 5806 if (map_to_exists_mode((char_u *)"", LANGMAP, FALSE)) |
7 | 5807 { |
5808 im_set_active(FALSE); | |
5809 | |
5810 /* ":lmap" mappings exists, toggle use of mappings. */ | |
5811 State ^= LANGMAP; | |
5812 if (State & LANGMAP) | |
5813 { | |
5814 curbuf->b_p_iminsert = B_IMODE_NONE; | |
5815 State &= ~LANGMAP; | |
5816 } | |
5817 else | |
5818 { | |
5819 curbuf->b_p_iminsert = B_IMODE_LMAP; | |
5820 State |= LANGMAP; | |
5821 } | |
5822 return TRUE; | |
5823 } | |
5824 | |
5825 return gtk_im_context_filter_keypress(xic, event); | |
5826 } | |
5827 | |
5828 /* Don't filter events through the IM context if IM isn't active | |
5829 * right now. Unlike with GTK+ 1.2 we cannot rely on the IM module | |
5830 * not doing anything before the activation key was sent. */ | |
5831 if (im_activatekey_keyval == GDK_VoidSymbol || im_is_active) | |
5832 { | |
5833 int imresult = gtk_im_context_filter_keypress(xic, event); | |
5834 | |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5835 if (p_imst == IM_ON_THE_SPOT) |
7 | 5836 { |
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5837 /* Some XIM send following sequence: |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5838 * 1. preedited string. |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5839 * 2. committed string. |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5840 * 3. line changed key. |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5841 * 4. preedited string. |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5842 * 5. remove preedited string. |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5843 * if 3, Vim can't move back the above line for 5. |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5844 * thus, this part should not parse the key. */ |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5845 if (!imresult && preedit_start_col != MAXCOL |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5846 && event->keyval == GDK_Return) |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5847 { |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5848 im_synthesize_keypress(GDK_Return, 0U); |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5849 return FALSE; |
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5850 } |
7 | 5851 } |
5852 | |
5853 /* If XIM tried to commit a keypad key as a single char., | |
5854 * ignore it so we can use the keypad key 'raw', for mappings. */ | |
5855 if (xim_expected_char != NUL && xim_ignored_char) | |
5856 /* We had a keypad key, and XIM tried to thieve it */ | |
5857 return FALSE; | |
5858 | |
2988 | 5859 /* This is supposed to fix a problem with iBus, that space |
5860 * characters don't work in input mode. */ | |
5861 xim_expected_char = NUL; | |
5862 | |
7 | 5863 /* Normal processing */ |
5864 return imresult; | |
5865 } | |
5866 } | |
5867 | |
5868 return FALSE; | |
5869 } | |
5870 | |
5871 int | |
5872 im_get_status(void) | |
5873 { | |
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5874 # ifdef FEAT_EVAL |
12936
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
5875 if (USE_IMSTATUSFUNC) |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5876 return call_imstatusfunc(); |
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5877 # endif |
7 | 5878 return im_is_active; |
5879 } | |
5880 | |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5881 int |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5882 preedit_get_status(void) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5883 { |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5884 return preedit_is_active; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5885 } |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5886 |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5887 int |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5888 im_is_preediting(void) |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5889 { |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5890 return xim_has_preediting; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5891 } |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5892 |
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
5893 # else /* !FEAT_GUI_GTK */ |
7 | 5894 |
5895 static int xim_is_active = FALSE; /* XIM should be active in the current | |
5896 mode */ | |
5897 static int xim_has_focus = FALSE; /* XIM is really being used for Vim */ | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5898 # ifdef FEAT_GUI_X11 |
7 | 5899 static XIMStyle input_style; |
5900 static int status_area_enabled = TRUE; | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5901 # endif |
7 | 5902 |
5903 /* | |
5904 * Switch using XIM on/off. This is used by the code that changes "State". | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5905 * When 'imactivatefunc' is defined use that function instead. |
7 | 5906 */ |
5907 void | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5908 im_set_active(int active_arg) |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5909 { |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5910 int active = active_arg; |
7 | 5911 |
5912 /* If 'imdisable' is set, XIM is never active. */ | |
5913 if (p_imdisable) | |
5914 active = FALSE; | |
5915 else if (input_style & XIMPreeditPosition) | |
5916 /* There is a problem in switching XIM off when preediting is used, | |
5917 * and it is not clear how this can be solved. For now, keep XIM on | |
5918 * all the time, like it was done in Vim 5.8. */ | |
5919 active = TRUE; | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5920 |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5921 # if defined(FEAT_EVAL) |
12936
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
5922 if (USE_IMACTIVATEFUNC) |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5923 { |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5924 if (active != im_get_status()) |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5925 { |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5926 call_imactivatefunc(active); |
12932
fe5e4fec0d41
patch 8.0.1342: cannot build with Motif and multi-byte
Christian Brabandt <cb@256bit.org>
parents:
12928
diff
changeset
|
5927 xim_has_focus = active; |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5928 } |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5929 return; |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5930 } |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5931 # endif |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5932 |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5933 if (xic == NULL) |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
5934 return; |
7 | 5935 |
5936 /* Remember the active state, it is needed when Vim gets keyboard focus. */ | |
5937 xim_is_active = active; | |
5938 xim_set_preedit(); | |
5939 } | |
5940 | |
5941 /* | |
5942 * Adjust using XIM for gaining or losing keyboard focus. Also called when | |
5943 * "xim_is_active" changes. | |
5944 */ | |
5945 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5946 xim_set_focus(int focus) |
7 | 5947 { |
5948 if (xic == NULL) | |
5949 return; | |
5950 | |
5951 /* | |
5952 * XIM only gets focus when the Vim window has keyboard focus and XIM has | |
5953 * been set active for the current mode. | |
5954 */ | |
5955 if (focus && xim_is_active) | |
5956 { | |
5957 if (!xim_has_focus) | |
5958 { | |
5959 xim_has_focus = TRUE; | |
5960 XSetICFocus(xic); | |
5961 } | |
5962 } | |
5963 else | |
5964 { | |
5965 if (xim_has_focus) | |
5966 { | |
5967 xim_has_focus = FALSE; | |
5968 XUnsetICFocus(xic); | |
5969 } | |
5970 } | |
5971 } | |
5972 | |
5973 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5974 im_set_position(int row UNUSED, int col UNUSED) |
7 | 5975 { |
5976 xim_set_preedit(); | |
5977 } | |
5978 | |
5979 /* | |
5980 * Set the XIM to the current cursor position. | |
5981 */ | |
5982 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5983 xim_set_preedit(void) |
7 | 5984 { |
2580 | 5985 XVaNestedList attr_list; |
5986 XRectangle spot_area; | |
5987 XPoint over_spot; | |
5988 int line_space; | |
5989 | |
7 | 5990 if (xic == NULL) |
5991 return; | |
5992 | |
5993 xim_set_focus(TRUE); | |
5994 | |
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5995 if (!xim_has_focus) |
7 | 5996 { |
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5997 /* hide XIM cursor */ |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5998 over_spot.x = 0; |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5999 over_spot.y = -100; /* arbitrary invisible position */ |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6000 attr_list = (XVaNestedList) XVaCreateNestedList(0, |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6001 XNSpotLocation, |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6002 &over_spot, |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6003 NULL); |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6004 XSetICValues(xic, XNPreeditAttributes, attr_list, NULL); |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6005 XFree(attr_list); |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6006 return; |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6007 } |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6008 |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6009 if (input_style & XIMPreeditPosition) |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6010 { |
7 | 6011 if (xim_fg_color == INVALCOLOR) |
6012 { | |
6013 xim_fg_color = gui.def_norm_pixel; | |
6014 xim_bg_color = gui.def_back_pixel; | |
6015 } | |
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6016 over_spot.x = TEXT_X(gui.col); |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6017 over_spot.y = TEXT_Y(gui.row); |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6018 spot_area.x = 0; |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6019 spot_area.y = 0; |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6020 spot_area.height = gui.char_height * Rows; |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6021 spot_area.width = gui.char_width * Columns; |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6022 line_space = gui.char_height; |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6023 attr_list = (XVaNestedList) XVaCreateNestedList(0, |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6024 XNSpotLocation, &over_spot, |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6025 XNForeground, (Pixel) xim_fg_color, |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6026 XNBackground, (Pixel) xim_bg_color, |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6027 XNArea, &spot_area, |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6028 XNLineSpace, line_space, |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6029 NULL); |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6030 if (XSetICValues(xic, XNPreeditAttributes, attr_list, NULL)) |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6031 EMSG(_("E284: Cannot set IC values")); |
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6032 XFree(attr_list); |
7 | 6033 } |
6034 } | |
6035 | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6036 # if defined(FEAT_GUI_X11) |
7 | 6037 static char e_xim[] = N_("E285: Failed to create input context"); |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6038 # endif |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6039 |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6040 # if defined(FEAT_GUI_X11) || defined(PROTO) |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6041 # if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 && !defined(SUN_SYSTEM) |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6042 # define USE_X11R6_XIM |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6043 # endif |
7 | 6044 |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
6045 static int xim_real_init(Window x11_window, Display *x11_display); |
7 | 6046 |
6047 | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6048 # ifdef USE_X11R6_XIM |
7 | 6049 static void |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6050 xim_instantiate_cb( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6051 Display *display, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6052 XPointer client_data UNUSED, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6053 XPointer call_data UNUSED) |
7 | 6054 { |
6055 Window x11_window; | |
6056 Display *x11_display; | |
6057 | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6058 # ifdef XIM_DEBUG |
7 | 6059 xim_log("xim_instantiate_cb()\n"); |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6060 # endif |
7 | 6061 |
6062 gui_get_x11_windis(&x11_window, &x11_display); | |
6063 if (display != x11_display) | |
6064 return; | |
6065 | |
6066 xim_real_init(x11_window, x11_display); | |
811 | 6067 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
7 | 6068 if (xic != NULL) |
6069 XUnregisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
6070 xim_instantiate_cb, NULL); | |
6071 } | |
6072 | |
6073 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6074 xim_destroy_cb( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6075 XIM im UNUSED, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6076 XPointer client_data UNUSED, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6077 XPointer call_data UNUSED) |
7 | 6078 { |
6079 Window x11_window; | |
6080 Display *x11_display; | |
6081 | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6082 # ifdef XIM_DEBUG |
7 | 6083 xim_log("xim_destroy_cb()\n"); |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6084 #endif |
7 | 6085 gui_get_x11_windis(&x11_window, &x11_display); |
6086 | |
6087 xic = NULL; | |
6088 status_area_enabled = FALSE; | |
6089 | |
811 | 6090 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
7 | 6091 |
6092 XRegisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
6093 xim_instantiate_cb, NULL); | |
6094 } | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6095 # endif |
7 | 6096 |
6097 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6098 xim_init(void) |
7 | 6099 { |
6100 Window x11_window; | |
6101 Display *x11_display; | |
6102 | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6103 # ifdef XIM_DEBUG |
7 | 6104 xim_log("xim_init()\n"); |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6105 # endif |
7 | 6106 |
6107 gui_get_x11_windis(&x11_window, &x11_display); | |
6108 | |
6109 xic = NULL; | |
6110 | |
6111 if (xim_real_init(x11_window, x11_display)) | |
6112 return; | |
6113 | |
811 | 6114 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
7 | 6115 |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6116 # ifdef USE_X11R6_XIM |
7 | 6117 XRegisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, |
6118 xim_instantiate_cb, NULL); | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6119 # endif |
7 | 6120 } |
6121 | |
6122 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6123 xim_real_init(Window x11_window, Display *x11_display) |
7 | 6124 { |
6125 int i; | |
6126 char *p, | |
6127 *s, | |
6128 *ns, | |
6129 *end, | |
6130 tmp[1024]; | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6131 # define IMLEN_MAX 40 |
7 | 6132 char buf[IMLEN_MAX + 7]; |
6133 XIM xim = NULL; | |
6134 XIMStyles *xim_styles; | |
6135 XIMStyle this_input_style = 0; | |
6136 Boolean found; | |
6137 XPoint over_spot; | |
6138 XVaNestedList preedit_list, status_list; | |
6139 | |
6140 input_style = 0; | |
6141 status_area_enabled = FALSE; | |
6142 | |
6143 if (xic != NULL) | |
6144 return FALSE; | |
6145 | |
6146 if (gui.rsrc_input_method != NULL && *gui.rsrc_input_method != NUL) | |
6147 { | |
6148 strcpy(tmp, gui.rsrc_input_method); | |
6149 for (ns = s = tmp; ns != NULL && *s != NUL;) | |
6150 { | |
6151 s = (char *)skipwhite((char_u *)s); | |
6152 if (*s == NUL) | |
6153 break; | |
6154 if ((ns = end = strchr(s, ',')) == NULL) | |
6155 end = s + strlen(s); | |
6156 while (isspace(((char_u *)end)[-1])) | |
6157 end--; | |
6158 *end = NUL; | |
6159 | |
6160 if (strlen(s) <= IMLEN_MAX) | |
6161 { | |
6162 strcpy(buf, "@im="); | |
6163 strcat(buf, s); | |
6164 if ((p = XSetLocaleModifiers(buf)) != NULL && *p != NUL | |
6165 && (xim = XOpenIM(x11_display, NULL, NULL, NULL)) | |
6166 != NULL) | |
6167 break; | |
6168 } | |
6169 | |
6170 s = ns + 1; | |
6171 } | |
6172 } | |
6173 | |
6174 if (xim == NULL && (p = XSetLocaleModifiers("")) != NULL && *p != NUL) | |
6175 xim = XOpenIM(x11_display, NULL, NULL, NULL); | |
6176 | |
6177 /* This is supposed to be useful to obtain characters through | |
6178 * XmbLookupString() without really using a XIM. */ | |
6179 if (xim == NULL && (p = XSetLocaleModifiers("@im=none")) != NULL | |
6180 && *p != NUL) | |
6181 xim = XOpenIM(x11_display, NULL, NULL, NULL); | |
6182 | |
6183 if (xim == NULL) | |
6184 { | |
6185 /* Only give this message when verbose is set, because too many people | |
6186 * got this message when they didn't want to use a XIM. */ | |
6187 if (p_verbose > 0) | |
292 | 6188 { |
6189 verbose_enter(); | |
7 | 6190 EMSG(_("E286: Failed to open input method")); |
292 | 6191 verbose_leave(); |
6192 } | |
7 | 6193 return FALSE; |
6194 } | |
6195 | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6196 # ifdef USE_X11R6_XIM |
7 | 6197 { |
6198 XIMCallback destroy_cb; | |
6199 | |
6200 destroy_cb.callback = xim_destroy_cb; | |
6201 destroy_cb.client_data = NULL; | |
6202 if (XSetIMValues(xim, XNDestroyCallback, &destroy_cb, NULL)) | |
6203 EMSG(_("E287: Warning: Could not set destroy callback to IM")); | |
6204 } | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6205 # endif |
7 | 6206 |
6207 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) || !xim_styles) | |
6208 { | |
6209 EMSG(_("E288: input method doesn't support any style")); | |
6210 XCloseIM(xim); | |
6211 return FALSE; | |
6212 } | |
6213 | |
6214 found = False; | |
6215 strcpy(tmp, gui.rsrc_preedit_type_name); | |
6216 for (s = tmp; s && !found; ) | |
6217 { | |
6218 while (*s && isspace((unsigned char)*s)) | |
6219 s++; | |
6220 if (!*s) | |
6221 break; | |
6222 if ((ns = end = strchr(s, ',')) != 0) | |
6223 ns++; | |
6224 else | |
6225 end = s + strlen(s); | |
6226 while (isspace((unsigned char)*end)) | |
6227 end--; | |
6228 *end = '\0'; | |
6229 | |
6230 if (!strcmp(s, "OverTheSpot")) | |
6231 this_input_style = (XIMPreeditPosition | XIMStatusArea); | |
6232 else if (!strcmp(s, "OffTheSpot")) | |
6233 this_input_style = (XIMPreeditArea | XIMStatusArea); | |
6234 else if (!strcmp(s, "Root")) | |
6235 this_input_style = (XIMPreeditNothing | XIMStatusNothing); | |
6236 | |
6237 for (i = 0; (unsigned short)i < xim_styles->count_styles; i++) | |
6238 { | |
6239 if (this_input_style == xim_styles->supported_styles[i]) | |
6240 { | |
6241 found = True; | |
6242 break; | |
6243 } | |
6244 } | |
6245 if (!found) | |
6246 for (i = 0; (unsigned short)i < xim_styles->count_styles; i++) | |
6247 { | |
6248 if ((xim_styles->supported_styles[i] & this_input_style) | |
6249 == (this_input_style & ~XIMStatusArea)) | |
6250 { | |
6251 this_input_style &= ~XIMStatusArea; | |
6252 found = True; | |
6253 break; | |
6254 } | |
6255 } | |
6256 | |
6257 s = ns; | |
6258 } | |
6259 XFree(xim_styles); | |
6260 | |
6261 if (!found) | |
6262 { | |
6263 /* Only give this message when verbose is set, because too many people | |
6264 * got this message when they didn't want to use a XIM. */ | |
6265 if (p_verbose > 0) | |
292 | 6266 { |
6267 verbose_enter(); | |
7 | 6268 EMSG(_("E289: input method doesn't support my preedit type")); |
292 | 6269 verbose_leave(); |
6270 } | |
7 | 6271 XCloseIM(xim); |
6272 return FALSE; | |
6273 } | |
6274 | |
6275 over_spot.x = TEXT_X(gui.col); | |
6276 over_spot.y = TEXT_Y(gui.row); | |
6277 input_style = this_input_style; | |
6278 | |
6279 /* A crash was reported when trying to pass gui.norm_font as XNFontSet, | |
6280 * thus that has been removed. Hopefully the default works... */ | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6281 # ifdef FEAT_XFONTSET |
7 | 6282 if (gui.fontset != NOFONTSET) |
6283 { | |
6284 preedit_list = XVaCreateNestedList(0, | |
6285 XNSpotLocation, &over_spot, | |
6286 XNForeground, (Pixel)gui.def_norm_pixel, | |
6287 XNBackground, (Pixel)gui.def_back_pixel, | |
6288 XNFontSet, (XFontSet)gui.fontset, | |
6289 NULL); | |
6290 status_list = XVaCreateNestedList(0, | |
6291 XNForeground, (Pixel)gui.def_norm_pixel, | |
6292 XNBackground, (Pixel)gui.def_back_pixel, | |
6293 XNFontSet, (XFontSet)gui.fontset, | |
6294 NULL); | |
6295 } | |
6296 else | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6297 # endif |
7 | 6298 { |
6299 preedit_list = XVaCreateNestedList(0, | |
6300 XNSpotLocation, &over_spot, | |
6301 XNForeground, (Pixel)gui.def_norm_pixel, | |
6302 XNBackground, (Pixel)gui.def_back_pixel, | |
6303 NULL); | |
6304 status_list = XVaCreateNestedList(0, | |
6305 XNForeground, (Pixel)gui.def_norm_pixel, | |
6306 XNBackground, (Pixel)gui.def_back_pixel, | |
6307 NULL); | |
6308 } | |
6309 | |
6310 xic = XCreateIC(xim, | |
6311 XNInputStyle, input_style, | |
6312 XNClientWindow, x11_window, | |
6313 XNFocusWindow, gui.wid, | |
6314 XNPreeditAttributes, preedit_list, | |
6315 XNStatusAttributes, status_list, | |
6316 NULL); | |
6317 XFree(status_list); | |
6318 XFree(preedit_list); | |
6319 if (xic != NULL) | |
6320 { | |
6321 if (input_style & XIMStatusArea) | |
6322 { | |
6323 xim_set_status_area(); | |
6324 status_area_enabled = TRUE; | |
6325 } | |
6326 else | |
811 | 6327 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
7 | 6328 } |
6329 else | |
6330 { | |
12936
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
6331 if (!is_not_a_term()) |
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
6332 EMSG(_(e_xim)); |
7 | 6333 XCloseIM(xim); |
6334 return FALSE; | |
6335 } | |
6336 | |
6337 return TRUE; | |
6338 } | |
6339 | |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6340 # endif /* FEAT_GUI_X11 */ |
7 | 6341 |
6342 /* | |
6343 * Get IM status. When IM is on, return TRUE. Else return FALSE. | |
6344 * FIXME: This doesn't work correctly: Having focus doesn't always mean XIM is | |
6345 * active, when not having focus XIM may still be active (e.g., when using a | |
6346 * tear-off menu item). | |
6347 */ | |
6348 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6349 im_get_status(void) |
7 | 6350 { |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6351 # ifdef FEAT_EVAL |
12936
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
6352 if (USE_IMSTATUSFUNC) |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6353 return call_imstatusfunc(); |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6354 # endif |
7 | 6355 return xim_has_focus; |
6356 } | |
6357 | |
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
6358 # endif /* !FEAT_GUI_GTK */ |
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
6359 |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6360 # if !defined(FEAT_GUI_GTK) || defined(PROTO) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6361 /* |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6362 * Set up the status area. |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6363 * |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6364 * This should use a separate Widget, but that seems not possible, because |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6365 * preedit_area and status_area should be set to the same window as for the |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6366 * text input. Unfortunately this means the status area pollutes the text |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6367 * window... |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6368 */ |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6369 void |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6370 xim_set_status_area(void) |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6371 { |
2580 | 6372 XVaNestedList preedit_list = 0, status_list = 0, list = 0; |
6373 XRectangle pre_area, status_area; | |
6374 | |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6375 if (xic == NULL) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6376 return; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6377 |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6378 if (input_style & XIMStatusArea) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6379 { |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6380 if (input_style & XIMPreeditArea) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6381 { |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6382 XRectangle *needed_rect; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6383 |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6384 /* to get status_area width */ |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6385 status_list = XVaCreateNestedList(0, XNAreaNeeded, |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6386 &needed_rect, NULL); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6387 XGetICValues(xic, XNStatusAttributes, status_list, NULL); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6388 XFree(status_list); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6389 |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6390 status_area.width = needed_rect->width; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6391 } |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6392 else |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6393 status_area.width = gui.char_width * Columns; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6394 |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6395 status_area.x = 0; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6396 status_area.y = gui.char_height * Rows + gui.border_offset; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6397 if (gui.which_scrollbars[SBAR_BOTTOM]) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6398 status_area.y += gui.scrollbar_height; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6399 #ifdef FEAT_MENU |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6400 if (gui.menu_is_active) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6401 status_area.y += gui.menu_height; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6402 #endif |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6403 status_area.height = gui.char_height; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6404 status_list = XVaCreateNestedList(0, XNArea, &status_area, NULL); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6405 } |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6406 else |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6407 { |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6408 status_area.x = 0; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6409 status_area.y = gui.char_height * Rows + gui.border_offset; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6410 if (gui.which_scrollbars[SBAR_BOTTOM]) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6411 status_area.y += gui.scrollbar_height; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6412 #ifdef FEAT_MENU |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6413 if (gui.menu_is_active) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6414 status_area.y += gui.menu_height; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6415 #endif |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6416 status_area.width = 0; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6417 status_area.height = gui.char_height; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6418 } |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6419 |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6420 if (input_style & XIMPreeditArea) /* off-the-spot */ |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6421 { |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6422 pre_area.x = status_area.x + status_area.width; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6423 pre_area.y = gui.char_height * Rows + gui.border_offset; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6424 pre_area.width = gui.char_width * Columns - pre_area.x; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6425 if (gui.which_scrollbars[SBAR_BOTTOM]) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6426 pre_area.y += gui.scrollbar_height; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6427 #ifdef FEAT_MENU |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6428 if (gui.menu_is_active) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6429 pre_area.y += gui.menu_height; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6430 #endif |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6431 pre_area.height = gui.char_height; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6432 preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6433 } |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6434 else if (input_style & XIMPreeditPosition) /* over-the-spot */ |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6435 { |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6436 pre_area.x = 0; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6437 pre_area.y = 0; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6438 pre_area.height = gui.char_height * Rows; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6439 pre_area.width = gui.char_width * Columns; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6440 preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6441 } |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6442 |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6443 if (preedit_list && status_list) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6444 list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list, |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6445 XNStatusAttributes, status_list, NULL); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6446 else if (preedit_list) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6447 list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list, |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6448 NULL); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6449 else if (status_list) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6450 list = XVaCreateNestedList(0, XNStatusAttributes, status_list, |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6451 NULL); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6452 else |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6453 list = NULL; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6454 |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6455 if (list) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6456 { |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6457 XSetICValues(xic, XNVaNestedList, list, NULL); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6458 XFree(list); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6459 } |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6460 if (status_list) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6461 XFree(status_list); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6462 if (preedit_list) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6463 XFree(preedit_list); |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6464 } |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6465 |
1668 | 6466 int |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6467 xim_get_status_area_height(void) |
1668 | 6468 { |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6469 if (status_area_enabled) |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6470 return gui.char_height; |
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6471 return 0; |
1668 | 6472 } |
6473 # endif | |
6474 | |
12920
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6475 #else /* !defined(FEAT_XIM) */ |
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6476 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13353
diff
changeset
|
6477 # ifdef IME_WITHOUT_XIM |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6478 static int im_was_set_active = FALSE; |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6479 |
12920
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6480 int |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13353
diff
changeset
|
6481 im_get_status(void) |
12920
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6482 { |
12948
851393938fa3
patch 8.0.1350: cannot build with +eval and -multi_byte
Christian Brabandt <cb@256bit.org>
parents:
12936
diff
changeset
|
6483 # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) |
12936
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
6484 if (USE_IMSTATUSFUNC) |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6485 return call_imstatusfunc(); |
12920
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6486 # endif |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6487 return im_was_set_active; |
12920
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6488 } |
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6489 |
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6490 void |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6491 im_set_active(int active_arg) |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6492 { |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6493 # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6494 int active = !p_imdisable && active_arg; |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6495 |
12936
c53a80f39a52
patch 8.0.1344: using 'imactivatefunc' in the GUI does not work
Christian Brabandt <cb@256bit.org>
parents:
12932
diff
changeset
|
6496 if (USE_IMACTIVATEFUNC && active != im_get_status()) |
12924
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6497 { |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6498 call_imactivatefunc(active); |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6499 im_was_set_active = active; |
85a601f985ab
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Christian Brabandt <cb@256bit.org>
parents:
12922
diff
changeset
|
6500 } |
12920
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6501 # endif |
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6502 } |
12928
75ffa8ee989c
patch 8.0.1340: MS-Windows: cannot build GUI without IME
Christian Brabandt <cb@256bit.org>
parents:
12924
diff
changeset
|
6503 |
75ffa8ee989c
patch 8.0.1340: MS-Windows: cannot build GUI without IME
Christian Brabandt <cb@256bit.org>
parents:
12924
diff
changeset
|
6504 # ifdef FEAT_GUI |
75ffa8ee989c
patch 8.0.1340: MS-Windows: cannot build GUI without IME
Christian Brabandt <cb@256bit.org>
parents:
12924
diff
changeset
|
6505 void |
13958
fbd4f9645b57
patch 8.0.1849: compiler warning for unused arguments, missing prototype
Christian Brabandt <cb@256bit.org>
parents:
13610
diff
changeset
|
6506 im_set_position(int row UNUSED, int col UNUSED) |
12928
75ffa8ee989c
patch 8.0.1340: MS-Windows: cannot build GUI without IME
Christian Brabandt <cb@256bit.org>
parents:
12924
diff
changeset
|
6507 { |
75ffa8ee989c
patch 8.0.1340: MS-Windows: cannot build GUI without IME
Christian Brabandt <cb@256bit.org>
parents:
12924
diff
changeset
|
6508 } |
75ffa8ee989c
patch 8.0.1340: MS-Windows: cannot build GUI without IME
Christian Brabandt <cb@256bit.org>
parents:
12924
diff
changeset
|
6509 # endif |
12920
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6510 # endif |
327e1264b9bf
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
6511 |
7 | 6512 #endif /* FEAT_XIM */ |
6513 | |
6514 #if defined(FEAT_MBYTE) || defined(PROTO) | |
6515 | |
6516 /* | |
6517 * Setup "vcp" for conversion from "from" to "to". | |
6518 * The names must have been made canonical with enc_canonize(). | |
6519 * vcp->vc_type must have been initialized to CONV_NONE. | |
6520 * Note: cannot be used for conversion from/to ucs-2 and ucs-4 (will use utf-8 | |
6521 * instead). | |
6522 * Afterwards invoke with "from" and "to" equal to NULL to cleanup. | |
6523 * Return FAIL when conversion is not supported, OK otherwise. | |
6524 */ | |
6525 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6526 convert_setup(vimconv_T *vcp, char_u *from, char_u *to) |
7 | 6527 { |
1904 | 6528 return convert_setup_ext(vcp, from, TRUE, to, TRUE); |
6529 } | |
6530 | |
6531 /* | |
6532 * As convert_setup(), but only when from_unicode_is_utf8 is TRUE will all | |
6533 * "from" unicode charsets be considered utf-8. Same for "to". | |
6534 */ | |
6535 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6536 convert_setup_ext( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6537 vimconv_T *vcp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6538 char_u *from, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6539 int from_unicode_is_utf8, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6540 char_u *to, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6541 int to_unicode_is_utf8) |
1904 | 6542 { |
7 | 6543 int from_prop; |
6544 int to_prop; | |
1904 | 6545 int from_is_utf8; |
6546 int to_is_utf8; | |
7 | 6547 |
6548 /* Reset to no conversion. */ | |
6549 # ifdef USE_ICONV | |
6550 if (vcp->vc_type == CONV_ICONV && vcp->vc_fd != (iconv_t)-1) | |
6551 iconv_close(vcp->vc_fd); | |
6552 # endif | |
6553 vcp->vc_type = CONV_NONE; | |
6554 vcp->vc_factor = 1; | |
6555 vcp->vc_fail = FALSE; | |
6556 | |
6557 /* No conversion when one of the names is empty or they are equal. */ | |
6558 if (from == NULL || *from == NUL || to == NULL || *to == NUL | |
6559 || STRCMP(from, to) == 0) | |
6560 return OK; | |
6561 | |
6562 from_prop = enc_canon_props(from); | |
6563 to_prop = enc_canon_props(to); | |
1904 | 6564 if (from_unicode_is_utf8) |
6565 from_is_utf8 = from_prop & ENC_UNICODE; | |
6566 else | |
6567 from_is_utf8 = from_prop == ENC_UNICODE; | |
6568 if (to_unicode_is_utf8) | |
6569 to_is_utf8 = to_prop & ENC_UNICODE; | |
6570 else | |
6571 to_is_utf8 = to_prop == ENC_UNICODE; | |
6572 | |
6573 if ((from_prop & ENC_LATIN1) && to_is_utf8) | |
7 | 6574 { |
6575 /* Internal latin1 -> utf-8 conversion. */ | |
6576 vcp->vc_type = CONV_TO_UTF8; | |
6577 vcp->vc_factor = 2; /* up to twice as long */ | |
6578 } | |
1904 | 6579 else if ((from_prop & ENC_LATIN9) && to_is_utf8) |
26 | 6580 { |
6581 /* Internal latin9 -> utf-8 conversion. */ | |
6582 vcp->vc_type = CONV_9_TO_UTF8; | |
6583 vcp->vc_factor = 3; /* up to three as long (euro sign) */ | |
6584 } | |
1904 | 6585 else if (from_is_utf8 && (to_prop & ENC_LATIN1)) |
7 | 6586 { |
6587 /* Internal utf-8 -> latin1 conversion. */ | |
6588 vcp->vc_type = CONV_TO_LATIN1; | |
6589 } | |
1904 | 6590 else if (from_is_utf8 && (to_prop & ENC_LATIN9)) |
26 | 6591 { |
6592 /* Internal utf-8 -> latin9 conversion. */ | |
6593 vcp->vc_type = CONV_TO_LATIN9; | |
6594 } | |
7 | 6595 #ifdef WIN3264 |
6596 /* Win32-specific codepage <-> codepage conversion without iconv. */ | |
1904 | 6597 else if ((from_is_utf8 || encname2codepage(from) > 0) |
6598 && (to_is_utf8 || encname2codepage(to) > 0)) | |
7 | 6599 { |
6600 vcp->vc_type = CONV_CODEPAGE; | |
6601 vcp->vc_factor = 2; /* up to twice as long */ | |
1904 | 6602 vcp->vc_cpfrom = from_is_utf8 ? 0 : encname2codepage(from); |
6603 vcp->vc_cpto = to_is_utf8 ? 0 : encname2codepage(to); | |
7 | 6604 } |
6605 #endif | |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
6606 #ifdef MACOS_CONVERT |
7 | 6607 else if ((from_prop & ENC_MACROMAN) && (to_prop & ENC_LATIN1)) |
6608 { | |
6609 vcp->vc_type = CONV_MAC_LATIN1; | |
6610 } | |
1904 | 6611 else if ((from_prop & ENC_MACROMAN) && to_is_utf8) |
7 | 6612 { |
6613 vcp->vc_type = CONV_MAC_UTF8; | |
6614 vcp->vc_factor = 2; /* up to twice as long */ | |
6615 } | |
6616 else if ((from_prop & ENC_LATIN1) && (to_prop & ENC_MACROMAN)) | |
6617 { | |
6618 vcp->vc_type = CONV_LATIN1_MAC; | |
6619 } | |
1904 | 6620 else if (from_is_utf8 && (to_prop & ENC_MACROMAN)) |
7 | 6621 { |
6622 vcp->vc_type = CONV_UTF8_MAC; | |
6623 } | |
6624 #endif | |
6625 # ifdef USE_ICONV | |
6626 else | |
6627 { | |
6628 /* Use iconv() for conversion. */ | |
6629 vcp->vc_fd = (iconv_t)my_iconv_open( | |
1904 | 6630 to_is_utf8 ? (char_u *)"utf-8" : to, |
6631 from_is_utf8 ? (char_u *)"utf-8" : from); | |
7 | 6632 if (vcp->vc_fd != (iconv_t)-1) |
6633 { | |
6634 vcp->vc_type = CONV_ICONV; | |
6635 vcp->vc_factor = 4; /* could be longer too... */ | |
6636 } | |
6637 } | |
6638 # endif | |
6639 if (vcp->vc_type == CONV_NONE) | |
6640 return FAIL; | |
167 | 6641 |
7 | 6642 return OK; |
6643 } | |
6644 | |
6645 #if defined(FEAT_GUI) || defined(AMIGA) || defined(WIN3264) \ | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8080
diff
changeset
|
6646 || defined(PROTO) |
7 | 6647 /* |
6648 * Do conversion on typed input characters in-place. | |
6649 * The input and output are not NUL terminated! | |
6650 * Returns the length after conversion. | |
6651 */ | |
6652 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6653 convert_input(char_u *ptr, int len, int maxlen) |
7 | 6654 { |
6655 return convert_input_safe(ptr, len, maxlen, NULL, NULL); | |
6656 } | |
6657 #endif | |
6658 | |
6659 /* | |
6660 * Like convert_input(), but when there is an incomplete byte sequence at the | |
6661 * end return that as an allocated string in "restp" and set "*restlenp" to | |
6662 * the length. If "restp" is NULL it is not used. | |
6663 */ | |
6664 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6665 convert_input_safe( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6666 char_u *ptr, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6667 int len, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6668 int maxlen, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6669 char_u **restp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6670 int *restlenp) |
7 | 6671 { |
6672 char_u *d; | |
6673 int dlen = len; | |
6674 int unconvertlen = 0; | |
6675 | |
6676 d = string_convert_ext(&input_conv, ptr, &dlen, | |
6677 restp == NULL ? NULL : &unconvertlen); | |
6678 if (d != NULL) | |
6679 { | |
6680 if (dlen <= maxlen) | |
6681 { | |
6682 if (unconvertlen > 0) | |
6683 { | |
6684 /* Move the unconverted characters to allocated memory. */ | |
6685 *restp = alloc(unconvertlen); | |
6686 if (*restp != NULL) | |
6687 mch_memmove(*restp, ptr + len - unconvertlen, unconvertlen); | |
6688 *restlenp = unconvertlen; | |
6689 } | |
6690 mch_memmove(ptr, d, dlen); | |
6691 } | |
6692 else | |
6693 /* result is too long, keep the unconverted text (the caller must | |
6694 * have done something wrong!) */ | |
6695 dlen = len; | |
6696 vim_free(d); | |
6697 } | |
6698 return dlen; | |
6699 } | |
6700 | |
6701 /* | |
6702 * Convert text "ptr[*lenp]" according to "vcp". | |
6703 * Returns the result in allocated memory and sets "*lenp". | |
6704 * When "lenp" is NULL, use NUL terminated strings. | |
6705 * Illegal chars are often changed to "?", unless vcp->vc_fail is set. | |
6706 * When something goes wrong, NULL is returned and "*lenp" is unchanged. | |
6707 */ | |
6708 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6709 string_convert( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6710 vimconv_T *vcp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6711 char_u *ptr, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6712 int *lenp) |
7 | 6713 { |
6714 return string_convert_ext(vcp, ptr, lenp, NULL); | |
6715 } | |
6716 | |
6717 /* | |
6718 * Like string_convert(), but when "unconvlenp" is not NULL and there are is | |
6719 * an incomplete sequence at the end it is not converted and "*unconvlenp" is | |
6720 * set to the number of remaining bytes. | |
6721 */ | |
6722 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6723 string_convert_ext( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6724 vimconv_T *vcp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6725 char_u *ptr, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6726 int *lenp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6727 int *unconvlenp) |
7 | 6728 { |
6729 char_u *retval = NULL; | |
6730 char_u *d; | |
6731 int len; | |
6732 int i; | |
6733 int l; | |
6734 int c; | |
6735 | |
6736 if (lenp == NULL) | |
6737 len = (int)STRLEN(ptr); | |
6738 else | |
6739 len = *lenp; | |
6740 if (len == 0) | |
6741 return vim_strsave((char_u *)""); | |
6742 | |
6743 switch (vcp->vc_type) | |
6744 { | |
6745 case CONV_TO_UTF8: /* latin1 to utf-8 conversion */ | |
6746 retval = alloc(len * 2 + 1); | |
6747 if (retval == NULL) | |
6748 break; | |
6749 d = retval; | |
6750 for (i = 0; i < len; ++i) | |
6751 { | |
26 | 6752 c = ptr[i]; |
6753 if (c < 0x80) | |
6754 *d++ = c; | |
7 | 6755 else |
6756 { | |
26 | 6757 *d++ = 0xc0 + ((unsigned)c >> 6); |
6758 *d++ = 0x80 + (c & 0x3f); | |
7 | 6759 } |
6760 } | |
6761 *d = NUL; | |
6762 if (lenp != NULL) | |
6763 *lenp = (int)(d - retval); | |
6764 break; | |
6765 | |
26 | 6766 case CONV_9_TO_UTF8: /* latin9 to utf-8 conversion */ |
6767 retval = alloc(len * 3 + 1); | |
6768 if (retval == NULL) | |
6769 break; | |
6770 d = retval; | |
6771 for (i = 0; i < len; ++i) | |
6772 { | |
6773 c = ptr[i]; | |
6774 switch (c) | |
6775 { | |
6776 case 0xa4: c = 0x20ac; break; /* euro */ | |
6777 case 0xa6: c = 0x0160; break; /* S hat */ | |
6778 case 0xa8: c = 0x0161; break; /* S -hat */ | |
6779 case 0xb4: c = 0x017d; break; /* Z hat */ | |
6780 case 0xb8: c = 0x017e; break; /* Z -hat */ | |
6781 case 0xbc: c = 0x0152; break; /* OE */ | |
6782 case 0xbd: c = 0x0153; break; /* oe */ | |
6783 case 0xbe: c = 0x0178; break; /* Y */ | |
6784 } | |
6785 d += utf_char2bytes(c, d); | |
6786 } | |
6787 *d = NUL; | |
6788 if (lenp != NULL) | |
6789 *lenp = (int)(d - retval); | |
6790 break; | |
6791 | |
7 | 6792 case CONV_TO_LATIN1: /* utf-8 to latin1 conversion */ |
26 | 6793 case CONV_TO_LATIN9: /* utf-8 to latin9 conversion */ |
7 | 6794 retval = alloc(len + 1); |
6795 if (retval == NULL) | |
6796 break; | |
6797 d = retval; | |
6798 for (i = 0; i < len; ++i) | |
6799 { | |
2015 | 6800 l = utf_ptr2len_len(ptr + i, len - i); |
7 | 6801 if (l == 0) |
6802 *d++ = NUL; | |
6803 else if (l == 1) | |
6804 { | |
2015 | 6805 int l_w = utf8len_tab_zero[ptr[i]]; |
6806 | |
6807 if (l_w == 0) | |
6808 { | |
6809 /* Illegal utf-8 byte cannot be converted */ | |
6810 vim_free(retval); | |
6811 return NULL; | |
6812 } | |
6813 if (unconvlenp != NULL && l_w > len - i) | |
7 | 6814 { |
6815 /* Incomplete sequence at the end. */ | |
6816 *unconvlenp = len - i; | |
6817 break; | |
6818 } | |
6819 *d++ = ptr[i]; | |
6820 } | |
6821 else | |
6822 { | |
6823 c = utf_ptr2char(ptr + i); | |
26 | 6824 if (vcp->vc_type == CONV_TO_LATIN9) |
6825 switch (c) | |
6826 { | |
6827 case 0x20ac: c = 0xa4; break; /* euro */ | |
6828 case 0x0160: c = 0xa6; break; /* S hat */ | |
6829 case 0x0161: c = 0xa8; break; /* S -hat */ | |
6830 case 0x017d: c = 0xb4; break; /* Z hat */ | |
6831 case 0x017e: c = 0xb8; break; /* Z -hat */ | |
6832 case 0x0152: c = 0xbc; break; /* OE */ | |
6833 case 0x0153: c = 0xbd; break; /* oe */ | |
6834 case 0x0178: c = 0xbe; break; /* Y */ | |
6835 case 0xa4: | |
6836 case 0xa6: | |
6837 case 0xa8: | |
6838 case 0xb4: | |
6839 case 0xb8: | |
6840 case 0xbc: | |
6841 case 0xbd: | |
6842 case 0xbe: c = 0x100; break; /* not in latin9 */ | |
6843 } | |
7 | 6844 if (!utf_iscomposing(c)) /* skip composing chars */ |
6845 { | |
6846 if (c < 0x100) | |
6847 *d++ = c; | |
6848 else if (vcp->vc_fail) | |
6849 { | |
6850 vim_free(retval); | |
6851 return NULL; | |
6852 } | |
6853 else | |
6854 { | |
6855 *d++ = 0xbf; | |
6856 if (utf_char2cells(c) > 1) | |
6857 *d++ = '?'; | |
6858 } | |
6859 } | |
6860 i += l - 1; | |
6861 } | |
6862 } | |
6863 *d = NUL; | |
6864 if (lenp != NULL) | |
6865 *lenp = (int)(d - retval); | |
6866 break; | |
6867 | |
765 | 6868 # ifdef MACOS_CONVERT |
7 | 6869 case CONV_MAC_LATIN1: |
6870 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
18 | 6871 'm', 'l', unconvlenp); |
7 | 6872 break; |
6873 | |
6874 case CONV_LATIN1_MAC: | |
6875 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
18 | 6876 'l', 'm', unconvlenp); |
7 | 6877 break; |
6878 | |
6879 case CONV_MAC_UTF8: | |
6880 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
18 | 6881 'm', 'u', unconvlenp); |
7 | 6882 break; |
6883 | |
6884 case CONV_UTF8_MAC: | |
6885 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
18 | 6886 'u', 'm', unconvlenp); |
7 | 6887 break; |
6888 # endif | |
6889 | |
6890 # ifdef USE_ICONV | |
6891 case CONV_ICONV: /* conversion with output_conv.vc_fd */ | |
1904 | 6892 retval = iconv_string(vcp, ptr, len, unconvlenp, lenp); |
7 | 6893 break; |
6894 # endif | |
6895 # ifdef WIN3264 | |
6896 case CONV_CODEPAGE: /* codepage -> codepage */ | |
6897 { | |
6898 int retlen; | |
6899 int tmp_len; | |
6900 short_u *tmp; | |
6901 | |
6902 /* 1. codepage/UTF-8 -> ucs-2. */ | |
6903 if (vcp->vc_cpfrom == 0) | |
1752 | 6904 tmp_len = utf8_to_utf16(ptr, len, NULL, NULL); |
7 | 6905 else |
4122 | 6906 { |
6907 tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, | |
6908 unconvlenp ? MB_ERR_INVALID_CHARS : 0, | |
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6909 (char *)ptr, len, 0, 0); |
4122 | 6910 if (tmp_len == 0 |
6911 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION) | |
6912 { | |
6913 if (lenp != NULL) | |
6914 *lenp = 0; | |
6915 if (unconvlenp != NULL) | |
6916 *unconvlenp = len; | |
6917 retval = alloc(1); | |
6918 if (retval) | |
6919 retval[0] = NUL; | |
6920 return retval; | |
6921 } | |
6922 } | |
7 | 6923 tmp = (short_u *)alloc(sizeof(short_u) * tmp_len); |
6924 if (tmp == NULL) | |
6925 break; | |
6926 if (vcp->vc_cpfrom == 0) | |
1752 | 6927 utf8_to_utf16(ptr, len, tmp, unconvlenp); |
7 | 6928 else |
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6929 MultiByteToWideChar(vcp->vc_cpfrom, 0, |
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6930 (char *)ptr, len, tmp, tmp_len); |
7 | 6931 |
6932 /* 2. ucs-2 -> codepage/UTF-8. */ | |
6933 if (vcp->vc_cpto == 0) | |
1752 | 6934 retlen = utf16_to_utf8(tmp, tmp_len, NULL); |
7 | 6935 else |
6936 retlen = WideCharToMultiByte(vcp->vc_cpto, 0, | |
6937 tmp, tmp_len, 0, 0, 0, 0); | |
6938 retval = alloc(retlen + 1); | |
6939 if (retval != NULL) | |
6940 { | |
6941 if (vcp->vc_cpto == 0) | |
1752 | 6942 utf16_to_utf8(tmp, tmp_len, retval); |
7 | 6943 else |
6944 WideCharToMultiByte(vcp->vc_cpto, 0, | |
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6945 tmp, tmp_len, |
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6946 (char *)retval, retlen, 0, 0); |
7 | 6947 retval[retlen] = NUL; |
6948 if (lenp != NULL) | |
6949 *lenp = retlen; | |
6950 } | |
6951 vim_free(tmp); | |
6952 break; | |
6953 } | |
6954 # endif | |
6955 } | |
6956 | |
6957 return retval; | |
6958 } | |
6959 #endif |