Mercurial > vim
annotate src/mbyte.c @ 2766:415c55534d90 v7.3.159
updated for version 7.3.159
Problem: Using uninitialized pointer when out of memory.
Solution: Check for NULL return value.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Mon, 11 Apr 2011 14:29:17 +0200 |
| parents | fb60c9f35517 |
| children | 0bef86c5c985 |
| rev | line source |
|---|---|
| 7 | 1 /* vi:set ts=8 sts=4 sw=4: |
| 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 | |
| 86 # include <windows.h> | |
| 87 # ifdef WIN32 | |
| 88 # undef WIN32 /* Some windows.h define WIN32, we don't want that here. */ | |
| 89 # endif | |
| 90 #endif | |
| 91 | |
| 92 #if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__) | |
| 93 # include <winnls.h> | |
| 94 #endif | |
| 95 | |
| 96 #ifdef FEAT_GUI_X11 | |
| 97 # include <X11/Intrinsic.h> | |
| 98 #endif | |
| 99 #ifdef X_LOCALE | |
| 100 #include <X11/Xlocale.h> | |
| 101 #endif | |
| 102 | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
103 #if defined(FEAT_GUI_GTK) && defined(FEAT_XIM) |
| 7 | 104 # include <gdk/gdkkeysyms.h> |
| 105 # ifdef WIN3264 | |
| 106 # include <gdk/gdkwin32.h> | |
| 107 # else | |
| 108 # include <gdk/gdkx.h> | |
| 109 # endif | |
| 110 #endif | |
| 111 | |
| 112 #ifdef HAVE_WCHAR_H | |
| 113 # include <wchar.h> | |
| 114 #endif | |
| 115 | |
| 116 #if 0 | |
| 117 /* This has been disabled, because several people reported problems with the | |
| 118 * wcwidth() and iswprint() library functions, esp. for Hebrew. */ | |
| 119 # ifdef __STDC_ISO_10646__ | |
| 120 # define USE_WCHAR_FUNCTIONS | |
| 121 # endif | |
| 122 #endif | |
| 123 | |
| 124 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 125 | |
| 126 static int enc_canon_search __ARGS((char_u *name)); | |
| 127 static int dbcs_char2len __ARGS((int c)); | |
| 128 static int dbcs_char2bytes __ARGS((int c, char_u *buf)); | |
| 474 | 129 static int dbcs_ptr2len __ARGS((char_u *p)); |
| 1903 | 130 static int dbcs_ptr2len_len __ARGS((char_u *p, int size)); |
| 131 static int utf_ptr2cells_len __ARGS((char_u *p, int size)); | |
| 7 | 132 static int dbcs_char2cells __ARGS((int c)); |
| 1903 | 133 static int dbcs_ptr2cells_len __ARGS((char_u *p, int size)); |
| 7 | 134 static int dbcs_ptr2char __ARGS((char_u *p)); |
| 135 | |
| 2015 | 136 /* |
| 137 * Lookup table to quickly get the length in bytes of a UTF-8 character from | |
| 138 * the first byte of a UTF-8 string. | |
| 139 * Bytes which are illegal when used as the first byte have a 1. | |
| 140 * The NUL byte has length 1. | |
| 141 */ | |
| 7 | 142 static char utf8len_tab[256] = |
| 143 { | |
| 144 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, | |
| 145 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, | |
| 146 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, | |
| 147 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 | 148 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, |
| 149 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 | 150 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, |
| 151 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, | |
| 152 }; | |
| 153 | |
| 154 /* | |
| 2015 | 155 * Like utf8len_tab above, but using a zero for illegal lead bytes. |
| 156 */ | |
| 157 static char utf8len_tab_zero[256] = | |
| 158 { | |
| 159 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
| 160 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
| 161 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
| 162 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
| 163 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, | |
| 164 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, | |
| 165 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, | |
| 166 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, | |
| 167 }; | |
| 168 | |
| 169 /* | |
| 7 | 170 * XIM often causes trouble. Define XIM_DEBUG to get a log of XIM callbacks |
| 171 * in the "xim.log" file. | |
| 172 */ | |
| 173 /* #define XIM_DEBUG */ | |
| 174 #ifdef XIM_DEBUG | |
| 175 static void | |
| 176 xim_log(char *s, ...) | |
| 177 { | |
| 178 va_list arglist; | |
| 179 static FILE *fd = NULL; | |
| 180 | |
| 181 if (fd == (FILE *)-1) | |
| 182 return; | |
| 183 if (fd == NULL) | |
| 184 { | |
| 531 | 185 fd = mch_fopen("xim.log", "w"); |
| 7 | 186 if (fd == NULL) |
| 187 { | |
| 188 EMSG("Cannot open xim.log"); | |
| 189 fd = (FILE *)-1; | |
| 190 return; | |
| 191 } | |
| 192 } | |
| 193 | |
| 194 va_start(arglist, s); | |
| 195 vfprintf(fd, s, arglist); | |
| 196 va_end(arglist); | |
| 197 } | |
| 198 #endif | |
| 199 | |
| 200 #endif | |
| 201 | |
| 202 #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) || defined(PROTO) | |
| 203 /* | |
| 204 * Canonical encoding names and their properties. | |
| 205 * "iso-8859-n" is handled by enc_canonize() directly. | |
| 206 */ | |
| 207 static struct | |
| 208 { char *name; int prop; int codepage;} | |
| 209 enc_canon_table[] = | |
| 210 { | |
| 211 #define IDX_LATIN_1 0 | |
| 212 {"latin1", ENC_8BIT + ENC_LATIN1, 1252}, | |
| 213 #define IDX_ISO_2 1 | |
| 214 {"iso-8859-2", ENC_8BIT, 0}, | |
| 215 #define IDX_ISO_3 2 | |
| 216 {"iso-8859-3", ENC_8BIT, 0}, | |
| 217 #define IDX_ISO_4 3 | |
| 218 {"iso-8859-4", ENC_8BIT, 0}, | |
| 219 #define IDX_ISO_5 4 | |
| 220 {"iso-8859-5", ENC_8BIT, 0}, | |
| 221 #define IDX_ISO_6 5 | |
| 222 {"iso-8859-6", ENC_8BIT, 0}, | |
| 223 #define IDX_ISO_7 6 | |
| 224 {"iso-8859-7", ENC_8BIT, 0}, | |
| 407 | 225 #define IDX_ISO_8 7 |
| 7 | 226 {"iso-8859-8", ENC_8BIT, 0}, |
| 407 | 227 #define IDX_ISO_9 8 |
| 7 | 228 {"iso-8859-9", ENC_8BIT, 0}, |
| 407 | 229 #define IDX_ISO_10 9 |
| 7 | 230 {"iso-8859-10", ENC_8BIT, 0}, |
| 407 | 231 #define IDX_ISO_11 10 |
| 7 | 232 {"iso-8859-11", ENC_8BIT, 0}, |
| 407 | 233 #define IDX_ISO_13 11 |
| 7 | 234 {"iso-8859-13", ENC_8BIT, 0}, |
| 407 | 235 #define IDX_ISO_14 12 |
| 7 | 236 {"iso-8859-14", ENC_8BIT, 0}, |
| 407 | 237 #define IDX_ISO_15 13 |
| 26 | 238 {"iso-8859-15", ENC_8BIT + ENC_LATIN9, 0}, |
| 407 | 239 #define IDX_KOI8_R 14 |
| 7 | 240 {"koi8-r", ENC_8BIT, 0}, |
| 407 | 241 #define IDX_KOI8_U 15 |
| 7 | 242 {"koi8-u", ENC_8BIT, 0}, |
| 407 | 243 #define IDX_UTF8 16 |
| 7 | 244 {"utf-8", ENC_UNICODE, 0}, |
| 407 | 245 #define IDX_UCS2 17 |
| 7 | 246 {"ucs-2", ENC_UNICODE + ENC_ENDIAN_B + ENC_2BYTE, 0}, |
| 407 | 247 #define IDX_UCS2LE 18 |
| 7 | 248 {"ucs-2le", ENC_UNICODE + ENC_ENDIAN_L + ENC_2BYTE, 0}, |
| 407 | 249 #define IDX_UTF16 19 |
| 7 | 250 {"utf-16", ENC_UNICODE + ENC_ENDIAN_B + ENC_2WORD, 0}, |
| 407 | 251 #define IDX_UTF16LE 20 |
| 7 | 252 {"utf-16le", ENC_UNICODE + ENC_ENDIAN_L + ENC_2WORD, 0}, |
| 407 | 253 #define IDX_UCS4 21 |
| 7 | 254 {"ucs-4", ENC_UNICODE + ENC_ENDIAN_B + ENC_4BYTE, 0}, |
| 407 | 255 #define IDX_UCS4LE 22 |
| 7 | 256 {"ucs-4le", ENC_UNICODE + ENC_ENDIAN_L + ENC_4BYTE, 0}, |
| 407 | 257 |
| 258 /* For debugging DBCS encoding on Unix. */ | |
| 259 #define IDX_DEBUG 23 | |
| 7 | 260 {"debug", ENC_DBCS, DBCS_DEBUG}, |
| 407 | 261 #define IDX_EUC_JP 24 |
| 7 | 262 {"euc-jp", ENC_DBCS, DBCS_JPNU}, |
| 407 | 263 #define IDX_SJIS 25 |
| 7 | 264 {"sjis", ENC_DBCS, DBCS_JPN}, |
| 407 | 265 #define IDX_EUC_KR 26 |
| 7 | 266 {"euc-kr", ENC_DBCS, DBCS_KORU}, |
| 407 | 267 #define IDX_EUC_CN 27 |
| 7 | 268 {"euc-cn", ENC_DBCS, DBCS_CHSU}, |
| 407 | 269 #define IDX_EUC_TW 28 |
| 7 | 270 {"euc-tw", ENC_DBCS, DBCS_CHTU}, |
| 407 | 271 #define IDX_BIG5 29 |
| 7 | 272 {"big5", ENC_DBCS, DBCS_CHT}, |
| 407 | 273 |
| 274 /* MS-DOS and MS-Windows codepages are included here, so that they can be | |
| 275 * used on Unix too. Most of them are similar to ISO-8859 encodings, but | |
| 276 * not exactly the same. */ | |
| 277 #define IDX_CP437 30 | |
| 278 {"cp437", ENC_8BIT, 437}, /* like iso-8859-1 */ | |
| 279 #define IDX_CP737 31 | |
| 280 {"cp737", ENC_8BIT, 737}, /* like iso-8859-7 */ | |
| 281 #define IDX_CP775 32 | |
| 282 {"cp775", ENC_8BIT, 775}, /* Baltic */ | |
| 283 #define IDX_CP850 33 | |
| 284 {"cp850", ENC_8BIT, 850}, /* like iso-8859-4 */ | |
| 285 #define IDX_CP852 34 | |
| 286 {"cp852", ENC_8BIT, 852}, /* like iso-8859-1 */ | |
| 287 #define IDX_CP855 35 | |
| 288 {"cp855", ENC_8BIT, 855}, /* like iso-8859-2 */ | |
| 289 #define IDX_CP857 36 | |
| 290 {"cp857", ENC_8BIT, 857}, /* like iso-8859-5 */ | |
| 291 #define IDX_CP860 37 | |
| 292 {"cp860", ENC_8BIT, 860}, /* like iso-8859-9 */ | |
| 293 #define IDX_CP861 38 | |
| 294 {"cp861", ENC_8BIT, 861}, /* like iso-8859-1 */ | |
| 295 #define IDX_CP862 39 | |
| 296 {"cp862", ENC_8BIT, 862}, /* like iso-8859-1 */ | |
| 297 #define IDX_CP863 40 | |
| 298 {"cp863", ENC_8BIT, 863}, /* like iso-8859-8 */ | |
| 299 #define IDX_CP865 41 | |
| 300 {"cp865", ENC_8BIT, 865}, /* like iso-8859-1 */ | |
| 301 #define IDX_CP866 42 | |
| 302 {"cp866", ENC_8BIT, 866}, /* like iso-8859-5 */ | |
| 303 #define IDX_CP869 43 | |
| 304 {"cp869", ENC_8BIT, 869}, /* like iso-8859-7 */ | |
| 305 #define IDX_CP874 44 | |
| 306 {"cp874", ENC_8BIT, 874}, /* Thai */ | |
| 307 #define IDX_CP932 45 | |
| 308 {"cp932", ENC_DBCS, DBCS_JPN}, | |
| 309 #define IDX_CP936 46 | |
| 310 {"cp936", ENC_DBCS, DBCS_CHS}, | |
| 311 #define IDX_CP949 47 | |
| 312 {"cp949", ENC_DBCS, DBCS_KOR}, | |
| 313 #define IDX_CP950 48 | |
| 314 {"cp950", ENC_DBCS, DBCS_CHT}, | |
| 315 #define IDX_CP1250 49 | |
| 316 {"cp1250", ENC_8BIT, 1250}, /* Czech, Polish, etc. */ | |
| 317 #define IDX_CP1251 50 | |
| 318 {"cp1251", ENC_8BIT, 1251}, /* Cyrillic */ | |
| 319 /* cp1252 is considered to be equal to latin1 */ | |
| 320 #define IDX_CP1253 51 | |
| 321 {"cp1253", ENC_8BIT, 1253}, /* Greek */ | |
| 322 #define IDX_CP1254 52 | |
| 323 {"cp1254", ENC_8BIT, 1254}, /* Turkish */ | |
| 324 #define IDX_CP1255 53 | |
| 325 {"cp1255", ENC_8BIT, 1255}, /* Hebrew */ | |
| 326 #define IDX_CP1256 54 | |
| 327 {"cp1256", ENC_8BIT, 1256}, /* Arabic */ | |
| 328 #define IDX_CP1257 55 | |
| 329 {"cp1257", ENC_8BIT, 1257}, /* Baltic */ | |
| 330 #define IDX_CP1258 56 | |
| 331 {"cp1258", ENC_8BIT, 1258}, /* Vietnamese */ | |
| 332 | |
| 333 #define IDX_MACROMAN 57 | |
| 334 {"macroman", ENC_8BIT + ENC_MACROMAN, 0}, /* Mac OS */ | |
| 890 | 335 #define IDX_DECMCS 58 |
| 336 {"dec-mcs", ENC_8BIT, 0}, /* DEC MCS */ | |
| 337 #define IDX_HPROMAN8 59 | |
| 338 {"hp-roman8", ENC_8BIT, 0}, /* HP Roman8 */ | |
| 339 #define IDX_COUNT 60 | |
| 7 | 340 }; |
| 341 | |
| 342 /* | |
| 343 * Aliases for encoding names. | |
| 344 */ | |
| 345 static struct | |
| 346 { char *name; int canon;} | |
| 347 enc_alias_table[] = | |
| 348 { | |
| 349 {"ansi", IDX_LATIN_1}, | |
| 350 {"iso-8859-1", IDX_LATIN_1}, | |
| 351 {"latin2", IDX_ISO_2}, | |
| 352 {"latin3", IDX_ISO_3}, | |
| 353 {"latin4", IDX_ISO_4}, | |
| 354 {"cyrillic", IDX_ISO_5}, | |
| 355 {"arabic", IDX_ISO_6}, | |
| 356 {"greek", IDX_ISO_7}, | |
| 357 #ifdef WIN3264 | |
| 358 {"hebrew", IDX_CP1255}, | |
| 359 #else | |
| 360 {"hebrew", IDX_ISO_8}, | |
| 361 #endif | |
| 362 {"latin5", IDX_ISO_9}, | |
| 363 {"turkish", IDX_ISO_9}, /* ? */ | |
| 364 {"latin6", IDX_ISO_10}, | |
| 365 {"nordic", IDX_ISO_10}, /* ? */ | |
| 366 {"thai", IDX_ISO_11}, /* ? */ | |
| 367 {"latin7", IDX_ISO_13}, | |
| 368 {"latin8", IDX_ISO_14}, | |
| 369 {"latin9", IDX_ISO_15}, | |
| 370 {"utf8", IDX_UTF8}, | |
| 371 {"unicode", IDX_UCS2}, | |
| 372 {"ucs2", IDX_UCS2}, | |
| 373 {"ucs2be", IDX_UCS2}, | |
| 374 {"ucs-2be", IDX_UCS2}, | |
| 375 {"ucs2le", IDX_UCS2LE}, | |
| 376 {"utf16", IDX_UTF16}, | |
| 377 {"utf16be", IDX_UTF16}, | |
| 378 {"utf-16be", IDX_UTF16}, | |
| 379 {"utf16le", IDX_UTF16LE}, | |
| 380 {"ucs4", IDX_UCS4}, | |
| 381 {"ucs4be", IDX_UCS4}, | |
| 382 {"ucs-4be", IDX_UCS4}, | |
| 383 {"ucs4le", IDX_UCS4LE}, | |
| 1540 | 384 {"utf32", IDX_UCS4}, |
| 385 {"utf-32", IDX_UCS4}, | |
| 386 {"utf32be", IDX_UCS4}, | |
| 387 {"utf-32be", IDX_UCS4}, | |
| 388 {"utf32le", IDX_UCS4LE}, | |
| 389 {"utf-32le", IDX_UCS4LE}, | |
| 7 | 390 {"932", IDX_CP932}, |
| 391 {"949", IDX_CP949}, | |
| 392 {"936", IDX_CP936}, | |
| 932 | 393 {"gbk", IDX_CP936}, |
| 7 | 394 {"950", IDX_CP950}, |
| 395 {"eucjp", IDX_EUC_JP}, | |
| 396 {"unix-jis", IDX_EUC_JP}, | |
| 397 {"ujis", IDX_EUC_JP}, | |
| 398 {"shift-jis", IDX_SJIS}, | |
| 399 {"euckr", IDX_EUC_KR}, | |
| 400 {"5601", IDX_EUC_KR}, /* Sun: KS C 5601 */ | |
| 401 {"euccn", IDX_EUC_CN}, | |
| 402 {"gb2312", IDX_EUC_CN}, | |
| 403 {"euctw", IDX_EUC_TW}, | |
| 404 #if defined(WIN3264) || defined(WIN32UNIX) || defined(MACOS) | |
| 405 {"japan", IDX_CP932}, | |
| 406 {"korea", IDX_CP949}, | |
| 407 {"prc", IDX_CP936}, | |
| 408 {"chinese", IDX_CP936}, | |
| 409 {"taiwan", IDX_CP950}, | |
| 410 {"big5", IDX_CP950}, | |
| 411 #else | |
| 412 {"japan", IDX_EUC_JP}, | |
| 413 {"korea", IDX_EUC_KR}, | |
| 414 {"prc", IDX_EUC_CN}, | |
| 415 {"chinese", IDX_EUC_CN}, | |
| 416 {"taiwan", IDX_EUC_TW}, | |
| 417 {"cp950", IDX_BIG5}, | |
| 418 {"950", IDX_BIG5}, | |
| 419 #endif | |
| 420 {"mac", IDX_MACROMAN}, | |
| 890 | 421 {"mac-roman", IDX_MACROMAN}, |
| 7 | 422 {NULL, 0} |
| 423 }; | |
| 424 | |
| 425 #ifndef CP_UTF8 | |
| 426 # define CP_UTF8 65001 /* magic number from winnls.h */ | |
| 427 #endif | |
| 428 | |
| 429 /* | |
| 430 * Find encoding "name" in the list of canonical encoding names. | |
| 431 * Returns -1 if not found. | |
| 432 */ | |
| 433 static int | |
| 434 enc_canon_search(name) | |
| 435 char_u *name; | |
| 436 { | |
| 437 int i; | |
| 438 | |
| 439 for (i = 0; i < IDX_COUNT; ++i) | |
| 440 if (STRCMP(name, enc_canon_table[i].name) == 0) | |
| 441 return i; | |
| 442 return -1; | |
| 443 } | |
| 444 | |
| 445 #endif | |
| 446 | |
| 447 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 448 | |
| 449 /* | |
| 450 * Find canonical encoding "name" in the list and return its properties. | |
| 451 * Returns 0 if not found. | |
| 452 */ | |
| 453 int | |
| 454 enc_canon_props(name) | |
| 455 char_u *name; | |
| 456 { | |
| 457 int i; | |
| 458 | |
| 459 i = enc_canon_search(name); | |
| 460 if (i >= 0) | |
| 461 return enc_canon_table[i].prop; | |
| 462 #ifdef WIN3264 | |
| 463 if (name[0] == 'c' && name[1] == 'p' && VIM_ISDIGIT(name[2])) | |
| 464 { | |
| 465 CPINFO cpinfo; | |
| 466 | |
| 467 /* Get info on this codepage to find out what it is. */ | |
| 468 if (GetCPInfo(atoi(name + 2), &cpinfo) != 0) | |
| 469 { | |
| 470 if (cpinfo.MaxCharSize == 1) /* some single-byte encoding */ | |
| 471 return ENC_8BIT; | |
| 472 if (cpinfo.MaxCharSize == 2 | |
| 473 && (cpinfo.LeadByte[0] != 0 || cpinfo.LeadByte[1] != 0)) | |
| 474 /* must be a DBCS encoding */ | |
| 475 return ENC_DBCS; | |
| 476 } | |
| 477 return 0; | |
| 478 } | |
| 479 #endif | |
| 480 if (STRNCMP(name, "2byte-", 6) == 0) | |
| 481 return ENC_DBCS; | |
| 482 if (STRNCMP(name, "8bit-", 5) == 0 || STRNCMP(name, "iso-8859-", 9) == 0) | |
| 483 return ENC_8BIT; | |
| 484 return 0; | |
| 485 } | |
| 486 | |
| 487 /* | |
| 488 * Set up for using multi-byte characters. | |
| 489 * Called in three cases: | |
| 490 * - by main() to initialize (p_enc == NULL) | |
| 491 * - by set_init_1() after 'encoding' was set to its default. | |
| 492 * - by do_set() when 'encoding' has been set. | |
| 493 * p_enc must have been passed through enc_canonize() already. | |
| 494 * Sets the "enc_unicode", "enc_utf8", "enc_dbcs" and "has_mbyte" flags. | |
| 495 * Fills mb_bytelen_tab[] and returns NULL when there are no problems. | |
| 496 * When there is something wrong: Returns an error message and doesn't change | |
| 497 * anything. | |
| 498 */ | |
| 499 char_u * | |
| 500 mb_init() | |
| 501 { | |
| 502 int i; | |
| 503 int idx; | |
| 504 int n; | |
| 505 int enc_dbcs_new = 0; | |
| 506 #if defined(USE_ICONV) && !defined(WIN3264) && !defined(WIN32UNIX) \ | |
| 507 && !defined(MACOS) | |
| 508 # define LEN_FROM_CONV | |
| 509 vimconv_T vimconv; | |
| 510 char_u *p; | |
| 511 #endif | |
| 512 | |
| 513 if (p_enc == NULL) | |
| 514 { | |
| 515 /* Just starting up: set the whole table to one's. */ | |
| 516 for (i = 0; i < 256; ++i) | |
| 517 mb_bytelen_tab[i] = 1; | |
| 518 input_conv.vc_type = CONV_NONE; | |
| 519 input_conv.vc_factor = 1; | |
| 520 output_conv.vc_type = CONV_NONE; | |
| 521 return NULL; | |
| 522 } | |
| 523 | |
| 524 #ifdef WIN3264 | |
| 525 if (p_enc[0] == 'c' && p_enc[1] == 'p' && VIM_ISDIGIT(p_enc[2])) | |
| 526 { | |
| 527 CPINFO cpinfo; | |
| 528 | |
| 529 /* Get info on this codepage to find out what it is. */ | |
| 530 if (GetCPInfo(atoi(p_enc + 2), &cpinfo) != 0) | |
| 531 { | |
| 532 if (cpinfo.MaxCharSize == 1) | |
| 533 { | |
| 534 /* some single-byte encoding */ | |
| 535 enc_unicode = 0; | |
| 536 enc_utf8 = FALSE; | |
| 537 } | |
| 538 else if (cpinfo.MaxCharSize == 2 | |
| 539 && (cpinfo.LeadByte[0] != 0 || cpinfo.LeadByte[1] != 0)) | |
| 540 { | |
| 541 /* must be a DBCS encoding, check below */ | |
| 542 enc_dbcs_new = atoi(p_enc + 2); | |
| 543 } | |
| 544 else | |
| 545 goto codepage_invalid; | |
| 546 } | |
| 547 else if (GetLastError() == ERROR_INVALID_PARAMETER) | |
| 548 { | |
| 549 codepage_invalid: | |
| 550 return (char_u *)N_("E543: Not a valid codepage"); | |
| 551 } | |
| 552 } | |
| 553 #endif | |
| 554 else if (STRNCMP(p_enc, "8bit-", 5) == 0 | |
| 555 || STRNCMP(p_enc, "iso-8859-", 9) == 0) | |
| 556 { | |
| 557 /* Accept any "8bit-" or "iso-8859-" name. */ | |
| 558 enc_unicode = 0; | |
| 559 enc_utf8 = FALSE; | |
| 560 } | |
| 561 else if (STRNCMP(p_enc, "2byte-", 6) == 0) | |
| 562 { | |
| 563 #ifdef WIN3264 | |
| 564 /* Windows: accept only valid codepage numbers, check below. */ | |
| 565 if (p_enc[6] != 'c' || p_enc[7] != 'p' | |
| 566 || (enc_dbcs_new = atoi(p_enc + 8)) == 0) | |
| 567 return e_invarg; | |
| 568 #else | |
| 569 /* Unix: accept any "2byte-" name, assume current locale. */ | |
| 570 enc_dbcs_new = DBCS_2BYTE; | |
| 571 #endif | |
| 572 } | |
| 573 else if ((idx = enc_canon_search(p_enc)) >= 0) | |
| 574 { | |
| 575 i = enc_canon_table[idx].prop; | |
| 576 if (i & ENC_UNICODE) | |
| 577 { | |
| 578 /* Unicode */ | |
| 579 enc_utf8 = TRUE; | |
| 580 if (i & (ENC_2BYTE | ENC_2WORD)) | |
| 581 enc_unicode = 2; | |
| 582 else if (i & ENC_4BYTE) | |
| 583 enc_unicode = 4; | |
| 584 else | |
| 585 enc_unicode = 0; | |
| 586 } | |
| 587 else if (i & ENC_DBCS) | |
| 588 { | |
| 589 /* 2byte, handle below */ | |
| 590 enc_dbcs_new = enc_canon_table[idx].codepage; | |
| 591 } | |
| 592 else | |
| 593 { | |
| 594 /* Must be 8-bit. */ | |
| 595 enc_unicode = 0; | |
| 596 enc_utf8 = FALSE; | |
| 597 } | |
| 598 } | |
| 599 else /* Don't know what encoding this is, reject it. */ | |
| 600 return e_invarg; | |
| 601 | |
| 602 if (enc_dbcs_new != 0) | |
| 603 { | |
| 604 #ifdef WIN3264 | |
| 605 /* Check if the DBCS code page is OK. */ | |
| 606 if (!IsValidCodePage(enc_dbcs_new)) | |
| 607 goto codepage_invalid; | |
| 608 #endif | |
| 609 enc_unicode = 0; | |
| 610 enc_utf8 = FALSE; | |
| 611 } | |
| 612 enc_dbcs = enc_dbcs_new; | |
| 613 has_mbyte = (enc_dbcs != 0 || enc_utf8); | |
| 614 | |
| 615 #ifdef WIN3264 | |
| 616 enc_codepage = encname2codepage(p_enc); | |
| 26 | 617 enc_latin9 = (STRCMP(p_enc, "iso-8859-15") == 0); |
| 7 | 618 #endif |
| 619 | |
| 492 | 620 /* Detect an encoding that uses latin1 characters. */ |
| 621 enc_latin1like = (enc_utf8 || STRCMP(p_enc, "latin1") == 0 | |
| 622 || STRCMP(p_enc, "iso-8859-15") == 0); | |
| 623 | |
| 7 | 624 /* |
| 625 * Set the function pointers. | |
| 626 */ | |
| 627 if (enc_utf8) | |
| 628 { | |
| 474 | 629 mb_ptr2len = utfc_ptr2len; |
| 1903 | 630 mb_ptr2len_len = utfc_ptr2len_len; |
| 7 | 631 mb_char2len = utf_char2len; |
| 632 mb_char2bytes = utf_char2bytes; | |
| 633 mb_ptr2cells = utf_ptr2cells; | |
| 1903 | 634 mb_ptr2cells_len = utf_ptr2cells_len; |
| 7 | 635 mb_char2cells = utf_char2cells; |
| 636 mb_off2cells = utf_off2cells; | |
| 637 mb_ptr2char = utf_ptr2char; | |
| 638 mb_head_off = utf_head_off; | |
| 639 } | |
| 640 else if (enc_dbcs != 0) | |
| 641 { | |
| 474 | 642 mb_ptr2len = dbcs_ptr2len; |
| 1903 | 643 mb_ptr2len_len = dbcs_ptr2len_len; |
| 7 | 644 mb_char2len = dbcs_char2len; |
| 645 mb_char2bytes = dbcs_char2bytes; | |
| 646 mb_ptr2cells = dbcs_ptr2cells; | |
| 1903 | 647 mb_ptr2cells_len = dbcs_ptr2cells_len; |
| 7 | 648 mb_char2cells = dbcs_char2cells; |
| 649 mb_off2cells = dbcs_off2cells; | |
| 650 mb_ptr2char = dbcs_ptr2char; | |
| 651 mb_head_off = dbcs_head_off; | |
| 652 } | |
| 653 else | |
| 654 { | |
| 474 | 655 mb_ptr2len = latin_ptr2len; |
| 1903 | 656 mb_ptr2len_len = latin_ptr2len_len; |
| 7 | 657 mb_char2len = latin_char2len; |
| 658 mb_char2bytes = latin_char2bytes; | |
| 659 mb_ptr2cells = latin_ptr2cells; | |
| 1903 | 660 mb_ptr2cells_len = latin_ptr2cells_len; |
| 7 | 661 mb_char2cells = latin_char2cells; |
| 662 mb_off2cells = latin_off2cells; | |
| 663 mb_ptr2char = latin_ptr2char; | |
| 664 mb_head_off = latin_head_off; | |
| 665 } | |
| 666 | |
| 667 /* | |
| 668 * Fill the mb_bytelen_tab[] for MB_BYTE2LEN(). | |
| 669 */ | |
| 670 #ifdef LEN_FROM_CONV | |
| 671 /* When 'encoding' is different from the current locale mblen() won't | |
| 672 * work. Use conversion to "utf-8" instead. */ | |
| 673 vimconv.vc_type = CONV_NONE; | |
| 674 if (enc_dbcs) | |
| 675 { | |
| 676 p = enc_locale(); | |
| 677 if (p == NULL || STRCMP(p, p_enc) != 0) | |
| 678 { | |
| 679 convert_setup(&vimconv, p_enc, (char_u *)"utf-8"); | |
| 680 vimconv.vc_fail = TRUE; | |
| 681 } | |
| 682 vim_free(p); | |
| 683 } | |
| 684 #endif | |
| 685 | |
| 686 for (i = 0; i < 256; ++i) | |
| 687 { | |
| 688 /* Our own function to reliably check the length of UTF-8 characters, | |
| 689 * independent of mblen(). */ | |
| 690 if (enc_utf8) | |
| 691 n = utf8len_tab[i]; | |
| 692 else if (enc_dbcs == 0) | |
| 693 n = 1; | |
| 694 else | |
| 695 { | |
| 696 #if defined(WIN3264) || defined(WIN32UNIX) | |
| 697 /* enc_dbcs is set by setting 'fileencoding'. It becomes a Windows | |
| 698 * CodePage identifier, which we can pass directly in to Windows | |
| 699 * API */ | |
| 700 n = IsDBCSLeadByteEx(enc_dbcs, (BYTE)i) ? 2 : 1; | |
| 701 #else | |
| 1030 | 702 # if defined(MACOS) || defined(__amigaos4__) |
| 7 | 703 /* |
| 704 * if mblen() is not available, character which MSB is turned on | |
| 705 * are treated as leading byte character. (note : This assumption | |
| 706 * is not always true.) | |
| 707 */ | |
| 708 n = (i & 0x80) ? 2 : 1; | |
| 709 # else | |
| 710 char buf[MB_MAXBYTES]; | |
| 711 # ifdef X_LOCALE | |
| 712 # ifndef mblen | |
| 713 # define mblen _Xmblen | |
| 714 # endif | |
| 715 # endif | |
| 716 if (i == NUL) /* just in case mblen() can't handle "" */ | |
| 717 n = 1; | |
| 718 else | |
| 719 { | |
| 720 buf[0] = i; | |
| 721 buf[1] = 0; | |
| 722 #ifdef LEN_FROM_CONV | |
| 723 if (vimconv.vc_type != CONV_NONE) | |
| 724 { | |
| 725 /* | |
| 726 * string_convert() should fail when converting the first | |
| 727 * byte of a double-byte character. | |
| 728 */ | |
| 729 p = string_convert(&vimconv, (char_u *)buf, NULL); | |
| 730 if (p != NULL) | |
| 731 { | |
| 732 vim_free(p); | |
| 733 n = 1; | |
| 734 } | |
| 735 else | |
| 736 n = 2; | |
| 737 } | |
| 738 else | |
| 739 #endif | |
| 740 { | |
| 741 /* | |
| 742 * mblen() should return -1 for invalid (means the leading | |
| 743 * multibyte) character. However there are some platforms | |
| 744 * where mblen() returns 0 for invalid character. | |
| 745 * Therefore, following condition includes 0. | |
| 746 */ | |
| 1757 | 747 ignored = mblen(NULL, 0); /* First reset the state. */ |
| 7 | 748 if (mblen(buf, (size_t)1) <= 0) |
| 749 n = 2; | |
| 750 else | |
| 751 n = 1; | |
| 752 } | |
| 753 } | |
| 754 # endif | |
| 755 #endif | |
| 756 } | |
| 757 | |
| 758 mb_bytelen_tab[i] = n; | |
| 759 } | |
| 760 | |
| 761 #ifdef LEN_FROM_CONV | |
| 762 convert_setup(&vimconv, NULL, NULL); | |
| 763 #endif | |
| 764 | |
| 765 /* The cell width depends on the type of multi-byte characters. */ | |
| 766 (void)init_chartab(); | |
| 767 | |
| 768 /* When enc_utf8 is set or reset, (de)allocate ScreenLinesUC[] */ | |
| 769 screenalloc(FALSE); | |
| 770 | |
| 771 /* When using Unicode, set default for 'fileencodings'. */ | |
| 772 if (enc_utf8 && !option_was_set((char_u *)"fencs")) | |
| 773 set_string_option_direct((char_u *)"fencs", -1, | |
| 694 | 774 (char_u *)"ucs-bom,utf-8,default,latin1", OPT_FREE, 0); |
| 775 | |
| 7 | 776 #if defined(HAVE_BIND_TEXTDOMAIN_CODESET) && defined(FEAT_GETTEXT) |
| 777 /* GNU gettext 0.10.37 supports this feature: set the codeset used for | |
| 778 * translated messages independently from the current locale. */ | |
| 779 (void)bind_textdomain_codeset(VIMPACKAGE, | |
| 780 enc_utf8 ? "utf-8" : (char *)p_enc); | |
| 781 #endif | |
| 782 | |
| 23 | 783 #ifdef WIN32 |
| 784 /* When changing 'encoding' while starting up, then convert the command | |
| 785 * line arguments from the active codepage to 'encoding'. */ | |
| 786 if (starting != 0) | |
| 787 fix_arg_enc(); | |
| 788 #endif | |
| 789 | |
| 7 | 790 #ifdef FEAT_AUTOCMD |
| 791 /* Fire an autocommand to let people do custom font setup. This must be | |
| 792 * after Vim has been setup for the new encoding. */ | |
| 793 apply_autocmds(EVENT_ENCODINGCHANGED, NULL, (char_u *)"", FALSE, curbuf); | |
| 794 #endif | |
| 795 | |
| 740 | 796 #ifdef FEAT_SPELL |
| 236 | 797 /* Need to reload spell dictionaries */ |
| 798 spell_reload(); | |
| 799 #endif | |
| 800 | |
| 7 | 801 return NULL; |
| 802 } | |
| 803 | |
| 804 /* | |
| 805 * Return the size of the BOM for the current buffer: | |
| 806 * 0 - no BOM | |
| 807 * 2 - UCS-2 or UTF-16 BOM | |
| 808 * 4 - UCS-4 BOM | |
| 809 * 3 - UTF-8 BOM | |
| 810 */ | |
| 811 int | |
| 812 bomb_size() | |
| 813 { | |
| 814 int n = 0; | |
| 815 | |
| 816 if (curbuf->b_p_bomb && !curbuf->b_p_bin) | |
| 817 { | |
| 818 if (*curbuf->b_p_fenc == NUL) | |
| 819 { | |
| 820 if (enc_utf8) | |
| 821 { | |
| 822 if (enc_unicode != 0) | |
| 823 n = enc_unicode; | |
| 824 else | |
| 825 n = 3; | |
| 826 } | |
| 827 } | |
| 828 else if (STRCMP(curbuf->b_p_fenc, "utf-8") == 0) | |
| 829 n = 3; | |
| 830 else if (STRNCMP(curbuf->b_p_fenc, "ucs-2", 5) == 0 | |
| 831 || STRNCMP(curbuf->b_p_fenc, "utf-16", 6) == 0) | |
| 832 n = 2; | |
| 833 else if (STRNCMP(curbuf->b_p_fenc, "ucs-4", 5) == 0) | |
| 834 n = 4; | |
| 835 } | |
| 836 return n; | |
| 837 } | |
| 838 | |
| 839 /* | |
| 840 * Get class of pointer: | |
| 841 * 0 for blank or NUL | |
| 842 * 1 for punctuation | |
| 843 * 2 for an (ASCII) word character | |
| 844 * >2 for other word characters | |
| 845 */ | |
| 846 int | |
| 847 mb_get_class(p) | |
| 848 char_u *p; | |
| 849 { | |
| 850 if (MB_BYTE2LEN(p[0]) == 1) | |
| 851 { | |
| 852 if (p[0] == NUL || vim_iswhite(p[0])) | |
| 853 return 0; | |
| 854 if (vim_iswordc(p[0])) | |
| 855 return 2; | |
| 856 return 1; | |
| 857 } | |
| 858 if (enc_dbcs != 0 && p[0] != NUL && p[1] != NUL) | |
| 859 return dbcs_class(p[0], p[1]); | |
| 860 if (enc_utf8) | |
| 861 return utf_class(utf_ptr2char(p)); | |
| 862 return 0; | |
| 863 } | |
| 864 | |
| 865 /* | |
| 866 * Get class of a double-byte character. This always returns 3 or bigger. | |
| 867 * TODO: Should return 1 for punctuation. | |
| 868 */ | |
| 869 int | |
| 870 dbcs_class(lead, trail) | |
| 871 unsigned lead; | |
| 872 unsigned trail; | |
| 873 { | |
| 874 switch (enc_dbcs) | |
| 875 { | |
| 876 /* please add classfy routine for your language in here */ | |
| 877 | |
| 878 case DBCS_JPNU: /* ? */ | |
| 879 case DBCS_JPN: | |
| 880 { | |
| 881 /* JIS code classification */ | |
| 882 unsigned char lb = lead; | |
| 883 unsigned char tb = trail; | |
| 884 | |
| 885 /* convert process code to JIS */ | |
| 886 # if defined(WIN3264) || defined(WIN32UNIX) || defined(MACOS) | |
| 887 /* process code is SJIS */ | |
| 888 if (lb <= 0x9f) | |
| 889 lb = (lb - 0x81) * 2 + 0x21; | |
| 890 else | |
| 891 lb = (lb - 0xc1) * 2 + 0x21; | |
| 892 if (tb <= 0x7e) | |
| 893 tb -= 0x1f; | |
| 894 else if (tb <= 0x9e) | |
| 895 tb -= 0x20; | |
| 896 else | |
| 897 { | |
| 898 tb -= 0x7e; | |
| 899 lb += 1; | |
| 900 } | |
| 901 # else | |
| 902 /* | |
| 903 * XXX: Code page identification can not use with all | |
| 904 * system! So, some other encoding information | |
| 905 * will be needed. | |
| 906 * In japanese: SJIS,EUC,UNICODE,(JIS) | |
| 907 * Note that JIS-code system don't use as | |
| 908 * process code in most system because it uses | |
| 909 * escape sequences(JIS is context depend encoding). | |
| 910 */ | |
| 911 /* assume process code is JAPANESE-EUC */ | |
| 912 lb &= 0x7f; | |
| 913 tb &= 0x7f; | |
| 914 # endif | |
| 915 /* exceptions */ | |
| 916 switch (lb << 8 | tb) | |
| 917 { | |
| 918 case 0x2121: /* ZENKAKU space */ | |
| 919 return 0; | |
| 920 case 0x2122: /* KU-TEN (Japanese comma) */ | |
| 921 case 0x2123: /* TOU-TEN (Japanese period) */ | |
| 922 case 0x2124: /* ZENKAKU comma */ | |
| 923 case 0x2125: /* ZENKAKU period */ | |
| 924 return 1; | |
| 925 case 0x213c: /* prolongedsound handled as KATAKANA */ | |
| 926 return 13; | |
| 927 } | |
| 928 /* sieved by KU code */ | |
| 929 switch (lb) | |
| 930 { | |
| 931 case 0x21: | |
| 932 case 0x22: | |
| 933 /* special symbols */ | |
| 934 return 10; | |
| 935 case 0x23: | |
| 936 /* alpha-numeric */ | |
| 937 return 11; | |
| 938 case 0x24: | |
| 939 /* hiragana */ | |
| 940 return 12; | |
| 941 case 0x25: | |
| 942 /* katakana */ | |
| 943 return 13; | |
| 944 case 0x26: | |
| 945 /* greek */ | |
| 946 return 14; | |
| 947 case 0x27: | |
| 948 /* russian */ | |
| 949 return 15; | |
| 950 case 0x28: | |
| 951 /* lines */ | |
| 952 return 16; | |
| 953 default: | |
| 954 /* kanji */ | |
| 955 return 17; | |
| 956 } | |
| 957 } | |
| 958 | |
| 959 case DBCS_KORU: /* ? */ | |
| 960 case DBCS_KOR: | |
| 961 { | |
| 962 /* KS code classification */ | |
| 963 unsigned char c1 = lead; | |
| 964 unsigned char c2 = trail; | |
| 965 | |
| 966 /* | |
| 967 * 20 : Hangul | |
| 968 * 21 : Hanja | |
| 969 * 22 : Symbols | |
| 970 * 23 : Alpha-numeric/Roman Letter (Full width) | |
| 971 * 24 : Hangul Letter(Alphabet) | |
| 972 * 25 : Roman Numeral/Greek Letter | |
| 973 * 26 : Box Drawings | |
| 974 * 27 : Unit Symbols | |
| 975 * 28 : Circled/Parenthesized Letter | |
| 976 * 29 : Hirigana/Katakana | |
| 977 * 30 : Cyrillic Letter | |
| 978 */ | |
| 979 | |
| 980 if (c1 >= 0xB0 && c1 <= 0xC8) | |
| 981 /* Hangul */ | |
| 982 return 20; | |
| 983 #if defined(WIN3264) || defined(WIN32UNIX) | |
| 984 else if (c1 <= 0xA0 || c2 <= 0xA0) | |
| 985 /* Extended Hangul Region : MS UHC(Unified Hangul Code) */ | |
| 986 /* c1: 0x81-0xA0 with c2: 0x41-0x5A, 0x61-0x7A, 0x81-0xFE | |
| 987 * c1: 0xA1-0xC6 with c2: 0x41-0x5A, 0x61-0x7A, 0x81-0xA0 | |
| 988 */ | |
| 989 return 20; | |
| 990 #endif | |
| 991 | |
| 992 else if (c1 >= 0xCA && c1 <= 0xFD) | |
| 993 /* Hanja */ | |
| 994 return 21; | |
| 995 else switch (c1) | |
| 996 { | |
| 997 case 0xA1: | |
| 998 case 0xA2: | |
| 999 /* Symbols */ | |
| 1000 return 22; | |
| 1001 case 0xA3: | |
| 1002 /* Alpha-numeric */ | |
| 1003 return 23; | |
| 1004 case 0xA4: | |
| 1005 /* Hangul Letter(Alphabet) */ | |
| 1006 return 24; | |
| 1007 case 0xA5: | |
| 1008 /* Roman Numeral/Greek Letter */ | |
| 1009 return 25; | |
| 1010 case 0xA6: | |
| 1011 /* Box Drawings */ | |
| 1012 return 26; | |
| 1013 case 0xA7: | |
| 1014 /* Unit Symbols */ | |
| 1015 return 27; | |
| 1016 case 0xA8: | |
| 1017 case 0xA9: | |
| 1018 if (c2 <= 0xAF) | |
| 1019 return 25; /* Roman Letter */ | |
| 1020 else if (c2 >= 0xF6) | |
| 1021 return 22; /* Symbols */ | |
| 1022 else | |
| 1023 /* Circled/Parenthesized Letter */ | |
| 1024 return 28; | |
| 1025 case 0xAA: | |
| 1026 case 0xAB: | |
| 1027 /* Hirigana/Katakana */ | |
| 1028 return 29; | |
| 1029 case 0xAC: | |
| 1030 /* Cyrillic Letter */ | |
| 1031 return 30; | |
| 1032 } | |
| 1033 } | |
| 1034 default: | |
| 1035 break; | |
| 1036 } | |
| 1037 return 3; | |
| 1038 } | |
| 1039 | |
| 1040 /* | |
| 1041 * mb_char2len() function pointer. | |
| 1042 * Return length in bytes of character "c". | |
| 1043 * Returns 1 for a single-byte character. | |
| 1044 */ | |
| 1045 int | |
| 1046 latin_char2len(c) | |
| 1883 | 1047 int c UNUSED; |
| 7 | 1048 { |
| 1049 return 1; | |
| 1050 } | |
| 1051 | |
| 1052 static int | |
| 1053 dbcs_char2len(c) | |
| 1054 int c; | |
| 1055 { | |
| 1056 if (c >= 0x100) | |
| 1057 return 2; | |
| 1058 return 1; | |
| 1059 } | |
| 1060 | |
| 1061 /* | |
| 1062 * mb_char2bytes() function pointer. | |
| 1063 * Convert a character to its bytes. | |
| 1064 * Returns the length in bytes. | |
| 1065 */ | |
| 1066 int | |
| 1067 latin_char2bytes(c, buf) | |
| 1068 int c; | |
| 1069 char_u *buf; | |
| 1070 { | |
| 1071 buf[0] = c; | |
| 1072 return 1; | |
| 1073 } | |
| 1074 | |
| 1075 static int | |
| 1076 dbcs_char2bytes(c, buf) | |
| 1077 int c; | |
| 1078 char_u *buf; | |
| 1079 { | |
| 1080 if (c >= 0x100) | |
| 1081 { | |
| 1082 buf[0] = (unsigned)c >> 8; | |
| 1083 buf[1] = c; | |
| 221 | 1084 /* Never use a NUL byte, it causes lots of trouble. It's an invalid |
| 1085 * character anyway. */ | |
| 1086 if (buf[1] == NUL) | |
| 1087 buf[1] = '\n'; | |
| 7 | 1088 return 2; |
| 1089 } | |
| 1090 buf[0] = c; | |
| 1091 return 1; | |
| 1092 } | |
| 1093 | |
| 1094 /* | |
| 474 | 1095 * mb_ptr2len() function pointer. |
| 7 | 1096 * Get byte length of character at "*p" but stop at a NUL. |
| 1097 * For UTF-8 this includes following composing characters. | |
| 1098 * Returns 0 when *p is NUL. | |
| 1099 */ | |
| 1100 int | |
| 474 | 1101 latin_ptr2len(p) |
| 7 | 1102 char_u *p; |
| 1103 { | |
| 1104 return MB_BYTE2LEN(*p); | |
| 1105 } | |
| 1106 | |
| 1107 static int | |
| 474 | 1108 dbcs_ptr2len(p) |
| 7 | 1109 char_u *p; |
| 1110 { | |
| 1111 int len; | |
| 1112 | |
| 1113 /* Check if second byte is not missing. */ | |
| 1114 len = MB_BYTE2LEN(*p); | |
| 1115 if (len == 2 && p[1] == NUL) | |
| 1116 len = 1; | |
| 1117 return len; | |
| 1118 } | |
| 1119 | |
| 1903 | 1120 /* |
| 1121 * mb_ptr2len_len() function pointer. | |
| 1122 * Like mb_ptr2len(), but limit to read "size" bytes. | |
| 1123 * Returns 0 for an empty string. | |
| 1124 * Returns 1 for an illegal char or an incomplete byte sequence. | |
| 1125 */ | |
| 1126 int | |
| 1127 latin_ptr2len_len(p, size) | |
| 1128 char_u *p; | |
| 1129 int size; | |
| 1130 { | |
| 1131 if (size < 1 || *p == NUL) | |
| 1132 return 0; | |
| 1133 return 1; | |
| 1134 } | |
| 1135 | |
| 1136 static int | |
| 1137 dbcs_ptr2len_len(p, size) | |
| 1138 char_u *p; | |
| 1139 int size; | |
| 1140 { | |
| 1141 int len; | |
| 1142 | |
| 1143 if (size < 1 || *p == NUL) | |
| 1144 return 0; | |
| 1145 if (size == 1) | |
| 1146 return 1; | |
| 1147 /* Check that second byte is not missing. */ | |
| 1148 len = MB_BYTE2LEN(*p); | |
| 1149 if (len == 2 && p[1] == NUL) | |
| 1150 len = 1; | |
| 1151 return len; | |
| 1152 } | |
| 1153 | |
| 7 | 1154 struct interval |
| 1155 { | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1156 long first; |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1157 long last; |
| 7 | 1158 }; |
| 1159 static int intable __ARGS((struct interval *table, size_t size, int c)); | |
| 1160 | |
| 1161 /* | |
| 1162 * Return TRUE if "c" is in "table[size / sizeof(struct interval)]". | |
| 1163 */ | |
| 1164 static int | |
| 1165 intable(table, size, c) | |
| 1166 struct interval *table; | |
| 1167 size_t size; | |
| 1168 int c; | |
| 1169 { | |
| 1170 int mid, bot, top; | |
| 1171 | |
| 1172 /* first quick check for Latin1 etc. characters */ | |
| 1173 if (c < table[0].first) | |
| 1174 return FALSE; | |
| 1175 | |
| 1176 /* binary search in table */ | |
| 1177 bot = 0; | |
| 835 | 1178 top = (int)(size / sizeof(struct interval) - 1); |
| 7 | 1179 while (top >= bot) |
| 1180 { | |
| 1181 mid = (bot + top) / 2; | |
| 1182 if (table[mid].last < c) | |
| 1183 bot = mid + 1; | |
| 1184 else if (table[mid].first > c) | |
| 1185 top = mid - 1; | |
| 1186 else | |
| 1187 return TRUE; | |
| 1188 } | |
| 1189 return FALSE; | |
| 1190 } | |
| 1191 | |
| 1192 /* | |
| 1193 * For UTF-8 character "c" return 2 for a double-width character, 1 for others. | |
| 1194 * Returns 4 or 6 for an unprintable character. | |
| 1195 * Is only correct for characters >= 0x80. | |
| 1196 * When p_ambw is "double", return 2 for a character with East Asian Width | |
| 1197 * class 'A'(mbiguous). | |
| 1198 */ | |
| 1199 int | |
| 1200 utf_char2cells(c) | |
| 1201 int c; | |
| 1202 { | |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1203 /* 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
|
1204 * characters, generated with ../runtime/tools/unicode.vim. */ |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1205 static struct interval doublewidth[] = |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1206 { |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1207 {0x1100, 0x115f}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1208 {0x11a3, 0x11a7}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1209 {0x11fa, 0x11ff}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1210 {0x2329, 0x232a}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1211 {0x2e80, 0x2e99}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1212 {0x2e9b, 0x2ef3}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1213 {0x2f00, 0x2fd5}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1214 {0x2ff0, 0x2ffb}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1215 {0x3000, 0x3029}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1216 {0x3030, 0x303e}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1217 {0x3041, 0x3096}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1218 {0x309b, 0x30ff}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1219 {0x3105, 0x312d}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1220 {0x3131, 0x318e}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1221 {0x3190, 0x31b7}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1222 {0x31c0, 0x31e3}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1223 {0x31f0, 0x321e}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1224 {0x3220, 0x3247}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1225 {0x3250, 0x32fe}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1226 {0x3300, 0x4dbf}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1227 {0x4e00, 0xa48c}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1228 {0xa490, 0xa4c6}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1229 {0xa960, 0xa97c}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1230 {0xac00, 0xd7a3}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1231 {0xd7b0, 0xd7c6}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1232 {0xd7cb, 0xd7fb}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1233 {0xf900, 0xfaff}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1234 {0xfe10, 0xfe19}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1235 {0xfe30, 0xfe52}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1236 {0xfe54, 0xfe66}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1237 {0xfe68, 0xfe6b}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1238 {0xff01, 0xff60}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1239 {0xffe0, 0xffe6}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1240 {0x1f200, 0x1f200}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1241 {0x1f210, 0x1f231}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1242 {0x1f240, 0x1f248}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1243 {0x20000, 0x2fffd}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1244 {0x30000, 0x3fffd} |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1245 }; |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1246 /* Sorted list of non-overlapping intervals of East Asian Ambiguous |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1247 * characters, generated with ../runtime/tools/unicode.vim. */ |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1248 static struct interval ambiguous[] = |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1249 { |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1250 {0x00a1, 0x00a1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1251 {0x00a4, 0x00a4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1252 {0x00a7, 0x00a8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1253 {0x00aa, 0x00aa}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1254 {0x00ad, 0x00ae}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1255 {0x00b0, 0x00b4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1256 {0x00b6, 0x00ba}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1257 {0x00bc, 0x00bf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1258 {0x00c6, 0x00c6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1259 {0x00d0, 0x00d0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1260 {0x00d7, 0x00d8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1261 {0x00de, 0x00e1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1262 {0x00e6, 0x00e6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1263 {0x00e8, 0x00ea}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1264 {0x00ec, 0x00ed}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1265 {0x00f0, 0x00f0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1266 {0x00f2, 0x00f3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1267 {0x00f7, 0x00fa}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1268 {0x00fc, 0x00fc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1269 {0x00fe, 0x00fe}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1270 {0x0101, 0x0101}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1271 {0x0111, 0x0111}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1272 {0x0113, 0x0113}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1273 {0x011b, 0x011b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1274 {0x0126, 0x0127}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1275 {0x012b, 0x012b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1276 {0x0131, 0x0133}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1277 {0x0138, 0x0138}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1278 {0x013f, 0x0142}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1279 {0x0144, 0x0144}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1280 {0x0148, 0x014b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1281 {0x014d, 0x014d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1282 {0x0152, 0x0153}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1283 {0x0166, 0x0167}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1284 {0x016b, 0x016b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1285 {0x01ce, 0x01ce}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1286 {0x01d0, 0x01d0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1287 {0x01d2, 0x01d2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1288 {0x01d4, 0x01d4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1289 {0x01d6, 0x01d6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1290 {0x01d8, 0x01d8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1291 {0x01da, 0x01da}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1292 {0x01dc, 0x01dc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1293 {0x0251, 0x0251}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1294 {0x0261, 0x0261}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1295 {0x02c4, 0x02c4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1296 {0x02c7, 0x02c7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1297 {0x02c9, 0x02cb}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1298 {0x02cd, 0x02cd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1299 {0x02d0, 0x02d0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1300 {0x02d8, 0x02db}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1301 {0x02dd, 0x02dd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1302 {0x02df, 0x02df}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1303 {0x0391, 0x03a1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1304 {0x03a3, 0x03a9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1305 {0x03b1, 0x03c1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1306 {0x03c3, 0x03c9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1307 {0x0401, 0x0401}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1308 {0x0410, 0x044f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1309 {0x0451, 0x0451}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1310 {0x2010, 0x2010}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1311 {0x2013, 0x2016}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1312 {0x2018, 0x2019}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1313 {0x201c, 0x201d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1314 {0x2020, 0x2022}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1315 {0x2024, 0x2027}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1316 {0x2030, 0x2030}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1317 {0x2032, 0x2033}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1318 {0x2035, 0x2035}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1319 {0x203b, 0x203b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1320 {0x203e, 0x203e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1321 {0x2074, 0x2074}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1322 {0x207f, 0x207f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1323 {0x2081, 0x2084}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1324 {0x20ac, 0x20ac}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1325 {0x2103, 0x2103}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1326 {0x2105, 0x2105}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1327 {0x2109, 0x2109}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1328 {0x2113, 0x2113}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1329 {0x2116, 0x2116}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1330 {0x2121, 0x2122}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1331 {0x2126, 0x2126}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1332 {0x212b, 0x212b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1333 {0x2153, 0x2154}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1334 {0x215b, 0x215e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1335 {0x2160, 0x216b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1336 {0x2170, 0x2179}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1337 {0x2189, 0x2189}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1338 {0x2190, 0x2199}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1339 {0x21b8, 0x21b9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1340 {0x21d2, 0x21d2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1341 {0x21d4, 0x21d4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1342 {0x21e7, 0x21e7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1343 {0x2200, 0x2200}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1344 {0x2202, 0x2203}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1345 {0x2207, 0x2208}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1346 {0x220b, 0x220b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1347 {0x220f, 0x220f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1348 {0x2211, 0x2211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1349 {0x2215, 0x2215}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1350 {0x221a, 0x221a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1351 {0x221d, 0x2220}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1352 {0x2223, 0x2223}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1353 {0x2225, 0x2225}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1354 {0x2227, 0x222c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1355 {0x222e, 0x222e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1356 {0x2234, 0x2237}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1357 {0x223c, 0x223d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1358 {0x2248, 0x2248}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1359 {0x224c, 0x224c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1360 {0x2252, 0x2252}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1361 {0x2260, 0x2261}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1362 {0x2264, 0x2267}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1363 {0x226a, 0x226b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1364 {0x226e, 0x226f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1365 {0x2282, 0x2283}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1366 {0x2286, 0x2287}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1367 {0x2295, 0x2295}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1368 {0x2299, 0x2299}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1369 {0x22a5, 0x22a5}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1370 {0x22bf, 0x22bf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1371 {0x2312, 0x2312}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1372 {0x2460, 0x24e9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1373 {0x24eb, 0x254b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1374 {0x2550, 0x2573}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1375 {0x2580, 0x258f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1376 {0x2592, 0x2595}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1377 {0x25a0, 0x25a1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1378 {0x25a3, 0x25a9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1379 {0x25b2, 0x25b3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1380 {0x25b6, 0x25b7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1381 {0x25bc, 0x25bd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1382 {0x25c0, 0x25c1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1383 {0x25c6, 0x25c8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1384 {0x25cb, 0x25cb}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1385 {0x25ce, 0x25d1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1386 {0x25e2, 0x25e5}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1387 {0x25ef, 0x25ef}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1388 {0x2605, 0x2606}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1389 {0x2609, 0x2609}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1390 {0x260e, 0x260f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1391 {0x2614, 0x2615}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1392 {0x261c, 0x261c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1393 {0x261e, 0x261e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1394 {0x2640, 0x2640}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1395 {0x2642, 0x2642}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1396 {0x2660, 0x2661}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1397 {0x2663, 0x2665}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1398 {0x2667, 0x266a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1399 {0x266c, 0x266d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1400 {0x266f, 0x266f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1401 {0x269e, 0x269f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1402 {0x26be, 0x26bf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1403 {0x26c4, 0x26cd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1404 {0x26cf, 0x26e1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1405 {0x26e3, 0x26e3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1406 {0x26e8, 0x26ff}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1407 {0x273d, 0x273d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1408 {0x2757, 0x2757}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1409 {0x2776, 0x277f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1410 {0x2b55, 0x2b59}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1411 {0x3248, 0x324f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1412 {0xe000, 0xf8ff}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1413 {0xfffd, 0xfffd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1414 {0x1f100, 0x1f10a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1415 {0x1f110, 0x1f12d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1416 {0x1f131, 0x1f131}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1417 {0x1f13d, 0x1f13d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1418 {0x1f13f, 0x1f13f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1419 {0x1f142, 0x1f142}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1420 {0x1f146, 0x1f146}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1421 {0x1f14a, 0x1f14e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1422 {0x1f157, 0x1f157}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1423 {0x1f15f, 0x1f15f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1424 {0x1f179, 0x1f179}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1425 {0x1f17b, 0x1f17c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1426 {0x1f17f, 0x1f17f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1427 {0x1f18a, 0x1f18d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1428 {0x1f190, 0x1f190}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1429 {0xf0000, 0xffffd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1430 {0x100000, 0x10fffd} |
| 7 | 1431 }; |
| 1432 | |
| 1433 if (c >= 0x100) | |
| 1434 { | |
| 1435 #ifdef USE_WCHAR_FUNCTIONS | |
| 1436 /* | |
| 1437 * Assume the library function wcwidth() works better than our own | |
| 1438 * stuff. It should return 1 for ambiguous width chars! | |
| 1439 */ | |
| 1440 int n = wcwidth(c); | |
| 1441 | |
| 1442 if (n < 0) | |
| 1443 return 6; /* unprintable, displays <xxxx> */ | |
| 1444 if (n > 1) | |
| 1445 return n; | |
| 1446 #else | |
| 1447 if (!utf_printable(c)) | |
| 1448 return 6; /* unprintable, displays <xxxx> */ | |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1449 if (intable(doublewidth, sizeof(doublewidth), c)) |
| 7 | 1450 return 2; |
| 1451 #endif | |
| 1452 } | |
| 1453 | |
| 1454 /* Characters below 0x100 are influenced by 'isprint' option */ | |
| 1455 else if (c >= 0x80 && !vim_isprintc(c)) | |
| 1456 return 4; /* unprintable, displays <xx> */ | |
| 1457 | |
| 1458 if (c >= 0x80 && *p_ambw == 'd' && intable(ambiguous, sizeof(ambiguous), c)) | |
| 1459 return 2; | |
| 1460 | |
| 1461 return 1; | |
| 1462 } | |
| 1463 | |
| 1464 /* | |
| 1465 * mb_ptr2cells() function pointer. | |
| 1466 * Return the number of display cells character at "*p" occupies. | |
| 1467 * This doesn't take care of unprintable characters, use ptr2cells() for that. | |
| 1468 */ | |
| 1469 int | |
| 1470 latin_ptr2cells(p) | |
| 1883 | 1471 char_u *p UNUSED; |
| 7 | 1472 { |
| 1473 return 1; | |
| 1474 } | |
| 1475 | |
| 1476 int | |
| 1477 utf_ptr2cells(p) | |
| 1478 char_u *p; | |
| 1479 { | |
| 1480 int c; | |
| 1481 | |
| 1482 /* Need to convert to a wide character. */ | |
| 1483 if (*p >= 0x80) | |
| 1484 { | |
| 1485 c = utf_ptr2char(p); | |
| 1486 /* An illegal byte is displayed as <xx>. */ | |
| 474 | 1487 if (utf_ptr2len(p) == 1 || c == NUL) |
| 7 | 1488 return 4; |
| 1489 /* If the char is ASCII it must be an overlong sequence. */ | |
| 1490 if (c < 0x80) | |
| 1491 return char2cells(c); | |
| 1492 return utf_char2cells(c); | |
| 1493 } | |
| 1494 return 1; | |
| 1495 } | |
| 1496 | |
| 1497 int | |
| 1498 dbcs_ptr2cells(p) | |
| 1499 char_u *p; | |
| 1500 { | |
| 1501 /* Number of cells is equal to number of bytes, except for euc-jp when | |
| 1502 * the first byte is 0x8e. */ | |
| 1503 if (enc_dbcs == DBCS_JPNU && *p == 0x8e) | |
| 1504 return 1; | |
| 1505 return MB_BYTE2LEN(*p); | |
| 1506 } | |
| 1507 | |
| 1508 /* | |
| 1903 | 1509 * mb_ptr2cells_len() function pointer. |
| 1510 * Like mb_ptr2cells(), but limit string length to "size". | |
| 1511 * For an empty string or truncated character returns 1. | |
| 1512 */ | |
| 1513 int | |
| 1514 latin_ptr2cells_len(p, size) | |
| 1515 char_u *p UNUSED; | |
| 1516 int size UNUSED; | |
| 1517 { | |
| 1518 return 1; | |
| 1519 } | |
| 1520 | |
| 1521 static int | |
| 1522 utf_ptr2cells_len(p, size) | |
| 1523 char_u *p; | |
| 1524 int size; | |
| 1525 { | |
| 1526 int c; | |
| 1527 | |
| 1528 /* Need to convert to a wide character. */ | |
| 1529 if (size > 0 && *p >= 0x80) | |
| 1530 { | |
| 1531 if (utf_ptr2len_len(p, size) < utf8len_tab[*p]) | |
| 2015 | 1532 return 1; /* truncated */ |
| 1903 | 1533 c = utf_ptr2char(p); |
| 1534 /* An illegal byte is displayed as <xx>. */ | |
| 1535 if (utf_ptr2len(p) == 1 || c == NUL) | |
| 1536 return 4; | |
| 1537 /* If the char is ASCII it must be an overlong sequence. */ | |
| 1538 if (c < 0x80) | |
| 1539 return char2cells(c); | |
| 1540 return utf_char2cells(c); | |
| 1541 } | |
| 1542 return 1; | |
| 1543 } | |
| 1544 | |
| 1545 static int | |
| 1546 dbcs_ptr2cells_len(p, size) | |
| 1547 char_u *p; | |
| 1548 int size; | |
| 1549 { | |
| 1550 /* Number of cells is equal to number of bytes, except for euc-jp when | |
| 1551 * the first byte is 0x8e. */ | |
| 1552 if (size <= 1 || (enc_dbcs == DBCS_JPNU && *p == 0x8e)) | |
| 1553 return 1; | |
| 1554 return MB_BYTE2LEN(*p); | |
| 1555 } | |
| 1556 | |
| 1557 /* | |
| 7 | 1558 * mb_char2cells() function pointer. |
| 1559 * Return the number of display cells character "c" occupies. | |
| 1560 * Only takes care of multi-byte chars, not "^C" and such. | |
| 1561 */ | |
| 1562 int | |
| 1563 latin_char2cells(c) | |
| 1883 | 1564 int c UNUSED; |
| 7 | 1565 { |
| 1566 return 1; | |
| 1567 } | |
| 1568 | |
| 1569 static int | |
| 1570 dbcs_char2cells(c) | |
| 1571 int c; | |
| 1572 { | |
| 1573 /* Number of cells is equal to number of bytes, except for euc-jp when | |
| 1574 * the first byte is 0x8e. */ | |
| 1575 if (enc_dbcs == DBCS_JPNU && ((unsigned)c >> 8) == 0x8e) | |
| 1576 return 1; | |
| 1577 /* use the first byte */ | |
| 1578 return MB_BYTE2LEN((unsigned)c >> 8); | |
| 1579 } | |
| 1580 | |
| 1581 /* | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1582 * Return the number of cells occupied by string "p". |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1583 * 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
|
1584 */ |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1585 int |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1586 mb_string2cells(p, len) |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1587 char_u *p; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1588 int len; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1589 { |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1590 int i; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1591 int clen = 0; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1592 |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1593 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
|
1594 clen += (*mb_ptr2cells)(p + i); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1595 return clen; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1596 } |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1597 |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1598 /* |
| 7 | 1599 * mb_off2cells() function pointer. |
| 1600 * Return number of display cells for char at ScreenLines[off]. | |
| 1378 | 1601 * We make sure that the offset used is less than "max_off". |
| 7 | 1602 */ |
| 1603 int | |
| 1378 | 1604 latin_off2cells(off, max_off) |
| 1883 | 1605 unsigned off UNUSED; |
| 1606 unsigned max_off UNUSED; | |
| 7 | 1607 { |
| 1608 return 1; | |
| 1609 } | |
| 1610 | |
| 1611 int | |
| 1378 | 1612 dbcs_off2cells(off, max_off) |
| 7 | 1613 unsigned off; |
| 1378 | 1614 unsigned max_off; |
| 7 | 1615 { |
| 1378 | 1616 /* never check beyond end of the line */ |
| 1617 if (off >= max_off) | |
| 1618 return 1; | |
| 1619 | |
| 7 | 1620 /* Number of cells is equal to number of bytes, except for euc-jp when |
| 1621 * the first byte is 0x8e. */ | |
| 1622 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 1623 return 1; | |
| 1624 return MB_BYTE2LEN(ScreenLines[off]); | |
| 1625 } | |
| 1626 | |
| 1627 int | |
| 1378 | 1628 utf_off2cells(off, max_off) |
| 7 | 1629 unsigned off; |
| 1378 | 1630 unsigned max_off; |
| 7 | 1631 { |
| 1378 | 1632 return (off + 1 < max_off && ScreenLines[off + 1] == 0) ? 2 : 1; |
| 7 | 1633 } |
| 1634 | |
| 1635 /* | |
| 1636 * mb_ptr2char() function pointer. | |
| 1637 * Convert a byte sequence into a character. | |
| 1638 */ | |
| 1639 int | |
| 1640 latin_ptr2char(p) | |
| 1641 char_u *p; | |
| 1642 { | |
| 1643 return *p; | |
| 1644 } | |
| 1645 | |
| 1646 static int | |
| 1647 dbcs_ptr2char(p) | |
| 1648 char_u *p; | |
| 1649 { | |
| 1650 if (MB_BYTE2LEN(*p) > 1 && p[1] != NUL) | |
| 1651 return (p[0] << 8) + p[1]; | |
| 1652 return *p; | |
| 1653 } | |
| 1654 | |
| 1655 /* | |
| 1656 * Convert a UTF-8 byte sequence to a wide character. | |
| 1657 * If the sequence is illegal or truncated by a NUL the first byte is | |
| 1658 * returned. | |
| 1659 * Does not include composing characters, of course. | |
| 1660 */ | |
| 1661 int | |
| 1662 utf_ptr2char(p) | |
| 1663 char_u *p; | |
| 1664 { | |
| 1665 int len; | |
| 1666 | |
| 1667 if (p[0] < 0x80) /* be quick for ASCII */ | |
| 1668 return p[0]; | |
| 1669 | |
| 2015 | 1670 len = utf8len_tab_zero[p[0]]; |
| 1658 | 1671 if (len > 1 && (p[1] & 0xc0) == 0x80) |
| 7 | 1672 { |
| 1673 if (len == 2) | |
| 1674 return ((p[0] & 0x1f) << 6) + (p[1] & 0x3f); | |
| 1675 if ((p[2] & 0xc0) == 0x80) | |
| 1676 { | |
| 1677 if (len == 3) | |
| 1678 return ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) | |
| 1679 + (p[2] & 0x3f); | |
| 1680 if ((p[3] & 0xc0) == 0x80) | |
| 1681 { | |
| 1682 if (len == 4) | |
| 1683 return ((p[0] & 0x07) << 18) + ((p[1] & 0x3f) << 12) | |
| 1684 + ((p[2] & 0x3f) << 6) + (p[3] & 0x3f); | |
| 1685 if ((p[4] & 0xc0) == 0x80) | |
| 1686 { | |
| 1687 if (len == 5) | |
| 1688 return ((p[0] & 0x03) << 24) + ((p[1] & 0x3f) << 18) | |
| 1689 + ((p[2] & 0x3f) << 12) + ((p[3] & 0x3f) << 6) | |
| 1690 + (p[4] & 0x3f); | |
| 1691 if ((p[5] & 0xc0) == 0x80 && len == 6) | |
| 1692 return ((p[0] & 0x01) << 30) + ((p[1] & 0x3f) << 24) | |
| 1693 + ((p[2] & 0x3f) << 18) + ((p[3] & 0x3f) << 12) | |
| 1694 + ((p[4] & 0x3f) << 6) + (p[5] & 0x3f); | |
| 1695 } | |
| 1696 } | |
| 1697 } | |
| 1698 } | |
| 1699 /* Illegal value, just return the first byte */ | |
| 1700 return p[0]; | |
| 1701 } | |
| 1702 | |
| 1703 /* | |
| 1704 * Get character at **pp and advance *pp to the next character. | |
| 1705 * Note: composing characters are skipped! | |
| 1706 */ | |
| 1707 int | |
| 1708 mb_ptr2char_adv(pp) | |
| 1709 char_u **pp; | |
| 1710 { | |
| 1711 int c; | |
| 1712 | |
| 1713 c = (*mb_ptr2char)(*pp); | |
| 474 | 1714 *pp += (*mb_ptr2len)(*pp); |
| 1715 return c; | |
| 1716 } | |
| 1717 | |
| 1718 /* | |
| 1719 * Get character at **pp and advance *pp to the next character. | |
| 1720 * Note: composing characters are returned as separate characters. | |
| 1721 */ | |
| 1722 int | |
| 1723 mb_cptr2char_adv(pp) | |
| 1724 char_u **pp; | |
| 1725 { | |
| 1726 int c; | |
| 1727 | |
| 1728 c = (*mb_ptr2char)(*pp); | |
| 1729 if (enc_utf8) | |
| 1730 *pp += utf_ptr2len(*pp); | |
| 1731 else | |
| 1732 *pp += (*mb_ptr2len)(*pp); | |
| 7 | 1733 return c; |
| 1734 } | |
| 1735 | |
| 1736 #if defined(FEAT_ARABIC) || defined(PROTO) | |
| 1737 /* | |
| 1738 * Check whether we are dealing with Arabic combining characters. | |
| 1739 * Note: these are NOT really composing characters! | |
| 1740 */ | |
| 1741 int | |
| 1742 arabic_combine(one, two) | |
| 1743 int one; /* first character */ | |
| 1744 int two; /* character just after "one" */ | |
| 1745 { | |
| 1746 if (one == a_LAM) | |
| 1747 return arabic_maycombine(two); | |
| 1748 return FALSE; | |
| 1749 } | |
| 1750 | |
| 1751 /* | |
| 1752 * Check whether we are dealing with a character that could be regarded as an | |
| 1753 * Arabic combining character, need to check the character before this. | |
| 1754 */ | |
| 1755 int | |
| 1756 arabic_maycombine(two) | |
| 1757 int two; | |
| 1758 { | |
| 1759 if (p_arshape && !p_tbidi) | |
| 1760 return (two == a_ALEF_MADDA | |
| 1761 || two == a_ALEF_HAMZA_ABOVE | |
| 1762 || two == a_ALEF_HAMZA_BELOW | |
| 1763 || two == a_ALEF); | |
| 1764 return FALSE; | |
| 1765 } | |
| 1766 | |
| 1767 /* | |
| 1768 * Check if the character pointed to by "p2" is a composing character when it | |
| 1769 * comes after "p1". For Arabic sometimes "ab" is replaced with "c", which | |
| 1770 * behaves like a composing character. | |
| 1771 */ | |
| 1772 int | |
| 1773 utf_composinglike(p1, p2) | |
| 1774 char_u *p1; | |
| 1775 char_u *p2; | |
| 1776 { | |
| 1777 int c2; | |
| 1778 | |
| 1779 c2 = utf_ptr2char(p2); | |
| 1780 if (utf_iscomposing(c2)) | |
| 1781 return TRUE; | |
| 1782 if (!arabic_maycombine(c2)) | |
| 1783 return FALSE; | |
| 1784 return arabic_combine(utf_ptr2char(p1), c2); | |
| 1785 } | |
| 1786 #endif | |
| 1787 | |
| 1788 /* | |
| 1205 | 1789 * Convert a UTF-8 byte string to a wide character. Also get up to MAX_MCO |
| 7 | 1790 * composing characters. |
| 1791 */ | |
| 1792 int | |
| 714 | 1793 utfc_ptr2char(p, pcc) |
| 7 | 1794 char_u *p; |
| 714 | 1795 int *pcc; /* return: composing chars, last one is 0 */ |
| 7 | 1796 { |
| 1797 int len; | |
| 1798 int c; | |
| 1799 int cc; | |
| 714 | 1800 int i = 0; |
| 7 | 1801 |
| 1802 c = utf_ptr2char(p); | |
| 474 | 1803 len = utf_ptr2len(p); |
| 714 | 1804 |
| 7 | 1805 /* Only accept a composing char when the first char isn't illegal. */ |
| 1806 if ((len > 1 || *p < 0x80) | |
| 1807 && p[len] >= 0x80 | |
| 1808 && UTF_COMPOSINGLIKE(p, p + len)) | |
| 1809 { | |
| 714 | 1810 cc = utf_ptr2char(p + len); |
| 1811 for (;;) | |
| 1812 { | |
| 1813 pcc[i++] = cc; | |
| 1814 if (i == MAX_MCO) | |
| 1815 break; | |
| 1816 len += utf_ptr2len(p + len); | |
| 1817 if (p[len] < 0x80 || !utf_iscomposing(cc = utf_ptr2char(p + len))) | |
| 1818 break; | |
| 1819 } | |
| 7 | 1820 } |
| 714 | 1821 |
| 1822 if (i < MAX_MCO) /* last composing char must be 0 */ | |
| 1823 pcc[i] = 0; | |
| 1824 | |
| 7 | 1825 return c; |
| 1826 } | |
| 1827 | |
| 1828 /* | |
| 1205 | 1829 * Convert a UTF-8 byte string to a wide character. Also get up to MAX_MCO |
| 7 | 1830 * composing characters. Use no more than p[maxlen]. |
| 1831 */ | |
| 1832 int | |
| 714 | 1833 utfc_ptr2char_len(p, pcc, maxlen) |
| 7 | 1834 char_u *p; |
| 714 | 1835 int *pcc; /* return: composing chars, last one is 0 */ |
| 7 | 1836 int maxlen; |
| 1837 { | |
| 1838 int len; | |
| 1839 int c; | |
| 1840 int cc; | |
| 714 | 1841 int i = 0; |
| 7 | 1842 |
| 1843 c = utf_ptr2char(p); | |
| 474 | 1844 len = utf_ptr2len_len(p, maxlen); |
| 7 | 1845 /* Only accept a composing char when the first char isn't illegal. */ |
| 1846 if ((len > 1 || *p < 0x80) | |
| 1847 && len < maxlen | |
| 1848 && p[len] >= 0x80 | |
| 1849 && UTF_COMPOSINGLIKE(p, p + len)) | |
| 1850 { | |
| 714 | 1851 cc = utf_ptr2char(p + len); |
| 1852 for (;;) | |
| 1853 { | |
| 1854 pcc[i++] = cc; | |
| 1855 if (i == MAX_MCO) | |
| 1856 break; | |
| 1857 len += utf_ptr2len_len(p + len, maxlen - len); | |
| 1858 if (len >= maxlen | |
| 1859 || p[len] < 0x80 | |
| 1860 || !utf_iscomposing(cc = utf_ptr2char(p + len))) | |
| 1861 break; | |
| 1862 } | |
| 7 | 1863 } |
| 714 | 1864 |
| 1865 if (i < MAX_MCO) /* last composing char must be 0 */ | |
| 1866 pcc[i] = 0; | |
| 1867 | |
| 7 | 1868 return c; |
| 1869 } | |
| 1870 | |
| 1871 /* | |
| 1872 * Convert the character at screen position "off" to a sequence of bytes. | |
| 1873 * Includes the composing characters. | |
| 1874 * "buf" must at least have the length MB_MAXBYTES. | |
|
2154
7c8c7c95a865
First step in the Vim 7.3 branch. Changed version numbers.
Bram Moolenaar <bram@zimbu.org>
parents:
2063
diff
changeset
|
1875 * Only to be used when ScreenLinesUC[off] != 0. |
| 7 | 1876 * Returns the produced number of bytes. |
| 1877 */ | |
| 1878 int | |
| 1879 utfc_char2bytes(off, buf) | |
| 1880 int off; | |
| 1881 char_u *buf; | |
| 1882 { | |
| 1883 int len; | |
| 714 | 1884 int i; |
| 7 | 1885 |
| 1886 len = utf_char2bytes(ScreenLinesUC[off], buf); | |
| 714 | 1887 for (i = 0; i < Screen_mco; ++i) |
| 7 | 1888 { |
| 714 | 1889 if (ScreenLinesC[i][off] == 0) |
| 1890 break; | |
| 1891 len += utf_char2bytes(ScreenLinesC[i][off], buf + len); | |
| 7 | 1892 } |
| 1893 return len; | |
| 1894 } | |
| 1895 | |
| 1896 /* | |
| 1897 * Get the length of a UTF-8 byte sequence, not including any following | |
| 1898 * composing characters. | |
| 1899 * Returns 0 for "". | |
| 1900 * Returns 1 for an illegal byte sequence. | |
| 1901 */ | |
| 1902 int | |
| 474 | 1903 utf_ptr2len(p) |
| 7 | 1904 char_u *p; |
| 1905 { | |
| 1906 int len; | |
| 1907 int i; | |
| 1908 | |
| 1909 if (*p == NUL) | |
| 1910 return 0; | |
| 1911 len = utf8len_tab[*p]; | |
| 1912 for (i = 1; i < len; ++i) | |
| 1913 if ((p[i] & 0xc0) != 0x80) | |
| 1914 return 1; | |
| 1915 return len; | |
| 1916 } | |
| 1917 | |
| 1918 /* | |
| 1919 * Return length of UTF-8 character, obtained from the first byte. | |
| 1920 * "b" must be between 0 and 255! | |
| 2015 | 1921 * Returns 1 for an invalid first byte value. |
| 7 | 1922 */ |
| 1923 int | |
| 1924 utf_byte2len(b) | |
| 1925 int b; | |
| 1926 { | |
| 1927 return utf8len_tab[b]; | |
| 1928 } | |
| 1929 | |
| 1930 /* | |
| 1931 * Get the length of UTF-8 byte sequence "p[size]". Does not include any | |
| 1932 * following composing characters. | |
| 1933 * Returns 1 for "". | |
| 1487 | 1934 * Returns 1 for an illegal byte sequence (also in incomplete byte seq.). |
| 7 | 1935 * Returns number > "size" for an incomplete byte sequence. |
| 2015 | 1936 * Never returns zero. |
| 7 | 1937 */ |
| 1938 int | |
| 474 | 1939 utf_ptr2len_len(p, size) |
| 7 | 1940 char_u *p; |
| 1941 int size; | |
| 1942 { | |
| 1943 int len; | |
| 1944 int i; | |
| 1487 | 1945 int m; |
| 7 | 1946 |
| 2015 | 1947 len = utf8len_tab[*p]; |
| 1948 if (len == 1) | |
| 1949 return 1; /* NUL, ascii or illegal lead byte */ | |
| 7 | 1950 if (len > size) |
| 1487 | 1951 m = size; /* incomplete byte sequence. */ |
| 2015 | 1952 else |
| 1953 m = len; | |
| 1487 | 1954 for (i = 1; i < m; ++i) |
| 7 | 1955 if ((p[i] & 0xc0) != 0x80) |
| 1956 return 1; | |
| 1957 return len; | |
| 1958 } | |
| 1959 | |
| 1960 /* | |
| 1961 * Return the number of bytes the UTF-8 encoding of the character at "p" takes. | |
| 1962 * This includes following composing characters. | |
| 1963 */ | |
| 1964 int | |
| 474 | 1965 utfc_ptr2len(p) |
| 7 | 1966 char_u *p; |
| 1967 { | |
| 1968 int len; | |
| 318 | 1969 int b0 = *p; |
| 7 | 1970 #ifdef FEAT_ARABIC |
| 1971 int prevlen; | |
| 1972 #endif | |
| 1973 | |
| 318 | 1974 if (b0 == NUL) |
| 7 | 1975 return 0; |
| 318 | 1976 if (b0 < 0x80 && p[1] < 0x80) /* be quick for ASCII */ |
| 7 | 1977 return 1; |
| 1978 | |
| 1979 /* Skip over first UTF-8 char, stopping at a NUL byte. */ | |
| 474 | 1980 len = utf_ptr2len(p); |
| 7 | 1981 |
| 1982 /* Check for illegal byte. */ | |
| 318 | 1983 if (len == 1 && b0 >= 0x80) |
| 7 | 1984 return 1; |
| 1985 | |
| 1986 /* | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1987 * Check for composing characters. We can handle only the first six, but |
| 7 | 1988 * skip all of them (otherwise the cursor would get stuck). |
| 1989 */ | |
| 1990 #ifdef FEAT_ARABIC | |
| 1991 prevlen = 0; | |
| 1992 #endif | |
| 1993 for (;;) | |
| 1994 { | |
| 1995 if (p[len] < 0x80 || !UTF_COMPOSINGLIKE(p + prevlen, p + len)) | |
| 1996 return len; | |
| 1997 | |
| 1998 /* Skip over composing char */ | |
| 1999 #ifdef FEAT_ARABIC | |
| 2000 prevlen = len; | |
| 2001 #endif | |
| 474 | 2002 len += utf_ptr2len(p + len); |
| 7 | 2003 } |
| 2004 } | |
| 2005 | |
| 2006 /* | |
| 2007 * Return the number of bytes the UTF-8 encoding of the character at "p[size]" | |
| 2008 * takes. This includes following composing characters. | |
| 1903 | 2009 * Returns 0 for an empty string. |
| 7 | 2010 * Returns 1 for an illegal char or an incomplete byte sequence. |
| 2011 */ | |
| 2012 int | |
| 474 | 2013 utfc_ptr2len_len(p, size) |
| 7 | 2014 char_u *p; |
| 2015 int size; | |
| 2016 { | |
| 2017 int len; | |
| 2018 #ifdef FEAT_ARABIC | |
| 2019 int prevlen; | |
| 2020 #endif | |
| 2021 | |
| 1903 | 2022 if (size < 1 || *p == NUL) |
| 7 | 2023 return 0; |
| 2024 if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */ | |
| 2025 return 1; | |
| 2026 | |
| 2027 /* Skip over first UTF-8 char, stopping at a NUL byte. */ | |
| 474 | 2028 len = utf_ptr2len_len(p, size); |
| 7 | 2029 |
| 2030 /* Check for illegal byte and incomplete byte sequence. */ | |
| 2031 if ((len == 1 && p[0] >= 0x80) || len > size) | |
| 2032 return 1; | |
| 2033 | |
| 2034 /* | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2035 * Check for composing characters. We can handle only the first six, but |
| 7 | 2036 * skip all of them (otherwise the cursor would get stuck). |
| 2037 */ | |
| 2038 #ifdef FEAT_ARABIC | |
| 2039 prevlen = 0; | |
| 2040 #endif | |
| 2041 while (len < size) | |
| 2042 { | |
| 1658 | 2043 int len_next_char; |
| 2044 | |
| 2045 if (p[len] < 0x80) | |
| 2046 break; | |
| 2047 | |
| 2048 /* | |
| 2049 * Next character length should not go beyond size to ensure that | |
| 2050 * UTF_COMPOSINGLIKE(...) does not read beyond size. | |
| 2051 */ | |
| 2052 len_next_char = utf_ptr2len_len(p + len, size - len); | |
| 2053 if (len_next_char > size - len) | |
| 2054 break; | |
| 2055 | |
| 2056 if (!UTF_COMPOSINGLIKE(p + prevlen, p + len)) | |
| 7 | 2057 break; |
| 2058 | |
| 2059 /* Skip over composing char */ | |
| 2060 #ifdef FEAT_ARABIC | |
| 2061 prevlen = len; | |
| 2062 #endif | |
| 1658 | 2063 len += len_next_char; |
| 7 | 2064 } |
| 2065 return len; | |
| 2066 } | |
| 2067 | |
| 2068 /* | |
| 2069 * Return the number of bytes the UTF-8 encoding of character "c" takes. | |
| 2070 * This does not include composing characters. | |
| 2071 */ | |
| 2072 int | |
| 2073 utf_char2len(c) | |
| 2074 int c; | |
| 2075 { | |
| 2076 if (c < 0x80) | |
| 2077 return 1; | |
| 2078 if (c < 0x800) | |
| 2079 return 2; | |
| 2080 if (c < 0x10000) | |
| 2081 return 3; | |
| 2082 if (c < 0x200000) | |
| 2083 return 4; | |
| 2084 if (c < 0x4000000) | |
| 2085 return 5; | |
| 2086 return 6; | |
| 2087 } | |
| 2088 | |
| 2089 /* | |
| 2090 * Convert Unicode character "c" to UTF-8 string in "buf[]". | |
| 2091 * Returns the number of bytes. | |
| 2092 * This does not include composing characters. | |
| 2093 */ | |
| 2094 int | |
| 2095 utf_char2bytes(c, buf) | |
| 2096 int c; | |
| 2097 char_u *buf; | |
| 2098 { | |
| 2099 if (c < 0x80) /* 7 bits */ | |
| 2100 { | |
| 2101 buf[0] = c; | |
| 2102 return 1; | |
| 2103 } | |
| 2104 if (c < 0x800) /* 11 bits */ | |
| 2105 { | |
| 2106 buf[0] = 0xc0 + ((unsigned)c >> 6); | |
| 2107 buf[1] = 0x80 + (c & 0x3f); | |
| 2108 return 2; | |
| 2109 } | |
| 2110 if (c < 0x10000) /* 16 bits */ | |
| 2111 { | |
| 2112 buf[0] = 0xe0 + ((unsigned)c >> 12); | |
| 2113 buf[1] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
| 2114 buf[2] = 0x80 + (c & 0x3f); | |
| 2115 return 3; | |
| 2116 } | |
| 2117 if (c < 0x200000) /* 21 bits */ | |
| 2118 { | |
| 2119 buf[0] = 0xf0 + ((unsigned)c >> 18); | |
| 2120 buf[1] = 0x80 + (((unsigned)c >> 12) & 0x3f); | |
| 2121 buf[2] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
| 2122 buf[3] = 0x80 + (c & 0x3f); | |
| 2123 return 4; | |
| 2124 } | |
| 2125 if (c < 0x4000000) /* 26 bits */ | |
| 2126 { | |
| 2127 buf[0] = 0xf8 + ((unsigned)c >> 24); | |
| 2128 buf[1] = 0x80 + (((unsigned)c >> 18) & 0x3f); | |
| 2129 buf[2] = 0x80 + (((unsigned)c >> 12) & 0x3f); | |
| 2130 buf[3] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
| 2131 buf[4] = 0x80 + (c & 0x3f); | |
| 2132 return 5; | |
| 2133 } | |
| 2134 /* 31 bits */ | |
| 2135 buf[0] = 0xfc + ((unsigned)c >> 30); | |
| 2136 buf[1] = 0x80 + (((unsigned)c >> 24) & 0x3f); | |
| 2137 buf[2] = 0x80 + (((unsigned)c >> 18) & 0x3f); | |
| 2138 buf[3] = 0x80 + (((unsigned)c >> 12) & 0x3f); | |
| 2139 buf[4] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
| 2140 buf[5] = 0x80 + (c & 0x3f); | |
| 2141 return 6; | |
| 2142 } | |
| 2143 | |
| 2144 /* | |
| 2145 * Return TRUE if "c" is a composing UTF-8 character. This means it will be | |
| 2146 * drawn on top of the preceding character. | |
| 2147 * Based on code from Markus Kuhn. | |
| 2148 */ | |
| 2149 int | |
| 2150 utf_iscomposing(c) | |
| 2151 int c; | |
| 2152 { | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2153 /* Sorted list of non-overlapping intervals. |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2154 * Generated by ../runtime/tools/unicode.vim. */ |
| 7 | 2155 static struct interval combining[] = |
| 2156 { | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2157 {0x0300, 0x036f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2158 {0x0483, 0x0489}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2159 {0x0591, 0x05bd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2160 {0x05bf, 0x05bf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2161 {0x05c1, 0x05c2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2162 {0x05c4, 0x05c5}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2163 {0x05c7, 0x05c7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2164 {0x0610, 0x061a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2165 {0x064b, 0x065e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2166 {0x0670, 0x0670}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2167 {0x06d6, 0x06dc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2168 {0x06de, 0x06e4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2169 {0x06e7, 0x06e8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2170 {0x06ea, 0x06ed}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2171 {0x0711, 0x0711}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2172 {0x0730, 0x074a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2173 {0x07a6, 0x07b0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2174 {0x07eb, 0x07f3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2175 {0x0816, 0x0819}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2176 {0x081b, 0x0823}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2177 {0x0825, 0x0827}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2178 {0x0829, 0x082d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2179 {0x0900, 0x0903}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2180 {0x093c, 0x093c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2181 {0x093e, 0x094e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2182 {0x0951, 0x0955}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2183 {0x0962, 0x0963}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2184 {0x0981, 0x0983}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2185 {0x09bc, 0x09bc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2186 {0x09be, 0x09c4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2187 {0x09c7, 0x09c8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2188 {0x09cb, 0x09cd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2189 {0x09d7, 0x09d7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2190 {0x09e2, 0x09e3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2191 {0x0a01, 0x0a03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2192 {0x0a3c, 0x0a3c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2193 {0x0a3e, 0x0a42}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2194 {0x0a47, 0x0a48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2195 {0x0a4b, 0x0a4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2196 {0x0a51, 0x0a51}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2197 {0x0a70, 0x0a71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2198 {0x0a75, 0x0a75}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2199 {0x0a81, 0x0a83}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2200 {0x0abc, 0x0abc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2201 {0x0abe, 0x0ac5}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2202 {0x0ac7, 0x0ac9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2203 {0x0acb, 0x0acd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2204 {0x0ae2, 0x0ae3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2205 {0x0b01, 0x0b03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2206 {0x0b3c, 0x0b3c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2207 {0x0b3e, 0x0b44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2208 {0x0b47, 0x0b48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2209 {0x0b4b, 0x0b4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2210 {0x0b56, 0x0b57}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2211 {0x0b62, 0x0b63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2212 {0x0b82, 0x0b82}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2213 {0x0bbe, 0x0bc2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2214 {0x0bc6, 0x0bc8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2215 {0x0bca, 0x0bcd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2216 {0x0bd7, 0x0bd7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2217 {0x0c01, 0x0c03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2218 {0x0c3e, 0x0c44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2219 {0x0c46, 0x0c48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2220 {0x0c4a, 0x0c4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2221 {0x0c55, 0x0c56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2222 {0x0c62, 0x0c63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2223 {0x0c82, 0x0c83}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2224 {0x0cbc, 0x0cbc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2225 {0x0cbe, 0x0cc4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2226 {0x0cc6, 0x0cc8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2227 {0x0cca, 0x0ccd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2228 {0x0cd5, 0x0cd6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2229 {0x0ce2, 0x0ce3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2230 {0x0d02, 0x0d03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2231 {0x0d3e, 0x0d44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2232 {0x0d46, 0x0d48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2233 {0x0d4a, 0x0d4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2234 {0x0d57, 0x0d57}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2235 {0x0d62, 0x0d63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2236 {0x0d82, 0x0d83}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2237 {0x0dca, 0x0dca}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2238 {0x0dcf, 0x0dd4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2239 {0x0dd6, 0x0dd6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2240 {0x0dd8, 0x0ddf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2241 {0x0df2, 0x0df3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2242 {0x0e31, 0x0e31}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2243 {0x0e34, 0x0e3a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2244 {0x0e47, 0x0e4e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2245 {0x0eb1, 0x0eb1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2246 {0x0eb4, 0x0eb9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2247 {0x0ebb, 0x0ebc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2248 {0x0ec8, 0x0ecd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2249 {0x0f18, 0x0f19}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2250 {0x0f35, 0x0f35}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2251 {0x0f37, 0x0f37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2252 {0x0f39, 0x0f39}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2253 {0x0f3e, 0x0f3f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2254 {0x0f71, 0x0f84}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2255 {0x0f86, 0x0f87}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2256 {0x0f90, 0x0f97}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2257 {0x0f99, 0x0fbc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2258 {0x0fc6, 0x0fc6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2259 {0x102b, 0x103e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2260 {0x1056, 0x1059}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2261 {0x105e, 0x1060}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2262 {0x1062, 0x1064}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2263 {0x1067, 0x106d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2264 {0x1071, 0x1074}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2265 {0x1082, 0x108d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2266 {0x108f, 0x108f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2267 {0x109a, 0x109d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2268 {0x135f, 0x135f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2269 {0x1712, 0x1714}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2270 {0x1732, 0x1734}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2271 {0x1752, 0x1753}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2272 {0x1772, 0x1773}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2273 {0x17b6, 0x17d3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2274 {0x17dd, 0x17dd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2275 {0x180b, 0x180d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2276 {0x18a9, 0x18a9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2277 {0x1920, 0x192b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2278 {0x1930, 0x193b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2279 {0x19b0, 0x19c0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2280 {0x19c8, 0x19c9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2281 {0x1a17, 0x1a1b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2282 {0x1a55, 0x1a5e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2283 {0x1a60, 0x1a7c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2284 {0x1a7f, 0x1a7f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2285 {0x1b00, 0x1b04}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2286 {0x1b34, 0x1b44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2287 {0x1b6b, 0x1b73}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2288 {0x1b80, 0x1b82}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2289 {0x1ba1, 0x1baa}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2290 {0x1c24, 0x1c37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2291 {0x1cd0, 0x1cd2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2292 {0x1cd4, 0x1ce8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2293 {0x1ced, 0x1ced}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2294 {0x1cf2, 0x1cf2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2295 {0x1dc0, 0x1de6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2296 {0x1dfd, 0x1dff}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2297 {0x20d0, 0x20f0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2298 {0x2cef, 0x2cf1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2299 {0x2de0, 0x2dff}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2300 {0x302a, 0x302f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2301 {0x3099, 0x309a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2302 {0xa66f, 0xa672}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2303 {0xa67c, 0xa67d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2304 {0xa6f0, 0xa6f1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2305 {0xa802, 0xa802}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2306 {0xa806, 0xa806}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2307 {0xa80b, 0xa80b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2308 {0xa823, 0xa827}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2309 {0xa880, 0xa881}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2310 {0xa8b4, 0xa8c4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2311 {0xa8e0, 0xa8f1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2312 {0xa926, 0xa92d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2313 {0xa947, 0xa953}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2314 {0xa980, 0xa983}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2315 {0xa9b3, 0xa9c0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2316 {0xaa29, 0xaa36}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2317 {0xaa43, 0xaa43}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2318 {0xaa4c, 0xaa4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2319 {0xaa7b, 0xaa7b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2320 {0xaab0, 0xaab0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2321 {0xaab2, 0xaab4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2322 {0xaab7, 0xaab8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2323 {0xaabe, 0xaabf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2324 {0xaac1, 0xaac1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2325 {0xabe3, 0xabea}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2326 {0xabec, 0xabed}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2327 {0xfb1e, 0xfb1e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2328 {0xfe00, 0xfe0f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2329 {0xfe20, 0xfe26}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2330 {0x101fd, 0x101fd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2331 {0x10a01, 0x10a03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2332 {0x10a05, 0x10a06}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2333 {0x10a0c, 0x10a0f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2334 {0x10a38, 0x10a3a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2335 {0x10a3f, 0x10a3f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2336 {0x11080, 0x11082}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2337 {0x110b0, 0x110ba}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2338 {0x1d165, 0x1d169}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2339 {0x1d16d, 0x1d172}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2340 {0x1d17b, 0x1d182}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2341 {0x1d185, 0x1d18b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2342 {0x1d1aa, 0x1d1ad}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2343 {0x1d242, 0x1d244}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2344 {0xe0100, 0xe01ef} |
| 7 | 2345 }; |
| 2346 | |
| 2347 return intable(combining, sizeof(combining), c); | |
| 2348 } | |
| 2349 | |
| 2350 /* | |
| 2351 * Return TRUE for characters that can be displayed in a normal way. | |
| 2352 * Only for characters of 0x100 and above! | |
| 2353 */ | |
| 2354 int | |
| 2355 utf_printable(c) | |
| 2356 int c; | |
| 2357 { | |
| 2358 #ifdef USE_WCHAR_FUNCTIONS | |
| 2359 /* | |
| 2360 * Assume the iswprint() library function works better than our own stuff. | |
| 2361 */ | |
| 2362 return iswprint(c); | |
| 2363 #else | |
| 2364 /* Sorted list of non-overlapping intervals. | |
| 2365 * 0xd800-0xdfff is reserved for UTF-16, actually illegal. */ | |
| 2366 static struct interval nonprint[] = | |
| 2367 { | |
| 2368 {0x070f, 0x070f}, {0x180b, 0x180e}, {0x200b, 0x200f}, {0x202a, 0x202e}, | |
| 2369 {0x206a, 0x206f}, {0xd800, 0xdfff}, {0xfeff, 0xfeff}, {0xfff9, 0xfffb}, | |
| 2370 {0xfffe, 0xffff} | |
| 2371 }; | |
| 2372 | |
| 2373 return !intable(nonprint, sizeof(nonprint), c); | |
| 2374 #endif | |
| 2375 } | |
| 2376 | |
| 2377 /* | |
| 2378 * Get class of a Unicode character. | |
| 2379 * 0: white space | |
| 2380 * 1: punctuation | |
| 2381 * 2 or bigger: some class of word character. | |
| 2382 */ | |
| 2383 int | |
| 2384 utf_class(c) | |
| 2385 int c; | |
| 2386 { | |
| 2387 /* sorted list of non-overlapping intervals */ | |
| 2388 static struct clinterval | |
| 2389 { | |
| 2390 unsigned short first; | |
| 2391 unsigned short last; | |
| 2392 unsigned short class; | |
| 2393 } classes[] = | |
| 2394 { | |
| 2395 {0x037e, 0x037e, 1}, /* Greek question mark */ | |
| 2396 {0x0387, 0x0387, 1}, /* Greek ano teleia */ | |
| 2397 {0x055a, 0x055f, 1}, /* Armenian punctuation */ | |
| 2398 {0x0589, 0x0589, 1}, /* Armenian full stop */ | |
| 2399 {0x05be, 0x05be, 1}, | |
| 2400 {0x05c0, 0x05c0, 1}, | |
| 2401 {0x05c3, 0x05c3, 1}, | |
| 2402 {0x05f3, 0x05f4, 1}, | |
| 2403 {0x060c, 0x060c, 1}, | |
| 2404 {0x061b, 0x061b, 1}, | |
| 2405 {0x061f, 0x061f, 1}, | |
| 2406 {0x066a, 0x066d, 1}, | |
| 2407 {0x06d4, 0x06d4, 1}, | |
| 2408 {0x0700, 0x070d, 1}, /* Syriac punctuation */ | |
| 2409 {0x0964, 0x0965, 1}, | |
| 2410 {0x0970, 0x0970, 1}, | |
| 2411 {0x0df4, 0x0df4, 1}, | |
| 2412 {0x0e4f, 0x0e4f, 1}, | |
| 2413 {0x0e5a, 0x0e5b, 1}, | |
| 2414 {0x0f04, 0x0f12, 1}, | |
| 2415 {0x0f3a, 0x0f3d, 1}, | |
| 2416 {0x0f85, 0x0f85, 1}, | |
| 2417 {0x104a, 0x104f, 1}, /* Myanmar punctuation */ | |
| 2418 {0x10fb, 0x10fb, 1}, /* Georgian punctuation */ | |
| 2419 {0x1361, 0x1368, 1}, /* Ethiopic punctuation */ | |
| 2420 {0x166d, 0x166e, 1}, /* Canadian Syl. punctuation */ | |
| 2421 {0x1680, 0x1680, 0}, | |
| 2422 {0x169b, 0x169c, 1}, | |
| 2423 {0x16eb, 0x16ed, 1}, | |
| 2424 {0x1735, 0x1736, 1}, | |
| 2425 {0x17d4, 0x17dc, 1}, /* Khmer punctuation */ | |
| 2426 {0x1800, 0x180a, 1}, /* Mongolian punctuation */ | |
| 2427 {0x2000, 0x200b, 0}, /* spaces */ | |
| 2428 {0x200c, 0x2027, 1}, /* punctuation and symbols */ | |
| 2429 {0x2028, 0x2029, 0}, | |
| 2430 {0x202a, 0x202e, 1}, /* punctuation and symbols */ | |
| 2431 {0x202f, 0x202f, 0}, | |
| 2432 {0x2030, 0x205e, 1}, /* punctuation and symbols */ | |
| 2433 {0x205f, 0x205f, 0}, | |
| 2434 {0x2060, 0x27ff, 1}, /* punctuation and symbols */ | |
| 2435 {0x2070, 0x207f, 0x2070}, /* superscript */ | |
| 1593 | 2436 {0x2080, 0x2094, 0x2080}, /* subscript */ |
| 2437 {0x20a0, 0x27ff, 1}, /* all kinds of symbols */ | |
| 2438 {0x2800, 0x28ff, 0x2800}, /* braille */ | |
| 2439 {0x2900, 0x2998, 1}, /* arrows, brackets, etc. */ | |
| 7 | 2440 {0x29d8, 0x29db, 1}, |
| 2441 {0x29fc, 0x29fd, 1}, | |
| 2442 {0x3000, 0x3000, 0}, /* ideographic space */ | |
| 2443 {0x3001, 0x3020, 1}, /* ideographic punctuation */ | |
| 2444 {0x3030, 0x3030, 1}, | |
| 2445 {0x303d, 0x303d, 1}, | |
| 2446 {0x3040, 0x309f, 0x3040}, /* Hiragana */ | |
| 2447 {0x30a0, 0x30ff, 0x30a0}, /* Katakana */ | |
| 2448 {0x3300, 0x9fff, 0x4e00}, /* CJK Ideographs */ | |
| 2449 {0xac00, 0xd7a3, 0xac00}, /* Hangul Syllables */ | |
| 2450 {0xf900, 0xfaff, 0x4e00}, /* CJK Ideographs */ | |
| 2451 {0xfd3e, 0xfd3f, 1}, | |
| 2452 {0xfe30, 0xfe6b, 1}, /* punctuation forms */ | |
| 2453 {0xff00, 0xff0f, 1}, /* half/fullwidth ASCII */ | |
| 2454 {0xff1a, 0xff20, 1}, /* half/fullwidth ASCII */ | |
| 2455 {0xff3b, 0xff40, 1}, /* half/fullwidth ASCII */ | |
| 2456 {0xff5b, 0xff65, 1}, /* half/fullwidth ASCII */ | |
| 2457 }; | |
| 2458 int bot = 0; | |
| 2459 int top = sizeof(classes) / sizeof(struct clinterval) - 1; | |
| 2460 int mid; | |
| 2461 | |
| 2462 /* First quick check for Latin1 characters, use 'iskeyword'. */ | |
| 2463 if (c < 0x100) | |
| 2464 { | |
| 335 | 2465 if (c == ' ' || c == '\t' || c == NUL || c == 0xa0) |
| 7 | 2466 return 0; /* blank */ |
| 2467 if (vim_iswordc(c)) | |
| 2468 return 2; /* word character */ | |
| 2469 return 1; /* punctuation */ | |
| 2470 } | |
| 2471 | |
| 2472 /* binary search in table */ | |
| 2473 while (top >= bot) | |
| 2474 { | |
| 2475 mid = (bot + top) / 2; | |
| 2476 if (classes[mid].last < c) | |
| 2477 bot = mid + 1; | |
| 2478 else if (classes[mid].first > c) | |
| 2479 top = mid - 1; | |
| 2480 else | |
| 2481 return (int)classes[mid].class; | |
| 2482 } | |
| 2483 | |
| 2484 /* most other characters are "word" characters */ | |
| 2485 return 2; | |
| 2486 } | |
| 2487 | |
| 2488 /* | |
| 2489 * Code for Unicode case-dependent operations. Based on notes in | |
| 2490 * http://www.unicode.org/Public/UNIDATA/CaseFolding.txt | |
| 2491 * 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
|
2492 * Last updated for Unicode 5.2. |
| 7 | 2493 */ |
| 2494 | |
| 2495 /* | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2496 * 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
|
2497 * 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
|
2498 * 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
|
2499 * 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
|
2500 * folded/upper/lower by adding 32. |
| 7 | 2501 */ |
| 2502 typedef struct | |
| 2503 { | |
| 2504 int rangeStart; | |
| 2505 int rangeEnd; | |
| 2506 int step; | |
| 2507 int offset; | |
| 2508 } convertStruct; | |
| 2509 | |
| 297 | 2510 static convertStruct foldCase[] = |
| 7 | 2511 { |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2512 {0x41,0x5a,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2513 {0xb5,0xb5,-1,775}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2514 {0xc0,0xd6,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2515 {0xd8,0xde,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2516 {0x100,0x12e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2517 {0x132,0x136,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2518 {0x139,0x147,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2519 {0x14a,0x176,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2520 {0x178,0x178,-1,-121}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2521 {0x179,0x17d,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2522 {0x17f,0x17f,-1,-268}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2523 {0x181,0x181,-1,210}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2524 {0x182,0x184,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2525 {0x186,0x186,-1,206}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2526 {0x187,0x187,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2527 {0x189,0x18a,1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2528 {0x18b,0x18b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2529 {0x18e,0x18e,-1,79}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2530 {0x18f,0x18f,-1,202}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2531 {0x190,0x190,-1,203}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2532 {0x191,0x191,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2533 {0x193,0x193,-1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2534 {0x194,0x194,-1,207}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2535 {0x196,0x196,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2536 {0x197,0x197,-1,209}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2537 {0x198,0x198,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2538 {0x19c,0x19c,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2539 {0x19d,0x19d,-1,213}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2540 {0x19f,0x19f,-1,214}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2541 {0x1a0,0x1a4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2542 {0x1a6,0x1a6,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2543 {0x1a7,0x1a7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2544 {0x1a9,0x1a9,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2545 {0x1ac,0x1ac,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2546 {0x1ae,0x1ae,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2547 {0x1af,0x1af,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2548 {0x1b1,0x1b2,1,217}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2549 {0x1b3,0x1b5,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2550 {0x1b7,0x1b7,-1,219}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2551 {0x1b8,0x1bc,4,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2552 {0x1c4,0x1c4,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2553 {0x1c5,0x1c5,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2554 {0x1c7,0x1c7,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2555 {0x1c8,0x1c8,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2556 {0x1ca,0x1ca,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2557 {0x1cb,0x1db,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2558 {0x1de,0x1ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2559 {0x1f1,0x1f1,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2560 {0x1f2,0x1f4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2561 {0x1f6,0x1f6,-1,-97}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2562 {0x1f7,0x1f7,-1,-56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2563 {0x1f8,0x21e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2564 {0x220,0x220,-1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2565 {0x222,0x232,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2566 {0x23a,0x23a,-1,10795}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2567 {0x23b,0x23b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2568 {0x23d,0x23d,-1,-163}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2569 {0x23e,0x23e,-1,10792}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2570 {0x241,0x241,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2571 {0x243,0x243,-1,-195}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2572 {0x244,0x244,-1,69}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2573 {0x245,0x245,-1,71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2574 {0x246,0x24e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2575 {0x345,0x345,-1,116}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2576 {0x370,0x372,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2577 {0x376,0x376,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2578 {0x386,0x386,-1,38}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2579 {0x388,0x38a,1,37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2580 {0x38c,0x38c,-1,64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2581 {0x38e,0x38f,1,63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2582 {0x391,0x3a1,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2583 {0x3a3,0x3ab,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2584 {0x3c2,0x3c2,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2585 {0x3cf,0x3cf,-1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2586 {0x3d0,0x3d0,-1,-30}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2587 {0x3d1,0x3d1,-1,-25}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2588 {0x3d5,0x3d5,-1,-15}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2589 {0x3d6,0x3d6,-1,-22}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2590 {0x3d8,0x3ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2591 {0x3f0,0x3f0,-1,-54}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2592 {0x3f1,0x3f1,-1,-48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2593 {0x3f4,0x3f4,-1,-60}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2594 {0x3f5,0x3f5,-1,-64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2595 {0x3f7,0x3f7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2596 {0x3f9,0x3f9,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2597 {0x3fa,0x3fa,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2598 {0x3fd,0x3ff,1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2599 {0x400,0x40f,1,80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2600 {0x410,0x42f,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2601 {0x460,0x480,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2602 {0x48a,0x4be,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2603 {0x4c0,0x4c0,-1,15}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2604 {0x4c1,0x4cd,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2605 {0x4d0,0x524,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2606 {0x531,0x556,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2607 {0x10a0,0x10c5,1,7264}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2608 {0x1e00,0x1e94,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2609 {0x1e9b,0x1e9b,-1,-58}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2610 {0x1e9e,0x1e9e,-1,-7615}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2611 {0x1ea0,0x1efe,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2612 {0x1f08,0x1f0f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2613 {0x1f18,0x1f1d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2614 {0x1f28,0x1f2f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2615 {0x1f38,0x1f3f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2616 {0x1f48,0x1f4d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2617 {0x1f59,0x1f5f,2,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2618 {0x1f68,0x1f6f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2619 {0x1f88,0x1f8f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2620 {0x1f98,0x1f9f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2621 {0x1fa8,0x1faf,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2622 {0x1fb8,0x1fb9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2623 {0x1fba,0x1fbb,1,-74}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2624 {0x1fbc,0x1fbc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2625 {0x1fbe,0x1fbe,-1,-7173}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2626 {0x1fc8,0x1fcb,1,-86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2627 {0x1fcc,0x1fcc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2628 {0x1fd8,0x1fd9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2629 {0x1fda,0x1fdb,1,-100}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2630 {0x1fe8,0x1fe9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2631 {0x1fea,0x1feb,1,-112}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2632 {0x1fec,0x1fec,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2633 {0x1ff8,0x1ff9,1,-128}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2634 {0x1ffa,0x1ffb,1,-126}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2635 {0x1ffc,0x1ffc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2636 {0x2126,0x2126,-1,-7517}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2637 {0x212a,0x212a,-1,-8383}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2638 {0x212b,0x212b,-1,-8262}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2639 {0x2132,0x2132,-1,28}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2640 {0x2160,0x216f,1,16}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2641 {0x2183,0x2183,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2642 {0x24b6,0x24cf,1,26}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2643 {0x2c00,0x2c2e,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2644 {0x2c60,0x2c60,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2645 {0x2c62,0x2c62,-1,-10743}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2646 {0x2c63,0x2c63,-1,-3814}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2647 {0x2c64,0x2c64,-1,-10727}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2648 {0x2c67,0x2c6b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2649 {0x2c6d,0x2c6d,-1,-10780}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2650 {0x2c6e,0x2c6e,-1,-10749}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2651 {0x2c6f,0x2c6f,-1,-10783}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2652 {0x2c70,0x2c70,-1,-10782}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2653 {0x2c72,0x2c75,3,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2654 {0x2c7e,0x2c7f,1,-10815}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2655 {0x2c80,0x2ce2,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2656 {0x2ceb,0x2ced,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2657 {0xa640,0xa65e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2658 {0xa662,0xa66c,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2659 {0xa680,0xa696,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2660 {0xa722,0xa72e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2661 {0xa732,0xa76e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2662 {0xa779,0xa77b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2663 {0xa77d,0xa77d,-1,-35332}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2664 {0xa77e,0xa786,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2665 {0xa78b,0xa78b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2666 {0xff21,0xff3a,1,32}, |
| 7 | 2667 {0x10400,0x10427,1,40} |
| 2668 }; | |
| 2669 | |
| 2670 static int utf_convert(int a, convertStruct table[], int tableSize); | |
| 2671 | |
| 2672 /* | |
| 2673 * Generic conversion function for case operations. | |
| 2674 * Return the converted equivalent of "a", which is a UCS-4 character. Use | |
| 2675 * the given conversion "table". Uses binary search on "table". | |
| 2676 */ | |
| 2677 static int | |
| 2678 utf_convert(a, table, tableSize) | |
| 2679 int a; | |
| 2680 convertStruct table[]; | |
| 2681 int tableSize; | |
| 2682 { | |
| 2683 int start, mid, end; /* indices into table */ | |
| 2684 | |
| 2685 start = 0; | |
| 2686 end = tableSize / sizeof(convertStruct); | |
| 2687 while (start < end) | |
| 2688 { | |
| 2689 /* need to search further */ | |
| 2690 mid = (end + start) /2; | |
| 2691 if (table[mid].rangeEnd < a) | |
| 2692 start = mid + 1; | |
| 2693 else | |
| 2694 end = mid; | |
| 2695 } | |
| 2696 if (table[start].rangeStart <= a && a <= table[start].rangeEnd | |
| 2697 && (a - table[start].rangeStart) % table[start].step == 0) | |
| 2698 return (a + table[start].offset); | |
| 2699 else | |
| 2700 return a; | |
| 2701 } | |
| 2702 | |
| 2703 /* | |
| 2704 * Return the folded-case equivalent of "a", which is a UCS-4 character. Uses | |
| 2705 * simple case folding. | |
| 2706 */ | |
| 2707 int | |
| 2708 utf_fold(a) | |
| 2709 int a; | |
| 2710 { | |
| 2711 return utf_convert(a, foldCase, sizeof(foldCase)); | |
| 2712 } | |
| 2713 | |
| 297 | 2714 static convertStruct toLower[] = |
| 7 | 2715 { |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2716 {0x41,0x5a,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2717 {0xc0,0xd6,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2718 {0xd8,0xde,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2719 {0x100,0x12e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2720 {0x130,0x130,-1,-199}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2721 {0x132,0x136,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2722 {0x139,0x147,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2723 {0x14a,0x176,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2724 {0x178,0x178,-1,-121}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2725 {0x179,0x17d,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2726 {0x181,0x181,-1,210}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2727 {0x182,0x184,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2728 {0x186,0x186,-1,206}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2729 {0x187,0x187,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2730 {0x189,0x18a,1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2731 {0x18b,0x18b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2732 {0x18e,0x18e,-1,79}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2733 {0x18f,0x18f,-1,202}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2734 {0x190,0x190,-1,203}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2735 {0x191,0x191,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2736 {0x193,0x193,-1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2737 {0x194,0x194,-1,207}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2738 {0x196,0x196,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2739 {0x197,0x197,-1,209}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2740 {0x198,0x198,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2741 {0x19c,0x19c,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2742 {0x19d,0x19d,-1,213}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2743 {0x19f,0x19f,-1,214}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2744 {0x1a0,0x1a4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2745 {0x1a6,0x1a6,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2746 {0x1a7,0x1a7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2747 {0x1a9,0x1a9,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2748 {0x1ac,0x1ac,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2749 {0x1ae,0x1ae,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2750 {0x1af,0x1af,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2751 {0x1b1,0x1b2,1,217}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2752 {0x1b3,0x1b5,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2753 {0x1b7,0x1b7,-1,219}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2754 {0x1b8,0x1bc,4,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2755 {0x1c4,0x1c4,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2756 {0x1c5,0x1c5,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2757 {0x1c7,0x1c7,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2758 {0x1c8,0x1c8,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2759 {0x1ca,0x1ca,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2760 {0x1cb,0x1db,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2761 {0x1de,0x1ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2762 {0x1f1,0x1f1,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2763 {0x1f2,0x1f4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2764 {0x1f6,0x1f6,-1,-97}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2765 {0x1f7,0x1f7,-1,-56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2766 {0x1f8,0x21e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2767 {0x220,0x220,-1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2768 {0x222,0x232,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2769 {0x23a,0x23a,-1,10795}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2770 {0x23b,0x23b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2771 {0x23d,0x23d,-1,-163}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2772 {0x23e,0x23e,-1,10792}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2773 {0x241,0x241,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2774 {0x243,0x243,-1,-195}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2775 {0x244,0x244,-1,69}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2776 {0x245,0x245,-1,71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2777 {0x246,0x24e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2778 {0x370,0x372,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2779 {0x376,0x376,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2780 {0x386,0x386,-1,38}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2781 {0x388,0x38a,1,37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2782 {0x38c,0x38c,-1,64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2783 {0x38e,0x38f,1,63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2784 {0x391,0x3a1,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2785 {0x3a3,0x3ab,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2786 {0x3cf,0x3cf,-1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2787 {0x3d8,0x3ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2788 {0x3f4,0x3f4,-1,-60}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2789 {0x3f7,0x3f7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2790 {0x3f9,0x3f9,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2791 {0x3fa,0x3fa,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2792 {0x3fd,0x3ff,1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2793 {0x400,0x40f,1,80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2794 {0x410,0x42f,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2795 {0x460,0x480,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2796 {0x48a,0x4be,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2797 {0x4c0,0x4c0,-1,15}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2798 {0x4c1,0x4cd,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2799 {0x4d0,0x524,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2800 {0x531,0x556,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2801 {0x10a0,0x10c5,1,7264}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2802 {0x1e00,0x1e94,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2803 {0x1e9e,0x1e9e,-1,-7615}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2804 {0x1ea0,0x1efe,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2805 {0x1f08,0x1f0f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2806 {0x1f18,0x1f1d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2807 {0x1f28,0x1f2f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2808 {0x1f38,0x1f3f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2809 {0x1f48,0x1f4d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2810 {0x1f59,0x1f5f,2,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2811 {0x1f68,0x1f6f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2812 {0x1f88,0x1f8f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2813 {0x1f98,0x1f9f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2814 {0x1fa8,0x1faf,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2815 {0x1fb8,0x1fb9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2816 {0x1fba,0x1fbb,1,-74}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2817 {0x1fbc,0x1fbc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2818 {0x1fc8,0x1fcb,1,-86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2819 {0x1fcc,0x1fcc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2820 {0x1fd8,0x1fd9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2821 {0x1fda,0x1fdb,1,-100}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2822 {0x1fe8,0x1fe9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2823 {0x1fea,0x1feb,1,-112}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2824 {0x1fec,0x1fec,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2825 {0x1ff8,0x1ff9,1,-128}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2826 {0x1ffa,0x1ffb,1,-126}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2827 {0x1ffc,0x1ffc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2828 {0x2126,0x2126,-1,-7517}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2829 {0x212a,0x212a,-1,-8383}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2830 {0x212b,0x212b,-1,-8262}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2831 {0x2132,0x2132,-1,28}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2832 {0x2160,0x216f,1,16}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2833 {0x2183,0x2183,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2834 {0x24b6,0x24cf,1,26}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2835 {0x2c00,0x2c2e,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2836 {0x2c60,0x2c60,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2837 {0x2c62,0x2c62,-1,-10743}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2838 {0x2c63,0x2c63,-1,-3814}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2839 {0x2c64,0x2c64,-1,-10727}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2840 {0x2c67,0x2c6b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2841 {0x2c6d,0x2c6d,-1,-10780}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2842 {0x2c6e,0x2c6e,-1,-10749}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2843 {0x2c6f,0x2c6f,-1,-10783}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2844 {0x2c70,0x2c70,-1,-10782}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2845 {0x2c72,0x2c75,3,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2846 {0x2c7e,0x2c7f,1,-10815}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2847 {0x2c80,0x2ce2,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2848 {0x2ceb,0x2ced,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2849 {0xa640,0xa65e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2850 {0xa662,0xa66c,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2851 {0xa680,0xa696,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2852 {0xa722,0xa72e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2853 {0xa732,0xa76e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2854 {0xa779,0xa77b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2855 {0xa77d,0xa77d,-1,-35332}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2856 {0xa77e,0xa786,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2857 {0xa78b,0xa78b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2858 {0xff21,0xff3a,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2859 {0x10400,0x10427,1,40} |
| 7 | 2860 }; |
| 2861 | |
| 297 | 2862 static convertStruct toUpper[] = |
| 7 | 2863 { |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2864 {0x61,0x7a,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2865 {0xb5,0xb5,-1,743}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2866 {0xe0,0xf6,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2867 {0xf8,0xfe,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2868 {0xff,0xff,-1,121}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2869 {0x101,0x12f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2870 {0x131,0x131,-1,-232}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2871 {0x133,0x137,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2872 {0x13a,0x148,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2873 {0x14b,0x177,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2874 {0x17a,0x17e,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2875 {0x17f,0x17f,-1,-300}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2876 {0x180,0x180,-1,195}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2877 {0x183,0x185,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2878 {0x188,0x18c,4,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2879 {0x192,0x192,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2880 {0x195,0x195,-1,97}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2881 {0x199,0x199,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2882 {0x19a,0x19a,-1,163}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2883 {0x19e,0x19e,-1,130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2884 {0x1a1,0x1a5,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2885 {0x1a8,0x1ad,5,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2886 {0x1b0,0x1b4,4,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2887 {0x1b6,0x1b9,3,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2888 {0x1bd,0x1bd,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2889 {0x1bf,0x1bf,-1,56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2890 {0x1c5,0x1c5,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2891 {0x1c6,0x1c6,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2892 {0x1c8,0x1c8,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2893 {0x1c9,0x1c9,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2894 {0x1cb,0x1cb,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2895 {0x1cc,0x1cc,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2896 {0x1ce,0x1dc,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2897 {0x1dd,0x1dd,-1,-79}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2898 {0x1df,0x1ef,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2899 {0x1f2,0x1f2,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2900 {0x1f3,0x1f3,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2901 {0x1f5,0x1f9,4,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2902 {0x1fb,0x21f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2903 {0x223,0x233,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2904 {0x23c,0x23c,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2905 {0x23f,0x240,1,10815}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2906 {0x242,0x247,5,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2907 {0x249,0x24f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2908 {0x250,0x250,-1,10783}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2909 {0x251,0x251,-1,10780}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2910 {0x252,0x252,-1,10782}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2911 {0x253,0x253,-1,-210}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2912 {0x254,0x254,-1,-206}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2913 {0x256,0x257,1,-205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2914 {0x259,0x259,-1,-202}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2915 {0x25b,0x25b,-1,-203}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2916 {0x260,0x260,-1,-205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2917 {0x263,0x263,-1,-207}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2918 {0x268,0x268,-1,-209}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2919 {0x269,0x269,-1,-211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2920 {0x26b,0x26b,-1,10743}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2921 {0x26f,0x26f,-1,-211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2922 {0x271,0x271,-1,10749}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2923 {0x272,0x272,-1,-213}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2924 {0x275,0x275,-1,-214}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2925 {0x27d,0x27d,-1,10727}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2926 {0x280,0x283,3,-218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2927 {0x288,0x288,-1,-218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2928 {0x289,0x289,-1,-69}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2929 {0x28a,0x28b,1,-217}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2930 {0x28c,0x28c,-1,-71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2931 {0x292,0x292,-1,-219}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2932 {0x345,0x345,-1,84}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2933 {0x371,0x373,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2934 {0x377,0x377,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2935 {0x37b,0x37d,1,130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2936 {0x3ac,0x3ac,-1,-38}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2937 {0x3ad,0x3af,1,-37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2938 {0x3b1,0x3c1,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2939 {0x3c2,0x3c2,-1,-31}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2940 {0x3c3,0x3cb,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2941 {0x3cc,0x3cc,-1,-64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2942 {0x3cd,0x3ce,1,-63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2943 {0x3d0,0x3d0,-1,-62}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2944 {0x3d1,0x3d1,-1,-57}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2945 {0x3d5,0x3d5,-1,-47}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2946 {0x3d6,0x3d6,-1,-54}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2947 {0x3d7,0x3d7,-1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2948 {0x3d9,0x3ef,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2949 {0x3f0,0x3f0,-1,-86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2950 {0x3f1,0x3f1,-1,-80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2951 {0x3f2,0x3f2,-1,7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2952 {0x3f5,0x3f5,-1,-96}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2953 {0x3f8,0x3fb,3,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2954 {0x430,0x44f,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2955 {0x450,0x45f,1,-80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2956 {0x461,0x481,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2957 {0x48b,0x4bf,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2958 {0x4c2,0x4ce,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2959 {0x4cf,0x4cf,-1,-15}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2960 {0x4d1,0x525,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2961 {0x561,0x586,1,-48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2962 {0x1d79,0x1d79,-1,35332}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2963 {0x1d7d,0x1d7d,-1,3814}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2964 {0x1e01,0x1e95,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2965 {0x1e9b,0x1e9b,-1,-59}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2966 {0x1ea1,0x1eff,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2967 {0x1f00,0x1f07,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2968 {0x1f10,0x1f15,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2969 {0x1f20,0x1f27,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2970 {0x1f30,0x1f37,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2971 {0x1f40,0x1f45,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2972 {0x1f51,0x1f57,2,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2973 {0x1f60,0x1f67,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2974 {0x1f70,0x1f71,1,74}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2975 {0x1f72,0x1f75,1,86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2976 {0x1f76,0x1f77,1,100}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2977 {0x1f78,0x1f79,1,128}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2978 {0x1f7a,0x1f7b,1,112}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2979 {0x1f7c,0x1f7d,1,126}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2980 {0x1f80,0x1f87,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2981 {0x1f90,0x1f97,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2982 {0x1fa0,0x1fa7,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2983 {0x1fb0,0x1fb1,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2984 {0x1fb3,0x1fb3,-1,9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2985 {0x1fbe,0x1fbe,-1,-7205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2986 {0x1fc3,0x1fc3,-1,9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2987 {0x1fd0,0x1fd1,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2988 {0x1fe0,0x1fe1,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2989 {0x1fe5,0x1fe5,-1,7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2990 {0x1ff3,0x1ff3,-1,9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2991 {0x214e,0x214e,-1,-28}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2992 {0x2170,0x217f,1,-16}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2993 {0x2184,0x2184,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2994 {0x24d0,0x24e9,1,-26}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2995 {0x2c30,0x2c5e,1,-48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2996 {0x2c61,0x2c61,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2997 {0x2c65,0x2c65,-1,-10795}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2998 {0x2c66,0x2c66,-1,-10792}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2999 {0x2c68,0x2c6c,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3000 {0x2c73,0x2c76,3,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3001 {0x2c81,0x2ce3,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3002 {0x2cec,0x2cee,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3003 {0x2d00,0x2d25,1,-7264}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3004 {0xa641,0xa65f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3005 {0xa663,0xa66d,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3006 {0xa681,0xa697,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3007 {0xa723,0xa72f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3008 {0xa733,0xa76f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3009 {0xa77a,0xa77c,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3010 {0xa77f,0xa787,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3011 {0xa78c,0xa78c,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3012 {0xff41,0xff5a,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3013 {0x10428,0x1044f,1,-40} |
| 7 | 3014 }; |
| 3015 | |
| 3016 /* | |
| 3017 * Return the upper-case equivalent of "a", which is a UCS-4 character. Use | |
| 3018 * simple case folding. | |
| 3019 */ | |
| 3020 int | |
| 3021 utf_toupper(a) | |
| 3022 int a; | |
| 3023 { | |
| 3024 /* If 'casemap' contains "keepascii" use ASCII style toupper(). */ | |
| 3025 if (a < 128 && (cmp_flags & CMP_KEEPASCII)) | |
| 3026 return TOUPPER_ASC(a); | |
| 3027 | |
| 856 | 3028 #if defined(HAVE_TOWUPPER) && defined(__STDC_ISO_10646__) |
| 3029 /* If towupper() is available and handles Unicode, use it. */ | |
| 7 | 3030 if (!(cmp_flags & CMP_INTERNAL)) |
| 3031 return towupper(a); | |
| 3032 #endif | |
| 3033 | |
| 3034 /* For characters below 128 use locale sensitive toupper(). */ | |
| 3035 if (a < 128) | |
| 3036 return TOUPPER_LOC(a); | |
| 3037 | |
| 3038 /* For any other characters use the above mapping table. */ | |
| 3039 return utf_convert(a, toUpper, sizeof(toUpper)); | |
| 3040 } | |
| 3041 | |
| 3042 int | |
| 3043 utf_islower(a) | |
| 3044 int a; | |
| 3045 { | |
| 3046 return (utf_toupper(a) != a); | |
| 3047 } | |
| 3048 | |
| 3049 /* | |
| 3050 * Return the lower-case equivalent of "a", which is a UCS-4 character. Use | |
| 3051 * simple case folding. | |
| 3052 */ | |
| 3053 int | |
| 3054 utf_tolower(a) | |
| 3055 int a; | |
| 3056 { | |
| 3057 /* If 'casemap' contains "keepascii" use ASCII style tolower(). */ | |
| 3058 if (a < 128 && (cmp_flags & CMP_KEEPASCII)) | |
| 3059 return TOLOWER_ASC(a); | |
| 3060 | |
| 856 | 3061 #if defined(HAVE_TOWLOWER) && defined(__STDC_ISO_10646__) |
| 257 | 3062 /* If towlower() is available and handles Unicode, use it. */ |
| 7 | 3063 if (!(cmp_flags & CMP_INTERNAL)) |
| 3064 return towlower(a); | |
| 3065 #endif | |
| 3066 | |
| 3067 /* For characters below 128 use locale sensitive tolower(). */ | |
| 3068 if (a < 128) | |
| 3069 return TOLOWER_LOC(a); | |
| 3070 | |
| 3071 /* For any other characters use the above mapping table. */ | |
| 3072 return utf_convert(a, toLower, sizeof(toLower)); | |
| 3073 } | |
| 3074 | |
| 3075 int | |
| 3076 utf_isupper(a) | |
| 3077 int a; | |
| 3078 { | |
| 3079 return (utf_tolower(a) != a); | |
| 3080 } | |
| 3081 | |
| 3082 /* | |
| 3083 * Version of strnicmp() that handles multi-byte characters. | |
| 3084 * Needed for Big5, Sjift-JIS and UTF-8 encoding. Other DBCS encodings can | |
| 3085 * probably use strnicmp(), because there are no ASCII characters in the | |
| 3086 * second byte. | |
| 3087 * Returns zero if s1 and s2 are equal (ignoring case), the difference between | |
| 3088 * two characters otherwise. | |
| 3089 */ | |
| 3090 int | |
| 303 | 3091 mb_strnicmp(s1, s2, nn) |
| 7 | 3092 char_u *s1, *s2; |
| 303 | 3093 size_t nn; |
| 7 | 3094 { |
| 3095 int i, j, l; | |
| 3096 int cdiff; | |
| 308 | 3097 int incomplete = FALSE; |
| 835 | 3098 int n = (int)nn; |
| 7 | 3099 |
| 3100 for (i = 0; i < n; i += l) | |
| 3101 { | |
| 3102 if (s1[i] == NUL && s2[i] == NUL) /* both strings end */ | |
| 3103 return 0; | |
| 3104 if (enc_utf8) | |
| 3105 { | |
| 3106 l = utf_byte2len(s1[i]); | |
| 3107 if (l > n - i) | |
| 308 | 3108 { |
| 7 | 3109 l = n - i; /* incomplete character */ |
| 308 | 3110 incomplete = TRUE; |
| 3111 } | |
| 7 | 3112 /* Check directly first, it's faster. */ |
| 3113 for (j = 0; j < l; ++j) | |
| 1052 | 3114 { |
| 7 | 3115 if (s1[i + j] != s2[i + j]) |
| 3116 break; | |
| 1052 | 3117 if (s1[i + j] == 0) |
| 3118 /* Both stings have the same bytes but are incomplete or | |
| 3119 * have illegal bytes, accept them as equal. */ | |
| 3120 l = j; | |
| 3121 } | |
| 7 | 3122 if (j < l) |
| 3123 { | |
| 3124 /* If one of the two characters is incomplete return -1. */ | |
| 308 | 3125 if (incomplete || i + utf_byte2len(s2[i]) > n) |
| 7 | 3126 return -1; |
| 2618 | 3127 /* Don't case-fold illegal bytes or truncated characters. */ |
| 3128 if (utf_ptr2len(s1 + i) < l || utf_ptr2len(s2 + i) < l) | |
| 3129 return -1; | |
| 7 | 3130 cdiff = utf_fold(utf_ptr2char(s1 + i)) |
| 3131 - utf_fold(utf_ptr2char(s2 + i)); | |
| 3132 if (cdiff != 0) | |
| 3133 return cdiff; | |
| 3134 } | |
| 3135 } | |
| 3136 else | |
| 3137 { | |
| 474 | 3138 l = (*mb_ptr2len)(s1 + i); |
| 7 | 3139 if (l <= 1) |
| 3140 { | |
| 3141 /* Single byte: first check normally, then with ignore case. */ | |
| 3142 if (s1[i] != s2[i]) | |
| 3143 { | |
| 1347 | 3144 cdiff = MB_TOLOWER(s1[i]) - MB_TOLOWER(s2[i]); |
| 7 | 3145 if (cdiff != 0) |
| 3146 return cdiff; | |
| 3147 } | |
| 3148 } | |
| 3149 else | |
| 3150 { | |
| 3151 /* For non-Unicode multi-byte don't ignore case. */ | |
| 3152 if (l > n - i) | |
| 3153 l = n - i; | |
| 3154 cdiff = STRNCMP(s1 + i, s2 + i, l); | |
| 3155 if (cdiff != 0) | |
| 3156 return cdiff; | |
| 3157 } | |
| 3158 } | |
| 3159 } | |
| 3160 return 0; | |
| 3161 } | |
| 3162 | |
| 3163 /* | |
| 3164 * "g8": show bytes of the UTF-8 char under the cursor. Doesn't matter what | |
| 3165 * 'encoding' has been set to. | |
| 3166 */ | |
| 3167 void | |
| 3168 show_utf8() | |
| 3169 { | |
| 3170 int len; | |
| 273 | 3171 int rlen = 0; |
| 7 | 3172 char_u *line; |
| 3173 int clen; | |
| 3174 int i; | |
| 3175 | |
| 3176 /* Get the byte length of the char under the cursor, including composing | |
| 3177 * characters. */ | |
| 3178 line = ml_get_cursor(); | |
| 474 | 3179 len = utfc_ptr2len(line); |
| 7 | 3180 if (len == 0) |
| 3181 { | |
| 3182 MSG("NUL"); | |
| 3183 return; | |
| 3184 } | |
| 3185 | |
| 3186 clen = 0; | |
| 3187 for (i = 0; i < len; ++i) | |
| 3188 { | |
| 3189 if (clen == 0) | |
| 3190 { | |
| 3191 /* start of (composing) character, get its length */ | |
| 3192 if (i > 0) | |
| 273 | 3193 { |
| 3194 STRCPY(IObuff + rlen, "+ "); | |
| 3195 rlen += 2; | |
| 3196 } | |
| 474 | 3197 clen = utf_ptr2len(line + i); |
| 7 | 3198 } |
|
2205
54605ada811b
"g8" doesn't work properly on a NUL.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
3199 sprintf((char *)IObuff + rlen, "%02x ", |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
3200 (line[i] == NL) ? NUL : line[i]); /* NUL is stored as NL */ |
| 7 | 3201 --clen; |
| 835 | 3202 rlen += (int)STRLEN(IObuff + rlen); |
| 273 | 3203 if (rlen > IOSIZE - 20) |
| 3204 break; | |
| 7 | 3205 } |
| 3206 | |
| 3207 msg(IObuff); | |
| 3208 } | |
| 3209 | |
| 3210 /* | |
| 3211 * mb_head_off() function pointer. | |
| 3212 * Return offset from "p" to the first byte of the character it points into. | |
| 2015 | 3213 * If "p" points to the NUL at the end of the string return 0. |
| 7 | 3214 * Returns 0 when already at the first byte of a character. |
| 3215 */ | |
| 3216 int | |
| 3217 latin_head_off(base, p) | |
| 1883 | 3218 char_u *base UNUSED; |
| 3219 char_u *p UNUSED; | |
| 7 | 3220 { |
| 3221 return 0; | |
| 3222 } | |
| 3223 | |
| 3224 int | |
| 3225 dbcs_head_off(base, p) | |
| 3226 char_u *base; | |
| 3227 char_u *p; | |
| 3228 { | |
| 3229 char_u *q; | |
| 3230 | |
| 3231 /* It can't be a trailing byte when not using DBCS, at the start of the | |
| 3232 * string or the previous byte can't start a double-byte. */ | |
| 2015 | 3233 if (p <= base || MB_BYTE2LEN(p[-1]) == 1 || *p == NUL) |
| 7 | 3234 return 0; |
| 3235 | |
| 3236 /* This is slow: need to start at the base and go forward until the | |
| 3237 * byte we are looking for. Return 1 when we went past it, 0 otherwise. */ | |
| 3238 q = base; | |
| 3239 while (q < p) | |
| 474 | 3240 q += dbcs_ptr2len(q); |
| 7 | 3241 return (q == p) ? 0 : 1; |
| 3242 } | |
| 3243 | |
| 3244 /* | |
| 3245 * Special version of dbcs_head_off() that works for ScreenLines[], where | |
| 3246 * single-width DBCS_JPNU characters are stored separately. | |
| 3247 */ | |
| 3248 int | |
| 3249 dbcs_screen_head_off(base, p) | |
| 3250 char_u *base; | |
| 3251 char_u *p; | |
| 3252 { | |
| 3253 char_u *q; | |
| 3254 | |
| 3255 /* It can't be a trailing byte when not using DBCS, at the start of the | |
| 3256 * string or the previous byte can't start a double-byte. | |
| 3257 * For euc-jp an 0x8e byte in the previous cell always means we have a | |
| 3258 * lead byte in the current cell. */ | |
| 3259 if (p <= base | |
| 3260 || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e) | |
| 2015 | 3261 || MB_BYTE2LEN(p[-1]) == 1 |
| 3262 || *p == NUL) | |
| 7 | 3263 return 0; |
| 3264 | |
| 3265 /* This is slow: need to start at the base and go forward until the | |
| 3266 * byte we are looking for. Return 1 when we went past it, 0 otherwise. | |
| 3267 * For DBCS_JPNU look out for 0x8e, which means the second byte is not | |
| 3268 * stored as the next byte. */ | |
| 3269 q = base; | |
| 3270 while (q < p) | |
| 3271 { | |
| 3272 if (enc_dbcs == DBCS_JPNU && *q == 0x8e) | |
| 3273 ++q; | |
| 3274 else | |
| 474 | 3275 q += dbcs_ptr2len(q); |
| 7 | 3276 } |
| 3277 return (q == p) ? 0 : 1; | |
| 3278 } | |
| 3279 | |
| 3280 int | |
| 3281 utf_head_off(base, p) | |
| 3282 char_u *base; | |
| 3283 char_u *p; | |
| 3284 { | |
| 3285 char_u *q; | |
| 3286 char_u *s; | |
| 3287 int c; | |
| 2015 | 3288 int len; |
| 7 | 3289 #ifdef FEAT_ARABIC |
| 3290 char_u *j; | |
| 3291 #endif | |
| 3292 | |
| 3293 if (*p < 0x80) /* be quick for ASCII */ | |
| 3294 return 0; | |
| 3295 | |
| 3296 /* Skip backwards over trailing bytes: 10xx.xxxx | |
| 3297 * Skip backwards again if on a composing char. */ | |
| 3298 for (q = p; ; --q) | |
| 3299 { | |
| 3300 /* Move s to the last byte of this char. */ | |
| 3301 for (s = q; (s[1] & 0xc0) == 0x80; ++s) | |
| 3302 ; | |
| 3303 /* Move q to the first byte of this char. */ | |
| 3304 while (q > base && (*q & 0xc0) == 0x80) | |
| 3305 --q; | |
| 3306 /* Check for illegal sequence. Do allow an illegal byte after where we | |
| 3307 * started. */ | |
| 2015 | 3308 len = utf8len_tab[*q]; |
| 3309 if (len != (int)(s - q + 1) && len != (int)(p - q + 1)) | |
| 7 | 3310 return 0; |
| 3311 | |
| 3312 if (q <= base) | |
| 3313 break; | |
| 3314 | |
| 3315 c = utf_ptr2char(q); | |
| 3316 if (utf_iscomposing(c)) | |
| 3317 continue; | |
| 3318 | |
| 3319 #ifdef FEAT_ARABIC | |
| 3320 if (arabic_maycombine(c)) | |
| 3321 { | |
| 3322 /* Advance to get a sneak-peak at the next char */ | |
| 3323 j = q; | |
| 3324 --j; | |
| 3325 /* Move j to the first byte of this char. */ | |
| 3326 while (j > base && (*j & 0xc0) == 0x80) | |
| 3327 --j; | |
| 3328 if (arabic_combine(utf_ptr2char(j), c)) | |
| 3329 continue; | |
| 3330 } | |
| 3331 #endif | |
| 3332 break; | |
| 3333 } | |
| 3334 | |
| 3335 return (int)(p - q); | |
| 3336 } | |
| 3337 | |
| 3338 /* | |
| 99 | 3339 * Copy a character from "*fp" to "*tp" and advance the pointers. |
| 3340 */ | |
| 3341 void | |
| 3342 mb_copy_char(fp, tp) | |
| 3343 char_u **fp; | |
| 3344 char_u **tp; | |
| 3345 { | |
| 474 | 3346 int l = (*mb_ptr2len)(*fp); |
| 99 | 3347 |
| 3348 mch_memmove(*tp, *fp, (size_t)l); | |
| 3349 *tp += l; | |
| 3350 *fp += l; | |
| 3351 } | |
| 3352 | |
| 3353 /* | |
| 7 | 3354 * Return the offset from "p" to the first byte of a character. When "p" is |
| 3355 * at the start of a character 0 is returned, otherwise the offset to the next | |
| 3356 * character. Can start anywhere in a stream of bytes. | |
| 3357 */ | |
| 3358 int | |
| 3359 mb_off_next(base, p) | |
| 3360 char_u *base; | |
| 3361 char_u *p; | |
| 3362 { | |
| 3363 int i; | |
| 3364 int j; | |
| 3365 | |
| 3366 if (enc_utf8) | |
| 3367 { | |
| 3368 if (*p < 0x80) /* be quick for ASCII */ | |
| 3369 return 0; | |
| 3370 | |
| 3371 /* Find the next character that isn't 10xx.xxxx */ | |
| 3372 for (i = 0; (p[i] & 0xc0) == 0x80; ++i) | |
| 3373 ; | |
| 3374 if (i > 0) | |
| 3375 { | |
| 3376 /* Check for illegal sequence. */ | |
| 3377 for (j = 0; p - j > base; ++j) | |
| 3378 if ((p[-j] & 0xc0) != 0x80) | |
| 3379 break; | |
| 3380 if (utf8len_tab[p[-j]] != i + j) | |
| 3381 return 0; | |
| 3382 } | |
| 3383 return i; | |
| 3384 } | |
| 3385 | |
| 3386 /* Only need to check if we're on a trail byte, it doesn't matter if we | |
| 3387 * want the offset to the next or current character. */ | |
| 3388 return (*mb_head_off)(base, p); | |
| 3389 } | |
| 3390 | |
| 3391 /* | |
| 3392 * Return the offset from "p" to the last byte of the character it points | |
| 3393 * into. Can start anywhere in a stream of bytes. | |
| 3394 */ | |
| 3395 int | |
| 3396 mb_tail_off(base, p) | |
| 3397 char_u *base; | |
| 3398 char_u *p; | |
| 3399 { | |
| 3400 int i; | |
| 3401 int j; | |
| 3402 | |
| 3403 if (*p == NUL) | |
| 3404 return 0; | |
| 3405 | |
| 3406 if (enc_utf8) | |
| 3407 { | |
| 3408 /* Find the last character that is 10xx.xxxx */ | |
| 3409 for (i = 0; (p[i + 1] & 0xc0) == 0x80; ++i) | |
| 3410 ; | |
| 3411 /* Check for illegal sequence. */ | |
| 3412 for (j = 0; p - j > base; ++j) | |
| 3413 if ((p[-j] & 0xc0) != 0x80) | |
| 3414 break; | |
| 3415 if (utf8len_tab[p[-j]] != i + j + 1) | |
| 3416 return 0; | |
| 3417 return i; | |
| 3418 } | |
| 3419 | |
| 3420 /* It can't be the first byte if a double-byte when not using DBCS, at the | |
| 3421 * end of the string or the byte can't start a double-byte. */ | |
| 3422 if (enc_dbcs == 0 || p[1] == NUL || MB_BYTE2LEN(*p) == 1) | |
| 3423 return 0; | |
| 3424 | |
| 3425 /* Return 1 when on the lead byte, 0 when on the tail byte. */ | |
| 3426 return 1 - dbcs_head_off(base, p); | |
| 3427 } | |
| 3428 | |
| 776 | 3429 /* |
| 3430 * Find the next illegal byte sequence. | |
| 3431 */ | |
| 3432 void | |
| 3433 utf_find_illegal() | |
| 3434 { | |
| 3435 pos_T pos = curwin->w_cursor; | |
| 3436 char_u *p; | |
| 3437 int len; | |
| 3438 vimconv_T vimconv; | |
| 3439 char_u *tofree = NULL; | |
| 3440 | |
| 3441 vimconv.vc_type = CONV_NONE; | |
| 3442 if (enc_utf8 && (enc_canon_props(curbuf->b_p_fenc) & ENC_8BIT)) | |
| 3443 { | |
| 3444 /* 'encoding' is "utf-8" but we are editing a 8-bit encoded file, | |
| 3445 * possibly a utf-8 file with illegal bytes. Setup for conversion | |
| 3446 * from utf-8 to 'fileencoding'. */ | |
| 3447 convert_setup(&vimconv, p_enc, curbuf->b_p_fenc); | |
| 3448 } | |
| 3449 | |
| 3450 #ifdef FEAT_VIRTUALEDIT | |
| 3451 curwin->w_cursor.coladd = 0; | |
| 3452 #endif | |
| 3453 for (;;) | |
| 3454 { | |
| 3455 p = ml_get_cursor(); | |
| 3456 if (vimconv.vc_type != CONV_NONE) | |
| 3457 { | |
| 3458 vim_free(tofree); | |
| 3459 tofree = string_convert(&vimconv, p, NULL); | |
| 3460 if (tofree == NULL) | |
| 3461 break; | |
| 3462 p = tofree; | |
| 3463 } | |
| 3464 | |
| 3465 while (*p != NUL) | |
| 3466 { | |
| 3467 /* Illegal means that there are not enough trail bytes (checked by | |
| 3468 * utf_ptr2len()) or too many of them (overlong sequence). */ | |
| 3469 len = utf_ptr2len(p); | |
| 3470 if (*p >= 0x80 && (len == 1 | |
| 3471 || utf_char2len(utf_ptr2char(p)) != len)) | |
| 3472 { | |
| 3473 if (vimconv.vc_type == CONV_NONE) | |
| 835 | 3474 curwin->w_cursor.col += (colnr_T)(p - ml_get_cursor()); |
| 776 | 3475 else |
| 3476 { | |
| 3477 int l; | |
| 3478 | |
| 835 | 3479 len = (int)(p - tofree); |
| 776 | 3480 for (p = ml_get_cursor(); *p != NUL && len-- > 0; p += l) |
| 3481 { | |
| 3482 l = utf_ptr2len(p); | |
| 3483 curwin->w_cursor.col += l; | |
| 3484 } | |
| 3485 } | |
| 3486 goto theend; | |
| 3487 } | |
| 3488 p += len; | |
| 3489 } | |
| 3490 if (curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
| 3491 break; | |
| 3492 ++curwin->w_cursor.lnum; | |
| 3493 curwin->w_cursor.col = 0; | |
| 3494 } | |
| 3495 | |
| 3496 /* didn't find it: don't move and beep */ | |
| 3497 curwin->w_cursor = pos; | |
| 3498 beep_flush(); | |
| 3499 | |
| 3500 theend: | |
| 3501 vim_free(tofree); | |
| 3502 convert_setup(&vimconv, NULL, NULL); | |
| 3503 } | |
| 3504 | |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
3505 #if defined(FEAT_GUI_GTK) || defined(PROTO) |
| 26 | 3506 /* |
| 3507 * Return TRUE if string "s" is a valid utf-8 string. | |
| 3508 * When "end" is NULL stop at the first NUL. | |
| 3509 * When "end" is positive stop there. | |
| 3510 */ | |
| 3511 int | |
| 3512 utf_valid_string(s, end) | |
| 3513 char_u *s; | |
| 3514 char_u *end; | |
| 3515 { | |
| 3516 int l; | |
| 3517 char_u *p = s; | |
| 3518 | |
| 3519 while (end == NULL ? *p != NUL : p < end) | |
| 3520 { | |
| 2015 | 3521 l = utf8len_tab_zero[*p]; |
| 3522 if (l == 0) | |
| 26 | 3523 return FALSE; /* invalid lead byte */ |
| 3524 if (end != NULL && p + l > end) | |
| 3525 return FALSE; /* incomplete byte sequence */ | |
| 3526 ++p; | |
| 3527 while (--l > 0) | |
| 3528 if ((*p++ & 0xc0) != 0x80) | |
| 3529 return FALSE; /* invalid trail byte */ | |
| 3530 } | |
| 3531 return TRUE; | |
| 3532 } | |
| 3533 #endif | |
| 3534 | |
| 7 | 3535 #if defined(FEAT_GUI) || defined(PROTO) |
| 3536 /* | |
| 3537 * Special version of mb_tail_off() for use in ScreenLines[]. | |
| 3538 */ | |
| 3539 int | |
| 3540 dbcs_screen_tail_off(base, p) | |
| 3541 char_u *base; | |
| 3542 char_u *p; | |
| 3543 { | |
| 3544 /* It can't be the first byte if a double-byte when not using DBCS, at the | |
| 3545 * end of the string or the byte can't start a double-byte. | |
| 3546 * For euc-jp an 0x8e byte always means we have a lead byte in the current | |
| 3547 * cell. */ | |
| 3548 if (*p == NUL || p[1] == NUL | |
| 3549 || (enc_dbcs == DBCS_JPNU && *p == 0x8e) | |
| 3550 || MB_BYTE2LEN(*p) == 1) | |
| 3551 return 0; | |
| 3552 | |
| 3553 /* Return 1 when on the lead byte, 0 when on the tail byte. */ | |
| 3554 return 1 - dbcs_screen_head_off(base, p); | |
| 3555 } | |
| 3556 #endif | |
| 3557 | |
| 3558 /* | |
| 3559 * If the cursor moves on an trail byte, set the cursor on the lead byte. | |
| 3560 * Thus it moves left if necessary. | |
| 3561 * Return TRUE when the cursor was adjusted. | |
| 3562 */ | |
| 3563 void | |
| 3564 mb_adjust_cursor() | |
| 3565 { | |
| 3566 mb_adjustpos(&curwin->w_cursor); | |
| 3567 } | |
| 3568 | |
| 3569 /* | |
| 3570 * Adjust position "*lp" to point to the first byte of a multi-byte character. | |
| 3571 * If it points to a tail byte it's moved backwards to the head byte. | |
| 3572 */ | |
| 3573 void | |
| 3574 mb_adjustpos(lp) | |
| 3575 pos_T *lp; | |
| 3576 { | |
| 3577 char_u *p; | |
| 3578 | |
| 3579 if (lp->col > 0 | |
| 3580 #ifdef FEAT_VIRTUALEDIT | |
| 3581 || lp->coladd > 1 | |
| 3582 #endif | |
| 3583 ) | |
| 3584 { | |
| 3585 p = ml_get(lp->lnum); | |
| 3586 lp->col -= (*mb_head_off)(p, p + lp->col); | |
| 3587 #ifdef FEAT_VIRTUALEDIT | |
| 3588 /* Reset "coladd" when the cursor would be on the right half of a | |
| 3589 * double-wide character. */ | |
| 3590 if (lp->coladd == 1 | |
| 3591 && p[lp->col] != TAB | |
| 3592 && vim_isprintc((*mb_ptr2char)(p + lp->col)) | |
| 3593 && ptr2cells(p + lp->col) > 1) | |
| 3594 lp->coladd = 0; | |
| 3595 #endif | |
| 3596 } | |
| 3597 } | |
| 3598 | |
| 3599 /* | |
| 3600 * Return a pointer to the character before "*p", if there is one. | |
| 3601 */ | |
| 3602 char_u * | |
| 3603 mb_prevptr(line, p) | |
| 3604 char_u *line; /* start of the string */ | |
| 3605 char_u *p; | |
| 3606 { | |
| 3607 if (p > line) | |
| 39 | 3608 mb_ptr_back(line, p); |
| 7 | 3609 return p; |
| 3610 } | |
| 3611 | |
| 3612 /* | |
| 474 | 3613 * Return the character length of "str". Each multi-byte character (with |
| 3614 * following composing characters) counts as one. | |
| 7 | 3615 */ |
| 3616 int | |
| 3617 mb_charlen(str) | |
| 3618 char_u *str; | |
| 3619 { | |
| 500 | 3620 char_u *p = str; |
| 3621 int count; | |
| 3622 | |
| 3623 if (p == NULL) | |
| 7 | 3624 return 0; |
| 3625 | |
| 500 | 3626 for (count = 0; *p != NUL; count++) |
| 3627 p += (*mb_ptr2len)(p); | |
| 7 | 3628 |
| 3629 return count; | |
| 3630 } | |
| 3631 | |
| 740 | 3632 #if defined(FEAT_SPELL) || defined(PROTO) |
| 500 | 3633 /* |
| 3634 * Like mb_charlen() but for a string with specified length. | |
| 3635 */ | |
| 3636 int | |
| 3637 mb_charlen_len(str, len) | |
| 3638 char_u *str; | |
| 3639 int len; | |
| 3640 { | |
| 3641 char_u *p = str; | |
| 3642 int count; | |
| 3643 | |
| 3644 for (count = 0; *p != NUL && p < str + len; count++) | |
| 3645 p += (*mb_ptr2len)(p); | |
| 3646 | |
| 3647 return count; | |
| 3648 } | |
| 3649 #endif | |
| 3650 | |
| 7 | 3651 /* |
| 3652 * Try to un-escape a multi-byte character. | |
| 3653 * Used for the "to" and "from" part of a mapping. | |
| 3654 * Return the un-escaped string if it is a multi-byte character, and advance | |
| 3655 * "pp" to just after the bytes that formed it. | |
| 3656 * Return NULL if no multi-byte char was found. | |
| 3657 */ | |
| 3658 char_u * | |
| 3659 mb_unescape(pp) | |
| 3660 char_u **pp; | |
| 3661 { | |
| 3662 static char_u buf[MB_MAXBYTES + 1]; | |
| 3663 int n, m = 0; | |
| 3664 char_u *str = *pp; | |
| 3665 | |
| 3666 /* Must translate K_SPECIAL KS_SPECIAL KE_FILLER to K_SPECIAL and CSI | |
| 3667 * KS_EXTRA KE_CSI to CSI. */ | |
| 3668 for (n = 0; str[n] != NUL && m <= MB_MAXBYTES; ++n) | |
| 3669 { | |
| 3670 if (str[n] == K_SPECIAL | |
| 3671 && str[n + 1] == KS_SPECIAL | |
| 3672 && str[n + 2] == KE_FILLER) | |
| 3673 { | |
| 3674 buf[m++] = K_SPECIAL; | |
| 3675 n += 2; | |
| 3676 } | |
| 1495 | 3677 else if ((str[n] == K_SPECIAL |
| 7 | 3678 # ifdef FEAT_GUI |
| 1495 | 3679 || str[n] == CSI |
| 3680 # endif | |
| 3681 ) | |
| 7 | 3682 && str[n + 1] == KS_EXTRA |
| 3683 && str[n + 2] == (int)KE_CSI) | |
| 3684 { | |
| 3685 buf[m++] = CSI; | |
| 3686 n += 2; | |
| 3687 } | |
| 3688 else if (str[n] == K_SPECIAL | |
| 3689 # ifdef FEAT_GUI | |
| 3690 || str[n] == CSI | |
| 3691 # endif | |
| 3692 ) | |
| 3693 break; /* a special key can't be a multibyte char */ | |
| 3694 else | |
| 3695 buf[m++] = str[n]; | |
| 3696 buf[m] = NUL; | |
| 3697 | |
| 3698 /* Return a multi-byte character if it's found. An illegal sequence | |
| 3699 * will result in a 1 here. */ | |
| 474 | 3700 if ((*mb_ptr2len)(buf) > 1) |
| 7 | 3701 { |
| 3702 *pp = str + n + 1; | |
| 3703 return buf; | |
| 3704 } | |
| 3705 } | |
| 3706 return NULL; | |
| 3707 } | |
| 3708 | |
| 3709 /* | |
| 3710 * Return TRUE if the character at "row"/"col" on the screen is the left side | |
| 3711 * of a double-width character. | |
| 3712 * Caller must make sure "row" and "col" are not invalid! | |
| 3713 */ | |
| 3714 int | |
| 3715 mb_lefthalve(row, col) | |
| 3716 int row; | |
| 3717 int col; | |
| 3718 { | |
| 3719 #ifdef FEAT_HANGULIN | |
| 3720 if (composing_hangul) | |
| 3721 return TRUE; | |
| 3722 #endif | |
| 1378 | 3723 return (*mb_off2cells)(LineOffset[row] + col, |
| 3724 LineOffset[row] + screen_Columns) > 1; | |
| 7 | 3725 } |
| 3726 | |
| 3727 /* | |
| 1698 | 3728 * Correct a position on the screen, if it's the right half of a double-wide |
| 3729 * char move it to the left half. Returns the corrected column. | |
| 7 | 3730 */ |
| 3731 int | |
| 3732 mb_fix_col(col, row) | |
| 3733 int col; | |
| 3734 int row; | |
| 3735 { | |
| 3736 col = check_col(col); | |
| 3737 row = check_row(row); | |
| 3738 if (has_mbyte && ScreenLines != NULL && col > 0 | |
| 3739 && ((enc_dbcs | |
| 3740 && ScreenLines[LineOffset[row] + col] != NUL | |
| 3741 && dbcs_screen_head_off(ScreenLines + LineOffset[row], | |
| 3742 ScreenLines + LineOffset[row] + col)) | |
| 3743 || (enc_utf8 && ScreenLines[LineOffset[row] + col] == 0))) | |
| 1620 | 3744 return col - 1; |
| 7 | 3745 return col; |
| 3746 } | |
| 3747 #endif | |
| 3748 | |
| 3749 #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) || defined(PROTO) | |
| 3750 static int enc_alias_search __ARGS((char_u *name)); | |
| 3751 | |
| 3752 /* | |
| 3753 * Skip the Vim specific head of a 'encoding' name. | |
| 3754 */ | |
| 3755 char_u * | |
| 3756 enc_skip(p) | |
| 3757 char_u *p; | |
| 3758 { | |
| 3759 if (STRNCMP(p, "2byte-", 6) == 0) | |
| 3760 return p + 6; | |
| 3761 if (STRNCMP(p, "8bit-", 5) == 0) | |
| 3762 return p + 5; | |
| 3763 return p; | |
| 3764 } | |
| 3765 | |
| 3766 /* | |
| 3767 * Find the canonical name for encoding "enc". | |
| 3768 * When the name isn't recognized, returns "enc" itself, but with all lower | |
| 3769 * case characters and '_' replaced with '-'. | |
| 3770 * Returns an allocated string. NULL for out-of-memory. | |
| 3771 */ | |
| 3772 char_u * | |
| 3773 enc_canonize(enc) | |
| 3774 char_u *enc; | |
| 3775 { | |
| 3776 char_u *r; | |
| 3777 char_u *p, *s; | |
| 3778 int i; | |
| 3779 | |
| 39 | 3780 # ifdef FEAT_MBYTE |
| 3781 if (STRCMP(enc, "default") == 0) | |
| 3782 { | |
| 3783 /* Use the default encoding as it's found by set_init_1(). */ | |
| 3784 r = get_encoding_default(); | |
| 3785 if (r == NULL) | |
| 3786 r = (char_u *)"latin1"; | |
| 3787 return vim_strsave(r); | |
| 3788 } | |
| 3789 # endif | |
| 3790 | |
| 1205 | 3791 /* copy "enc" to allocated memory, with room for two '-' */ |
| 7 | 3792 r = alloc((unsigned)(STRLEN(enc) + 3)); |
| 3793 if (r != NULL) | |
| 3794 { | |
| 3795 /* Make it all lower case and replace '_' with '-'. */ | |
| 3796 p = r; | |
| 3797 for (s = enc; *s != NUL; ++s) | |
| 3798 { | |
| 3799 if (*s == '_') | |
| 3800 *p++ = '-'; | |
| 3801 else | |
| 3802 *p++ = TOLOWER_ASC(*s); | |
| 3803 } | |
| 3804 *p = NUL; | |
| 3805 | |
| 3806 /* Skip "2byte-" and "8bit-". */ | |
| 3807 p = enc_skip(r); | |
| 3808 | |
| 481 | 3809 /* Change "microsoft-cp" to "cp". Used in some spell files. */ |
| 3810 if (STRNCMP(p, "microsoft-cp", 12) == 0) | |
| 1620 | 3811 STRMOVE(p, p + 10); |
| 481 | 3812 |
| 7 | 3813 /* "iso8859" -> "iso-8859" */ |
| 3814 if (STRNCMP(p, "iso8859", 7) == 0) | |
| 3815 { | |
| 1620 | 3816 STRMOVE(p + 4, p + 3); |
| 7 | 3817 p[3] = '-'; |
| 3818 } | |
| 3819 | |
| 3820 /* "iso-8859n" -> "iso-8859-n" */ | |
| 3821 if (STRNCMP(p, "iso-8859", 8) == 0 && p[8] != '-') | |
| 3822 { | |
| 1620 | 3823 STRMOVE(p + 9, p + 8); |
| 7 | 3824 p[8] = '-'; |
| 3825 } | |
| 3826 | |
| 3827 /* "latin-N" -> "latinN" */ | |
| 3828 if (STRNCMP(p, "latin-", 6) == 0) | |
| 1620 | 3829 STRMOVE(p + 5, p + 6); |
| 7 | 3830 |
| 3831 if (enc_canon_search(p) >= 0) | |
| 3832 { | |
| 3833 /* canonical name can be used unmodified */ | |
| 3834 if (p != r) | |
| 1620 | 3835 STRMOVE(r, p); |
| 7 | 3836 } |
| 3837 else if ((i = enc_alias_search(p)) >= 0) | |
| 3838 { | |
| 3839 /* alias recognized, get canonical name */ | |
| 3840 vim_free(r); | |
| 3841 r = vim_strsave((char_u *)enc_canon_table[i].name); | |
| 3842 } | |
| 3843 } | |
| 3844 return r; | |
| 3845 } | |
| 3846 | |
| 3847 /* | |
| 3848 * Search for an encoding alias of "name". | |
| 3849 * Returns -1 when not found. | |
| 3850 */ | |
| 3851 static int | |
| 3852 enc_alias_search(name) | |
| 3853 char_u *name; | |
| 3854 { | |
| 3855 int i; | |
| 3856 | |
| 3857 for (i = 0; enc_alias_table[i].name != NULL; ++i) | |
| 3858 if (STRCMP(name, enc_alias_table[i].name) == 0) | |
| 3859 return enc_alias_table[i].canon; | |
| 3860 return -1; | |
| 3861 } | |
| 3862 #endif | |
| 3863 | |
| 3864 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 3865 | |
| 3866 #ifdef HAVE_LANGINFO_H | |
| 3867 # include <langinfo.h> | |
| 3868 #endif | |
| 3869 | |
| 3870 /* | |
| 3871 * Get the canonicalized encoding of the current locale. | |
| 3872 * Returns an allocated string when successful, NULL when not. | |
| 3873 */ | |
| 3874 char_u * | |
| 3875 enc_locale() | |
| 3876 { | |
| 3877 #ifndef WIN3264 | |
| 3878 char *s; | |
| 3879 char *p; | |
| 3880 int i; | |
| 3881 #endif | |
| 3882 char buf[50]; | |
| 3883 #ifdef WIN3264 | |
| 3884 long acp = GetACP(); | |
| 3885 | |
| 3886 if (acp == 1200) | |
| 3887 STRCPY(buf, "ucs-2le"); | |
| 407 | 3888 else if (acp == 1252) /* cp1252 is used as latin1 */ |
| 7 | 3889 STRCPY(buf, "latin1"); |
| 3890 else | |
| 3891 sprintf(buf, "cp%ld", acp); | |
| 3892 #else | |
| 3893 # ifdef HAVE_NL_LANGINFO_CODESET | |
| 3894 if ((s = nl_langinfo(CODESET)) == NULL || *s == NUL) | |
| 3895 # endif | |
| 167 | 3896 # if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
| 7 | 3897 if ((s = setlocale(LC_CTYPE, NULL)) == NULL || *s == NUL) |
| 167 | 3898 # endif |
| 7 | 3899 if ((s = getenv("LC_ALL")) == NULL || *s == NUL) |
| 3900 if ((s = getenv("LC_CTYPE")) == NULL || *s == NUL) | |
| 3901 s = getenv("LANG"); | |
| 3902 | |
| 3903 if (s == NULL || *s == NUL) | |
| 3904 return FAIL; | |
| 3905 | |
| 3906 /* The most generic locale format is: | |
| 3907 * language[_territory][.codeset][@modifier][+special][,[sponsor][_revision]] | |
| 3908 * If there is a '.' remove the part before it. | |
| 3909 * if there is something after the codeset, remove it. | |
| 3910 * Make the name lowercase and replace '_' with '-'. | |
| 3911 * Exception: "ja_JP.EUC" == "euc-jp", "zh_CN.EUC" = "euc-cn", | |
| 3912 * "ko_KR.EUC" == "euc-kr" | |
| 3913 */ | |
| 3914 if ((p = (char *)vim_strchr((char_u *)s, '.')) != NULL) | |
| 3915 { | |
| 3916 if (p > s + 2 && STRNICMP(p + 1, "EUC", 3) == 0 | |
| 3917 && !isalnum((int)p[4]) && p[4] != '-' && p[-3] == '_') | |
| 3918 { | |
| 3919 /* copy "XY.EUC" to "euc-XY" to buf[10] */ | |
| 3920 STRCPY(buf + 10, "euc-"); | |
| 3921 buf[14] = p[-2]; | |
| 3922 buf[15] = p[-1]; | |
| 3923 buf[16] = 0; | |
| 3924 s = buf + 10; | |
| 3925 } | |
| 3926 else | |
| 3927 s = p + 1; | |
| 3928 } | |
| 1883 | 3929 for (i = 0; s[i] != NUL && i < (int)sizeof(buf) - 1; ++i) |
| 7 | 3930 { |
| 3931 if (s[i] == '_' || s[i] == '-') | |
| 3932 buf[i] = '-'; | |
| 3933 else if (isalnum((int)s[i])) | |
| 3934 buf[i] = TOLOWER_ASC(s[i]); | |
| 3935 else | |
| 3936 break; | |
| 3937 } | |
| 3938 buf[i] = NUL; | |
| 3939 #endif | |
| 3940 | |
| 3941 return enc_canonize((char_u *)buf); | |
| 3942 } | |
| 3943 | |
| 3944 #if defined(WIN3264) || defined(PROTO) | |
| 3945 /* | |
| 3946 * Convert an encoding name to an MS-Windows codepage. | |
| 3947 * Returns zero if no codepage can be figured out. | |
| 3948 */ | |
| 3949 int | |
| 3950 encname2codepage(name) | |
| 3951 char_u *name; | |
| 3952 { | |
| 3953 int cp; | |
| 3954 char_u *p = name; | |
| 3955 int idx; | |
| 3956 | |
| 3957 if (STRNCMP(p, "8bit-", 5) == 0) | |
| 3958 p += 5; | |
| 3959 else if (STRNCMP(p_enc, "2byte-", 6) == 0) | |
| 3960 p += 6; | |
| 3961 | |
| 3962 if (p[0] == 'c' && p[1] == 'p') | |
| 3963 cp = atoi(p + 2); | |
| 3964 else if ((idx = enc_canon_search(p)) >= 0) | |
| 3965 cp = enc_canon_table[idx].codepage; | |
| 3966 else | |
| 3967 return 0; | |
| 3968 if (IsValidCodePage(cp)) | |
| 3969 return cp; | |
| 3970 return 0; | |
| 3971 } | |
| 3972 #endif | |
| 3973 | |
| 3974 # if defined(USE_ICONV) || defined(PROTO) | |
| 3975 | |
| 1904 | 3976 static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp, int *resultlenp)); |
| 7 | 3977 |
| 3978 /* | |
| 3979 * Call iconv_open() with a check if iconv() works properly (there are broken | |
| 3980 * versions). | |
| 3981 * Returns (void *)-1 if failed. | |
| 3982 * (should return iconv_t, but that causes problems with prototypes). | |
| 3983 */ | |
| 3984 void * | |
| 3985 my_iconv_open(to, from) | |
| 3986 char_u *to; | |
| 3987 char_u *from; | |
| 3988 { | |
| 3989 iconv_t fd; | |
| 3990 #define ICONV_TESTLEN 400 | |
| 3991 char_u tobuf[ICONV_TESTLEN]; | |
| 3992 char *p; | |
| 3993 size_t tolen; | |
| 3994 static int iconv_ok = -1; | |
| 3995 | |
| 3996 if (iconv_ok == FALSE) | |
| 3997 return (void *)-1; /* detected a broken iconv() previously */ | |
| 3998 | |
| 3999 #ifdef DYNAMIC_ICONV | |
| 4000 /* Check if the iconv.dll can be found. */ | |
| 4001 if (!iconv_enabled(TRUE)) | |
| 4002 return (void *)-1; | |
| 4003 #endif | |
| 4004 | |
| 4005 fd = iconv_open((char *)enc_skip(to), (char *)enc_skip(from)); | |
| 4006 | |
| 4007 if (fd != (iconv_t)-1 && iconv_ok == -1) | |
| 4008 { | |
| 4009 /* | |
| 4010 * Do a dummy iconv() call to check if it actually works. There is a | |
| 4011 * version of iconv() on Linux that is broken. We can't ignore it, | |
| 4012 * because it's wide-spread. The symptoms are that after outputting | |
| 4013 * the initial shift state the "to" pointer is NULL and conversion | |
| 4014 * stops for no apparent reason after about 8160 characters. | |
| 4015 */ | |
| 4016 p = (char *)tobuf; | |
| 4017 tolen = ICONV_TESTLEN; | |
| 4018 (void)iconv(fd, NULL, NULL, &p, &tolen); | |
| 4019 if (p == NULL) | |
| 4020 { | |
| 4021 iconv_ok = FALSE; | |
| 4022 iconv_close(fd); | |
| 4023 fd = (iconv_t)-1; | |
| 4024 } | |
| 4025 else | |
| 4026 iconv_ok = TRUE; | |
| 4027 } | |
| 4028 | |
| 4029 return (void *)fd; | |
| 4030 } | |
| 4031 | |
| 4032 /* | |
| 4033 * Convert the string "str[slen]" with iconv(). | |
| 4034 * If "unconvlenp" is not NULL handle the string ending in an incomplete | |
| 4035 * sequence and set "*unconvlenp" to the length of it. | |
| 4036 * Returns the converted string in allocated memory. NULL for an error. | |
| 1904 | 4037 * If resultlenp is not NULL, sets it to the result length in bytes. |
| 7 | 4038 */ |
| 4039 static char_u * | |
| 1904 | 4040 iconv_string(vcp, str, slen, unconvlenp, resultlenp) |
| 7 | 4041 vimconv_T *vcp; |
| 4042 char_u *str; | |
| 4043 int slen; | |
| 4044 int *unconvlenp; | |
| 1904 | 4045 int *resultlenp; |
| 7 | 4046 { |
| 4047 const char *from; | |
| 4048 size_t fromlen; | |
| 4049 char *to; | |
| 4050 size_t tolen; | |
| 4051 size_t len = 0; | |
| 4052 size_t done = 0; | |
| 4053 char_u *result = NULL; | |
| 4054 char_u *p; | |
| 4055 int l; | |
| 4056 | |
| 4057 from = (char *)str; | |
| 4058 fromlen = slen; | |
| 4059 for (;;) | |
| 4060 { | |
| 4061 if (len == 0 || ICONV_ERRNO == ICONV_E2BIG) | |
| 4062 { | |
| 4063 /* Allocate enough room for most conversions. When re-allocating | |
| 4064 * increase the buffer size. */ | |
| 4065 len = len + fromlen * 2 + 40; | |
| 4066 p = alloc((unsigned)len); | |
| 4067 if (p != NULL && done > 0) | |
| 4068 mch_memmove(p, result, done); | |
| 4069 vim_free(result); | |
| 4070 result = p; | |
| 4071 if (result == NULL) /* out of memory */ | |
| 4072 break; | |
| 4073 } | |
| 4074 | |
| 4075 to = (char *)result + done; | |
| 4076 tolen = len - done - 2; | |
| 4077 /* Avoid a warning for systems with a wrong iconv() prototype by | |
| 4078 * casting the second argument to void *. */ | |
| 4079 if (iconv(vcp->vc_fd, (void *)&from, &fromlen, &to, &tolen) | |
| 4080 != (size_t)-1) | |
| 4081 { | |
| 4082 /* Finished, append a NUL. */ | |
| 4083 *to = NUL; | |
| 4084 break; | |
| 4085 } | |
| 4086 | |
| 4087 /* Check both ICONV_EINVAL and EINVAL, because the dynamically loaded | |
| 4088 * iconv library may use one of them. */ | |
| 4089 if (!vcp->vc_fail && unconvlenp != NULL | |
| 4090 && (ICONV_ERRNO == ICONV_EINVAL || ICONV_ERRNO == EINVAL)) | |
| 4091 { | |
| 4092 /* Handle an incomplete sequence at the end. */ | |
| 4093 *to = NUL; | |
| 835 | 4094 *unconvlenp = (int)fromlen; |
| 7 | 4095 break; |
| 4096 } | |
| 4097 | |
| 4098 /* Check both ICONV_EILSEQ and EILSEQ, because the dynamically loaded | |
| 4099 * iconv library may use one of them. */ | |
| 4100 else if (!vcp->vc_fail | |
| 4101 && (ICONV_ERRNO == ICONV_EILSEQ || ICONV_ERRNO == EILSEQ | |
| 4102 || ICONV_ERRNO == ICONV_EINVAL || ICONV_ERRNO == EINVAL)) | |
| 4103 { | |
| 4104 /* Can't convert: insert a '?' and skip a character. This assumes | |
| 4105 * conversion from 'encoding' to something else. In other | |
| 4106 * situations we don't know what to skip anyway. */ | |
| 4107 *to++ = '?'; | |
| 4108 if ((*mb_ptr2cells)((char_u *)from) > 1) | |
| 4109 *to++ = '?'; | |
| 221 | 4110 if (enc_utf8) |
| 835 | 4111 l = utfc_ptr2len_len((char_u *)from, (int)fromlen); |
| 221 | 4112 else |
| 4113 { | |
| 474 | 4114 l = (*mb_ptr2len)((char_u *)from); |
| 227 | 4115 if (l > (int)fromlen) |
| 835 | 4116 l = (int)fromlen; |
| 221 | 4117 } |
| 7 | 4118 from += l; |
| 4119 fromlen -= l; | |
| 4120 } | |
| 4121 else if (ICONV_ERRNO != ICONV_E2BIG) | |
| 4122 { | |
| 4123 /* conversion failed */ | |
| 4124 vim_free(result); | |
| 4125 result = NULL; | |
| 4126 break; | |
| 4127 } | |
| 4128 /* Not enough room or skipping illegal sequence. */ | |
| 4129 done = to - (char *)result; | |
| 4130 } | |
| 1904 | 4131 |
| 2766 | 4132 if (resultlenp != NULL && result != NULL) |
| 1904 | 4133 *resultlenp = (int)(to - (char *)result); |
| 7 | 4134 return result; |
| 4135 } | |
| 4136 | |
| 4137 # if defined(DYNAMIC_ICONV) || defined(PROTO) | |
| 4138 /* | |
| 4139 * Dynamically load the "iconv.dll" on Win32. | |
| 4140 */ | |
| 4141 | |
| 4142 #ifndef DYNAMIC_ICONV /* just generating prototypes */ | |
| 4143 # define HINSTANCE int | |
| 4144 #endif | |
| 297 | 4145 static HINSTANCE hIconvDLL = 0; |
| 4146 static HINSTANCE hMsvcrtDLL = 0; | |
| 7 | 4147 |
| 4148 # ifndef DYNAMIC_ICONV_DLL | |
| 4149 # define DYNAMIC_ICONV_DLL "iconv.dll" | |
| 4150 # define DYNAMIC_ICONV_DLL_ALT "libiconv.dll" | |
| 4151 # endif | |
| 4152 # ifndef DYNAMIC_MSVCRT_DLL | |
| 4153 # define DYNAMIC_MSVCRT_DLL "msvcrt.dll" | |
| 4154 # endif | |
| 4155 | |
| 4156 /* | |
| 4157 * Try opening the iconv.dll and return TRUE if iconv() can be used. | |
| 4158 */ | |
| 4159 int | |
| 4160 iconv_enabled(verbose) | |
| 4161 int verbose; | |
| 4162 { | |
| 4163 if (hIconvDLL != 0 && hMsvcrtDLL != 0) | |
| 4164 return TRUE; | |
| 2612 | 4165 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL); |
| 7 | 4166 if (hIconvDLL == 0) /* sometimes it's called libiconv.dll */ |
| 2612 | 4167 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT); |
| 7 | 4168 if (hIconvDLL != 0) |
| 2612 | 4169 hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL); |
| 7 | 4170 if (hIconvDLL == 0 || hMsvcrtDLL == 0) |
| 4171 { | |
| 4172 /* Only give the message when 'verbose' is set, otherwise it might be | |
| 4173 * done whenever a conversion is attempted. */ | |
| 4174 if (verbose && p_verbose > 0) | |
| 292 | 4175 { |
| 4176 verbose_enter(); | |
| 7 | 4177 EMSG2(_(e_loadlib), |
| 4178 hIconvDLL == 0 ? DYNAMIC_ICONV_DLL : DYNAMIC_MSVCRT_DLL); | |
| 292 | 4179 verbose_leave(); |
| 4180 } | |
| 7 | 4181 iconv_end(); |
| 4182 return FALSE; | |
| 4183 } | |
| 4184 | |
| 344 | 4185 iconv = (void *)GetProcAddress(hIconvDLL, "libiconv"); |
| 4186 iconv_open = (void *)GetProcAddress(hIconvDLL, "libiconv_open"); | |
| 4187 iconv_close = (void *)GetProcAddress(hIconvDLL, "libiconv_close"); | |
| 4188 iconvctl = (void *)GetProcAddress(hIconvDLL, "libiconvctl"); | |
| 4189 iconv_errno = (void *)GetProcAddress(hMsvcrtDLL, "_errno"); | |
| 7 | 4190 if (iconv == NULL || iconv_open == NULL || iconv_close == NULL |
| 4191 || iconvctl == NULL || iconv_errno == NULL) | |
| 4192 { | |
| 4193 iconv_end(); | |
| 4194 if (verbose && p_verbose > 0) | |
| 292 | 4195 { |
| 4196 verbose_enter(); | |
| 7 | 4197 EMSG2(_(e_loadfunc), "for libiconv"); |
| 292 | 4198 verbose_leave(); |
| 4199 } | |
| 7 | 4200 return FALSE; |
| 4201 } | |
| 4202 return TRUE; | |
| 4203 } | |
| 4204 | |
| 4205 void | |
| 4206 iconv_end() | |
| 4207 { | |
| 4208 /* Don't use iconv() when inputting or outputting characters. */ | |
| 4209 if (input_conv.vc_type == CONV_ICONV) | |
| 4210 convert_setup(&input_conv, NULL, NULL); | |
| 4211 if (output_conv.vc_type == CONV_ICONV) | |
| 4212 convert_setup(&output_conv, NULL, NULL); | |
| 4213 | |
| 4214 if (hIconvDLL != 0) | |
| 4215 FreeLibrary(hIconvDLL); | |
| 4216 if (hMsvcrtDLL != 0) | |
| 4217 FreeLibrary(hMsvcrtDLL); | |
| 4218 hIconvDLL = 0; | |
| 4219 hMsvcrtDLL = 0; | |
| 4220 } | |
| 4221 # endif /* DYNAMIC_ICONV */ | |
| 4222 # endif /* USE_ICONV */ | |
| 4223 | |
| 4224 #endif /* FEAT_MBYTE */ | |
| 4225 | |
| 4226 #if defined(FEAT_XIM) || defined(PROTO) | |
| 4227 | |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
4228 # if defined(FEAT_GUI_GTK) || defined(PROTO) |
| 7 | 4229 static int xim_has_preediting INIT(= FALSE); /* IM current status */ |
| 4230 | |
| 4231 /* | |
| 4232 * Set preedit_start_col to the current cursor position. | |
| 4233 */ | |
| 4234 static void | |
| 4235 init_preedit_start_col(void) | |
| 4236 { | |
| 4237 if (State & CMDLINE) | |
| 4238 preedit_start_col = cmdline_getvcol_cursor(); | |
| 4239 else if (curwin != NULL) | |
| 4240 getvcol(curwin, &curwin->w_cursor, &preedit_start_col, NULL, NULL); | |
| 4241 /* Prevent that preediting marks the buffer as changed. */ | |
| 4242 xim_changed_while_preediting = curbuf->b_changed; | |
| 4243 } | |
| 4244 | |
| 4245 static int im_is_active = FALSE; /* IM is enabled for current mode */ | |
| 1668 | 4246 static int preedit_is_active = FALSE; |
| 7 | 4247 static int im_preedit_cursor = 0; /* cursor offset in characters */ |
| 4248 static int im_preedit_trailing = 0; /* number of characters after cursor */ | |
| 4249 | |
| 4250 static unsigned long im_commit_handler_id = 0; | |
| 4251 static unsigned int im_activatekey_keyval = GDK_VoidSymbol; | |
| 4252 static unsigned int im_activatekey_state = 0; | |
| 4253 | |
| 4254 void | |
| 4255 im_set_active(int active) | |
| 4256 { | |
| 4257 int was_active; | |
| 4258 | |
| 4259 was_active = !!im_is_active; | |
| 4260 im_is_active = (active && !p_imdisable); | |
| 4261 | |
| 4262 if (im_is_active != was_active) | |
| 4263 xim_reset(); | |
| 4264 } | |
| 4265 | |
| 4266 void | |
| 4267 xim_set_focus(int focus) | |
| 4268 { | |
| 4269 if (xic != NULL) | |
| 4270 { | |
| 4271 if (focus) | |
| 4272 gtk_im_context_focus_in(xic); | |
| 4273 else | |
| 4274 gtk_im_context_focus_out(xic); | |
| 4275 } | |
| 4276 } | |
| 4277 | |
| 4278 void | |
| 4279 im_set_position(int row, int col) | |
| 4280 { | |
| 4281 if (xic != NULL) | |
| 4282 { | |
| 4283 GdkRectangle area; | |
| 4284 | |
| 4285 area.x = FILL_X(col); | |
| 4286 area.y = FILL_Y(row); | |
| 4287 area.width = gui.char_width * (mb_lefthalve(row, col) ? 2 : 1); | |
| 4288 area.height = gui.char_height; | |
| 4289 | |
| 4290 gtk_im_context_set_cursor_location(xic, &area); | |
| 4291 } | |
| 4292 } | |
| 4293 | |
| 4294 # if 0 || defined(PROTO) /* apparently only used in gui_x11.c */ | |
| 4295 void | |
| 4296 xim_set_preedit(void) | |
| 4297 { | |
| 4298 im_set_position(gui.row, gui.col); | |
| 4299 } | |
| 4300 # endif | |
| 4301 | |
| 4302 static void | |
| 4303 im_add_to_input(char_u *str, int len) | |
| 4304 { | |
| 4305 /* Convert from 'termencoding' (always "utf-8") to 'encoding' */ | |
| 4306 if (input_conv.vc_type != CONV_NONE) | |
| 4307 { | |
| 4308 str = string_convert(&input_conv, str, &len); | |
| 4309 g_return_if_fail(str != NULL); | |
| 4310 } | |
| 4311 | |
| 4312 add_to_input_buf_csi(str, len); | |
| 4313 | |
| 4314 if (input_conv.vc_type != CONV_NONE) | |
| 4315 vim_free(str); | |
| 4316 | |
| 4317 if (p_mh) /* blank out the pointer if necessary */ | |
| 4318 gui_mch_mousehide(TRUE); | |
| 4319 } | |
| 4320 | |
| 4321 static void | |
| 4322 im_delete_preedit(void) | |
| 4323 { | |
| 4324 char_u bskey[] = {CSI, 'k', 'b'}; | |
| 4325 char_u delkey[] = {CSI, 'k', 'D'}; | |
| 4326 | |
| 4327 if (State & NORMAL) | |
| 4328 { | |
| 4329 im_preedit_cursor = 0; | |
| 4330 return; | |
| 4331 } | |
| 4332 for (; im_preedit_cursor > 0; --im_preedit_cursor) | |
| 4333 add_to_input_buf(bskey, (int)sizeof(bskey)); | |
| 4334 | |
| 4335 for (; im_preedit_trailing > 0; --im_preedit_trailing) | |
| 4336 add_to_input_buf(delkey, (int)sizeof(delkey)); | |
| 4337 } | |
| 4338 | |
| 941 | 4339 /* |
| 4340 * Move the cursor left by "num_move_back" characters. | |
| 4341 * Note that ins_left() checks im_is_preediting() to avoid breaking undo for | |
| 4342 * these K_LEFT keys. | |
| 4343 */ | |
| 7 | 4344 static void |
| 4345 im_correct_cursor(int num_move_back) | |
| 4346 { | |
| 4347 char_u backkey[] = {CSI, 'k', 'l'}; | |
| 4348 | |
| 4349 if (State & NORMAL) | |
| 4350 return; | |
| 4351 # ifdef FEAT_RIGHTLEFT | |
| 4352 if ((State & CMDLINE) == 0 && curwin != NULL && curwin->w_p_rl) | |
| 4353 backkey[2] = 'r'; | |
| 4354 # endif | |
| 4355 for (; num_move_back > 0; --num_move_back) | |
| 4356 add_to_input_buf(backkey, (int)sizeof(backkey)); | |
| 4357 } | |
| 4358 | |
| 4359 static int xim_expected_char = NUL; | |
| 4360 static int xim_ignored_char = FALSE; | |
| 4361 | |
| 4362 /* | |
| 4363 * Update the mode and cursor while in an IM callback. | |
| 4364 */ | |
| 4365 static void | |
| 4366 im_show_info(void) | |
| 4367 { | |
| 4368 int old_vgetc_busy; | |
| 822 | 4369 |
| 7 | 4370 old_vgetc_busy = vgetc_busy; |
| 4371 vgetc_busy = TRUE; | |
| 4372 showmode(); | |
| 4373 vgetc_busy = old_vgetc_busy; | |
| 4374 setcursor(); | |
| 4375 out_flush(); | |
| 4376 } | |
| 4377 | |
| 4378 /* | |
| 4379 * Callback invoked when the user finished preediting. | |
| 4380 * Put the final string into the input buffer. | |
| 4381 */ | |
| 4382 static void | |
| 1883 | 4383 im_commit_cb(GtkIMContext *context UNUSED, |
| 4384 const gchar *str, | |
| 4385 gpointer data UNUSED) | |
| 7 | 4386 { |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
4387 int slen = (int)STRLEN(str); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
4388 int add_to_input = TRUE; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
4389 int clen; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
4390 int len = slen; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
4391 int commit_with_preedit = TRUE; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
4392 char_u *im_str; |
| 7 | 4393 |
| 4394 #ifdef XIM_DEBUG | |
| 4395 xim_log("im_commit_cb(): %s\n", str); | |
| 4396 #endif | |
| 4397 | |
| 4398 /* The imhangul module doesn't reset the preedit string before | |
| 4399 * committing. Call im_delete_preedit() to work around that. */ | |
| 4400 im_delete_preedit(); | |
| 4401 | |
| 4402 /* Indicate that preediting has finished. */ | |
| 4403 if (preedit_start_col == MAXCOL) | |
| 4404 { | |
| 4405 init_preedit_start_col(); | |
| 4406 commit_with_preedit = FALSE; | |
| 4407 } | |
| 4408 | |
| 4409 /* The thing which setting "preedit_start_col" to MAXCOL means that | |
| 4410 * "preedit_start_col" will be set forcely when calling | |
| 4411 * preedit_changed_cb() next time. | |
| 4412 * "preedit_start_col" should not reset with MAXCOL on this part. Vim | |
| 4413 * is simulating the preediting by using add_to_input_str(). when | |
| 4414 * preedit begin immediately before committed, the typebuf is not | |
| 4415 * flushed to screen, then it can't get correct "preedit_start_col". | |
| 4416 * Thus, it should calculate the cells by adding cells of the committed | |
| 4417 * string. */ | |
| 4418 if (input_conv.vc_type != CONV_NONE) | |
| 4419 { | |
| 4420 im_str = string_convert(&input_conv, (char_u *)str, &len); | |
| 4421 g_return_if_fail(im_str != NULL); | |
| 4422 } | |
| 4423 else | |
| 4424 im_str = (char_u *)str; | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
4425 |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
4426 clen = mb_string2cells(im_str, len); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
4427 |
| 7 | 4428 if (input_conv.vc_type != CONV_NONE) |
| 4429 vim_free(im_str); | |
| 4430 preedit_start_col += clen; | |
| 4431 | |
| 4432 /* Is this a single character that matches a keypad key that's just | |
| 4433 * been pressed? If so, we don't want it to be entered as such - let | |
| 4434 * us carry on processing the raw keycode so that it may be used in | |
| 4435 * mappings as <kSomething>. */ | |
| 4436 if (xim_expected_char != NUL) | |
| 4437 { | |
| 4438 /* We're currently processing a keypad or other special key */ | |
| 4439 if (slen == 1 && str[0] == xim_expected_char) | |
| 4440 { | |
| 4441 /* It's a match - don't do it here */ | |
| 4442 xim_ignored_char = TRUE; | |
| 4443 add_to_input = FALSE; | |
| 4444 } | |
| 4445 else | |
| 4446 { | |
| 4447 /* Not a match */ | |
| 4448 xim_ignored_char = FALSE; | |
| 4449 } | |
| 4450 } | |
| 4451 | |
| 4452 if (add_to_input) | |
| 4453 im_add_to_input((char_u *)str, slen); | |
| 4454 | |
| 4455 /* Inserting chars while "im_is_active" is set does not cause a change of | |
| 4456 * buffer. When the chars are committed the buffer must be marked as | |
| 4457 * changed. */ | |
| 4458 if (!commit_with_preedit) | |
| 4459 preedit_start_col = MAXCOL; | |
| 4460 | |
| 4461 /* This flag is used in changed() at next call. */ | |
| 4462 xim_changed_while_preediting = TRUE; | |
| 4463 | |
| 4464 if (gtk_main_level() > 0) | |
| 4465 gtk_main_quit(); | |
| 4466 } | |
| 4467 | |
| 4468 /* | |
| 4469 * Callback invoked after start to the preedit. | |
| 4470 */ | |
| 4471 static void | |
| 1883 | 4472 im_preedit_start_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) |
| 7 | 4473 { |
| 4474 #ifdef XIM_DEBUG | |
| 4475 xim_log("im_preedit_start_cb()\n"); | |
| 4476 #endif | |
| 4477 | |
| 4478 im_is_active = TRUE; | |
| 1668 | 4479 preedit_is_active = TRUE; |
| 7 | 4480 gui_update_cursor(TRUE, FALSE); |
| 1668 | 4481 im_show_info(); |
| 7 | 4482 } |
| 4483 | |
| 4484 /* | |
| 4485 * Callback invoked after end to the preedit. | |
| 4486 */ | |
| 4487 static void | |
| 1883 | 4488 im_preedit_end_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) |
| 7 | 4489 { |
| 4490 #ifdef XIM_DEBUG | |
| 4491 xim_log("im_preedit_end_cb()\n"); | |
| 4492 #endif | |
| 4493 im_delete_preedit(); | |
| 4494 | |
| 4495 /* Indicate that preediting has finished */ | |
| 4496 preedit_start_col = MAXCOL; | |
| 4497 xim_has_preediting = FALSE; | |
| 4498 | |
| 1620 | 4499 #if 0 |
| 4500 /* Removal of this line suggested by Takuhiro Nishioka. Fixes that IM was | |
| 1668 | 4501 * switched off unintentionally. We now use preedit_is_active (added by |
| 4502 * SungHyun Nam). */ | |
| 7 | 4503 im_is_active = FALSE; |
| 1620 | 4504 #endif |
| 1668 | 4505 preedit_is_active = FALSE; |
| 7 | 4506 gui_update_cursor(TRUE, FALSE); |
| 4507 im_show_info(); | |
| 4508 } | |
| 4509 | |
| 4510 /* | |
| 4511 * Callback invoked after changes to the preedit string. If the preedit | |
| 4512 * string was empty before, remember the preedit start column so we know | |
| 4513 * where to apply feedback attributes. Delete the previous preedit string | |
| 4514 * if there was one, save the new preedit cursor offset, and put the new | |
| 4515 * string into the input buffer. | |
| 4516 * | |
| 4517 * TODO: The pragmatic "put into input buffer" approach used here has | |
| 4518 * several fundamental problems: | |
| 4519 * | |
| 4520 * - The characters in the preedit string are subject to remapping. | |
| 4521 * That's broken, only the finally committed string should be remapped. | |
| 4522 * | |
| 4523 * - There is a race condition involved: The retrieved value for the | |
| 4524 * current cursor position will be wrong if any unprocessed characters | |
| 4525 * are still queued in the input buffer. | |
| 4526 * | |
| 4527 * - Due to the lack of synchronization between the file buffer in memory | |
| 4528 * and any typed characters, it's practically impossible to implement the | |
| 4529 * "retrieve_surrounding" and "delete_surrounding" signals reliably. IM | |
| 4530 * modules for languages such as Thai are likely to rely on this feature | |
| 4531 * for proper operation. | |
| 4532 * | |
| 4533 * Conclusions: I think support for preediting needs to be moved to the | |
| 4534 * core parts of Vim. Ideally, until it has been committed, the preediting | |
| 4535 * string should only be displayed and not affect the buffer content at all. | |
| 4536 * The question how to deal with the synchronization issue still remains. | |
| 4537 * Circumventing the input buffer is probably not desirable. Anyway, I think | |
| 4538 * implementing "retrieve_surrounding" is the only hard problem. | |
| 4539 * | |
| 4540 * One way to solve all of this in a clean manner would be to queue all key | |
| 4541 * press/release events "as is" in the input buffer, and apply the IM filtering | |
| 4542 * at the receiving end of the queue. This, however, would have a rather large | |
| 4543 * impact on the code base. If there is an easy way to force processing of all | |
| 4544 * remaining input from within the "retrieve_surrounding" signal handler, this | |
| 4545 * might not be necessary. Gotta ask on vim-dev for opinions. | |
| 4546 */ | |
| 4547 static void | |
| 1883 | 4548 im_preedit_changed_cb(GtkIMContext *context, gpointer data UNUSED) |
| 7 | 4549 { |
| 4550 char *preedit_string = NULL; | |
| 4551 int cursor_index = 0; | |
| 4552 int num_move_back = 0; | |
| 4553 char_u *str; | |
| 4554 char_u *p; | |
| 4555 int i; | |
| 4556 | |
| 4557 gtk_im_context_get_preedit_string(context, | |
| 4558 &preedit_string, NULL, | |
| 4559 &cursor_index); | |
| 4560 | |
| 4561 #ifdef XIM_DEBUG | |
| 4562 xim_log("im_preedit_changed_cb(): %s\n", preedit_string); | |
| 4563 #endif | |
| 4564 | |
| 4565 g_return_if_fail(preedit_string != NULL); /* just in case */ | |
| 4566 | |
| 4567 /* If preedit_start_col is MAXCOL set it to the current cursor position. */ | |
| 4568 if (preedit_start_col == MAXCOL && preedit_string[0] != '\0') | |
| 4569 { | |
| 4570 xim_has_preediting = TRUE; | |
| 4571 | |
| 4572 /* Urgh, this breaks if the input buffer isn't empty now */ | |
| 4573 init_preedit_start_col(); | |
| 4574 } | |
| 4575 else if (cursor_index == 0 && preedit_string[0] == '\0') | |
| 4576 { | |
| 941 | 4577 xim_has_preediting = FALSE; |
| 7 | 4578 |
| 4579 /* If at the start position (after typing backspace) | |
| 4580 * preedit_start_col must be reset. */ | |
| 4581 preedit_start_col = MAXCOL; | |
| 4582 } | |
| 4583 | |
| 4584 im_delete_preedit(); | |
| 4585 | |
| 4586 /* | |
| 4587 * Compute the end of the preediting area: "preedit_end_col". | |
| 4588 * According to the documentation of gtk_im_context_get_preedit_string(), | |
| 4589 * the cursor_pos output argument returns the offset in bytes. This is | |
| 4590 * unfortunately not true -- real life shows the offset is in characters, | |
| 4591 * and the GTK+ source code agrees with me. Will file a bug later. | |
| 4592 */ | |
| 4593 if (preedit_start_col != MAXCOL) | |
| 4594 preedit_end_col = preedit_start_col; | |
| 4595 str = (char_u *)preedit_string; | |
| 4596 for (p = str, i = 0; *p != NUL; p += utf_byte2len(*p), ++i) | |
| 4597 { | |
| 4598 int is_composing; | |
| 4599 | |
| 4600 is_composing = ((*p & 0x80) != 0 && utf_iscomposing(utf_ptr2char(p))); | |
| 4601 /* | |
| 4602 * These offsets are used as counters when generating <BS> and <Del> | |
| 4603 * to delete the preedit string. So don't count composing characters | |
| 4604 * unless 'delcombine' is enabled. | |
| 4605 */ | |
| 4606 if (!is_composing || p_deco) | |
| 4607 { | |
| 4608 if (i < cursor_index) | |
| 4609 ++im_preedit_cursor; | |
| 4610 else | |
| 4611 ++im_preedit_trailing; | |
| 4612 } | |
| 4613 if (!is_composing && i >= cursor_index) | |
| 4614 { | |
| 4615 /* This is essentially the same as im_preedit_trailing, except | |
| 4616 * composing characters are not counted even if p_deco is set. */ | |
| 4617 ++num_move_back; | |
| 4618 } | |
| 4619 if (preedit_start_col != MAXCOL) | |
| 4620 preedit_end_col += utf_ptr2cells(p); | |
| 4621 } | |
| 4622 | |
| 4623 if (p > str) | |
| 4624 { | |
| 4625 im_add_to_input(str, (int)(p - str)); | |
| 4626 im_correct_cursor(num_move_back); | |
| 4627 } | |
| 4628 | |
| 4629 g_free(preedit_string); | |
| 4630 | |
| 4631 if (gtk_main_level() > 0) | |
| 4632 gtk_main_quit(); | |
| 4633 } | |
| 4634 | |
| 4635 /* | |
| 4636 * Translate the Pango attributes at iter to Vim highlighting attributes. | |
| 4637 * Ignore attributes not supported by Vim highlighting. This shouldn't have | |
| 4638 * too much impact -- right now we handle even more attributes than necessary | |
| 4639 * for the IM modules I tested with. | |
| 4640 */ | |
| 4641 static int | |
| 4642 translate_pango_attributes(PangoAttrIterator *iter) | |
| 4643 { | |
| 4644 PangoAttribute *attr; | |
| 4645 int char_attr = HL_NORMAL; | |
| 4646 | |
| 4647 attr = pango_attr_iterator_get(iter, PANGO_ATTR_UNDERLINE); | |
| 4648 if (attr != NULL && ((PangoAttrInt *)attr)->value | |
| 4649 != (int)PANGO_UNDERLINE_NONE) | |
| 4650 char_attr |= HL_UNDERLINE; | |
| 4651 | |
| 4652 attr = pango_attr_iterator_get(iter, PANGO_ATTR_WEIGHT); | |
| 4653 if (attr != NULL && ((PangoAttrInt *)attr)->value >= (int)PANGO_WEIGHT_BOLD) | |
| 4654 char_attr |= HL_BOLD; | |
| 4655 | |
| 4656 attr = pango_attr_iterator_get(iter, PANGO_ATTR_STYLE); | |
| 4657 if (attr != NULL && ((PangoAttrInt *)attr)->value | |
| 4658 != (int)PANGO_STYLE_NORMAL) | |
| 4659 char_attr |= HL_ITALIC; | |
| 4660 | |
| 4661 attr = pango_attr_iterator_get(iter, PANGO_ATTR_BACKGROUND); | |
| 4662 if (attr != NULL) | |
| 4663 { | |
| 4664 const PangoColor *color = &((PangoAttrColor *)attr)->color; | |
| 4665 | |
| 4666 /* Assume inverse if black background is requested */ | |
| 4667 if ((color->red | color->green | color->blue) == 0) | |
| 4668 char_attr |= HL_INVERSE; | |
| 4669 } | |
| 4670 | |
| 4671 return char_attr; | |
| 4672 } | |
| 4673 | |
| 4674 /* | |
| 4675 * Retrieve the highlighting attributes at column col in the preedit string. | |
| 4676 * Return -1 if not in preediting mode or if col is out of range. | |
| 4677 */ | |
| 4678 int | |
| 4679 im_get_feedback_attr(int col) | |
| 4680 { | |
| 4681 char *preedit_string = NULL; | |
| 4682 PangoAttrList *attr_list = NULL; | |
| 4683 int char_attr = -1; | |
| 4684 | |
| 4685 if (xic == NULL) | |
| 4686 return char_attr; | |
| 4687 | |
| 4688 gtk_im_context_get_preedit_string(xic, &preedit_string, &attr_list, NULL); | |
| 4689 | |
| 4690 if (preedit_string != NULL && attr_list != NULL) | |
| 4691 { | |
| 944 | 4692 int idx; |
| 7 | 4693 |
| 4694 /* Get the byte index as used by PangoAttrIterator */ | |
| 944 | 4695 for (idx = 0; col > 0 && preedit_string[idx] != '\0'; --col) |
| 4696 idx += utfc_ptr2len((char_u *)preedit_string + idx); | |
| 4697 | |
| 4698 if (preedit_string[idx] != '\0') | |
| 7 | 4699 { |
| 4700 PangoAttrIterator *iter; | |
| 4701 int start, end; | |
| 4702 | |
| 4703 char_attr = HL_NORMAL; | |
| 4704 iter = pango_attr_list_get_iterator(attr_list); | |
| 4705 | |
| 4706 /* Extract all relevant attributes from the list. */ | |
| 4707 do | |
| 4708 { | |
| 4709 pango_attr_iterator_range(iter, &start, &end); | |
| 4710 | |
| 944 | 4711 if (idx >= start && idx < end) |
| 7 | 4712 char_attr |= translate_pango_attributes(iter); |
| 4713 } | |
| 4714 while (pango_attr_iterator_next(iter)); | |
| 4715 | |
| 4716 pango_attr_iterator_destroy(iter); | |
| 4717 } | |
| 4718 } | |
| 4719 | |
| 4720 if (attr_list != NULL) | |
| 4721 pango_attr_list_unref(attr_list); | |
| 4722 g_free(preedit_string); | |
| 4723 | |
| 4724 return char_attr; | |
| 4725 } | |
| 4726 | |
| 4727 void | |
| 4728 xim_init(void) | |
| 4729 { | |
| 4730 #ifdef XIM_DEBUG | |
| 4731 xim_log("xim_init()\n"); | |
| 4732 #endif | |
| 4733 | |
| 4734 g_return_if_fail(gui.drawarea != NULL); | |
| 4735 g_return_if_fail(gui.drawarea->window != NULL); | |
| 4736 | |
| 4737 xic = gtk_im_multicontext_new(); | |
| 4738 g_object_ref(xic); | |
| 4739 | |
| 4740 im_commit_handler_id = g_signal_connect(G_OBJECT(xic), "commit", | |
| 4741 G_CALLBACK(&im_commit_cb), NULL); | |
| 4742 g_signal_connect(G_OBJECT(xic), "preedit_changed", | |
| 4743 G_CALLBACK(&im_preedit_changed_cb), NULL); | |
| 4744 g_signal_connect(G_OBJECT(xic), "preedit_start", | |
| 4745 G_CALLBACK(&im_preedit_start_cb), NULL); | |
| 4746 g_signal_connect(G_OBJECT(xic), "preedit_end", | |
| 4747 G_CALLBACK(&im_preedit_end_cb), NULL); | |
| 4748 | |
| 4749 gtk_im_context_set_client_window(xic, gui.drawarea->window); | |
| 4750 } | |
| 4751 | |
| 4752 void | |
| 4753 im_shutdown(void) | |
| 4754 { | |
| 4755 #ifdef XIM_DEBUG | |
| 4756 xim_log("im_shutdown()\n"); | |
| 4757 #endif | |
| 4758 | |
| 4759 if (xic != NULL) | |
| 4760 { | |
| 4761 gtk_im_context_focus_out(xic); | |
| 4762 g_object_unref(xic); | |
| 4763 xic = NULL; | |
| 4764 } | |
| 4765 im_is_active = FALSE; | |
| 4766 im_commit_handler_id = 0; | |
| 4767 preedit_start_col = MAXCOL; | |
| 4768 xim_has_preediting = FALSE; | |
| 4769 } | |
| 4770 | |
| 4771 /* | |
| 4772 * Convert the string argument to keyval and state for GdkEventKey. | |
| 4773 * If str is valid return TRUE, otherwise FALSE. | |
| 4774 * | |
| 4775 * See 'imactivatekey' for documentation of the format. | |
| 4776 */ | |
| 4777 static int | |
| 4778 im_string_to_keyval(const char *str, unsigned int *keyval, unsigned int *state) | |
| 4779 { | |
| 4780 const char *mods_end; | |
| 4781 unsigned tmp_keyval; | |
| 4782 unsigned tmp_state = 0; | |
| 4783 | |
| 4784 mods_end = strrchr(str, '-'); | |
| 4785 mods_end = (mods_end != NULL) ? mods_end + 1 : str; | |
| 4786 | |
| 4787 /* Parse modifier keys */ | |
| 4788 while (str < mods_end) | |
| 4789 switch (*str++) | |
| 4790 { | |
| 4791 case '-': break; | |
| 4792 case 'S': case 's': tmp_state |= (unsigned)GDK_SHIFT_MASK; break; | |
| 4793 case 'L': case 'l': tmp_state |= (unsigned)GDK_LOCK_MASK; break; | |
| 4794 case 'C': case 'c': tmp_state |= (unsigned)GDK_CONTROL_MASK;break; | |
| 4795 case '1': tmp_state |= (unsigned)GDK_MOD1_MASK; break; | |
| 4796 case '2': tmp_state |= (unsigned)GDK_MOD2_MASK; break; | |
| 4797 case '3': tmp_state |= (unsigned)GDK_MOD3_MASK; break; | |
| 4798 case '4': tmp_state |= (unsigned)GDK_MOD4_MASK; break; | |
| 4799 case '5': tmp_state |= (unsigned)GDK_MOD5_MASK; break; | |
| 4800 default: | |
| 4801 return FALSE; | |
| 4802 } | |
| 4803 | |
| 4804 tmp_keyval = gdk_keyval_from_name(str); | |
| 4805 | |
| 4806 if (tmp_keyval == 0 || tmp_keyval == GDK_VoidSymbol) | |
| 4807 return FALSE; | |
| 4808 | |
| 4809 if (keyval != NULL) | |
| 4810 *keyval = tmp_keyval; | |
| 4811 if (state != NULL) | |
| 4812 *state = tmp_state; | |
| 4813 | |
| 4814 return TRUE; | |
| 4815 } | |
| 4816 | |
| 4817 /* | |
| 4818 * Return TRUE if p_imak is valid, otherwise FALSE. As a special case, an | |
| 4819 * empty string is also regarded as valid. | |
| 4820 * | |
| 4821 * Note: The numerical key value of p_imak is cached if it was valid; thus | |
| 4822 * boldly assuming im_xim_isvalid_imactivate() will always be called whenever | |
| 4823 * 'imak' changes. This is currently the case but not obvious -- should | |
| 4824 * probably rename the function for clarity. | |
| 4825 */ | |
| 4826 int | |
| 4827 im_xim_isvalid_imactivate(void) | |
| 4828 { | |
| 4829 if (p_imak[0] == NUL) | |
| 4830 { | |
| 4831 im_activatekey_keyval = GDK_VoidSymbol; | |
| 4832 im_activatekey_state = 0; | |
| 4833 return TRUE; | |
| 4834 } | |
| 4835 | |
| 4836 return im_string_to_keyval((const char *)p_imak, | |
| 4837 &im_activatekey_keyval, | |
| 4838 &im_activatekey_state); | |
| 4839 } | |
| 4840 | |
| 4841 static void | |
| 4842 im_synthesize_keypress(unsigned int keyval, unsigned int state) | |
| 4843 { | |
| 4844 GdkEventKey *event; | |
| 4845 | |
| 4846 # ifdef HAVE_GTK_MULTIHEAD | |
| 4847 event = (GdkEventKey *)gdk_event_new(GDK_KEY_PRESS); | |
| 4848 g_object_ref(gui.drawarea->window); /* unreffed by gdk_event_free() */ | |
| 4849 # else | |
| 4850 event = (GdkEventKey *)g_malloc0((gulong)sizeof(GdkEvent)); | |
| 4851 event->type = GDK_KEY_PRESS; | |
| 4852 # endif | |
| 4853 event->window = gui.drawarea->window; | |
| 4854 event->send_event = TRUE; | |
| 4855 event->time = GDK_CURRENT_TIME; | |
| 4856 event->state = state; | |
| 4857 event->keyval = keyval; | |
| 4858 event->hardware_keycode = /* needed for XIM */ | |
| 4859 XKeysymToKeycode(GDK_WINDOW_XDISPLAY(event->window), (KeySym)keyval); | |
| 4860 event->length = 0; | |
| 4861 event->string = NULL; | |
| 4862 | |
| 4863 gtk_im_context_filter_keypress(xic, event); | |
| 4864 | |
| 4865 /* For consistency, also send the corresponding release event. */ | |
| 4866 event->type = GDK_KEY_RELEASE; | |
| 4867 event->send_event = FALSE; | |
| 4868 gtk_im_context_filter_keypress(xic, event); | |
| 4869 | |
| 4870 # ifdef HAVE_GTK_MULTIHEAD | |
| 4871 gdk_event_free((GdkEvent *)event); | |
| 4872 # else | |
| 4873 g_free(event); | |
| 4874 # endif | |
| 4875 } | |
| 4876 | |
| 4877 void | |
| 4878 xim_reset(void) | |
| 4879 { | |
| 4880 if (xic != NULL) | |
| 4881 { | |
| 4882 /* | |
| 4883 * The third-party imhangul module (and maybe others too) ignores | |
| 4884 * gtk_im_context_reset() or at least doesn't reset the active state. | |
| 4885 * Thus sending imactivatekey would turn it off if it was on before, | |
| 4886 * which is clearly not what we want. Fortunately we can work around | |
| 4887 * that for imhangul by sending GDK_Escape, but I don't know if it | |
| 4888 * works with all IM modules that support an activation key :/ | |
| 4889 * | |
| 4890 * An alternative approach would be to destroy the IM context and | |
| 4891 * recreate it. But that means loading/unloading the IM module on | |
|
2205
54605ada811b
"g8" doesn't work properly on a NUL.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
4892 * every mode switch, which causes a quite noticeable delay even on |
| 7 | 4893 * my rather fast box... |
| 4894 * * | |
| 4895 * Moreover, there are some XIM which cannot respond to | |
| 4896 * im_synthesize_keypress(). we hope that they reset by | |
| 4897 * xim_shutdown(). | |
| 4898 */ | |
| 4899 if (im_activatekey_keyval != GDK_VoidSymbol && im_is_active) | |
| 4900 im_synthesize_keypress(GDK_Escape, 0U); | |
| 4901 | |
| 4902 gtk_im_context_reset(xic); | |
| 4903 | |
| 4904 /* | |
| 4905 * HACK for Ami: This sequence of function calls makes Ami handle | |
| 1205 | 4906 * the IM reset graciously, without breaking loads of other stuff. |
| 7 | 4907 * It seems to force English mode as well, which is exactly what we |
| 4908 * want because it makes the Ami status display work reliably. | |
| 4909 */ | |
| 4910 gtk_im_context_set_use_preedit(xic, FALSE); | |
| 4911 | |
| 4912 if (p_imdisable) | |
| 4913 im_shutdown(); | |
| 4914 else | |
| 4915 { | |
| 4916 gtk_im_context_set_use_preedit(xic, TRUE); | |
| 4917 xim_set_focus(gui.in_focus); | |
| 4918 | |
| 4919 if (im_activatekey_keyval != GDK_VoidSymbol) | |
| 4920 { | |
| 4921 if (im_is_active) | |
| 4922 { | |
| 4923 g_signal_handler_block(xic, im_commit_handler_id); | |
| 4924 im_synthesize_keypress(im_activatekey_keyval, | |
| 4925 im_activatekey_state); | |
| 4926 g_signal_handler_unblock(xic, im_commit_handler_id); | |
| 4927 } | |
| 4928 } | |
| 4929 else | |
| 4930 { | |
| 4931 im_shutdown(); | |
| 4932 xim_init(); | |
| 4933 xim_set_focus(gui.in_focus); | |
| 4934 } | |
| 4935 } | |
| 4936 } | |
| 4937 | |
| 4938 preedit_start_col = MAXCOL; | |
| 4939 xim_has_preediting = FALSE; | |
| 4940 } | |
| 4941 | |
| 4942 int | |
| 4943 xim_queue_key_press_event(GdkEventKey *event, int down) | |
| 4944 { | |
| 4945 if (down) | |
| 4946 { | |
| 4947 /* | |
| 4948 * Workaround GTK2 XIM 'feature' that always converts keypad keys to | |
| 4949 * chars., even when not part of an IM sequence (ref. feature of | |
| 4950 * gdk/gdkkeyuni.c). | |
| 4951 * Flag any keypad keys that might represent a single char. | |
| 4952 * If this (on its own - i.e., not part of an IM sequence) is | |
| 4953 * committed while we're processing one of these keys, we can ignore | |
| 4954 * that commit and go ahead & process it ourselves. That way we can | |
| 4955 * still distinguish keypad keys for use in mappings. | |
| 1620 | 4956 * Also add GDK_space to make <S-Space> work. |
| 7 | 4957 */ |
| 4958 switch (event->keyval) | |
| 4959 { | |
| 4960 case GDK_KP_Add: xim_expected_char = '+'; break; | |
| 4961 case GDK_KP_Subtract: xim_expected_char = '-'; break; | |
| 4962 case GDK_KP_Divide: xim_expected_char = '/'; break; | |
| 4963 case GDK_KP_Multiply: xim_expected_char = '*'; break; | |
| 4964 case GDK_KP_Decimal: xim_expected_char = '.'; break; | |
| 4965 case GDK_KP_Equal: xim_expected_char = '='; break; | |
| 4966 case GDK_KP_0: xim_expected_char = '0'; break; | |
| 4967 case GDK_KP_1: xim_expected_char = '1'; break; | |
| 4968 case GDK_KP_2: xim_expected_char = '2'; break; | |
| 4969 case GDK_KP_3: xim_expected_char = '3'; break; | |
| 4970 case GDK_KP_4: xim_expected_char = '4'; break; | |
| 4971 case GDK_KP_5: xim_expected_char = '5'; break; | |
| 4972 case GDK_KP_6: xim_expected_char = '6'; break; | |
| 4973 case GDK_KP_7: xim_expected_char = '7'; break; | |
| 4974 case GDK_KP_8: xim_expected_char = '8'; break; | |
| 4975 case GDK_KP_9: xim_expected_char = '9'; break; | |
| 1620 | 4976 case GDK_space: xim_expected_char = ' '; break; |
| 7 | 4977 default: xim_expected_char = NUL; |
| 4978 } | |
| 4979 xim_ignored_char = FALSE; | |
| 4980 } | |
| 4981 | |
| 4982 /* | |
| 4983 * When typing fFtT, XIM may be activated. Thus it must pass | |
| 4984 * gtk_im_context_filter_keypress() in Normal mode. | |
| 4985 * And while doing :sh too. | |
| 4986 */ | |
| 4987 if (xic != NULL && !p_imdisable | |
| 4988 && (State & (INSERT | CMDLINE | NORMAL | EXTERNCMD)) != 0) | |
| 4989 { | |
| 4990 /* | |
| 4991 * Filter 'imactivatekey' and map it to CTRL-^. This way, Vim is | |
| 4992 * always aware of the current status of IM, and can even emulate | |
| 4993 * the activation key for modules that don't support one. | |
| 4994 */ | |
| 4995 if (event->keyval == im_activatekey_keyval | |
| 4996 && (event->state & im_activatekey_state) == im_activatekey_state) | |
| 4997 { | |
| 4998 unsigned int state_mask; | |
| 4999 | |
| 5000 /* Require the state of the 3 most used modifiers to match exactly. | |
| 5001 * Otherwise e.g. <S-C-space> would be unusable for other purposes | |
| 5002 * if the IM activate key is <S-space>. */ | |
| 5003 state_mask = im_activatekey_state; | |
| 5004 state_mask |= ((int)GDK_SHIFT_MASK | (int)GDK_CONTROL_MASK | |
| 5005 | (int)GDK_MOD1_MASK); | |
| 5006 | |
| 5007 if ((event->state & state_mask) != im_activatekey_state) | |
| 5008 return FALSE; | |
| 5009 | |
| 5010 /* Don't send it a second time on GDK_KEY_RELEASE. */ | |
| 5011 if (event->type != GDK_KEY_PRESS) | |
| 5012 return TRUE; | |
| 5013 | |
| 781 | 5014 if (map_to_exists_mode((char_u *)"", LANGMAP, FALSE)) |
| 7 | 5015 { |
| 5016 im_set_active(FALSE); | |
| 5017 | |
| 5018 /* ":lmap" mappings exists, toggle use of mappings. */ | |
| 5019 State ^= LANGMAP; | |
| 5020 if (State & LANGMAP) | |
| 5021 { | |
| 5022 curbuf->b_p_iminsert = B_IMODE_NONE; | |
| 5023 State &= ~LANGMAP; | |
| 5024 } | |
| 5025 else | |
| 5026 { | |
| 5027 curbuf->b_p_iminsert = B_IMODE_LMAP; | |
| 5028 State |= LANGMAP; | |
| 5029 } | |
| 5030 return TRUE; | |
| 5031 } | |
| 5032 | |
| 5033 return gtk_im_context_filter_keypress(xic, event); | |
| 5034 } | |
| 5035 | |
| 5036 /* Don't filter events through the IM context if IM isn't active | |
| 5037 * right now. Unlike with GTK+ 1.2 we cannot rely on the IM module | |
| 5038 * not doing anything before the activation key was sent. */ | |
| 5039 if (im_activatekey_keyval == GDK_VoidSymbol || im_is_active) | |
| 5040 { | |
| 5041 int imresult = gtk_im_context_filter_keypress(xic, event); | |
| 5042 | |
| 5043 /* Some XIM send following sequence: | |
| 5044 * 1. preedited string. | |
| 5045 * 2. committed string. | |
| 5046 * 3. line changed key. | |
| 5047 * 4. preedited string. | |
| 5048 * 5. remove preedited string. | |
| 5049 * if 3, Vim can't move back the above line for 5. | |
| 5050 * thus, this part should not parse the key. */ | |
| 5051 if (!imresult && preedit_start_col != MAXCOL | |
| 5052 && event->keyval == GDK_Return) | |
| 5053 { | |
| 5054 im_synthesize_keypress(GDK_Return, 0U); | |
| 5055 return FALSE; | |
| 5056 } | |
| 5057 | |
| 5058 /* If XIM tried to commit a keypad key as a single char., | |
| 5059 * ignore it so we can use the keypad key 'raw', for mappings. */ | |
| 5060 if (xim_expected_char != NUL && xim_ignored_char) | |
| 5061 /* We had a keypad key, and XIM tried to thieve it */ | |
| 5062 return FALSE; | |
| 5063 | |
| 5064 /* Normal processing */ | |
| 5065 return imresult; | |
| 5066 } | |
| 5067 } | |
| 5068 | |
| 5069 return FALSE; | |
| 5070 } | |
| 5071 | |
| 5072 int | |
| 5073 im_get_status(void) | |
| 5074 { | |
| 5075 return im_is_active; | |
| 5076 } | |
| 5077 | |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5078 int |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5079 preedit_get_status(void) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5080 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5081 return preedit_is_active; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5082 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5083 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5084 int |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5085 im_is_preediting() |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5086 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5087 return xim_has_preediting; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5088 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5089 |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
5090 # else /* !FEAT_GUI_GTK */ |
| 7 | 5091 |
| 5092 static int xim_is_active = FALSE; /* XIM should be active in the current | |
| 5093 mode */ | |
| 5094 static int xim_has_focus = FALSE; /* XIM is really being used for Vim */ | |
| 5095 #ifdef FEAT_GUI_X11 | |
| 5096 static XIMStyle input_style; | |
| 5097 static int status_area_enabled = TRUE; | |
| 5098 #endif | |
| 5099 | |
| 5100 /* | |
| 5101 * Switch using XIM on/off. This is used by the code that changes "State". | |
| 5102 */ | |
| 5103 void | |
| 5104 im_set_active(active) | |
| 5105 int active; | |
| 5106 { | |
| 5107 if (xic == NULL) | |
| 5108 return; | |
| 5109 | |
| 5110 /* If 'imdisable' is set, XIM is never active. */ | |
| 5111 if (p_imdisable) | |
| 5112 active = FALSE; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2205
diff
changeset
|
5113 #if !defined(FEAT_GUI_GTK) |
| 7 | 5114 else if (input_style & XIMPreeditPosition) |
| 5115 /* There is a problem in switching XIM off when preediting is used, | |
| 5116 * and it is not clear how this can be solved. For now, keep XIM on | |
| 5117 * all the time, like it was done in Vim 5.8. */ | |
| 5118 active = TRUE; | |
| 5119 #endif | |
| 5120 | |
| 5121 /* Remember the active state, it is needed when Vim gets keyboard focus. */ | |
| 5122 xim_is_active = active; | |
| 5123 xim_set_preedit(); | |
| 5124 } | |
| 5125 | |
| 5126 /* | |
| 5127 * Adjust using XIM for gaining or losing keyboard focus. Also called when | |
| 5128 * "xim_is_active" changes. | |
| 5129 */ | |
| 5130 void | |
| 5131 xim_set_focus(focus) | |
| 5132 int focus; | |
| 5133 { | |
| 5134 if (xic == NULL) | |
| 5135 return; | |
| 5136 | |
| 5137 /* | |
| 5138 * XIM only gets focus when the Vim window has keyboard focus and XIM has | |
| 5139 * been set active for the current mode. | |
| 5140 */ | |
| 5141 if (focus && xim_is_active) | |
| 5142 { | |
| 5143 if (!xim_has_focus) | |
| 5144 { | |
| 5145 xim_has_focus = TRUE; | |
| 5146 XSetICFocus(xic); | |
| 5147 } | |
| 5148 } | |
| 5149 else | |
| 5150 { | |
| 5151 if (xim_has_focus) | |
| 5152 { | |
| 5153 xim_has_focus = FALSE; | |
| 5154 XUnsetICFocus(xic); | |
| 5155 } | |
| 5156 } | |
| 5157 } | |
| 5158 | |
| 5159 void | |
| 5160 im_set_position(row, col) | |
| 1883 | 5161 int row UNUSED; |
| 5162 int col UNUSED; | |
| 7 | 5163 { |
| 5164 xim_set_preedit(); | |
| 5165 } | |
| 5166 | |
| 5167 /* | |
| 5168 * Set the XIM to the current cursor position. | |
| 5169 */ | |
| 5170 void | |
| 5171 xim_set_preedit() | |
| 5172 { | |
| 2580 | 5173 XVaNestedList attr_list; |
| 5174 XRectangle spot_area; | |
| 5175 XPoint over_spot; | |
| 5176 int line_space; | |
| 5177 | |
| 7 | 5178 if (xic == NULL) |
| 5179 return; | |
| 5180 | |
| 5181 xim_set_focus(TRUE); | |
| 5182 | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5183 if (!xim_has_focus) |
| 7 | 5184 { |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5185 /* 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
|
5186 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
|
5187 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
|
5188 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
|
5189 XNSpotLocation, |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5190 &over_spot, |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5191 NULL); |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5192 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
|
5193 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
|
5194 return; |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5195 } |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5196 |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5197 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
|
5198 { |
| 7 | 5199 if (xim_fg_color == INVALCOLOR) |
| 5200 { | |
| 5201 xim_fg_color = gui.def_norm_pixel; | |
| 5202 xim_bg_color = gui.def_back_pixel; | |
| 5203 } | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5204 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
|
5205 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
|
5206 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
|
5207 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
|
5208 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
|
5209 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
|
5210 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
|
5211 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
|
5212 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
|
5213 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
|
5214 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
|
5215 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
|
5216 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
|
5217 NULL); |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5218 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
|
5219 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
|
5220 XFree(attr_list); |
| 7 | 5221 } |
| 5222 } | |
| 5223 | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5224 #if defined(FEAT_GUI_X11) |
| 7 | 5225 static char e_xim[] = N_("E285: Failed to create input context"); |
| 5226 #endif | |
| 5227 | |
| 5228 #if defined(FEAT_GUI_X11) || defined(PROTO) | |
| 5229 # if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 && !defined(sun) | |
| 5230 # define USE_X11R6_XIM | |
| 5231 # endif | |
| 5232 | |
| 5233 static int xim_real_init __ARGS((Window x11_window, Display *x11_display)); | |
| 5234 | |
| 5235 | |
| 5236 #ifdef USE_X11R6_XIM | |
| 5237 static void xim_instantiate_cb __ARGS((Display *display, XPointer client_data, XPointer call_data)); | |
| 5238 static void xim_destroy_cb __ARGS((XIM im, XPointer client_data, XPointer call_data)); | |
| 5239 | |
| 5240 static void | |
| 5241 xim_instantiate_cb(display, client_data, call_data) | |
| 5242 Display *display; | |
| 1883 | 5243 XPointer client_data UNUSED; |
| 5244 XPointer call_data UNUSED; | |
| 7 | 5245 { |
| 5246 Window x11_window; | |
| 5247 Display *x11_display; | |
| 5248 | |
| 5249 #ifdef XIM_DEBUG | |
| 5250 xim_log("xim_instantiate_cb()\n"); | |
| 5251 #endif | |
| 5252 | |
| 5253 gui_get_x11_windis(&x11_window, &x11_display); | |
| 5254 if (display != x11_display) | |
| 5255 return; | |
| 5256 | |
| 5257 xim_real_init(x11_window, x11_display); | |
| 811 | 5258 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 5259 if (xic != NULL) |
| 5260 XUnregisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
| 5261 xim_instantiate_cb, NULL); | |
| 5262 } | |
| 5263 | |
| 5264 static void | |
| 5265 xim_destroy_cb(im, client_data, call_data) | |
| 1883 | 5266 XIM im UNUSED; |
| 5267 XPointer client_data UNUSED; | |
| 5268 XPointer call_data UNUSED; | |
| 7 | 5269 { |
| 5270 Window x11_window; | |
| 5271 Display *x11_display; | |
| 5272 | |
| 5273 #ifdef XIM_DEBUG | |
| 5274 xim_log("xim_destroy_cb()\n"); | |
| 5275 #endif | |
| 5276 gui_get_x11_windis(&x11_window, &x11_display); | |
| 5277 | |
| 5278 xic = NULL; | |
| 5279 status_area_enabled = FALSE; | |
| 5280 | |
| 811 | 5281 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 5282 |
| 5283 XRegisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
| 5284 xim_instantiate_cb, NULL); | |
| 5285 } | |
| 5286 #endif | |
| 5287 | |
| 5288 void | |
| 5289 xim_init() | |
| 5290 { | |
| 5291 Window x11_window; | |
| 5292 Display *x11_display; | |
| 5293 | |
| 5294 #ifdef XIM_DEBUG | |
| 5295 xim_log("xim_init()\n"); | |
| 5296 #endif | |
| 5297 | |
| 5298 gui_get_x11_windis(&x11_window, &x11_display); | |
| 5299 | |
| 5300 xic = NULL; | |
| 5301 | |
| 5302 if (xim_real_init(x11_window, x11_display)) | |
| 5303 return; | |
| 5304 | |
| 811 | 5305 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 5306 |
| 5307 #ifdef USE_X11R6_XIM | |
| 5308 XRegisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
| 5309 xim_instantiate_cb, NULL); | |
| 5310 #endif | |
| 5311 } | |
| 5312 | |
| 5313 static int | |
| 5314 xim_real_init(x11_window, x11_display) | |
| 5315 Window x11_window; | |
| 5316 Display *x11_display; | |
| 5317 { | |
| 5318 int i; | |
| 5319 char *p, | |
| 5320 *s, | |
| 5321 *ns, | |
| 5322 *end, | |
| 5323 tmp[1024]; | |
| 5324 #define IMLEN_MAX 40 | |
| 5325 char buf[IMLEN_MAX + 7]; | |
| 5326 XIM xim = NULL; | |
| 5327 XIMStyles *xim_styles; | |
| 5328 XIMStyle this_input_style = 0; | |
| 5329 Boolean found; | |
| 5330 XPoint over_spot; | |
| 5331 XVaNestedList preedit_list, status_list; | |
| 5332 | |
| 5333 input_style = 0; | |
| 5334 status_area_enabled = FALSE; | |
| 5335 | |
| 5336 if (xic != NULL) | |
| 5337 return FALSE; | |
| 5338 | |
| 5339 if (gui.rsrc_input_method != NULL && *gui.rsrc_input_method != NUL) | |
| 5340 { | |
| 5341 strcpy(tmp, gui.rsrc_input_method); | |
| 5342 for (ns = s = tmp; ns != NULL && *s != NUL;) | |
| 5343 { | |
| 5344 s = (char *)skipwhite((char_u *)s); | |
| 5345 if (*s == NUL) | |
| 5346 break; | |
| 5347 if ((ns = end = strchr(s, ',')) == NULL) | |
| 5348 end = s + strlen(s); | |
| 5349 while (isspace(((char_u *)end)[-1])) | |
| 5350 end--; | |
| 5351 *end = NUL; | |
| 5352 | |
| 5353 if (strlen(s) <= IMLEN_MAX) | |
| 5354 { | |
| 5355 strcpy(buf, "@im="); | |
| 5356 strcat(buf, s); | |
| 5357 if ((p = XSetLocaleModifiers(buf)) != NULL && *p != NUL | |
| 5358 && (xim = XOpenIM(x11_display, NULL, NULL, NULL)) | |
| 5359 != NULL) | |
| 5360 break; | |
| 5361 } | |
| 5362 | |
| 5363 s = ns + 1; | |
| 5364 } | |
| 5365 } | |
| 5366 | |
| 5367 if (xim == NULL && (p = XSetLocaleModifiers("")) != NULL && *p != NUL) | |
| 5368 xim = XOpenIM(x11_display, NULL, NULL, NULL); | |
| 5369 | |
| 5370 /* This is supposed to be useful to obtain characters through | |
| 5371 * XmbLookupString() without really using a XIM. */ | |
| 5372 if (xim == NULL && (p = XSetLocaleModifiers("@im=none")) != NULL | |
| 5373 && *p != NUL) | |
| 5374 xim = XOpenIM(x11_display, NULL, NULL, NULL); | |
| 5375 | |
| 5376 if (xim == NULL) | |
| 5377 { | |
| 5378 /* Only give this message when verbose is set, because too many people | |
| 5379 * got this message when they didn't want to use a XIM. */ | |
| 5380 if (p_verbose > 0) | |
| 292 | 5381 { |
| 5382 verbose_enter(); | |
| 7 | 5383 EMSG(_("E286: Failed to open input method")); |
| 292 | 5384 verbose_leave(); |
| 5385 } | |
| 7 | 5386 return FALSE; |
| 5387 } | |
| 5388 | |
| 5389 #ifdef USE_X11R6_XIM | |
| 5390 { | |
| 5391 XIMCallback destroy_cb; | |
| 5392 | |
| 5393 destroy_cb.callback = xim_destroy_cb; | |
| 5394 destroy_cb.client_data = NULL; | |
| 5395 if (XSetIMValues(xim, XNDestroyCallback, &destroy_cb, NULL)) | |
| 5396 EMSG(_("E287: Warning: Could not set destroy callback to IM")); | |
| 5397 } | |
| 5398 #endif | |
| 5399 | |
| 5400 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) || !xim_styles) | |
| 5401 { | |
| 5402 EMSG(_("E288: input method doesn't support any style")); | |
| 5403 XCloseIM(xim); | |
| 5404 return FALSE; | |
| 5405 } | |
| 5406 | |
| 5407 found = False; | |
| 5408 strcpy(tmp, gui.rsrc_preedit_type_name); | |
| 5409 for (s = tmp; s && !found; ) | |
| 5410 { | |
| 5411 while (*s && isspace((unsigned char)*s)) | |
| 5412 s++; | |
| 5413 if (!*s) | |
| 5414 break; | |
| 5415 if ((ns = end = strchr(s, ',')) != 0) | |
| 5416 ns++; | |
| 5417 else | |
| 5418 end = s + strlen(s); | |
| 5419 while (isspace((unsigned char)*end)) | |
| 5420 end--; | |
| 5421 *end = '\0'; | |
| 5422 | |
| 5423 if (!strcmp(s, "OverTheSpot")) | |
| 5424 this_input_style = (XIMPreeditPosition | XIMStatusArea); | |
| 5425 else if (!strcmp(s, "OffTheSpot")) | |
| 5426 this_input_style = (XIMPreeditArea | XIMStatusArea); | |
| 5427 else if (!strcmp(s, "Root")) | |
| 5428 this_input_style = (XIMPreeditNothing | XIMStatusNothing); | |
| 5429 | |
| 5430 for (i = 0; (unsigned short)i < xim_styles->count_styles; i++) | |
| 5431 { | |
| 5432 if (this_input_style == xim_styles->supported_styles[i]) | |
| 5433 { | |
| 5434 found = True; | |
| 5435 break; | |
| 5436 } | |
| 5437 } | |
| 5438 if (!found) | |
| 5439 for (i = 0; (unsigned short)i < xim_styles->count_styles; i++) | |
| 5440 { | |
| 5441 if ((xim_styles->supported_styles[i] & this_input_style) | |
| 5442 == (this_input_style & ~XIMStatusArea)) | |
| 5443 { | |
| 5444 this_input_style &= ~XIMStatusArea; | |
| 5445 found = True; | |
| 5446 break; | |
| 5447 } | |
| 5448 } | |
| 5449 | |
| 5450 s = ns; | |
| 5451 } | |
| 5452 XFree(xim_styles); | |
| 5453 | |
| 5454 if (!found) | |
| 5455 { | |
| 5456 /* Only give this message when verbose is set, because too many people | |
| 5457 * got this message when they didn't want to use a XIM. */ | |
| 5458 if (p_verbose > 0) | |
| 292 | 5459 { |
| 5460 verbose_enter(); | |
| 7 | 5461 EMSG(_("E289: input method doesn't support my preedit type")); |
| 292 | 5462 verbose_leave(); |
| 5463 } | |
| 7 | 5464 XCloseIM(xim); |
| 5465 return FALSE; | |
| 5466 } | |
| 5467 | |
| 5468 over_spot.x = TEXT_X(gui.col); | |
| 5469 over_spot.y = TEXT_Y(gui.row); | |
| 5470 input_style = this_input_style; | |
| 5471 | |
| 5472 /* A crash was reported when trying to pass gui.norm_font as XNFontSet, | |
| 5473 * thus that has been removed. Hopefully the default works... */ | |
| 5474 #ifdef FEAT_XFONTSET | |
| 5475 if (gui.fontset != NOFONTSET) | |
| 5476 { | |
| 5477 preedit_list = XVaCreateNestedList(0, | |
| 5478 XNSpotLocation, &over_spot, | |
| 5479 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 5480 XNBackground, (Pixel)gui.def_back_pixel, | |
| 5481 XNFontSet, (XFontSet)gui.fontset, | |
| 5482 NULL); | |
| 5483 status_list = XVaCreateNestedList(0, | |
| 5484 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 5485 XNBackground, (Pixel)gui.def_back_pixel, | |
| 5486 XNFontSet, (XFontSet)gui.fontset, | |
| 5487 NULL); | |
| 5488 } | |
| 5489 else | |
| 5490 #endif | |
| 5491 { | |
| 5492 preedit_list = XVaCreateNestedList(0, | |
| 5493 XNSpotLocation, &over_spot, | |
| 5494 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 5495 XNBackground, (Pixel)gui.def_back_pixel, | |
| 5496 NULL); | |
| 5497 status_list = XVaCreateNestedList(0, | |
| 5498 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 5499 XNBackground, (Pixel)gui.def_back_pixel, | |
| 5500 NULL); | |
| 5501 } | |
| 5502 | |
| 5503 xic = XCreateIC(xim, | |
| 5504 XNInputStyle, input_style, | |
| 5505 XNClientWindow, x11_window, | |
| 5506 XNFocusWindow, gui.wid, | |
| 5507 XNPreeditAttributes, preedit_list, | |
| 5508 XNStatusAttributes, status_list, | |
| 5509 NULL); | |
| 5510 XFree(status_list); | |
| 5511 XFree(preedit_list); | |
| 5512 if (xic != NULL) | |
| 5513 { | |
| 5514 if (input_style & XIMStatusArea) | |
| 5515 { | |
| 5516 xim_set_status_area(); | |
| 5517 status_area_enabled = TRUE; | |
| 5518 } | |
| 5519 else | |
| 811 | 5520 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 5521 } |
| 5522 else | |
| 5523 { | |
| 5524 EMSG(_(e_xim)); | |
| 5525 XCloseIM(xim); | |
| 5526 return FALSE; | |
| 5527 } | |
| 5528 | |
| 5529 return TRUE; | |
| 5530 } | |
| 5531 | |
| 5532 #endif /* FEAT_GUI_X11 */ | |
| 5533 | |
| 5534 /* | |
| 5535 * Get IM status. When IM is on, return TRUE. Else return FALSE. | |
| 5536 * FIXME: This doesn't work correctly: Having focus doesn't always mean XIM is | |
| 5537 * active, when not having focus XIM may still be active (e.g., when using a | |
| 5538 * tear-off menu item). | |
| 5539 */ | |
| 5540 int | |
| 5541 im_get_status() | |
| 5542 { | |
| 5543 return xim_has_focus; | |
| 5544 } | |
| 5545 | |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
5546 # endif /* !FEAT_GUI_GTK */ |
|
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
5547 |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5548 # if !defined(FEAT_GUI_GTK) || defined(PROTO) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5549 /* |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5550 * Set up the status area. |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5551 * |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5552 * 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
|
5553 * 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
|
5554 * 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
|
5555 * window... |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5556 */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5557 void |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5558 xim_set_status_area() |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5559 { |
| 2580 | 5560 XVaNestedList preedit_list = 0, status_list = 0, list = 0; |
| 5561 XRectangle pre_area, status_area; | |
| 5562 | |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5563 if (xic == NULL) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5564 return; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5565 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5566 if (input_style & XIMStatusArea) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5567 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5568 if (input_style & XIMPreeditArea) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5569 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5570 XRectangle *needed_rect; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5571 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5572 /* to get status_area width */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5573 status_list = XVaCreateNestedList(0, XNAreaNeeded, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5574 &needed_rect, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5575 XGetICValues(xic, XNStatusAttributes, status_list, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5576 XFree(status_list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5577 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5578 status_area.width = needed_rect->width; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5579 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5580 else |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5581 status_area.width = gui.char_width * Columns; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5582 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5583 status_area.x = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5584 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
|
5585 if (gui.which_scrollbars[SBAR_BOTTOM]) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5586 status_area.y += gui.scrollbar_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5587 #ifdef FEAT_MENU |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5588 if (gui.menu_is_active) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5589 status_area.y += gui.menu_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5590 #endif |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5591 status_area.height = gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5592 status_list = XVaCreateNestedList(0, XNArea, &status_area, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5593 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5594 else |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5595 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5596 status_area.x = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5597 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
|
5598 if (gui.which_scrollbars[SBAR_BOTTOM]) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5599 status_area.y += gui.scrollbar_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5600 #ifdef FEAT_MENU |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5601 if (gui.menu_is_active) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5602 status_area.y += gui.menu_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5603 #endif |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5604 status_area.width = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5605 status_area.height = gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5606 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5607 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5608 if (input_style & XIMPreeditArea) /* off-the-spot */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5609 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5610 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
|
5611 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
|
5612 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
|
5613 if (gui.which_scrollbars[SBAR_BOTTOM]) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5614 pre_area.y += gui.scrollbar_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5615 #ifdef FEAT_MENU |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5616 if (gui.menu_is_active) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5617 pre_area.y += gui.menu_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5618 #endif |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5619 pre_area.height = gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5620 preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5621 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5622 else if (input_style & XIMPreeditPosition) /* over-the-spot */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5623 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5624 pre_area.x = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5625 pre_area.y = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5626 pre_area.height = gui.char_height * Rows; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5627 pre_area.width = gui.char_width * Columns; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5628 preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5629 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5630 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5631 if (preedit_list && status_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5632 list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5633 XNStatusAttributes, status_list, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5634 else if (preedit_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5635 list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5636 NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5637 else if (status_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5638 list = XVaCreateNestedList(0, XNStatusAttributes, status_list, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5639 NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5640 else |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5641 list = NULL; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5642 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5643 if (list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5644 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5645 XSetICValues(xic, XNVaNestedList, list, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5646 XFree(list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5647 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5648 if (status_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5649 XFree(status_list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5650 if (preedit_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5651 XFree(preedit_list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5652 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5653 |
| 1668 | 5654 int |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5655 xim_get_status_area_height() |
| 1668 | 5656 { |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5657 if (status_area_enabled) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5658 return gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5659 return 0; |
| 1668 | 5660 } |
| 5661 # endif | |
| 5662 | |
| 7 | 5663 #endif /* FEAT_XIM */ |
| 5664 | |
| 5665 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 5666 | |
| 5667 /* | |
| 5668 * Setup "vcp" for conversion from "from" to "to". | |
| 5669 * The names must have been made canonical with enc_canonize(). | |
| 5670 * vcp->vc_type must have been initialized to CONV_NONE. | |
| 5671 * Note: cannot be used for conversion from/to ucs-2 and ucs-4 (will use utf-8 | |
| 5672 * instead). | |
| 5673 * Afterwards invoke with "from" and "to" equal to NULL to cleanup. | |
| 5674 * Return FAIL when conversion is not supported, OK otherwise. | |
| 5675 */ | |
| 5676 int | |
| 5677 convert_setup(vcp, from, to) | |
| 5678 vimconv_T *vcp; | |
| 5679 char_u *from; | |
| 5680 char_u *to; | |
| 5681 { | |
| 1904 | 5682 return convert_setup_ext(vcp, from, TRUE, to, TRUE); |
| 5683 } | |
| 5684 | |
| 5685 /* | |
| 5686 * As convert_setup(), but only when from_unicode_is_utf8 is TRUE will all | |
| 5687 * "from" unicode charsets be considered utf-8. Same for "to". | |
| 5688 */ | |
| 5689 int | |
| 5690 convert_setup_ext(vcp, from, from_unicode_is_utf8, to, to_unicode_is_utf8) | |
| 5691 vimconv_T *vcp; | |
| 5692 char_u *from; | |
| 5693 int from_unicode_is_utf8; | |
| 5694 char_u *to; | |
| 5695 int to_unicode_is_utf8; | |
| 5696 { | |
| 7 | 5697 int from_prop; |
| 5698 int to_prop; | |
| 1904 | 5699 int from_is_utf8; |
| 5700 int to_is_utf8; | |
| 7 | 5701 |
| 5702 /* Reset to no conversion. */ | |
| 5703 # ifdef USE_ICONV | |
| 5704 if (vcp->vc_type == CONV_ICONV && vcp->vc_fd != (iconv_t)-1) | |
| 5705 iconv_close(vcp->vc_fd); | |
| 5706 # endif | |
| 5707 vcp->vc_type = CONV_NONE; | |
| 5708 vcp->vc_factor = 1; | |
| 5709 vcp->vc_fail = FALSE; | |
| 5710 | |
| 5711 /* No conversion when one of the names is empty or they are equal. */ | |
| 5712 if (from == NULL || *from == NUL || to == NULL || *to == NUL | |
| 5713 || STRCMP(from, to) == 0) | |
| 5714 return OK; | |
| 5715 | |
| 5716 from_prop = enc_canon_props(from); | |
| 5717 to_prop = enc_canon_props(to); | |
| 1904 | 5718 if (from_unicode_is_utf8) |
| 5719 from_is_utf8 = from_prop & ENC_UNICODE; | |
| 5720 else | |
| 5721 from_is_utf8 = from_prop == ENC_UNICODE; | |
| 5722 if (to_unicode_is_utf8) | |
| 5723 to_is_utf8 = to_prop & ENC_UNICODE; | |
| 5724 else | |
| 5725 to_is_utf8 = to_prop == ENC_UNICODE; | |
| 5726 | |
| 5727 if ((from_prop & ENC_LATIN1) && to_is_utf8) | |
| 7 | 5728 { |
| 5729 /* Internal latin1 -> utf-8 conversion. */ | |
| 5730 vcp->vc_type = CONV_TO_UTF8; | |
| 5731 vcp->vc_factor = 2; /* up to twice as long */ | |
| 5732 } | |
| 1904 | 5733 else if ((from_prop & ENC_LATIN9) && to_is_utf8) |
| 26 | 5734 { |
| 5735 /* Internal latin9 -> utf-8 conversion. */ | |
| 5736 vcp->vc_type = CONV_9_TO_UTF8; | |
| 5737 vcp->vc_factor = 3; /* up to three as long (euro sign) */ | |
| 5738 } | |
| 1904 | 5739 else if (from_is_utf8 && (to_prop & ENC_LATIN1)) |
| 7 | 5740 { |
| 5741 /* Internal utf-8 -> latin1 conversion. */ | |
| 5742 vcp->vc_type = CONV_TO_LATIN1; | |
| 5743 } | |
| 1904 | 5744 else if (from_is_utf8 && (to_prop & ENC_LATIN9)) |
| 26 | 5745 { |
| 5746 /* Internal utf-8 -> latin9 conversion. */ | |
| 5747 vcp->vc_type = CONV_TO_LATIN9; | |
| 5748 } | |
| 7 | 5749 #ifdef WIN3264 |
| 5750 /* Win32-specific codepage <-> codepage conversion without iconv. */ | |
| 1904 | 5751 else if ((from_is_utf8 || encname2codepage(from) > 0) |
| 5752 && (to_is_utf8 || encname2codepage(to) > 0)) | |
| 7 | 5753 { |
| 5754 vcp->vc_type = CONV_CODEPAGE; | |
| 5755 vcp->vc_factor = 2; /* up to twice as long */ | |
| 1904 | 5756 vcp->vc_cpfrom = from_is_utf8 ? 0 : encname2codepage(from); |
| 5757 vcp->vc_cpto = to_is_utf8 ? 0 : encname2codepage(to); | |
| 7 | 5758 } |
| 5759 #endif | |
| 5760 #ifdef MACOS_X | |
| 5761 else if ((from_prop & ENC_MACROMAN) && (to_prop & ENC_LATIN1)) | |
| 5762 { | |
| 5763 vcp->vc_type = CONV_MAC_LATIN1; | |
| 5764 } | |
| 1904 | 5765 else if ((from_prop & ENC_MACROMAN) && to_is_utf8) |
| 7 | 5766 { |
| 5767 vcp->vc_type = CONV_MAC_UTF8; | |
| 5768 vcp->vc_factor = 2; /* up to twice as long */ | |
| 5769 } | |
| 5770 else if ((from_prop & ENC_LATIN1) && (to_prop & ENC_MACROMAN)) | |
| 5771 { | |
| 5772 vcp->vc_type = CONV_LATIN1_MAC; | |
| 5773 } | |
| 1904 | 5774 else if (from_is_utf8 && (to_prop & ENC_MACROMAN)) |
| 7 | 5775 { |
| 5776 vcp->vc_type = CONV_UTF8_MAC; | |
| 5777 } | |
| 5778 #endif | |
| 5779 # ifdef USE_ICONV | |
| 5780 else | |
| 5781 { | |
| 5782 /* Use iconv() for conversion. */ | |
| 5783 vcp->vc_fd = (iconv_t)my_iconv_open( | |
| 1904 | 5784 to_is_utf8 ? (char_u *)"utf-8" : to, |
| 5785 from_is_utf8 ? (char_u *)"utf-8" : from); | |
| 7 | 5786 if (vcp->vc_fd != (iconv_t)-1) |
| 5787 { | |
| 5788 vcp->vc_type = CONV_ICONV; | |
| 5789 vcp->vc_factor = 4; /* could be longer too... */ | |
| 5790 } | |
| 5791 } | |
| 5792 # endif | |
| 5793 if (vcp->vc_type == CONV_NONE) | |
| 5794 return FAIL; | |
| 167 | 5795 |
| 7 | 5796 return OK; |
| 5797 } | |
| 5798 | |
| 5799 #if defined(FEAT_GUI) || defined(AMIGA) || defined(WIN3264) \ | |
| 5800 || defined(MSDOS) || defined(PROTO) | |
| 5801 /* | |
| 5802 * Do conversion on typed input characters in-place. | |
| 5803 * The input and output are not NUL terminated! | |
| 5804 * Returns the length after conversion. | |
| 5805 */ | |
| 5806 int | |
| 5807 convert_input(ptr, len, maxlen) | |
| 5808 char_u *ptr; | |
| 5809 int len; | |
| 5810 int maxlen; | |
| 5811 { | |
| 5812 return convert_input_safe(ptr, len, maxlen, NULL, NULL); | |
| 5813 } | |
| 5814 #endif | |
| 5815 | |
| 5816 /* | |
| 5817 * Like convert_input(), but when there is an incomplete byte sequence at the | |
| 5818 * end return that as an allocated string in "restp" and set "*restlenp" to | |
| 5819 * the length. If "restp" is NULL it is not used. | |
| 5820 */ | |
| 5821 int | |
| 5822 convert_input_safe(ptr, len, maxlen, restp, restlenp) | |
| 5823 char_u *ptr; | |
| 5824 int len; | |
| 5825 int maxlen; | |
| 5826 char_u **restp; | |
| 5827 int *restlenp; | |
| 5828 { | |
| 5829 char_u *d; | |
| 5830 int dlen = len; | |
| 5831 int unconvertlen = 0; | |
| 5832 | |
| 5833 d = string_convert_ext(&input_conv, ptr, &dlen, | |
| 5834 restp == NULL ? NULL : &unconvertlen); | |
| 5835 if (d != NULL) | |
| 5836 { | |
| 5837 if (dlen <= maxlen) | |
| 5838 { | |
| 5839 if (unconvertlen > 0) | |
| 5840 { | |
| 5841 /* Move the unconverted characters to allocated memory. */ | |
| 5842 *restp = alloc(unconvertlen); | |
| 5843 if (*restp != NULL) | |
| 5844 mch_memmove(*restp, ptr + len - unconvertlen, unconvertlen); | |
| 5845 *restlenp = unconvertlen; | |
| 5846 } | |
| 5847 mch_memmove(ptr, d, dlen); | |
| 5848 } | |
| 5849 else | |
| 5850 /* result is too long, keep the unconverted text (the caller must | |
| 5851 * have done something wrong!) */ | |
| 5852 dlen = len; | |
| 5853 vim_free(d); | |
| 5854 } | |
| 5855 return dlen; | |
| 5856 } | |
| 5857 | |
| 5858 /* | |
| 5859 * Convert text "ptr[*lenp]" according to "vcp". | |
| 5860 * Returns the result in allocated memory and sets "*lenp". | |
| 5861 * When "lenp" is NULL, use NUL terminated strings. | |
| 5862 * Illegal chars are often changed to "?", unless vcp->vc_fail is set. | |
| 5863 * When something goes wrong, NULL is returned and "*lenp" is unchanged. | |
| 5864 */ | |
| 5865 char_u * | |
| 5866 string_convert(vcp, ptr, lenp) | |
| 5867 vimconv_T *vcp; | |
| 5868 char_u *ptr; | |
| 5869 int *lenp; | |
| 5870 { | |
| 5871 return string_convert_ext(vcp, ptr, lenp, NULL); | |
| 5872 } | |
| 5873 | |
| 5874 /* | |
| 5875 * Like string_convert(), but when "unconvlenp" is not NULL and there are is | |
| 5876 * an incomplete sequence at the end it is not converted and "*unconvlenp" is | |
| 5877 * set to the number of remaining bytes. | |
| 5878 */ | |
| 5879 char_u * | |
| 5880 string_convert_ext(vcp, ptr, lenp, unconvlenp) | |
| 5881 vimconv_T *vcp; | |
| 5882 char_u *ptr; | |
| 5883 int *lenp; | |
| 5884 int *unconvlenp; | |
| 5885 { | |
| 5886 char_u *retval = NULL; | |
| 5887 char_u *d; | |
| 5888 int len; | |
| 5889 int i; | |
| 5890 int l; | |
| 5891 int c; | |
| 5892 | |
| 5893 if (lenp == NULL) | |
| 5894 len = (int)STRLEN(ptr); | |
| 5895 else | |
| 5896 len = *lenp; | |
| 5897 if (len == 0) | |
| 5898 return vim_strsave((char_u *)""); | |
| 5899 | |
| 5900 switch (vcp->vc_type) | |
| 5901 { | |
| 5902 case CONV_TO_UTF8: /* latin1 to utf-8 conversion */ | |
| 5903 retval = alloc(len * 2 + 1); | |
| 5904 if (retval == NULL) | |
| 5905 break; | |
| 5906 d = retval; | |
| 5907 for (i = 0; i < len; ++i) | |
| 5908 { | |
| 26 | 5909 c = ptr[i]; |
| 5910 if (c < 0x80) | |
| 5911 *d++ = c; | |
| 7 | 5912 else |
| 5913 { | |
| 26 | 5914 *d++ = 0xc0 + ((unsigned)c >> 6); |
| 5915 *d++ = 0x80 + (c & 0x3f); | |
| 7 | 5916 } |
| 5917 } | |
| 5918 *d = NUL; | |
| 5919 if (lenp != NULL) | |
| 5920 *lenp = (int)(d - retval); | |
| 5921 break; | |
| 5922 | |
| 26 | 5923 case CONV_9_TO_UTF8: /* latin9 to utf-8 conversion */ |
| 5924 retval = alloc(len * 3 + 1); | |
| 5925 if (retval == NULL) | |
| 5926 break; | |
| 5927 d = retval; | |
| 5928 for (i = 0; i < len; ++i) | |
| 5929 { | |
| 5930 c = ptr[i]; | |
| 5931 switch (c) | |
| 5932 { | |
| 5933 case 0xa4: c = 0x20ac; break; /* euro */ | |
| 5934 case 0xa6: c = 0x0160; break; /* S hat */ | |
| 5935 case 0xa8: c = 0x0161; break; /* S -hat */ | |
| 5936 case 0xb4: c = 0x017d; break; /* Z hat */ | |
| 5937 case 0xb8: c = 0x017e; break; /* Z -hat */ | |
| 5938 case 0xbc: c = 0x0152; break; /* OE */ | |
| 5939 case 0xbd: c = 0x0153; break; /* oe */ | |
| 5940 case 0xbe: c = 0x0178; break; /* Y */ | |
| 5941 } | |
| 5942 d += utf_char2bytes(c, d); | |
| 5943 } | |
| 5944 *d = NUL; | |
| 5945 if (lenp != NULL) | |
| 5946 *lenp = (int)(d - retval); | |
| 5947 break; | |
| 5948 | |
| 7 | 5949 case CONV_TO_LATIN1: /* utf-8 to latin1 conversion */ |
| 26 | 5950 case CONV_TO_LATIN9: /* utf-8 to latin9 conversion */ |
| 7 | 5951 retval = alloc(len + 1); |
| 5952 if (retval == NULL) | |
| 5953 break; | |
| 5954 d = retval; | |
| 5955 for (i = 0; i < len; ++i) | |
| 5956 { | |
| 2015 | 5957 l = utf_ptr2len_len(ptr + i, len - i); |
| 7 | 5958 if (l == 0) |
| 5959 *d++ = NUL; | |
| 5960 else if (l == 1) | |
| 5961 { | |
| 2015 | 5962 int l_w = utf8len_tab_zero[ptr[i]]; |
| 5963 | |
| 5964 if (l_w == 0) | |
| 5965 { | |
| 5966 /* Illegal utf-8 byte cannot be converted */ | |
| 5967 vim_free(retval); | |
| 5968 return NULL; | |
| 5969 } | |
| 5970 if (unconvlenp != NULL && l_w > len - i) | |
| 7 | 5971 { |
| 5972 /* Incomplete sequence at the end. */ | |
| 5973 *unconvlenp = len - i; | |
| 5974 break; | |
| 5975 } | |
| 5976 *d++ = ptr[i]; | |
| 5977 } | |
| 5978 else | |
| 5979 { | |
| 5980 c = utf_ptr2char(ptr + i); | |
| 26 | 5981 if (vcp->vc_type == CONV_TO_LATIN9) |
| 5982 switch (c) | |
| 5983 { | |
| 5984 case 0x20ac: c = 0xa4; break; /* euro */ | |
| 5985 case 0x0160: c = 0xa6; break; /* S hat */ | |
| 5986 case 0x0161: c = 0xa8; break; /* S -hat */ | |
| 5987 case 0x017d: c = 0xb4; break; /* Z hat */ | |
| 5988 case 0x017e: c = 0xb8; break; /* Z -hat */ | |
| 5989 case 0x0152: c = 0xbc; break; /* OE */ | |
| 5990 case 0x0153: c = 0xbd; break; /* oe */ | |
| 5991 case 0x0178: c = 0xbe; break; /* Y */ | |
| 5992 case 0xa4: | |
| 5993 case 0xa6: | |
| 5994 case 0xa8: | |
| 5995 case 0xb4: | |
| 5996 case 0xb8: | |
| 5997 case 0xbc: | |
| 5998 case 0xbd: | |
| 5999 case 0xbe: c = 0x100; break; /* not in latin9 */ | |
| 6000 } | |
| 7 | 6001 if (!utf_iscomposing(c)) /* skip composing chars */ |
| 6002 { | |
| 6003 if (c < 0x100) | |
| 6004 *d++ = c; | |
| 6005 else if (vcp->vc_fail) | |
| 6006 { | |
| 6007 vim_free(retval); | |
| 6008 return NULL; | |
| 6009 } | |
| 6010 else | |
| 6011 { | |
| 6012 *d++ = 0xbf; | |
| 6013 if (utf_char2cells(c) > 1) | |
| 6014 *d++ = '?'; | |
| 6015 } | |
| 6016 } | |
| 6017 i += l - 1; | |
| 6018 } | |
| 6019 } | |
| 6020 *d = NUL; | |
| 6021 if (lenp != NULL) | |
| 6022 *lenp = (int)(d - retval); | |
| 6023 break; | |
| 6024 | |
| 765 | 6025 # ifdef MACOS_CONVERT |
| 7 | 6026 case CONV_MAC_LATIN1: |
| 6027 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6028 'm', 'l', unconvlenp); |
| 7 | 6029 break; |
| 6030 | |
| 6031 case CONV_LATIN1_MAC: | |
| 6032 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6033 'l', 'm', unconvlenp); |
| 7 | 6034 break; |
| 6035 | |
| 6036 case CONV_MAC_UTF8: | |
| 6037 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6038 'm', 'u', unconvlenp); |
| 7 | 6039 break; |
| 6040 | |
| 6041 case CONV_UTF8_MAC: | |
| 6042 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6043 'u', 'm', unconvlenp); |
| 7 | 6044 break; |
| 6045 # endif | |
| 6046 | |
| 6047 # ifdef USE_ICONV | |
| 6048 case CONV_ICONV: /* conversion with output_conv.vc_fd */ | |
| 1904 | 6049 retval = iconv_string(vcp, ptr, len, unconvlenp, lenp); |
| 7 | 6050 break; |
| 6051 # endif | |
| 6052 # ifdef WIN3264 | |
| 6053 case CONV_CODEPAGE: /* codepage -> codepage */ | |
| 6054 { | |
| 6055 int retlen; | |
| 6056 int tmp_len; | |
| 6057 short_u *tmp; | |
| 6058 | |
| 6059 /* 1. codepage/UTF-8 -> ucs-2. */ | |
| 6060 if (vcp->vc_cpfrom == 0) | |
| 1752 | 6061 tmp_len = utf8_to_utf16(ptr, len, NULL, NULL); |
| 7 | 6062 else |
| 6063 tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, 0, | |
| 6064 ptr, len, 0, 0); | |
| 6065 tmp = (short_u *)alloc(sizeof(short_u) * tmp_len); | |
| 6066 if (tmp == NULL) | |
| 6067 break; | |
| 6068 if (vcp->vc_cpfrom == 0) | |
| 1752 | 6069 utf8_to_utf16(ptr, len, tmp, unconvlenp); |
| 7 | 6070 else |
| 6071 MultiByteToWideChar(vcp->vc_cpfrom, 0, ptr, len, tmp, tmp_len); | |
| 6072 | |
| 6073 /* 2. ucs-2 -> codepage/UTF-8. */ | |
| 6074 if (vcp->vc_cpto == 0) | |
| 1752 | 6075 retlen = utf16_to_utf8(tmp, tmp_len, NULL); |
| 7 | 6076 else |
| 6077 retlen = WideCharToMultiByte(vcp->vc_cpto, 0, | |
| 6078 tmp, tmp_len, 0, 0, 0, 0); | |
| 6079 retval = alloc(retlen + 1); | |
| 6080 if (retval != NULL) | |
| 6081 { | |
| 6082 if (vcp->vc_cpto == 0) | |
| 1752 | 6083 utf16_to_utf8(tmp, tmp_len, retval); |
| 7 | 6084 else |
| 6085 WideCharToMultiByte(vcp->vc_cpto, 0, | |
| 6086 tmp, tmp_len, retval, retlen, 0, 0); | |
| 6087 retval[retlen] = NUL; | |
| 6088 if (lenp != NULL) | |
| 6089 *lenp = retlen; | |
| 6090 } | |
| 6091 vim_free(tmp); | |
| 6092 break; | |
| 6093 } | |
| 6094 # endif | |
| 6095 } | |
| 6096 | |
| 6097 return retval; | |
| 6098 } | |
| 6099 #endif |