Mercurial > vim
annotate src/mbyte.c @ 12293:1ff5e5dfa9b0 v8.0.1026
patch 8.0.1026: GTK on-the-spot input has problems
commit https://github.com/vim/vim/commit/5c6dbcb03fa552d7b0e61c8fcf425147eb6bf7d5
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 30 22:00:20 2017 +0200
patch 8.0.1026: GTK on-the-spot input has problems
Problem: GTK on-the-spot input has problems. (Gerd Wachsmuth)
Solution: Support over-the-spot. (Yukihiro Nakadaira, Ketn Takata, closes
#1215)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 30 Aug 2017 22:15:04 +0200 |
| parents | d2373927d76d |
| children | d3175a3bd8cd |
| 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 | |
| 108 #include <X11/Xlocale.h> | |
| 109 #endif | |
| 110 | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
111 #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
|
112 # 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
|
113 # include <gdk/gdkkeysyms-compat.h> |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
114 # else |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
115 # include <gdk/gdkkeysyms.h> |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
116 # endif |
| 7 | 117 # ifdef WIN3264 |
| 118 # include <gdk/gdkwin32.h> | |
| 119 # else | |
| 120 # include <gdk/gdkx.h> | |
| 121 # endif | |
| 122 #endif | |
| 123 | |
| 124 #ifdef HAVE_WCHAR_H | |
| 125 # include <wchar.h> | |
| 126 #endif | |
| 127 | |
| 128 #if 0 | |
| 129 /* This has been disabled, because several people reported problems with the | |
| 130 * wcwidth() and iswprint() library functions, esp. for Hebrew. */ | |
| 131 # ifdef __STDC_ISO_10646__ | |
| 132 # define USE_WCHAR_FUNCTIONS | |
| 133 # endif | |
| 134 #endif | |
| 135 | |
| 136 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 137 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
138 static int enc_canon_search(char_u *name); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
139 static int dbcs_char2len(int c); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
140 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
|
141 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
|
142 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
|
143 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
|
144 static int dbcs_char2cells(int c); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
145 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
|
146 static int dbcs_ptr2char(char_u *p); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
147 static int utf_safe_read_char_adv(char_u **s, size_t *n); |
| 7 | 148 |
| 2015 | 149 /* |
| 150 * Lookup table to quickly get the length in bytes of a UTF-8 character from | |
| 151 * the first byte of a UTF-8 string. | |
| 152 * Bytes which are illegal when used as the first byte have a 1. | |
| 153 * The NUL byte has length 1. | |
| 154 */ | |
| 7 | 155 static char utf8len_tab[256] = |
| 156 { | |
| 157 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, | |
| 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, | |
| 2015 | 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, |
| 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, | |
| 7 | 163 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, |
| 164 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, | |
| 165 }; | |
| 166 | |
| 167 /* | |
| 2015 | 168 * Like utf8len_tab above, but using a zero for illegal lead bytes. |
| 169 */ | |
| 170 static char utf8len_tab_zero[256] = | |
| 171 { | |
| 172 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, | |
| 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 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, | |
| 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 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, | |
| 179 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, | |
| 180 }; | |
| 181 | |
| 182 /* | |
| 7 | 183 * XIM often causes trouble. Define XIM_DEBUG to get a log of XIM callbacks |
| 184 * in the "xim.log" file. | |
| 185 */ | |
| 186 /* #define XIM_DEBUG */ | |
| 187 #ifdef XIM_DEBUG | |
| 188 static void | |
| 189 xim_log(char *s, ...) | |
| 190 { | |
| 191 va_list arglist; | |
| 192 static FILE *fd = NULL; | |
| 193 | |
| 194 if (fd == (FILE *)-1) | |
| 195 return; | |
| 196 if (fd == NULL) | |
| 197 { | |
| 531 | 198 fd = mch_fopen("xim.log", "w"); |
| 7 | 199 if (fd == NULL) |
| 200 { | |
| 201 EMSG("Cannot open xim.log"); | |
| 202 fd = (FILE *)-1; | |
| 203 return; | |
| 204 } | |
| 205 } | |
| 206 | |
| 207 va_start(arglist, s); | |
| 208 vfprintf(fd, s, arglist); | |
| 209 va_end(arglist); | |
| 210 } | |
| 211 #endif | |
| 212 | |
| 213 #endif | |
| 214 | |
| 215 #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) || defined(PROTO) | |
| 216 /* | |
| 217 * Canonical encoding names and their properties. | |
| 218 * "iso-8859-n" is handled by enc_canonize() directly. | |
| 219 */ | |
| 220 static struct | |
| 221 { char *name; int prop; int codepage;} | |
| 222 enc_canon_table[] = | |
| 223 { | |
| 224 #define IDX_LATIN_1 0 | |
| 225 {"latin1", ENC_8BIT + ENC_LATIN1, 1252}, | |
| 226 #define IDX_ISO_2 1 | |
| 227 {"iso-8859-2", ENC_8BIT, 0}, | |
| 228 #define IDX_ISO_3 2 | |
| 229 {"iso-8859-3", ENC_8BIT, 0}, | |
| 230 #define IDX_ISO_4 3 | |
| 231 {"iso-8859-4", ENC_8BIT, 0}, | |
| 232 #define IDX_ISO_5 4 | |
| 233 {"iso-8859-5", ENC_8BIT, 0}, | |
| 234 #define IDX_ISO_6 5 | |
| 235 {"iso-8859-6", ENC_8BIT, 0}, | |
| 236 #define IDX_ISO_7 6 | |
| 237 {"iso-8859-7", ENC_8BIT, 0}, | |
| 407 | 238 #define IDX_ISO_8 7 |
| 7 | 239 {"iso-8859-8", ENC_8BIT, 0}, |
| 407 | 240 #define IDX_ISO_9 8 |
| 7 | 241 {"iso-8859-9", ENC_8BIT, 0}, |
| 407 | 242 #define IDX_ISO_10 9 |
| 7 | 243 {"iso-8859-10", ENC_8BIT, 0}, |
| 407 | 244 #define IDX_ISO_11 10 |
| 7 | 245 {"iso-8859-11", ENC_8BIT, 0}, |
| 407 | 246 #define IDX_ISO_13 11 |
| 7 | 247 {"iso-8859-13", ENC_8BIT, 0}, |
| 407 | 248 #define IDX_ISO_14 12 |
| 7 | 249 {"iso-8859-14", ENC_8BIT, 0}, |
| 407 | 250 #define IDX_ISO_15 13 |
| 26 | 251 {"iso-8859-15", ENC_8BIT + ENC_LATIN9, 0}, |
| 407 | 252 #define IDX_KOI8_R 14 |
| 7 | 253 {"koi8-r", ENC_8BIT, 0}, |
| 407 | 254 #define IDX_KOI8_U 15 |
| 7 | 255 {"koi8-u", ENC_8BIT, 0}, |
| 407 | 256 #define IDX_UTF8 16 |
| 7 | 257 {"utf-8", ENC_UNICODE, 0}, |
| 407 | 258 #define IDX_UCS2 17 |
| 7 | 259 {"ucs-2", ENC_UNICODE + ENC_ENDIAN_B + ENC_2BYTE, 0}, |
| 407 | 260 #define IDX_UCS2LE 18 |
| 7 | 261 {"ucs-2le", ENC_UNICODE + ENC_ENDIAN_L + ENC_2BYTE, 0}, |
| 407 | 262 #define IDX_UTF16 19 |
| 7 | 263 {"utf-16", ENC_UNICODE + ENC_ENDIAN_B + ENC_2WORD, 0}, |
| 407 | 264 #define IDX_UTF16LE 20 |
| 7 | 265 {"utf-16le", ENC_UNICODE + ENC_ENDIAN_L + ENC_2WORD, 0}, |
| 407 | 266 #define IDX_UCS4 21 |
| 7 | 267 {"ucs-4", ENC_UNICODE + ENC_ENDIAN_B + ENC_4BYTE, 0}, |
| 407 | 268 #define IDX_UCS4LE 22 |
| 7 | 269 {"ucs-4le", ENC_UNICODE + ENC_ENDIAN_L + ENC_4BYTE, 0}, |
| 407 | 270 |
| 271 /* For debugging DBCS encoding on Unix. */ | |
| 272 #define IDX_DEBUG 23 | |
| 7 | 273 {"debug", ENC_DBCS, DBCS_DEBUG}, |
| 407 | 274 #define IDX_EUC_JP 24 |
| 7 | 275 {"euc-jp", ENC_DBCS, DBCS_JPNU}, |
| 407 | 276 #define IDX_SJIS 25 |
| 7 | 277 {"sjis", ENC_DBCS, DBCS_JPN}, |
| 407 | 278 #define IDX_EUC_KR 26 |
| 7 | 279 {"euc-kr", ENC_DBCS, DBCS_KORU}, |
| 407 | 280 #define IDX_EUC_CN 27 |
| 7 | 281 {"euc-cn", ENC_DBCS, DBCS_CHSU}, |
| 407 | 282 #define IDX_EUC_TW 28 |
| 7 | 283 {"euc-tw", ENC_DBCS, DBCS_CHTU}, |
| 407 | 284 #define IDX_BIG5 29 |
| 7 | 285 {"big5", ENC_DBCS, DBCS_CHT}, |
| 407 | 286 |
| 287 /* MS-DOS and MS-Windows codepages are included here, so that they can be | |
| 288 * used on Unix too. Most of them are similar to ISO-8859 encodings, but | |
| 289 * not exactly the same. */ | |
| 290 #define IDX_CP437 30 | |
| 291 {"cp437", ENC_8BIT, 437}, /* like iso-8859-1 */ | |
| 292 #define IDX_CP737 31 | |
| 293 {"cp737", ENC_8BIT, 737}, /* like iso-8859-7 */ | |
| 294 #define IDX_CP775 32 | |
| 295 {"cp775", ENC_8BIT, 775}, /* Baltic */ | |
| 296 #define IDX_CP850 33 | |
| 297 {"cp850", ENC_8BIT, 850}, /* like iso-8859-4 */ | |
| 298 #define IDX_CP852 34 | |
| 299 {"cp852", ENC_8BIT, 852}, /* like iso-8859-1 */ | |
| 300 #define IDX_CP855 35 | |
| 301 {"cp855", ENC_8BIT, 855}, /* like iso-8859-2 */ | |
| 302 #define IDX_CP857 36 | |
| 303 {"cp857", ENC_8BIT, 857}, /* like iso-8859-5 */ | |
| 304 #define IDX_CP860 37 | |
| 305 {"cp860", ENC_8BIT, 860}, /* like iso-8859-9 */ | |
| 306 #define IDX_CP861 38 | |
| 307 {"cp861", ENC_8BIT, 861}, /* like iso-8859-1 */ | |
| 308 #define IDX_CP862 39 | |
| 309 {"cp862", ENC_8BIT, 862}, /* like iso-8859-1 */ | |
| 310 #define IDX_CP863 40 | |
| 311 {"cp863", ENC_8BIT, 863}, /* like iso-8859-8 */ | |
| 312 #define IDX_CP865 41 | |
| 313 {"cp865", ENC_8BIT, 865}, /* like iso-8859-1 */ | |
| 314 #define IDX_CP866 42 | |
| 315 {"cp866", ENC_8BIT, 866}, /* like iso-8859-5 */ | |
| 316 #define IDX_CP869 43 | |
| 317 {"cp869", ENC_8BIT, 869}, /* like iso-8859-7 */ | |
| 318 #define IDX_CP874 44 | |
| 319 {"cp874", ENC_8BIT, 874}, /* Thai */ | |
| 320 #define IDX_CP932 45 | |
| 321 {"cp932", ENC_DBCS, DBCS_JPN}, | |
| 322 #define IDX_CP936 46 | |
| 323 {"cp936", ENC_DBCS, DBCS_CHS}, | |
| 324 #define IDX_CP949 47 | |
| 325 {"cp949", ENC_DBCS, DBCS_KOR}, | |
| 326 #define IDX_CP950 48 | |
| 327 {"cp950", ENC_DBCS, DBCS_CHT}, | |
| 328 #define IDX_CP1250 49 | |
| 329 {"cp1250", ENC_8BIT, 1250}, /* Czech, Polish, etc. */ | |
| 330 #define IDX_CP1251 50 | |
| 331 {"cp1251", ENC_8BIT, 1251}, /* Cyrillic */ | |
| 332 /* cp1252 is considered to be equal to latin1 */ | |
| 333 #define IDX_CP1253 51 | |
| 334 {"cp1253", ENC_8BIT, 1253}, /* Greek */ | |
| 335 #define IDX_CP1254 52 | |
| 336 {"cp1254", ENC_8BIT, 1254}, /* Turkish */ | |
| 337 #define IDX_CP1255 53 | |
| 338 {"cp1255", ENC_8BIT, 1255}, /* Hebrew */ | |
| 339 #define IDX_CP1256 54 | |
| 340 {"cp1256", ENC_8BIT, 1256}, /* Arabic */ | |
| 341 #define IDX_CP1257 55 | |
| 342 {"cp1257", ENC_8BIT, 1257}, /* Baltic */ | |
| 343 #define IDX_CP1258 56 | |
| 344 {"cp1258", ENC_8BIT, 1258}, /* Vietnamese */ | |
| 345 | |
| 346 #define IDX_MACROMAN 57 | |
| 347 {"macroman", ENC_8BIT + ENC_MACROMAN, 0}, /* Mac OS */ | |
| 890 | 348 #define IDX_DECMCS 58 |
| 349 {"dec-mcs", ENC_8BIT, 0}, /* DEC MCS */ | |
| 350 #define IDX_HPROMAN8 59 | |
| 351 {"hp-roman8", ENC_8BIT, 0}, /* HP Roman8 */ | |
| 352 #define IDX_COUNT 60 | |
| 7 | 353 }; |
| 354 | |
| 355 /* | |
| 356 * Aliases for encoding names. | |
| 357 */ | |
| 358 static struct | |
| 359 { char *name; int canon;} | |
| 360 enc_alias_table[] = | |
| 361 { | |
| 362 {"ansi", IDX_LATIN_1}, | |
| 363 {"iso-8859-1", IDX_LATIN_1}, | |
| 364 {"latin2", IDX_ISO_2}, | |
| 365 {"latin3", IDX_ISO_3}, | |
| 366 {"latin4", IDX_ISO_4}, | |
| 367 {"cyrillic", IDX_ISO_5}, | |
| 368 {"arabic", IDX_ISO_6}, | |
| 369 {"greek", IDX_ISO_7}, | |
| 370 #ifdef WIN3264 | |
| 371 {"hebrew", IDX_CP1255}, | |
| 372 #else | |
| 373 {"hebrew", IDX_ISO_8}, | |
| 374 #endif | |
| 375 {"latin5", IDX_ISO_9}, | |
| 376 {"turkish", IDX_ISO_9}, /* ? */ | |
| 377 {"latin6", IDX_ISO_10}, | |
| 378 {"nordic", IDX_ISO_10}, /* ? */ | |
| 379 {"thai", IDX_ISO_11}, /* ? */ | |
| 380 {"latin7", IDX_ISO_13}, | |
| 381 {"latin8", IDX_ISO_14}, | |
| 382 {"latin9", IDX_ISO_15}, | |
| 383 {"utf8", IDX_UTF8}, | |
| 384 {"unicode", IDX_UCS2}, | |
| 385 {"ucs2", IDX_UCS2}, | |
| 386 {"ucs2be", IDX_UCS2}, | |
| 387 {"ucs-2be", IDX_UCS2}, | |
| 388 {"ucs2le", IDX_UCS2LE}, | |
| 389 {"utf16", IDX_UTF16}, | |
| 390 {"utf16be", IDX_UTF16}, | |
| 391 {"utf-16be", IDX_UTF16}, | |
| 392 {"utf16le", IDX_UTF16LE}, | |
| 393 {"ucs4", IDX_UCS4}, | |
| 394 {"ucs4be", IDX_UCS4}, | |
| 395 {"ucs-4be", IDX_UCS4}, | |
| 396 {"ucs4le", IDX_UCS4LE}, | |
| 1540 | 397 {"utf32", IDX_UCS4}, |
| 398 {"utf-32", IDX_UCS4}, | |
| 399 {"utf32be", IDX_UCS4}, | |
| 400 {"utf-32be", IDX_UCS4}, | |
| 401 {"utf32le", IDX_UCS4LE}, | |
| 402 {"utf-32le", IDX_UCS4LE}, | |
| 7 | 403 {"932", IDX_CP932}, |
| 404 {"949", IDX_CP949}, | |
| 405 {"936", IDX_CP936}, | |
| 932 | 406 {"gbk", IDX_CP936}, |
| 7 | 407 {"950", IDX_CP950}, |
| 408 {"eucjp", IDX_EUC_JP}, | |
| 409 {"unix-jis", IDX_EUC_JP}, | |
| 410 {"ujis", IDX_EUC_JP}, | |
| 411 {"shift-jis", IDX_SJIS}, | |
| 6377 | 412 {"pck", IDX_SJIS}, /* Sun: PCK */ |
| 7 | 413 {"euckr", IDX_EUC_KR}, |
| 414 {"5601", IDX_EUC_KR}, /* Sun: KS C 5601 */ | |
| 415 {"euccn", IDX_EUC_CN}, | |
| 416 {"gb2312", IDX_EUC_CN}, | |
| 417 {"euctw", IDX_EUC_TW}, | |
| 418 #if defined(WIN3264) || defined(WIN32UNIX) || defined(MACOS) | |
| 419 {"japan", IDX_CP932}, | |
| 420 {"korea", IDX_CP949}, | |
| 421 {"prc", IDX_CP936}, | |
| 422 {"chinese", IDX_CP936}, | |
| 423 {"taiwan", IDX_CP950}, | |
| 424 {"big5", IDX_CP950}, | |
| 425 #else | |
| 426 {"japan", IDX_EUC_JP}, | |
| 427 {"korea", IDX_EUC_KR}, | |
| 428 {"prc", IDX_EUC_CN}, | |
| 429 {"chinese", IDX_EUC_CN}, | |
| 430 {"taiwan", IDX_EUC_TW}, | |
| 431 {"cp950", IDX_BIG5}, | |
| 432 {"950", IDX_BIG5}, | |
| 433 #endif | |
| 434 {"mac", IDX_MACROMAN}, | |
| 890 | 435 {"mac-roman", IDX_MACROMAN}, |
| 7 | 436 {NULL, 0} |
| 437 }; | |
| 438 | |
| 439 #ifndef CP_UTF8 | |
| 440 # define CP_UTF8 65001 /* magic number from winnls.h */ | |
| 441 #endif | |
| 442 | |
| 443 /* | |
| 444 * Find encoding "name" in the list of canonical encoding names. | |
| 445 * Returns -1 if not found. | |
| 446 */ | |
| 447 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
448 enc_canon_search(char_u *name) |
| 7 | 449 { |
| 450 int i; | |
| 451 | |
| 452 for (i = 0; i < IDX_COUNT; ++i) | |
| 453 if (STRCMP(name, enc_canon_table[i].name) == 0) | |
| 454 return i; | |
| 455 return -1; | |
| 456 } | |
| 457 | |
| 458 #endif | |
| 459 | |
| 460 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 461 | |
| 462 /* | |
| 463 * Find canonical encoding "name" in the list and return its properties. | |
| 464 * Returns 0 if not found. | |
| 465 */ | |
| 466 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
467 enc_canon_props(char_u *name) |
| 7 | 468 { |
| 469 int i; | |
| 470 | |
| 471 i = enc_canon_search(name); | |
| 472 if (i >= 0) | |
| 473 return enc_canon_table[i].prop; | |
| 474 #ifdef WIN3264 | |
| 475 if (name[0] == 'c' && name[1] == 'p' && VIM_ISDIGIT(name[2])) | |
| 476 { | |
| 477 CPINFO cpinfo; | |
| 478 | |
| 479 /* 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
|
480 if (GetCPInfo(atoi((char *)name + 2), &cpinfo) != 0) |
| 7 | 481 { |
| 482 if (cpinfo.MaxCharSize == 1) /* some single-byte encoding */ | |
| 483 return ENC_8BIT; | |
| 484 if (cpinfo.MaxCharSize == 2 | |
| 485 && (cpinfo.LeadByte[0] != 0 || cpinfo.LeadByte[1] != 0)) | |
| 486 /* must be a DBCS encoding */ | |
| 487 return ENC_DBCS; | |
| 488 } | |
| 489 return 0; | |
| 490 } | |
| 491 #endif | |
| 492 if (STRNCMP(name, "2byte-", 6) == 0) | |
| 493 return ENC_DBCS; | |
| 494 if (STRNCMP(name, "8bit-", 5) == 0 || STRNCMP(name, "iso-8859-", 9) == 0) | |
| 495 return ENC_8BIT; | |
| 496 return 0; | |
| 497 } | |
| 498 | |
| 499 /* | |
| 500 * Set up for using multi-byte characters. | |
| 501 * Called in three cases: | |
| 502 * - by main() to initialize (p_enc == NULL) | |
| 503 * - by set_init_1() after 'encoding' was set to its default. | |
| 504 * - by do_set() when 'encoding' has been set. | |
| 505 * p_enc must have been passed through enc_canonize() already. | |
| 506 * Sets the "enc_unicode", "enc_utf8", "enc_dbcs" and "has_mbyte" flags. | |
| 507 * Fills mb_bytelen_tab[] and returns NULL when there are no problems. | |
| 508 * When there is something wrong: Returns an error message and doesn't change | |
| 509 * anything. | |
| 510 */ | |
| 511 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
512 mb_init(void) |
| 7 | 513 { |
| 514 int i; | |
| 515 int idx; | |
| 516 int n; | |
| 517 int enc_dbcs_new = 0; | |
| 518 #if defined(USE_ICONV) && !defined(WIN3264) && !defined(WIN32UNIX) \ | |
| 519 && !defined(MACOS) | |
| 520 # define LEN_FROM_CONV | |
| 521 vimconv_T vimconv; | |
| 522 char_u *p; | |
| 523 #endif | |
| 524 | |
| 525 if (p_enc == NULL) | |
| 526 { | |
| 527 /* Just starting up: set the whole table to one's. */ | |
| 528 for (i = 0; i < 256; ++i) | |
| 529 mb_bytelen_tab[i] = 1; | |
| 530 input_conv.vc_type = CONV_NONE; | |
| 531 input_conv.vc_factor = 1; | |
| 532 output_conv.vc_type = CONV_NONE; | |
| 533 return NULL; | |
| 534 } | |
| 535 | |
| 536 #ifdef WIN3264 | |
| 537 if (p_enc[0] == 'c' && p_enc[1] == 'p' && VIM_ISDIGIT(p_enc[2])) | |
| 538 { | |
| 539 CPINFO cpinfo; | |
| 540 | |
| 541 /* 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
|
542 if (GetCPInfo(atoi((char *)p_enc + 2), &cpinfo) != 0) |
| 7 | 543 { |
| 544 if (cpinfo.MaxCharSize == 1) | |
| 545 { | |
| 546 /* some single-byte encoding */ | |
| 547 enc_unicode = 0; | |
| 548 enc_utf8 = FALSE; | |
| 549 } | |
| 550 else if (cpinfo.MaxCharSize == 2 | |
| 551 && (cpinfo.LeadByte[0] != 0 || cpinfo.LeadByte[1] != 0)) | |
| 552 { | |
| 553 /* 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
|
554 enc_dbcs_new = atoi((char *)p_enc + 2); |
| 7 | 555 } |
| 556 else | |
| 557 goto codepage_invalid; | |
| 558 } | |
| 559 else if (GetLastError() == ERROR_INVALID_PARAMETER) | |
| 560 { | |
| 561 codepage_invalid: | |
| 562 return (char_u *)N_("E543: Not a valid codepage"); | |
| 563 } | |
| 564 } | |
| 565 #endif | |
| 566 else if (STRNCMP(p_enc, "8bit-", 5) == 0 | |
| 567 || STRNCMP(p_enc, "iso-8859-", 9) == 0) | |
| 568 { | |
| 569 /* Accept any "8bit-" or "iso-8859-" name. */ | |
| 570 enc_unicode = 0; | |
| 571 enc_utf8 = FALSE; | |
| 572 } | |
| 573 else if (STRNCMP(p_enc, "2byte-", 6) == 0) | |
| 574 { | |
| 575 #ifdef WIN3264 | |
| 576 /* Windows: accept only valid codepage numbers, check below. */ | |
| 577 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
|
578 || (enc_dbcs_new = atoi((char *)p_enc + 8)) == 0) |
| 7 | 579 return e_invarg; |
| 580 #else | |
| 581 /* Unix: accept any "2byte-" name, assume current locale. */ | |
| 582 enc_dbcs_new = DBCS_2BYTE; | |
| 583 #endif | |
| 584 } | |
| 585 else if ((idx = enc_canon_search(p_enc)) >= 0) | |
| 586 { | |
| 587 i = enc_canon_table[idx].prop; | |
| 588 if (i & ENC_UNICODE) | |
| 589 { | |
| 590 /* Unicode */ | |
| 591 enc_utf8 = TRUE; | |
| 592 if (i & (ENC_2BYTE | ENC_2WORD)) | |
| 593 enc_unicode = 2; | |
| 594 else if (i & ENC_4BYTE) | |
| 595 enc_unicode = 4; | |
| 596 else | |
| 597 enc_unicode = 0; | |
| 598 } | |
| 599 else if (i & ENC_DBCS) | |
| 600 { | |
| 601 /* 2byte, handle below */ | |
| 602 enc_dbcs_new = enc_canon_table[idx].codepage; | |
| 603 } | |
| 604 else | |
| 605 { | |
| 606 /* Must be 8-bit. */ | |
| 607 enc_unicode = 0; | |
| 608 enc_utf8 = FALSE; | |
| 609 } | |
| 610 } | |
| 611 else /* Don't know what encoding this is, reject it. */ | |
| 612 return e_invarg; | |
| 613 | |
| 614 if (enc_dbcs_new != 0) | |
| 615 { | |
| 616 #ifdef WIN3264 | |
| 617 /* Check if the DBCS code page is OK. */ | |
| 618 if (!IsValidCodePage(enc_dbcs_new)) | |
| 619 goto codepage_invalid; | |
| 620 #endif | |
| 621 enc_unicode = 0; | |
| 622 enc_utf8 = FALSE; | |
| 623 } | |
| 624 enc_dbcs = enc_dbcs_new; | |
| 625 has_mbyte = (enc_dbcs != 0 || enc_utf8); | |
| 626 | |
| 4168 | 627 #if defined(WIN3264) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD) |
| 7 | 628 enc_codepage = encname2codepage(p_enc); |
| 26 | 629 enc_latin9 = (STRCMP(p_enc, "iso-8859-15") == 0); |
| 7 | 630 #endif |
| 631 | |
| 492 | 632 /* Detect an encoding that uses latin1 characters. */ |
| 633 enc_latin1like = (enc_utf8 || STRCMP(p_enc, "latin1") == 0 | |
| 634 || STRCMP(p_enc, "iso-8859-15") == 0); | |
| 635 | |
| 7 | 636 /* |
| 637 * Set the function pointers. | |
| 638 */ | |
| 639 if (enc_utf8) | |
| 640 { | |
| 474 | 641 mb_ptr2len = utfc_ptr2len; |
| 1903 | 642 mb_ptr2len_len = utfc_ptr2len_len; |
| 7 | 643 mb_char2len = utf_char2len; |
| 644 mb_char2bytes = utf_char2bytes; | |
| 645 mb_ptr2cells = utf_ptr2cells; | |
| 1903 | 646 mb_ptr2cells_len = utf_ptr2cells_len; |
| 7 | 647 mb_char2cells = utf_char2cells; |
| 648 mb_off2cells = utf_off2cells; | |
| 649 mb_ptr2char = utf_ptr2char; | |
| 650 mb_head_off = utf_head_off; | |
| 651 } | |
| 652 else if (enc_dbcs != 0) | |
| 653 { | |
| 474 | 654 mb_ptr2len = dbcs_ptr2len; |
| 1903 | 655 mb_ptr2len_len = dbcs_ptr2len_len; |
| 7 | 656 mb_char2len = dbcs_char2len; |
| 657 mb_char2bytes = dbcs_char2bytes; | |
| 658 mb_ptr2cells = dbcs_ptr2cells; | |
| 1903 | 659 mb_ptr2cells_len = dbcs_ptr2cells_len; |
| 7 | 660 mb_char2cells = dbcs_char2cells; |
| 661 mb_off2cells = dbcs_off2cells; | |
| 662 mb_ptr2char = dbcs_ptr2char; | |
| 663 mb_head_off = dbcs_head_off; | |
| 664 } | |
| 665 else | |
| 666 { | |
| 474 | 667 mb_ptr2len = latin_ptr2len; |
| 1903 | 668 mb_ptr2len_len = latin_ptr2len_len; |
| 7 | 669 mb_char2len = latin_char2len; |
| 670 mb_char2bytes = latin_char2bytes; | |
| 671 mb_ptr2cells = latin_ptr2cells; | |
| 1903 | 672 mb_ptr2cells_len = latin_ptr2cells_len; |
| 7 | 673 mb_char2cells = latin_char2cells; |
| 674 mb_off2cells = latin_off2cells; | |
| 675 mb_ptr2char = latin_ptr2char; | |
| 676 mb_head_off = latin_head_off; | |
| 677 } | |
| 678 | |
| 679 /* | |
| 680 * Fill the mb_bytelen_tab[] for MB_BYTE2LEN(). | |
| 681 */ | |
| 682 #ifdef LEN_FROM_CONV | |
| 683 /* When 'encoding' is different from the current locale mblen() won't | |
| 684 * work. Use conversion to "utf-8" instead. */ | |
| 685 vimconv.vc_type = CONV_NONE; | |
| 686 if (enc_dbcs) | |
| 687 { | |
| 688 p = enc_locale(); | |
| 689 if (p == NULL || STRCMP(p, p_enc) != 0) | |
| 690 { | |
| 691 convert_setup(&vimconv, p_enc, (char_u *)"utf-8"); | |
| 692 vimconv.vc_fail = TRUE; | |
| 693 } | |
| 694 vim_free(p); | |
| 695 } | |
| 696 #endif | |
| 697 | |
| 698 for (i = 0; i < 256; ++i) | |
| 699 { | |
| 700 /* Our own function to reliably check the length of UTF-8 characters, | |
| 701 * independent of mblen(). */ | |
| 702 if (enc_utf8) | |
| 703 n = utf8len_tab[i]; | |
| 704 else if (enc_dbcs == 0) | |
| 705 n = 1; | |
| 706 else | |
| 707 { | |
| 708 #if defined(WIN3264) || defined(WIN32UNIX) | |
| 709 /* enc_dbcs is set by setting 'fileencoding'. It becomes a Windows | |
| 710 * CodePage identifier, which we can pass directly in to Windows | |
| 711 * API */ | |
| 5602 | 712 n = IsDBCSLeadByteEx(enc_dbcs, (WINBYTE)i) ? 2 : 1; |
| 7 | 713 #else |
| 5698 | 714 # if defined(MACOS) || defined(__amigaos4__) || defined(__ANDROID__) |
| 7 | 715 /* |
| 716 * if mblen() is not available, character which MSB is turned on | |
| 717 * are treated as leading byte character. (note : This assumption | |
| 718 * is not always true.) | |
| 719 */ | |
| 720 n = (i & 0x80) ? 2 : 1; | |
| 721 # else | |
| 3549 | 722 char buf[MB_MAXBYTES + 1]; |
| 7 | 723 # ifdef X_LOCALE |
| 724 # ifndef mblen | |
| 725 # define mblen _Xmblen | |
| 726 # endif | |
| 727 # endif | |
| 728 if (i == NUL) /* just in case mblen() can't handle "" */ | |
| 729 n = 1; | |
| 730 else | |
| 731 { | |
| 732 buf[0] = i; | |
| 733 buf[1] = 0; | |
| 734 #ifdef LEN_FROM_CONV | |
| 735 if (vimconv.vc_type != CONV_NONE) | |
| 736 { | |
| 737 /* | |
| 738 * string_convert() should fail when converting the first | |
| 739 * byte of a double-byte character. | |
| 740 */ | |
| 741 p = string_convert(&vimconv, (char_u *)buf, NULL); | |
| 742 if (p != NULL) | |
| 743 { | |
| 744 vim_free(p); | |
| 745 n = 1; | |
| 746 } | |
| 747 else | |
| 748 n = 2; | |
| 749 } | |
| 750 else | |
| 751 #endif | |
| 752 { | |
| 753 /* | |
| 754 * mblen() should return -1 for invalid (means the leading | |
| 755 * multibyte) character. However there are some platforms | |
| 756 * where mblen() returns 0 for invalid character. | |
| 757 * Therefore, following condition includes 0. | |
| 758 */ | |
| 1757 | 759 ignored = mblen(NULL, 0); /* First reset the state. */ |
| 7 | 760 if (mblen(buf, (size_t)1) <= 0) |
| 761 n = 2; | |
| 762 else | |
| 763 n = 1; | |
| 764 } | |
| 765 } | |
| 766 # endif | |
| 767 #endif | |
| 768 } | |
| 769 | |
| 770 mb_bytelen_tab[i] = n; | |
| 771 } | |
| 772 | |
| 773 #ifdef LEN_FROM_CONV | |
| 774 convert_setup(&vimconv, NULL, NULL); | |
| 775 #endif | |
| 776 | |
| 777 /* The cell width depends on the type of multi-byte characters. */ | |
| 778 (void)init_chartab(); | |
| 779 | |
| 780 /* When enc_utf8 is set or reset, (de)allocate ScreenLinesUC[] */ | |
| 781 screenalloc(FALSE); | |
| 782 | |
| 783 /* When using Unicode, set default for 'fileencodings'. */ | |
| 784 if (enc_utf8 && !option_was_set((char_u *)"fencs")) | |
| 785 set_string_option_direct((char_u *)"fencs", -1, | |
| 694 | 786 (char_u *)"ucs-bom,utf-8,default,latin1", OPT_FREE, 0); |
| 787 | |
| 7 | 788 #if defined(HAVE_BIND_TEXTDOMAIN_CODESET) && defined(FEAT_GETTEXT) |
| 789 /* GNU gettext 0.10.37 supports this feature: set the codeset used for | |
| 790 * translated messages independently from the current locale. */ | |
| 791 (void)bind_textdomain_codeset(VIMPACKAGE, | |
| 792 enc_utf8 ? "utf-8" : (char *)p_enc); | |
| 793 #endif | |
| 794 | |
| 23 | 795 #ifdef WIN32 |
| 796 /* When changing 'encoding' while starting up, then convert the command | |
| 797 * line arguments from the active codepage to 'encoding'. */ | |
| 798 if (starting != 0) | |
| 799 fix_arg_enc(); | |
| 800 #endif | |
| 801 | |
| 7 | 802 #ifdef FEAT_AUTOCMD |
| 803 /* Fire an autocommand to let people do custom font setup. This must be | |
| 804 * after Vim has been setup for the new encoding. */ | |
| 805 apply_autocmds(EVENT_ENCODINGCHANGED, NULL, (char_u *)"", FALSE, curbuf); | |
| 806 #endif | |
| 807 | |
| 740 | 808 #ifdef FEAT_SPELL |
| 236 | 809 /* Need to reload spell dictionaries */ |
| 810 spell_reload(); | |
| 811 #endif | |
| 812 | |
| 7 | 813 return NULL; |
| 814 } | |
| 815 | |
| 816 /* | |
| 817 * Return the size of the BOM for the current buffer: | |
| 818 * 0 - no BOM | |
| 819 * 2 - UCS-2 or UTF-16 BOM | |
| 820 * 4 - UCS-4 BOM | |
| 821 * 3 - UTF-8 BOM | |
| 822 */ | |
| 823 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
824 bomb_size(void) |
| 7 | 825 { |
| 826 int n = 0; | |
| 827 | |
| 828 if (curbuf->b_p_bomb && !curbuf->b_p_bin) | |
| 829 { | |
| 830 if (*curbuf->b_p_fenc == NUL) | |
| 831 { | |
| 832 if (enc_utf8) | |
| 833 { | |
| 834 if (enc_unicode != 0) | |
| 835 n = enc_unicode; | |
| 836 else | |
| 837 n = 3; | |
| 838 } | |
| 839 } | |
| 840 else if (STRCMP(curbuf->b_p_fenc, "utf-8") == 0) | |
| 841 n = 3; | |
| 842 else if (STRNCMP(curbuf->b_p_fenc, "ucs-2", 5) == 0 | |
| 843 || STRNCMP(curbuf->b_p_fenc, "utf-16", 6) == 0) | |
| 844 n = 2; | |
| 845 else if (STRNCMP(curbuf->b_p_fenc, "ucs-4", 5) == 0) | |
| 846 n = 4; | |
| 847 } | |
| 848 return n; | |
| 849 } | |
| 850 | |
| 851 /* | |
| 3002 | 852 * Remove all BOM from "s" by moving remaining text. |
| 853 */ | |
| 854 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
855 remove_bom(char_u *s) |
| 3002 | 856 { |
| 857 if (enc_utf8) | |
| 858 { | |
| 859 char_u *p = s; | |
| 860 | |
| 861 while ((p = vim_strbyte(p, 0xef)) != NULL) | |
| 862 { | |
| 863 if (p[1] == 0xbb && p[2] == 0xbf) | |
| 864 STRMOVE(p, p + 3); | |
| 865 else | |
| 866 ++p; | |
| 867 } | |
| 868 } | |
| 869 } | |
| 870 | |
| 871 /* | |
| 7 | 872 * Get class of pointer: |
| 873 * 0 for blank or NUL | |
| 874 * 1 for punctuation | |
| 875 * 2 for an (ASCII) word character | |
| 876 * >2 for other word characters | |
| 877 */ | |
| 878 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
879 mb_get_class(char_u *p) |
| 7 | 880 { |
| 4069 | 881 return mb_get_class_buf(p, curbuf); |
| 882 } | |
| 883 | |
| 884 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
885 mb_get_class_buf(char_u *p, buf_T *buf) |
| 4069 | 886 { |
| 7 | 887 if (MB_BYTE2LEN(p[0]) == 1) |
| 888 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
889 if (p[0] == NUL || VIM_ISWHITE(p[0])) |
| 7 | 890 return 0; |
| 4069 | 891 if (vim_iswordc_buf(p[0], buf)) |
| 7 | 892 return 2; |
| 893 return 1; | |
| 894 } | |
| 895 if (enc_dbcs != 0 && p[0] != NUL && p[1] != NUL) | |
| 896 return dbcs_class(p[0], p[1]); | |
| 897 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
|
898 return utf_class_buf(utf_ptr2char(p), buf); |
| 7 | 899 return 0; |
| 900 } | |
| 901 | |
| 902 /* | |
| 903 * Get class of a double-byte character. This always returns 3 or bigger. | |
| 904 * TODO: Should return 1 for punctuation. | |
| 905 */ | |
| 906 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
907 dbcs_class(unsigned lead, unsigned trail) |
| 7 | 908 { |
| 909 switch (enc_dbcs) | |
| 910 { | |
| 4352 | 911 /* please add classify routine for your language in here */ |
| 7 | 912 |
| 913 case DBCS_JPNU: /* ? */ | |
| 914 case DBCS_JPN: | |
| 915 { | |
| 916 /* JIS code classification */ | |
| 917 unsigned char lb = lead; | |
| 918 unsigned char tb = trail; | |
| 919 | |
| 920 /* convert process code to JIS */ | |
| 921 # if defined(WIN3264) || defined(WIN32UNIX) || defined(MACOS) | |
| 922 /* process code is SJIS */ | |
| 923 if (lb <= 0x9f) | |
| 924 lb = (lb - 0x81) * 2 + 0x21; | |
| 925 else | |
| 926 lb = (lb - 0xc1) * 2 + 0x21; | |
| 927 if (tb <= 0x7e) | |
| 928 tb -= 0x1f; | |
| 929 else if (tb <= 0x9e) | |
| 930 tb -= 0x20; | |
| 931 else | |
| 932 { | |
| 933 tb -= 0x7e; | |
| 934 lb += 1; | |
| 935 } | |
| 936 # else | |
| 937 /* | |
| 938 * XXX: Code page identification can not use with all | |
| 939 * system! So, some other encoding information | |
| 940 * will be needed. | |
| 941 * In japanese: SJIS,EUC,UNICODE,(JIS) | |
| 942 * Note that JIS-code system don't use as | |
| 943 * process code in most system because it uses | |
| 944 * escape sequences(JIS is context depend encoding). | |
| 945 */ | |
| 946 /* assume process code is JAPANESE-EUC */ | |
| 947 lb &= 0x7f; | |
| 948 tb &= 0x7f; | |
| 949 # endif | |
| 950 /* exceptions */ | |
| 951 switch (lb << 8 | tb) | |
| 952 { | |
| 953 case 0x2121: /* ZENKAKU space */ | |
| 954 return 0; | |
| 5477 | 955 case 0x2122: /* TOU-TEN (Japanese comma) */ |
| 956 case 0x2123: /* KU-TEN (Japanese period) */ | |
| 7 | 957 case 0x2124: /* ZENKAKU comma */ |
| 958 case 0x2125: /* ZENKAKU period */ | |
| 959 return 1; | |
| 960 case 0x213c: /* prolongedsound handled as KATAKANA */ | |
| 961 return 13; | |
| 962 } | |
| 963 /* sieved by KU code */ | |
| 964 switch (lb) | |
| 965 { | |
| 966 case 0x21: | |
| 967 case 0x22: | |
| 968 /* special symbols */ | |
| 969 return 10; | |
| 970 case 0x23: | |
| 971 /* alpha-numeric */ | |
| 972 return 11; | |
| 973 case 0x24: | |
| 974 /* hiragana */ | |
| 975 return 12; | |
| 976 case 0x25: | |
| 977 /* katakana */ | |
| 978 return 13; | |
| 979 case 0x26: | |
| 980 /* greek */ | |
| 981 return 14; | |
| 982 case 0x27: | |
| 983 /* russian */ | |
| 984 return 15; | |
| 985 case 0x28: | |
| 986 /* lines */ | |
| 987 return 16; | |
| 988 default: | |
| 989 /* kanji */ | |
| 990 return 17; | |
| 991 } | |
| 992 } | |
| 993 | |
| 994 case DBCS_KORU: /* ? */ | |
| 995 case DBCS_KOR: | |
| 996 { | |
| 997 /* KS code classification */ | |
| 998 unsigned char c1 = lead; | |
| 999 unsigned char c2 = trail; | |
| 1000 | |
| 1001 /* | |
| 1002 * 20 : Hangul | |
| 1003 * 21 : Hanja | |
| 1004 * 22 : Symbols | |
| 1005 * 23 : Alpha-numeric/Roman Letter (Full width) | |
| 1006 * 24 : Hangul Letter(Alphabet) | |
| 1007 * 25 : Roman Numeral/Greek Letter | |
| 1008 * 26 : Box Drawings | |
| 1009 * 27 : Unit Symbols | |
| 1010 * 28 : Circled/Parenthesized Letter | |
| 4352 | 1011 * 29 : Hiragana/Katakana |
| 7 | 1012 * 30 : Cyrillic Letter |
| 1013 */ | |
| 1014 | |
| 1015 if (c1 >= 0xB0 && c1 <= 0xC8) | |
| 1016 /* Hangul */ | |
| 1017 return 20; | |
| 1018 #if defined(WIN3264) || defined(WIN32UNIX) | |
| 1019 else if (c1 <= 0xA0 || c2 <= 0xA0) | |
| 1020 /* Extended Hangul Region : MS UHC(Unified Hangul Code) */ | |
| 1021 /* c1: 0x81-0xA0 with c2: 0x41-0x5A, 0x61-0x7A, 0x81-0xFE | |
| 1022 * c1: 0xA1-0xC6 with c2: 0x41-0x5A, 0x61-0x7A, 0x81-0xA0 | |
| 1023 */ | |
| 1024 return 20; | |
| 1025 #endif | |
| 1026 | |
| 1027 else if (c1 >= 0xCA && c1 <= 0xFD) | |
| 1028 /* Hanja */ | |
| 1029 return 21; | |
| 1030 else switch (c1) | |
| 1031 { | |
| 1032 case 0xA1: | |
| 1033 case 0xA2: | |
| 1034 /* Symbols */ | |
| 1035 return 22; | |
| 1036 case 0xA3: | |
| 1037 /* Alpha-numeric */ | |
| 1038 return 23; | |
| 1039 case 0xA4: | |
| 1040 /* Hangul Letter(Alphabet) */ | |
| 1041 return 24; | |
| 1042 case 0xA5: | |
| 1043 /* Roman Numeral/Greek Letter */ | |
| 1044 return 25; | |
| 1045 case 0xA6: | |
| 1046 /* Box Drawings */ | |
| 1047 return 26; | |
| 1048 case 0xA7: | |
| 1049 /* Unit Symbols */ | |
| 1050 return 27; | |
| 1051 case 0xA8: | |
| 1052 case 0xA9: | |
| 1053 if (c2 <= 0xAF) | |
| 1054 return 25; /* Roman Letter */ | |
| 1055 else if (c2 >= 0xF6) | |
| 1056 return 22; /* Symbols */ | |
| 1057 else | |
| 1058 /* Circled/Parenthesized Letter */ | |
| 1059 return 28; | |
| 1060 case 0xAA: | |
| 1061 case 0xAB: | |
| 4352 | 1062 /* Hiragana/Katakana */ |
| 7 | 1063 return 29; |
| 1064 case 0xAC: | |
| 1065 /* Cyrillic Letter */ | |
| 1066 return 30; | |
| 1067 } | |
| 1068 } | |
| 1069 default: | |
| 1070 break; | |
| 1071 } | |
| 1072 return 3; | |
| 1073 } | |
| 1074 | |
| 1075 /* | |
| 1076 * mb_char2len() function pointer. | |
| 1077 * Return length in bytes of character "c". | |
| 1078 * Returns 1 for a single-byte character. | |
| 1079 */ | |
| 1080 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1081 latin_char2len(int c UNUSED) |
| 7 | 1082 { |
| 1083 return 1; | |
| 1084 } | |
| 1085 | |
| 1086 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1087 dbcs_char2len( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1088 int c) |
| 7 | 1089 { |
| 1090 if (c >= 0x100) | |
| 1091 return 2; | |
| 1092 return 1; | |
| 1093 } | |
| 1094 | |
| 1095 /* | |
| 1096 * mb_char2bytes() function pointer. | |
| 1097 * Convert a character to its bytes. | |
| 1098 * Returns the length in bytes. | |
| 1099 */ | |
| 1100 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1101 latin_char2bytes(int c, char_u *buf) |
| 7 | 1102 { |
| 1103 buf[0] = c; | |
| 1104 return 1; | |
| 1105 } | |
| 1106 | |
| 1107 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1108 dbcs_char2bytes(int c, char_u *buf) |
| 7 | 1109 { |
| 1110 if (c >= 0x100) | |
| 1111 { | |
| 1112 buf[0] = (unsigned)c >> 8; | |
| 1113 buf[1] = c; | |
| 221 | 1114 /* Never use a NUL byte, it causes lots of trouble. It's an invalid |
| 1115 * character anyway. */ | |
| 1116 if (buf[1] == NUL) | |
| 1117 buf[1] = '\n'; | |
| 7 | 1118 return 2; |
| 1119 } | |
| 1120 buf[0] = c; | |
| 1121 return 1; | |
| 1122 } | |
| 1123 | |
| 1124 /* | |
| 474 | 1125 * mb_ptr2len() function pointer. |
| 7 | 1126 * Get byte length of character at "*p" but stop at a NUL. |
| 1127 * For UTF-8 this includes following composing characters. | |
| 1128 * Returns 0 when *p is NUL. | |
| 1129 */ | |
| 1130 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1131 latin_ptr2len(char_u *p) |
| 7 | 1132 { |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1133 return MB_BYTE2LEN(*p); |
| 7 | 1134 } |
| 1135 | |
| 1136 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1137 dbcs_ptr2len( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1138 char_u *p) |
| 7 | 1139 { |
| 1140 int len; | |
| 1141 | |
| 1142 /* Check if second byte is not missing. */ | |
| 1143 len = MB_BYTE2LEN(*p); | |
| 1144 if (len == 2 && p[1] == NUL) | |
| 1145 len = 1; | |
| 1146 return len; | |
| 1147 } | |
| 1148 | |
| 1903 | 1149 /* |
| 1150 * mb_ptr2len_len() function pointer. | |
| 1151 * Like mb_ptr2len(), but limit to read "size" bytes. | |
| 1152 * Returns 0 for an empty string. | |
| 1153 * Returns 1 for an illegal char or an incomplete byte sequence. | |
| 1154 */ | |
| 1155 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1156 latin_ptr2len_len(char_u *p, int size) |
| 1903 | 1157 { |
| 1158 if (size < 1 || *p == NUL) | |
| 1159 return 0; | |
| 1160 return 1; | |
| 1161 } | |
| 1162 | |
| 1163 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1164 dbcs_ptr2len_len(char_u *p, int size) |
| 1903 | 1165 { |
| 1166 int len; | |
| 1167 | |
| 1168 if (size < 1 || *p == NUL) | |
| 1169 return 0; | |
| 1170 if (size == 1) | |
| 1171 return 1; | |
| 1172 /* Check that second byte is not missing. */ | |
| 1173 len = MB_BYTE2LEN(*p); | |
| 1174 if (len == 2 && p[1] == NUL) | |
| 1175 len = 1; | |
| 1176 return len; | |
| 1177 } | |
| 1178 | |
| 7 | 1179 struct interval |
| 1180 { | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1181 long first; |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1182 long last; |
| 7 | 1183 }; |
| 1184 | |
| 1185 /* | |
| 1186 * Return TRUE if "c" is in "table[size / sizeof(struct interval)]". | |
| 1187 */ | |
| 1188 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1189 intable(struct interval *table, size_t size, int c) |
| 7 | 1190 { |
| 1191 int mid, bot, top; | |
| 1192 | |
| 1193 /* first quick check for Latin1 etc. characters */ | |
| 1194 if (c < table[0].first) | |
| 1195 return FALSE; | |
| 1196 | |
| 1197 /* binary search in table */ | |
| 1198 bot = 0; | |
| 835 | 1199 top = (int)(size / sizeof(struct interval) - 1); |
| 7 | 1200 while (top >= bot) |
| 1201 { | |
| 1202 mid = (bot + top) / 2; | |
| 1203 if (table[mid].last < c) | |
| 1204 bot = mid + 1; | |
| 1205 else if (table[mid].first > c) | |
| 1206 top = mid - 1; | |
| 1207 else | |
| 1208 return TRUE; | |
| 1209 } | |
| 1210 return FALSE; | |
| 1211 } | |
| 1212 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1213 /* 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
|
1214 * 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
|
1215 static struct interval ambiguous[] = |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1216 { |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1217 {0x00a1, 0x00a1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1218 {0x00a4, 0x00a4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1219 {0x00a7, 0x00a8}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1220 {0x00aa, 0x00aa}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1221 {0x00ad, 0x00ae}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1222 {0x00b0, 0x00b4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1223 {0x00b6, 0x00ba}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1224 {0x00bc, 0x00bf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1225 {0x00c6, 0x00c6}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1226 {0x00d0, 0x00d0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1227 {0x00d7, 0x00d8}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1228 {0x00de, 0x00e1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1229 {0x00e6, 0x00e6}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1230 {0x00e8, 0x00ea}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1231 {0x00ec, 0x00ed}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1232 {0x00f0, 0x00f0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1233 {0x00f2, 0x00f3}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1234 {0x00f7, 0x00fa}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1235 {0x00fc, 0x00fc}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1236 {0x00fe, 0x00fe}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1237 {0x0101, 0x0101}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1238 {0x0111, 0x0111}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1239 {0x0113, 0x0113}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1240 {0x011b, 0x011b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1241 {0x0126, 0x0127}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1242 {0x012b, 0x012b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1243 {0x0131, 0x0133}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1244 {0x0138, 0x0138}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1245 {0x013f, 0x0142}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1246 {0x0144, 0x0144}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1247 {0x0148, 0x014b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1248 {0x014d, 0x014d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1249 {0x0152, 0x0153}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1250 {0x0166, 0x0167}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1251 {0x016b, 0x016b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1252 {0x01ce, 0x01ce}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1253 {0x01d0, 0x01d0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1254 {0x01d2, 0x01d2}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1255 {0x01d4, 0x01d4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1256 {0x01d6, 0x01d6}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1257 {0x01d8, 0x01d8}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1258 {0x01da, 0x01da}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1259 {0x01dc, 0x01dc}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1260 {0x0251, 0x0251}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1261 {0x0261, 0x0261}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1262 {0x02c4, 0x02c4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1263 {0x02c7, 0x02c7}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1264 {0x02c9, 0x02cb}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1265 {0x02cd, 0x02cd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1266 {0x02d0, 0x02d0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1267 {0x02d8, 0x02db}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1268 {0x02dd, 0x02dd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1269 {0x02df, 0x02df}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1270 {0x0300, 0x036f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1271 {0x0391, 0x03a1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1272 {0x03a3, 0x03a9}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1273 {0x03b1, 0x03c1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1274 {0x03c3, 0x03c9}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1275 {0x0401, 0x0401}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1276 {0x0410, 0x044f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1277 {0x0451, 0x0451}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1278 {0x2010, 0x2010}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1279 {0x2013, 0x2016}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1280 {0x2018, 0x2019}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1281 {0x201c, 0x201d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1282 {0x2020, 0x2022}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1283 {0x2024, 0x2027}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1284 {0x2030, 0x2030}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1285 {0x2032, 0x2033}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1286 {0x2035, 0x2035}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1287 {0x203b, 0x203b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1288 {0x203e, 0x203e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1289 {0x2074, 0x2074}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1290 {0x207f, 0x207f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1291 {0x2081, 0x2084}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1292 {0x20ac, 0x20ac}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1293 {0x2103, 0x2103}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1294 {0x2105, 0x2105}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1295 {0x2109, 0x2109}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1296 {0x2113, 0x2113}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1297 {0x2116, 0x2116}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1298 {0x2121, 0x2122}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1299 {0x2126, 0x2126}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1300 {0x212b, 0x212b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1301 {0x2153, 0x2154}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1302 {0x215b, 0x215e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1303 {0x2160, 0x216b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1304 {0x2170, 0x2179}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1305 {0x2189, 0x2189}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1306 {0x2190, 0x2199}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1307 {0x21b8, 0x21b9}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1308 {0x21d2, 0x21d2}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1309 {0x21d4, 0x21d4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1310 {0x21e7, 0x21e7}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1311 {0x2200, 0x2200}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1312 {0x2202, 0x2203}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1313 {0x2207, 0x2208}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1314 {0x220b, 0x220b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1315 {0x220f, 0x220f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1316 {0x2211, 0x2211}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1317 {0x2215, 0x2215}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1318 {0x221a, 0x221a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1319 {0x221d, 0x2220}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1320 {0x2223, 0x2223}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1321 {0x2225, 0x2225}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1322 {0x2227, 0x222c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1323 {0x222e, 0x222e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1324 {0x2234, 0x2237}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1325 {0x223c, 0x223d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1326 {0x2248, 0x2248}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1327 {0x224c, 0x224c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1328 {0x2252, 0x2252}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1329 {0x2260, 0x2261}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1330 {0x2264, 0x2267}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1331 {0x226a, 0x226b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1332 {0x226e, 0x226f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1333 {0x2282, 0x2283}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1334 {0x2286, 0x2287}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1335 {0x2295, 0x2295}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1336 {0x2299, 0x2299}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1337 {0x22a5, 0x22a5}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1338 {0x22bf, 0x22bf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1339 {0x2312, 0x2312}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1340 {0x2460, 0x24e9}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1341 {0x24eb, 0x254b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1342 {0x2550, 0x2573}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1343 {0x2580, 0x258f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1344 {0x2592, 0x2595}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1345 {0x25a0, 0x25a1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1346 {0x25a3, 0x25a9}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1347 {0x25b2, 0x25b3}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1348 {0x25b6, 0x25b7}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1349 {0x25bc, 0x25bd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1350 {0x25c0, 0x25c1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1351 {0x25c6, 0x25c8}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1352 {0x25cb, 0x25cb}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1353 {0x25ce, 0x25d1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1354 {0x25e2, 0x25e5}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1355 {0x25ef, 0x25ef}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1356 {0x2605, 0x2606}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1357 {0x2609, 0x2609}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1358 {0x260e, 0x260f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1359 {0x261c, 0x261c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1360 {0x261e, 0x261e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1361 {0x2640, 0x2640}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1362 {0x2642, 0x2642}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1363 {0x2660, 0x2661}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1364 {0x2663, 0x2665}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1365 {0x2667, 0x266a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1366 {0x266c, 0x266d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1367 {0x266f, 0x266f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1368 {0x269e, 0x269f}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1369 {0x26bf, 0x26bf}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1370 {0x26c6, 0x26cd}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1371 {0x26cf, 0x26d3}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1372 {0x26d5, 0x26e1}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1373 {0x26e3, 0x26e3}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1374 {0x26e8, 0x26e9}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1375 {0x26eb, 0x26f1}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1376 {0x26f4, 0x26f4}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1377 {0x26f6, 0x26f9}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1378 {0x26fb, 0x26fc}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1379 {0x26fe, 0x26ff}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1380 {0x273d, 0x273d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1381 {0x2776, 0x277f}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1382 {0x2b56, 0x2b59}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1383 {0x3248, 0x324f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1384 {0xe000, 0xf8ff}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1385 {0xfe00, 0xfe0f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1386 {0xfffd, 0xfffd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1387 {0x1f100, 0x1f10a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1388 {0x1f110, 0x1f12d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1389 {0x1f130, 0x1f169}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1390 {0x1f170, 0x1f18d}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1391 {0x1f18f, 0x1f190}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1392 {0x1f19b, 0x1f1ac}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1393 {0xe0100, 0xe01ef}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1394 {0xf0000, 0xffffd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1395 {0x100000, 0x10fffd} |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1396 }; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1397 |
|
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1398 #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
|
1399 /* |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1400 * 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
|
1401 */ |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1402 int |
|
12269
d2373927d76d
patch 8.0.1014: old compiler doesn't know uint32_t
Christian Brabandt <cb@256bit.org>
parents:
12210
diff
changeset
|
1403 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
|
1404 { |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1405 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
|
1406 } |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1407 #endif |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1408 |
| 7 | 1409 /* |
| 1410 * For UTF-8 character "c" return 2 for a double-width character, 1 for others. | |
| 1411 * Returns 4 or 6 for an unprintable character. | |
| 1412 * Is only correct for characters >= 0x80. | |
| 1413 * When p_ambw is "double", return 2 for a character with East Asian Width | |
| 1414 * class 'A'(mbiguous). | |
| 1415 */ | |
| 1416 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1417 utf_char2cells(int c) |
| 7 | 1418 { |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1419 /* 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
|
1420 * characters, generated with ../runtime/tools/unicode.vim. */ |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1421 static struct interval doublewidth[] = |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1422 { |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1423 {0x1100, 0x115f}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1424 {0x231a, 0x231b}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1425 {0x2329, 0x232a}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1426 {0x23e9, 0x23ec}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1427 {0x23f0, 0x23f0}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1428 {0x23f3, 0x23f3}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1429 {0x25fd, 0x25fe}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1430 {0x2614, 0x2615}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1431 {0x2648, 0x2653}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1432 {0x267f, 0x267f}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1433 {0x2693, 0x2693}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1434 {0x26a1, 0x26a1}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1435 {0x26aa, 0x26ab}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1436 {0x26bd, 0x26be}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1437 {0x26c4, 0x26c5}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1438 {0x26ce, 0x26ce}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1439 {0x26d4, 0x26d4}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1440 {0x26ea, 0x26ea}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1441 {0x26f2, 0x26f3}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1442 {0x26f5, 0x26f5}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1443 {0x26fa, 0x26fa}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1444 {0x26fd, 0x26fd}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1445 {0x2705, 0x2705}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1446 {0x270a, 0x270b}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1447 {0x2728, 0x2728}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1448 {0x274c, 0x274c}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1449 {0x274e, 0x274e}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1450 {0x2753, 0x2755}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1451 {0x2757, 0x2757}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1452 {0x2795, 0x2797}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1453 {0x27b0, 0x27b0}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1454 {0x27bf, 0x27bf}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1455 {0x2b1b, 0x2b1c}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1456 {0x2b50, 0x2b50}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1457 {0x2b55, 0x2b55}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1458 {0x2e80, 0x2e99}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1459 {0x2e9b, 0x2ef3}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1460 {0x2f00, 0x2fd5}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1461 {0x2ff0, 0x2ffb}, |
| 6495 | 1462 {0x3000, 0x303e}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1463 {0x3041, 0x3096}, |
| 6495 | 1464 {0x3099, 0x30ff}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1465 {0x3105, 0x312e}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1466 {0x3131, 0x318e}, |
| 6495 | 1467 {0x3190, 0x31ba}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1468 {0x31c0, 0x31e3}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1469 {0x31f0, 0x321e}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1470 {0x3220, 0x3247}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1471 {0x3250, 0x32fe}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1472 {0x3300, 0x4dbf}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1473 {0x4e00, 0xa48c}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1474 {0xa490, 0xa4c6}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1475 {0xa960, 0xa97c}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1476 {0xac00, 0xd7a3}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1477 {0xf900, 0xfaff}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1478 {0xfe10, 0xfe19}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1479 {0xfe30, 0xfe52}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1480 {0xfe54, 0xfe66}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1481 {0xfe68, 0xfe6b}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1482 {0xff01, 0xff60}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1483 {0xffe0, 0xffe6}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1484 {0x16fe0, 0x16fe1}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1485 {0x17000, 0x187ec}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1486 {0x18800, 0x18af2}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1487 {0x1b000, 0x1b11e}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1488 {0x1b170, 0x1b2fb}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1489 {0x1f004, 0x1f004}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1490 {0x1f0cf, 0x1f0cf}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1491 {0x1f18e, 0x1f18e}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1492 {0x1f191, 0x1f19a}, |
|
8682
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
1493 {0x1f200, 0x1f202}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1494 {0x1f210, 0x1f23b}, |
|
8682
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
1495 {0x1f240, 0x1f248}, |
|
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
1496 {0x1f250, 0x1f251}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1497 {0x1f260, 0x1f265}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1498 {0x1f300, 0x1f320}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1499 {0x1f32d, 0x1f335}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1500 {0x1f337, 0x1f37c}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1501 {0x1f37e, 0x1f393}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1502 {0x1f3a0, 0x1f3ca}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1503 {0x1f3cf, 0x1f3d3}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1504 {0x1f3e0, 0x1f3f0}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1505 {0x1f3f4, 0x1f3f4}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1506 {0x1f3f8, 0x1f43e}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1507 {0x1f440, 0x1f440}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1508 {0x1f442, 0x1f4fc}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1509 {0x1f4ff, 0x1f53d}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1510 {0x1f54b, 0x1f54e}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1511 {0x1f550, 0x1f567}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1512 {0x1f57a, 0x1f57a}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1513 {0x1f595, 0x1f596}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1514 {0x1f5a4, 0x1f5a4}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1515 {0x1f5fb, 0x1f64f}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1516 {0x1f680, 0x1f6c5}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1517 {0x1f6cc, 0x1f6cc}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1518 {0x1f6d0, 0x1f6d2}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1519 {0x1f6eb, 0x1f6ec}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1520 {0x1f6f4, 0x1f6f8}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1521 {0x1f910, 0x1f93e}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1522 {0x1f940, 0x1f94c}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1523 {0x1f950, 0x1f96b}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1524 {0x1f980, 0x1f997}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1525 {0x1f9c0, 0x1f9c0}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1526 {0x1f9d0, 0x1f9e6}, |
|
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. | |
| 1785 * Does not include composing characters, of course. | |
| 1786 */ | |
| 1787 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1788 utf_ptr2char(char_u *p) |
| 7 | 1789 { |
| 1790 int len; | |
| 1791 | |
| 1792 if (p[0] < 0x80) /* be quick for ASCII */ | |
| 1793 return p[0]; | |
| 1794 | |
| 2015 | 1795 len = utf8len_tab_zero[p[0]]; |
| 1658 | 1796 if (len > 1 && (p[1] & 0xc0) == 0x80) |
| 7 | 1797 { |
| 1798 if (len == 2) | |
| 1799 return ((p[0] & 0x1f) << 6) + (p[1] & 0x3f); | |
| 1800 if ((p[2] & 0xc0) == 0x80) | |
| 1801 { | |
| 1802 if (len == 3) | |
| 1803 return ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) | |
| 1804 + (p[2] & 0x3f); | |
| 1805 if ((p[3] & 0xc0) == 0x80) | |
| 1806 { | |
| 1807 if (len == 4) | |
| 1808 return ((p[0] & 0x07) << 18) + ((p[1] & 0x3f) << 12) | |
| 1809 + ((p[2] & 0x3f) << 6) + (p[3] & 0x3f); | |
| 1810 if ((p[4] & 0xc0) == 0x80) | |
| 1811 { | |
| 1812 if (len == 5) | |
| 1813 return ((p[0] & 0x03) << 24) + ((p[1] & 0x3f) << 18) | |
| 1814 + ((p[2] & 0x3f) << 12) + ((p[3] & 0x3f) << 6) | |
| 1815 + (p[4] & 0x3f); | |
| 1816 if ((p[5] & 0xc0) == 0x80 && len == 6) | |
| 1817 return ((p[0] & 0x01) << 30) + ((p[1] & 0x3f) << 24) | |
| 1818 + ((p[2] & 0x3f) << 18) + ((p[3] & 0x3f) << 12) | |
| 1819 + ((p[4] & 0x3f) << 6) + (p[5] & 0x3f); | |
| 1820 } | |
| 1821 } | |
| 1822 } | |
| 1823 } | |
| 1824 /* Illegal value, just return the first byte */ | |
| 1825 return p[0]; | |
| 1826 } | |
| 1827 | |
| 1828 /* | |
| 2961 | 1829 * Convert a UTF-8 byte sequence to a wide character. |
| 1830 * String is assumed to be terminated by NUL or after "n" bytes, whichever | |
| 1831 * comes first. | |
| 1832 * The function is safe in the sense that it never accesses memory beyond the | |
| 1833 * first "n" bytes of "s". | |
| 1834 * | |
| 1835 * On success, returns decoded codepoint, advances "s" to the beginning of | |
| 1836 * next character and decreases "n" accordingly. | |
| 1837 * | |
| 1838 * If end of string was reached, returns 0 and, if "n" > 0, advances "s" past | |
| 1839 * NUL byte. | |
| 1840 * | |
| 1841 * If byte sequence is illegal or incomplete, returns -1 and does not advance | |
| 1842 * "s". | |
| 1843 */ | |
| 1844 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1845 utf_safe_read_char_adv(char_u **s, size_t *n) |
| 2961 | 1846 { |
| 1847 int c, k; | |
| 1848 | |
| 1849 if (*n == 0) /* end of buffer */ | |
| 1850 return 0; | |
| 1851 | |
| 1852 k = utf8len_tab_zero[**s]; | |
| 1853 | |
| 1854 if (k == 1) | |
| 1855 { | |
| 1856 /* ASCII character or NUL */ | |
| 1857 (*n)--; | |
| 1858 return *(*s)++; | |
| 1859 } | |
| 1860 | |
| 1861 if ((size_t)k <= *n) | |
| 1862 { | |
| 1863 /* We have a multibyte sequence and it isn't truncated by buffer | |
| 1864 * limits so utf_ptr2char() is safe to use. Or the first byte is | |
| 1865 * illegal (k=0), and it's also safe to use utf_ptr2char(). */ | |
| 1866 c = utf_ptr2char(*s); | |
| 1867 | |
| 1868 /* On failure, utf_ptr2char() returns the first byte, so here we | |
| 1869 * check equality with the first byte. The only non-ASCII character | |
| 1870 * which equals the first byte of its own UTF-8 representation is | |
| 1871 * U+00C3 (UTF-8: 0xC3 0x83), so need to check that special case too. | |
| 1872 * It's safe even if n=1, else we would have k=2 > n. */ | |
| 1873 if (c != (int)(**s) || (c == 0xC3 && (*s)[1] == 0x83)) | |
| 1874 { | |
| 1875 /* byte sequence was successfully decoded */ | |
| 1876 *s += k; | |
| 1877 *n -= k; | |
| 1878 return c; | |
| 1879 } | |
| 1880 } | |
| 1881 | |
| 1882 /* byte sequence is incomplete or illegal */ | |
| 1883 return -1; | |
| 1884 } | |
| 1885 | |
| 1886 /* | |
| 7 | 1887 * Get character at **pp and advance *pp to the next character. |
| 1888 * Note: composing characters are skipped! | |
| 1889 */ | |
| 1890 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1891 mb_ptr2char_adv(char_u **pp) |
| 7 | 1892 { |
| 1893 int c; | |
| 1894 | |
| 1895 c = (*mb_ptr2char)(*pp); | |
| 474 | 1896 *pp += (*mb_ptr2len)(*pp); |
| 1897 return c; | |
| 1898 } | |
| 1899 | |
| 1900 /* | |
| 1901 * Get character at **pp and advance *pp to the next character. | |
| 1902 * Note: composing characters are returned as separate characters. | |
| 1903 */ | |
| 1904 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1905 mb_cptr2char_adv(char_u **pp) |
| 474 | 1906 { |
| 1907 int c; | |
| 1908 | |
| 1909 c = (*mb_ptr2char)(*pp); | |
| 1910 if (enc_utf8) | |
| 1911 *pp += utf_ptr2len(*pp); | |
| 1912 else | |
| 1913 *pp += (*mb_ptr2len)(*pp); | |
| 7 | 1914 return c; |
| 1915 } | |
| 1916 | |
| 1917 #if defined(FEAT_ARABIC) || defined(PROTO) | |
| 1918 /* | |
| 1919 * Check whether we are dealing with Arabic combining characters. | |
| 1920 * Note: these are NOT really composing characters! | |
| 1921 */ | |
| 1922 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1923 arabic_combine( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1924 int one, /* first character */ |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1925 int two) /* character just after "one" */ |
| 7 | 1926 { |
| 1927 if (one == a_LAM) | |
| 1928 return arabic_maycombine(two); | |
| 1929 return FALSE; | |
| 1930 } | |
| 1931 | |
| 1932 /* | |
| 1933 * Check whether we are dealing with a character that could be regarded as an | |
| 1934 * Arabic combining character, need to check the character before this. | |
| 1935 */ | |
| 1936 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1937 arabic_maycombine(int two) |
| 7 | 1938 { |
| 1939 if (p_arshape && !p_tbidi) | |
| 1940 return (two == a_ALEF_MADDA | |
| 1941 || two == a_ALEF_HAMZA_ABOVE | |
| 1942 || two == a_ALEF_HAMZA_BELOW | |
| 1943 || two == a_ALEF); | |
| 1944 return FALSE; | |
| 1945 } | |
| 1946 | |
| 1947 /* | |
| 1948 * Check if the character pointed to by "p2" is a composing character when it | |
| 1949 * comes after "p1". For Arabic sometimes "ab" is replaced with "c", which | |
| 1950 * behaves like a composing character. | |
| 1951 */ | |
| 1952 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1953 utf_composinglike(char_u *p1, char_u *p2) |
| 7 | 1954 { |
| 1955 int c2; | |
| 1956 | |
| 1957 c2 = utf_ptr2char(p2); | |
| 1958 if (utf_iscomposing(c2)) | |
| 1959 return TRUE; | |
| 1960 if (!arabic_maycombine(c2)) | |
| 1961 return FALSE; | |
| 1962 return arabic_combine(utf_ptr2char(p1), c2); | |
| 1963 } | |
| 1964 #endif | |
| 1965 | |
| 1966 /* | |
| 1205 | 1967 * Convert a UTF-8 byte string to a wide character. Also get up to MAX_MCO |
| 7 | 1968 * composing characters. |
| 1969 */ | |
| 1970 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1971 utfc_ptr2char( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1972 char_u *p, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1973 int *pcc) /* return: composing chars, last one is 0 */ |
| 7 | 1974 { |
| 1975 int len; | |
| 1976 int c; | |
| 1977 int cc; | |
| 714 | 1978 int i = 0; |
| 7 | 1979 |
| 1980 c = utf_ptr2char(p); | |
| 474 | 1981 len = utf_ptr2len(p); |
| 714 | 1982 |
| 7 | 1983 /* Only accept a composing char when the first char isn't illegal. */ |
| 1984 if ((len > 1 || *p < 0x80) | |
| 1985 && p[len] >= 0x80 | |
| 1986 && UTF_COMPOSINGLIKE(p, p + len)) | |
| 1987 { | |
| 714 | 1988 cc = utf_ptr2char(p + len); |
| 1989 for (;;) | |
| 1990 { | |
| 1991 pcc[i++] = cc; | |
| 1992 if (i == MAX_MCO) | |
| 1993 break; | |
| 1994 len += utf_ptr2len(p + len); | |
| 1995 if (p[len] < 0x80 || !utf_iscomposing(cc = utf_ptr2char(p + len))) | |
| 1996 break; | |
| 1997 } | |
| 7 | 1998 } |
| 714 | 1999 |
| 2000 if (i < MAX_MCO) /* last composing char must be 0 */ | |
| 2001 pcc[i] = 0; | |
| 2002 | |
| 7 | 2003 return c; |
| 2004 } | |
| 2005 | |
| 2006 /* | |
| 1205 | 2007 * Convert a UTF-8 byte string to a wide character. Also get up to MAX_MCO |
| 7 | 2008 * composing characters. Use no more than p[maxlen]. |
| 2009 */ | |
| 2010 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2011 utfc_ptr2char_len( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2012 char_u *p, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2013 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
|
2014 int maxlen) |
| 7 | 2015 { |
| 2016 int len; | |
| 2017 int c; | |
| 2018 int cc; | |
| 714 | 2019 int i = 0; |
| 7 | 2020 |
| 2021 c = utf_ptr2char(p); | |
| 474 | 2022 len = utf_ptr2len_len(p, maxlen); |
| 7 | 2023 /* Only accept a composing char when the first char isn't illegal. */ |
| 2024 if ((len > 1 || *p < 0x80) | |
| 2025 && len < maxlen | |
| 2026 && p[len] >= 0x80 | |
| 2027 && UTF_COMPOSINGLIKE(p, p + len)) | |
| 2028 { | |
| 714 | 2029 cc = utf_ptr2char(p + len); |
| 2030 for (;;) | |
| 2031 { | |
| 2032 pcc[i++] = cc; | |
| 2033 if (i == MAX_MCO) | |
| 2034 break; | |
| 2035 len += utf_ptr2len_len(p + len, maxlen - len); | |
| 2036 if (len >= maxlen | |
| 2037 || p[len] < 0x80 | |
| 2038 || !utf_iscomposing(cc = utf_ptr2char(p + len))) | |
| 2039 break; | |
| 2040 } | |
| 7 | 2041 } |
| 714 | 2042 |
| 2043 if (i < MAX_MCO) /* last composing char must be 0 */ | |
| 2044 pcc[i] = 0; | |
| 2045 | |
| 7 | 2046 return c; |
| 2047 } | |
| 2048 | |
| 2049 /* | |
| 2050 * Convert the character at screen position "off" to a sequence of bytes. | |
| 2051 * Includes the composing characters. | |
| 3549 | 2052 * "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
|
2053 * Only to be used when ScreenLinesUC[off] != 0. |
| 7 | 2054 * Returns the produced number of bytes. |
| 2055 */ | |
| 2056 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2057 utfc_char2bytes(int off, char_u *buf) |
| 7 | 2058 { |
| 2059 int len; | |
| 714 | 2060 int i; |
| 7 | 2061 |
| 2062 len = utf_char2bytes(ScreenLinesUC[off], buf); | |
| 714 | 2063 for (i = 0; i < Screen_mco; ++i) |
| 7 | 2064 { |
| 714 | 2065 if (ScreenLinesC[i][off] == 0) |
| 2066 break; | |
| 2067 len += utf_char2bytes(ScreenLinesC[i][off], buf + len); | |
| 7 | 2068 } |
| 2069 return len; | |
| 2070 } | |
| 2071 | |
| 2072 /* | |
| 2073 * Get the length of a UTF-8 byte sequence, not including any following | |
| 2074 * composing characters. | |
| 2075 * Returns 0 for "". | |
| 2076 * Returns 1 for an illegal byte sequence. | |
| 2077 */ | |
| 2078 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2079 utf_ptr2len(char_u *p) |
| 7 | 2080 { |
| 2081 int len; | |
| 2082 int i; | |
| 2083 | |
| 2084 if (*p == NUL) | |
| 2085 return 0; | |
| 2086 len = utf8len_tab[*p]; | |
| 2087 for (i = 1; i < len; ++i) | |
| 2088 if ((p[i] & 0xc0) != 0x80) | |
| 2089 return 1; | |
| 2090 return len; | |
| 2091 } | |
| 2092 | |
| 2093 /* | |
| 2094 * Return length of UTF-8 character, obtained from the first byte. | |
| 2095 * "b" must be between 0 and 255! | |
| 2015 | 2096 * Returns 1 for an invalid first byte value. |
| 7 | 2097 */ |
| 2098 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2099 utf_byte2len(int b) |
| 7 | 2100 { |
| 2101 return utf8len_tab[b]; | |
| 2102 } | |
| 2103 | |
| 2104 /* | |
| 2105 * Get the length of UTF-8 byte sequence "p[size]". Does not include any | |
| 2106 * following composing characters. | |
| 2107 * Returns 1 for "". | |
| 1487 | 2108 * Returns 1 for an illegal byte sequence (also in incomplete byte seq.). |
| 7 | 2109 * Returns number > "size" for an incomplete byte sequence. |
| 2015 | 2110 * Never returns zero. |
| 7 | 2111 */ |
| 2112 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2113 utf_ptr2len_len(char_u *p, int size) |
| 7 | 2114 { |
| 2115 int len; | |
| 2116 int i; | |
| 1487 | 2117 int m; |
| 7 | 2118 |
| 2015 | 2119 len = utf8len_tab[*p]; |
| 2120 if (len == 1) | |
| 2121 return 1; /* NUL, ascii or illegal lead byte */ | |
| 7 | 2122 if (len > size) |
| 1487 | 2123 m = size; /* incomplete byte sequence. */ |
| 2015 | 2124 else |
| 2125 m = len; | |
| 1487 | 2126 for (i = 1; i < m; ++i) |
| 7 | 2127 if ((p[i] & 0xc0) != 0x80) |
| 2128 return 1; | |
| 2129 return len; | |
| 2130 } | |
| 2131 | |
| 2132 /* | |
| 2133 * Return the number of bytes the UTF-8 encoding of the character at "p" takes. | |
| 2134 * This includes following composing characters. | |
| 2135 */ | |
| 2136 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2137 utfc_ptr2len(char_u *p) |
| 7 | 2138 { |
| 2139 int len; | |
| 318 | 2140 int b0 = *p; |
| 7 | 2141 #ifdef FEAT_ARABIC |
| 2142 int prevlen; | |
| 2143 #endif | |
| 2144 | |
| 318 | 2145 if (b0 == NUL) |
| 7 | 2146 return 0; |
| 318 | 2147 if (b0 < 0x80 && p[1] < 0x80) /* be quick for ASCII */ |
| 7 | 2148 return 1; |
| 2149 | |
| 2150 /* Skip over first UTF-8 char, stopping at a NUL byte. */ | |
| 474 | 2151 len = utf_ptr2len(p); |
| 7 | 2152 |
| 2153 /* Check for illegal byte. */ | |
| 318 | 2154 if (len == 1 && b0 >= 0x80) |
| 7 | 2155 return 1; |
| 2156 | |
| 2157 /* | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2158 * Check for composing characters. We can handle only the first six, but |
| 7 | 2159 * skip all of them (otherwise the cursor would get stuck). |
| 2160 */ | |
| 2161 #ifdef FEAT_ARABIC | |
| 2162 prevlen = 0; | |
| 2163 #endif | |
| 2164 for (;;) | |
| 2165 { | |
| 2166 if (p[len] < 0x80 || !UTF_COMPOSINGLIKE(p + prevlen, p + len)) | |
| 2167 return len; | |
| 2168 | |
| 2169 /* Skip over composing char */ | |
| 2170 #ifdef FEAT_ARABIC | |
| 2171 prevlen = len; | |
| 2172 #endif | |
| 474 | 2173 len += utf_ptr2len(p + len); |
| 7 | 2174 } |
| 2175 } | |
| 2176 | |
| 2177 /* | |
| 2178 * Return the number of bytes the UTF-8 encoding of the character at "p[size]" | |
| 2179 * takes. This includes following composing characters. | |
| 1903 | 2180 * Returns 0 for an empty string. |
| 7 | 2181 * Returns 1 for an illegal char or an incomplete byte sequence. |
| 2182 */ | |
| 2183 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2184 utfc_ptr2len_len(char_u *p, int size) |
| 7 | 2185 { |
| 2186 int len; | |
| 2187 #ifdef FEAT_ARABIC | |
| 2188 int prevlen; | |
| 2189 #endif | |
| 2190 | |
| 1903 | 2191 if (size < 1 || *p == NUL) |
| 7 | 2192 return 0; |
| 2193 if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */ | |
| 2194 return 1; | |
| 2195 | |
| 2196 /* Skip over first UTF-8 char, stopping at a NUL byte. */ | |
| 474 | 2197 len = utf_ptr2len_len(p, size); |
| 7 | 2198 |
| 2199 /* Check for illegal byte and incomplete byte sequence. */ | |
| 2200 if ((len == 1 && p[0] >= 0x80) || len > size) | |
| 2201 return 1; | |
| 2202 | |
| 2203 /* | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2204 * Check for composing characters. We can handle only the first six, but |
| 7 | 2205 * skip all of them (otherwise the cursor would get stuck). |
| 2206 */ | |
| 2207 #ifdef FEAT_ARABIC | |
| 2208 prevlen = 0; | |
| 2209 #endif | |
| 2210 while (len < size) | |
| 2211 { | |
| 1658 | 2212 int len_next_char; |
| 2213 | |
| 2214 if (p[len] < 0x80) | |
| 2215 break; | |
| 2216 | |
| 2217 /* | |
| 2218 * Next character length should not go beyond size to ensure that | |
| 2219 * UTF_COMPOSINGLIKE(...) does not read beyond size. | |
| 2220 */ | |
| 2221 len_next_char = utf_ptr2len_len(p + len, size - len); | |
| 2222 if (len_next_char > size - len) | |
| 2223 break; | |
| 2224 | |
| 2225 if (!UTF_COMPOSINGLIKE(p + prevlen, p + len)) | |
| 7 | 2226 break; |
| 2227 | |
| 2228 /* Skip over composing char */ | |
| 2229 #ifdef FEAT_ARABIC | |
| 2230 prevlen = len; | |
| 2231 #endif | |
| 1658 | 2232 len += len_next_char; |
| 7 | 2233 } |
| 2234 return len; | |
| 2235 } | |
| 2236 | |
| 2237 /* | |
| 2238 * Return the number of bytes the UTF-8 encoding of character "c" takes. | |
| 2239 * This does not include composing characters. | |
| 2240 */ | |
| 2241 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2242 utf_char2len(int c) |
| 7 | 2243 { |
| 2244 if (c < 0x80) | |
| 2245 return 1; | |
| 2246 if (c < 0x800) | |
| 2247 return 2; | |
| 2248 if (c < 0x10000) | |
| 2249 return 3; | |
| 2250 if (c < 0x200000) | |
| 2251 return 4; | |
| 2252 if (c < 0x4000000) | |
| 2253 return 5; | |
| 2254 return 6; | |
| 2255 } | |
| 2256 | |
| 2257 /* | |
| 2258 * Convert Unicode character "c" to UTF-8 string in "buf[]". | |
| 2259 * Returns the number of bytes. | |
| 2260 * This does not include composing characters. | |
| 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}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2351 {0x0816, 0x0819}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2352 {0x081b, 0x0823}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2353 {0x0825, 0x0827}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2354 {0x0829, 0x082d}, |
| 6495 | 2355 {0x0859, 0x085b}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2356 {0x08d4, 0x08e1}, |
| 6864 | 2357 {0x08e3, 0x0903}, |
| 6495 | 2358 {0x093a, 0x093c}, |
| 2359 {0x093e, 0x094f}, | |
| 2360 {0x0951, 0x0957}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2361 {0x0962, 0x0963}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2362 {0x0981, 0x0983}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2363 {0x09bc, 0x09bc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2364 {0x09be, 0x09c4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2365 {0x09c7, 0x09c8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2366 {0x09cb, 0x09cd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2367 {0x09d7, 0x09d7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2368 {0x09e2, 0x09e3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2369 {0x0a01, 0x0a03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2370 {0x0a3c, 0x0a3c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2371 {0x0a3e, 0x0a42}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2372 {0x0a47, 0x0a48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2373 {0x0a4b, 0x0a4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2374 {0x0a51, 0x0a51}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2375 {0x0a70, 0x0a71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2376 {0x0a75, 0x0a75}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2377 {0x0a81, 0x0a83}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2378 {0x0abc, 0x0abc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2379 {0x0abe, 0x0ac5}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2380 {0x0ac7, 0x0ac9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2381 {0x0acb, 0x0acd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2382 {0x0ae2, 0x0ae3}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2383 {0x0afa, 0x0aff}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2384 {0x0b01, 0x0b03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2385 {0x0b3c, 0x0b3c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2386 {0x0b3e, 0x0b44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2387 {0x0b47, 0x0b48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2388 {0x0b4b, 0x0b4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2389 {0x0b56, 0x0b57}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2390 {0x0b62, 0x0b63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2391 {0x0b82, 0x0b82}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2392 {0x0bbe, 0x0bc2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2393 {0x0bc6, 0x0bc8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2394 {0x0bca, 0x0bcd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2395 {0x0bd7, 0x0bd7}, |
| 6495 | 2396 {0x0c00, 0x0c03}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2397 {0x0c3e, 0x0c44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2398 {0x0c46, 0x0c48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2399 {0x0c4a, 0x0c4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2400 {0x0c55, 0x0c56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2401 {0x0c62, 0x0c63}, |
| 6495 | 2402 {0x0c81, 0x0c83}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2403 {0x0cbc, 0x0cbc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2404 {0x0cbe, 0x0cc4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2405 {0x0cc6, 0x0cc8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2406 {0x0cca, 0x0ccd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2407 {0x0cd5, 0x0cd6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2408 {0x0ce2, 0x0ce3}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2409 {0x0d00, 0x0d03}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2410 {0x0d3b, 0x0d3c}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2411 {0x0d3e, 0x0d44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2412 {0x0d46, 0x0d48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2413 {0x0d4a, 0x0d4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2414 {0x0d57, 0x0d57}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2415 {0x0d62, 0x0d63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2416 {0x0d82, 0x0d83}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2417 {0x0dca, 0x0dca}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2418 {0x0dcf, 0x0dd4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2419 {0x0dd6, 0x0dd6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2420 {0x0dd8, 0x0ddf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2421 {0x0df2, 0x0df3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2422 {0x0e31, 0x0e31}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2423 {0x0e34, 0x0e3a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2424 {0x0e47, 0x0e4e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2425 {0x0eb1, 0x0eb1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2426 {0x0eb4, 0x0eb9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2427 {0x0ebb, 0x0ebc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2428 {0x0ec8, 0x0ecd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2429 {0x0f18, 0x0f19}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2430 {0x0f35, 0x0f35}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2431 {0x0f37, 0x0f37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2432 {0x0f39, 0x0f39}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2433 {0x0f3e, 0x0f3f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2434 {0x0f71, 0x0f84}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2435 {0x0f86, 0x0f87}, |
| 6495 | 2436 {0x0f8d, 0x0f97}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2437 {0x0f99, 0x0fbc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2438 {0x0fc6, 0x0fc6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2439 {0x102b, 0x103e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2440 {0x1056, 0x1059}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2441 {0x105e, 0x1060}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2442 {0x1062, 0x1064}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2443 {0x1067, 0x106d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2444 {0x1071, 0x1074}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2445 {0x1082, 0x108d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2446 {0x108f, 0x108f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2447 {0x109a, 0x109d}, |
| 6495 | 2448 {0x135d, 0x135f}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2449 {0x1712, 0x1714}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2450 {0x1732, 0x1734}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2451 {0x1752, 0x1753}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2452 {0x1772, 0x1773}, |
| 6495 | 2453 {0x17b4, 0x17d3}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2454 {0x17dd, 0x17dd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2455 {0x180b, 0x180d}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2456 {0x1885, 0x1886}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2457 {0x18a9, 0x18a9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2458 {0x1920, 0x192b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2459 {0x1930, 0x193b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2460 {0x1a17, 0x1a1b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2461 {0x1a55, 0x1a5e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2462 {0x1a60, 0x1a7c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2463 {0x1a7f, 0x1a7f}, |
| 6495 | 2464 {0x1ab0, 0x1abe}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2465 {0x1b00, 0x1b04}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2466 {0x1b34, 0x1b44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2467 {0x1b6b, 0x1b73}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2468 {0x1b80, 0x1b82}, |
| 6495 | 2469 {0x1ba1, 0x1bad}, |
| 2470 {0x1be6, 0x1bf3}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2471 {0x1c24, 0x1c37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2472 {0x1cd0, 0x1cd2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2473 {0x1cd4, 0x1ce8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2474 {0x1ced, 0x1ced}, |
| 6495 | 2475 {0x1cf2, 0x1cf4}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2476 {0x1cf7, 0x1cf9}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2477 {0x1dc0, 0x1df9}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2478 {0x1dfb, 0x1dff}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2479 {0x20d0, 0x20f0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2480 {0x2cef, 0x2cf1}, |
| 6495 | 2481 {0x2d7f, 0x2d7f}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2482 {0x2de0, 0x2dff}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2483 {0x302a, 0x302f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2484 {0x3099, 0x309a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2485 {0xa66f, 0xa672}, |
| 6495 | 2486 {0xa674, 0xa67d}, |
| 6864 | 2487 {0xa69e, 0xa69f}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2488 {0xa6f0, 0xa6f1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2489 {0xa802, 0xa802}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2490 {0xa806, 0xa806}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2491 {0xa80b, 0xa80b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2492 {0xa823, 0xa827}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2493 {0xa880, 0xa881}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2494 {0xa8b4, 0xa8c5}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2495 {0xa8e0, 0xa8f1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2496 {0xa926, 0xa92d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2497 {0xa947, 0xa953}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2498 {0xa980, 0xa983}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2499 {0xa9b3, 0xa9c0}, |
| 6495 | 2500 {0xa9e5, 0xa9e5}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2501 {0xaa29, 0xaa36}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2502 {0xaa43, 0xaa43}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2503 {0xaa4c, 0xaa4d}, |
| 6495 | 2504 {0xaa7b, 0xaa7d}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2505 {0xaab0, 0xaab0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2506 {0xaab2, 0xaab4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2507 {0xaab7, 0xaab8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2508 {0xaabe, 0xaabf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2509 {0xaac1, 0xaac1}, |
| 6495 | 2510 {0xaaeb, 0xaaef}, |
| 2511 {0xaaf5, 0xaaf6}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2512 {0xabe3, 0xabea}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2513 {0xabec, 0xabed}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2514 {0xfb1e, 0xfb1e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2515 {0xfe00, 0xfe0f}, |
| 6864 | 2516 {0xfe20, 0xfe2f}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2517 {0x101fd, 0x101fd}, |
| 6495 | 2518 {0x102e0, 0x102e0}, |
| 2519 {0x10376, 0x1037a}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2520 {0x10a01, 0x10a03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2521 {0x10a05, 0x10a06}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2522 {0x10a0c, 0x10a0f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2523 {0x10a38, 0x10a3a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2524 {0x10a3f, 0x10a3f}, |
| 6495 | 2525 {0x10ae5, 0x10ae6}, |
| 2526 {0x11000, 0x11002}, | |
| 2527 {0x11038, 0x11046}, | |
| 2528 {0x1107f, 0x11082}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2529 {0x110b0, 0x110ba}, |
| 6495 | 2530 {0x11100, 0x11102}, |
| 2531 {0x11127, 0x11134}, | |
| 2532 {0x11173, 0x11173}, | |
| 2533 {0x11180, 0x11182}, | |
| 2534 {0x111b3, 0x111c0}, | |
| 6864 | 2535 {0x111ca, 0x111cc}, |
| 6495 | 2536 {0x1122c, 0x11237}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2537 {0x1123e, 0x1123e}, |
| 6495 | 2538 {0x112df, 0x112ea}, |
| 6864 | 2539 {0x11300, 0x11303}, |
| 6495 | 2540 {0x1133c, 0x1133c}, |
| 2541 {0x1133e, 0x11344}, | |
| 2542 {0x11347, 0x11348}, | |
| 2543 {0x1134b, 0x1134d}, | |
| 2544 {0x11357, 0x11357}, | |
| 2545 {0x11362, 0x11363}, | |
| 2546 {0x11366, 0x1136c}, | |
| 2547 {0x11370, 0x11374}, | |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2548 {0x11435, 0x11446}, |
| 6495 | 2549 {0x114b0, 0x114c3}, |
| 2550 {0x115af, 0x115b5}, | |
| 2551 {0x115b8, 0x115c0}, | |
| 6864 | 2552 {0x115dc, 0x115dd}, |
| 6495 | 2553 {0x11630, 0x11640}, |
| 2554 {0x116ab, 0x116b7}, | |
| 6864 | 2555 {0x1171d, 0x1172b}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2556 {0x11a01, 0x11a0a}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2557 {0x11a33, 0x11a39}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2558 {0x11a3b, 0x11a3e}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2559 {0x11a47, 0x11a47}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2560 {0x11a51, 0x11a5b}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2561 {0x11a8a, 0x11a99}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2562 {0x11c2f, 0x11c36}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2563 {0x11c38, 0x11c3f}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2564 {0x11c92, 0x11ca7}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2565 {0x11ca9, 0x11cb6}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2566 {0x11d31, 0x11d36}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2567 {0x11d3a, 0x11d3a}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2568 {0x11d3c, 0x11d3d}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2569 {0x11d3f, 0x11d45}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2570 {0x11d47, 0x11d47}, |
| 6495 | 2571 {0x16af0, 0x16af4}, |
| 2572 {0x16b30, 0x16b36}, | |
| 2573 {0x16f51, 0x16f7e}, | |
| 2574 {0x16f8f, 0x16f92}, | |
| 2575 {0x1bc9d, 0x1bc9e}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2576 {0x1d165, 0x1d169}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2577 {0x1d16d, 0x1d172}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2578 {0x1d17b, 0x1d182}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2579 {0x1d185, 0x1d18b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2580 {0x1d1aa, 0x1d1ad}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2581 {0x1d242, 0x1d244}, |
| 6864 | 2582 {0x1da00, 0x1da36}, |
| 2583 {0x1da3b, 0x1da6c}, | |
| 2584 {0x1da75, 0x1da75}, | |
| 2585 {0x1da84, 0x1da84}, | |
| 2586 {0x1da9b, 0x1da9f}, | |
| 2587 {0x1daa1, 0x1daaf}, | |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2588 {0x1e000, 0x1e006}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2589 {0x1e008, 0x1e018}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2590 {0x1e01b, 0x1e021}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2591 {0x1e023, 0x1e024}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2592 {0x1e026, 0x1e02a}, |
| 6495 | 2593 {0x1e8d0, 0x1e8d6}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2594 {0x1e944, 0x1e94a}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2595 {0xe0100, 0xe01ef} |
| 7 | 2596 }; |
| 2597 | |
| 2598 return intable(combining, sizeof(combining), c); | |
| 2599 } | |
| 2600 | |
| 2601 /* | |
| 2602 * Return TRUE for characters that can be displayed in a normal way. | |
| 2603 * Only for characters of 0x100 and above! | |
| 2604 */ | |
| 2605 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2606 utf_printable(int c) |
| 7 | 2607 { |
| 2608 #ifdef USE_WCHAR_FUNCTIONS | |
| 2609 /* | |
| 2610 * Assume the iswprint() library function works better than our own stuff. | |
| 2611 */ | |
| 2612 return iswprint(c); | |
| 2613 #else | |
| 2614 /* Sorted list of non-overlapping intervals. | |
| 2615 * 0xd800-0xdfff is reserved for UTF-16, actually illegal. */ | |
| 2616 static struct interval nonprint[] = | |
| 2617 { | |
| 2618 {0x070f, 0x070f}, {0x180b, 0x180e}, {0x200b, 0x200f}, {0x202a, 0x202e}, | |
| 2619 {0x206a, 0x206f}, {0xd800, 0xdfff}, {0xfeff, 0xfeff}, {0xfff9, 0xfffb}, | |
| 2620 {0xfffe, 0xffff} | |
| 2621 }; | |
| 2622 | |
| 2623 return !intable(nonprint, sizeof(nonprint), c); | |
| 2624 #endif | |
| 2625 } | |
| 2626 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2627 /* 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
|
2628 * 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
|
2629 static struct interval emoji_all[] = |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2630 { |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2631 {0x203c, 0x203c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2632 {0x2049, 0x2049}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2633 {0x2122, 0x2122}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2634 {0x2139, 0x2139}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2635 {0x2194, 0x2199}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2636 {0x21a9, 0x21aa}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2637 {0x231a, 0x231b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2638 {0x2328, 0x2328}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2639 {0x23cf, 0x23cf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2640 {0x23e9, 0x23f3}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2641 {0x23f8, 0x23fa}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2642 {0x24c2, 0x24c2}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2643 {0x25aa, 0x25ab}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2644 {0x25b6, 0x25b6}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2645 {0x25c0, 0x25c0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2646 {0x25fb, 0x25fe}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2647 {0x2600, 0x2604}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2648 {0x260e, 0x260e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2649 {0x2611, 0x2611}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2650 {0x2614, 0x2615}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2651 {0x2618, 0x2618}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2652 {0x261d, 0x261d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2653 {0x2620, 0x2620}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2654 {0x2622, 0x2623}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2655 {0x2626, 0x2626}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2656 {0x262a, 0x262a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2657 {0x262e, 0x262f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2658 {0x2638, 0x263a}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2659 {0x2640, 0x2640}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2660 {0x2642, 0x2642}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2661 {0x2648, 0x2653}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2662 {0x2660, 0x2660}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2663 {0x2663, 0x2663}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2664 {0x2665, 0x2666}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2665 {0x2668, 0x2668}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2666 {0x267b, 0x267b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2667 {0x267f, 0x267f}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2668 {0x2692, 0x2697}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2669 {0x2699, 0x2699}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2670 {0x269b, 0x269c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2671 {0x26a0, 0x26a1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2672 {0x26aa, 0x26ab}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2673 {0x26b0, 0x26b1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2674 {0x26bd, 0x26be}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2675 {0x26c4, 0x26c5}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2676 {0x26c8, 0x26c8}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2677 {0x26ce, 0x26cf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2678 {0x26d1, 0x26d1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2679 {0x26d3, 0x26d4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2680 {0x26e9, 0x26ea}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2681 {0x26f0, 0x26f5}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2682 {0x26f7, 0x26fa}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2683 {0x26fd, 0x26fd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2684 {0x2702, 0x2702}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2685 {0x2705, 0x2705}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2686 {0x2708, 0x270d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2687 {0x270f, 0x270f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2688 {0x2712, 0x2712}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2689 {0x2714, 0x2714}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2690 {0x2716, 0x2716}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2691 {0x271d, 0x271d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2692 {0x2721, 0x2721}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2693 {0x2728, 0x2728}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2694 {0x2733, 0x2734}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2695 {0x2744, 0x2744}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2696 {0x2747, 0x2747}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2697 {0x274c, 0x274c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2698 {0x274e, 0x274e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2699 {0x2753, 0x2755}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2700 {0x2757, 0x2757}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2701 {0x2763, 0x2764}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2702 {0x2795, 0x2797}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2703 {0x27a1, 0x27a1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2704 {0x27b0, 0x27b0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2705 {0x27bf, 0x27bf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2706 {0x2934, 0x2935}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2707 {0x2b05, 0x2b07}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2708 {0x2b1b, 0x2b1c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2709 {0x2b50, 0x2b50}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2710 {0x2b55, 0x2b55}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2711 {0x3030, 0x3030}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2712 {0x303d, 0x303d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2713 {0x3297, 0x3297}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2714 {0x3299, 0x3299}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2715 {0x1f004, 0x1f004}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2716 {0x1f0cf, 0x1f0cf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2717 {0x1f170, 0x1f171}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2718 {0x1f17e, 0x1f17f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2719 {0x1f18e, 0x1f18e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2720 {0x1f191, 0x1f19a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2721 {0x1f1e6, 0x1f1ff}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2722 {0x1f201, 0x1f202}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2723 {0x1f21a, 0x1f21a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2724 {0x1f22f, 0x1f22f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2725 {0x1f232, 0x1f23a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2726 {0x1f250, 0x1f251}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2727 {0x1f300, 0x1f321}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2728 {0x1f324, 0x1f393}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2729 {0x1f396, 0x1f397}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2730 {0x1f399, 0x1f39b}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2731 {0x1f39e, 0x1f3f0}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2732 {0x1f3f3, 0x1f3f5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2733 {0x1f3f7, 0x1f4fd}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2734 {0x1f4ff, 0x1f53d}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2735 {0x1f549, 0x1f54e}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2736 {0x1f550, 0x1f567}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2737 {0x1f56f, 0x1f570}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2738 {0x1f573, 0x1f57a}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2739 {0x1f587, 0x1f587}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2740 {0x1f58a, 0x1f58d}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2741 {0x1f590, 0x1f590}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2742 {0x1f595, 0x1f596}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2743 {0x1f5a4, 0x1f5a5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2744 {0x1f5a8, 0x1f5a8}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2745 {0x1f5b1, 0x1f5b2}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2746 {0x1f5bc, 0x1f5bc}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2747 {0x1f5c2, 0x1f5c4}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2748 {0x1f5d1, 0x1f5d3}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2749 {0x1f5dc, 0x1f5de}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2750 {0x1f5e1, 0x1f5e1}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2751 {0x1f5e3, 0x1f5e3}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2752 {0x1f5e8, 0x1f5e8}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2753 {0x1f5ef, 0x1f5ef}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2754 {0x1f5f3, 0x1f5f3}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2755 {0x1f5fa, 0x1f64f}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2756 {0x1f680, 0x1f6c5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2757 {0x1f6cb, 0x1f6d2}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2758 {0x1f6e0, 0x1f6e5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2759 {0x1f6e9, 0x1f6e9}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2760 {0x1f6eb, 0x1f6ec}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2761 {0x1f6f0, 0x1f6f0}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2762 {0x1f6f3, 0x1f6f8}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2763 {0x1f910, 0x1f93a}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2764 {0x1f93c, 0x1f93e}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2765 {0x1f940, 0x1f945}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2766 {0x1f947, 0x1f94c}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2767 {0x1f950, 0x1f96b}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2768 {0x1f980, 0x1f997}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2769 {0x1f9c0, 0x1f9c0}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2770 {0x1f9d0, 0x1f9e6} |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2771 }; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2772 |
| 7 | 2773 /* |
| 2774 * Get class of a Unicode character. | |
| 2775 * 0: white space | |
| 2776 * 1: punctuation | |
| 2777 * 2 or bigger: some class of word character. | |
| 2778 */ | |
| 2779 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2780 utf_class(int c) |
| 7 | 2781 { |
|
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2782 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
|
2783 } |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2784 |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2785 int |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2786 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
|
2787 { |
| 7 | 2788 /* sorted list of non-overlapping intervals */ |
| 2789 static struct clinterval | |
| 2790 { | |
| 5477 | 2791 unsigned int first; |
| 2792 unsigned int last; | |
| 2793 unsigned int class; | |
| 7 | 2794 } classes[] = |
| 2795 { | |
| 2796 {0x037e, 0x037e, 1}, /* Greek question mark */ | |
| 2797 {0x0387, 0x0387, 1}, /* Greek ano teleia */ | |
| 2798 {0x055a, 0x055f, 1}, /* Armenian punctuation */ | |
| 2799 {0x0589, 0x0589, 1}, /* Armenian full stop */ | |
| 2800 {0x05be, 0x05be, 1}, | |
| 2801 {0x05c0, 0x05c0, 1}, | |
| 2802 {0x05c3, 0x05c3, 1}, | |
| 2803 {0x05f3, 0x05f4, 1}, | |
| 2804 {0x060c, 0x060c, 1}, | |
| 2805 {0x061b, 0x061b, 1}, | |
| 2806 {0x061f, 0x061f, 1}, | |
| 2807 {0x066a, 0x066d, 1}, | |
| 2808 {0x06d4, 0x06d4, 1}, | |
| 2809 {0x0700, 0x070d, 1}, /* Syriac punctuation */ | |
| 2810 {0x0964, 0x0965, 1}, | |
| 2811 {0x0970, 0x0970, 1}, | |
| 2812 {0x0df4, 0x0df4, 1}, | |
| 2813 {0x0e4f, 0x0e4f, 1}, | |
| 2814 {0x0e5a, 0x0e5b, 1}, | |
| 2815 {0x0f04, 0x0f12, 1}, | |
| 2816 {0x0f3a, 0x0f3d, 1}, | |
| 2817 {0x0f85, 0x0f85, 1}, | |
| 2818 {0x104a, 0x104f, 1}, /* Myanmar punctuation */ | |
| 2819 {0x10fb, 0x10fb, 1}, /* Georgian punctuation */ | |
| 2820 {0x1361, 0x1368, 1}, /* Ethiopic punctuation */ | |
| 2821 {0x166d, 0x166e, 1}, /* Canadian Syl. punctuation */ | |
| 2822 {0x1680, 0x1680, 0}, | |
| 2823 {0x169b, 0x169c, 1}, | |
| 2824 {0x16eb, 0x16ed, 1}, | |
| 2825 {0x1735, 0x1736, 1}, | |
| 2826 {0x17d4, 0x17dc, 1}, /* Khmer punctuation */ | |
| 2827 {0x1800, 0x180a, 1}, /* Mongolian punctuation */ | |
| 2828 {0x2000, 0x200b, 0}, /* spaces */ | |
| 2829 {0x200c, 0x2027, 1}, /* punctuation and symbols */ | |
| 2830 {0x2028, 0x2029, 0}, | |
| 2831 {0x202a, 0x202e, 1}, /* punctuation and symbols */ | |
| 2832 {0x202f, 0x202f, 0}, | |
| 2833 {0x2030, 0x205e, 1}, /* punctuation and symbols */ | |
| 2834 {0x205f, 0x205f, 0}, | |
| 2835 {0x2060, 0x27ff, 1}, /* punctuation and symbols */ | |
| 2836 {0x2070, 0x207f, 0x2070}, /* superscript */ | |
| 1593 | 2837 {0x2080, 0x2094, 0x2080}, /* subscript */ |
| 2838 {0x20a0, 0x27ff, 1}, /* all kinds of symbols */ | |
| 2839 {0x2800, 0x28ff, 0x2800}, /* braille */ | |
| 2840 {0x2900, 0x2998, 1}, /* arrows, brackets, etc. */ | |
| 7 | 2841 {0x29d8, 0x29db, 1}, |
| 2842 {0x29fc, 0x29fd, 1}, | |
| 6218 | 2843 {0x2e00, 0x2e7f, 1}, /* supplemental punctuation */ |
| 7 | 2844 {0x3000, 0x3000, 0}, /* ideographic space */ |
| 2845 {0x3001, 0x3020, 1}, /* ideographic punctuation */ | |
| 2846 {0x3030, 0x3030, 1}, | |
| 2847 {0x303d, 0x303d, 1}, | |
| 2848 {0x3040, 0x309f, 0x3040}, /* Hiragana */ | |
| 2849 {0x30a0, 0x30ff, 0x30a0}, /* Katakana */ | |
| 2850 {0x3300, 0x9fff, 0x4e00}, /* CJK Ideographs */ | |
| 2851 {0xac00, 0xd7a3, 0xac00}, /* Hangul Syllables */ | |
| 2852 {0xf900, 0xfaff, 0x4e00}, /* CJK Ideographs */ | |
| 2853 {0xfd3e, 0xfd3f, 1}, | |
| 2854 {0xfe30, 0xfe6b, 1}, /* punctuation forms */ | |
| 2855 {0xff00, 0xff0f, 1}, /* half/fullwidth ASCII */ | |
| 2856 {0xff1a, 0xff20, 1}, /* half/fullwidth ASCII */ | |
| 2857 {0xff3b, 0xff40, 1}, /* half/fullwidth ASCII */ | |
| 2858 {0xff5b, 0xff65, 1}, /* half/fullwidth ASCII */ | |
| 5477 | 2859 {0x20000, 0x2a6df, 0x4e00}, /* CJK Ideographs */ |
| 2860 {0x2a700, 0x2b73f, 0x4e00}, /* CJK Ideographs */ | |
| 2861 {0x2b740, 0x2b81f, 0x4e00}, /* CJK Ideographs */ | |
| 2862 {0x2f800, 0x2fa1f, 0x4e00}, /* CJK Ideographs */ | |
| 7 | 2863 }; |
|
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
2864 |
| 7 | 2865 int bot = 0; |
| 2866 int top = sizeof(classes) / sizeof(struct clinterval) - 1; | |
| 2867 int mid; | |
| 2868 | |
| 2869 /* First quick check for Latin1 characters, use 'iskeyword'. */ | |
| 2870 if (c < 0x100) | |
| 2871 { | |
| 335 | 2872 if (c == ' ' || c == '\t' || c == NUL || c == 0xa0) |
| 7 | 2873 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
|
2874 if (vim_iswordc_buf(c, buf)) |
| 7 | 2875 return 2; /* word character */ |
| 2876 return 1; /* punctuation */ | |
| 2877 } | |
| 2878 | |
| 2879 /* binary search in table */ | |
| 2880 while (top >= bot) | |
| 2881 { | |
| 2882 mid = (bot + top) / 2; | |
| 5477 | 2883 if (classes[mid].last < (unsigned int)c) |
| 7 | 2884 bot = mid + 1; |
| 5477 | 2885 else if (classes[mid].first > (unsigned int)c) |
| 7 | 2886 top = mid - 1; |
| 2887 else | |
| 2888 return (int)classes[mid].class; | |
| 2889 } | |
| 2890 | |
|
8661
a931160ffc41
commit https://github.com/vim/vim/commit/4077b33a8370afb3d5ae74e556a0119cf51fe294
Christian Brabandt <cb@256bit.org>
parents:
8629
diff
changeset
|
2891 /* emoji */ |
|
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
2892 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
|
2893 return 3; |
|
a931160ffc41
commit https://github.com/vim/vim/commit/4077b33a8370afb3d5ae74e556a0119cf51fe294
Christian Brabandt <cb@256bit.org>
parents:
8629
diff
changeset
|
2894 |
| 7 | 2895 /* most other characters are "word" characters */ |
| 2896 return 2; | |
| 2897 } | |
| 2898 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2899 int |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2900 utf_ambiguous_width(int c) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2901 { |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2902 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
|
2903 || 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
|
2904 } |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2905 |
| 7 | 2906 /* |
| 2907 * Code for Unicode case-dependent operations. Based on notes in | |
| 2908 * http://www.unicode.org/Public/UNIDATA/CaseFolding.txt | |
| 2909 * 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
|
2910 * Last updated for Unicode 5.2. |
| 7 | 2911 */ |
| 2912 | |
| 2913 /* | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2914 * 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
|
2915 * 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
|
2916 * 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
|
2917 * 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
|
2918 * folded/upper/lower by adding 32. |
| 7 | 2919 */ |
| 2920 typedef struct | |
| 2921 { | |
| 2922 int rangeStart; | |
| 2923 int rangeEnd; | |
| 2924 int step; | |
| 2925 int offset; | |
| 2926 } convertStruct; | |
| 2927 | |
| 297 | 2928 static convertStruct foldCase[] = |
| 7 | 2929 { |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2930 {0x41,0x5a,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2931 {0xb5,0xb5,-1,775}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2932 {0xc0,0xd6,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2933 {0xd8,0xde,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2934 {0x100,0x12e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2935 {0x132,0x136,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2936 {0x139,0x147,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2937 {0x14a,0x176,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2938 {0x178,0x178,-1,-121}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2939 {0x179,0x17d,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2940 {0x17f,0x17f,-1,-268}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2941 {0x181,0x181,-1,210}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2942 {0x182,0x184,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2943 {0x186,0x186,-1,206}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2944 {0x187,0x187,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2945 {0x189,0x18a,1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2946 {0x18b,0x18b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2947 {0x18e,0x18e,-1,79}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2948 {0x18f,0x18f,-1,202}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2949 {0x190,0x190,-1,203}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2950 {0x191,0x191,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2951 {0x193,0x193,-1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2952 {0x194,0x194,-1,207}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2953 {0x196,0x196,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2954 {0x197,0x197,-1,209}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2955 {0x198,0x198,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2956 {0x19c,0x19c,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2957 {0x19d,0x19d,-1,213}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2958 {0x19f,0x19f,-1,214}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2959 {0x1a0,0x1a4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2960 {0x1a6,0x1a6,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2961 {0x1a7,0x1a7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2962 {0x1a9,0x1a9,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2963 {0x1ac,0x1ac,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2964 {0x1ae,0x1ae,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2965 {0x1af,0x1af,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2966 {0x1b1,0x1b2,1,217}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2967 {0x1b3,0x1b5,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2968 {0x1b7,0x1b7,-1,219}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2969 {0x1b8,0x1bc,4,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2970 {0x1c4,0x1c4,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2971 {0x1c5,0x1c5,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2972 {0x1c7,0x1c7,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2973 {0x1c8,0x1c8,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2974 {0x1ca,0x1ca,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2975 {0x1cb,0x1db,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2976 {0x1de,0x1ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2977 {0x1f1,0x1f1,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2978 {0x1f2,0x1f4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2979 {0x1f6,0x1f6,-1,-97}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2980 {0x1f7,0x1f7,-1,-56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2981 {0x1f8,0x21e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2982 {0x220,0x220,-1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2983 {0x222,0x232,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2984 {0x23a,0x23a,-1,10795}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2985 {0x23b,0x23b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2986 {0x23d,0x23d,-1,-163}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2987 {0x23e,0x23e,-1,10792}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2988 {0x241,0x241,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2989 {0x243,0x243,-1,-195}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2990 {0x244,0x244,-1,69}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2991 {0x245,0x245,-1,71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2992 {0x246,0x24e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2993 {0x345,0x345,-1,116}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2994 {0x370,0x372,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2995 {0x376,0x376,-1,1}, |
| 6495 | 2996 {0x37f,0x37f,-1,116}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2997 {0x386,0x386,-1,38}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2998 {0x388,0x38a,1,37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2999 {0x38c,0x38c,-1,64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3000 {0x38e,0x38f,1,63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3001 {0x391,0x3a1,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3002 {0x3a3,0x3ab,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3003 {0x3c2,0x3c2,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3004 {0x3cf,0x3cf,-1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3005 {0x3d0,0x3d0,-1,-30}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3006 {0x3d1,0x3d1,-1,-25}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3007 {0x3d5,0x3d5,-1,-15}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3008 {0x3d6,0x3d6,-1,-22}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3009 {0x3d8,0x3ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3010 {0x3f0,0x3f0,-1,-54}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3011 {0x3f1,0x3f1,-1,-48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3012 {0x3f4,0x3f4,-1,-60}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3013 {0x3f5,0x3f5,-1,-64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3014 {0x3f7,0x3f7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3015 {0x3f9,0x3f9,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3016 {0x3fa,0x3fa,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3017 {0x3fd,0x3ff,1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3018 {0x400,0x40f,1,80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3019 {0x410,0x42f,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3020 {0x460,0x480,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3021 {0x48a,0x4be,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3022 {0x4c0,0x4c0,-1,15}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3023 {0x4c1,0x4cd,2,1}, |
| 6495 | 3024 {0x4d0,0x52e,2,1}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3025 {0x531,0x556,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3026 {0x10a0,0x10c5,1,7264}, |
| 6495 | 3027 {0x10c7,0x10cd,6,7264}, |
| 6864 | 3028 {0x13f8,0x13fd,1,-8}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3029 {0x1c80,0x1c80,-1,-6222}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3030 {0x1c81,0x1c81,-1,-6221}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3031 {0x1c82,0x1c82,-1,-6212}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3032 {0x1c83,0x1c84,1,-6210}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3033 {0x1c85,0x1c85,-1,-6211}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3034 {0x1c86,0x1c86,-1,-6204}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3035 {0x1c87,0x1c87,-1,-6180}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3036 {0x1c88,0x1c88,-1,35267}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3037 {0x1e00,0x1e94,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3038 {0x1e9b,0x1e9b,-1,-58}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3039 {0x1e9e,0x1e9e,-1,-7615}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3040 {0x1ea0,0x1efe,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3041 {0x1f08,0x1f0f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3042 {0x1f18,0x1f1d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3043 {0x1f28,0x1f2f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3044 {0x1f38,0x1f3f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3045 {0x1f48,0x1f4d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3046 {0x1f59,0x1f5f,2,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3047 {0x1f68,0x1f6f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3048 {0x1f88,0x1f8f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3049 {0x1f98,0x1f9f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3050 {0x1fa8,0x1faf,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3051 {0x1fb8,0x1fb9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3052 {0x1fba,0x1fbb,1,-74}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3053 {0x1fbc,0x1fbc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3054 {0x1fbe,0x1fbe,-1,-7173}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3055 {0x1fc8,0x1fcb,1,-86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3056 {0x1fcc,0x1fcc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3057 {0x1fd8,0x1fd9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3058 {0x1fda,0x1fdb,1,-100}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3059 {0x1fe8,0x1fe9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3060 {0x1fea,0x1feb,1,-112}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3061 {0x1fec,0x1fec,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3062 {0x1ff8,0x1ff9,1,-128}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3063 {0x1ffa,0x1ffb,1,-126}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3064 {0x1ffc,0x1ffc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3065 {0x2126,0x2126,-1,-7517}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3066 {0x212a,0x212a,-1,-8383}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3067 {0x212b,0x212b,-1,-8262}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3068 {0x2132,0x2132,-1,28}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3069 {0x2160,0x216f,1,16}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3070 {0x2183,0x2183,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3071 {0x24b6,0x24cf,1,26}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3072 {0x2c00,0x2c2e,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3073 {0x2c60,0x2c60,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3074 {0x2c62,0x2c62,-1,-10743}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3075 {0x2c63,0x2c63,-1,-3814}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3076 {0x2c64,0x2c64,-1,-10727}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3077 {0x2c67,0x2c6b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3078 {0x2c6d,0x2c6d,-1,-10780}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3079 {0x2c6e,0x2c6e,-1,-10749}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3080 {0x2c6f,0x2c6f,-1,-10783}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3081 {0x2c70,0x2c70,-1,-10782}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3082 {0x2c72,0x2c75,3,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3083 {0x2c7e,0x2c7f,1,-10815}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3084 {0x2c80,0x2ce2,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3085 {0x2ceb,0x2ced,2,1}, |
| 6495 | 3086 {0x2cf2,0xa640,31054,1}, |
| 3087 {0xa642,0xa66c,2,1}, | |
| 3088 {0xa680,0xa69a,2,1}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3089 {0xa722,0xa72e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3090 {0xa732,0xa76e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3091 {0xa779,0xa77b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3092 {0xa77d,0xa77d,-1,-35332}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3093 {0xa77e,0xa786,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3094 {0xa78b,0xa78b,-1,1}, |
| 6495 | 3095 {0xa78d,0xa78d,-1,-42280}, |
| 3096 {0xa790,0xa792,2,1}, | |
| 3097 {0xa796,0xa7a8,2,1}, | |
| 3098 {0xa7aa,0xa7aa,-1,-42308}, | |
| 3099 {0xa7ab,0xa7ab,-1,-42319}, | |
| 3100 {0xa7ac,0xa7ac,-1,-42315}, | |
| 3101 {0xa7ad,0xa7ad,-1,-42305}, | |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3102 {0xa7ae,0xa7ae,-1,-42308}, |
| 6495 | 3103 {0xa7b0,0xa7b0,-1,-42258}, |
| 3104 {0xa7b1,0xa7b1,-1,-42282}, | |
| 6864 | 3105 {0xa7b2,0xa7b2,-1,-42261}, |
| 3106 {0xa7b3,0xa7b3,-1,928}, | |
| 3107 {0xa7b4,0xa7b6,2,1}, | |
| 3108 {0xab70,0xabbf,1,-38864}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3109 {0xff21,0xff3a,1,32}, |
| 6495 | 3110 {0x10400,0x10427,1,40}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3111 {0x104b0,0x104d3,1,40}, |
| 6864 | 3112 {0x10c80,0x10cb2,1,64}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3113 {0x118a0,0x118bf,1,32}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3114 {0x1e900,0x1e921,1,34} |
| 7 | 3115 }; |
| 3116 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
3117 static int utf_convert(int a, convertStruct table[], int tableSize); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
3118 static int utf_strnicmp(char_u *s1, char_u *s2, size_t n1, size_t n2); |
| 7 | 3119 |
| 3120 /* | |
| 3121 * Generic conversion function for case operations. | |
| 3122 * Return the converted equivalent of "a", which is a UCS-4 character. Use | |
| 3123 * the given conversion "table". Uses binary search on "table". | |
| 3124 */ | |
| 3125 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3126 utf_convert( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3127 int a, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3128 convertStruct table[], |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3129 int tableSize) |
| 7 | 3130 { |
| 3131 int start, mid, end; /* indices into table */ | |
| 3190 | 3132 int entries = tableSize / sizeof(convertStruct); |
| 7 | 3133 |
| 3134 start = 0; | |
| 3190 | 3135 end = entries; |
| 7 | 3136 while (start < end) |
| 3137 { | |
| 3138 /* need to search further */ | |
| 3190 | 3139 mid = (end + start) / 2; |
| 7 | 3140 if (table[mid].rangeEnd < a) |
| 3141 start = mid + 1; | |
| 3142 else | |
| 3143 end = mid; | |
| 3144 } | |
| 3190 | 3145 if (start < entries |
| 3146 && table[start].rangeStart <= a | |
| 3147 && a <= table[start].rangeEnd | |
| 7 | 3148 && (a - table[start].rangeStart) % table[start].step == 0) |
| 3149 return (a + table[start].offset); | |
| 3150 else | |
| 3151 return a; | |
| 3152 } | |
| 3153 | |
| 3154 /* | |
| 3155 * Return the folded-case equivalent of "a", which is a UCS-4 character. Uses | |
| 3156 * simple case folding. | |
| 3157 */ | |
| 3158 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3159 utf_fold(int a) |
| 7 | 3160 { |
|
9477
045543df0c28
commit https://github.com/vim/vim/commit/c4a927ca8dc383190d5df2cacd3f966698b6190c
Christian Brabandt <cb@256bit.org>
parents:
9357
diff
changeset
|
3161 if (a < 0x80) |
|
045543df0c28
commit https://github.com/vim/vim/commit/c4a927ca8dc383190d5df2cacd3f966698b6190c
Christian Brabandt <cb@256bit.org>
parents:
9357
diff
changeset
|
3162 /* be fast for ASCII */ |
|
045543df0c28
commit https://github.com/vim/vim/commit/c4a927ca8dc383190d5df2cacd3f966698b6190c
Christian Brabandt <cb@256bit.org>
parents:
9357
diff
changeset
|
3163 return a >= 0x41 && a <= 0x5a ? a + 32 : a; |
| 3190 | 3164 return utf_convert(a, foldCase, (int)sizeof(foldCase)); |
| 7 | 3165 } |
| 3166 | |
| 297 | 3167 static convertStruct toLower[] = |
| 7 | 3168 { |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3169 {0x41,0x5a,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3170 {0xc0,0xd6,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3171 {0xd8,0xde,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3172 {0x100,0x12e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3173 {0x130,0x130,-1,-199}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3174 {0x132,0x136,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3175 {0x139,0x147,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3176 {0x14a,0x176,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3177 {0x178,0x178,-1,-121}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3178 {0x179,0x17d,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3179 {0x181,0x181,-1,210}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3180 {0x182,0x184,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3181 {0x186,0x186,-1,206}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3182 {0x187,0x187,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3183 {0x189,0x18a,1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3184 {0x18b,0x18b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3185 {0x18e,0x18e,-1,79}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3186 {0x18f,0x18f,-1,202}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3187 {0x190,0x190,-1,203}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3188 {0x191,0x191,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3189 {0x193,0x193,-1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3190 {0x194,0x194,-1,207}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3191 {0x196,0x196,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3192 {0x197,0x197,-1,209}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3193 {0x198,0x198,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3194 {0x19c,0x19c,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3195 {0x19d,0x19d,-1,213}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3196 {0x19f,0x19f,-1,214}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3197 {0x1a0,0x1a4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3198 {0x1a6,0x1a6,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3199 {0x1a7,0x1a7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3200 {0x1a9,0x1a9,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3201 {0x1ac,0x1ac,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3202 {0x1ae,0x1ae,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3203 {0x1af,0x1af,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3204 {0x1b1,0x1b2,1,217}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3205 {0x1b3,0x1b5,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3206 {0x1b7,0x1b7,-1,219}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3207 {0x1b8,0x1bc,4,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3208 {0x1c4,0x1c4,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3209 {0x1c5,0x1c5,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3210 {0x1c7,0x1c7,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3211 {0x1c8,0x1c8,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3212 {0x1ca,0x1ca,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3213 {0x1cb,0x1db,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3214 {0x1de,0x1ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3215 {0x1f1,0x1f1,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3216 {0x1f2,0x1f4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3217 {0x1f6,0x1f6,-1,-97}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3218 {0x1f7,0x1f7,-1,-56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3219 {0x1f8,0x21e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3220 {0x220,0x220,-1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3221 {0x222,0x232,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3222 {0x23a,0x23a,-1,10795}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3223 {0x23b,0x23b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3224 {0x23d,0x23d,-1,-163}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3225 {0x23e,0x23e,-1,10792}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3226 {0x241,0x241,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3227 {0x243,0x243,-1,-195}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3228 {0x244,0x244,-1,69}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3229 {0x245,0x245,-1,71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3230 {0x246,0x24e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3231 {0x370,0x372,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3232 {0x376,0x376,-1,1}, |
| 6495 | 3233 {0x37f,0x37f,-1,116}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3234 {0x386,0x386,-1,38}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3235 {0x388,0x38a,1,37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3236 {0x38c,0x38c,-1,64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3237 {0x38e,0x38f,1,63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3238 {0x391,0x3a1,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3239 {0x3a3,0x3ab,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3240 {0x3cf,0x3cf,-1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3241 {0x3d8,0x3ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3242 {0x3f4,0x3f4,-1,-60}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3243 {0x3f7,0x3f7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3244 {0x3f9,0x3f9,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3245 {0x3fa,0x3fa,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3246 {0x3fd,0x3ff,1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3247 {0x400,0x40f,1,80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3248 {0x410,0x42f,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3249 {0x460,0x480,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3250 {0x48a,0x4be,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3251 {0x4c0,0x4c0,-1,15}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3252 {0x4c1,0x4cd,2,1}, |
| 6495 | 3253 {0x4d0,0x52e,2,1}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3254 {0x531,0x556,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3255 {0x10a0,0x10c5,1,7264}, |
| 6495 | 3256 {0x10c7,0x10cd,6,7264}, |
| 6864 | 3257 {0x13a0,0x13ef,1,38864}, |
| 3258 {0x13f0,0x13f5,1,8}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3259 {0x1e00,0x1e94,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3260 {0x1e9e,0x1e9e,-1,-7615}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3261 {0x1ea0,0x1efe,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3262 {0x1f08,0x1f0f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3263 {0x1f18,0x1f1d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3264 {0x1f28,0x1f2f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3265 {0x1f38,0x1f3f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3266 {0x1f48,0x1f4d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3267 {0x1f59,0x1f5f,2,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3268 {0x1f68,0x1f6f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3269 {0x1f88,0x1f8f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3270 {0x1f98,0x1f9f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3271 {0x1fa8,0x1faf,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3272 {0x1fb8,0x1fb9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3273 {0x1fba,0x1fbb,1,-74}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3274 {0x1fbc,0x1fbc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3275 {0x1fc8,0x1fcb,1,-86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3276 {0x1fcc,0x1fcc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3277 {0x1fd8,0x1fd9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3278 {0x1fda,0x1fdb,1,-100}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3279 {0x1fe8,0x1fe9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3280 {0x1fea,0x1feb,1,-112}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3281 {0x1fec,0x1fec,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3282 {0x1ff8,0x1ff9,1,-128}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3283 {0x1ffa,0x1ffb,1,-126}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3284 {0x1ffc,0x1ffc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3285 {0x2126,0x2126,-1,-7517}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3286 {0x212a,0x212a,-1,-8383}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3287 {0x212b,0x212b,-1,-8262}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3288 {0x2132,0x2132,-1,28}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3289 {0x2160,0x216f,1,16}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3290 {0x2183,0x2183,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3291 {0x24b6,0x24cf,1,26}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3292 {0x2c00,0x2c2e,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3293 {0x2c60,0x2c60,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3294 {0x2c62,0x2c62,-1,-10743}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3295 {0x2c63,0x2c63,-1,-3814}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3296 {0x2c64,0x2c64,-1,-10727}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3297 {0x2c67,0x2c6b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3298 {0x2c6d,0x2c6d,-1,-10780}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3299 {0x2c6e,0x2c6e,-1,-10749}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3300 {0x2c6f,0x2c6f,-1,-10783}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3301 {0x2c70,0x2c70,-1,-10782}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3302 {0x2c72,0x2c75,3,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3303 {0x2c7e,0x2c7f,1,-10815}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3304 {0x2c80,0x2ce2,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3305 {0x2ceb,0x2ced,2,1}, |
| 6495 | 3306 {0x2cf2,0xa640,31054,1}, |
| 3307 {0xa642,0xa66c,2,1}, | |
| 3308 {0xa680,0xa69a,2,1}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3309 {0xa722,0xa72e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3310 {0xa732,0xa76e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3311 {0xa779,0xa77b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3312 {0xa77d,0xa77d,-1,-35332}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3313 {0xa77e,0xa786,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3314 {0xa78b,0xa78b,-1,1}, |
| 6495 | 3315 {0xa78d,0xa78d,-1,-42280}, |
| 3316 {0xa790,0xa792,2,1}, | |
| 3317 {0xa796,0xa7a8,2,1}, | |
| 3318 {0xa7aa,0xa7aa,-1,-42308}, | |
| 3319 {0xa7ab,0xa7ab,-1,-42319}, | |
| 3320 {0xa7ac,0xa7ac,-1,-42315}, | |
| 3321 {0xa7ad,0xa7ad,-1,-42305}, | |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3322 {0xa7ae,0xa7ae,-1,-42308}, |
| 6495 | 3323 {0xa7b0,0xa7b0,-1,-42258}, |
| 3324 {0xa7b1,0xa7b1,-1,-42282}, | |
| 6864 | 3325 {0xa7b2,0xa7b2,-1,-42261}, |
| 3326 {0xa7b3,0xa7b3,-1,928}, | |
| 3327 {0xa7b4,0xa7b6,2,1}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3328 {0xff21,0xff3a,1,32}, |
| 6495 | 3329 {0x10400,0x10427,1,40}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3330 {0x104b0,0x104d3,1,40}, |
| 6864 | 3331 {0x10c80,0x10cb2,1,64}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3332 {0x118a0,0x118bf,1,32}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3333 {0x1e900,0x1e921,1,34} |
| 7 | 3334 }; |
| 3335 | |
| 297 | 3336 static convertStruct toUpper[] = |
| 7 | 3337 { |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3338 {0x61,0x7a,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3339 {0xb5,0xb5,-1,743}, |
| 6495 | 3340 {0xe0,0xf6,1,-32}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3341 {0xf8,0xfe,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3342 {0xff,0xff,-1,121}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3343 {0x101,0x12f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3344 {0x131,0x131,-1,-232}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3345 {0x133,0x137,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3346 {0x13a,0x148,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3347 {0x14b,0x177,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3348 {0x17a,0x17e,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3349 {0x17f,0x17f,-1,-300}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3350 {0x180,0x180,-1,195}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3351 {0x183,0x185,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3352 {0x188,0x18c,4,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3353 {0x192,0x192,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3354 {0x195,0x195,-1,97}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3355 {0x199,0x199,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3356 {0x19a,0x19a,-1,163}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3357 {0x19e,0x19e,-1,130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3358 {0x1a1,0x1a5,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3359 {0x1a8,0x1ad,5,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3360 {0x1b0,0x1b4,4,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3361 {0x1b6,0x1b9,3,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3362 {0x1bd,0x1bd,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3363 {0x1bf,0x1bf,-1,56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3364 {0x1c5,0x1c5,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3365 {0x1c6,0x1c6,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3366 {0x1c8,0x1c8,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3367 {0x1c9,0x1c9,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3368 {0x1cb,0x1cb,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3369 {0x1cc,0x1cc,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3370 {0x1ce,0x1dc,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3371 {0x1dd,0x1dd,-1,-79}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3372 {0x1df,0x1ef,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3373 {0x1f2,0x1f2,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3374 {0x1f3,0x1f3,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3375 {0x1f5,0x1f9,4,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3376 {0x1fb,0x21f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3377 {0x223,0x233,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3378 {0x23c,0x23c,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3379 {0x23f,0x240,1,10815}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3380 {0x242,0x247,5,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3381 {0x249,0x24f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3382 {0x250,0x250,-1,10783}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3383 {0x251,0x251,-1,10780}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3384 {0x252,0x252,-1,10782}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3385 {0x253,0x253,-1,-210}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3386 {0x254,0x254,-1,-206}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3387 {0x256,0x257,1,-205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3388 {0x259,0x259,-1,-202}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3389 {0x25b,0x25b,-1,-203}, |
| 6495 | 3390 {0x25c,0x25c,-1,42319}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3391 {0x260,0x260,-1,-205}, |
| 6495 | 3392 {0x261,0x261,-1,42315}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3393 {0x263,0x263,-1,-207}, |
| 6495 | 3394 {0x265,0x265,-1,42280}, |
| 3395 {0x266,0x266,-1,42308}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3396 {0x268,0x268,-1,-209}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3397 {0x269,0x269,-1,-211}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3398 {0x26a,0x26a,-1,42308}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3399 {0x26b,0x26b,-1,10743}, |
| 6495 | 3400 {0x26c,0x26c,-1,42305}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3401 {0x26f,0x26f,-1,-211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3402 {0x271,0x271,-1,10749}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3403 {0x272,0x272,-1,-213}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3404 {0x275,0x275,-1,-214}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3405 {0x27d,0x27d,-1,10727}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3406 {0x280,0x283,3,-218}, |
| 6495 | 3407 {0x287,0x287,-1,42282}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3408 {0x288,0x288,-1,-218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3409 {0x289,0x289,-1,-69}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3410 {0x28a,0x28b,1,-217}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3411 {0x28c,0x28c,-1,-71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3412 {0x292,0x292,-1,-219}, |
| 6864 | 3413 {0x29d,0x29d,-1,42261}, |
| 6495 | 3414 {0x29e,0x29e,-1,42258}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3415 {0x345,0x345,-1,84}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3416 {0x371,0x373,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3417 {0x377,0x377,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3418 {0x37b,0x37d,1,130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3419 {0x3ac,0x3ac,-1,-38}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3420 {0x3ad,0x3af,1,-37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3421 {0x3b1,0x3c1,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3422 {0x3c2,0x3c2,-1,-31}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3423 {0x3c3,0x3cb,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3424 {0x3cc,0x3cc,-1,-64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3425 {0x3cd,0x3ce,1,-63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3426 {0x3d0,0x3d0,-1,-62}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3427 {0x3d1,0x3d1,-1,-57}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3428 {0x3d5,0x3d5,-1,-47}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3429 {0x3d6,0x3d6,-1,-54}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3430 {0x3d7,0x3d7,-1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3431 {0x3d9,0x3ef,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3432 {0x3f0,0x3f0,-1,-86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3433 {0x3f1,0x3f1,-1,-80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3434 {0x3f2,0x3f2,-1,7}, |
| 6495 | 3435 {0x3f3,0x3f3,-1,-116}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3436 {0x3f5,0x3f5,-1,-96}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3437 {0x3f8,0x3fb,3,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3438 {0x430,0x44f,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3439 {0x450,0x45f,1,-80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3440 {0x461,0x481,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3441 {0x48b,0x4bf,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3442 {0x4c2,0x4ce,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3443 {0x4cf,0x4cf,-1,-15}, |
| 6495 | 3444 {0x4d1,0x52f,2,-1}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3445 {0x561,0x586,1,-48}, |
| 6864 | 3446 {0x13f8,0x13fd,1,-8}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3447 {0x1c80,0x1c80,-1,-6254}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3448 {0x1c81,0x1c81,-1,-6253}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3449 {0x1c82,0x1c82,-1,-6244}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3450 {0x1c83,0x1c84,1,-6242}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3451 {0x1c85,0x1c85,-1,-6243}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3452 {0x1c86,0x1c86,-1,-6236}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3453 {0x1c87,0x1c87,-1,-6181}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3454 {0x1c88,0x1c88,-1,35266}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3455 {0x1d79,0x1d79,-1,35332}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3456 {0x1d7d,0x1d7d,-1,3814}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3457 {0x1e01,0x1e95,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3458 {0x1e9b,0x1e9b,-1,-59}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3459 {0x1ea1,0x1eff,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3460 {0x1f00,0x1f07,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3461 {0x1f10,0x1f15,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3462 {0x1f20,0x1f27,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3463 {0x1f30,0x1f37,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3464 {0x1f40,0x1f45,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3465 {0x1f51,0x1f57,2,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3466 {0x1f60,0x1f67,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3467 {0x1f70,0x1f71,1,74}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3468 {0x1f72,0x1f75,1,86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3469 {0x1f76,0x1f77,1,100}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3470 {0x1f78,0x1f79,1,128}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3471 {0x1f7a,0x1f7b,1,112}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3472 {0x1f7c,0x1f7d,1,126}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3473 {0x1f80,0x1f87,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3474 {0x1f90,0x1f97,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3475 {0x1fa0,0x1fa7,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3476 {0x1fb0,0x1fb1,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3477 {0x1fb3,0x1fb3,-1,9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3478 {0x1fbe,0x1fbe,-1,-7205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3479 {0x1fc3,0x1fc3,-1,9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3480 {0x1fd0,0x1fd1,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3481 {0x1fe0,0x1fe1,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3482 {0x1fe5,0x1fe5,-1,7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3483 {0x1ff3,0x1ff3,-1,9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3484 {0x214e,0x214e,-1,-28}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3485 {0x2170,0x217f,1,-16}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3486 {0x2184,0x2184,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3487 {0x24d0,0x24e9,1,-26}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3488 {0x2c30,0x2c5e,1,-48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3489 {0x2c61,0x2c61,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3490 {0x2c65,0x2c65,-1,-10795}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3491 {0x2c66,0x2c66,-1,-10792}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3492 {0x2c68,0x2c6c,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3493 {0x2c73,0x2c76,3,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3494 {0x2c81,0x2ce3,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3495 {0x2cec,0x2cee,2,-1}, |
| 6495 | 3496 {0x2cf3,0x2cf3,-1,-1}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3497 {0x2d00,0x2d25,1,-7264}, |
| 6495 | 3498 {0x2d27,0x2d2d,6,-7264}, |
| 3499 {0xa641,0xa66d,2,-1}, | |
| 3500 {0xa681,0xa69b,2,-1}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3501 {0xa723,0xa72f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3502 {0xa733,0xa76f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3503 {0xa77a,0xa77c,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3504 {0xa77f,0xa787,2,-1}, |
| 6495 | 3505 {0xa78c,0xa791,5,-1}, |
| 3506 {0xa793,0xa797,4,-1}, | |
| 3507 {0xa799,0xa7a9,2,-1}, | |
| 6864 | 3508 {0xa7b5,0xa7b7,2,-1}, |
| 3509 {0xab53,0xab53,-1,-928}, | |
| 3510 {0xab70,0xabbf,1,-38864}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3511 {0xff41,0xff5a,1,-32}, |
| 6495 | 3512 {0x10428,0x1044f,1,-40}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3513 {0x104d8,0x104fb,1,-40}, |
| 6864 | 3514 {0x10cc0,0x10cf2,1,-64}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3515 {0x118c0,0x118df,1,-32}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3516 {0x1e922,0x1e943,1,-34} |
| 7 | 3517 }; |
|
8682
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
3518 |
| 7 | 3519 /* |
| 3520 * Return the upper-case equivalent of "a", which is a UCS-4 character. Use | |
| 3521 * simple case folding. | |
| 3522 */ | |
| 3523 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3524 utf_toupper(int a) |
| 7 | 3525 { |
| 3526 /* If 'casemap' contains "keepascii" use ASCII style toupper(). */ | |
| 3527 if (a < 128 && (cmp_flags & CMP_KEEPASCII)) | |
| 3528 return TOUPPER_ASC(a); | |
| 3529 | |
| 856 | 3530 #if defined(HAVE_TOWUPPER) && defined(__STDC_ISO_10646__) |
| 3531 /* If towupper() is available and handles Unicode, use it. */ | |
| 7 | 3532 if (!(cmp_flags & CMP_INTERNAL)) |
| 3533 return towupper(a); | |
| 3534 #endif | |
| 3535 | |
| 3536 /* For characters below 128 use locale sensitive toupper(). */ | |
| 3537 if (a < 128) | |
| 3538 return TOUPPER_LOC(a); | |
| 3539 | |
| 3540 /* For any other characters use the above mapping table. */ | |
| 3190 | 3541 return utf_convert(a, toUpper, (int)sizeof(toUpper)); |
| 7 | 3542 } |
| 3543 | |
| 3544 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3545 utf_islower(int a) |
| 7 | 3546 { |
| 3551 | 3547 /* German sharp s is lower case but has no upper case equivalent. */ |
| 3548 return (utf_toupper(a) != a) || a == 0xdf; | |
| 7 | 3549 } |
| 3550 | |
| 3551 /* | |
| 3552 * Return the lower-case equivalent of "a", which is a UCS-4 character. Use | |
| 3553 * simple case folding. | |
| 3554 */ | |
| 3555 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3556 utf_tolower(int a) |
| 7 | 3557 { |
| 3558 /* If 'casemap' contains "keepascii" use ASCII style tolower(). */ | |
| 3559 if (a < 128 && (cmp_flags & CMP_KEEPASCII)) | |
| 3560 return TOLOWER_ASC(a); | |
| 3561 | |
| 856 | 3562 #if defined(HAVE_TOWLOWER) && defined(__STDC_ISO_10646__) |
| 257 | 3563 /* If towlower() is available and handles Unicode, use it. */ |
| 7 | 3564 if (!(cmp_flags & CMP_INTERNAL)) |
| 3565 return towlower(a); | |
| 3566 #endif | |
| 3567 | |
| 3568 /* For characters below 128 use locale sensitive tolower(). */ | |
| 3569 if (a < 128) | |
| 3570 return TOLOWER_LOC(a); | |
| 3571 | |
| 3572 /* For any other characters use the above mapping table. */ | |
| 3190 | 3573 return utf_convert(a, toLower, (int)sizeof(toLower)); |
| 7 | 3574 } |
| 3575 | |
| 3576 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3577 utf_isupper(int a) |
| 7 | 3578 { |
| 3579 return (utf_tolower(a) != a); | |
| 3580 } | |
| 3581 | |
| 2961 | 3582 static int |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3583 utf_strnicmp( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3584 char_u *s1, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3585 char_u *s2, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3586 size_t n1, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3587 size_t n2) |
| 2961 | 3588 { |
| 3589 int c1, c2, cdiff; | |
| 3590 char_u buffer[6]; | |
| 3591 | |
| 3592 for (;;) | |
| 3593 { | |
| 3594 c1 = utf_safe_read_char_adv(&s1, &n1); | |
| 3595 c2 = utf_safe_read_char_adv(&s2, &n2); | |
| 3596 | |
| 3597 if (c1 <= 0 || c2 <= 0) | |
| 3598 break; | |
| 3599 | |
| 3600 if (c1 == c2) | |
| 3601 continue; | |
| 3602 | |
| 3603 cdiff = utf_fold(c1) - utf_fold(c2); | |
| 3604 if (cdiff != 0) | |
| 3605 return cdiff; | |
| 3606 } | |
| 3607 | |
| 3608 /* some string ended or has an incomplete/illegal character sequence */ | |
| 3609 | |
| 3610 if (c1 == 0 || c2 == 0) | |
| 3611 { | |
| 3612 /* some string ended. shorter string is smaller */ | |
| 3613 if (c1 == 0 && c2 == 0) | |
| 3614 return 0; | |
| 3615 return c1 == 0 ? -1 : 1; | |
| 3616 } | |
| 3617 | |
| 3618 /* Continue with bytewise comparison to produce some result that | |
| 3619 * would make comparison operations involving this function transitive. | |
| 3620 * | |
| 3621 * If only one string had an error, comparison should be made with | |
| 3622 * folded version of the other string. In this case it is enough | |
| 3623 * to fold just one character to determine the result of comparison. */ | |
| 3624 | |
| 3625 if (c1 != -1 && c2 == -1) | |
| 3626 { | |
| 3627 n1 = utf_char2bytes(utf_fold(c1), buffer); | |
| 3628 s1 = buffer; | |
| 3629 } | |
| 3630 else if (c2 != -1 && c1 == -1) | |
| 3631 { | |
| 3632 n2 = utf_char2bytes(utf_fold(c2), buffer); | |
| 3633 s2 = buffer; | |
| 3634 } | |
| 3635 | |
| 3636 while (n1 > 0 && n2 > 0 && *s1 != NUL && *s2 != NUL) | |
| 3637 { | |
| 3638 cdiff = (int)(*s1) - (int)(*s2); | |
| 3639 if (cdiff != 0) | |
| 3640 return cdiff; | |
| 3641 | |
| 3642 s1++; | |
| 3643 s2++; | |
| 3644 n1--; | |
| 3645 n2--; | |
| 3646 } | |
| 3647 | |
| 3648 if (n1 > 0 && *s1 == NUL) | |
| 3649 n1 = 0; | |
| 3650 if (n2 > 0 && *s2 == NUL) | |
| 3651 n2 = 0; | |
| 3652 | |
| 3653 if (n1 == 0 && n2 == 0) | |
| 3654 return 0; | |
| 3655 return n1 == 0 ? -1 : 1; | |
| 3656 } | |
| 3657 | |
| 7 | 3658 /* |
| 3659 * Version of strnicmp() that handles multi-byte characters. | |
| 4025 | 3660 * Needed for Big5, Shift-JIS and UTF-8 encoding. Other DBCS encodings can |
| 7 | 3661 * probably use strnicmp(), because there are no ASCII characters in the |
| 3662 * second byte. | |
| 3663 * Returns zero if s1 and s2 are equal (ignoring case), the difference between | |
| 3664 * two characters otherwise. | |
| 3665 */ | |
| 3666 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3667 mb_strnicmp(char_u *s1, char_u *s2, size_t nn) |
| 7 | 3668 { |
| 2961 | 3669 int i, l; |
| 7 | 3670 int cdiff; |
| 835 | 3671 int n = (int)nn; |
| 7 | 3672 |
| 2961 | 3673 if (enc_utf8) |
| 7 | 3674 { |
| 2961 | 3675 return utf_strnicmp(s1, s2, nn, nn); |
| 3676 } | |
| 3677 else | |
| 3678 { | |
| 3679 for (i = 0; i < n; i += l) | |
| 7 | 3680 { |
| 2961 | 3681 if (s1[i] == NUL && s2[i] == NUL) /* both strings end */ |
| 3682 return 0; | |
| 3683 | |
| 474 | 3684 l = (*mb_ptr2len)(s1 + i); |
| 7 | 3685 if (l <= 1) |
| 3686 { | |
| 3687 /* Single byte: first check normally, then with ignore case. */ | |
| 3688 if (s1[i] != s2[i]) | |
| 3689 { | |
| 1347 | 3690 cdiff = MB_TOLOWER(s1[i]) - MB_TOLOWER(s2[i]); |
| 7 | 3691 if (cdiff != 0) |
| 3692 return cdiff; | |
| 3693 } | |
| 3694 } | |
| 3695 else | |
| 3696 { | |
| 3697 /* For non-Unicode multi-byte don't ignore case. */ | |
| 3698 if (l > n - i) | |
| 3699 l = n - i; | |
| 3700 cdiff = STRNCMP(s1 + i, s2 + i, l); | |
| 3701 if (cdiff != 0) | |
| 3702 return cdiff; | |
| 3703 } | |
| 3704 } | |
| 3705 } | |
| 3706 return 0; | |
| 3707 } | |
| 3708 | |
| 3709 /* | |
| 3710 * "g8": show bytes of the UTF-8 char under the cursor. Doesn't matter what | |
| 3711 * 'encoding' has been set to. | |
| 3712 */ | |
| 3713 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3714 show_utf8(void) |
| 7 | 3715 { |
| 3716 int len; | |
| 273 | 3717 int rlen = 0; |
| 7 | 3718 char_u *line; |
| 3719 int clen; | |
| 3720 int i; | |
| 3721 | |
| 3722 /* Get the byte length of the char under the cursor, including composing | |
| 3723 * characters. */ | |
| 3724 line = ml_get_cursor(); | |
| 474 | 3725 len = utfc_ptr2len(line); |
| 7 | 3726 if (len == 0) |
| 3727 { | |
| 3728 MSG("NUL"); | |
| 3729 return; | |
| 3730 } | |
| 3731 | |
| 3732 clen = 0; | |
| 3733 for (i = 0; i < len; ++i) | |
| 3734 { | |
| 3735 if (clen == 0) | |
| 3736 { | |
| 3737 /* start of (composing) character, get its length */ | |
| 3738 if (i > 0) | |
| 273 | 3739 { |
| 3740 STRCPY(IObuff + rlen, "+ "); | |
| 3741 rlen += 2; | |
| 3742 } | |
| 474 | 3743 clen = utf_ptr2len(line + i); |
| 7 | 3744 } |
|
2205
54605ada811b
"g8" doesn't work properly on a NUL.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
3745 sprintf((char *)IObuff + rlen, "%02x ", |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
3746 (line[i] == NL) ? NUL : line[i]); /* NUL is stored as NL */ |
| 7 | 3747 --clen; |
| 835 | 3748 rlen += (int)STRLEN(IObuff + rlen); |
| 273 | 3749 if (rlen > IOSIZE - 20) |
| 3750 break; | |
| 7 | 3751 } |
| 3752 | |
| 3753 msg(IObuff); | |
| 3754 } | |
| 3755 | |
| 3756 /* | |
| 3757 * mb_head_off() function pointer. | |
| 3758 * Return offset from "p" to the first byte of the character it points into. | |
| 2015 | 3759 * If "p" points to the NUL at the end of the string return 0. |
| 7 | 3760 * Returns 0 when already at the first byte of a character. |
| 3761 */ | |
| 3762 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3763 latin_head_off(char_u *base UNUSED, char_u *p UNUSED) |
| 7 | 3764 { |
| 3765 return 0; | |
| 3766 } | |
| 3767 | |
| 3768 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3769 dbcs_head_off(char_u *base, char_u *p) |
| 7 | 3770 { |
| 3771 char_u *q; | |
| 3772 | |
| 3773 /* It can't be a trailing byte when not using DBCS, at the start of the | |
| 3774 * string or the previous byte can't start a double-byte. */ | |
| 2015 | 3775 if (p <= base || MB_BYTE2LEN(p[-1]) == 1 || *p == NUL) |
| 7 | 3776 return 0; |
| 3777 | |
| 3778 /* This is slow: need to start at the base and go forward until the | |
| 3779 * byte we are looking for. Return 1 when we went past it, 0 otherwise. */ | |
| 3780 q = base; | |
| 3781 while (q < p) | |
| 474 | 3782 q += dbcs_ptr2len(q); |
| 7 | 3783 return (q == p) ? 0 : 1; |
| 3784 } | |
| 3785 | |
| 3786 /* | |
| 3787 * Special version of dbcs_head_off() that works for ScreenLines[], where | |
| 3788 * single-width DBCS_JPNU characters are stored separately. | |
| 3789 */ | |
| 3790 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3791 dbcs_screen_head_off(char_u *base, char_u *p) |
| 7 | 3792 { |
| 3793 char_u *q; | |
| 3794 | |
| 3795 /* It can't be a trailing byte when not using DBCS, at the start of the | |
| 3796 * string or the previous byte can't start a double-byte. | |
| 3797 * For euc-jp an 0x8e byte in the previous cell always means we have a | |
| 3798 * lead byte in the current cell. */ | |
| 3799 if (p <= base | |
| 3800 || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e) | |
| 2015 | 3801 || MB_BYTE2LEN(p[-1]) == 1 |
| 3802 || *p == NUL) | |
| 7 | 3803 return 0; |
| 3804 | |
| 3805 /* This is slow: need to start at the base and go forward until the | |
| 3806 * byte we are looking for. Return 1 when we went past it, 0 otherwise. | |
| 3807 * For DBCS_JPNU look out for 0x8e, which means the second byte is not | |
| 3808 * stored as the next byte. */ | |
| 3809 q = base; | |
| 3810 while (q < p) | |
| 3811 { | |
| 3812 if (enc_dbcs == DBCS_JPNU && *q == 0x8e) | |
| 3813 ++q; | |
| 3814 else | |
| 474 | 3815 q += dbcs_ptr2len(q); |
| 7 | 3816 } |
| 3817 return (q == p) ? 0 : 1; | |
| 3818 } | |
| 3819 | |
| 3820 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3821 utf_head_off(char_u *base, char_u *p) |
| 7 | 3822 { |
| 3823 char_u *q; | |
| 3824 char_u *s; | |
| 3825 int c; | |
| 2015 | 3826 int len; |
| 7 | 3827 #ifdef FEAT_ARABIC |
| 3828 char_u *j; | |
| 3829 #endif | |
| 3830 | |
| 3831 if (*p < 0x80) /* be quick for ASCII */ | |
| 3832 return 0; | |
| 3833 | |
| 3834 /* Skip backwards over trailing bytes: 10xx.xxxx | |
| 3835 * Skip backwards again if on a composing char. */ | |
| 3836 for (q = p; ; --q) | |
| 3837 { | |
| 3838 /* Move s to the last byte of this char. */ | |
| 3839 for (s = q; (s[1] & 0xc0) == 0x80; ++s) | |
| 3840 ; | |
| 3841 /* Move q to the first byte of this char. */ | |
| 3842 while (q > base && (*q & 0xc0) == 0x80) | |
| 3843 --q; | |
| 3844 /* Check for illegal sequence. Do allow an illegal byte after where we | |
| 3845 * started. */ | |
| 2015 | 3846 len = utf8len_tab[*q]; |
| 3847 if (len != (int)(s - q + 1) && len != (int)(p - q + 1)) | |
| 7 | 3848 return 0; |
| 3849 | |
| 3850 if (q <= base) | |
| 3851 break; | |
| 3852 | |
| 3853 c = utf_ptr2char(q); | |
| 3854 if (utf_iscomposing(c)) | |
| 3855 continue; | |
| 3856 | |
| 3857 #ifdef FEAT_ARABIC | |
| 3858 if (arabic_maycombine(c)) | |
| 3859 { | |
| 3860 /* Advance to get a sneak-peak at the next char */ | |
| 3861 j = q; | |
| 3862 --j; | |
| 3863 /* Move j to the first byte of this char. */ | |
| 3864 while (j > base && (*j & 0xc0) == 0x80) | |
| 3865 --j; | |
| 3866 if (arabic_combine(utf_ptr2char(j), c)) | |
| 3867 continue; | |
| 3868 } | |
| 3869 #endif | |
| 3870 break; | |
| 3871 } | |
| 3872 | |
| 3873 return (int)(p - q); | |
| 3874 } | |
| 3875 | |
| 3876 /* | |
| 99 | 3877 * Copy a character from "*fp" to "*tp" and advance the pointers. |
| 3878 */ | |
| 3879 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3880 mb_copy_char(char_u **fp, char_u **tp) |
| 99 | 3881 { |
| 474 | 3882 int l = (*mb_ptr2len)(*fp); |
| 99 | 3883 |
| 3884 mch_memmove(*tp, *fp, (size_t)l); | |
| 3885 *tp += l; | |
| 3886 *fp += l; | |
| 3887 } | |
| 3888 | |
| 3889 /* | |
| 7 | 3890 * Return the offset from "p" to the first byte of a character. When "p" is |
| 3891 * at the start of a character 0 is returned, otherwise the offset to the next | |
| 3892 * character. Can start anywhere in a stream of bytes. | |
| 3893 */ | |
| 3894 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3895 mb_off_next(char_u *base, char_u *p) |
| 7 | 3896 { |
| 3897 int i; | |
| 3898 int j; | |
| 3899 | |
| 3900 if (enc_utf8) | |
| 3901 { | |
| 3902 if (*p < 0x80) /* be quick for ASCII */ | |
| 3903 return 0; | |
| 3904 | |
| 3905 /* Find the next character that isn't 10xx.xxxx */ | |
| 3906 for (i = 0; (p[i] & 0xc0) == 0x80; ++i) | |
| 3907 ; | |
| 3908 if (i > 0) | |
| 3909 { | |
| 3910 /* Check for illegal sequence. */ | |
| 3911 for (j = 0; p - j > base; ++j) | |
| 3912 if ((p[-j] & 0xc0) != 0x80) | |
| 3913 break; | |
| 3914 if (utf8len_tab[p[-j]] != i + j) | |
| 3915 return 0; | |
| 3916 } | |
| 3917 return i; | |
| 3918 } | |
| 3919 | |
| 3920 /* Only need to check if we're on a trail byte, it doesn't matter if we | |
| 3921 * want the offset to the next or current character. */ | |
| 3922 return (*mb_head_off)(base, p); | |
| 3923 } | |
| 3924 | |
| 3925 /* | |
| 3926 * Return the offset from "p" to the last byte of the character it points | |
| 3927 * into. Can start anywhere in a stream of bytes. | |
| 3928 */ | |
| 3929 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3930 mb_tail_off(char_u *base, char_u *p) |
| 7 | 3931 { |
| 3932 int i; | |
| 3933 int j; | |
| 3934 | |
| 3935 if (*p == NUL) | |
| 3936 return 0; | |
| 3937 | |
| 3938 if (enc_utf8) | |
| 3939 { | |
| 3940 /* Find the last character that is 10xx.xxxx */ | |
| 3941 for (i = 0; (p[i + 1] & 0xc0) == 0x80; ++i) | |
| 3942 ; | |
| 3943 /* Check for illegal sequence. */ | |
| 3944 for (j = 0; p - j > base; ++j) | |
| 3945 if ((p[-j] & 0xc0) != 0x80) | |
| 3946 break; | |
| 3947 if (utf8len_tab[p[-j]] != i + j + 1) | |
| 3948 return 0; | |
| 3949 return i; | |
| 3950 } | |
| 3951 | |
| 3952 /* It can't be the first byte if a double-byte when not using DBCS, at the | |
| 3953 * end of the string or the byte can't start a double-byte. */ | |
| 3954 if (enc_dbcs == 0 || p[1] == NUL || MB_BYTE2LEN(*p) == 1) | |
| 3955 return 0; | |
| 3956 | |
| 3957 /* Return 1 when on the lead byte, 0 when on the tail byte. */ | |
| 3958 return 1 - dbcs_head_off(base, p); | |
| 3959 } | |
| 3960 | |
| 776 | 3961 /* |
| 3962 * Find the next illegal byte sequence. | |
| 3963 */ | |
| 3964 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3965 utf_find_illegal(void) |
| 776 | 3966 { |
| 3967 pos_T pos = curwin->w_cursor; | |
| 3968 char_u *p; | |
| 3969 int len; | |
| 3970 vimconv_T vimconv; | |
| 3971 char_u *tofree = NULL; | |
| 3972 | |
| 3973 vimconv.vc_type = CONV_NONE; | |
| 3974 if (enc_utf8 && (enc_canon_props(curbuf->b_p_fenc) & ENC_8BIT)) | |
| 3975 { | |
| 3976 /* 'encoding' is "utf-8" but we are editing a 8-bit encoded file, | |
| 3977 * possibly a utf-8 file with illegal bytes. Setup for conversion | |
| 3978 * from utf-8 to 'fileencoding'. */ | |
| 3979 convert_setup(&vimconv, p_enc, curbuf->b_p_fenc); | |
| 3980 } | |
| 3981 | |
| 3982 #ifdef FEAT_VIRTUALEDIT | |
| 3983 curwin->w_cursor.coladd = 0; | |
| 3984 #endif | |
| 3985 for (;;) | |
| 3986 { | |
| 3987 p = ml_get_cursor(); | |
| 3988 if (vimconv.vc_type != CONV_NONE) | |
| 3989 { | |
| 3990 vim_free(tofree); | |
| 3991 tofree = string_convert(&vimconv, p, NULL); | |
| 3992 if (tofree == NULL) | |
| 3993 break; | |
| 3994 p = tofree; | |
| 3995 } | |
| 3996 | |
| 3997 while (*p != NUL) | |
| 3998 { | |
| 3999 /* Illegal means that there are not enough trail bytes (checked by | |
| 4000 * utf_ptr2len()) or too many of them (overlong sequence). */ | |
| 4001 len = utf_ptr2len(p); | |
| 4002 if (*p >= 0x80 && (len == 1 | |
| 4003 || utf_char2len(utf_ptr2char(p)) != len)) | |
| 4004 { | |
| 4005 if (vimconv.vc_type == CONV_NONE) | |
| 835 | 4006 curwin->w_cursor.col += (colnr_T)(p - ml_get_cursor()); |
| 776 | 4007 else |
| 4008 { | |
| 4009 int l; | |
| 4010 | |
| 835 | 4011 len = (int)(p - tofree); |
| 776 | 4012 for (p = ml_get_cursor(); *p != NUL && len-- > 0; p += l) |
| 4013 { | |
| 4014 l = utf_ptr2len(p); | |
| 4015 curwin->w_cursor.col += l; | |
| 4016 } | |
| 4017 } | |
| 4018 goto theend; | |
| 4019 } | |
| 4020 p += len; | |
| 4021 } | |
| 4022 if (curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
| 4023 break; | |
| 4024 ++curwin->w_cursor.lnum; | |
| 4025 curwin->w_cursor.col = 0; | |
| 4026 } | |
| 4027 | |
| 4028 /* didn't find it: don't move and beep */ | |
| 4029 curwin->w_cursor = pos; | |
| 4030 beep_flush(); | |
| 4031 | |
| 4032 theend: | |
| 4033 vim_free(tofree); | |
| 4034 convert_setup(&vimconv, NULL, NULL); | |
| 4035 } | |
| 4036 | |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
4037 #if defined(FEAT_GUI_GTK) || defined(PROTO) |
| 26 | 4038 /* |
| 4039 * Return TRUE if string "s" is a valid utf-8 string. | |
| 4040 * When "end" is NULL stop at the first NUL. | |
| 4041 * When "end" is positive stop there. | |
| 4042 */ | |
| 4043 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4044 utf_valid_string(char_u *s, char_u *end) |
| 26 | 4045 { |
| 4046 int l; | |
| 4047 char_u *p = s; | |
| 4048 | |
| 4049 while (end == NULL ? *p != NUL : p < end) | |
| 4050 { | |
| 2015 | 4051 l = utf8len_tab_zero[*p]; |
| 4052 if (l == 0) | |
| 26 | 4053 return FALSE; /* invalid lead byte */ |
| 4054 if (end != NULL && p + l > end) | |
| 4055 return FALSE; /* incomplete byte sequence */ | |
| 4056 ++p; | |
| 4057 while (--l > 0) | |
| 4058 if ((*p++ & 0xc0) != 0x80) | |
| 4059 return FALSE; /* invalid trail byte */ | |
| 4060 } | |
| 4061 return TRUE; | |
| 4062 } | |
| 4063 #endif | |
| 4064 | |
| 7 | 4065 #if defined(FEAT_GUI) || defined(PROTO) |
| 4066 /* | |
| 4067 * Special version of mb_tail_off() for use in ScreenLines[]. | |
| 4068 */ | |
| 4069 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4070 dbcs_screen_tail_off(char_u *base, char_u *p) |
| 7 | 4071 { |
| 4072 /* It can't be the first byte if a double-byte when not using DBCS, at the | |
| 4073 * end of the string or the byte can't start a double-byte. | |
| 4074 * For euc-jp an 0x8e byte always means we have a lead byte in the current | |
| 4075 * cell. */ | |
| 4076 if (*p == NUL || p[1] == NUL | |
| 4077 || (enc_dbcs == DBCS_JPNU && *p == 0x8e) | |
| 4078 || MB_BYTE2LEN(*p) == 1) | |
| 4079 return 0; | |
| 4080 | |
| 4081 /* Return 1 when on the lead byte, 0 when on the tail byte. */ | |
| 4082 return 1 - dbcs_screen_head_off(base, p); | |
| 4083 } | |
| 4084 #endif | |
| 4085 | |
| 4086 /* | |
| 4087 * If the cursor moves on an trail byte, set the cursor on the lead byte. | |
| 4088 * Thus it moves left if necessary. | |
| 4089 * Return TRUE when the cursor was adjusted. | |
| 4090 */ | |
| 4091 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4092 mb_adjust_cursor(void) |
| 7 | 4093 { |
| 2933 | 4094 mb_adjustpos(curbuf, &curwin->w_cursor); |
| 7 | 4095 } |
| 4096 | |
| 4097 /* | |
| 4098 * Adjust position "*lp" to point to the first byte of a multi-byte character. | |
| 4099 * If it points to a tail byte it's moved backwards to the head byte. | |
| 4100 */ | |
| 4101 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4102 mb_adjustpos(buf_T *buf, pos_T *lp) |
| 7 | 4103 { |
| 4104 char_u *p; | |
| 4105 | |
| 4106 if (lp->col > 0 | |
| 4107 #ifdef FEAT_VIRTUALEDIT | |
| 4108 || lp->coladd > 1 | |
| 4109 #endif | |
| 4110 ) | |
| 4111 { | |
| 2933 | 4112 p = ml_get_buf(buf, lp->lnum, FALSE); |
| 7 | 4113 lp->col -= (*mb_head_off)(p, p + lp->col); |
| 4114 #ifdef FEAT_VIRTUALEDIT | |
| 4115 /* Reset "coladd" when the cursor would be on the right half of a | |
| 4116 * double-wide character. */ | |
| 4117 if (lp->coladd == 1 | |
| 4118 && p[lp->col] != TAB | |
| 4119 && vim_isprintc((*mb_ptr2char)(p + lp->col)) | |
| 4120 && ptr2cells(p + lp->col) > 1) | |
| 4121 lp->coladd = 0; | |
| 4122 #endif | |
| 4123 } | |
| 4124 } | |
| 4125 | |
| 4126 /* | |
| 4127 * Return a pointer to the character before "*p", if there is one. | |
| 4128 */ | |
| 4129 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4130 mb_prevptr( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4131 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
|
4132 char_u *p) |
| 7 | 4133 { |
| 4134 if (p > line) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10724
diff
changeset
|
4135 MB_PTR_BACK(line, p); |
| 7 | 4136 return p; |
| 4137 } | |
| 4138 | |
| 4139 /* | |
| 474 | 4140 * Return the character length of "str". Each multi-byte character (with |
| 4141 * following composing characters) counts as one. | |
| 7 | 4142 */ |
| 4143 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4144 mb_charlen(char_u *str) |
| 7 | 4145 { |
| 500 | 4146 char_u *p = str; |
| 4147 int count; | |
| 4148 | |
| 4149 if (p == NULL) | |
| 7 | 4150 return 0; |
| 4151 | |
| 500 | 4152 for (count = 0; *p != NUL; count++) |
| 4153 p += (*mb_ptr2len)(p); | |
| 7 | 4154 |
| 4155 return count; | |
| 4156 } | |
| 4157 | |
| 740 | 4158 #if defined(FEAT_SPELL) || defined(PROTO) |
| 500 | 4159 /* |
| 4160 * Like mb_charlen() but for a string with specified length. | |
| 4161 */ | |
| 4162 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4163 mb_charlen_len(char_u *str, int len) |
| 500 | 4164 { |
| 4165 char_u *p = str; | |
| 4166 int count; | |
| 4167 | |
| 4168 for (count = 0; *p != NUL && p < str + len; count++) | |
| 4169 p += (*mb_ptr2len)(p); | |
| 4170 | |
| 4171 return count; | |
| 4172 } | |
| 4173 #endif | |
| 4174 | |
| 7 | 4175 /* |
| 4176 * Try to un-escape a multi-byte character. | |
| 4177 * Used for the "to" and "from" part of a mapping. | |
| 4178 * Return the un-escaped string if it is a multi-byte character, and advance | |
| 4179 * "pp" to just after the bytes that formed it. | |
| 4180 * Return NULL if no multi-byte char was found. | |
| 4181 */ | |
| 4182 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4183 mb_unescape(char_u **pp) |
| 7 | 4184 { |
| 3812 | 4185 static char_u buf[6]; |
| 4186 int n; | |
| 4187 int m = 0; | |
| 7 | 4188 char_u *str = *pp; |
| 4189 | |
| 4190 /* Must translate K_SPECIAL KS_SPECIAL KE_FILLER to K_SPECIAL and CSI | |
| 3812 | 4191 * KS_EXTRA KE_CSI to CSI. |
| 4192 * Maximum length of a utf-8 character is 4 bytes. */ | |
| 4193 for (n = 0; str[n] != NUL && m < 4; ++n) | |
| 7 | 4194 { |
| 4195 if (str[n] == K_SPECIAL | |
| 4196 && str[n + 1] == KS_SPECIAL | |
| 4197 && str[n + 2] == KE_FILLER) | |
| 4198 { | |
| 4199 buf[m++] = K_SPECIAL; | |
| 4200 n += 2; | |
| 4201 } | |
| 1495 | 4202 else if ((str[n] == K_SPECIAL |
| 7 | 4203 # ifdef FEAT_GUI |
| 1495 | 4204 || str[n] == CSI |
| 4205 # endif | |
| 4206 ) | |
| 7 | 4207 && str[n + 1] == KS_EXTRA |
| 4208 && str[n + 2] == (int)KE_CSI) | |
| 4209 { | |
| 4210 buf[m++] = CSI; | |
| 4211 n += 2; | |
| 4212 } | |
| 4213 else if (str[n] == K_SPECIAL | |
| 4214 # ifdef FEAT_GUI | |
| 4215 || str[n] == CSI | |
| 4216 # endif | |
| 4217 ) | |
| 4218 break; /* a special key can't be a multibyte char */ | |
| 4219 else | |
| 4220 buf[m++] = str[n]; | |
| 4221 buf[m] = NUL; | |
| 4222 | |
| 4223 /* Return a multi-byte character if it's found. An illegal sequence | |
| 4224 * will result in a 1 here. */ | |
| 474 | 4225 if ((*mb_ptr2len)(buf) > 1) |
| 7 | 4226 { |
| 4227 *pp = str + n + 1; | |
| 4228 return buf; | |
| 4229 } | |
| 3812 | 4230 |
| 4231 /* Bail out quickly for ASCII. */ | |
| 4232 if (buf[0] < 128) | |
| 4233 break; | |
| 7 | 4234 } |
| 4235 return NULL; | |
| 4236 } | |
| 4237 | |
| 4238 /* | |
| 4239 * Return TRUE if the character at "row"/"col" on the screen is the left side | |
| 4240 * of a double-width character. | |
| 4241 * Caller must make sure "row" and "col" are not invalid! | |
| 4242 */ | |
| 4243 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4244 mb_lefthalve(int row, int col) |
| 7 | 4245 { |
| 4246 #ifdef FEAT_HANGULIN | |
| 4247 if (composing_hangul) | |
| 4248 return TRUE; | |
| 4249 #endif | |
| 1378 | 4250 return (*mb_off2cells)(LineOffset[row] + col, |
| 4251 LineOffset[row] + screen_Columns) > 1; | |
| 7 | 4252 } |
| 4253 | |
| 4254 /* | |
| 1698 | 4255 * Correct a position on the screen, if it's the right half of a double-wide |
| 4256 * char move it to the left half. Returns the corrected column. | |
| 7 | 4257 */ |
| 4258 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4259 mb_fix_col(int col, int row) |
| 7 | 4260 { |
| 4261 col = check_col(col); | |
| 4262 row = check_row(row); | |
| 4263 if (has_mbyte && ScreenLines != NULL && col > 0 | |
| 4264 && ((enc_dbcs | |
| 4265 && ScreenLines[LineOffset[row] + col] != NUL | |
| 4266 && dbcs_screen_head_off(ScreenLines + LineOffset[row], | |
| 4267 ScreenLines + LineOffset[row] + col)) | |
| 4268 || (enc_utf8 && ScreenLines[LineOffset[row] + col] == 0))) | |
| 1620 | 4269 return col - 1; |
| 7 | 4270 return col; |
| 4271 } | |
| 4272 #endif | |
| 4273 | |
| 4274 #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
|
4275 static int enc_alias_search(char_u *name); |
| 7 | 4276 |
| 4277 /* | |
| 4278 * Skip the Vim specific head of a 'encoding' name. | |
| 4279 */ | |
| 4280 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4281 enc_skip(char_u *p) |
| 7 | 4282 { |
| 4283 if (STRNCMP(p, "2byte-", 6) == 0) | |
| 4284 return p + 6; | |
| 4285 if (STRNCMP(p, "8bit-", 5) == 0) | |
| 4286 return p + 5; | |
| 4287 return p; | |
| 4288 } | |
| 4289 | |
| 4290 /* | |
| 4291 * Find the canonical name for encoding "enc". | |
| 4292 * When the name isn't recognized, returns "enc" itself, but with all lower | |
| 4293 * case characters and '_' replaced with '-'. | |
| 4294 * Returns an allocated string. NULL for out-of-memory. | |
| 4295 */ | |
| 4296 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4297 enc_canonize(char_u *enc) |
| 7 | 4298 { |
| 4299 char_u *r; | |
| 4300 char_u *p, *s; | |
| 4301 int i; | |
| 4302 | |
| 39 | 4303 # ifdef FEAT_MBYTE |
| 4304 if (STRCMP(enc, "default") == 0) | |
| 4305 { | |
| 4306 /* Use the default encoding as it's found by set_init_1(). */ | |
| 4307 r = get_encoding_default(); | |
| 4308 if (r == NULL) | |
| 4309 r = (char_u *)"latin1"; | |
| 4310 return vim_strsave(r); | |
| 4311 } | |
| 4312 # endif | |
| 4313 | |
| 1205 | 4314 /* copy "enc" to allocated memory, with room for two '-' */ |
| 7 | 4315 r = alloc((unsigned)(STRLEN(enc) + 3)); |
| 4316 if (r != NULL) | |
| 4317 { | |
| 4318 /* Make it all lower case and replace '_' with '-'. */ | |
| 4319 p = r; | |
| 4320 for (s = enc; *s != NUL; ++s) | |
| 4321 { | |
| 4322 if (*s == '_') | |
| 4323 *p++ = '-'; | |
| 4324 else | |
| 4325 *p++ = TOLOWER_ASC(*s); | |
| 4326 } | |
| 4327 *p = NUL; | |
| 4328 | |
| 4329 /* Skip "2byte-" and "8bit-". */ | |
| 4330 p = enc_skip(r); | |
| 4331 | |
| 481 | 4332 /* Change "microsoft-cp" to "cp". Used in some spell files. */ |
| 4333 if (STRNCMP(p, "microsoft-cp", 12) == 0) | |
| 1620 | 4334 STRMOVE(p, p + 10); |
| 481 | 4335 |
| 7 | 4336 /* "iso8859" -> "iso-8859" */ |
| 4337 if (STRNCMP(p, "iso8859", 7) == 0) | |
| 4338 { | |
| 1620 | 4339 STRMOVE(p + 4, p + 3); |
| 7 | 4340 p[3] = '-'; |
| 4341 } | |
| 4342 | |
| 4343 /* "iso-8859n" -> "iso-8859-n" */ | |
| 4344 if (STRNCMP(p, "iso-8859", 8) == 0 && p[8] != '-') | |
| 4345 { | |
| 1620 | 4346 STRMOVE(p + 9, p + 8); |
| 7 | 4347 p[8] = '-'; |
| 4348 } | |
| 4349 | |
| 4350 /* "latin-N" -> "latinN" */ | |
| 4351 if (STRNCMP(p, "latin-", 6) == 0) | |
| 1620 | 4352 STRMOVE(p + 5, p + 6); |
| 7 | 4353 |
| 4354 if (enc_canon_search(p) >= 0) | |
| 4355 { | |
| 4356 /* canonical name can be used unmodified */ | |
| 4357 if (p != r) | |
| 1620 | 4358 STRMOVE(r, p); |
| 7 | 4359 } |
| 4360 else if ((i = enc_alias_search(p)) >= 0) | |
| 4361 { | |
| 4362 /* alias recognized, get canonical name */ | |
| 4363 vim_free(r); | |
| 4364 r = vim_strsave((char_u *)enc_canon_table[i].name); | |
| 4365 } | |
| 4366 } | |
| 4367 return r; | |
| 4368 } | |
| 4369 | |
| 4370 /* | |
| 4371 * Search for an encoding alias of "name". | |
| 4372 * Returns -1 when not found. | |
| 4373 */ | |
| 4374 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4375 enc_alias_search(char_u *name) |
| 7 | 4376 { |
| 4377 int i; | |
| 4378 | |
| 4379 for (i = 0; enc_alias_table[i].name != NULL; ++i) | |
| 4380 if (STRCMP(name, enc_alias_table[i].name) == 0) | |
| 4381 return enc_alias_table[i].canon; | |
| 4382 return -1; | |
| 4383 } | |
| 4384 #endif | |
| 4385 | |
| 4386 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 4387 | |
| 4388 #ifdef HAVE_LANGINFO_H | |
| 4389 # include <langinfo.h> | |
| 4390 #endif | |
| 4391 | |
| 4392 /* | |
| 4393 * Get the canonicalized encoding of the current locale. | |
| 4394 * Returns an allocated string when successful, NULL when not. | |
| 4395 */ | |
| 4396 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4397 enc_locale(void) |
| 7 | 4398 { |
| 4399 #ifndef WIN3264 | |
| 4400 char *s; | |
| 4401 char *p; | |
| 4402 int i; | |
| 4403 #endif | |
| 4404 char buf[50]; | |
| 4405 #ifdef WIN3264 | |
| 4406 long acp = GetACP(); | |
| 4407 | |
| 4408 if (acp == 1200) | |
| 4409 STRCPY(buf, "ucs-2le"); | |
| 407 | 4410 else if (acp == 1252) /* cp1252 is used as latin1 */ |
| 7 | 4411 STRCPY(buf, "latin1"); |
| 4412 else | |
| 4413 sprintf(buf, "cp%ld", acp); | |
| 4414 #else | |
| 4415 # ifdef HAVE_NL_LANGINFO_CODESET | |
| 4416 if ((s = nl_langinfo(CODESET)) == NULL || *s == NUL) | |
| 4417 # endif | |
| 167 | 4418 # if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
| 7 | 4419 if ((s = setlocale(LC_CTYPE, NULL)) == NULL || *s == NUL) |
| 167 | 4420 # endif |
| 7 | 4421 if ((s = getenv("LC_ALL")) == NULL || *s == NUL) |
| 4422 if ((s = getenv("LC_CTYPE")) == NULL || *s == NUL) | |
| 4423 s = getenv("LANG"); | |
| 4424 | |
| 4425 if (s == NULL || *s == NUL) | |
| 4426 return FAIL; | |
| 4427 | |
| 4428 /* The most generic locale format is: | |
| 4429 * language[_territory][.codeset][@modifier][+special][,[sponsor][_revision]] | |
| 4430 * If there is a '.' remove the part before it. | |
| 4431 * if there is something after the codeset, remove it. | |
| 4432 * Make the name lowercase and replace '_' with '-'. | |
| 4433 * Exception: "ja_JP.EUC" == "euc-jp", "zh_CN.EUC" = "euc-cn", | |
| 4434 * "ko_KR.EUC" == "euc-kr" | |
| 4435 */ | |
| 4436 if ((p = (char *)vim_strchr((char_u *)s, '.')) != NULL) | |
| 4437 { | |
| 4438 if (p > s + 2 && STRNICMP(p + 1, "EUC", 3) == 0 | |
| 4439 && !isalnum((int)p[4]) && p[4] != '-' && p[-3] == '_') | |
| 4440 { | |
| 4441 /* copy "XY.EUC" to "euc-XY" to buf[10] */ | |
| 4442 STRCPY(buf + 10, "euc-"); | |
| 4443 buf[14] = p[-2]; | |
| 4444 buf[15] = p[-1]; | |
| 4445 buf[16] = 0; | |
| 4446 s = buf + 10; | |
| 4447 } | |
| 4448 else | |
| 4449 s = p + 1; | |
| 4450 } | |
|
9495
c086632cca2e
commit https://github.com/vim/vim/commit/5498a41f5a62c3877fee0185adf3bf7245a9a547
Christian Brabandt <cb@256bit.org>
parents:
9477
diff
changeset
|
4451 for (i = 0; i < (int)sizeof(buf) - 1 && s[i] != NUL; ++i) |
| 7 | 4452 { |
| 4453 if (s[i] == '_' || s[i] == '-') | |
| 4454 buf[i] = '-'; | |
| 4455 else if (isalnum((int)s[i])) | |
| 4456 buf[i] = TOLOWER_ASC(s[i]); | |
| 4457 else | |
| 4458 break; | |
| 4459 } | |
| 4460 buf[i] = NUL; | |
| 4461 #endif | |
| 4462 | |
| 4463 return enc_canonize((char_u *)buf); | |
| 4464 } | |
| 4465 | |
| 4168 | 4466 #if defined(WIN3264) || defined(PROTO) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD) |
| 7 | 4467 /* |
| 4468 * Convert an encoding name to an MS-Windows codepage. | |
| 4469 * Returns zero if no codepage can be figured out. | |
| 4470 */ | |
| 4471 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4472 encname2codepage(char_u *name) |
| 7 | 4473 { |
| 4474 int cp; | |
| 4475 char_u *p = name; | |
| 4476 int idx; | |
| 4477 | |
| 4478 if (STRNCMP(p, "8bit-", 5) == 0) | |
| 4479 p += 5; | |
| 4480 else if (STRNCMP(p_enc, "2byte-", 6) == 0) | |
| 4481 p += 6; | |
| 4482 | |
| 4483 if (p[0] == 'c' && p[1] == 'p') | |
|
5136
28e6f5f88968
updated for version 7.3.1311
Bram Moolenaar <bram@vim.org>
parents:
5025
diff
changeset
|
4484 cp = atoi((char *)p + 2); |
| 7 | 4485 else if ((idx = enc_canon_search(p)) >= 0) |
| 4486 cp = enc_canon_table[idx].codepage; | |
| 4487 else | |
| 4488 return 0; | |
| 4489 if (IsValidCodePage(cp)) | |
| 4490 return cp; | |
| 4491 return 0; | |
| 4492 } | |
| 4493 #endif | |
| 4494 | |
| 4495 # if defined(USE_ICONV) || defined(PROTO) | |
| 4496 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
4497 static char_u *iconv_string(vimconv_T *vcp, char_u *str, int slen, int *unconvlenp, int *resultlenp); |
| 7 | 4498 |
| 4499 /* | |
| 4500 * Call iconv_open() with a check if iconv() works properly (there are broken | |
| 4501 * versions). | |
| 4502 * Returns (void *)-1 if failed. | |
| 4503 * (should return iconv_t, but that causes problems with prototypes). | |
| 4504 */ | |
| 4505 void * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4506 my_iconv_open(char_u *to, char_u *from) |
| 7 | 4507 { |
| 4508 iconv_t fd; | |
| 4509 #define ICONV_TESTLEN 400 | |
| 4510 char_u tobuf[ICONV_TESTLEN]; | |
| 4511 char *p; | |
| 4512 size_t tolen; | |
| 4513 static int iconv_ok = -1; | |
| 4514 | |
| 4515 if (iconv_ok == FALSE) | |
| 4516 return (void *)-1; /* detected a broken iconv() previously */ | |
| 4517 | |
| 4518 #ifdef DYNAMIC_ICONV | |
| 4519 /* Check if the iconv.dll can be found. */ | |
| 4520 if (!iconv_enabled(TRUE)) | |
| 4521 return (void *)-1; | |
| 4522 #endif | |
| 4523 | |
| 4524 fd = iconv_open((char *)enc_skip(to), (char *)enc_skip(from)); | |
| 4525 | |
| 4526 if (fd != (iconv_t)-1 && iconv_ok == -1) | |
| 4527 { | |
| 4528 /* | |
| 4529 * Do a dummy iconv() call to check if it actually works. There is a | |
| 4530 * version of iconv() on Linux that is broken. We can't ignore it, | |
| 4531 * because it's wide-spread. The symptoms are that after outputting | |
| 4532 * the initial shift state the "to" pointer is NULL and conversion | |
| 4533 * stops for no apparent reason after about 8160 characters. | |
| 4534 */ | |
| 4535 p = (char *)tobuf; | |
| 4536 tolen = ICONV_TESTLEN; | |
| 4537 (void)iconv(fd, NULL, NULL, &p, &tolen); | |
| 4538 if (p == NULL) | |
| 4539 { | |
| 4540 iconv_ok = FALSE; | |
| 4541 iconv_close(fd); | |
| 4542 fd = (iconv_t)-1; | |
| 4543 } | |
| 4544 else | |
| 4545 iconv_ok = TRUE; | |
| 4546 } | |
| 4547 | |
| 4548 return (void *)fd; | |
| 4549 } | |
| 4550 | |
| 4551 /* | |
| 4552 * Convert the string "str[slen]" with iconv(). | |
| 4553 * If "unconvlenp" is not NULL handle the string ending in an incomplete | |
| 4554 * sequence and set "*unconvlenp" to the length of it. | |
| 4555 * Returns the converted string in allocated memory. NULL for an error. | |
| 1904 | 4556 * If resultlenp is not NULL, sets it to the result length in bytes. |
| 7 | 4557 */ |
| 4558 static char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4559 iconv_string( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4560 vimconv_T *vcp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4561 char_u *str, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4562 int slen, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4563 int *unconvlenp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4564 int *resultlenp) |
| 7 | 4565 { |
| 4566 const char *from; | |
| 4567 size_t fromlen; | |
| 4568 char *to; | |
| 4569 size_t tolen; | |
| 4570 size_t len = 0; | |
| 4571 size_t done = 0; | |
| 4572 char_u *result = NULL; | |
| 4573 char_u *p; | |
| 4574 int l; | |
| 4575 | |
| 4576 from = (char *)str; | |
| 4577 fromlen = slen; | |
| 4578 for (;;) | |
| 4579 { | |
| 4580 if (len == 0 || ICONV_ERRNO == ICONV_E2BIG) | |
| 4581 { | |
| 4582 /* Allocate enough room for most conversions. When re-allocating | |
| 4583 * increase the buffer size. */ | |
| 4584 len = len + fromlen * 2 + 40; | |
| 4585 p = alloc((unsigned)len); | |
| 4586 if (p != NULL && done > 0) | |
| 4587 mch_memmove(p, result, done); | |
| 4588 vim_free(result); | |
| 4589 result = p; | |
| 4590 if (result == NULL) /* out of memory */ | |
| 4591 break; | |
| 4592 } | |
| 4593 | |
| 4594 to = (char *)result + done; | |
| 4595 tolen = len - done - 2; | |
| 4596 /* Avoid a warning for systems with a wrong iconv() prototype by | |
| 4597 * casting the second argument to void *. */ | |
| 4598 if (iconv(vcp->vc_fd, (void *)&from, &fromlen, &to, &tolen) | |
| 4599 != (size_t)-1) | |
| 4600 { | |
| 4601 /* Finished, append a NUL. */ | |
| 4602 *to = NUL; | |
| 4603 break; | |
| 4604 } | |
| 4605 | |
| 4606 /* Check both ICONV_EINVAL and EINVAL, because the dynamically loaded | |
| 4607 * iconv library may use one of them. */ | |
| 4608 if (!vcp->vc_fail && unconvlenp != NULL | |
| 4609 && (ICONV_ERRNO == ICONV_EINVAL || ICONV_ERRNO == EINVAL)) | |
| 4610 { | |
| 4611 /* Handle an incomplete sequence at the end. */ | |
| 4612 *to = NUL; | |
| 835 | 4613 *unconvlenp = (int)fromlen; |
| 7 | 4614 break; |
| 4615 } | |
| 4616 | |
| 4617 /* Check both ICONV_EILSEQ and EILSEQ, because the dynamically loaded | |
| 4618 * iconv library may use one of them. */ | |
| 4619 else if (!vcp->vc_fail | |
| 4620 && (ICONV_ERRNO == ICONV_EILSEQ || ICONV_ERRNO == EILSEQ | |
| 4621 || ICONV_ERRNO == ICONV_EINVAL || ICONV_ERRNO == EINVAL)) | |
| 4622 { | |
| 4623 /* Can't convert: insert a '?' and skip a character. This assumes | |
| 4624 * conversion from 'encoding' to something else. In other | |
| 4625 * situations we don't know what to skip anyway. */ | |
| 4626 *to++ = '?'; | |
| 4627 if ((*mb_ptr2cells)((char_u *)from) > 1) | |
| 4628 *to++ = '?'; | |
| 221 | 4629 if (enc_utf8) |
| 835 | 4630 l = utfc_ptr2len_len((char_u *)from, (int)fromlen); |
| 221 | 4631 else |
| 4632 { | |
| 474 | 4633 l = (*mb_ptr2len)((char_u *)from); |
| 227 | 4634 if (l > (int)fromlen) |
| 835 | 4635 l = (int)fromlen; |
| 221 | 4636 } |
| 7 | 4637 from += l; |
| 4638 fromlen -= l; | |
| 4639 } | |
| 4640 else if (ICONV_ERRNO != ICONV_E2BIG) | |
| 4641 { | |
| 4642 /* conversion failed */ | |
| 4643 vim_free(result); | |
| 4644 result = NULL; | |
| 4645 break; | |
| 4646 } | |
| 4647 /* Not enough room or skipping illegal sequence. */ | |
| 4648 done = to - (char *)result; | |
| 4649 } | |
| 1904 | 4650 |
| 2766 | 4651 if (resultlenp != NULL && result != NULL) |
| 1904 | 4652 *resultlenp = (int)(to - (char *)result); |
| 7 | 4653 return result; |
| 4654 } | |
| 4655 | |
| 4656 # if defined(DYNAMIC_ICONV) || defined(PROTO) | |
| 4657 /* | |
| 4658 * Dynamically load the "iconv.dll" on Win32. | |
| 4659 */ | |
| 4660 | |
|
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4661 # 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
|
4662 # define HINSTANCE int |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4663 # endif |
| 297 | 4664 static HINSTANCE hIconvDLL = 0; |
| 4665 static HINSTANCE hMsvcrtDLL = 0; | |
| 7 | 4666 |
|
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4667 # ifndef DYNAMIC_ICONV_DLL |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4668 # define DYNAMIC_ICONV_DLL "iconv.dll" |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4669 # 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
|
4670 # 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
|
4671 # 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
|
4672 # endif |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4673 # ifndef DYNAMIC_MSVCRT_DLL |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4674 # define DYNAMIC_MSVCRT_DLL "msvcrt.dll" |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4675 # endif |
| 7 | 4676 |
| 4677 /* | |
| 4678 * Try opening the iconv.dll and return TRUE if iconv() can be used. | |
| 4679 */ | |
| 4680 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4681 iconv_enabled(int verbose) |
| 7 | 4682 { |
| 4683 if (hIconvDLL != 0 && hMsvcrtDLL != 0) | |
| 4684 return TRUE; | |
|
7162
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4685 |
|
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4686 /* 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
|
4687 * 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
|
4688 #ifdef DYNAMIC_ICONV_DLL_ALT2 |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4689 if (hIconvDLL == 0) |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4690 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT2); |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4691 #endif |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4692 #ifdef DYNAMIC_ICONV_DLL_ALT3 |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4693 if (hIconvDLL == 0) |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4694 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT3); |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4695 #endif |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4696 if (hIconvDLL == 0) |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4697 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL); |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4698 #ifdef DYNAMIC_ICONV_DLL_ALT1 |
|
7162
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4699 if (hIconvDLL == 0) |
|
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4700 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
|
4701 #endif |
|
7162
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4702 |
| 7 | 4703 if (hIconvDLL != 0) |
| 2612 | 4704 hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL); |
| 7 | 4705 if (hIconvDLL == 0 || hMsvcrtDLL == 0) |
| 4706 { | |
| 4707 /* Only give the message when 'verbose' is set, otherwise it might be | |
| 4708 * done whenever a conversion is attempted. */ | |
| 4709 if (verbose && p_verbose > 0) | |
| 292 | 4710 { |
| 4711 verbose_enter(); | |
| 7 | 4712 EMSG2(_(e_loadlib), |
| 4713 hIconvDLL == 0 ? DYNAMIC_ICONV_DLL : DYNAMIC_MSVCRT_DLL); | |
| 292 | 4714 verbose_leave(); |
| 4715 } | |
| 7 | 4716 iconv_end(); |
| 4717 return FALSE; | |
| 4718 } | |
| 4719 | |
| 344 | 4720 iconv = (void *)GetProcAddress(hIconvDLL, "libiconv"); |
| 4721 iconv_open = (void *)GetProcAddress(hIconvDLL, "libiconv_open"); | |
| 4722 iconv_close = (void *)GetProcAddress(hIconvDLL, "libiconv_close"); | |
| 4723 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
|
4724 iconv_errno = get_dll_import_func(hIconvDLL, "_errno"); |
| 4025 | 4725 if (iconv_errno == NULL) |
| 4726 iconv_errno = (void *)GetProcAddress(hMsvcrtDLL, "_errno"); | |
| 7 | 4727 if (iconv == NULL || iconv_open == NULL || iconv_close == NULL |
| 4728 || iconvctl == NULL || iconv_errno == NULL) | |
| 4729 { | |
| 4730 iconv_end(); | |
| 4731 if (verbose && p_verbose > 0) | |
| 292 | 4732 { |
| 4733 verbose_enter(); | |
| 7 | 4734 EMSG2(_(e_loadfunc), "for libiconv"); |
| 292 | 4735 verbose_leave(); |
| 4736 } | |
| 7 | 4737 return FALSE; |
| 4738 } | |
| 4739 return TRUE; | |
| 4740 } | |
| 4741 | |
| 4742 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4743 iconv_end(void) |
| 7 | 4744 { |
| 4745 /* Don't use iconv() when inputting or outputting characters. */ | |
| 4746 if (input_conv.vc_type == CONV_ICONV) | |
| 4747 convert_setup(&input_conv, NULL, NULL); | |
| 4748 if (output_conv.vc_type == CONV_ICONV) | |
| 4749 convert_setup(&output_conv, NULL, NULL); | |
| 4750 | |
| 4751 if (hIconvDLL != 0) | |
| 4752 FreeLibrary(hIconvDLL); | |
| 4753 if (hMsvcrtDLL != 0) | |
| 4754 FreeLibrary(hMsvcrtDLL); | |
| 4755 hIconvDLL = 0; | |
| 4756 hMsvcrtDLL = 0; | |
| 4757 } | |
| 4758 # endif /* DYNAMIC_ICONV */ | |
| 4759 # endif /* USE_ICONV */ | |
| 4760 | |
| 4761 #endif /* FEAT_MBYTE */ | |
| 4762 | |
| 4763 #if defined(FEAT_XIM) || defined(PROTO) | |
| 4764 | |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
4765 # if defined(FEAT_GUI_GTK) || defined(PROTO) |
| 7 | 4766 static int xim_has_preediting INIT(= FALSE); /* IM current status */ |
| 4767 | |
| 4768 /* | |
| 4769 * Set preedit_start_col to the current cursor position. | |
| 4770 */ | |
| 4771 static void | |
| 4772 init_preedit_start_col(void) | |
| 4773 { | |
| 4774 if (State & CMDLINE) | |
| 4775 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
|
4776 else if (curwin != NULL && curwin->w_buffer != NULL) |
| 7 | 4777 getvcol(curwin, &curwin->w_cursor, &preedit_start_col, NULL, NULL); |
| 4778 /* Prevent that preediting marks the buffer as changed. */ | |
| 4779 xim_changed_while_preediting = curbuf->b_changed; | |
| 4780 } | |
| 4781 | |
| 4782 static int im_is_active = FALSE; /* IM is enabled for current mode */ | |
| 1668 | 4783 static int preedit_is_active = FALSE; |
| 7 | 4784 static int im_preedit_cursor = 0; /* cursor offset in characters */ |
| 4785 static int im_preedit_trailing = 0; /* number of characters after cursor */ | |
| 4786 | |
| 4787 static unsigned long im_commit_handler_id = 0; | |
| 4788 static unsigned int im_activatekey_keyval = GDK_VoidSymbol; | |
| 4789 static unsigned int im_activatekey_state = 0; | |
| 4790 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4791 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
|
4792 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
|
4793 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4794 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
|
4795 |
| 7 | 4796 void |
| 4797 im_set_active(int active) | |
| 4798 { | |
| 4799 int was_active; | |
| 4800 | |
|
5008
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4801 was_active = !!im_get_status(); |
| 7 | 4802 im_is_active = (active && !p_imdisable); |
| 4803 | |
| 4804 if (im_is_active != was_active) | |
| 4805 xim_reset(); | |
| 4806 } | |
| 4807 | |
| 4808 void | |
| 4809 xim_set_focus(int focus) | |
| 4810 { | |
| 4811 if (xic != NULL) | |
| 4812 { | |
| 4813 if (focus) | |
| 4814 gtk_im_context_focus_in(xic); | |
| 4815 else | |
| 4816 gtk_im_context_focus_out(xic); | |
| 4817 } | |
| 4818 } | |
| 4819 | |
| 4820 void | |
| 4821 im_set_position(int row, int col) | |
| 4822 { | |
| 4823 if (xic != NULL) | |
| 4824 { | |
| 4825 GdkRectangle area; | |
| 4826 | |
| 4827 area.x = FILL_X(col); | |
| 4828 area.y = FILL_Y(row); | |
| 4829 area.width = gui.char_width * (mb_lefthalve(row, col) ? 2 : 1); | |
| 4830 area.height = gui.char_height; | |
| 4831 | |
| 4832 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
|
4833 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4834 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
|
4835 im_preedit_window_set_position(); |
| 7 | 4836 } |
| 4837 } | |
| 4838 | |
| 4839 # if 0 || defined(PROTO) /* apparently only used in gui_x11.c */ | |
| 4840 void | |
| 4841 xim_set_preedit(void) | |
| 4842 { | |
| 4843 im_set_position(gui.row, gui.col); | |
| 4844 } | |
| 4845 # endif | |
| 4846 | |
| 4847 static void | |
| 4848 im_add_to_input(char_u *str, int len) | |
| 4849 { | |
| 4850 /* Convert from 'termencoding' (always "utf-8") to 'encoding' */ | |
| 4851 if (input_conv.vc_type != CONV_NONE) | |
| 4852 { | |
| 4853 str = string_convert(&input_conv, str, &len); | |
| 4854 g_return_if_fail(str != NULL); | |
| 4855 } | |
| 4856 | |
| 4857 add_to_input_buf_csi(str, len); | |
| 4858 | |
| 4859 if (input_conv.vc_type != CONV_NONE) | |
| 4860 vim_free(str); | |
| 4861 | |
| 4862 if (p_mh) /* blank out the pointer if necessary */ | |
| 4863 gui_mch_mousehide(TRUE); | |
| 4864 } | |
| 4865 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4866 static void |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4867 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
|
4868 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4869 int x, y, w, h, sw, sh; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4870 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4871 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
|
4872 return; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4873 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4874 sw = gdk_screen_get_width(gtk_widget_get_screen(preedit_window)); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4875 sh = gdk_screen_get_height(gtk_widget_get_screen(preedit_window)); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4876 #if GTK_CHECK_VERSION(3,0,0) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4877 gdk_window_get_origin(gtk_widget_get_window(gui.drawarea), &x, &y); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4878 #else |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4879 gdk_window_get_origin(gui.drawarea->window, &x, &y); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4880 #endif |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4881 gtk_window_get_size(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
|
4882 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
|
4883 y = y + FILL_Y(gui.row); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4884 if (x + w > sw) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4885 x = sw - w; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4886 if (y + h > sh) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4887 y = sh - h; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4888 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
|
4889 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4890 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4891 static void |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4892 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
|
4893 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4894 char *preedit_string; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4895 char buf[8]; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4896 PangoAttrList *attr_list; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4897 PangoLayout *layout; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4898 GdkColor color; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4899 gint w, h; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4900 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4901 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
|
4902 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4903 preedit_window = gtk_window_new(GTK_WINDOW_POPUP); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4904 preedit_label = gtk_label_new(""); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4905 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
|
4906 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4907 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4908 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
|
4909 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4910 vim_snprintf(buf, sizeof(buf), "#%06X", gui.norm_pixel); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4911 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
|
4912 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
|
4913 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4914 vim_snprintf(buf, sizeof(buf), "#%06X", gui.back_pixel); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4915 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
|
4916 gtk_widget_modify_bg(preedit_window, 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
|
4917 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4918 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
|
4919 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4920 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
|
4921 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4922 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
|
4923 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
|
4924 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4925 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
|
4926 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
|
4927 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
|
4928 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
|
4929 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4930 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
|
4931 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4932 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
|
4933 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4934 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4935 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
|
4936 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
|
4937 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4938 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4939 static void |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4940 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
|
4941 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4942 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
|
4943 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
|
4944 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4945 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4946 static void |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4947 im_show_preedit() |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4948 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4949 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
|
4950 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4951 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
|
4952 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
|
4953 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4954 |
| 7 | 4955 static void |
| 4956 im_delete_preedit(void) | |
| 4957 { | |
| 4958 char_u bskey[] = {CSI, 'k', 'b'}; | |
| 4959 char_u delkey[] = {CSI, 'k', 'D'}; | |
| 4960 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4961 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
|
4962 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4963 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
|
4964 return; |
|
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 |
| 7 | 4967 if (State & NORMAL) |
| 4968 { | |
| 4969 im_preedit_cursor = 0; | |
| 4970 return; | |
| 4971 } | |
| 4972 for (; im_preedit_cursor > 0; --im_preedit_cursor) | |
| 4973 add_to_input_buf(bskey, (int)sizeof(bskey)); | |
| 4974 | |
| 4975 for (; im_preedit_trailing > 0; --im_preedit_trailing) | |
| 4976 add_to_input_buf(delkey, (int)sizeof(delkey)); | |
| 4977 } | |
| 4978 | |
| 941 | 4979 /* |
| 4980 * Move the cursor left by "num_move_back" characters. | |
| 4981 * Note that ins_left() checks im_is_preediting() to avoid breaking undo for | |
| 4982 * these K_LEFT keys. | |
| 4983 */ | |
| 7 | 4984 static void |
| 4985 im_correct_cursor(int num_move_back) | |
| 4986 { | |
| 4987 char_u backkey[] = {CSI, 'k', 'l'}; | |
| 4988 | |
| 4989 if (State & NORMAL) | |
| 4990 return; | |
| 4991 # ifdef FEAT_RIGHTLEFT | |
| 4992 if ((State & CMDLINE) == 0 && curwin != NULL && curwin->w_p_rl) | |
| 4993 backkey[2] = 'r'; | |
| 4994 # endif | |
| 4995 for (; num_move_back > 0; --num_move_back) | |
| 4996 add_to_input_buf(backkey, (int)sizeof(backkey)); | |
| 4997 } | |
| 4998 | |
| 4999 static int xim_expected_char = NUL; | |
| 5000 static int xim_ignored_char = FALSE; | |
| 5001 | |
| 5002 /* | |
| 5003 * Update the mode and cursor while in an IM callback. | |
| 5004 */ | |
| 5005 static void | |
| 5006 im_show_info(void) | |
| 5007 { | |
| 5008 int old_vgetc_busy; | |
| 822 | 5009 |
| 7 | 5010 old_vgetc_busy = vgetc_busy; |
| 5011 vgetc_busy = TRUE; | |
| 5012 showmode(); | |
| 5013 vgetc_busy = old_vgetc_busy; | |
| 3402 | 5014 if ((State & NORMAL) || (State & INSERT)) |
| 5015 setcursor(); | |
| 7 | 5016 out_flush(); |
| 5017 } | |
| 5018 | |
| 5019 /* | |
| 5020 * Callback invoked when the user finished preediting. | |
| 5021 * Put the final string into the input buffer. | |
| 5022 */ | |
| 5023 static void | |
| 1883 | 5024 im_commit_cb(GtkIMContext *context UNUSED, |
| 5025 const gchar *str, | |
| 5026 gpointer data UNUSED) | |
| 7 | 5027 { |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5028 int slen = (int)STRLEN(str); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5029 int add_to_input = TRUE; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5030 int clen; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5031 int len = slen; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5032 int commit_with_preedit = TRUE; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5033 char_u *im_str; |
| 7 | 5034 |
| 5035 #ifdef XIM_DEBUG | |
| 5036 xim_log("im_commit_cb(): %s\n", str); | |
| 5037 #endif | |
| 5038 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5039 if (p_imst == IM_ON_THE_SPOT) |
| 7 | 5040 { |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5041 /* 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
|
5042 * 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
|
5043 im_delete_preedit(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5044 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5045 /* 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
|
5046 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
|
5047 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5048 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
|
5049 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
|
5050 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5051 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5052 /* 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
|
5053 * "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
|
5054 * 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
|
5055 * "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
|
5056 * 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
|
5057 * 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
|
5058 * 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
|
5059 * 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
|
5060 * string. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5061 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
|
5062 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5063 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
|
5064 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
|
5065 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5066 else |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5067 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
|
5068 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5069 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
|
5070 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5071 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
|
5072 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
|
5073 preedit_start_col += clen; |
| 7 | 5074 } |
| 5075 | |
| 5076 /* Is this a single character that matches a keypad key that's just | |
| 5077 * been pressed? If so, we don't want it to be entered as such - let | |
| 5078 * us carry on processing the raw keycode so that it may be used in | |
| 5079 * mappings as <kSomething>. */ | |
| 5080 if (xim_expected_char != NUL) | |
| 5081 { | |
| 5082 /* We're currently processing a keypad or other special key */ | |
| 5083 if (slen == 1 && str[0] == xim_expected_char) | |
| 5084 { | |
| 5085 /* It's a match - don't do it here */ | |
| 5086 xim_ignored_char = TRUE; | |
| 5087 add_to_input = FALSE; | |
| 5088 } | |
| 5089 else | |
| 5090 { | |
| 5091 /* Not a match */ | |
| 5092 xim_ignored_char = FALSE; | |
| 5093 } | |
| 5094 } | |
| 5095 | |
| 5096 if (add_to_input) | |
| 5097 im_add_to_input((char_u *)str, slen); | |
| 5098 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5099 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
|
5100 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5101 /* 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
|
5102 * 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
|
5103 * marked as changed. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5104 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
|
5105 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
|
5106 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5107 /* 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
|
5108 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
|
5109 } |
| 7 | 5110 |
| 5111 if (gtk_main_level() > 0) | |
| 5112 gtk_main_quit(); | |
| 5113 } | |
| 5114 | |
| 5115 /* | |
| 5116 * Callback invoked after start to the preedit. | |
| 5117 */ | |
| 5118 static void | |
| 1883 | 5119 im_preedit_start_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) |
| 7 | 5120 { |
| 5121 #ifdef XIM_DEBUG | |
| 5122 xim_log("im_preedit_start_cb()\n"); | |
| 5123 #endif | |
| 5124 | |
| 5125 im_is_active = TRUE; | |
| 1668 | 5126 preedit_is_active = TRUE; |
| 7 | 5127 gui_update_cursor(TRUE, FALSE); |
| 1668 | 5128 im_show_info(); |
| 7 | 5129 } |
| 5130 | |
| 5131 /* | |
| 5132 * Callback invoked after end to the preedit. | |
| 5133 */ | |
| 5134 static void | |
| 1883 | 5135 im_preedit_end_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) |
| 7 | 5136 { |
| 5137 #ifdef XIM_DEBUG | |
| 5138 xim_log("im_preedit_end_cb()\n"); | |
| 5139 #endif | |
| 5140 im_delete_preedit(); | |
| 5141 | |
| 5142 /* 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
|
5143 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
|
5144 preedit_start_col = MAXCOL; |
| 7 | 5145 xim_has_preediting = FALSE; |
| 5146 | |
| 1620 | 5147 #if 0 |
| 5148 /* Removal of this line suggested by Takuhiro Nishioka. Fixes that IM was | |
| 1668 | 5149 * switched off unintentionally. We now use preedit_is_active (added by |
| 5150 * SungHyun Nam). */ | |
| 7 | 5151 im_is_active = FALSE; |
| 1620 | 5152 #endif |
| 1668 | 5153 preedit_is_active = FALSE; |
| 7 | 5154 gui_update_cursor(TRUE, FALSE); |
| 5155 im_show_info(); | |
| 5156 } | |
| 5157 | |
| 5158 /* | |
| 5159 * Callback invoked after changes to the preedit string. If the preedit | |
| 5160 * string was empty before, remember the preedit start column so we know | |
| 5161 * where to apply feedback attributes. Delete the previous preedit string | |
| 5162 * if there was one, save the new preedit cursor offset, and put the new | |
| 5163 * string into the input buffer. | |
| 5164 * | |
| 5165 * TODO: The pragmatic "put into input buffer" approach used here has | |
| 5166 * several fundamental problems: | |
| 5167 * | |
| 5168 * - The characters in the preedit string are subject to remapping. | |
| 5169 * That's broken, only the finally committed string should be remapped. | |
| 5170 * | |
| 5171 * - There is a race condition involved: The retrieved value for the | |
| 5172 * current cursor position will be wrong if any unprocessed characters | |
| 5173 * are still queued in the input buffer. | |
| 5174 * | |
| 5175 * - Due to the lack of synchronization between the file buffer in memory | |
| 5176 * and any typed characters, it's practically impossible to implement the | |
| 5177 * "retrieve_surrounding" and "delete_surrounding" signals reliably. IM | |
| 5178 * modules for languages such as Thai are likely to rely on this feature | |
| 5179 * for proper operation. | |
| 5180 * | |
| 5181 * Conclusions: I think support for preediting needs to be moved to the | |
| 5182 * core parts of Vim. Ideally, until it has been committed, the preediting | |
| 5183 * string should only be displayed and not affect the buffer content at all. | |
| 5184 * The question how to deal with the synchronization issue still remains. | |
| 5185 * Circumventing the input buffer is probably not desirable. Anyway, I think | |
| 5186 * implementing "retrieve_surrounding" is the only hard problem. | |
| 5187 * | |
| 5188 * One way to solve all of this in a clean manner would be to queue all key | |
| 5189 * press/release events "as is" in the input buffer, and apply the IM filtering | |
| 5190 * at the receiving end of the queue. This, however, would have a rather large | |
| 5191 * impact on the code base. If there is an easy way to force processing of all | |
| 5192 * remaining input from within the "retrieve_surrounding" signal handler, this | |
| 5193 * might not be necessary. Gotta ask on vim-dev for opinions. | |
| 5194 */ | |
| 5195 static void | |
| 1883 | 5196 im_preedit_changed_cb(GtkIMContext *context, gpointer data UNUSED) |
| 7 | 5197 { |
| 5198 char *preedit_string = NULL; | |
| 5199 int cursor_index = 0; | |
| 5200 int num_move_back = 0; | |
| 5201 char_u *str; | |
| 5202 char_u *p; | |
| 5203 int i; | |
| 5204 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5205 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
|
5206 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
|
5207 &preedit_string, NULL, |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5208 &cursor_index); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5209 else |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5210 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
|
5211 &preedit_string, NULL, |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5212 NULL); |
| 7 | 5213 |
| 5214 #ifdef XIM_DEBUG | |
| 5215 xim_log("im_preedit_changed_cb(): %s\n", preedit_string); | |
| 5216 #endif | |
| 5217 | |
| 5218 g_return_if_fail(preedit_string != NULL); /* just in case */ | |
| 5219 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5220 if (p_imst == IM_OVER_THE_SPOT) |
| 7 | 5221 { |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5222 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
|
5223 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5224 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
|
5225 im_delete_preedit(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5226 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5227 else |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5228 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5229 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
|
5230 im_show_preedit(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5231 } |
| 7 | 5232 } |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5233 else |
| 7 | 5234 { |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5235 /* 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
|
5236 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
|
5237 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5238 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
|
5239 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5240 /* 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
|
5241 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
|
5242 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5243 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
|
5244 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5245 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
|
5246 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5247 /* 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
|
5248 * 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
|
5249 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
|
5250 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5251 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5252 im_delete_preedit(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5253 |
| 7 | 5254 /* |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5255 * 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
|
5256 * 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
|
5257 * 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
|
5258 * 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
|
5259 * and the GTK+ source code agrees with me. Will file a bug later. |
| 7 | 5260 */ |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5261 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
|
5262 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
|
5263 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
|
5264 for (p = str, i = 0; *p != NUL; p += utf_byte2len(*p), ++i) |
| 7 | 5265 { |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5266 int is_composing; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5267 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5268 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
|
5269 /* |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5270 * 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
|
5271 * 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
|
5272 * 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
|
5273 */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5274 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
|
5275 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5276 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
|
5277 ++im_preedit_cursor; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5278 else |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5279 ++im_preedit_trailing; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5280 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5281 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
|
5282 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5283 /* 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
|
5284 * 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
|
5285 ++num_move_back; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5286 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5287 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
|
5288 preedit_end_col += utf_ptr2cells(p); |
| 7 | 5289 } |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5290 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5291 if (p > str) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5292 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5293 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
|
5294 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
|
5295 } |
| 7 | 5296 } |
| 5297 | |
| 5298 g_free(preedit_string); | |
| 5299 | |
| 5300 if (gtk_main_level() > 0) | |
| 5301 gtk_main_quit(); | |
| 5302 } | |
| 5303 | |
| 5304 /* | |
| 5305 * Translate the Pango attributes at iter to Vim highlighting attributes. | |
| 5306 * Ignore attributes not supported by Vim highlighting. This shouldn't have | |
| 5307 * too much impact -- right now we handle even more attributes than necessary | |
| 5308 * for the IM modules I tested with. | |
| 5309 */ | |
| 5310 static int | |
| 5311 translate_pango_attributes(PangoAttrIterator *iter) | |
| 5312 { | |
| 5313 PangoAttribute *attr; | |
| 5314 int char_attr = HL_NORMAL; | |
| 5315 | |
| 5316 attr = pango_attr_iterator_get(iter, PANGO_ATTR_UNDERLINE); | |
| 5317 if (attr != NULL && ((PangoAttrInt *)attr)->value | |
| 5318 != (int)PANGO_UNDERLINE_NONE) | |
| 5319 char_attr |= HL_UNDERLINE; | |
| 5320 | |
| 5321 attr = pango_attr_iterator_get(iter, PANGO_ATTR_WEIGHT); | |
| 5322 if (attr != NULL && ((PangoAttrInt *)attr)->value >= (int)PANGO_WEIGHT_BOLD) | |
| 5323 char_attr |= HL_BOLD; | |
| 5324 | |
| 5325 attr = pango_attr_iterator_get(iter, PANGO_ATTR_STYLE); | |
| 5326 if (attr != NULL && ((PangoAttrInt *)attr)->value | |
| 5327 != (int)PANGO_STYLE_NORMAL) | |
| 5328 char_attr |= HL_ITALIC; | |
| 5329 | |
| 5330 attr = pango_attr_iterator_get(iter, PANGO_ATTR_BACKGROUND); | |
| 5331 if (attr != NULL) | |
| 5332 { | |
| 5333 const PangoColor *color = &((PangoAttrColor *)attr)->color; | |
| 5334 | |
| 5335 /* Assume inverse if black background is requested */ | |
| 5336 if ((color->red | color->green | color->blue) == 0) | |
| 5337 char_attr |= HL_INVERSE; | |
| 5338 } | |
| 5339 | |
| 5340 return char_attr; | |
| 5341 } | |
| 5342 | |
| 5343 /* | |
| 5344 * Retrieve the highlighting attributes at column col in the preedit string. | |
| 5345 * Return -1 if not in preediting mode or if col is out of range. | |
| 5346 */ | |
| 5347 int | |
| 5348 im_get_feedback_attr(int col) | |
| 5349 { | |
| 5350 char *preedit_string = NULL; | |
| 5351 PangoAttrList *attr_list = NULL; | |
| 5352 int char_attr = -1; | |
| 5353 | |
| 5354 if (xic == NULL) | |
| 5355 return char_attr; | |
| 5356 | |
| 5357 gtk_im_context_get_preedit_string(xic, &preedit_string, &attr_list, NULL); | |
| 5358 | |
| 5359 if (preedit_string != NULL && attr_list != NULL) | |
| 5360 { | |
| 944 | 5361 int idx; |
| 7 | 5362 |
| 5363 /* Get the byte index as used by PangoAttrIterator */ | |
| 944 | 5364 for (idx = 0; col > 0 && preedit_string[idx] != '\0'; --col) |
| 5365 idx += utfc_ptr2len((char_u *)preedit_string + idx); | |
| 5366 | |
| 5367 if (preedit_string[idx] != '\0') | |
| 7 | 5368 { |
| 5369 PangoAttrIterator *iter; | |
| 5370 int start, end; | |
| 5371 | |
| 5372 char_attr = HL_NORMAL; | |
| 5373 iter = pango_attr_list_get_iterator(attr_list); | |
| 5374 | |
| 5375 /* Extract all relevant attributes from the list. */ | |
| 5376 do | |
| 5377 { | |
| 5378 pango_attr_iterator_range(iter, &start, &end); | |
| 5379 | |
| 944 | 5380 if (idx >= start && idx < end) |
| 7 | 5381 char_attr |= translate_pango_attributes(iter); |
| 5382 } | |
| 5383 while (pango_attr_iterator_next(iter)); | |
| 5384 | |
| 5385 pango_attr_iterator_destroy(iter); | |
| 5386 } | |
| 5387 } | |
| 5388 | |
| 5389 if (attr_list != NULL) | |
| 5390 pango_attr_list_unref(attr_list); | |
| 5391 g_free(preedit_string); | |
| 5392 | |
| 5393 return char_attr; | |
| 5394 } | |
| 5395 | |
| 5396 void | |
| 5397 xim_init(void) | |
| 5398 { | |
| 5399 #ifdef XIM_DEBUG | |
| 5400 xim_log("xim_init()\n"); | |
| 5401 #endif | |
| 5402 | |
| 5403 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
|
5404 #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
|
5405 g_return_if_fail(gtk_widget_get_window(gui.drawarea) != NULL); |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5406 #else |
| 7 | 5407 g_return_if_fail(gui.drawarea->window != NULL); |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5408 #endif |
| 7 | 5409 |
| 5410 xic = gtk_im_multicontext_new(); | |
| 5411 g_object_ref(xic); | |
| 5412 | |
| 5413 im_commit_handler_id = g_signal_connect(G_OBJECT(xic), "commit", | |
| 5414 G_CALLBACK(&im_commit_cb), NULL); | |
| 5415 g_signal_connect(G_OBJECT(xic), "preedit_changed", | |
| 5416 G_CALLBACK(&im_preedit_changed_cb), NULL); | |
| 5417 g_signal_connect(G_OBJECT(xic), "preedit_start", | |
| 5418 G_CALLBACK(&im_preedit_start_cb), NULL); | |
| 5419 g_signal_connect(G_OBJECT(xic), "preedit_end", | |
| 5420 G_CALLBACK(&im_preedit_end_cb), NULL); | |
| 5421 | |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5422 #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
|
5423 gtk_im_context_set_client_window(xic, gtk_widget_get_window(gui.drawarea)); |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5424 #else |
| 7 | 5425 gtk_im_context_set_client_window(xic, gui.drawarea->window); |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5426 #endif |
| 7 | 5427 } |
| 5428 | |
| 5429 void | |
| 5430 im_shutdown(void) | |
| 5431 { | |
| 5432 #ifdef XIM_DEBUG | |
| 5433 xim_log("im_shutdown()\n"); | |
| 5434 #endif | |
| 5435 | |
| 5436 if (xic != NULL) | |
| 5437 { | |
| 5438 gtk_im_context_focus_out(xic); | |
| 5439 g_object_unref(xic); | |
| 5440 xic = NULL; | |
| 5441 } | |
| 5442 im_is_active = FALSE; | |
| 5443 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
|
5444 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
|
5445 preedit_start_col = MAXCOL; |
| 7 | 5446 xim_has_preediting = FALSE; |
| 5447 } | |
| 5448 | |
| 5449 /* | |
| 5450 * Convert the string argument to keyval and state for GdkEventKey. | |
| 5451 * If str is valid return TRUE, otherwise FALSE. | |
| 5452 * | |
| 5453 * See 'imactivatekey' for documentation of the format. | |
| 5454 */ | |
| 5455 static int | |
| 5456 im_string_to_keyval(const char *str, unsigned int *keyval, unsigned int *state) | |
| 5457 { | |
| 5458 const char *mods_end; | |
| 5459 unsigned tmp_keyval; | |
| 5460 unsigned tmp_state = 0; | |
| 5461 | |
| 5462 mods_end = strrchr(str, '-'); | |
| 5463 mods_end = (mods_end != NULL) ? mods_end + 1 : str; | |
| 5464 | |
| 5465 /* Parse modifier keys */ | |
| 5466 while (str < mods_end) | |
| 5467 switch (*str++) | |
| 5468 { | |
| 5469 case '-': break; | |
| 5470 case 'S': case 's': tmp_state |= (unsigned)GDK_SHIFT_MASK; break; | |
| 5471 case 'L': case 'l': tmp_state |= (unsigned)GDK_LOCK_MASK; break; | |
| 5472 case 'C': case 'c': tmp_state |= (unsigned)GDK_CONTROL_MASK;break; | |
| 5473 case '1': tmp_state |= (unsigned)GDK_MOD1_MASK; break; | |
| 5474 case '2': tmp_state |= (unsigned)GDK_MOD2_MASK; break; | |
| 5475 case '3': tmp_state |= (unsigned)GDK_MOD3_MASK; break; | |
| 5476 case '4': tmp_state |= (unsigned)GDK_MOD4_MASK; break; | |
| 5477 case '5': tmp_state |= (unsigned)GDK_MOD5_MASK; break; | |
| 5478 default: | |
| 5479 return FALSE; | |
| 5480 } | |
| 5481 | |
| 5482 tmp_keyval = gdk_keyval_from_name(str); | |
| 5483 | |
| 5484 if (tmp_keyval == 0 || tmp_keyval == GDK_VoidSymbol) | |
| 5485 return FALSE; | |
| 5486 | |
| 5487 if (keyval != NULL) | |
| 5488 *keyval = tmp_keyval; | |
| 5489 if (state != NULL) | |
| 5490 *state = tmp_state; | |
| 5491 | |
| 5492 return TRUE; | |
| 5493 } | |
| 5494 | |
| 5495 /* | |
| 5496 * Return TRUE if p_imak is valid, otherwise FALSE. As a special case, an | |
| 5497 * empty string is also regarded as valid. | |
| 5498 * | |
| 5499 * Note: The numerical key value of p_imak is cached if it was valid; thus | |
| 5500 * boldly assuming im_xim_isvalid_imactivate() will always be called whenever | |
| 5501 * 'imak' changes. This is currently the case but not obvious -- should | |
| 5502 * probably rename the function for clarity. | |
| 5503 */ | |
| 5504 int | |
| 5505 im_xim_isvalid_imactivate(void) | |
| 5506 { | |
| 5507 if (p_imak[0] == NUL) | |
| 5508 { | |
| 5509 im_activatekey_keyval = GDK_VoidSymbol; | |
| 5510 im_activatekey_state = 0; | |
| 5511 return TRUE; | |
| 5512 } | |
| 5513 | |
| 5514 return im_string_to_keyval((const char *)p_imak, | |
| 5515 &im_activatekey_keyval, | |
| 5516 &im_activatekey_state); | |
| 5517 } | |
| 5518 | |
| 5519 static void | |
| 5520 im_synthesize_keypress(unsigned int keyval, unsigned int state) | |
| 5521 { | |
| 5522 GdkEventKey *event; | |
| 5523 | |
| 5524 event = (GdkEventKey *)gdk_event_new(GDK_KEY_PRESS); | |
|
11474
621e41f6dcc2
patch 8.0.0620: checking for HAVE_GTK_MULTIHEAD is not needed
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
5525 # if GTK_CHECK_VERSION(3,0,0) |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5526 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
|
5527 /* unreffed by gdk_event_free() */ |
|
11474
621e41f6dcc2
patch 8.0.0620: checking for HAVE_GTK_MULTIHEAD is not needed
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
5528 # else |
| 7 | 5529 g_object_ref(gui.drawarea->window); /* unreffed by gdk_event_free() */ |
| 5530 # endif | |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5531 # 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
|
5532 event->window = gtk_widget_get_window(gui.drawarea); |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5533 # else |
| 7 | 5534 event->window = gui.drawarea->window; |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5535 # endif |
| 7 | 5536 event->send_event = TRUE; |
| 5537 event->time = GDK_CURRENT_TIME; | |
| 5538 event->state = state; | |
| 5539 event->keyval = keyval; | |
| 5540 event->hardware_keycode = /* needed for XIM */ | |
| 5541 XKeysymToKeycode(GDK_WINDOW_XDISPLAY(event->window), (KeySym)keyval); | |
| 5542 event->length = 0; | |
| 5543 event->string = NULL; | |
| 5544 | |
| 5545 gtk_im_context_filter_keypress(xic, event); | |
| 5546 | |
| 5547 /* For consistency, also send the corresponding release event. */ | |
| 5548 event->type = GDK_KEY_RELEASE; | |
| 5549 event->send_event = FALSE; | |
| 5550 gtk_im_context_filter_keypress(xic, event); | |
| 5551 | |
| 5552 gdk_event_free((GdkEvent *)event); | |
| 5553 } | |
| 5554 | |
| 5555 void | |
| 5556 xim_reset(void) | |
| 5557 { | |
| 5558 if (xic != NULL) | |
| 5559 { | |
| 5560 gtk_im_context_reset(xic); | |
| 5561 | |
| 5562 if (p_imdisable) | |
| 5563 im_shutdown(); | |
| 5564 else | |
| 5565 { | |
| 5566 xim_set_focus(gui.in_focus); | |
| 5567 | |
|
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5568 # ifdef FEAT_EVAL |
|
5008
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5569 if (p_imaf[0] != NUL) |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5570 { |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5571 char_u *argv[1]; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5572 |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5573 if (im_is_active) |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5574 argv[0] = (char_u *)"1"; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5575 else |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5576 argv[0] = (char_u *)"0"; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5577 (void)call_func_retnr(p_imaf, 1, argv, FALSE); |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5578 } |
|
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5579 else |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5580 # endif |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5581 if (im_activatekey_keyval != GDK_VoidSymbol) |
| 7 | 5582 { |
| 5583 if (im_is_active) | |
| 5584 { | |
| 5585 g_signal_handler_block(xic, im_commit_handler_id); | |
| 5586 im_synthesize_keypress(im_activatekey_keyval, | |
| 5587 im_activatekey_state); | |
| 5588 g_signal_handler_unblock(xic, im_commit_handler_id); | |
| 5589 } | |
| 5590 } | |
| 5591 else | |
| 5592 { | |
| 5593 im_shutdown(); | |
| 5594 xim_init(); | |
| 5595 xim_set_focus(gui.in_focus); | |
| 5596 } | |
| 5597 } | |
| 5598 } | |
| 5599 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5600 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
|
5601 preedit_start_col = MAXCOL; |
| 7 | 5602 xim_has_preediting = FALSE; |
| 5603 } | |
| 5604 | |
| 5605 int | |
| 5606 xim_queue_key_press_event(GdkEventKey *event, int down) | |
| 5607 { | |
| 5608 if (down) | |
| 5609 { | |
| 5610 /* | |
| 5611 * Workaround GTK2 XIM 'feature' that always converts keypad keys to | |
| 5612 * chars., even when not part of an IM sequence (ref. feature of | |
| 5613 * gdk/gdkkeyuni.c). | |
| 5614 * Flag any keypad keys that might represent a single char. | |
| 5615 * If this (on its own - i.e., not part of an IM sequence) is | |
| 5616 * committed while we're processing one of these keys, we can ignore | |
| 5617 * that commit and go ahead & process it ourselves. That way we can | |
| 5618 * still distinguish keypad keys for use in mappings. | |
| 1620 | 5619 * Also add GDK_space to make <S-Space> work. |
| 7 | 5620 */ |
| 5621 switch (event->keyval) | |
| 5622 { | |
| 5623 case GDK_KP_Add: xim_expected_char = '+'; break; | |
| 5624 case GDK_KP_Subtract: xim_expected_char = '-'; break; | |
| 5625 case GDK_KP_Divide: xim_expected_char = '/'; break; | |
| 5626 case GDK_KP_Multiply: xim_expected_char = '*'; break; | |
| 5627 case GDK_KP_Decimal: xim_expected_char = '.'; break; | |
| 5628 case GDK_KP_Equal: xim_expected_char = '='; break; | |
| 5629 case GDK_KP_0: xim_expected_char = '0'; break; | |
| 5630 case GDK_KP_1: xim_expected_char = '1'; break; | |
| 5631 case GDK_KP_2: xim_expected_char = '2'; break; | |
| 5632 case GDK_KP_3: xim_expected_char = '3'; break; | |
| 5633 case GDK_KP_4: xim_expected_char = '4'; break; | |
| 5634 case GDK_KP_5: xim_expected_char = '5'; break; | |
| 5635 case GDK_KP_6: xim_expected_char = '6'; break; | |
| 5636 case GDK_KP_7: xim_expected_char = '7'; break; | |
| 5637 case GDK_KP_8: xim_expected_char = '8'; break; | |
| 5638 case GDK_KP_9: xim_expected_char = '9'; break; | |
| 1620 | 5639 case GDK_space: xim_expected_char = ' '; break; |
| 7 | 5640 default: xim_expected_char = NUL; |
| 5641 } | |
| 5642 xim_ignored_char = FALSE; | |
| 5643 } | |
| 5644 | |
| 5645 /* | |
| 5646 * When typing fFtT, XIM may be activated. Thus it must pass | |
| 5647 * gtk_im_context_filter_keypress() in Normal mode. | |
| 5648 * And while doing :sh too. | |
| 5649 */ | |
| 5650 if (xic != NULL && !p_imdisable | |
| 5651 && (State & (INSERT | CMDLINE | NORMAL | EXTERNCMD)) != 0) | |
| 5652 { | |
| 5653 /* | |
| 5654 * Filter 'imactivatekey' and map it to CTRL-^. This way, Vim is | |
| 5655 * always aware of the current status of IM, and can even emulate | |
| 5656 * the activation key for modules that don't support one. | |
| 5657 */ | |
| 5658 if (event->keyval == im_activatekey_keyval | |
| 5659 && (event->state & im_activatekey_state) == im_activatekey_state) | |
| 5660 { | |
| 5661 unsigned int state_mask; | |
| 5662 | |
| 5663 /* Require the state of the 3 most used modifiers to match exactly. | |
| 5664 * Otherwise e.g. <S-C-space> would be unusable for other purposes | |
| 5665 * if the IM activate key is <S-space>. */ | |
| 5666 state_mask = im_activatekey_state; | |
| 5667 state_mask |= ((int)GDK_SHIFT_MASK | (int)GDK_CONTROL_MASK | |
| 5668 | (int)GDK_MOD1_MASK); | |
| 5669 | |
| 5670 if ((event->state & state_mask) != im_activatekey_state) | |
| 5671 return FALSE; | |
| 5672 | |
| 5673 /* Don't send it a second time on GDK_KEY_RELEASE. */ | |
| 5674 if (event->type != GDK_KEY_PRESS) | |
| 5675 return TRUE; | |
| 5676 | |
| 781 | 5677 if (map_to_exists_mode((char_u *)"", LANGMAP, FALSE)) |
| 7 | 5678 { |
| 5679 im_set_active(FALSE); | |
| 5680 | |
| 5681 /* ":lmap" mappings exists, toggle use of mappings. */ | |
| 5682 State ^= LANGMAP; | |
| 5683 if (State & LANGMAP) | |
| 5684 { | |
| 5685 curbuf->b_p_iminsert = B_IMODE_NONE; | |
| 5686 State &= ~LANGMAP; | |
| 5687 } | |
| 5688 else | |
| 5689 { | |
| 5690 curbuf->b_p_iminsert = B_IMODE_LMAP; | |
| 5691 State |= LANGMAP; | |
| 5692 } | |
| 5693 return TRUE; | |
| 5694 } | |
| 5695 | |
| 5696 return gtk_im_context_filter_keypress(xic, event); | |
| 5697 } | |
| 5698 | |
| 5699 /* Don't filter events through the IM context if IM isn't active | |
| 5700 * right now. Unlike with GTK+ 1.2 we cannot rely on the IM module | |
| 5701 * not doing anything before the activation key was sent. */ | |
| 5702 if (im_activatekey_keyval == GDK_VoidSymbol || im_is_active) | |
| 5703 { | |
| 5704 int imresult = gtk_im_context_filter_keypress(xic, event); | |
| 5705 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5706 if (p_imst == IM_ON_THE_SPOT) |
| 7 | 5707 { |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5708 /* 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
|
5709 * 1. preedited string. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5710 * 2. committed string. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5711 * 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
|
5712 * 4. preedited string. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5713 * 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
|
5714 * 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
|
5715 * 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
|
5716 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
|
5717 && 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
|
5718 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5719 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
|
5720 return FALSE; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5721 } |
| 7 | 5722 } |
| 5723 | |
| 5724 /* If XIM tried to commit a keypad key as a single char., | |
| 5725 * ignore it so we can use the keypad key 'raw', for mappings. */ | |
| 5726 if (xim_expected_char != NUL && xim_ignored_char) | |
| 5727 /* We had a keypad key, and XIM tried to thieve it */ | |
| 5728 return FALSE; | |
| 5729 | |
| 2988 | 5730 /* This is supposed to fix a problem with iBus, that space |
| 5731 * characters don't work in input mode. */ | |
| 5732 xim_expected_char = NUL; | |
| 5733 | |
| 7 | 5734 /* Normal processing */ |
| 5735 return imresult; | |
| 5736 } | |
| 5737 } | |
| 5738 | |
| 5739 return FALSE; | |
| 5740 } | |
| 5741 | |
| 5742 int | |
| 5743 im_get_status(void) | |
| 5744 { | |
|
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5745 # ifdef FEAT_EVAL |
|
5008
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5746 if (p_imsf[0] != NUL) |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5747 { |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5748 int is_active; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5749 |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5750 /* FIXME: Don't execute user function in unsafe situation. */ |
|
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5751 if (exiting |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5752 # ifdef FEAT_AUTOCMD |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5753 || is_autocmd_blocked() |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5754 # endif |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5755 ) |
|
5008
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5756 return FALSE; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5757 /* FIXME: :py print 'xxx' is shown duplicate result. |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5758 * Use silent to avoid it. */ |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5759 ++msg_silent; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5760 is_active = call_func_retnr(p_imsf, 0, NULL, FALSE); |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5761 --msg_silent; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5762 return (is_active > 0); |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5763 } |
|
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5764 # endif |
| 7 | 5765 return im_is_active; |
| 5766 } | |
| 5767 | |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5768 int |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5769 preedit_get_status(void) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5770 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5771 return preedit_is_active; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5772 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5773 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5774 int |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5775 im_is_preediting(void) |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5776 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5777 return xim_has_preediting; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5778 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5779 |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
5780 # else /* !FEAT_GUI_GTK */ |
| 7 | 5781 |
| 5782 static int xim_is_active = FALSE; /* XIM should be active in the current | |
| 5783 mode */ | |
| 5784 static int xim_has_focus = FALSE; /* XIM is really being used for Vim */ | |
| 5785 #ifdef FEAT_GUI_X11 | |
| 5786 static XIMStyle input_style; | |
| 5787 static int status_area_enabled = TRUE; | |
| 5788 #endif | |
| 5789 | |
| 5790 /* | |
| 5791 * Switch using XIM on/off. This is used by the code that changes "State". | |
| 5792 */ | |
| 5793 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5794 im_set_active(int active) |
| 7 | 5795 { |
| 5796 if (xic == NULL) | |
| 5797 return; | |
| 5798 | |
| 5799 /* If 'imdisable' is set, XIM is never active. */ | |
| 5800 if (p_imdisable) | |
| 5801 active = FALSE; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2205
diff
changeset
|
5802 #if !defined(FEAT_GUI_GTK) |
| 7 | 5803 else if (input_style & XIMPreeditPosition) |
| 5804 /* There is a problem in switching XIM off when preediting is used, | |
| 5805 * and it is not clear how this can be solved. For now, keep XIM on | |
| 5806 * all the time, like it was done in Vim 5.8. */ | |
| 5807 active = TRUE; | |
| 5808 #endif | |
| 5809 | |
| 5810 /* Remember the active state, it is needed when Vim gets keyboard focus. */ | |
| 5811 xim_is_active = active; | |
| 5812 xim_set_preedit(); | |
| 5813 } | |
| 5814 | |
| 5815 /* | |
| 5816 * Adjust using XIM for gaining or losing keyboard focus. Also called when | |
| 5817 * "xim_is_active" changes. | |
| 5818 */ | |
| 5819 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5820 xim_set_focus(int focus) |
| 7 | 5821 { |
| 5822 if (xic == NULL) | |
| 5823 return; | |
| 5824 | |
| 5825 /* | |
| 5826 * XIM only gets focus when the Vim window has keyboard focus and XIM has | |
| 5827 * been set active for the current mode. | |
| 5828 */ | |
| 5829 if (focus && xim_is_active) | |
| 5830 { | |
| 5831 if (!xim_has_focus) | |
| 5832 { | |
| 5833 xim_has_focus = TRUE; | |
| 5834 XSetICFocus(xic); | |
| 5835 } | |
| 5836 } | |
| 5837 else | |
| 5838 { | |
| 5839 if (xim_has_focus) | |
| 5840 { | |
| 5841 xim_has_focus = FALSE; | |
| 5842 XUnsetICFocus(xic); | |
| 5843 } | |
| 5844 } | |
| 5845 } | |
| 5846 | |
| 5847 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5848 im_set_position(int row UNUSED, int col UNUSED) |
| 7 | 5849 { |
| 5850 xim_set_preedit(); | |
| 5851 } | |
| 5852 | |
| 5853 /* | |
| 5854 * Set the XIM to the current cursor position. | |
| 5855 */ | |
| 5856 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5857 xim_set_preedit(void) |
| 7 | 5858 { |
| 2580 | 5859 XVaNestedList attr_list; |
| 5860 XRectangle spot_area; | |
| 5861 XPoint over_spot; | |
| 5862 int line_space; | |
| 5863 | |
| 7 | 5864 if (xic == NULL) |
| 5865 return; | |
| 5866 | |
| 5867 xim_set_focus(TRUE); | |
| 5868 | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5869 if (!xim_has_focus) |
| 7 | 5870 { |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5871 /* 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
|
5872 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
|
5873 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
|
5874 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
|
5875 XNSpotLocation, |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5876 &over_spot, |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5877 NULL); |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5878 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
|
5879 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
|
5880 return; |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5881 } |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5882 |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5883 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
|
5884 { |
| 7 | 5885 if (xim_fg_color == INVALCOLOR) |
| 5886 { | |
| 5887 xim_fg_color = gui.def_norm_pixel; | |
| 5888 xim_bg_color = gui.def_back_pixel; | |
| 5889 } | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5890 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
|
5891 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
|
5892 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
|
5893 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
|
5894 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
|
5895 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
|
5896 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
|
5897 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
|
5898 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
|
5899 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
|
5900 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
|
5901 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
|
5902 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
|
5903 NULL); |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5904 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
|
5905 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
|
5906 XFree(attr_list); |
| 7 | 5907 } |
| 5908 } | |
| 5909 | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5910 #if defined(FEAT_GUI_X11) |
| 7 | 5911 static char e_xim[] = N_("E285: Failed to create input context"); |
| 5912 #endif | |
| 5913 | |
| 5914 #if defined(FEAT_GUI_X11) || defined(PROTO) | |
|
10460
7fd589f46801
commit https://github.com/vim/vim/commit/a899e6ecc4523c7e411eaf6fbaa4197d70f6f39e
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
5915 # if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 && !defined(SUN_SYSTEM) |
| 7 | 5916 # define USE_X11R6_XIM |
| 5917 # endif | |
| 5918 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
5919 static int xim_real_init(Window x11_window, Display *x11_display); |
| 7 | 5920 |
| 5921 | |
| 5922 #ifdef USE_X11R6_XIM | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
5923 static void xim_destroy_cb(XIM im, XPointer client_data, XPointer call_data); |
| 7 | 5924 |
| 5925 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5926 xim_instantiate_cb( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5927 Display *display, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5928 XPointer client_data UNUSED, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5929 XPointer call_data UNUSED) |
| 7 | 5930 { |
| 5931 Window x11_window; | |
| 5932 Display *x11_display; | |
| 5933 | |
| 5934 #ifdef XIM_DEBUG | |
| 5935 xim_log("xim_instantiate_cb()\n"); | |
| 5936 #endif | |
| 5937 | |
| 5938 gui_get_x11_windis(&x11_window, &x11_display); | |
| 5939 if (display != x11_display) | |
| 5940 return; | |
| 5941 | |
| 5942 xim_real_init(x11_window, x11_display); | |
| 811 | 5943 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 5944 if (xic != NULL) |
| 5945 XUnregisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
| 5946 xim_instantiate_cb, NULL); | |
| 5947 } | |
| 5948 | |
| 5949 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5950 xim_destroy_cb( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5951 XIM im UNUSED, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5952 XPointer client_data UNUSED, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5953 XPointer call_data UNUSED) |
| 7 | 5954 { |
| 5955 Window x11_window; | |
| 5956 Display *x11_display; | |
| 5957 | |
| 5958 #ifdef XIM_DEBUG | |
| 5959 xim_log("xim_destroy_cb()\n"); | |
| 5960 #endif | |
| 5961 gui_get_x11_windis(&x11_window, &x11_display); | |
| 5962 | |
| 5963 xic = NULL; | |
| 5964 status_area_enabled = FALSE; | |
| 5965 | |
| 811 | 5966 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 5967 |
| 5968 XRegisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
| 5969 xim_instantiate_cb, NULL); | |
| 5970 } | |
| 5971 #endif | |
| 5972 | |
| 5973 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5974 xim_init(void) |
| 7 | 5975 { |
| 5976 Window x11_window; | |
| 5977 Display *x11_display; | |
| 5978 | |
| 5979 #ifdef XIM_DEBUG | |
| 5980 xim_log("xim_init()\n"); | |
| 5981 #endif | |
| 5982 | |
| 5983 gui_get_x11_windis(&x11_window, &x11_display); | |
| 5984 | |
| 5985 xic = NULL; | |
| 5986 | |
| 5987 if (xim_real_init(x11_window, x11_display)) | |
| 5988 return; | |
| 5989 | |
| 811 | 5990 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 5991 |
| 5992 #ifdef USE_X11R6_XIM | |
| 5993 XRegisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
| 5994 xim_instantiate_cb, NULL); | |
| 5995 #endif | |
| 5996 } | |
| 5997 | |
| 5998 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5999 xim_real_init(Window x11_window, Display *x11_display) |
| 7 | 6000 { |
| 6001 int i; | |
| 6002 char *p, | |
| 6003 *s, | |
| 6004 *ns, | |
| 6005 *end, | |
| 6006 tmp[1024]; | |
| 6007 #define IMLEN_MAX 40 | |
| 6008 char buf[IMLEN_MAX + 7]; | |
| 6009 XIM xim = NULL; | |
| 6010 XIMStyles *xim_styles; | |
| 6011 XIMStyle this_input_style = 0; | |
| 6012 Boolean found; | |
| 6013 XPoint over_spot; | |
| 6014 XVaNestedList preedit_list, status_list; | |
| 6015 | |
| 6016 input_style = 0; | |
| 6017 status_area_enabled = FALSE; | |
| 6018 | |
| 6019 if (xic != NULL) | |
| 6020 return FALSE; | |
| 6021 | |
| 6022 if (gui.rsrc_input_method != NULL && *gui.rsrc_input_method != NUL) | |
| 6023 { | |
| 6024 strcpy(tmp, gui.rsrc_input_method); | |
| 6025 for (ns = s = tmp; ns != NULL && *s != NUL;) | |
| 6026 { | |
| 6027 s = (char *)skipwhite((char_u *)s); | |
| 6028 if (*s == NUL) | |
| 6029 break; | |
| 6030 if ((ns = end = strchr(s, ',')) == NULL) | |
| 6031 end = s + strlen(s); | |
| 6032 while (isspace(((char_u *)end)[-1])) | |
| 6033 end--; | |
| 6034 *end = NUL; | |
| 6035 | |
| 6036 if (strlen(s) <= IMLEN_MAX) | |
| 6037 { | |
| 6038 strcpy(buf, "@im="); | |
| 6039 strcat(buf, s); | |
| 6040 if ((p = XSetLocaleModifiers(buf)) != NULL && *p != NUL | |
| 6041 && (xim = XOpenIM(x11_display, NULL, NULL, NULL)) | |
| 6042 != NULL) | |
| 6043 break; | |
| 6044 } | |
| 6045 | |
| 6046 s = ns + 1; | |
| 6047 } | |
| 6048 } | |
| 6049 | |
| 6050 if (xim == NULL && (p = XSetLocaleModifiers("")) != NULL && *p != NUL) | |
| 6051 xim = XOpenIM(x11_display, NULL, NULL, NULL); | |
| 6052 | |
| 6053 /* This is supposed to be useful to obtain characters through | |
| 6054 * XmbLookupString() without really using a XIM. */ | |
| 6055 if (xim == NULL && (p = XSetLocaleModifiers("@im=none")) != NULL | |
| 6056 && *p != NUL) | |
| 6057 xim = XOpenIM(x11_display, NULL, NULL, NULL); | |
| 6058 | |
| 6059 if (xim == NULL) | |
| 6060 { | |
| 6061 /* Only give this message when verbose is set, because too many people | |
| 6062 * got this message when they didn't want to use a XIM. */ | |
| 6063 if (p_verbose > 0) | |
| 292 | 6064 { |
| 6065 verbose_enter(); | |
| 7 | 6066 EMSG(_("E286: Failed to open input method")); |
| 292 | 6067 verbose_leave(); |
| 6068 } | |
| 7 | 6069 return FALSE; |
| 6070 } | |
| 6071 | |
| 6072 #ifdef USE_X11R6_XIM | |
| 6073 { | |
| 6074 XIMCallback destroy_cb; | |
| 6075 | |
| 6076 destroy_cb.callback = xim_destroy_cb; | |
| 6077 destroy_cb.client_data = NULL; | |
| 6078 if (XSetIMValues(xim, XNDestroyCallback, &destroy_cb, NULL)) | |
| 6079 EMSG(_("E287: Warning: Could not set destroy callback to IM")); | |
| 6080 } | |
| 6081 #endif | |
| 6082 | |
| 6083 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) || !xim_styles) | |
| 6084 { | |
| 6085 EMSG(_("E288: input method doesn't support any style")); | |
| 6086 XCloseIM(xim); | |
| 6087 return FALSE; | |
| 6088 } | |
| 6089 | |
| 6090 found = False; | |
| 6091 strcpy(tmp, gui.rsrc_preedit_type_name); | |
| 6092 for (s = tmp; s && !found; ) | |
| 6093 { | |
| 6094 while (*s && isspace((unsigned char)*s)) | |
| 6095 s++; | |
| 6096 if (!*s) | |
| 6097 break; | |
| 6098 if ((ns = end = strchr(s, ',')) != 0) | |
| 6099 ns++; | |
| 6100 else | |
| 6101 end = s + strlen(s); | |
| 6102 while (isspace((unsigned char)*end)) | |
| 6103 end--; | |
| 6104 *end = '\0'; | |
| 6105 | |
| 6106 if (!strcmp(s, "OverTheSpot")) | |
| 6107 this_input_style = (XIMPreeditPosition | XIMStatusArea); | |
| 6108 else if (!strcmp(s, "OffTheSpot")) | |
| 6109 this_input_style = (XIMPreeditArea | XIMStatusArea); | |
| 6110 else if (!strcmp(s, "Root")) | |
| 6111 this_input_style = (XIMPreeditNothing | XIMStatusNothing); | |
| 6112 | |
| 6113 for (i = 0; (unsigned short)i < xim_styles->count_styles; i++) | |
| 6114 { | |
| 6115 if (this_input_style == xim_styles->supported_styles[i]) | |
| 6116 { | |
| 6117 found = True; | |
| 6118 break; | |
| 6119 } | |
| 6120 } | |
| 6121 if (!found) | |
| 6122 for (i = 0; (unsigned short)i < xim_styles->count_styles; i++) | |
| 6123 { | |
| 6124 if ((xim_styles->supported_styles[i] & this_input_style) | |
| 6125 == (this_input_style & ~XIMStatusArea)) | |
| 6126 { | |
| 6127 this_input_style &= ~XIMStatusArea; | |
| 6128 found = True; | |
| 6129 break; | |
| 6130 } | |
| 6131 } | |
| 6132 | |
| 6133 s = ns; | |
| 6134 } | |
| 6135 XFree(xim_styles); | |
| 6136 | |
| 6137 if (!found) | |
| 6138 { | |
| 6139 /* Only give this message when verbose is set, because too many people | |
| 6140 * got this message when they didn't want to use a XIM. */ | |
| 6141 if (p_verbose > 0) | |
| 292 | 6142 { |
| 6143 verbose_enter(); | |
| 7 | 6144 EMSG(_("E289: input method doesn't support my preedit type")); |
| 292 | 6145 verbose_leave(); |
| 6146 } | |
| 7 | 6147 XCloseIM(xim); |
| 6148 return FALSE; | |
| 6149 } | |
| 6150 | |
| 6151 over_spot.x = TEXT_X(gui.col); | |
| 6152 over_spot.y = TEXT_Y(gui.row); | |
| 6153 input_style = this_input_style; | |
| 6154 | |
| 6155 /* A crash was reported when trying to pass gui.norm_font as XNFontSet, | |
| 6156 * thus that has been removed. Hopefully the default works... */ | |
| 6157 #ifdef FEAT_XFONTSET | |
| 6158 if (gui.fontset != NOFONTSET) | |
| 6159 { | |
| 6160 preedit_list = XVaCreateNestedList(0, | |
| 6161 XNSpotLocation, &over_spot, | |
| 6162 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 6163 XNBackground, (Pixel)gui.def_back_pixel, | |
| 6164 XNFontSet, (XFontSet)gui.fontset, | |
| 6165 NULL); | |
| 6166 status_list = XVaCreateNestedList(0, | |
| 6167 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 6168 XNBackground, (Pixel)gui.def_back_pixel, | |
| 6169 XNFontSet, (XFontSet)gui.fontset, | |
| 6170 NULL); | |
| 6171 } | |
| 6172 else | |
| 6173 #endif | |
| 6174 { | |
| 6175 preedit_list = XVaCreateNestedList(0, | |
| 6176 XNSpotLocation, &over_spot, | |
| 6177 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 6178 XNBackground, (Pixel)gui.def_back_pixel, | |
| 6179 NULL); | |
| 6180 status_list = XVaCreateNestedList(0, | |
| 6181 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 6182 XNBackground, (Pixel)gui.def_back_pixel, | |
| 6183 NULL); | |
| 6184 } | |
| 6185 | |
| 6186 xic = XCreateIC(xim, | |
| 6187 XNInputStyle, input_style, | |
| 6188 XNClientWindow, x11_window, | |
| 6189 XNFocusWindow, gui.wid, | |
| 6190 XNPreeditAttributes, preedit_list, | |
| 6191 XNStatusAttributes, status_list, | |
| 6192 NULL); | |
| 6193 XFree(status_list); | |
| 6194 XFree(preedit_list); | |
| 6195 if (xic != NULL) | |
| 6196 { | |
| 6197 if (input_style & XIMStatusArea) | |
| 6198 { | |
| 6199 xim_set_status_area(); | |
| 6200 status_area_enabled = TRUE; | |
| 6201 } | |
| 6202 else | |
| 811 | 6203 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 6204 } |
| 6205 else | |
| 6206 { | |
| 6207 EMSG(_(e_xim)); | |
| 6208 XCloseIM(xim); | |
| 6209 return FALSE; | |
| 6210 } | |
| 6211 | |
| 6212 return TRUE; | |
| 6213 } | |
| 6214 | |
| 6215 #endif /* FEAT_GUI_X11 */ | |
| 6216 | |
| 6217 /* | |
| 6218 * Get IM status. When IM is on, return TRUE. Else return FALSE. | |
| 6219 * FIXME: This doesn't work correctly: Having focus doesn't always mean XIM is | |
| 6220 * active, when not having focus XIM may still be active (e.g., when using a | |
| 6221 * tear-off menu item). | |
| 6222 */ | |
| 6223 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6224 im_get_status(void) |
| 7 | 6225 { |
| 6226 return xim_has_focus; | |
| 6227 } | |
| 6228 | |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
6229 # endif /* !FEAT_GUI_GTK */ |
|
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
6230 |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6231 # if !defined(FEAT_GUI_GTK) || defined(PROTO) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6232 /* |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6233 * Set up the status area. |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6234 * |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6235 * 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
|
6236 * 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
|
6237 * 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
|
6238 * window... |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6239 */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6240 void |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6241 xim_set_status_area(void) |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6242 { |
| 2580 | 6243 XVaNestedList preedit_list = 0, status_list = 0, list = 0; |
| 6244 XRectangle pre_area, status_area; | |
| 6245 | |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6246 if (xic == NULL) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6247 return; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6248 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6249 if (input_style & XIMStatusArea) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6250 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6251 if (input_style & XIMPreeditArea) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6252 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6253 XRectangle *needed_rect; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6254 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6255 /* to get status_area width */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6256 status_list = XVaCreateNestedList(0, XNAreaNeeded, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6257 &needed_rect, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6258 XGetICValues(xic, XNStatusAttributes, status_list, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6259 XFree(status_list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6260 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6261 status_area.width = needed_rect->width; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6262 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6263 else |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6264 status_area.width = gui.char_width * Columns; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6265 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6266 status_area.x = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6267 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
|
6268 if (gui.which_scrollbars[SBAR_BOTTOM]) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6269 status_area.y += gui.scrollbar_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6270 #ifdef FEAT_MENU |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6271 if (gui.menu_is_active) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6272 status_area.y += gui.menu_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6273 #endif |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6274 status_area.height = gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6275 status_list = XVaCreateNestedList(0, XNArea, &status_area, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6276 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6277 else |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6278 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6279 status_area.x = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6280 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
|
6281 if (gui.which_scrollbars[SBAR_BOTTOM]) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6282 status_area.y += gui.scrollbar_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6283 #ifdef FEAT_MENU |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6284 if (gui.menu_is_active) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6285 status_area.y += gui.menu_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6286 #endif |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6287 status_area.width = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6288 status_area.height = gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6289 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6290 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6291 if (input_style & XIMPreeditArea) /* off-the-spot */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6292 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6293 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
|
6294 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
|
6295 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
|
6296 if (gui.which_scrollbars[SBAR_BOTTOM]) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6297 pre_area.y += gui.scrollbar_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6298 #ifdef FEAT_MENU |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6299 if (gui.menu_is_active) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6300 pre_area.y += gui.menu_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6301 #endif |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6302 pre_area.height = gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6303 preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6304 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6305 else if (input_style & XIMPreeditPosition) /* over-the-spot */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6306 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6307 pre_area.x = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6308 pre_area.y = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6309 pre_area.height = gui.char_height * Rows; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6310 pre_area.width = gui.char_width * Columns; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6311 preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6312 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6313 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6314 if (preedit_list && status_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6315 list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6316 XNStatusAttributes, status_list, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6317 else if (preedit_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6318 list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6319 NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6320 else if (status_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6321 list = XVaCreateNestedList(0, XNStatusAttributes, status_list, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6322 NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6323 else |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6324 list = NULL; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6325 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6326 if (list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6327 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6328 XSetICValues(xic, XNVaNestedList, list, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6329 XFree(list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6330 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6331 if (status_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6332 XFree(status_list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6333 if (preedit_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6334 XFree(preedit_list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6335 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6336 |
| 1668 | 6337 int |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6338 xim_get_status_area_height(void) |
| 1668 | 6339 { |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6340 if (status_area_enabled) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6341 return gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6342 return 0; |
| 1668 | 6343 } |
| 6344 # endif | |
| 6345 | |
| 7 | 6346 #endif /* FEAT_XIM */ |
| 6347 | |
| 6348 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 6349 | |
| 6350 /* | |
| 6351 * Setup "vcp" for conversion from "from" to "to". | |
| 6352 * The names must have been made canonical with enc_canonize(). | |
| 6353 * vcp->vc_type must have been initialized to CONV_NONE. | |
| 6354 * Note: cannot be used for conversion from/to ucs-2 and ucs-4 (will use utf-8 | |
| 6355 * instead). | |
| 6356 * Afterwards invoke with "from" and "to" equal to NULL to cleanup. | |
| 6357 * Return FAIL when conversion is not supported, OK otherwise. | |
| 6358 */ | |
| 6359 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6360 convert_setup(vimconv_T *vcp, char_u *from, char_u *to) |
| 7 | 6361 { |
| 1904 | 6362 return convert_setup_ext(vcp, from, TRUE, to, TRUE); |
| 6363 } | |
| 6364 | |
| 6365 /* | |
| 6366 * As convert_setup(), but only when from_unicode_is_utf8 is TRUE will all | |
| 6367 * "from" unicode charsets be considered utf-8. Same for "to". | |
| 6368 */ | |
| 6369 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6370 convert_setup_ext( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6371 vimconv_T *vcp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6372 char_u *from, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6373 int from_unicode_is_utf8, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6374 char_u *to, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6375 int to_unicode_is_utf8) |
| 1904 | 6376 { |
| 7 | 6377 int from_prop; |
| 6378 int to_prop; | |
| 1904 | 6379 int from_is_utf8; |
| 6380 int to_is_utf8; | |
| 7 | 6381 |
| 6382 /* Reset to no conversion. */ | |
| 6383 # ifdef USE_ICONV | |
| 6384 if (vcp->vc_type == CONV_ICONV && vcp->vc_fd != (iconv_t)-1) | |
| 6385 iconv_close(vcp->vc_fd); | |
| 6386 # endif | |
| 6387 vcp->vc_type = CONV_NONE; | |
| 6388 vcp->vc_factor = 1; | |
| 6389 vcp->vc_fail = FALSE; | |
| 6390 | |
| 6391 /* No conversion when one of the names is empty or they are equal. */ | |
| 6392 if (from == NULL || *from == NUL || to == NULL || *to == NUL | |
| 6393 || STRCMP(from, to) == 0) | |
| 6394 return OK; | |
| 6395 | |
| 6396 from_prop = enc_canon_props(from); | |
| 6397 to_prop = enc_canon_props(to); | |
| 1904 | 6398 if (from_unicode_is_utf8) |
| 6399 from_is_utf8 = from_prop & ENC_UNICODE; | |
| 6400 else | |
| 6401 from_is_utf8 = from_prop == ENC_UNICODE; | |
| 6402 if (to_unicode_is_utf8) | |
| 6403 to_is_utf8 = to_prop & ENC_UNICODE; | |
| 6404 else | |
| 6405 to_is_utf8 = to_prop == ENC_UNICODE; | |
| 6406 | |
| 6407 if ((from_prop & ENC_LATIN1) && to_is_utf8) | |
| 7 | 6408 { |
| 6409 /* Internal latin1 -> utf-8 conversion. */ | |
| 6410 vcp->vc_type = CONV_TO_UTF8; | |
| 6411 vcp->vc_factor = 2; /* up to twice as long */ | |
| 6412 } | |
| 1904 | 6413 else if ((from_prop & ENC_LATIN9) && to_is_utf8) |
| 26 | 6414 { |
| 6415 /* Internal latin9 -> utf-8 conversion. */ | |
| 6416 vcp->vc_type = CONV_9_TO_UTF8; | |
| 6417 vcp->vc_factor = 3; /* up to three as long (euro sign) */ | |
| 6418 } | |
| 1904 | 6419 else if (from_is_utf8 && (to_prop & ENC_LATIN1)) |
| 7 | 6420 { |
| 6421 /* Internal utf-8 -> latin1 conversion. */ | |
| 6422 vcp->vc_type = CONV_TO_LATIN1; | |
| 6423 } | |
| 1904 | 6424 else if (from_is_utf8 && (to_prop & ENC_LATIN9)) |
| 26 | 6425 { |
| 6426 /* Internal utf-8 -> latin9 conversion. */ | |
| 6427 vcp->vc_type = CONV_TO_LATIN9; | |
| 6428 } | |
| 7 | 6429 #ifdef WIN3264 |
| 6430 /* Win32-specific codepage <-> codepage conversion without iconv. */ | |
| 1904 | 6431 else if ((from_is_utf8 || encname2codepage(from) > 0) |
| 6432 && (to_is_utf8 || encname2codepage(to) > 0)) | |
| 7 | 6433 { |
| 6434 vcp->vc_type = CONV_CODEPAGE; | |
| 6435 vcp->vc_factor = 2; /* up to twice as long */ | |
| 1904 | 6436 vcp->vc_cpfrom = from_is_utf8 ? 0 : encname2codepage(from); |
| 6437 vcp->vc_cpto = to_is_utf8 ? 0 : encname2codepage(to); | |
| 7 | 6438 } |
| 6439 #endif | |
| 6440 #ifdef MACOS_X | |
| 6441 else if ((from_prop & ENC_MACROMAN) && (to_prop & ENC_LATIN1)) | |
| 6442 { | |
| 6443 vcp->vc_type = CONV_MAC_LATIN1; | |
| 6444 } | |
| 1904 | 6445 else if ((from_prop & ENC_MACROMAN) && to_is_utf8) |
| 7 | 6446 { |
| 6447 vcp->vc_type = CONV_MAC_UTF8; | |
| 6448 vcp->vc_factor = 2; /* up to twice as long */ | |
| 6449 } | |
| 6450 else if ((from_prop & ENC_LATIN1) && (to_prop & ENC_MACROMAN)) | |
| 6451 { | |
| 6452 vcp->vc_type = CONV_LATIN1_MAC; | |
| 6453 } | |
| 1904 | 6454 else if (from_is_utf8 && (to_prop & ENC_MACROMAN)) |
| 7 | 6455 { |
| 6456 vcp->vc_type = CONV_UTF8_MAC; | |
| 6457 } | |
| 6458 #endif | |
| 6459 # ifdef USE_ICONV | |
| 6460 else | |
| 6461 { | |
| 6462 /* Use iconv() for conversion. */ | |
| 6463 vcp->vc_fd = (iconv_t)my_iconv_open( | |
| 1904 | 6464 to_is_utf8 ? (char_u *)"utf-8" : to, |
| 6465 from_is_utf8 ? (char_u *)"utf-8" : from); | |
| 7 | 6466 if (vcp->vc_fd != (iconv_t)-1) |
| 6467 { | |
| 6468 vcp->vc_type = CONV_ICONV; | |
| 6469 vcp->vc_factor = 4; /* could be longer too... */ | |
| 6470 } | |
| 6471 } | |
| 6472 # endif | |
| 6473 if (vcp->vc_type == CONV_NONE) | |
| 6474 return FAIL; | |
| 167 | 6475 |
| 7 | 6476 return OK; |
| 6477 } | |
| 6478 | |
| 6479 #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
|
6480 || defined(PROTO) |
| 7 | 6481 /* |
| 6482 * Do conversion on typed input characters in-place. | |
| 6483 * The input and output are not NUL terminated! | |
| 6484 * Returns the length after conversion. | |
| 6485 */ | |
| 6486 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6487 convert_input(char_u *ptr, int len, int maxlen) |
| 7 | 6488 { |
| 6489 return convert_input_safe(ptr, len, maxlen, NULL, NULL); | |
| 6490 } | |
| 6491 #endif | |
| 6492 | |
| 6493 /* | |
| 6494 * Like convert_input(), but when there is an incomplete byte sequence at the | |
| 6495 * end return that as an allocated string in "restp" and set "*restlenp" to | |
| 6496 * the length. If "restp" is NULL it is not used. | |
| 6497 */ | |
| 6498 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6499 convert_input_safe( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6500 char_u *ptr, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6501 int len, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6502 int maxlen, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6503 char_u **restp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6504 int *restlenp) |
| 7 | 6505 { |
| 6506 char_u *d; | |
| 6507 int dlen = len; | |
| 6508 int unconvertlen = 0; | |
| 6509 | |
| 6510 d = string_convert_ext(&input_conv, ptr, &dlen, | |
| 6511 restp == NULL ? NULL : &unconvertlen); | |
| 6512 if (d != NULL) | |
| 6513 { | |
| 6514 if (dlen <= maxlen) | |
| 6515 { | |
| 6516 if (unconvertlen > 0) | |
| 6517 { | |
| 6518 /* Move the unconverted characters to allocated memory. */ | |
| 6519 *restp = alloc(unconvertlen); | |
| 6520 if (*restp != NULL) | |
| 6521 mch_memmove(*restp, ptr + len - unconvertlen, unconvertlen); | |
| 6522 *restlenp = unconvertlen; | |
| 6523 } | |
| 6524 mch_memmove(ptr, d, dlen); | |
| 6525 } | |
| 6526 else | |
| 6527 /* result is too long, keep the unconverted text (the caller must | |
| 6528 * have done something wrong!) */ | |
| 6529 dlen = len; | |
| 6530 vim_free(d); | |
| 6531 } | |
| 6532 return dlen; | |
| 6533 } | |
| 6534 | |
| 6535 /* | |
| 6536 * Convert text "ptr[*lenp]" according to "vcp". | |
| 6537 * Returns the result in allocated memory and sets "*lenp". | |
| 6538 * When "lenp" is NULL, use NUL terminated strings. | |
| 6539 * Illegal chars are often changed to "?", unless vcp->vc_fail is set. | |
| 6540 * When something goes wrong, NULL is returned and "*lenp" is unchanged. | |
| 6541 */ | |
| 6542 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6543 string_convert( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6544 vimconv_T *vcp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6545 char_u *ptr, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6546 int *lenp) |
| 7 | 6547 { |
| 6548 return string_convert_ext(vcp, ptr, lenp, NULL); | |
| 6549 } | |
| 6550 | |
| 6551 /* | |
| 6552 * Like string_convert(), but when "unconvlenp" is not NULL and there are is | |
| 6553 * an incomplete sequence at the end it is not converted and "*unconvlenp" is | |
| 6554 * set to the number of remaining bytes. | |
| 6555 */ | |
| 6556 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6557 string_convert_ext( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6558 vimconv_T *vcp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6559 char_u *ptr, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6560 int *lenp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6561 int *unconvlenp) |
| 7 | 6562 { |
| 6563 char_u *retval = NULL; | |
| 6564 char_u *d; | |
| 6565 int len; | |
| 6566 int i; | |
| 6567 int l; | |
| 6568 int c; | |
| 6569 | |
| 6570 if (lenp == NULL) | |
| 6571 len = (int)STRLEN(ptr); | |
| 6572 else | |
| 6573 len = *lenp; | |
| 6574 if (len == 0) | |
| 6575 return vim_strsave((char_u *)""); | |
| 6576 | |
| 6577 switch (vcp->vc_type) | |
| 6578 { | |
| 6579 case CONV_TO_UTF8: /* latin1 to utf-8 conversion */ | |
| 6580 retval = alloc(len * 2 + 1); | |
| 6581 if (retval == NULL) | |
| 6582 break; | |
| 6583 d = retval; | |
| 6584 for (i = 0; i < len; ++i) | |
| 6585 { | |
| 26 | 6586 c = ptr[i]; |
| 6587 if (c < 0x80) | |
| 6588 *d++ = c; | |
| 7 | 6589 else |
| 6590 { | |
| 26 | 6591 *d++ = 0xc0 + ((unsigned)c >> 6); |
| 6592 *d++ = 0x80 + (c & 0x3f); | |
| 7 | 6593 } |
| 6594 } | |
| 6595 *d = NUL; | |
| 6596 if (lenp != NULL) | |
| 6597 *lenp = (int)(d - retval); | |
| 6598 break; | |
| 6599 | |
| 26 | 6600 case CONV_9_TO_UTF8: /* latin9 to utf-8 conversion */ |
| 6601 retval = alloc(len * 3 + 1); | |
| 6602 if (retval == NULL) | |
| 6603 break; | |
| 6604 d = retval; | |
| 6605 for (i = 0; i < len; ++i) | |
| 6606 { | |
| 6607 c = ptr[i]; | |
| 6608 switch (c) | |
| 6609 { | |
| 6610 case 0xa4: c = 0x20ac; break; /* euro */ | |
| 6611 case 0xa6: c = 0x0160; break; /* S hat */ | |
| 6612 case 0xa8: c = 0x0161; break; /* S -hat */ | |
| 6613 case 0xb4: c = 0x017d; break; /* Z hat */ | |
| 6614 case 0xb8: c = 0x017e; break; /* Z -hat */ | |
| 6615 case 0xbc: c = 0x0152; break; /* OE */ | |
| 6616 case 0xbd: c = 0x0153; break; /* oe */ | |
| 6617 case 0xbe: c = 0x0178; break; /* Y */ | |
| 6618 } | |
| 6619 d += utf_char2bytes(c, d); | |
| 6620 } | |
| 6621 *d = NUL; | |
| 6622 if (lenp != NULL) | |
| 6623 *lenp = (int)(d - retval); | |
| 6624 break; | |
| 6625 | |
| 7 | 6626 case CONV_TO_LATIN1: /* utf-8 to latin1 conversion */ |
| 26 | 6627 case CONV_TO_LATIN9: /* utf-8 to latin9 conversion */ |
| 7 | 6628 retval = alloc(len + 1); |
| 6629 if (retval == NULL) | |
| 6630 break; | |
| 6631 d = retval; | |
| 6632 for (i = 0; i < len; ++i) | |
| 6633 { | |
| 2015 | 6634 l = utf_ptr2len_len(ptr + i, len - i); |
| 7 | 6635 if (l == 0) |
| 6636 *d++ = NUL; | |
| 6637 else if (l == 1) | |
| 6638 { | |
| 2015 | 6639 int l_w = utf8len_tab_zero[ptr[i]]; |
| 6640 | |
| 6641 if (l_w == 0) | |
| 6642 { | |
| 6643 /* Illegal utf-8 byte cannot be converted */ | |
| 6644 vim_free(retval); | |
| 6645 return NULL; | |
| 6646 } | |
| 6647 if (unconvlenp != NULL && l_w > len - i) | |
| 7 | 6648 { |
| 6649 /* Incomplete sequence at the end. */ | |
| 6650 *unconvlenp = len - i; | |
| 6651 break; | |
| 6652 } | |
| 6653 *d++ = ptr[i]; | |
| 6654 } | |
| 6655 else | |
| 6656 { | |
| 6657 c = utf_ptr2char(ptr + i); | |
| 26 | 6658 if (vcp->vc_type == CONV_TO_LATIN9) |
| 6659 switch (c) | |
| 6660 { | |
| 6661 case 0x20ac: c = 0xa4; break; /* euro */ | |
| 6662 case 0x0160: c = 0xa6; break; /* S hat */ | |
| 6663 case 0x0161: c = 0xa8; break; /* S -hat */ | |
| 6664 case 0x017d: c = 0xb4; break; /* Z hat */ | |
| 6665 case 0x017e: c = 0xb8; break; /* Z -hat */ | |
| 6666 case 0x0152: c = 0xbc; break; /* OE */ | |
| 6667 case 0x0153: c = 0xbd; break; /* oe */ | |
| 6668 case 0x0178: c = 0xbe; break; /* Y */ | |
| 6669 case 0xa4: | |
| 6670 case 0xa6: | |
| 6671 case 0xa8: | |
| 6672 case 0xb4: | |
| 6673 case 0xb8: | |
| 6674 case 0xbc: | |
| 6675 case 0xbd: | |
| 6676 case 0xbe: c = 0x100; break; /* not in latin9 */ | |
| 6677 } | |
| 7 | 6678 if (!utf_iscomposing(c)) /* skip composing chars */ |
| 6679 { | |
| 6680 if (c < 0x100) | |
| 6681 *d++ = c; | |
| 6682 else if (vcp->vc_fail) | |
| 6683 { | |
| 6684 vim_free(retval); | |
| 6685 return NULL; | |
| 6686 } | |
| 6687 else | |
| 6688 { | |
| 6689 *d++ = 0xbf; | |
| 6690 if (utf_char2cells(c) > 1) | |
| 6691 *d++ = '?'; | |
| 6692 } | |
| 6693 } | |
| 6694 i += l - 1; | |
| 6695 } | |
| 6696 } | |
| 6697 *d = NUL; | |
| 6698 if (lenp != NULL) | |
| 6699 *lenp = (int)(d - retval); | |
| 6700 break; | |
| 6701 | |
| 765 | 6702 # ifdef MACOS_CONVERT |
| 7 | 6703 case CONV_MAC_LATIN1: |
| 6704 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6705 'm', 'l', unconvlenp); |
| 7 | 6706 break; |
| 6707 | |
| 6708 case CONV_LATIN1_MAC: | |
| 6709 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6710 'l', 'm', unconvlenp); |
| 7 | 6711 break; |
| 6712 | |
| 6713 case CONV_MAC_UTF8: | |
| 6714 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6715 'm', 'u', unconvlenp); |
| 7 | 6716 break; |
| 6717 | |
| 6718 case CONV_UTF8_MAC: | |
| 6719 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6720 'u', 'm', unconvlenp); |
| 7 | 6721 break; |
| 6722 # endif | |
| 6723 | |
| 6724 # ifdef USE_ICONV | |
| 6725 case CONV_ICONV: /* conversion with output_conv.vc_fd */ | |
| 1904 | 6726 retval = iconv_string(vcp, ptr, len, unconvlenp, lenp); |
| 7 | 6727 break; |
| 6728 # endif | |
| 6729 # ifdef WIN3264 | |
| 6730 case CONV_CODEPAGE: /* codepage -> codepage */ | |
| 6731 { | |
| 6732 int retlen; | |
| 6733 int tmp_len; | |
| 6734 short_u *tmp; | |
| 6735 | |
| 6736 /* 1. codepage/UTF-8 -> ucs-2. */ | |
| 6737 if (vcp->vc_cpfrom == 0) | |
| 1752 | 6738 tmp_len = utf8_to_utf16(ptr, len, NULL, NULL); |
| 7 | 6739 else |
| 4122 | 6740 { |
| 6741 tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, | |
| 6742 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
|
6743 (char *)ptr, len, 0, 0); |
| 4122 | 6744 if (tmp_len == 0 |
| 6745 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION) | |
| 6746 { | |
| 6747 if (lenp != NULL) | |
| 6748 *lenp = 0; | |
| 6749 if (unconvlenp != NULL) | |
| 6750 *unconvlenp = len; | |
| 6751 retval = alloc(1); | |
| 6752 if (retval) | |
| 6753 retval[0] = NUL; | |
| 6754 return retval; | |
| 6755 } | |
| 6756 } | |
| 7 | 6757 tmp = (short_u *)alloc(sizeof(short_u) * tmp_len); |
| 6758 if (tmp == NULL) | |
| 6759 break; | |
| 6760 if (vcp->vc_cpfrom == 0) | |
| 1752 | 6761 utf8_to_utf16(ptr, len, tmp, unconvlenp); |
| 7 | 6762 else |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6763 MultiByteToWideChar(vcp->vc_cpfrom, 0, |
|
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6764 (char *)ptr, len, tmp, tmp_len); |
| 7 | 6765 |
| 6766 /* 2. ucs-2 -> codepage/UTF-8. */ | |
| 6767 if (vcp->vc_cpto == 0) | |
| 1752 | 6768 retlen = utf16_to_utf8(tmp, tmp_len, NULL); |
| 7 | 6769 else |
| 6770 retlen = WideCharToMultiByte(vcp->vc_cpto, 0, | |
| 6771 tmp, tmp_len, 0, 0, 0, 0); | |
| 6772 retval = alloc(retlen + 1); | |
| 6773 if (retval != NULL) | |
| 6774 { | |
| 6775 if (vcp->vc_cpto == 0) | |
| 1752 | 6776 utf16_to_utf8(tmp, tmp_len, retval); |
| 7 | 6777 else |
| 6778 WideCharToMultiByte(vcp->vc_cpto, 0, | |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6779 tmp, tmp_len, |
|
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6780 (char *)retval, retlen, 0, 0); |
| 7 | 6781 retval[retlen] = NUL; |
| 6782 if (lenp != NULL) | |
| 6783 *lenp = retlen; | |
| 6784 } | |
| 6785 vim_free(tmp); | |
| 6786 break; | |
| 6787 } | |
| 6788 # endif | |
| 6789 } | |
| 6790 | |
| 6791 return retval; | |
| 6792 } | |
| 6793 #endif |