Mercurial > vim
annotate src/mbyte.c @ 12889:0ebade0c0ab2 v8.0.1321
patch 8.0.1321: can't build huge version with Athena
commit https://github.com/vim/vim/commit/40e280d949fa26e33f69c4bf80ccc0b70f2e13f6
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 19 20:34:59 2017 +0100
patch 8.0.1321: can't build huge version with Athena
Problem: Can't build huge version with Athena. (Mark Kelly)
Solution: Move including beval.h to before structs.h. Include beval.pro like
other proto files.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 19 Nov 2017 20:45:05 +0100 |
| parents | 351cf7c67bbe |
| children | 327e1264b9bf |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9495
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * Multibyte extensions partly by Sung-Hoon Baek | |
| 5 * | |
| 6 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 7 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 8 * See README.txt for an overview of the Vim source code. | |
| 9 */ | |
| 10 /* | |
| 11 * mbyte.c: Code specifically for handling multi-byte characters. | |
| 12 * | |
| 13 * The encoding used in the core is set with 'encoding'. When 'encoding' is | |
| 14 * changed, the following four variables are set (for speed). | |
| 15 * Currently these types of character encodings are supported: | |
| 16 * | |
| 17 * "enc_dbcs" When non-zero it tells the type of double byte character | |
| 18 * encoding (Chinese, Korean, Japanese, etc.). | |
| 19 * The cell width on the display is equal to the number of | |
| 20 * bytes. (exception: DBCS_JPNU with first byte 0x8e) | |
| 21 * Recognizing the first or second byte is difficult, it | |
| 22 * requires checking a byte sequence from the start. | |
| 23 * "enc_utf8" When TRUE use Unicode characters in UTF-8 encoding. | |
| 24 * The cell width on the display needs to be determined from | |
| 25 * the character value. | |
| 26 * Recognizing bytes is easy: 0xxx.xxxx is a single-byte | |
| 27 * char, 10xx.xxxx is a trailing byte, 11xx.xxxx is a leading | |
| 28 * byte of a multi-byte character. | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
29 * To make things complicated, up to six composing characters |
| 7 | 30 * are allowed. These are drawn on top of the first char. |
| 31 * For most editing the sequence of bytes with composing | |
| 32 * characters included is considered to be one character. | |
| 33 * "enc_unicode" When 2 use 16-bit Unicode characters (or UTF-16). | |
| 34 * When 4 use 32-but Unicode characters. | |
| 35 * Internally characters are stored in UTF-8 encoding to | |
| 36 * avoid NUL bytes. Conversion happens when doing I/O. | |
| 37 * "enc_utf8" will also be TRUE. | |
| 38 * | |
| 39 * "has_mbyte" is set when "enc_dbcs" or "enc_utf8" is non-zero. | |
| 40 * | |
| 41 * If none of these is TRUE, 8-bit bytes are used for a character. The | |
| 42 * encoding isn't currently specified (TODO). | |
| 43 * | |
| 44 * 'encoding' specifies the encoding used in the core. This is in registers, | |
| 45 * text manipulation, buffers, etc. Conversion has to be done when characters | |
| 46 * in another encoding are received or send: | |
| 47 * | |
| 48 * clipboard | |
| 49 * ^ | |
| 50 * | (2) | |
| 51 * V | |
| 52 * +---------------+ | |
| 53 * (1) | | (3) | |
| 54 * keyboard ----->| core |-----> display | |
| 55 * | | | |
| 56 * +---------------+ | |
| 57 * ^ | |
| 58 * | (4) | |
| 59 * V | |
| 60 * file | |
| 61 * | |
| 62 * (1) Typed characters arrive in the current locale. Conversion is to be | |
| 63 * done when 'encoding' is different from 'termencoding'. | |
| 64 * (2) Text will be made available with the encoding specified with | |
| 65 * 'encoding'. If this is not sufficient, system-specific conversion | |
| 66 * might be required. | |
| 67 * (3) For the GUI the correct font must be selected, no conversion done. | |
| 68 * Otherwise, conversion is to be done when 'encoding' differs from | |
| 69 * 'termencoding'. (Different in the GTK+ 2 port -- 'termencoding' | |
| 70 * is always used for both input and output and must always be set to | |
| 71 * "utf-8". gui_mch_init() does this automatically.) | |
| 72 * (4) The encoding of the file is specified with 'fileencoding'. Conversion | |
| 73 * is to be done when it's different from 'encoding'. | |
| 74 * | |
| 75 * The viminfo file is a special case: Only text is converted, not file names. | |
| 76 * Vim scripts may contain an ":encoding" command. This has an effect for | |
| 77 * some commands, like ":menutrans" | |
| 78 */ | |
| 79 | |
| 80 #include "vim.h" | |
| 81 | |
| 82 #ifdef WIN32UNIX | |
| 83 # ifndef WIN32_LEAN_AND_MEAN | |
| 84 # define WIN32_LEAN_AND_MEAN | |
| 85 # endif | |
| 5602 | 86 # if defined(FEAT_GUI) || defined(FEAT_XCLIPBOARD) |
| 87 # include <X11/Xwindows.h> | |
| 88 # define WINBYTE wBYTE | |
| 89 # else | |
| 90 # include <windows.h> | |
| 91 # define WINBYTE BYTE | |
| 92 # endif | |
| 7 | 93 # ifdef WIN32 |
| 94 # undef WIN32 /* Some windows.h define WIN32, we don't want that here. */ | |
| 95 # endif | |
| 5602 | 96 #else |
| 97 # define WINBYTE BYTE | |
| 7 | 98 #endif |
| 99 | |
| 100 #if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__) | |
| 101 # include <winnls.h> | |
| 102 #endif | |
| 103 | |
| 104 #ifdef FEAT_GUI_X11 | |
| 105 # include <X11/Intrinsic.h> | |
| 106 #endif | |
| 107 #ifdef X_LOCALE | |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
108 # include <X11/Xlocale.h> |
|
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
109 # if !defined(HAVE_MBLEN) && !defined(mblen) |
|
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
110 # define mblen _Xmblen |
|
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
111 # endif |
| 7 | 112 #endif |
| 113 | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
114 #if defined(FEAT_GUI_GTK) && defined(FEAT_XIM) |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
115 # if GTK_CHECK_VERSION(3,0,0) |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
116 # include <gdk/gdkkeysyms-compat.h> |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
117 # else |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
118 # include <gdk/gdkkeysyms.h> |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
119 # endif |
| 7 | 120 # ifdef WIN3264 |
| 121 # include <gdk/gdkwin32.h> | |
| 122 # else | |
| 123 # include <gdk/gdkx.h> | |
| 124 # endif | |
| 125 #endif | |
| 126 | |
| 127 #ifdef HAVE_WCHAR_H | |
| 128 # include <wchar.h> | |
| 129 #endif | |
| 130 | |
| 131 #if 0 | |
| 132 /* This has been disabled, because several people reported problems with the | |
| 133 * wcwidth() and iswprint() library functions, esp. for Hebrew. */ | |
| 134 # ifdef __STDC_ISO_10646__ | |
| 135 # define USE_WCHAR_FUNCTIONS | |
| 136 # endif | |
| 137 #endif | |
| 138 | |
| 139 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 140 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
141 static int enc_canon_search(char_u *name); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
142 static int dbcs_char2len(int c); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
143 static int dbcs_char2bytes(int c, char_u *buf); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
144 static int dbcs_ptr2len(char_u *p); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
145 static int dbcs_ptr2len_len(char_u *p, int size); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
146 static int utf_ptr2cells_len(char_u *p, int size); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
147 static int dbcs_char2cells(int c); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
148 static int dbcs_ptr2cells_len(char_u *p, int size); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
149 static int dbcs_ptr2char(char_u *p); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
150 static int utf_safe_read_char_adv(char_u **s, size_t *n); |
| 7 | 151 |
| 2015 | 152 /* |
| 153 * Lookup table to quickly get the length in bytes of a UTF-8 character from | |
| 154 * the first byte of a UTF-8 string. | |
| 155 * Bytes which are illegal when used as the first byte have a 1. | |
| 156 * The NUL byte has length 1. | |
| 157 */ | |
| 7 | 158 static char utf8len_tab[256] = |
| 159 { | |
| 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 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 | 164 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, |
| 165 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 | 166 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, |
| 167 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, | |
| 168 }; | |
| 169 | |
| 170 /* | |
| 2015 | 171 * Like utf8len_tab above, but using a zero for illegal lead bytes. |
| 172 */ | |
| 173 static char utf8len_tab_zero[256] = | |
| 174 { | |
| 175 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
| 176 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, | |
| 177 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, | |
| 178 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, | |
| 179 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, | |
| 180 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, | |
| 181 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, | |
| 182 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, | |
| 183 }; | |
| 184 | |
| 185 /* | |
| 7 | 186 * XIM often causes trouble. Define XIM_DEBUG to get a log of XIM callbacks |
| 187 * in the "xim.log" file. | |
| 188 */ | |
| 189 /* #define XIM_DEBUG */ | |
| 190 #ifdef XIM_DEBUG | |
| 191 static void | |
| 192 xim_log(char *s, ...) | |
| 193 { | |
| 194 va_list arglist; | |
| 195 static FILE *fd = NULL; | |
| 196 | |
| 197 if (fd == (FILE *)-1) | |
| 198 return; | |
| 199 if (fd == NULL) | |
| 200 { | |
| 531 | 201 fd = mch_fopen("xim.log", "w"); |
| 7 | 202 if (fd == NULL) |
| 203 { | |
| 204 EMSG("Cannot open xim.log"); | |
| 205 fd = (FILE *)-1; | |
| 206 return; | |
| 207 } | |
| 208 } | |
| 209 | |
| 210 va_start(arglist, s); | |
| 211 vfprintf(fd, s, arglist); | |
| 212 va_end(arglist); | |
| 213 } | |
| 214 #endif | |
| 215 | |
| 216 #endif | |
| 217 | |
| 218 #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) || defined(PROTO) | |
| 219 /* | |
| 220 * Canonical encoding names and their properties. | |
| 221 * "iso-8859-n" is handled by enc_canonize() directly. | |
| 222 */ | |
| 223 static struct | |
| 224 { char *name; int prop; int codepage;} | |
| 225 enc_canon_table[] = | |
| 226 { | |
| 227 #define IDX_LATIN_1 0 | |
| 228 {"latin1", ENC_8BIT + ENC_LATIN1, 1252}, | |
| 229 #define IDX_ISO_2 1 | |
| 230 {"iso-8859-2", ENC_8BIT, 0}, | |
| 231 #define IDX_ISO_3 2 | |
| 232 {"iso-8859-3", ENC_8BIT, 0}, | |
| 233 #define IDX_ISO_4 3 | |
| 234 {"iso-8859-4", ENC_8BIT, 0}, | |
| 235 #define IDX_ISO_5 4 | |
| 236 {"iso-8859-5", ENC_8BIT, 0}, | |
| 237 #define IDX_ISO_6 5 | |
| 238 {"iso-8859-6", ENC_8BIT, 0}, | |
| 239 #define IDX_ISO_7 6 | |
| 240 {"iso-8859-7", ENC_8BIT, 0}, | |
| 407 | 241 #define IDX_ISO_8 7 |
| 7 | 242 {"iso-8859-8", ENC_8BIT, 0}, |
| 407 | 243 #define IDX_ISO_9 8 |
| 7 | 244 {"iso-8859-9", ENC_8BIT, 0}, |
| 407 | 245 #define IDX_ISO_10 9 |
| 7 | 246 {"iso-8859-10", ENC_8BIT, 0}, |
| 407 | 247 #define IDX_ISO_11 10 |
| 7 | 248 {"iso-8859-11", ENC_8BIT, 0}, |
| 407 | 249 #define IDX_ISO_13 11 |
| 7 | 250 {"iso-8859-13", ENC_8BIT, 0}, |
| 407 | 251 #define IDX_ISO_14 12 |
| 7 | 252 {"iso-8859-14", ENC_8BIT, 0}, |
| 407 | 253 #define IDX_ISO_15 13 |
| 26 | 254 {"iso-8859-15", ENC_8BIT + ENC_LATIN9, 0}, |
| 407 | 255 #define IDX_KOI8_R 14 |
| 7 | 256 {"koi8-r", ENC_8BIT, 0}, |
| 407 | 257 #define IDX_KOI8_U 15 |
| 7 | 258 {"koi8-u", ENC_8BIT, 0}, |
| 407 | 259 #define IDX_UTF8 16 |
| 7 | 260 {"utf-8", ENC_UNICODE, 0}, |
| 407 | 261 #define IDX_UCS2 17 |
| 7 | 262 {"ucs-2", ENC_UNICODE + ENC_ENDIAN_B + ENC_2BYTE, 0}, |
| 407 | 263 #define IDX_UCS2LE 18 |
| 7 | 264 {"ucs-2le", ENC_UNICODE + ENC_ENDIAN_L + ENC_2BYTE, 0}, |
| 407 | 265 #define IDX_UTF16 19 |
| 7 | 266 {"utf-16", ENC_UNICODE + ENC_ENDIAN_B + ENC_2WORD, 0}, |
| 407 | 267 #define IDX_UTF16LE 20 |
| 7 | 268 {"utf-16le", ENC_UNICODE + ENC_ENDIAN_L + ENC_2WORD, 0}, |
| 407 | 269 #define IDX_UCS4 21 |
| 7 | 270 {"ucs-4", ENC_UNICODE + ENC_ENDIAN_B + ENC_4BYTE, 0}, |
| 407 | 271 #define IDX_UCS4LE 22 |
| 7 | 272 {"ucs-4le", ENC_UNICODE + ENC_ENDIAN_L + ENC_4BYTE, 0}, |
| 407 | 273 |
| 274 /* For debugging DBCS encoding on Unix. */ | |
| 275 #define IDX_DEBUG 23 | |
| 7 | 276 {"debug", ENC_DBCS, DBCS_DEBUG}, |
| 407 | 277 #define IDX_EUC_JP 24 |
| 7 | 278 {"euc-jp", ENC_DBCS, DBCS_JPNU}, |
| 407 | 279 #define IDX_SJIS 25 |
| 7 | 280 {"sjis", ENC_DBCS, DBCS_JPN}, |
| 407 | 281 #define IDX_EUC_KR 26 |
| 7 | 282 {"euc-kr", ENC_DBCS, DBCS_KORU}, |
| 407 | 283 #define IDX_EUC_CN 27 |
| 7 | 284 {"euc-cn", ENC_DBCS, DBCS_CHSU}, |
| 407 | 285 #define IDX_EUC_TW 28 |
| 7 | 286 {"euc-tw", ENC_DBCS, DBCS_CHTU}, |
| 407 | 287 #define IDX_BIG5 29 |
| 7 | 288 {"big5", ENC_DBCS, DBCS_CHT}, |
| 407 | 289 |
| 290 /* MS-DOS and MS-Windows codepages are included here, so that they can be | |
| 291 * used on Unix too. Most of them are similar to ISO-8859 encodings, but | |
| 292 * not exactly the same. */ | |
| 293 #define IDX_CP437 30 | |
| 294 {"cp437", ENC_8BIT, 437}, /* like iso-8859-1 */ | |
| 295 #define IDX_CP737 31 | |
| 296 {"cp737", ENC_8BIT, 737}, /* like iso-8859-7 */ | |
| 297 #define IDX_CP775 32 | |
| 298 {"cp775", ENC_8BIT, 775}, /* Baltic */ | |
| 299 #define IDX_CP850 33 | |
| 300 {"cp850", ENC_8BIT, 850}, /* like iso-8859-4 */ | |
| 301 #define IDX_CP852 34 | |
| 302 {"cp852", ENC_8BIT, 852}, /* like iso-8859-1 */ | |
| 303 #define IDX_CP855 35 | |
| 304 {"cp855", ENC_8BIT, 855}, /* like iso-8859-2 */ | |
| 305 #define IDX_CP857 36 | |
| 306 {"cp857", ENC_8BIT, 857}, /* like iso-8859-5 */ | |
| 307 #define IDX_CP860 37 | |
| 308 {"cp860", ENC_8BIT, 860}, /* like iso-8859-9 */ | |
| 309 #define IDX_CP861 38 | |
| 310 {"cp861", ENC_8BIT, 861}, /* like iso-8859-1 */ | |
| 311 #define IDX_CP862 39 | |
| 312 {"cp862", ENC_8BIT, 862}, /* like iso-8859-1 */ | |
| 313 #define IDX_CP863 40 | |
| 314 {"cp863", ENC_8BIT, 863}, /* like iso-8859-8 */ | |
| 315 #define IDX_CP865 41 | |
| 316 {"cp865", ENC_8BIT, 865}, /* like iso-8859-1 */ | |
| 317 #define IDX_CP866 42 | |
| 318 {"cp866", ENC_8BIT, 866}, /* like iso-8859-5 */ | |
| 319 #define IDX_CP869 43 | |
| 320 {"cp869", ENC_8BIT, 869}, /* like iso-8859-7 */ | |
| 321 #define IDX_CP874 44 | |
| 322 {"cp874", ENC_8BIT, 874}, /* Thai */ | |
| 323 #define IDX_CP932 45 | |
| 324 {"cp932", ENC_DBCS, DBCS_JPN}, | |
| 325 #define IDX_CP936 46 | |
| 326 {"cp936", ENC_DBCS, DBCS_CHS}, | |
| 327 #define IDX_CP949 47 | |
| 328 {"cp949", ENC_DBCS, DBCS_KOR}, | |
| 329 #define IDX_CP950 48 | |
| 330 {"cp950", ENC_DBCS, DBCS_CHT}, | |
| 331 #define IDX_CP1250 49 | |
| 332 {"cp1250", ENC_8BIT, 1250}, /* Czech, Polish, etc. */ | |
| 333 #define IDX_CP1251 50 | |
| 334 {"cp1251", ENC_8BIT, 1251}, /* Cyrillic */ | |
| 335 /* cp1252 is considered to be equal to latin1 */ | |
| 336 #define IDX_CP1253 51 | |
| 337 {"cp1253", ENC_8BIT, 1253}, /* Greek */ | |
| 338 #define IDX_CP1254 52 | |
| 339 {"cp1254", ENC_8BIT, 1254}, /* Turkish */ | |
| 340 #define IDX_CP1255 53 | |
| 341 {"cp1255", ENC_8BIT, 1255}, /* Hebrew */ | |
| 342 #define IDX_CP1256 54 | |
| 343 {"cp1256", ENC_8BIT, 1256}, /* Arabic */ | |
| 344 #define IDX_CP1257 55 | |
| 345 {"cp1257", ENC_8BIT, 1257}, /* Baltic */ | |
| 346 #define IDX_CP1258 56 | |
| 347 {"cp1258", ENC_8BIT, 1258}, /* Vietnamese */ | |
| 348 | |
| 349 #define IDX_MACROMAN 57 | |
| 350 {"macroman", ENC_8BIT + ENC_MACROMAN, 0}, /* Mac OS */ | |
| 890 | 351 #define IDX_DECMCS 58 |
| 352 {"dec-mcs", ENC_8BIT, 0}, /* DEC MCS */ | |
| 353 #define IDX_HPROMAN8 59 | |
| 354 {"hp-roman8", ENC_8BIT, 0}, /* HP Roman8 */ | |
| 355 #define IDX_COUNT 60 | |
| 7 | 356 }; |
| 357 | |
| 358 /* | |
| 359 * Aliases for encoding names. | |
| 360 */ | |
| 361 static struct | |
| 362 { char *name; int canon;} | |
| 363 enc_alias_table[] = | |
| 364 { | |
| 365 {"ansi", IDX_LATIN_1}, | |
| 366 {"iso-8859-1", IDX_LATIN_1}, | |
| 367 {"latin2", IDX_ISO_2}, | |
| 368 {"latin3", IDX_ISO_3}, | |
| 369 {"latin4", IDX_ISO_4}, | |
| 370 {"cyrillic", IDX_ISO_5}, | |
| 371 {"arabic", IDX_ISO_6}, | |
| 372 {"greek", IDX_ISO_7}, | |
| 373 #ifdef WIN3264 | |
| 374 {"hebrew", IDX_CP1255}, | |
| 375 #else | |
| 376 {"hebrew", IDX_ISO_8}, | |
| 377 #endif | |
| 378 {"latin5", IDX_ISO_9}, | |
| 379 {"turkish", IDX_ISO_9}, /* ? */ | |
| 380 {"latin6", IDX_ISO_10}, | |
| 381 {"nordic", IDX_ISO_10}, /* ? */ | |
| 382 {"thai", IDX_ISO_11}, /* ? */ | |
| 383 {"latin7", IDX_ISO_13}, | |
| 384 {"latin8", IDX_ISO_14}, | |
| 385 {"latin9", IDX_ISO_15}, | |
| 386 {"utf8", IDX_UTF8}, | |
| 387 {"unicode", IDX_UCS2}, | |
| 388 {"ucs2", IDX_UCS2}, | |
| 389 {"ucs2be", IDX_UCS2}, | |
| 390 {"ucs-2be", IDX_UCS2}, | |
| 391 {"ucs2le", IDX_UCS2LE}, | |
| 392 {"utf16", IDX_UTF16}, | |
| 393 {"utf16be", IDX_UTF16}, | |
| 394 {"utf-16be", IDX_UTF16}, | |
| 395 {"utf16le", IDX_UTF16LE}, | |
| 396 {"ucs4", IDX_UCS4}, | |
| 397 {"ucs4be", IDX_UCS4}, | |
| 398 {"ucs-4be", IDX_UCS4}, | |
| 399 {"ucs4le", IDX_UCS4LE}, | |
| 1540 | 400 {"utf32", IDX_UCS4}, |
| 401 {"utf-32", IDX_UCS4}, | |
| 402 {"utf32be", IDX_UCS4}, | |
| 403 {"utf-32be", IDX_UCS4}, | |
| 404 {"utf32le", IDX_UCS4LE}, | |
| 405 {"utf-32le", IDX_UCS4LE}, | |
| 7 | 406 {"932", IDX_CP932}, |
| 407 {"949", IDX_CP949}, | |
| 408 {"936", IDX_CP936}, | |
| 932 | 409 {"gbk", IDX_CP936}, |
| 7 | 410 {"950", IDX_CP950}, |
| 411 {"eucjp", IDX_EUC_JP}, | |
| 412 {"unix-jis", IDX_EUC_JP}, | |
| 413 {"ujis", IDX_EUC_JP}, | |
| 414 {"shift-jis", IDX_SJIS}, | |
| 6377 | 415 {"pck", IDX_SJIS}, /* Sun: PCK */ |
| 7 | 416 {"euckr", IDX_EUC_KR}, |
| 417 {"5601", IDX_EUC_KR}, /* Sun: KS C 5601 */ | |
| 418 {"euccn", IDX_EUC_CN}, | |
| 419 {"gb2312", IDX_EUC_CN}, | |
| 420 {"euctw", IDX_EUC_TW}, | |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
421 #if defined(WIN3264) || defined(WIN32UNIX) || defined(MACOS_X) |
| 7 | 422 {"japan", IDX_CP932}, |
| 423 {"korea", IDX_CP949}, | |
| 424 {"prc", IDX_CP936}, | |
| 425 {"chinese", IDX_CP936}, | |
| 426 {"taiwan", IDX_CP950}, | |
| 427 {"big5", IDX_CP950}, | |
| 428 #else | |
| 429 {"japan", IDX_EUC_JP}, | |
| 430 {"korea", IDX_EUC_KR}, | |
| 431 {"prc", IDX_EUC_CN}, | |
| 432 {"chinese", IDX_EUC_CN}, | |
| 433 {"taiwan", IDX_EUC_TW}, | |
| 434 {"cp950", IDX_BIG5}, | |
| 435 {"950", IDX_BIG5}, | |
| 436 #endif | |
| 437 {"mac", IDX_MACROMAN}, | |
| 890 | 438 {"mac-roman", IDX_MACROMAN}, |
| 7 | 439 {NULL, 0} |
| 440 }; | |
| 441 | |
| 442 #ifndef CP_UTF8 | |
| 443 # define CP_UTF8 65001 /* magic number from winnls.h */ | |
| 444 #endif | |
| 445 | |
| 446 /* | |
| 447 * Find encoding "name" in the list of canonical encoding names. | |
| 448 * Returns -1 if not found. | |
| 449 */ | |
| 450 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
451 enc_canon_search(char_u *name) |
| 7 | 452 { |
| 453 int i; | |
| 454 | |
| 455 for (i = 0; i < IDX_COUNT; ++i) | |
| 456 if (STRCMP(name, enc_canon_table[i].name) == 0) | |
| 457 return i; | |
| 458 return -1; | |
| 459 } | |
| 460 | |
| 461 #endif | |
| 462 | |
| 463 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 464 | |
| 465 /* | |
| 466 * Find canonical encoding "name" in the list and return its properties. | |
| 467 * Returns 0 if not found. | |
| 468 */ | |
| 469 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
470 enc_canon_props(char_u *name) |
| 7 | 471 { |
| 472 int i; | |
| 473 | |
| 474 i = enc_canon_search(name); | |
| 475 if (i >= 0) | |
| 476 return enc_canon_table[i].prop; | |
| 477 #ifdef WIN3264 | |
| 478 if (name[0] == 'c' && name[1] == 'p' && VIM_ISDIGIT(name[2])) | |
| 479 { | |
| 480 CPINFO cpinfo; | |
| 481 | |
| 482 /* Get info on this codepage to find out what it is. */ | |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
483 if (GetCPInfo(atoi((char *)name + 2), &cpinfo) != 0) |
| 7 | 484 { |
| 485 if (cpinfo.MaxCharSize == 1) /* some single-byte encoding */ | |
| 486 return ENC_8BIT; | |
| 487 if (cpinfo.MaxCharSize == 2 | |
| 488 && (cpinfo.LeadByte[0] != 0 || cpinfo.LeadByte[1] != 0)) | |
| 489 /* must be a DBCS encoding */ | |
| 490 return ENC_DBCS; | |
| 491 } | |
| 492 return 0; | |
| 493 } | |
| 494 #endif | |
| 495 if (STRNCMP(name, "2byte-", 6) == 0) | |
| 496 return ENC_DBCS; | |
| 497 if (STRNCMP(name, "8bit-", 5) == 0 || STRNCMP(name, "iso-8859-", 9) == 0) | |
| 498 return ENC_8BIT; | |
| 499 return 0; | |
| 500 } | |
| 501 | |
| 502 /* | |
| 503 * Set up for using multi-byte characters. | |
| 504 * Called in three cases: | |
| 505 * - by main() to initialize (p_enc == NULL) | |
| 506 * - by set_init_1() after 'encoding' was set to its default. | |
| 507 * - by do_set() when 'encoding' has been set. | |
| 508 * p_enc must have been passed through enc_canonize() already. | |
| 509 * Sets the "enc_unicode", "enc_utf8", "enc_dbcs" and "has_mbyte" flags. | |
| 510 * Fills mb_bytelen_tab[] and returns NULL when there are no problems. | |
| 511 * When there is something wrong: Returns an error message and doesn't change | |
| 512 * anything. | |
| 513 */ | |
| 514 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
515 mb_init(void) |
| 7 | 516 { |
| 517 int i; | |
| 518 int idx; | |
| 519 int n; | |
| 520 int enc_dbcs_new = 0; | |
| 521 #if defined(USE_ICONV) && !defined(WIN3264) && !defined(WIN32UNIX) \ | |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
522 && !defined(MACOS_CONVERT) |
| 7 | 523 # define LEN_FROM_CONV |
| 524 vimconv_T vimconv; | |
| 525 char_u *p; | |
| 526 #endif | |
| 527 | |
| 528 if (p_enc == NULL) | |
| 529 { | |
| 530 /* Just starting up: set the whole table to one's. */ | |
| 531 for (i = 0; i < 256; ++i) | |
| 532 mb_bytelen_tab[i] = 1; | |
| 533 input_conv.vc_type = CONV_NONE; | |
| 534 input_conv.vc_factor = 1; | |
| 535 output_conv.vc_type = CONV_NONE; | |
| 536 return NULL; | |
| 537 } | |
| 538 | |
| 539 #ifdef WIN3264 | |
| 540 if (p_enc[0] == 'c' && p_enc[1] == 'p' && VIM_ISDIGIT(p_enc[2])) | |
| 541 { | |
| 542 CPINFO cpinfo; | |
| 543 | |
| 544 /* Get info on this codepage to find out what it is. */ | |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
545 if (GetCPInfo(atoi((char *)p_enc + 2), &cpinfo) != 0) |
| 7 | 546 { |
| 547 if (cpinfo.MaxCharSize == 1) | |
| 548 { | |
| 549 /* some single-byte encoding */ | |
| 550 enc_unicode = 0; | |
| 551 enc_utf8 = FALSE; | |
| 552 } | |
| 553 else if (cpinfo.MaxCharSize == 2 | |
| 554 && (cpinfo.LeadByte[0] != 0 || cpinfo.LeadByte[1] != 0)) | |
| 555 { | |
| 556 /* must be a DBCS encoding, check below */ | |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
557 enc_dbcs_new = atoi((char *)p_enc + 2); |
| 7 | 558 } |
| 559 else | |
| 560 goto codepage_invalid; | |
| 561 } | |
| 562 else if (GetLastError() == ERROR_INVALID_PARAMETER) | |
| 563 { | |
| 564 codepage_invalid: | |
| 565 return (char_u *)N_("E543: Not a valid codepage"); | |
| 566 } | |
| 567 } | |
| 568 #endif | |
| 569 else if (STRNCMP(p_enc, "8bit-", 5) == 0 | |
| 570 || STRNCMP(p_enc, "iso-8859-", 9) == 0) | |
| 571 { | |
| 572 /* Accept any "8bit-" or "iso-8859-" name. */ | |
| 573 enc_unicode = 0; | |
| 574 enc_utf8 = FALSE; | |
| 575 } | |
| 576 else if (STRNCMP(p_enc, "2byte-", 6) == 0) | |
| 577 { | |
| 578 #ifdef WIN3264 | |
| 579 /* Windows: accept only valid codepage numbers, check below. */ | |
| 580 if (p_enc[6] != 'c' || p_enc[7] != 'p' | |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
581 || (enc_dbcs_new = atoi((char *)p_enc + 8)) == 0) |
| 7 | 582 return e_invarg; |
| 583 #else | |
| 584 /* Unix: accept any "2byte-" name, assume current locale. */ | |
| 585 enc_dbcs_new = DBCS_2BYTE; | |
| 586 #endif | |
| 587 } | |
| 588 else if ((idx = enc_canon_search(p_enc)) >= 0) | |
| 589 { | |
| 590 i = enc_canon_table[idx].prop; | |
| 591 if (i & ENC_UNICODE) | |
| 592 { | |
| 593 /* Unicode */ | |
| 594 enc_utf8 = TRUE; | |
| 595 if (i & (ENC_2BYTE | ENC_2WORD)) | |
| 596 enc_unicode = 2; | |
| 597 else if (i & ENC_4BYTE) | |
| 598 enc_unicode = 4; | |
| 599 else | |
| 600 enc_unicode = 0; | |
| 601 } | |
| 602 else if (i & ENC_DBCS) | |
| 603 { | |
| 604 /* 2byte, handle below */ | |
| 605 enc_dbcs_new = enc_canon_table[idx].codepage; | |
| 606 } | |
| 607 else | |
| 608 { | |
| 609 /* Must be 8-bit. */ | |
| 610 enc_unicode = 0; | |
| 611 enc_utf8 = FALSE; | |
| 612 } | |
| 613 } | |
| 614 else /* Don't know what encoding this is, reject it. */ | |
| 615 return e_invarg; | |
| 616 | |
| 617 if (enc_dbcs_new != 0) | |
| 618 { | |
| 619 #ifdef WIN3264 | |
| 620 /* Check if the DBCS code page is OK. */ | |
| 621 if (!IsValidCodePage(enc_dbcs_new)) | |
| 622 goto codepage_invalid; | |
| 623 #endif | |
| 624 enc_unicode = 0; | |
| 625 enc_utf8 = FALSE; | |
| 626 } | |
| 627 enc_dbcs = enc_dbcs_new; | |
| 628 has_mbyte = (enc_dbcs != 0 || enc_utf8); | |
| 629 | |
| 4168 | 630 #if defined(WIN3264) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD) |
| 7 | 631 enc_codepage = encname2codepage(p_enc); |
| 26 | 632 enc_latin9 = (STRCMP(p_enc, "iso-8859-15") == 0); |
| 7 | 633 #endif |
| 634 | |
| 492 | 635 /* Detect an encoding that uses latin1 characters. */ |
| 636 enc_latin1like = (enc_utf8 || STRCMP(p_enc, "latin1") == 0 | |
| 637 || STRCMP(p_enc, "iso-8859-15") == 0); | |
| 638 | |
| 7 | 639 /* |
| 640 * Set the function pointers. | |
| 641 */ | |
| 642 if (enc_utf8) | |
| 643 { | |
| 474 | 644 mb_ptr2len = utfc_ptr2len; |
| 1903 | 645 mb_ptr2len_len = utfc_ptr2len_len; |
| 7 | 646 mb_char2len = utf_char2len; |
| 647 mb_char2bytes = utf_char2bytes; | |
| 648 mb_ptr2cells = utf_ptr2cells; | |
| 1903 | 649 mb_ptr2cells_len = utf_ptr2cells_len; |
| 7 | 650 mb_char2cells = utf_char2cells; |
| 651 mb_off2cells = utf_off2cells; | |
| 652 mb_ptr2char = utf_ptr2char; | |
| 653 mb_head_off = utf_head_off; | |
| 654 } | |
| 655 else if (enc_dbcs != 0) | |
| 656 { | |
| 474 | 657 mb_ptr2len = dbcs_ptr2len; |
| 1903 | 658 mb_ptr2len_len = dbcs_ptr2len_len; |
| 7 | 659 mb_char2len = dbcs_char2len; |
| 660 mb_char2bytes = dbcs_char2bytes; | |
| 661 mb_ptr2cells = dbcs_ptr2cells; | |
| 1903 | 662 mb_ptr2cells_len = dbcs_ptr2cells_len; |
| 7 | 663 mb_char2cells = dbcs_char2cells; |
| 664 mb_off2cells = dbcs_off2cells; | |
| 665 mb_ptr2char = dbcs_ptr2char; | |
| 666 mb_head_off = dbcs_head_off; | |
| 667 } | |
| 668 else | |
| 669 { | |
| 474 | 670 mb_ptr2len = latin_ptr2len; |
| 1903 | 671 mb_ptr2len_len = latin_ptr2len_len; |
| 7 | 672 mb_char2len = latin_char2len; |
| 673 mb_char2bytes = latin_char2bytes; | |
| 674 mb_ptr2cells = latin_ptr2cells; | |
| 1903 | 675 mb_ptr2cells_len = latin_ptr2cells_len; |
| 7 | 676 mb_char2cells = latin_char2cells; |
| 677 mb_off2cells = latin_off2cells; | |
| 678 mb_ptr2char = latin_ptr2char; | |
| 679 mb_head_off = latin_head_off; | |
| 680 } | |
| 681 | |
| 682 /* | |
| 683 * Fill the mb_bytelen_tab[] for MB_BYTE2LEN(). | |
| 684 */ | |
| 685 #ifdef LEN_FROM_CONV | |
| 686 /* When 'encoding' is different from the current locale mblen() won't | |
| 687 * work. Use conversion to "utf-8" instead. */ | |
| 688 vimconv.vc_type = CONV_NONE; | |
| 689 if (enc_dbcs) | |
| 690 { | |
| 691 p = enc_locale(); | |
| 692 if (p == NULL || STRCMP(p, p_enc) != 0) | |
| 693 { | |
| 694 convert_setup(&vimconv, p_enc, (char_u *)"utf-8"); | |
| 695 vimconv.vc_fail = TRUE; | |
| 696 } | |
| 697 vim_free(p); | |
| 698 } | |
| 699 #endif | |
| 700 | |
| 701 for (i = 0; i < 256; ++i) | |
| 702 { | |
| 703 /* Our own function to reliably check the length of UTF-8 characters, | |
| 704 * independent of mblen(). */ | |
| 705 if (enc_utf8) | |
| 706 n = utf8len_tab[i]; | |
| 707 else if (enc_dbcs == 0) | |
| 708 n = 1; | |
| 709 else | |
| 710 { | |
| 711 #if defined(WIN3264) || defined(WIN32UNIX) | |
| 712 /* enc_dbcs is set by setting 'fileencoding'. It becomes a Windows | |
| 713 * CodePage identifier, which we can pass directly in to Windows | |
| 714 * API */ | |
| 5602 | 715 n = IsDBCSLeadByteEx(enc_dbcs, (WINBYTE)i) ? 2 : 1; |
| 7 | 716 #else |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
717 # if defined(__amigaos4__) || defined(__ANDROID__) || \ |
|
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
718 !(defined(HAVE_MBLEN) || defined(X_LOCALE)) |
| 7 | 719 /* |
| 720 * if mblen() is not available, character which MSB is turned on | |
| 721 * are treated as leading byte character. (note : This assumption | |
| 722 * is not always true.) | |
| 723 */ | |
| 724 n = (i & 0x80) ? 2 : 1; | |
| 725 # else | |
| 3549 | 726 char buf[MB_MAXBYTES + 1]; |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
727 |
| 7 | 728 if (i == NUL) /* just in case mblen() can't handle "" */ |
| 729 n = 1; | |
| 730 else | |
| 731 { | |
| 732 buf[0] = i; | |
| 733 buf[1] = 0; | |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
734 # ifdef LEN_FROM_CONV |
| 7 | 735 if (vimconv.vc_type != CONV_NONE) |
| 736 { | |
| 737 /* | |
| 738 * string_convert() should fail when converting the first | |
| 739 * byte of a double-byte character. | |
| 740 */ | |
| 741 p = string_convert(&vimconv, (char_u *)buf, NULL); | |
| 742 if (p != NULL) | |
| 743 { | |
| 744 vim_free(p); | |
| 745 n = 1; | |
| 746 } | |
| 747 else | |
| 748 n = 2; | |
| 749 } | |
| 750 else | |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
751 # endif |
| 7 | 752 { |
| 753 /* | |
| 754 * mblen() should return -1 for invalid (means the leading | |
| 755 * multibyte) character. However there are some platforms | |
| 756 * where mblen() returns 0 for invalid character. | |
| 757 * Therefore, following condition includes 0. | |
| 758 */ | |
| 1757 | 759 ignored = mblen(NULL, 0); /* First reset the state. */ |
| 7 | 760 if (mblen(buf, (size_t)1) <= 0) |
| 761 n = 2; | |
| 762 else | |
| 763 n = 1; | |
| 764 } | |
| 765 } | |
| 766 # endif | |
| 767 #endif | |
| 768 } | |
| 769 | |
| 770 mb_bytelen_tab[i] = n; | |
| 771 } | |
| 772 | |
| 773 #ifdef LEN_FROM_CONV | |
| 774 convert_setup(&vimconv, NULL, NULL); | |
| 775 #endif | |
| 776 | |
| 777 /* The cell width depends on the type of multi-byte characters. */ | |
| 778 (void)init_chartab(); | |
| 779 | |
| 780 /* When enc_utf8 is set or reset, (de)allocate ScreenLinesUC[] */ | |
| 781 screenalloc(FALSE); | |
| 782 | |
| 783 /* When using Unicode, set default for 'fileencodings'. */ | |
| 784 if (enc_utf8 && !option_was_set((char_u *)"fencs")) | |
| 785 set_string_option_direct((char_u *)"fencs", -1, | |
| 694 | 786 (char_u *)"ucs-bom,utf-8,default,latin1", OPT_FREE, 0); |
| 787 | |
| 7 | 788 #if defined(HAVE_BIND_TEXTDOMAIN_CODESET) && defined(FEAT_GETTEXT) |
| 789 /* GNU gettext 0.10.37 supports this feature: set the codeset used for | |
| 790 * translated messages independently from the current locale. */ | |
| 791 (void)bind_textdomain_codeset(VIMPACKAGE, | |
| 792 enc_utf8 ? "utf-8" : (char *)p_enc); | |
| 793 #endif | |
| 794 | |
| 23 | 795 #ifdef WIN32 |
| 796 /* When changing 'encoding' while starting up, then convert the command | |
| 797 * line arguments from the active codepage to 'encoding'. */ | |
| 798 if (starting != 0) | |
| 799 fix_arg_enc(); | |
| 800 #endif | |
| 801 | |
| 7 | 802 #ifdef FEAT_AUTOCMD |
| 803 /* Fire an autocommand to let people do custom font setup. This must be | |
| 804 * after Vim has been setup for the new encoding. */ | |
| 805 apply_autocmds(EVENT_ENCODINGCHANGED, NULL, (char_u *)"", FALSE, curbuf); | |
| 806 #endif | |
| 807 | |
| 740 | 808 #ifdef FEAT_SPELL |
| 236 | 809 /* Need to reload spell dictionaries */ |
| 810 spell_reload(); | |
| 811 #endif | |
| 812 | |
| 7 | 813 return NULL; |
| 814 } | |
| 815 | |
| 816 /* | |
| 817 * Return the size of the BOM for the current buffer: | |
| 818 * 0 - no BOM | |
| 819 * 2 - UCS-2 or UTF-16 BOM | |
| 820 * 4 - UCS-4 BOM | |
| 821 * 3 - UTF-8 BOM | |
| 822 */ | |
| 823 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
824 bomb_size(void) |
| 7 | 825 { |
| 826 int n = 0; | |
| 827 | |
| 828 if (curbuf->b_p_bomb && !curbuf->b_p_bin) | |
| 829 { | |
| 830 if (*curbuf->b_p_fenc == NUL) | |
| 831 { | |
| 832 if (enc_utf8) | |
| 833 { | |
| 834 if (enc_unicode != 0) | |
| 835 n = enc_unicode; | |
| 836 else | |
| 837 n = 3; | |
| 838 } | |
| 839 } | |
| 840 else if (STRCMP(curbuf->b_p_fenc, "utf-8") == 0) | |
| 841 n = 3; | |
| 842 else if (STRNCMP(curbuf->b_p_fenc, "ucs-2", 5) == 0 | |
| 843 || STRNCMP(curbuf->b_p_fenc, "utf-16", 6) == 0) | |
| 844 n = 2; | |
| 845 else if (STRNCMP(curbuf->b_p_fenc, "ucs-4", 5) == 0) | |
| 846 n = 4; | |
| 847 } | |
| 848 return n; | |
| 849 } | |
| 850 | |
| 851 /* | |
| 3002 | 852 * Remove all BOM from "s" by moving remaining text. |
| 853 */ | |
| 854 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
855 remove_bom(char_u *s) |
| 3002 | 856 { |
| 857 if (enc_utf8) | |
| 858 { | |
| 859 char_u *p = s; | |
| 860 | |
| 861 while ((p = vim_strbyte(p, 0xef)) != NULL) | |
| 862 { | |
| 863 if (p[1] == 0xbb && p[2] == 0xbf) | |
| 864 STRMOVE(p, p + 3); | |
| 865 else | |
| 866 ++p; | |
| 867 } | |
| 868 } | |
| 869 } | |
| 870 | |
| 871 /* | |
| 7 | 872 * Get class of pointer: |
| 873 * 0 for blank or NUL | |
| 874 * 1 for punctuation | |
| 875 * 2 for an (ASCII) word character | |
| 876 * >2 for other word characters | |
| 877 */ | |
| 878 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
879 mb_get_class(char_u *p) |
| 7 | 880 { |
| 4069 | 881 return mb_get_class_buf(p, curbuf); |
| 882 } | |
| 883 | |
| 884 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
885 mb_get_class_buf(char_u *p, buf_T *buf) |
| 4069 | 886 { |
| 7 | 887 if (MB_BYTE2LEN(p[0]) == 1) |
| 888 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
889 if (p[0] == NUL || VIM_ISWHITE(p[0])) |
| 7 | 890 return 0; |
| 4069 | 891 if (vim_iswordc_buf(p[0], buf)) |
| 7 | 892 return 2; |
| 893 return 1; | |
| 894 } | |
| 895 if (enc_dbcs != 0 && p[0] != NUL && p[1] != NUL) | |
| 896 return dbcs_class(p[0], p[1]); | |
| 897 if (enc_utf8) | |
|
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
898 return utf_class_buf(utf_ptr2char(p), buf); |
| 7 | 899 return 0; |
| 900 } | |
| 901 | |
| 902 /* | |
| 903 * Get class of a double-byte character. This always returns 3 or bigger. | |
| 904 * TODO: Should return 1 for punctuation. | |
| 905 */ | |
| 906 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
907 dbcs_class(unsigned lead, unsigned trail) |
| 7 | 908 { |
| 909 switch (enc_dbcs) | |
| 910 { | |
| 4352 | 911 /* please add classify routine for your language in here */ |
| 7 | 912 |
| 913 case DBCS_JPNU: /* ? */ | |
| 914 case DBCS_JPN: | |
| 915 { | |
| 916 /* JIS code classification */ | |
| 917 unsigned char lb = lead; | |
| 918 unsigned char tb = trail; | |
| 919 | |
| 920 /* convert process code to JIS */ | |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
921 # if defined(WIN3264) || defined(WIN32UNIX) || defined(MACOS_X) |
| 7 | 922 /* process code is SJIS */ |
| 923 if (lb <= 0x9f) | |
| 924 lb = (lb - 0x81) * 2 + 0x21; | |
| 925 else | |
| 926 lb = (lb - 0xc1) * 2 + 0x21; | |
| 927 if (tb <= 0x7e) | |
| 928 tb -= 0x1f; | |
| 929 else if (tb <= 0x9e) | |
| 930 tb -= 0x20; | |
| 931 else | |
| 932 { | |
| 933 tb -= 0x7e; | |
| 934 lb += 1; | |
| 935 } | |
| 936 # else | |
| 937 /* | |
| 938 * XXX: Code page identification can not use with all | |
| 939 * system! So, some other encoding information | |
| 940 * will be needed. | |
| 941 * In japanese: SJIS,EUC,UNICODE,(JIS) | |
| 942 * Note that JIS-code system don't use as | |
| 943 * process code in most system because it uses | |
| 944 * escape sequences(JIS is context depend encoding). | |
| 945 */ | |
| 946 /* assume process code is JAPANESE-EUC */ | |
| 947 lb &= 0x7f; | |
| 948 tb &= 0x7f; | |
| 949 # endif | |
| 950 /* exceptions */ | |
| 951 switch (lb << 8 | tb) | |
| 952 { | |
| 953 case 0x2121: /* ZENKAKU space */ | |
| 954 return 0; | |
| 5477 | 955 case 0x2122: /* TOU-TEN (Japanese comma) */ |
| 956 case 0x2123: /* KU-TEN (Japanese period) */ | |
| 7 | 957 case 0x2124: /* ZENKAKU comma */ |
| 958 case 0x2125: /* ZENKAKU period */ | |
| 959 return 1; | |
| 960 case 0x213c: /* prolongedsound handled as KATAKANA */ | |
| 961 return 13; | |
| 962 } | |
| 963 /* sieved by KU code */ | |
| 964 switch (lb) | |
| 965 { | |
| 966 case 0x21: | |
| 967 case 0x22: | |
| 968 /* special symbols */ | |
| 969 return 10; | |
| 970 case 0x23: | |
| 971 /* alpha-numeric */ | |
| 972 return 11; | |
| 973 case 0x24: | |
| 974 /* hiragana */ | |
| 975 return 12; | |
| 976 case 0x25: | |
| 977 /* katakana */ | |
| 978 return 13; | |
| 979 case 0x26: | |
| 980 /* greek */ | |
| 981 return 14; | |
| 982 case 0x27: | |
| 983 /* russian */ | |
| 984 return 15; | |
| 985 case 0x28: | |
| 986 /* lines */ | |
| 987 return 16; | |
| 988 default: | |
| 989 /* kanji */ | |
| 990 return 17; | |
| 991 } | |
| 992 } | |
| 993 | |
| 994 case DBCS_KORU: /* ? */ | |
| 995 case DBCS_KOR: | |
| 996 { | |
| 997 /* KS code classification */ | |
| 998 unsigned char c1 = lead; | |
| 999 unsigned char c2 = trail; | |
| 1000 | |
| 1001 /* | |
| 1002 * 20 : Hangul | |
| 1003 * 21 : Hanja | |
| 1004 * 22 : Symbols | |
| 1005 * 23 : Alpha-numeric/Roman Letter (Full width) | |
| 1006 * 24 : Hangul Letter(Alphabet) | |
| 1007 * 25 : Roman Numeral/Greek Letter | |
| 1008 * 26 : Box Drawings | |
| 1009 * 27 : Unit Symbols | |
| 1010 * 28 : Circled/Parenthesized Letter | |
| 4352 | 1011 * 29 : Hiragana/Katakana |
| 7 | 1012 * 30 : Cyrillic Letter |
| 1013 */ | |
| 1014 | |
| 1015 if (c1 >= 0xB0 && c1 <= 0xC8) | |
| 1016 /* Hangul */ | |
| 1017 return 20; | |
| 1018 #if defined(WIN3264) || defined(WIN32UNIX) | |
| 1019 else if (c1 <= 0xA0 || c2 <= 0xA0) | |
| 1020 /* Extended Hangul Region : MS UHC(Unified Hangul Code) */ | |
| 1021 /* c1: 0x81-0xA0 with c2: 0x41-0x5A, 0x61-0x7A, 0x81-0xFE | |
| 1022 * c1: 0xA1-0xC6 with c2: 0x41-0x5A, 0x61-0x7A, 0x81-0xA0 | |
| 1023 */ | |
| 1024 return 20; | |
| 1025 #endif | |
| 1026 | |
| 1027 else if (c1 >= 0xCA && c1 <= 0xFD) | |
| 1028 /* Hanja */ | |
| 1029 return 21; | |
| 1030 else switch (c1) | |
| 1031 { | |
| 1032 case 0xA1: | |
| 1033 case 0xA2: | |
| 1034 /* Symbols */ | |
| 1035 return 22; | |
| 1036 case 0xA3: | |
| 1037 /* Alpha-numeric */ | |
| 1038 return 23; | |
| 1039 case 0xA4: | |
| 1040 /* Hangul Letter(Alphabet) */ | |
| 1041 return 24; | |
| 1042 case 0xA5: | |
| 1043 /* Roman Numeral/Greek Letter */ | |
| 1044 return 25; | |
| 1045 case 0xA6: | |
| 1046 /* Box Drawings */ | |
| 1047 return 26; | |
| 1048 case 0xA7: | |
| 1049 /* Unit Symbols */ | |
| 1050 return 27; | |
| 1051 case 0xA8: | |
| 1052 case 0xA9: | |
| 1053 if (c2 <= 0xAF) | |
| 1054 return 25; /* Roman Letter */ | |
| 1055 else if (c2 >= 0xF6) | |
| 1056 return 22; /* Symbols */ | |
| 1057 else | |
| 1058 /* Circled/Parenthesized Letter */ | |
| 1059 return 28; | |
| 1060 case 0xAA: | |
| 1061 case 0xAB: | |
| 4352 | 1062 /* Hiragana/Katakana */ |
| 7 | 1063 return 29; |
| 1064 case 0xAC: | |
| 1065 /* Cyrillic Letter */ | |
| 1066 return 30; | |
| 1067 } | |
| 1068 } | |
| 1069 default: | |
| 1070 break; | |
| 1071 } | |
| 1072 return 3; | |
| 1073 } | |
| 1074 | |
| 1075 /* | |
| 1076 * mb_char2len() function pointer. | |
| 1077 * Return length in bytes of character "c". | |
| 1078 * Returns 1 for a single-byte character. | |
| 1079 */ | |
| 1080 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1081 latin_char2len(int c UNUSED) |
| 7 | 1082 { |
| 1083 return 1; | |
| 1084 } | |
| 1085 | |
| 1086 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1087 dbcs_char2len( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1088 int c) |
| 7 | 1089 { |
| 1090 if (c >= 0x100) | |
| 1091 return 2; | |
| 1092 return 1; | |
| 1093 } | |
| 1094 | |
| 1095 /* | |
| 1096 * mb_char2bytes() function pointer. | |
| 1097 * Convert a character to its bytes. | |
| 1098 * Returns the length in bytes. | |
| 1099 */ | |
| 1100 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1101 latin_char2bytes(int c, char_u *buf) |
| 7 | 1102 { |
| 1103 buf[0] = c; | |
| 1104 return 1; | |
| 1105 } | |
| 1106 | |
| 1107 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1108 dbcs_char2bytes(int c, char_u *buf) |
| 7 | 1109 { |
| 1110 if (c >= 0x100) | |
| 1111 { | |
| 1112 buf[0] = (unsigned)c >> 8; | |
| 1113 buf[1] = c; | |
| 221 | 1114 /* Never use a NUL byte, it causes lots of trouble. It's an invalid |
| 1115 * character anyway. */ | |
| 1116 if (buf[1] == NUL) | |
| 1117 buf[1] = '\n'; | |
| 7 | 1118 return 2; |
| 1119 } | |
| 1120 buf[0] = c; | |
| 1121 return 1; | |
| 1122 } | |
| 1123 | |
| 1124 /* | |
| 474 | 1125 * mb_ptr2len() function pointer. |
| 7 | 1126 * Get byte length of character at "*p" but stop at a NUL. |
| 1127 * For UTF-8 this includes following composing characters. | |
| 1128 * Returns 0 when *p is NUL. | |
| 1129 */ | |
| 1130 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1131 latin_ptr2len(char_u *p) |
| 7 | 1132 { |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1133 return MB_BYTE2LEN(*p); |
| 7 | 1134 } |
| 1135 | |
| 1136 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1137 dbcs_ptr2len( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1138 char_u *p) |
| 7 | 1139 { |
| 1140 int len; | |
| 1141 | |
| 1142 /* Check if second byte is not missing. */ | |
| 1143 len = MB_BYTE2LEN(*p); | |
| 1144 if (len == 2 && p[1] == NUL) | |
| 1145 len = 1; | |
| 1146 return len; | |
| 1147 } | |
| 1148 | |
| 1903 | 1149 /* |
| 1150 * mb_ptr2len_len() function pointer. | |
| 1151 * Like mb_ptr2len(), but limit to read "size" bytes. | |
| 1152 * Returns 0 for an empty string. | |
| 1153 * Returns 1 for an illegal char or an incomplete byte sequence. | |
| 1154 */ | |
| 1155 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1156 latin_ptr2len_len(char_u *p, int size) |
| 1903 | 1157 { |
| 1158 if (size < 1 || *p == NUL) | |
| 1159 return 0; | |
| 1160 return 1; | |
| 1161 } | |
| 1162 | |
| 1163 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1164 dbcs_ptr2len_len(char_u *p, int size) |
| 1903 | 1165 { |
| 1166 int len; | |
| 1167 | |
| 1168 if (size < 1 || *p == NUL) | |
| 1169 return 0; | |
| 1170 if (size == 1) | |
| 1171 return 1; | |
| 1172 /* Check that second byte is not missing. */ | |
| 1173 len = MB_BYTE2LEN(*p); | |
| 1174 if (len == 2 && p[1] == NUL) | |
| 1175 len = 1; | |
| 1176 return len; | |
| 1177 } | |
| 1178 | |
| 7 | 1179 struct interval |
| 1180 { | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1181 long first; |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
1182 long last; |
| 7 | 1183 }; |
| 1184 | |
| 1185 /* | |
| 1186 * Return TRUE if "c" is in "table[size / sizeof(struct interval)]". | |
| 1187 */ | |
| 1188 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1189 intable(struct interval *table, size_t size, int c) |
| 7 | 1190 { |
| 1191 int mid, bot, top; | |
| 1192 | |
| 1193 /* first quick check for Latin1 etc. characters */ | |
| 1194 if (c < table[0].first) | |
| 1195 return FALSE; | |
| 1196 | |
| 1197 /* binary search in table */ | |
| 1198 bot = 0; | |
| 835 | 1199 top = (int)(size / sizeof(struct interval) - 1); |
| 7 | 1200 while (top >= bot) |
| 1201 { | |
| 1202 mid = (bot + top) / 2; | |
| 1203 if (table[mid].last < c) | |
| 1204 bot = mid + 1; | |
| 1205 else if (table[mid].first > c) | |
| 1206 top = mid - 1; | |
| 1207 else | |
| 1208 return TRUE; | |
| 1209 } | |
| 1210 return FALSE; | |
| 1211 } | |
| 1212 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1213 /* Sorted list of non-overlapping intervals of East Asian Ambiguous |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1214 * characters, generated with ../runtime/tools/unicode.vim. */ |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1215 static struct interval ambiguous[] = |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1216 { |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1217 {0x00a1, 0x00a1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1218 {0x00a4, 0x00a4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1219 {0x00a7, 0x00a8}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1220 {0x00aa, 0x00aa}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1221 {0x00ad, 0x00ae}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1222 {0x00b0, 0x00b4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1223 {0x00b6, 0x00ba}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1224 {0x00bc, 0x00bf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1225 {0x00c6, 0x00c6}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1226 {0x00d0, 0x00d0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1227 {0x00d7, 0x00d8}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1228 {0x00de, 0x00e1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1229 {0x00e6, 0x00e6}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1230 {0x00e8, 0x00ea}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1231 {0x00ec, 0x00ed}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1232 {0x00f0, 0x00f0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1233 {0x00f2, 0x00f3}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1234 {0x00f7, 0x00fa}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1235 {0x00fc, 0x00fc}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1236 {0x00fe, 0x00fe}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1237 {0x0101, 0x0101}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1238 {0x0111, 0x0111}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1239 {0x0113, 0x0113}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1240 {0x011b, 0x011b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1241 {0x0126, 0x0127}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1242 {0x012b, 0x012b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1243 {0x0131, 0x0133}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1244 {0x0138, 0x0138}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1245 {0x013f, 0x0142}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1246 {0x0144, 0x0144}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1247 {0x0148, 0x014b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1248 {0x014d, 0x014d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1249 {0x0152, 0x0153}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1250 {0x0166, 0x0167}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1251 {0x016b, 0x016b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1252 {0x01ce, 0x01ce}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1253 {0x01d0, 0x01d0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1254 {0x01d2, 0x01d2}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1255 {0x01d4, 0x01d4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1256 {0x01d6, 0x01d6}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1257 {0x01d8, 0x01d8}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1258 {0x01da, 0x01da}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1259 {0x01dc, 0x01dc}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1260 {0x0251, 0x0251}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1261 {0x0261, 0x0261}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1262 {0x02c4, 0x02c4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1263 {0x02c7, 0x02c7}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1264 {0x02c9, 0x02cb}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1265 {0x02cd, 0x02cd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1266 {0x02d0, 0x02d0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1267 {0x02d8, 0x02db}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1268 {0x02dd, 0x02dd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1269 {0x02df, 0x02df}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1270 {0x0300, 0x036f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1271 {0x0391, 0x03a1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1272 {0x03a3, 0x03a9}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1273 {0x03b1, 0x03c1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1274 {0x03c3, 0x03c9}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1275 {0x0401, 0x0401}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1276 {0x0410, 0x044f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1277 {0x0451, 0x0451}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1278 {0x2010, 0x2010}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1279 {0x2013, 0x2016}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1280 {0x2018, 0x2019}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1281 {0x201c, 0x201d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1282 {0x2020, 0x2022}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1283 {0x2024, 0x2027}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1284 {0x2030, 0x2030}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1285 {0x2032, 0x2033}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1286 {0x2035, 0x2035}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1287 {0x203b, 0x203b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1288 {0x203e, 0x203e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1289 {0x2074, 0x2074}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1290 {0x207f, 0x207f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1291 {0x2081, 0x2084}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1292 {0x20ac, 0x20ac}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1293 {0x2103, 0x2103}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1294 {0x2105, 0x2105}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1295 {0x2109, 0x2109}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1296 {0x2113, 0x2113}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1297 {0x2116, 0x2116}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1298 {0x2121, 0x2122}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1299 {0x2126, 0x2126}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1300 {0x212b, 0x212b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1301 {0x2153, 0x2154}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1302 {0x215b, 0x215e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1303 {0x2160, 0x216b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1304 {0x2170, 0x2179}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1305 {0x2189, 0x2189}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1306 {0x2190, 0x2199}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1307 {0x21b8, 0x21b9}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1308 {0x21d2, 0x21d2}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1309 {0x21d4, 0x21d4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1310 {0x21e7, 0x21e7}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1311 {0x2200, 0x2200}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1312 {0x2202, 0x2203}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1313 {0x2207, 0x2208}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1314 {0x220b, 0x220b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1315 {0x220f, 0x220f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1316 {0x2211, 0x2211}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1317 {0x2215, 0x2215}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1318 {0x221a, 0x221a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1319 {0x221d, 0x2220}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1320 {0x2223, 0x2223}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1321 {0x2225, 0x2225}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1322 {0x2227, 0x222c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1323 {0x222e, 0x222e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1324 {0x2234, 0x2237}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1325 {0x223c, 0x223d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1326 {0x2248, 0x2248}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1327 {0x224c, 0x224c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1328 {0x2252, 0x2252}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1329 {0x2260, 0x2261}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1330 {0x2264, 0x2267}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1331 {0x226a, 0x226b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1332 {0x226e, 0x226f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1333 {0x2282, 0x2283}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1334 {0x2286, 0x2287}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1335 {0x2295, 0x2295}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1336 {0x2299, 0x2299}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1337 {0x22a5, 0x22a5}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1338 {0x22bf, 0x22bf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1339 {0x2312, 0x2312}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1340 {0x2460, 0x24e9}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1341 {0x24eb, 0x254b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1342 {0x2550, 0x2573}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1343 {0x2580, 0x258f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1344 {0x2592, 0x2595}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1345 {0x25a0, 0x25a1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1346 {0x25a3, 0x25a9}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1347 {0x25b2, 0x25b3}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1348 {0x25b6, 0x25b7}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1349 {0x25bc, 0x25bd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1350 {0x25c0, 0x25c1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1351 {0x25c6, 0x25c8}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1352 {0x25cb, 0x25cb}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1353 {0x25ce, 0x25d1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1354 {0x25e2, 0x25e5}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1355 {0x25ef, 0x25ef}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1356 {0x2605, 0x2606}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1357 {0x2609, 0x2609}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1358 {0x260e, 0x260f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1359 {0x261c, 0x261c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1360 {0x261e, 0x261e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1361 {0x2640, 0x2640}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1362 {0x2642, 0x2642}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1363 {0x2660, 0x2661}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1364 {0x2663, 0x2665}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1365 {0x2667, 0x266a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1366 {0x266c, 0x266d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1367 {0x266f, 0x266f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1368 {0x269e, 0x269f}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1369 {0x26bf, 0x26bf}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1370 {0x26c6, 0x26cd}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1371 {0x26cf, 0x26d3}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1372 {0x26d5, 0x26e1}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1373 {0x26e3, 0x26e3}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1374 {0x26e8, 0x26e9}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1375 {0x26eb, 0x26f1}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1376 {0x26f4, 0x26f4}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1377 {0x26f6, 0x26f9}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1378 {0x26fb, 0x26fc}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1379 {0x26fe, 0x26ff}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1380 {0x273d, 0x273d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1381 {0x2776, 0x277f}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1382 {0x2b56, 0x2b59}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1383 {0x3248, 0x324f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1384 {0xe000, 0xf8ff}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1385 {0xfe00, 0xfe0f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1386 {0xfffd, 0xfffd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1387 {0x1f100, 0x1f10a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1388 {0x1f110, 0x1f12d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1389 {0x1f130, 0x1f169}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1390 {0x1f170, 0x1f18d}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1391 {0x1f18f, 0x1f190}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1392 {0x1f19b, 0x1f1ac}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1393 {0xe0100, 0xe01ef}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1394 {0xf0000, 0xffffd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1395 {0x100000, 0x10fffd} |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1396 }; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
1397 |
|
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1398 #if defined(FEAT_TERMINAL) || defined(PROTO) |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1399 /* |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1400 * utf_char2cells() with different argument type for libvterm. |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1401 */ |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1402 int |
|
12269
d2373927d76d
patch 8.0.1014: old compiler doesn't know uint32_t
Christian Brabandt <cb@256bit.org>
parents:
12210
diff
changeset
|
1403 utf_uint2cells(UINT32_T c) |
|
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1404 { |
|
12650
f58755eb453e
patch 8.0.1203: terminal window mistreats composing characters
Christian Brabandt <cb@256bit.org>
parents:
12547
diff
changeset
|
1405 if (c >= 0x100 && utf_iscomposing((int)c)) |
|
f58755eb453e
patch 8.0.1203: terminal window mistreats composing characters
Christian Brabandt <cb@256bit.org>
parents:
12547
diff
changeset
|
1406 return 0; |
|
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1407 return utf_char2cells((int)c); |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1408 } |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1409 #endif |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
1410 |
| 7 | 1411 /* |
| 1412 * For UTF-8 character "c" return 2 for a double-width character, 1 for others. | |
| 1413 * Returns 4 or 6 for an unprintable character. | |
| 1414 * Is only correct for characters >= 0x80. | |
| 1415 * When p_ambw is "double", return 2 for a character with East Asian Width | |
| 1416 * class 'A'(mbiguous). | |
| 1417 */ | |
| 1418 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1419 utf_char2cells(int c) |
| 7 | 1420 { |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1421 /* 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
|
1422 * characters, generated with ../runtime/tools/unicode.vim. */ |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1423 static struct interval doublewidth[] = |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1424 { |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1425 {0x1100, 0x115f}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1426 {0x231a, 0x231b}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1427 {0x2329, 0x232a}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1428 {0x23e9, 0x23ec}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1429 {0x23f0, 0x23f0}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1430 {0x23f3, 0x23f3}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1431 {0x25fd, 0x25fe}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1432 {0x2614, 0x2615}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1433 {0x2648, 0x2653}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1434 {0x267f, 0x267f}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1435 {0x2693, 0x2693}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1436 {0x26a1, 0x26a1}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1437 {0x26aa, 0x26ab}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1438 {0x26bd, 0x26be}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1439 {0x26c4, 0x26c5}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1440 {0x26ce, 0x26ce}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1441 {0x26d4, 0x26d4}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1442 {0x26ea, 0x26ea}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1443 {0x26f2, 0x26f3}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1444 {0x26f5, 0x26f5}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1445 {0x26fa, 0x26fa}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1446 {0x26fd, 0x26fd}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1447 {0x2705, 0x2705}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1448 {0x270a, 0x270b}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1449 {0x2728, 0x2728}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1450 {0x274c, 0x274c}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1451 {0x274e, 0x274e}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1452 {0x2753, 0x2755}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1453 {0x2757, 0x2757}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1454 {0x2795, 0x2797}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1455 {0x27b0, 0x27b0}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1456 {0x27bf, 0x27bf}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1457 {0x2b1b, 0x2b1c}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1458 {0x2b50, 0x2b50}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1459 {0x2b55, 0x2b55}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1460 {0x2e80, 0x2e99}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1461 {0x2e9b, 0x2ef3}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1462 {0x2f00, 0x2fd5}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1463 {0x2ff0, 0x2ffb}, |
| 6495 | 1464 {0x3000, 0x303e}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1465 {0x3041, 0x3096}, |
| 6495 | 1466 {0x3099, 0x30ff}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1467 {0x3105, 0x312e}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1468 {0x3131, 0x318e}, |
| 6495 | 1469 {0x3190, 0x31ba}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1470 {0x31c0, 0x31e3}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1471 {0x31f0, 0x321e}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1472 {0x3220, 0x3247}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1473 {0x3250, 0x32fe}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1474 {0x3300, 0x4dbf}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1475 {0x4e00, 0xa48c}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1476 {0xa490, 0xa4c6}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1477 {0xa960, 0xa97c}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1478 {0xac00, 0xd7a3}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1479 {0xf900, 0xfaff}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1480 {0xfe10, 0xfe19}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1481 {0xfe30, 0xfe52}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1482 {0xfe54, 0xfe66}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1483 {0xfe68, 0xfe6b}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1484 {0xff01, 0xff60}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1485 {0xffe0, 0xffe6}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1486 {0x16fe0, 0x16fe1}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1487 {0x17000, 0x187ec}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1488 {0x18800, 0x18af2}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1489 {0x1b000, 0x1b11e}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1490 {0x1b170, 0x1b2fb}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1491 {0x1f004, 0x1f004}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1492 {0x1f0cf, 0x1f0cf}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1493 {0x1f18e, 0x1f18e}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1494 {0x1f191, 0x1f19a}, |
|
8682
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
1495 {0x1f200, 0x1f202}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1496 {0x1f210, 0x1f23b}, |
|
8682
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
1497 {0x1f240, 0x1f248}, |
|
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
1498 {0x1f250, 0x1f251}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1499 {0x1f260, 0x1f265}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1500 {0x1f300, 0x1f320}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1501 {0x1f32d, 0x1f335}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1502 {0x1f337, 0x1f37c}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1503 {0x1f37e, 0x1f393}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1504 {0x1f3a0, 0x1f3ca}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1505 {0x1f3cf, 0x1f3d3}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1506 {0x1f3e0, 0x1f3f0}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1507 {0x1f3f4, 0x1f3f4}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1508 {0x1f3f8, 0x1f43e}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1509 {0x1f440, 0x1f440}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1510 {0x1f442, 0x1f4fc}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1511 {0x1f4ff, 0x1f53d}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1512 {0x1f54b, 0x1f54e}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1513 {0x1f550, 0x1f567}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1514 {0x1f57a, 0x1f57a}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1515 {0x1f595, 0x1f596}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1516 {0x1f5a4, 0x1f5a4}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1517 {0x1f5fb, 0x1f64f}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1518 {0x1f680, 0x1f6c5}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1519 {0x1f6cc, 0x1f6cc}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1520 {0x1f6d0, 0x1f6d2}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1521 {0x1f6eb, 0x1f6ec}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1522 {0x1f6f4, 0x1f6f8}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1523 {0x1f910, 0x1f93e}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1524 {0x1f940, 0x1f94c}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1525 {0x1f950, 0x1f96b}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1526 {0x1f980, 0x1f997}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
1527 {0x1f9c0, 0x1f9c0}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1528 {0x1f9d0, 0x1f9e6}, |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1529 {0x20000, 0x2fffd}, |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1530 {0x30000, 0x3fffd} |
|
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1531 }; |
| 6495 | 1532 |
|
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1533 /* Sorted list of non-overlapping intervals of Emoji characters that don't |
|
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1534 * have ambiguous or double width, |
|
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1535 * based on http://unicode.org/emoji/charts/emoji-list.html */ |
|
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1536 static struct interval emoji_width[] = |
|
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1537 { |
|
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1538 {0x1f1e6, 0x1f1ff}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1539 {0x1f321, 0x1f321}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1540 {0x1f324, 0x1f32c}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1541 {0x1f336, 0x1f336}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1542 {0x1f37d, 0x1f37d}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1543 {0x1f396, 0x1f397}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1544 {0x1f399, 0x1f39b}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1545 {0x1f39e, 0x1f39f}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1546 {0x1f3cb, 0x1f3ce}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1547 {0x1f3d4, 0x1f3df}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1548 {0x1f3f3, 0x1f3f5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1549 {0x1f3f7, 0x1f3f7}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1550 {0x1f43f, 0x1f43f}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1551 {0x1f441, 0x1f441}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1552 {0x1f4fd, 0x1f4fd}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1553 {0x1f549, 0x1f54a}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1554 {0x1f56f, 0x1f570}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1555 {0x1f573, 0x1f579}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1556 {0x1f587, 0x1f587}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1557 {0x1f58a, 0x1f58d}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1558 {0x1f590, 0x1f590}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1559 {0x1f5a5, 0x1f5a5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1560 {0x1f5a8, 0x1f5a8}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1561 {0x1f5b1, 0x1f5b2}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1562 {0x1f5bc, 0x1f5bc}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1563 {0x1f5c2, 0x1f5c4}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1564 {0x1f5d1, 0x1f5d3}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1565 {0x1f5dc, 0x1f5de}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1566 {0x1f5e1, 0x1f5e1}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1567 {0x1f5e3, 0x1f5e3}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1568 {0x1f5e8, 0x1f5e8}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1569 {0x1f5ef, 0x1f5ef}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1570 {0x1f5f3, 0x1f5f3}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1571 {0x1f5fa, 0x1f5fa}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1572 {0x1f6cb, 0x1f6cf}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1573 {0x1f6e0, 0x1f6e5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1574 {0x1f6e9, 0x1f6e9}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1575 {0x1f6f0, 0x1f6f0}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
1576 {0x1f6f3, 0x1f6f3} |
|
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1577 }; |
|
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1578 |
| 7 | 1579 if (c >= 0x100) |
| 1580 { | |
| 1581 #ifdef USE_WCHAR_FUNCTIONS | |
| 1582 /* | |
| 1583 * Assume the library function wcwidth() works better than our own | |
| 1584 * stuff. It should return 1 for ambiguous width chars! | |
| 1585 */ | |
| 1586 int n = wcwidth(c); | |
| 1587 | |
| 1588 if (n < 0) | |
| 1589 return 6; /* unprintable, displays <xxxx> */ | |
| 1590 if (n > 1) | |
| 1591 return n; | |
| 1592 #else | |
| 1593 if (!utf_printable(c)) | |
| 1594 return 6; /* unprintable, displays <xxxx> */ | |
|
2063
1378bc45ebe5
updated for version 7.2.348
Bram Moolenaar <bram@zimbu.org>
parents:
2041
diff
changeset
|
1595 if (intable(doublewidth, sizeof(doublewidth), c)) |
| 7 | 1596 return 2; |
| 1597 #endif | |
|
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
1598 if (p_emoji && intable(emoji_width, sizeof(emoji_width), c)) |
|
8629
54ac275e3fc4
commit https://github.com/vim/vim/commit/3848e00e0177abdb31bc600234967863ec487233
Christian Brabandt <cb@256bit.org>
parents:
8218
diff
changeset
|
1599 return 2; |
| 7 | 1600 } |
| 1601 | |
| 1602 /* Characters below 0x100 are influenced by 'isprint' option */ | |
| 1603 else if (c >= 0x80 && !vim_isprintc(c)) | |
| 1604 return 4; /* unprintable, displays <xx> */ | |
| 1605 | |
| 1606 if (c >= 0x80 && *p_ambw == 'd' && intable(ambiguous, sizeof(ambiguous), c)) | |
| 1607 return 2; | |
| 1608 | |
| 1609 return 1; | |
| 1610 } | |
| 1611 | |
| 1612 /* | |
| 1613 * mb_ptr2cells() function pointer. | |
| 1614 * Return the number of display cells character at "*p" occupies. | |
| 1615 * This doesn't take care of unprintable characters, use ptr2cells() for that. | |
| 1616 */ | |
| 1617 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1618 latin_ptr2cells(char_u *p UNUSED) |
| 7 | 1619 { |
| 1620 return 1; | |
| 1621 } | |
| 1622 | |
| 1623 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1624 utf_ptr2cells( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1625 char_u *p) |
| 7 | 1626 { |
| 1627 int c; | |
| 1628 | |
| 1629 /* Need to convert to a wide character. */ | |
| 1630 if (*p >= 0x80) | |
| 1631 { | |
| 1632 c = utf_ptr2char(p); | |
| 1633 /* An illegal byte is displayed as <xx>. */ | |
| 474 | 1634 if (utf_ptr2len(p) == 1 || c == NUL) |
| 7 | 1635 return 4; |
| 1636 /* If the char is ASCII it must be an overlong sequence. */ | |
| 1637 if (c < 0x80) | |
| 1638 return char2cells(c); | |
| 1639 return utf_char2cells(c); | |
| 1640 } | |
| 1641 return 1; | |
| 1642 } | |
| 1643 | |
| 1644 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1645 dbcs_ptr2cells(char_u *p) |
| 7 | 1646 { |
| 1647 /* Number of cells is equal to number of bytes, except for euc-jp when | |
| 1648 * the first byte is 0x8e. */ | |
| 1649 if (enc_dbcs == DBCS_JPNU && *p == 0x8e) | |
| 1650 return 1; | |
| 1651 return MB_BYTE2LEN(*p); | |
| 1652 } | |
| 1653 | |
| 1654 /* | |
| 1903 | 1655 * mb_ptr2cells_len() function pointer. |
| 1656 * Like mb_ptr2cells(), but limit string length to "size". | |
| 1657 * For an empty string or truncated character returns 1. | |
| 1658 */ | |
| 1659 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1660 latin_ptr2cells_len(char_u *p UNUSED, int size UNUSED) |
| 1903 | 1661 { |
| 1662 return 1; | |
| 1663 } | |
| 1664 | |
| 1665 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1666 utf_ptr2cells_len(char_u *p, int size) |
| 1903 | 1667 { |
| 1668 int c; | |
| 1669 | |
| 1670 /* Need to convert to a wide character. */ | |
| 1671 if (size > 0 && *p >= 0x80) | |
| 1672 { | |
| 1673 if (utf_ptr2len_len(p, size) < utf8len_tab[*p]) | |
| 2015 | 1674 return 1; /* truncated */ |
| 1903 | 1675 c = utf_ptr2char(p); |
| 1676 /* An illegal byte is displayed as <xx>. */ | |
| 1677 if (utf_ptr2len(p) == 1 || c == NUL) | |
| 1678 return 4; | |
| 1679 /* If the char is ASCII it must be an overlong sequence. */ | |
| 1680 if (c < 0x80) | |
| 1681 return char2cells(c); | |
| 1682 return utf_char2cells(c); | |
| 1683 } | |
| 1684 return 1; | |
| 1685 } | |
| 1686 | |
| 1687 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1688 dbcs_ptr2cells_len(char_u *p, int size) |
| 1903 | 1689 { |
| 1690 /* Number of cells is equal to number of bytes, except for euc-jp when | |
| 1691 * the first byte is 0x8e. */ | |
| 1692 if (size <= 1 || (enc_dbcs == DBCS_JPNU && *p == 0x8e)) | |
| 1693 return 1; | |
| 1694 return MB_BYTE2LEN(*p); | |
| 1695 } | |
| 1696 | |
| 1697 /* | |
| 7 | 1698 * mb_char2cells() function pointer. |
| 1699 * Return the number of display cells character "c" occupies. | |
| 1700 * Only takes care of multi-byte chars, not "^C" and such. | |
| 1701 */ | |
| 1702 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1703 latin_char2cells(int c UNUSED) |
| 7 | 1704 { |
| 1705 return 1; | |
| 1706 } | |
| 1707 | |
| 1708 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1709 dbcs_char2cells(int c) |
| 7 | 1710 { |
| 1711 /* Number of cells is equal to number of bytes, except for euc-jp when | |
| 1712 * the first byte is 0x8e. */ | |
| 1713 if (enc_dbcs == DBCS_JPNU && ((unsigned)c >> 8) == 0x8e) | |
| 1714 return 1; | |
| 1715 /* use the first byte */ | |
| 1716 return MB_BYTE2LEN((unsigned)c >> 8); | |
| 1717 } | |
| 1718 | |
| 1719 /* | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1720 * Return the number of cells occupied by string "p". |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1721 * 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
|
1722 */ |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1723 int |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1724 mb_string2cells(char_u *p, int len) |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1725 { |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1726 int i; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1727 int clen = 0; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1728 |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1729 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
|
1730 clen += (*mb_ptr2cells)(p + i); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1731 return clen; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1732 } |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1733 |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1734 /* |
| 7 | 1735 * mb_off2cells() function pointer. |
| 1736 * Return number of display cells for char at ScreenLines[off]. | |
| 1378 | 1737 * We make sure that the offset used is less than "max_off". |
| 7 | 1738 */ |
| 1739 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1740 latin_off2cells(unsigned off UNUSED, unsigned max_off UNUSED) |
| 7 | 1741 { |
| 1742 return 1; | |
| 1743 } | |
| 1744 | |
| 1745 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1746 dbcs_off2cells(unsigned off, unsigned max_off) |
| 7 | 1747 { |
| 1378 | 1748 /* never check beyond end of the line */ |
| 1749 if (off >= max_off) | |
| 1750 return 1; | |
| 1751 | |
| 7 | 1752 /* Number of cells is equal to number of bytes, except for euc-jp when |
| 1753 * the first byte is 0x8e. */ | |
| 1754 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 1755 return 1; | |
| 1756 return MB_BYTE2LEN(ScreenLines[off]); | |
| 1757 } | |
| 1758 | |
| 1759 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1760 utf_off2cells(unsigned off, unsigned max_off) |
| 7 | 1761 { |
| 1378 | 1762 return (off + 1 < max_off && ScreenLines[off + 1] == 0) ? 2 : 1; |
| 7 | 1763 } |
| 1764 | |
| 1765 /* | |
| 1766 * mb_ptr2char() function pointer. | |
| 1767 * Convert a byte sequence into a character. | |
| 1768 */ | |
| 1769 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1770 latin_ptr2char(char_u *p) |
| 7 | 1771 { |
| 1772 return *p; | |
| 1773 } | |
| 1774 | |
| 1775 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1776 dbcs_ptr2char(char_u *p) |
| 7 | 1777 { |
| 1778 if (MB_BYTE2LEN(*p) > 1 && p[1] != NUL) | |
| 1779 return (p[0] << 8) + p[1]; | |
| 1780 return *p; | |
| 1781 } | |
| 1782 | |
| 1783 /* | |
| 1784 * Convert a UTF-8 byte sequence to a wide character. | |
| 1785 * If the sequence is illegal or truncated by a NUL the first byte is | |
| 1786 * returned. | |
| 1787 * Does not include composing characters, of course. | |
| 1788 */ | |
| 1789 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1790 utf_ptr2char(char_u *p) |
| 7 | 1791 { |
| 1792 int len; | |
| 1793 | |
| 1794 if (p[0] < 0x80) /* be quick for ASCII */ | |
| 1795 return p[0]; | |
| 1796 | |
| 2015 | 1797 len = utf8len_tab_zero[p[0]]; |
| 1658 | 1798 if (len > 1 && (p[1] & 0xc0) == 0x80) |
| 7 | 1799 { |
| 1800 if (len == 2) | |
| 1801 return ((p[0] & 0x1f) << 6) + (p[1] & 0x3f); | |
| 1802 if ((p[2] & 0xc0) == 0x80) | |
| 1803 { | |
| 1804 if (len == 3) | |
| 1805 return ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) | |
| 1806 + (p[2] & 0x3f); | |
| 1807 if ((p[3] & 0xc0) == 0x80) | |
| 1808 { | |
| 1809 if (len == 4) | |
| 1810 return ((p[0] & 0x07) << 18) + ((p[1] & 0x3f) << 12) | |
| 1811 + ((p[2] & 0x3f) << 6) + (p[3] & 0x3f); | |
| 1812 if ((p[4] & 0xc0) == 0x80) | |
| 1813 { | |
| 1814 if (len == 5) | |
| 1815 return ((p[0] & 0x03) << 24) + ((p[1] & 0x3f) << 18) | |
| 1816 + ((p[2] & 0x3f) << 12) + ((p[3] & 0x3f) << 6) | |
| 1817 + (p[4] & 0x3f); | |
| 1818 if ((p[5] & 0xc0) == 0x80 && len == 6) | |
| 1819 return ((p[0] & 0x01) << 30) + ((p[1] & 0x3f) << 24) | |
| 1820 + ((p[2] & 0x3f) << 18) + ((p[3] & 0x3f) << 12) | |
| 1821 + ((p[4] & 0x3f) << 6) + (p[5] & 0x3f); | |
| 1822 } | |
| 1823 } | |
| 1824 } | |
| 1825 } | |
| 1826 /* Illegal value, just return the first byte */ | |
| 1827 return p[0]; | |
| 1828 } | |
| 1829 | |
| 1830 /* | |
| 2961 | 1831 * Convert a UTF-8 byte sequence to a wide character. |
| 1832 * String is assumed to be terminated by NUL or after "n" bytes, whichever | |
| 1833 * comes first. | |
| 1834 * The function is safe in the sense that it never accesses memory beyond the | |
| 1835 * first "n" bytes of "s". | |
| 1836 * | |
| 1837 * On success, returns decoded codepoint, advances "s" to the beginning of | |
| 1838 * next character and decreases "n" accordingly. | |
| 1839 * | |
| 1840 * If end of string was reached, returns 0 and, if "n" > 0, advances "s" past | |
| 1841 * NUL byte. | |
| 1842 * | |
| 1843 * If byte sequence is illegal or incomplete, returns -1 and does not advance | |
| 1844 * "s". | |
| 1845 */ | |
| 1846 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1847 utf_safe_read_char_adv(char_u **s, size_t *n) |
| 2961 | 1848 { |
| 1849 int c, k; | |
| 1850 | |
| 1851 if (*n == 0) /* end of buffer */ | |
| 1852 return 0; | |
| 1853 | |
| 1854 k = utf8len_tab_zero[**s]; | |
| 1855 | |
| 1856 if (k == 1) | |
| 1857 { | |
| 1858 /* ASCII character or NUL */ | |
| 1859 (*n)--; | |
| 1860 return *(*s)++; | |
| 1861 } | |
| 1862 | |
| 1863 if ((size_t)k <= *n) | |
| 1864 { | |
| 1865 /* We have a multibyte sequence and it isn't truncated by buffer | |
| 1866 * limits so utf_ptr2char() is safe to use. Or the first byte is | |
| 1867 * illegal (k=0), and it's also safe to use utf_ptr2char(). */ | |
| 1868 c = utf_ptr2char(*s); | |
| 1869 | |
| 1870 /* On failure, utf_ptr2char() returns the first byte, so here we | |
| 1871 * check equality with the first byte. The only non-ASCII character | |
| 1872 * which equals the first byte of its own UTF-8 representation is | |
| 1873 * U+00C3 (UTF-8: 0xC3 0x83), so need to check that special case too. | |
| 1874 * It's safe even if n=1, else we would have k=2 > n. */ | |
| 1875 if (c != (int)(**s) || (c == 0xC3 && (*s)[1] == 0x83)) | |
| 1876 { | |
| 1877 /* byte sequence was successfully decoded */ | |
| 1878 *s += k; | |
| 1879 *n -= k; | |
| 1880 return c; | |
| 1881 } | |
| 1882 } | |
| 1883 | |
| 1884 /* byte sequence is incomplete or illegal */ | |
| 1885 return -1; | |
| 1886 } | |
| 1887 | |
| 1888 /* | |
| 7 | 1889 * Get character at **pp and advance *pp to the next character. |
| 1890 * Note: composing characters are skipped! | |
| 1891 */ | |
| 1892 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1893 mb_ptr2char_adv(char_u **pp) |
| 7 | 1894 { |
| 1895 int c; | |
| 1896 | |
| 1897 c = (*mb_ptr2char)(*pp); | |
| 474 | 1898 *pp += (*mb_ptr2len)(*pp); |
| 1899 return c; | |
| 1900 } | |
| 1901 | |
| 1902 /* | |
| 1903 * Get character at **pp and advance *pp to the next character. | |
| 1904 * Note: composing characters are returned as separate characters. | |
| 1905 */ | |
| 1906 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1907 mb_cptr2char_adv(char_u **pp) |
| 474 | 1908 { |
| 1909 int c; | |
| 1910 | |
| 1911 c = (*mb_ptr2char)(*pp); | |
| 1912 if (enc_utf8) | |
| 1913 *pp += utf_ptr2len(*pp); | |
| 1914 else | |
| 1915 *pp += (*mb_ptr2len)(*pp); | |
| 7 | 1916 return c; |
| 1917 } | |
| 1918 | |
| 1919 #if defined(FEAT_ARABIC) || defined(PROTO) | |
| 1920 /* | |
| 1921 * Check whether we are dealing with Arabic combining characters. | |
| 1922 * Note: these are NOT really composing characters! | |
| 1923 */ | |
| 1924 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1925 arabic_combine( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1926 int one, /* first character */ |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1927 int two) /* character just after "one" */ |
| 7 | 1928 { |
| 1929 if (one == a_LAM) | |
| 1930 return arabic_maycombine(two); | |
| 1931 return FALSE; | |
| 1932 } | |
| 1933 | |
| 1934 /* | |
| 1935 * Check whether we are dealing with a character that could be regarded as an | |
| 1936 * Arabic combining character, need to check the character before this. | |
| 1937 */ | |
| 1938 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1939 arabic_maycombine(int two) |
| 7 | 1940 { |
| 1941 if (p_arshape && !p_tbidi) | |
| 1942 return (two == a_ALEF_MADDA | |
| 1943 || two == a_ALEF_HAMZA_ABOVE | |
| 1944 || two == a_ALEF_HAMZA_BELOW | |
| 1945 || two == a_ALEF); | |
| 1946 return FALSE; | |
| 1947 } | |
| 1948 | |
| 1949 /* | |
| 1950 * Check if the character pointed to by "p2" is a composing character when it | |
| 1951 * comes after "p1". For Arabic sometimes "ab" is replaced with "c", which | |
| 1952 * behaves like a composing character. | |
| 1953 */ | |
| 1954 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1955 utf_composinglike(char_u *p1, char_u *p2) |
| 7 | 1956 { |
| 1957 int c2; | |
| 1958 | |
| 1959 c2 = utf_ptr2char(p2); | |
| 1960 if (utf_iscomposing(c2)) | |
| 1961 return TRUE; | |
| 1962 if (!arabic_maycombine(c2)) | |
| 1963 return FALSE; | |
| 1964 return arabic_combine(utf_ptr2char(p1), c2); | |
| 1965 } | |
| 1966 #endif | |
| 1967 | |
| 1968 /* | |
| 1205 | 1969 * Convert a UTF-8 byte string to a wide character. Also get up to MAX_MCO |
| 7 | 1970 * composing characters. |
| 1971 */ | |
| 1972 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1973 utfc_ptr2char( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1974 char_u *p, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1975 int *pcc) /* return: composing chars, last one is 0 */ |
| 7 | 1976 { |
| 1977 int len; | |
| 1978 int c; | |
| 1979 int cc; | |
| 714 | 1980 int i = 0; |
| 7 | 1981 |
| 1982 c = utf_ptr2char(p); | |
| 474 | 1983 len = utf_ptr2len(p); |
| 714 | 1984 |
| 7 | 1985 /* Only accept a composing char when the first char isn't illegal. */ |
| 1986 if ((len > 1 || *p < 0x80) | |
| 1987 && p[len] >= 0x80 | |
| 1988 && UTF_COMPOSINGLIKE(p, p + len)) | |
| 1989 { | |
| 714 | 1990 cc = utf_ptr2char(p + len); |
| 1991 for (;;) | |
| 1992 { | |
| 1993 pcc[i++] = cc; | |
| 1994 if (i == MAX_MCO) | |
| 1995 break; | |
| 1996 len += utf_ptr2len(p + len); | |
| 1997 if (p[len] < 0x80 || !utf_iscomposing(cc = utf_ptr2char(p + len))) | |
| 1998 break; | |
| 1999 } | |
| 7 | 2000 } |
| 714 | 2001 |
| 2002 if (i < MAX_MCO) /* last composing char must be 0 */ | |
| 2003 pcc[i] = 0; | |
| 2004 | |
| 7 | 2005 return c; |
| 2006 } | |
| 2007 | |
| 2008 /* | |
| 1205 | 2009 * Convert a UTF-8 byte string to a wide character. Also get up to MAX_MCO |
| 7 | 2010 * composing characters. Use no more than p[maxlen]. |
| 2011 */ | |
| 2012 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2013 utfc_ptr2char_len( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2014 char_u *p, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2015 int *pcc, /* return: composing chars, last one is 0 */ |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2016 int maxlen) |
| 7 | 2017 { |
| 2018 int len; | |
| 2019 int c; | |
| 2020 int cc; | |
| 714 | 2021 int i = 0; |
| 7 | 2022 |
| 2023 c = utf_ptr2char(p); | |
| 474 | 2024 len = utf_ptr2len_len(p, maxlen); |
| 7 | 2025 /* Only accept a composing char when the first char isn't illegal. */ |
| 2026 if ((len > 1 || *p < 0x80) | |
| 2027 && len < maxlen | |
| 2028 && p[len] >= 0x80 | |
| 2029 && UTF_COMPOSINGLIKE(p, p + len)) | |
| 2030 { | |
| 714 | 2031 cc = utf_ptr2char(p + len); |
| 2032 for (;;) | |
| 2033 { | |
| 2034 pcc[i++] = cc; | |
| 2035 if (i == MAX_MCO) | |
| 2036 break; | |
| 2037 len += utf_ptr2len_len(p + len, maxlen - len); | |
| 2038 if (len >= maxlen | |
| 2039 || p[len] < 0x80 | |
| 2040 || !utf_iscomposing(cc = utf_ptr2char(p + len))) | |
| 2041 break; | |
| 2042 } | |
| 7 | 2043 } |
| 714 | 2044 |
| 2045 if (i < MAX_MCO) /* last composing char must be 0 */ | |
| 2046 pcc[i] = 0; | |
| 2047 | |
| 7 | 2048 return c; |
| 2049 } | |
| 2050 | |
| 2051 /* | |
| 2052 * Convert the character at screen position "off" to a sequence of bytes. | |
| 2053 * Includes the composing characters. | |
| 3549 | 2054 * "buf" must at least have the length MB_MAXBYTES + 1. |
|
2154
7c8c7c95a865
First step in the Vim 7.3 branch. Changed version numbers.
Bram Moolenaar <bram@zimbu.org>
parents:
2063
diff
changeset
|
2055 * Only to be used when ScreenLinesUC[off] != 0. |
| 7 | 2056 * Returns the produced number of bytes. |
| 2057 */ | |
| 2058 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2059 utfc_char2bytes(int off, char_u *buf) |
| 7 | 2060 { |
| 2061 int len; | |
| 714 | 2062 int i; |
| 7 | 2063 |
| 2064 len = utf_char2bytes(ScreenLinesUC[off], buf); | |
| 714 | 2065 for (i = 0; i < Screen_mco; ++i) |
| 7 | 2066 { |
| 714 | 2067 if (ScreenLinesC[i][off] == 0) |
| 2068 break; | |
| 2069 len += utf_char2bytes(ScreenLinesC[i][off], buf + len); | |
| 7 | 2070 } |
| 2071 return len; | |
| 2072 } | |
| 2073 | |
| 2074 /* | |
| 2075 * Get the length of a UTF-8 byte sequence, not including any following | |
| 2076 * composing characters. | |
| 2077 * Returns 0 for "". | |
| 2078 * Returns 1 for an illegal byte sequence. | |
| 2079 */ | |
| 2080 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2081 utf_ptr2len(char_u *p) |
| 7 | 2082 { |
| 2083 int len; | |
| 2084 int i; | |
| 2085 | |
| 2086 if (*p == NUL) | |
| 2087 return 0; | |
| 2088 len = utf8len_tab[*p]; | |
| 2089 for (i = 1; i < len; ++i) | |
| 2090 if ((p[i] & 0xc0) != 0x80) | |
| 2091 return 1; | |
| 2092 return len; | |
| 2093 } | |
| 2094 | |
| 2095 /* | |
| 2096 * Return length of UTF-8 character, obtained from the first byte. | |
| 2097 * "b" must be between 0 and 255! | |
| 2015 | 2098 * Returns 1 for an invalid first byte value. |
| 7 | 2099 */ |
| 2100 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2101 utf_byte2len(int b) |
| 7 | 2102 { |
| 2103 return utf8len_tab[b]; | |
| 2104 } | |
| 2105 | |
| 2106 /* | |
| 2107 * Get the length of UTF-8 byte sequence "p[size]". Does not include any | |
| 2108 * following composing characters. | |
| 2109 * Returns 1 for "". | |
| 1487 | 2110 * Returns 1 for an illegal byte sequence (also in incomplete byte seq.). |
| 7 | 2111 * Returns number > "size" for an incomplete byte sequence. |
| 2015 | 2112 * Never returns zero. |
| 7 | 2113 */ |
| 2114 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2115 utf_ptr2len_len(char_u *p, int size) |
| 7 | 2116 { |
| 2117 int len; | |
| 2118 int i; | |
| 1487 | 2119 int m; |
| 7 | 2120 |
| 2015 | 2121 len = utf8len_tab[*p]; |
| 2122 if (len == 1) | |
| 2123 return 1; /* NUL, ascii or illegal lead byte */ | |
| 7 | 2124 if (len > size) |
| 1487 | 2125 m = size; /* incomplete byte sequence. */ |
| 2015 | 2126 else |
| 2127 m = len; | |
| 1487 | 2128 for (i = 1; i < m; ++i) |
| 7 | 2129 if ((p[i] & 0xc0) != 0x80) |
| 2130 return 1; | |
| 2131 return len; | |
| 2132 } | |
| 2133 | |
| 2134 /* | |
| 2135 * Return the number of bytes the UTF-8 encoding of the character at "p" takes. | |
| 2136 * This includes following composing characters. | |
| 2137 */ | |
| 2138 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2139 utfc_ptr2len(char_u *p) |
| 7 | 2140 { |
| 2141 int len; | |
| 318 | 2142 int b0 = *p; |
| 7 | 2143 #ifdef FEAT_ARABIC |
| 2144 int prevlen; | |
| 2145 #endif | |
| 2146 | |
| 318 | 2147 if (b0 == NUL) |
| 7 | 2148 return 0; |
| 318 | 2149 if (b0 < 0x80 && p[1] < 0x80) /* be quick for ASCII */ |
| 7 | 2150 return 1; |
| 2151 | |
| 2152 /* Skip over first UTF-8 char, stopping at a NUL byte. */ | |
| 474 | 2153 len = utf_ptr2len(p); |
| 7 | 2154 |
| 2155 /* Check for illegal byte. */ | |
| 318 | 2156 if (len == 1 && b0 >= 0x80) |
| 7 | 2157 return 1; |
| 2158 | |
| 2159 /* | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2160 * Check for composing characters. We can handle only the first six, but |
| 7 | 2161 * skip all of them (otherwise the cursor would get stuck). |
| 2162 */ | |
| 2163 #ifdef FEAT_ARABIC | |
| 2164 prevlen = 0; | |
| 2165 #endif | |
| 2166 for (;;) | |
| 2167 { | |
| 2168 if (p[len] < 0x80 || !UTF_COMPOSINGLIKE(p + prevlen, p + len)) | |
| 2169 return len; | |
| 2170 | |
| 2171 /* Skip over composing char */ | |
| 2172 #ifdef FEAT_ARABIC | |
| 2173 prevlen = len; | |
| 2174 #endif | |
| 474 | 2175 len += utf_ptr2len(p + len); |
| 7 | 2176 } |
| 2177 } | |
| 2178 | |
| 2179 /* | |
| 2180 * Return the number of bytes the UTF-8 encoding of the character at "p[size]" | |
| 2181 * takes. This includes following composing characters. | |
| 1903 | 2182 * Returns 0 for an empty string. |
| 7 | 2183 * Returns 1 for an illegal char or an incomplete byte sequence. |
| 2184 */ | |
| 2185 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2186 utfc_ptr2len_len(char_u *p, int size) |
| 7 | 2187 { |
| 2188 int len; | |
| 2189 #ifdef FEAT_ARABIC | |
| 2190 int prevlen; | |
| 2191 #endif | |
| 2192 | |
| 1903 | 2193 if (size < 1 || *p == NUL) |
| 7 | 2194 return 0; |
| 2195 if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */ | |
| 2196 return 1; | |
| 2197 | |
| 2198 /* Skip over first UTF-8 char, stopping at a NUL byte. */ | |
| 474 | 2199 len = utf_ptr2len_len(p, size); |
| 7 | 2200 |
| 2201 /* Check for illegal byte and incomplete byte sequence. */ | |
| 2202 if ((len == 1 && p[0] >= 0x80) || len > size) | |
| 2203 return 1; | |
| 2204 | |
| 2205 /* | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2206 * Check for composing characters. We can handle only the first six, but |
| 7 | 2207 * skip all of them (otherwise the cursor would get stuck). |
| 2208 */ | |
| 2209 #ifdef FEAT_ARABIC | |
| 2210 prevlen = 0; | |
| 2211 #endif | |
| 2212 while (len < size) | |
| 2213 { | |
| 1658 | 2214 int len_next_char; |
| 2215 | |
| 2216 if (p[len] < 0x80) | |
| 2217 break; | |
| 2218 | |
| 2219 /* | |
| 2220 * Next character length should not go beyond size to ensure that | |
| 2221 * UTF_COMPOSINGLIKE(...) does not read beyond size. | |
| 2222 */ | |
| 2223 len_next_char = utf_ptr2len_len(p + len, size - len); | |
| 2224 if (len_next_char > size - len) | |
| 2225 break; | |
| 2226 | |
| 2227 if (!UTF_COMPOSINGLIKE(p + prevlen, p + len)) | |
| 7 | 2228 break; |
| 2229 | |
| 2230 /* Skip over composing char */ | |
| 2231 #ifdef FEAT_ARABIC | |
| 2232 prevlen = len; | |
| 2233 #endif | |
| 1658 | 2234 len += len_next_char; |
| 7 | 2235 } |
| 2236 return len; | |
| 2237 } | |
| 2238 | |
| 2239 /* | |
| 2240 * Return the number of bytes the UTF-8 encoding of character "c" takes. | |
| 2241 * This does not include composing characters. | |
| 2242 */ | |
| 2243 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2244 utf_char2len(int c) |
| 7 | 2245 { |
| 2246 if (c < 0x80) | |
| 2247 return 1; | |
| 2248 if (c < 0x800) | |
| 2249 return 2; | |
| 2250 if (c < 0x10000) | |
| 2251 return 3; | |
| 2252 if (c < 0x200000) | |
| 2253 return 4; | |
| 2254 if (c < 0x4000000) | |
| 2255 return 5; | |
| 2256 return 6; | |
| 2257 } | |
| 2258 | |
| 2259 /* | |
| 2260 * Convert Unicode character "c" to UTF-8 string in "buf[]". | |
| 2261 * Returns the number of bytes. | |
| 2262 * This does not include composing characters. | |
| 2263 */ | |
| 2264 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2265 utf_char2bytes(int c, char_u *buf) |
| 7 | 2266 { |
| 2267 if (c < 0x80) /* 7 bits */ | |
| 2268 { | |
| 2269 buf[0] = c; | |
| 2270 return 1; | |
| 2271 } | |
| 2272 if (c < 0x800) /* 11 bits */ | |
| 2273 { | |
| 2274 buf[0] = 0xc0 + ((unsigned)c >> 6); | |
| 2275 buf[1] = 0x80 + (c & 0x3f); | |
| 2276 return 2; | |
| 2277 } | |
| 2278 if (c < 0x10000) /* 16 bits */ | |
| 2279 { | |
| 2280 buf[0] = 0xe0 + ((unsigned)c >> 12); | |
| 2281 buf[1] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
| 2282 buf[2] = 0x80 + (c & 0x3f); | |
| 2283 return 3; | |
| 2284 } | |
| 2285 if (c < 0x200000) /* 21 bits */ | |
| 2286 { | |
| 2287 buf[0] = 0xf0 + ((unsigned)c >> 18); | |
| 2288 buf[1] = 0x80 + (((unsigned)c >> 12) & 0x3f); | |
| 2289 buf[2] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
| 2290 buf[3] = 0x80 + (c & 0x3f); | |
| 2291 return 4; | |
| 2292 } | |
| 2293 if (c < 0x4000000) /* 26 bits */ | |
| 2294 { | |
| 2295 buf[0] = 0xf8 + ((unsigned)c >> 24); | |
| 2296 buf[1] = 0x80 + (((unsigned)c >> 18) & 0x3f); | |
| 2297 buf[2] = 0x80 + (((unsigned)c >> 12) & 0x3f); | |
| 2298 buf[3] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
| 2299 buf[4] = 0x80 + (c & 0x3f); | |
| 2300 return 5; | |
| 2301 } | |
| 2302 /* 31 bits */ | |
| 2303 buf[0] = 0xfc + ((unsigned)c >> 30); | |
| 2304 buf[1] = 0x80 + (((unsigned)c >> 24) & 0x3f); | |
| 2305 buf[2] = 0x80 + (((unsigned)c >> 18) & 0x3f); | |
| 2306 buf[3] = 0x80 + (((unsigned)c >> 12) & 0x3f); | |
| 2307 buf[4] = 0x80 + (((unsigned)c >> 6) & 0x3f); | |
| 2308 buf[5] = 0x80 + (c & 0x3f); | |
| 2309 return 6; | |
| 2310 } | |
| 2311 | |
|
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2312 #if defined(FEAT_TERMINAL) || defined(PROTO) |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2313 /* |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2314 * utf_iscomposing() with different argument type for libvterm. |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2315 */ |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2316 int |
|
12269
d2373927d76d
patch 8.0.1014: old compiler doesn't know uint32_t
Christian Brabandt <cb@256bit.org>
parents:
12210
diff
changeset
|
2317 utf_iscomposing_uint(UINT32_T c) |
|
12210
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2318 { |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2319 return utf_iscomposing((int)c); |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2320 } |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2321 #endif |
|
b9b06aa0b6d9
patch 8.0.0985: libvterm has its own idea of character width
Christian Brabandt <cb@256bit.org>
parents:
11539
diff
changeset
|
2322 |
| 7 | 2323 /* |
| 2324 * Return TRUE if "c" is a composing UTF-8 character. This means it will be | |
| 2325 * drawn on top of the preceding character. | |
| 2326 * Based on code from Markus Kuhn. | |
| 2327 */ | |
| 2328 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2329 utf_iscomposing(int c) |
| 7 | 2330 { |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2331 /* Sorted list of non-overlapping intervals. |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2332 * Generated by ../runtime/tools/unicode.vim. */ |
| 7 | 2333 static struct interval combining[] = |
| 2334 { | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2335 {0x0300, 0x036f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2336 {0x0483, 0x0489}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2337 {0x0591, 0x05bd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2338 {0x05bf, 0x05bf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2339 {0x05c1, 0x05c2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2340 {0x05c4, 0x05c5}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2341 {0x05c7, 0x05c7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2342 {0x0610, 0x061a}, |
| 6495 | 2343 {0x064b, 0x065f}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2344 {0x0670, 0x0670}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2345 {0x06d6, 0x06dc}, |
| 6495 | 2346 {0x06df, 0x06e4}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2347 {0x06e7, 0x06e8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2348 {0x06ea, 0x06ed}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2349 {0x0711, 0x0711}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2350 {0x0730, 0x074a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2351 {0x07a6, 0x07b0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2352 {0x07eb, 0x07f3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2353 {0x0816, 0x0819}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2354 {0x081b, 0x0823}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2355 {0x0825, 0x0827}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2356 {0x0829, 0x082d}, |
| 6495 | 2357 {0x0859, 0x085b}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2358 {0x08d4, 0x08e1}, |
| 6864 | 2359 {0x08e3, 0x0903}, |
| 6495 | 2360 {0x093a, 0x093c}, |
| 2361 {0x093e, 0x094f}, | |
| 2362 {0x0951, 0x0957}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2363 {0x0962, 0x0963}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2364 {0x0981, 0x0983}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2365 {0x09bc, 0x09bc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2366 {0x09be, 0x09c4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2367 {0x09c7, 0x09c8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2368 {0x09cb, 0x09cd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2369 {0x09d7, 0x09d7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2370 {0x09e2, 0x09e3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2371 {0x0a01, 0x0a03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2372 {0x0a3c, 0x0a3c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2373 {0x0a3e, 0x0a42}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2374 {0x0a47, 0x0a48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2375 {0x0a4b, 0x0a4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2376 {0x0a51, 0x0a51}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2377 {0x0a70, 0x0a71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2378 {0x0a75, 0x0a75}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2379 {0x0a81, 0x0a83}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2380 {0x0abc, 0x0abc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2381 {0x0abe, 0x0ac5}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2382 {0x0ac7, 0x0ac9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2383 {0x0acb, 0x0acd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2384 {0x0ae2, 0x0ae3}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2385 {0x0afa, 0x0aff}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2386 {0x0b01, 0x0b03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2387 {0x0b3c, 0x0b3c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2388 {0x0b3e, 0x0b44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2389 {0x0b47, 0x0b48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2390 {0x0b4b, 0x0b4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2391 {0x0b56, 0x0b57}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2392 {0x0b62, 0x0b63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2393 {0x0b82, 0x0b82}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2394 {0x0bbe, 0x0bc2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2395 {0x0bc6, 0x0bc8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2396 {0x0bca, 0x0bcd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2397 {0x0bd7, 0x0bd7}, |
| 6495 | 2398 {0x0c00, 0x0c03}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2399 {0x0c3e, 0x0c44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2400 {0x0c46, 0x0c48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2401 {0x0c4a, 0x0c4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2402 {0x0c55, 0x0c56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2403 {0x0c62, 0x0c63}, |
| 6495 | 2404 {0x0c81, 0x0c83}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2405 {0x0cbc, 0x0cbc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2406 {0x0cbe, 0x0cc4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2407 {0x0cc6, 0x0cc8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2408 {0x0cca, 0x0ccd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2409 {0x0cd5, 0x0cd6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2410 {0x0ce2, 0x0ce3}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2411 {0x0d00, 0x0d03}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2412 {0x0d3b, 0x0d3c}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2413 {0x0d3e, 0x0d44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2414 {0x0d46, 0x0d48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2415 {0x0d4a, 0x0d4d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2416 {0x0d57, 0x0d57}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2417 {0x0d62, 0x0d63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2418 {0x0d82, 0x0d83}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2419 {0x0dca, 0x0dca}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2420 {0x0dcf, 0x0dd4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2421 {0x0dd6, 0x0dd6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2422 {0x0dd8, 0x0ddf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2423 {0x0df2, 0x0df3}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2424 {0x0e31, 0x0e31}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2425 {0x0e34, 0x0e3a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2426 {0x0e47, 0x0e4e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2427 {0x0eb1, 0x0eb1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2428 {0x0eb4, 0x0eb9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2429 {0x0ebb, 0x0ebc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2430 {0x0ec8, 0x0ecd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2431 {0x0f18, 0x0f19}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2432 {0x0f35, 0x0f35}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2433 {0x0f37, 0x0f37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2434 {0x0f39, 0x0f39}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2435 {0x0f3e, 0x0f3f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2436 {0x0f71, 0x0f84}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2437 {0x0f86, 0x0f87}, |
| 6495 | 2438 {0x0f8d, 0x0f97}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2439 {0x0f99, 0x0fbc}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2440 {0x0fc6, 0x0fc6}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2441 {0x102b, 0x103e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2442 {0x1056, 0x1059}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2443 {0x105e, 0x1060}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2444 {0x1062, 0x1064}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2445 {0x1067, 0x106d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2446 {0x1071, 0x1074}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2447 {0x1082, 0x108d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2448 {0x108f, 0x108f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2449 {0x109a, 0x109d}, |
| 6495 | 2450 {0x135d, 0x135f}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2451 {0x1712, 0x1714}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2452 {0x1732, 0x1734}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2453 {0x1752, 0x1753}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2454 {0x1772, 0x1773}, |
| 6495 | 2455 {0x17b4, 0x17d3}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2456 {0x17dd, 0x17dd}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2457 {0x180b, 0x180d}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2458 {0x1885, 0x1886}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2459 {0x18a9, 0x18a9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2460 {0x1920, 0x192b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2461 {0x1930, 0x193b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2462 {0x1a17, 0x1a1b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2463 {0x1a55, 0x1a5e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2464 {0x1a60, 0x1a7c}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2465 {0x1a7f, 0x1a7f}, |
| 6495 | 2466 {0x1ab0, 0x1abe}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2467 {0x1b00, 0x1b04}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2468 {0x1b34, 0x1b44}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2469 {0x1b6b, 0x1b73}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2470 {0x1b80, 0x1b82}, |
| 6495 | 2471 {0x1ba1, 0x1bad}, |
| 2472 {0x1be6, 0x1bf3}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2473 {0x1c24, 0x1c37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2474 {0x1cd0, 0x1cd2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2475 {0x1cd4, 0x1ce8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2476 {0x1ced, 0x1ced}, |
| 6495 | 2477 {0x1cf2, 0x1cf4}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2478 {0x1cf7, 0x1cf9}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2479 {0x1dc0, 0x1df9}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2480 {0x1dfb, 0x1dff}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2481 {0x20d0, 0x20f0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2482 {0x2cef, 0x2cf1}, |
| 6495 | 2483 {0x2d7f, 0x2d7f}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2484 {0x2de0, 0x2dff}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2485 {0x302a, 0x302f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2486 {0x3099, 0x309a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2487 {0xa66f, 0xa672}, |
| 6495 | 2488 {0xa674, 0xa67d}, |
| 6864 | 2489 {0xa69e, 0xa69f}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2490 {0xa6f0, 0xa6f1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2491 {0xa802, 0xa802}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2492 {0xa806, 0xa806}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2493 {0xa80b, 0xa80b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2494 {0xa823, 0xa827}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2495 {0xa880, 0xa881}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2496 {0xa8b4, 0xa8c5}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2497 {0xa8e0, 0xa8f1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2498 {0xa926, 0xa92d}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2499 {0xa947, 0xa953}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2500 {0xa980, 0xa983}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2501 {0xa9b3, 0xa9c0}, |
| 6495 | 2502 {0xa9e5, 0xa9e5}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2503 {0xaa29, 0xaa36}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2504 {0xaa43, 0xaa43}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2505 {0xaa4c, 0xaa4d}, |
| 6495 | 2506 {0xaa7b, 0xaa7d}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2507 {0xaab0, 0xaab0}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2508 {0xaab2, 0xaab4}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2509 {0xaab7, 0xaab8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2510 {0xaabe, 0xaabf}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2511 {0xaac1, 0xaac1}, |
| 6495 | 2512 {0xaaeb, 0xaaef}, |
| 2513 {0xaaf5, 0xaaf6}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2514 {0xabe3, 0xabea}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2515 {0xabec, 0xabed}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2516 {0xfb1e, 0xfb1e}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2517 {0xfe00, 0xfe0f}, |
| 6864 | 2518 {0xfe20, 0xfe2f}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2519 {0x101fd, 0x101fd}, |
| 6495 | 2520 {0x102e0, 0x102e0}, |
| 2521 {0x10376, 0x1037a}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2522 {0x10a01, 0x10a03}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2523 {0x10a05, 0x10a06}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2524 {0x10a0c, 0x10a0f}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2525 {0x10a38, 0x10a3a}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2526 {0x10a3f, 0x10a3f}, |
| 6495 | 2527 {0x10ae5, 0x10ae6}, |
| 2528 {0x11000, 0x11002}, | |
| 2529 {0x11038, 0x11046}, | |
| 2530 {0x1107f, 0x11082}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2531 {0x110b0, 0x110ba}, |
| 6495 | 2532 {0x11100, 0x11102}, |
| 2533 {0x11127, 0x11134}, | |
| 2534 {0x11173, 0x11173}, | |
| 2535 {0x11180, 0x11182}, | |
| 2536 {0x111b3, 0x111c0}, | |
| 6864 | 2537 {0x111ca, 0x111cc}, |
| 6495 | 2538 {0x1122c, 0x11237}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2539 {0x1123e, 0x1123e}, |
| 6495 | 2540 {0x112df, 0x112ea}, |
| 6864 | 2541 {0x11300, 0x11303}, |
| 6495 | 2542 {0x1133c, 0x1133c}, |
| 2543 {0x1133e, 0x11344}, | |
| 2544 {0x11347, 0x11348}, | |
| 2545 {0x1134b, 0x1134d}, | |
| 2546 {0x11357, 0x11357}, | |
| 2547 {0x11362, 0x11363}, | |
| 2548 {0x11366, 0x1136c}, | |
| 2549 {0x11370, 0x11374}, | |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2550 {0x11435, 0x11446}, |
| 6495 | 2551 {0x114b0, 0x114c3}, |
| 2552 {0x115af, 0x115b5}, | |
| 2553 {0x115b8, 0x115c0}, | |
| 6864 | 2554 {0x115dc, 0x115dd}, |
| 6495 | 2555 {0x11630, 0x11640}, |
| 2556 {0x116ab, 0x116b7}, | |
| 6864 | 2557 {0x1171d, 0x1172b}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2558 {0x11a01, 0x11a0a}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2559 {0x11a33, 0x11a39}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2560 {0x11a3b, 0x11a3e}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2561 {0x11a47, 0x11a47}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2562 {0x11a51, 0x11a5b}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2563 {0x11a8a, 0x11a99}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2564 {0x11c2f, 0x11c36}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2565 {0x11c38, 0x11c3f}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2566 {0x11c92, 0x11ca7}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2567 {0x11ca9, 0x11cb6}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2568 {0x11d31, 0x11d36}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2569 {0x11d3a, 0x11d3a}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2570 {0x11d3c, 0x11d3d}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2571 {0x11d3f, 0x11d45}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2572 {0x11d47, 0x11d47}, |
| 6495 | 2573 {0x16af0, 0x16af4}, |
| 2574 {0x16b30, 0x16b36}, | |
| 2575 {0x16f51, 0x16f7e}, | |
| 2576 {0x16f8f, 0x16f92}, | |
| 2577 {0x1bc9d, 0x1bc9e}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2578 {0x1d165, 0x1d169}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2579 {0x1d16d, 0x1d172}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2580 {0x1d17b, 0x1d182}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2581 {0x1d185, 0x1d18b}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2582 {0x1d1aa, 0x1d1ad}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2583 {0x1d242, 0x1d244}, |
| 6864 | 2584 {0x1da00, 0x1da36}, |
| 2585 {0x1da3b, 0x1da6c}, | |
| 2586 {0x1da75, 0x1da75}, | |
| 2587 {0x1da84, 0x1da84}, | |
| 2588 {0x1da9b, 0x1da9f}, | |
| 2589 {0x1daa1, 0x1daaf}, | |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2590 {0x1e000, 0x1e006}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2591 {0x1e008, 0x1e018}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2592 {0x1e01b, 0x1e021}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2593 {0x1e023, 0x1e024}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2594 {0x1e026, 0x1e02a}, |
| 6495 | 2595 {0x1e8d0, 0x1e8d6}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
2596 {0x1e944, 0x1e94a}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2597 {0xe0100, 0xe01ef} |
| 7 | 2598 }; |
| 2599 | |
| 2600 return intable(combining, sizeof(combining), c); | |
| 2601 } | |
| 2602 | |
| 2603 /* | |
| 2604 * Return TRUE for characters that can be displayed in a normal way. | |
| 2605 * Only for characters of 0x100 and above! | |
| 2606 */ | |
| 2607 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2608 utf_printable(int c) |
| 7 | 2609 { |
| 2610 #ifdef USE_WCHAR_FUNCTIONS | |
| 2611 /* | |
| 2612 * Assume the iswprint() library function works better than our own stuff. | |
| 2613 */ | |
| 2614 return iswprint(c); | |
| 2615 #else | |
| 2616 /* Sorted list of non-overlapping intervals. | |
| 2617 * 0xd800-0xdfff is reserved for UTF-16, actually illegal. */ | |
| 2618 static struct interval nonprint[] = | |
| 2619 { | |
| 2620 {0x070f, 0x070f}, {0x180b, 0x180e}, {0x200b, 0x200f}, {0x202a, 0x202e}, | |
| 2621 {0x206a, 0x206f}, {0xd800, 0xdfff}, {0xfeff, 0xfeff}, {0xfff9, 0xfffb}, | |
| 2622 {0xfffe, 0xffff} | |
| 2623 }; | |
| 2624 | |
| 2625 return !intable(nonprint, sizeof(nonprint), c); | |
| 2626 #endif | |
| 2627 } | |
| 2628 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2629 /* Sorted list of non-overlapping intervals of all Emoji characters, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2630 * based on http://unicode.org/emoji/charts/emoji-list.html */ |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2631 static struct interval emoji_all[] = |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2632 { |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2633 {0x203c, 0x203c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2634 {0x2049, 0x2049}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2635 {0x2122, 0x2122}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2636 {0x2139, 0x2139}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2637 {0x2194, 0x2199}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2638 {0x21a9, 0x21aa}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2639 {0x231a, 0x231b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2640 {0x2328, 0x2328}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2641 {0x23cf, 0x23cf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2642 {0x23e9, 0x23f3}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2643 {0x23f8, 0x23fa}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2644 {0x24c2, 0x24c2}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2645 {0x25aa, 0x25ab}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2646 {0x25b6, 0x25b6}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2647 {0x25c0, 0x25c0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2648 {0x25fb, 0x25fe}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2649 {0x2600, 0x2604}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2650 {0x260e, 0x260e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2651 {0x2611, 0x2611}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2652 {0x2614, 0x2615}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2653 {0x2618, 0x2618}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2654 {0x261d, 0x261d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2655 {0x2620, 0x2620}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2656 {0x2622, 0x2623}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2657 {0x2626, 0x2626}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2658 {0x262a, 0x262a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2659 {0x262e, 0x262f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2660 {0x2638, 0x263a}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2661 {0x2640, 0x2640}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2662 {0x2642, 0x2642}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2663 {0x2648, 0x2653}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2664 {0x2660, 0x2660}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2665 {0x2663, 0x2663}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2666 {0x2665, 0x2666}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2667 {0x2668, 0x2668}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2668 {0x267b, 0x267b}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2669 {0x267f, 0x267f}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2670 {0x2692, 0x2697}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2671 {0x2699, 0x2699}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2672 {0x269b, 0x269c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2673 {0x26a0, 0x26a1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2674 {0x26aa, 0x26ab}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2675 {0x26b0, 0x26b1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2676 {0x26bd, 0x26be}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2677 {0x26c4, 0x26c5}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2678 {0x26c8, 0x26c8}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2679 {0x26ce, 0x26cf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2680 {0x26d1, 0x26d1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2681 {0x26d3, 0x26d4}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2682 {0x26e9, 0x26ea}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2683 {0x26f0, 0x26f5}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2684 {0x26f7, 0x26fa}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2685 {0x26fd, 0x26fd}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2686 {0x2702, 0x2702}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2687 {0x2705, 0x2705}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2688 {0x2708, 0x270d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2689 {0x270f, 0x270f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2690 {0x2712, 0x2712}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2691 {0x2714, 0x2714}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2692 {0x2716, 0x2716}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2693 {0x271d, 0x271d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2694 {0x2721, 0x2721}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2695 {0x2728, 0x2728}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2696 {0x2733, 0x2734}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2697 {0x2744, 0x2744}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2698 {0x2747, 0x2747}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2699 {0x274c, 0x274c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2700 {0x274e, 0x274e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2701 {0x2753, 0x2755}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2702 {0x2757, 0x2757}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2703 {0x2763, 0x2764}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2704 {0x2795, 0x2797}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2705 {0x27a1, 0x27a1}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2706 {0x27b0, 0x27b0}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2707 {0x27bf, 0x27bf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2708 {0x2934, 0x2935}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2709 {0x2b05, 0x2b07}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2710 {0x2b1b, 0x2b1c}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2711 {0x2b50, 0x2b50}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2712 {0x2b55, 0x2b55}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2713 {0x3030, 0x3030}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2714 {0x303d, 0x303d}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2715 {0x3297, 0x3297}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2716 {0x3299, 0x3299}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2717 {0x1f004, 0x1f004}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2718 {0x1f0cf, 0x1f0cf}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2719 {0x1f170, 0x1f171}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2720 {0x1f17e, 0x1f17f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2721 {0x1f18e, 0x1f18e}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2722 {0x1f191, 0x1f19a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2723 {0x1f1e6, 0x1f1ff}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2724 {0x1f201, 0x1f202}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2725 {0x1f21a, 0x1f21a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2726 {0x1f22f, 0x1f22f}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2727 {0x1f232, 0x1f23a}, |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2728 {0x1f250, 0x1f251}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2729 {0x1f300, 0x1f321}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2730 {0x1f324, 0x1f393}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2731 {0x1f396, 0x1f397}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2732 {0x1f399, 0x1f39b}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2733 {0x1f39e, 0x1f3f0}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2734 {0x1f3f3, 0x1f3f5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2735 {0x1f3f7, 0x1f4fd}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2736 {0x1f4ff, 0x1f53d}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2737 {0x1f549, 0x1f54e}, |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2738 {0x1f550, 0x1f567}, |
|
11539
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2739 {0x1f56f, 0x1f570}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2740 {0x1f573, 0x1f57a}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2741 {0x1f587, 0x1f587}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2742 {0x1f58a, 0x1f58d}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2743 {0x1f590, 0x1f590}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2744 {0x1f595, 0x1f596}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2745 {0x1f5a4, 0x1f5a5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2746 {0x1f5a8, 0x1f5a8}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2747 {0x1f5b1, 0x1f5b2}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2748 {0x1f5bc, 0x1f5bc}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2749 {0x1f5c2, 0x1f5c4}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2750 {0x1f5d1, 0x1f5d3}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2751 {0x1f5dc, 0x1f5de}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2752 {0x1f5e1, 0x1f5e1}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2753 {0x1f5e3, 0x1f5e3}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2754 {0x1f5e8, 0x1f5e8}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2755 {0x1f5ef, 0x1f5ef}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2756 {0x1f5f3, 0x1f5f3}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2757 {0x1f5fa, 0x1f64f}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2758 {0x1f680, 0x1f6c5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2759 {0x1f6cb, 0x1f6d2}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2760 {0x1f6e0, 0x1f6e5}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2761 {0x1f6e9, 0x1f6e9}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2762 {0x1f6eb, 0x1f6ec}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2763 {0x1f6f0, 0x1f6f0}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2764 {0x1f6f3, 0x1f6f8}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2765 {0x1f910, 0x1f93a}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2766 {0x1f93c, 0x1f93e}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2767 {0x1f940, 0x1f945}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2768 {0x1f947, 0x1f94c}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2769 {0x1f950, 0x1f96b}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2770 {0x1f980, 0x1f997}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2771 {0x1f9c0, 0x1f9c0}, |
|
f7ba69508fd5
patch 8.0.0652: unicode information is outdated
Christian Brabandt <cb@256bit.org>
parents:
11474
diff
changeset
|
2772 {0x1f9d0, 0x1f9e6} |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2773 }; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2774 |
| 7 | 2775 /* |
| 2776 * Get class of a Unicode character. | |
| 2777 * 0: white space | |
| 2778 * 1: punctuation | |
| 2779 * 2 or bigger: some class of word character. | |
| 2780 */ | |
| 2781 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2782 utf_class(int c) |
| 7 | 2783 { |
|
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2784 return utf_class_buf(c, curbuf); |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2785 } |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2786 |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2787 int |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2788 utf_class_buf(int c, buf_T *buf) |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2789 { |
| 7 | 2790 /* sorted list of non-overlapping intervals */ |
| 2791 static struct clinterval | |
| 2792 { | |
| 5477 | 2793 unsigned int first; |
| 2794 unsigned int last; | |
| 2795 unsigned int class; | |
| 7 | 2796 } classes[] = |
| 2797 { | |
| 2798 {0x037e, 0x037e, 1}, /* Greek question mark */ | |
| 2799 {0x0387, 0x0387, 1}, /* Greek ano teleia */ | |
| 2800 {0x055a, 0x055f, 1}, /* Armenian punctuation */ | |
| 2801 {0x0589, 0x0589, 1}, /* Armenian full stop */ | |
| 2802 {0x05be, 0x05be, 1}, | |
| 2803 {0x05c0, 0x05c0, 1}, | |
| 2804 {0x05c3, 0x05c3, 1}, | |
| 2805 {0x05f3, 0x05f4, 1}, | |
| 2806 {0x060c, 0x060c, 1}, | |
| 2807 {0x061b, 0x061b, 1}, | |
| 2808 {0x061f, 0x061f, 1}, | |
| 2809 {0x066a, 0x066d, 1}, | |
| 2810 {0x06d4, 0x06d4, 1}, | |
| 2811 {0x0700, 0x070d, 1}, /* Syriac punctuation */ | |
| 2812 {0x0964, 0x0965, 1}, | |
| 2813 {0x0970, 0x0970, 1}, | |
| 2814 {0x0df4, 0x0df4, 1}, | |
| 2815 {0x0e4f, 0x0e4f, 1}, | |
| 2816 {0x0e5a, 0x0e5b, 1}, | |
| 2817 {0x0f04, 0x0f12, 1}, | |
| 2818 {0x0f3a, 0x0f3d, 1}, | |
| 2819 {0x0f85, 0x0f85, 1}, | |
| 2820 {0x104a, 0x104f, 1}, /* Myanmar punctuation */ | |
| 2821 {0x10fb, 0x10fb, 1}, /* Georgian punctuation */ | |
| 2822 {0x1361, 0x1368, 1}, /* Ethiopic punctuation */ | |
| 2823 {0x166d, 0x166e, 1}, /* Canadian Syl. punctuation */ | |
| 2824 {0x1680, 0x1680, 0}, | |
| 2825 {0x169b, 0x169c, 1}, | |
| 2826 {0x16eb, 0x16ed, 1}, | |
| 2827 {0x1735, 0x1736, 1}, | |
| 2828 {0x17d4, 0x17dc, 1}, /* Khmer punctuation */ | |
| 2829 {0x1800, 0x180a, 1}, /* Mongolian punctuation */ | |
| 2830 {0x2000, 0x200b, 0}, /* spaces */ | |
| 2831 {0x200c, 0x2027, 1}, /* punctuation and symbols */ | |
| 2832 {0x2028, 0x2029, 0}, | |
| 2833 {0x202a, 0x202e, 1}, /* punctuation and symbols */ | |
| 2834 {0x202f, 0x202f, 0}, | |
| 2835 {0x2030, 0x205e, 1}, /* punctuation and symbols */ | |
| 2836 {0x205f, 0x205f, 0}, | |
| 2837 {0x2060, 0x27ff, 1}, /* punctuation and symbols */ | |
| 2838 {0x2070, 0x207f, 0x2070}, /* superscript */ | |
| 1593 | 2839 {0x2080, 0x2094, 0x2080}, /* subscript */ |
| 2840 {0x20a0, 0x27ff, 1}, /* all kinds of symbols */ | |
| 2841 {0x2800, 0x28ff, 0x2800}, /* braille */ | |
| 2842 {0x2900, 0x2998, 1}, /* arrows, brackets, etc. */ | |
| 7 | 2843 {0x29d8, 0x29db, 1}, |
| 2844 {0x29fc, 0x29fd, 1}, | |
| 6218 | 2845 {0x2e00, 0x2e7f, 1}, /* supplemental punctuation */ |
| 7 | 2846 {0x3000, 0x3000, 0}, /* ideographic space */ |
| 2847 {0x3001, 0x3020, 1}, /* ideographic punctuation */ | |
| 2848 {0x3030, 0x3030, 1}, | |
| 2849 {0x303d, 0x303d, 1}, | |
| 2850 {0x3040, 0x309f, 0x3040}, /* Hiragana */ | |
| 2851 {0x30a0, 0x30ff, 0x30a0}, /* Katakana */ | |
| 2852 {0x3300, 0x9fff, 0x4e00}, /* CJK Ideographs */ | |
| 2853 {0xac00, 0xd7a3, 0xac00}, /* Hangul Syllables */ | |
| 2854 {0xf900, 0xfaff, 0x4e00}, /* CJK Ideographs */ | |
| 2855 {0xfd3e, 0xfd3f, 1}, | |
| 2856 {0xfe30, 0xfe6b, 1}, /* punctuation forms */ | |
| 2857 {0xff00, 0xff0f, 1}, /* half/fullwidth ASCII */ | |
| 2858 {0xff1a, 0xff20, 1}, /* half/fullwidth ASCII */ | |
| 2859 {0xff3b, 0xff40, 1}, /* half/fullwidth ASCII */ | |
| 2860 {0xff5b, 0xff65, 1}, /* half/fullwidth ASCII */ | |
| 5477 | 2861 {0x20000, 0x2a6df, 0x4e00}, /* CJK Ideographs */ |
| 2862 {0x2a700, 0x2b73f, 0x4e00}, /* CJK Ideographs */ | |
| 2863 {0x2b740, 0x2b81f, 0x4e00}, /* CJK Ideographs */ | |
| 2864 {0x2f800, 0x2fa1f, 0x4e00}, /* CJK Ideographs */ | |
| 7 | 2865 }; |
|
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
2866 |
| 7 | 2867 int bot = 0; |
| 2868 int top = sizeof(classes) / sizeof(struct clinterval) - 1; | |
| 2869 int mid; | |
| 2870 | |
| 2871 /* First quick check for Latin1 characters, use 'iskeyword'. */ | |
| 2872 if (c < 0x100) | |
| 2873 { | |
| 335 | 2874 if (c == ' ' || c == '\t' || c == NUL || c == 0xa0) |
| 7 | 2875 return 0; /* blank */ |
|
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2876 if (vim_iswordc_buf(c, buf)) |
| 7 | 2877 return 2; /* word character */ |
| 2878 return 1; /* punctuation */ | |
| 2879 } | |
| 2880 | |
| 2881 /* binary search in table */ | |
| 2882 while (top >= bot) | |
| 2883 { | |
| 2884 mid = (bot + top) / 2; | |
| 5477 | 2885 if (classes[mid].last < (unsigned int)c) |
| 7 | 2886 bot = mid + 1; |
| 5477 | 2887 else if (classes[mid].first > (unsigned int)c) |
| 7 | 2888 top = mid - 1; |
| 2889 else | |
| 2890 return (int)classes[mid].class; | |
| 2891 } | |
| 2892 | |
|
8661
a931160ffc41
commit https://github.com/vim/vim/commit/4077b33a8370afb3d5ae74e556a0119cf51fe294
Christian Brabandt <cb@256bit.org>
parents:
8629
diff
changeset
|
2893 /* emoji */ |
|
8680
131e651fb347
commit https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Christian Brabandt <cb@256bit.org>
parents:
8661
diff
changeset
|
2894 if (intable(emoji_all, sizeof(emoji_all), c)) |
|
8661
a931160ffc41
commit https://github.com/vim/vim/commit/4077b33a8370afb3d5ae74e556a0119cf51fe294
Christian Brabandt <cb@256bit.org>
parents:
8629
diff
changeset
|
2895 return 3; |
|
a931160ffc41
commit https://github.com/vim/vim/commit/4077b33a8370afb3d5ae74e556a0119cf51fe294
Christian Brabandt <cb@256bit.org>
parents:
8629
diff
changeset
|
2896 |
| 7 | 2897 /* most other characters are "word" characters */ |
| 2898 return 2; | |
| 2899 } | |
| 2900 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2901 int |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2902 utf_ambiguous_width(int c) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2903 { |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2904 return c >= 0x80 && (intable(ambiguous, sizeof(ambiguous), c) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2905 || intable(emoji_all, sizeof(emoji_all), c)); |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2906 } |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8706
diff
changeset
|
2907 |
| 7 | 2908 /* |
| 2909 * Code for Unicode case-dependent operations. Based on notes in | |
| 2910 * http://www.unicode.org/Public/UNIDATA/CaseFolding.txt | |
| 2911 * 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
|
2912 * Last updated for Unicode 5.2. |
| 7 | 2913 */ |
| 2914 | |
| 2915 /* | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2916 * 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
|
2917 * 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
|
2918 * 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
|
2919 * 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
|
2920 * folded/upper/lower by adding 32. |
| 7 | 2921 */ |
| 2922 typedef struct | |
| 2923 { | |
| 2924 int rangeStart; | |
| 2925 int rangeEnd; | |
| 2926 int step; | |
| 2927 int offset; | |
| 2928 } convertStruct; | |
| 2929 | |
| 297 | 2930 static convertStruct foldCase[] = |
| 7 | 2931 { |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2932 {0x41,0x5a,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2933 {0xb5,0xb5,-1,775}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2934 {0xc0,0xd6,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2935 {0xd8,0xde,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2936 {0x100,0x12e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2937 {0x132,0x136,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2938 {0x139,0x147,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2939 {0x14a,0x176,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2940 {0x178,0x178,-1,-121}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2941 {0x179,0x17d,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2942 {0x17f,0x17f,-1,-268}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2943 {0x181,0x181,-1,210}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2944 {0x182,0x184,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2945 {0x186,0x186,-1,206}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2946 {0x187,0x187,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2947 {0x189,0x18a,1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2948 {0x18b,0x18b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2949 {0x18e,0x18e,-1,79}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2950 {0x18f,0x18f,-1,202}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2951 {0x190,0x190,-1,203}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2952 {0x191,0x191,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2953 {0x193,0x193,-1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2954 {0x194,0x194,-1,207}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2955 {0x196,0x196,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2956 {0x197,0x197,-1,209}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2957 {0x198,0x198,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2958 {0x19c,0x19c,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2959 {0x19d,0x19d,-1,213}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2960 {0x19f,0x19f,-1,214}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2961 {0x1a0,0x1a4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2962 {0x1a6,0x1a6,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2963 {0x1a7,0x1a7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2964 {0x1a9,0x1a9,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2965 {0x1ac,0x1ac,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2966 {0x1ae,0x1ae,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2967 {0x1af,0x1af,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2968 {0x1b1,0x1b2,1,217}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2969 {0x1b3,0x1b5,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2970 {0x1b7,0x1b7,-1,219}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2971 {0x1b8,0x1bc,4,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2972 {0x1c4,0x1c4,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2973 {0x1c5,0x1c5,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2974 {0x1c7,0x1c7,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2975 {0x1c8,0x1c8,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2976 {0x1ca,0x1ca,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2977 {0x1cb,0x1db,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2978 {0x1de,0x1ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2979 {0x1f1,0x1f1,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2980 {0x1f2,0x1f4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2981 {0x1f6,0x1f6,-1,-97}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2982 {0x1f7,0x1f7,-1,-56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2983 {0x1f8,0x21e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2984 {0x220,0x220,-1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2985 {0x222,0x232,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2986 {0x23a,0x23a,-1,10795}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2987 {0x23b,0x23b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2988 {0x23d,0x23d,-1,-163}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2989 {0x23e,0x23e,-1,10792}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2990 {0x241,0x241,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2991 {0x243,0x243,-1,-195}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2992 {0x244,0x244,-1,69}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2993 {0x245,0x245,-1,71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2994 {0x246,0x24e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2995 {0x345,0x345,-1,116}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2996 {0x370,0x372,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2997 {0x376,0x376,-1,1}, |
| 6495 | 2998 {0x37f,0x37f,-1,116}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
2999 {0x386,0x386,-1,38}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3000 {0x388,0x38a,1,37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3001 {0x38c,0x38c,-1,64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3002 {0x38e,0x38f,1,63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3003 {0x391,0x3a1,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3004 {0x3a3,0x3ab,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3005 {0x3c2,0x3c2,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3006 {0x3cf,0x3cf,-1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3007 {0x3d0,0x3d0,-1,-30}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3008 {0x3d1,0x3d1,-1,-25}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3009 {0x3d5,0x3d5,-1,-15}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3010 {0x3d6,0x3d6,-1,-22}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3011 {0x3d8,0x3ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3012 {0x3f0,0x3f0,-1,-54}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3013 {0x3f1,0x3f1,-1,-48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3014 {0x3f4,0x3f4,-1,-60}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3015 {0x3f5,0x3f5,-1,-64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3016 {0x3f7,0x3f7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3017 {0x3f9,0x3f9,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3018 {0x3fa,0x3fa,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3019 {0x3fd,0x3ff,1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3020 {0x400,0x40f,1,80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3021 {0x410,0x42f,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3022 {0x460,0x480,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3023 {0x48a,0x4be,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3024 {0x4c0,0x4c0,-1,15}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3025 {0x4c1,0x4cd,2,1}, |
| 6495 | 3026 {0x4d0,0x52e,2,1}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3027 {0x531,0x556,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3028 {0x10a0,0x10c5,1,7264}, |
| 6495 | 3029 {0x10c7,0x10cd,6,7264}, |
| 6864 | 3030 {0x13f8,0x13fd,1,-8}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3031 {0x1c80,0x1c80,-1,-6222}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3032 {0x1c81,0x1c81,-1,-6221}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3033 {0x1c82,0x1c82,-1,-6212}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3034 {0x1c83,0x1c84,1,-6210}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3035 {0x1c85,0x1c85,-1,-6211}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3036 {0x1c86,0x1c86,-1,-6204}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3037 {0x1c87,0x1c87,-1,-6180}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3038 {0x1c88,0x1c88,-1,35267}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3039 {0x1e00,0x1e94,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3040 {0x1e9b,0x1e9b,-1,-58}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3041 {0x1e9e,0x1e9e,-1,-7615}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3042 {0x1ea0,0x1efe,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3043 {0x1f08,0x1f0f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3044 {0x1f18,0x1f1d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3045 {0x1f28,0x1f2f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3046 {0x1f38,0x1f3f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3047 {0x1f48,0x1f4d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3048 {0x1f59,0x1f5f,2,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3049 {0x1f68,0x1f6f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3050 {0x1f88,0x1f8f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3051 {0x1f98,0x1f9f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3052 {0x1fa8,0x1faf,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3053 {0x1fb8,0x1fb9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3054 {0x1fba,0x1fbb,1,-74}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3055 {0x1fbc,0x1fbc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3056 {0x1fbe,0x1fbe,-1,-7173}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3057 {0x1fc8,0x1fcb,1,-86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3058 {0x1fcc,0x1fcc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3059 {0x1fd8,0x1fd9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3060 {0x1fda,0x1fdb,1,-100}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3061 {0x1fe8,0x1fe9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3062 {0x1fea,0x1feb,1,-112}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3063 {0x1fec,0x1fec,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3064 {0x1ff8,0x1ff9,1,-128}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3065 {0x1ffa,0x1ffb,1,-126}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3066 {0x1ffc,0x1ffc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3067 {0x2126,0x2126,-1,-7517}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3068 {0x212a,0x212a,-1,-8383}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3069 {0x212b,0x212b,-1,-8262}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3070 {0x2132,0x2132,-1,28}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3071 {0x2160,0x216f,1,16}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3072 {0x2183,0x2183,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3073 {0x24b6,0x24cf,1,26}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3074 {0x2c00,0x2c2e,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3075 {0x2c60,0x2c60,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3076 {0x2c62,0x2c62,-1,-10743}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3077 {0x2c63,0x2c63,-1,-3814}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3078 {0x2c64,0x2c64,-1,-10727}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3079 {0x2c67,0x2c6b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3080 {0x2c6d,0x2c6d,-1,-10780}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3081 {0x2c6e,0x2c6e,-1,-10749}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3082 {0x2c6f,0x2c6f,-1,-10783}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3083 {0x2c70,0x2c70,-1,-10782}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3084 {0x2c72,0x2c75,3,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3085 {0x2c7e,0x2c7f,1,-10815}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3086 {0x2c80,0x2ce2,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3087 {0x2ceb,0x2ced,2,1}, |
| 6495 | 3088 {0x2cf2,0xa640,31054,1}, |
| 3089 {0xa642,0xa66c,2,1}, | |
| 3090 {0xa680,0xa69a,2,1}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3091 {0xa722,0xa72e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3092 {0xa732,0xa76e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3093 {0xa779,0xa77b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3094 {0xa77d,0xa77d,-1,-35332}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3095 {0xa77e,0xa786,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3096 {0xa78b,0xa78b,-1,1}, |
| 6495 | 3097 {0xa78d,0xa78d,-1,-42280}, |
| 3098 {0xa790,0xa792,2,1}, | |
| 3099 {0xa796,0xa7a8,2,1}, | |
| 3100 {0xa7aa,0xa7aa,-1,-42308}, | |
| 3101 {0xa7ab,0xa7ab,-1,-42319}, | |
| 3102 {0xa7ac,0xa7ac,-1,-42315}, | |
| 3103 {0xa7ad,0xa7ad,-1,-42305}, | |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3104 {0xa7ae,0xa7ae,-1,-42308}, |
| 6495 | 3105 {0xa7b0,0xa7b0,-1,-42258}, |
| 3106 {0xa7b1,0xa7b1,-1,-42282}, | |
| 6864 | 3107 {0xa7b2,0xa7b2,-1,-42261}, |
| 3108 {0xa7b3,0xa7b3,-1,928}, | |
| 3109 {0xa7b4,0xa7b6,2,1}, | |
| 3110 {0xab70,0xabbf,1,-38864}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3111 {0xff21,0xff3a,1,32}, |
| 6495 | 3112 {0x10400,0x10427,1,40}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3113 {0x104b0,0x104d3,1,40}, |
| 6864 | 3114 {0x10c80,0x10cb2,1,64}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3115 {0x118a0,0x118bf,1,32}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3116 {0x1e900,0x1e921,1,34} |
| 7 | 3117 }; |
| 3118 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
3119 static int utf_convert(int a, convertStruct table[], int tableSize); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
3120 static int utf_strnicmp(char_u *s1, char_u *s2, size_t n1, size_t n2); |
| 7 | 3121 |
| 3122 /* | |
| 3123 * Generic conversion function for case operations. | |
| 3124 * Return the converted equivalent of "a", which is a UCS-4 character. Use | |
| 3125 * the given conversion "table". Uses binary search on "table". | |
| 3126 */ | |
| 3127 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3128 utf_convert( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3129 int a, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3130 convertStruct table[], |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3131 int tableSize) |
| 7 | 3132 { |
| 3133 int start, mid, end; /* indices into table */ | |
| 3190 | 3134 int entries = tableSize / sizeof(convertStruct); |
| 7 | 3135 |
| 3136 start = 0; | |
| 3190 | 3137 end = entries; |
| 7 | 3138 while (start < end) |
| 3139 { | |
| 3140 /* need to search further */ | |
| 3190 | 3141 mid = (end + start) / 2; |
| 7 | 3142 if (table[mid].rangeEnd < a) |
| 3143 start = mid + 1; | |
| 3144 else | |
| 3145 end = mid; | |
| 3146 } | |
| 3190 | 3147 if (start < entries |
| 3148 && table[start].rangeStart <= a | |
| 3149 && a <= table[start].rangeEnd | |
| 7 | 3150 && (a - table[start].rangeStart) % table[start].step == 0) |
| 3151 return (a + table[start].offset); | |
| 3152 else | |
| 3153 return a; | |
| 3154 } | |
| 3155 | |
| 3156 /* | |
| 3157 * Return the folded-case equivalent of "a", which is a UCS-4 character. Uses | |
| 3158 * simple case folding. | |
| 3159 */ | |
| 3160 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3161 utf_fold(int a) |
| 7 | 3162 { |
|
9477
045543df0c28
commit https://github.com/vim/vim/commit/c4a927ca8dc383190d5df2cacd3f966698b6190c
Christian Brabandt <cb@256bit.org>
parents:
9357
diff
changeset
|
3163 if (a < 0x80) |
|
045543df0c28
commit https://github.com/vim/vim/commit/c4a927ca8dc383190d5df2cacd3f966698b6190c
Christian Brabandt <cb@256bit.org>
parents:
9357
diff
changeset
|
3164 /* be fast for ASCII */ |
|
045543df0c28
commit https://github.com/vim/vim/commit/c4a927ca8dc383190d5df2cacd3f966698b6190c
Christian Brabandt <cb@256bit.org>
parents:
9357
diff
changeset
|
3165 return a >= 0x41 && a <= 0x5a ? a + 32 : a; |
| 3190 | 3166 return utf_convert(a, foldCase, (int)sizeof(foldCase)); |
| 7 | 3167 } |
| 3168 | |
| 297 | 3169 static convertStruct toLower[] = |
| 7 | 3170 { |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3171 {0x41,0x5a,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3172 {0xc0,0xd6,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3173 {0xd8,0xde,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3174 {0x100,0x12e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3175 {0x130,0x130,-1,-199}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3176 {0x132,0x136,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3177 {0x139,0x147,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3178 {0x14a,0x176,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3179 {0x178,0x178,-1,-121}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3180 {0x179,0x17d,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3181 {0x181,0x181,-1,210}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3182 {0x182,0x184,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3183 {0x186,0x186,-1,206}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3184 {0x187,0x187,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3185 {0x189,0x18a,1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3186 {0x18b,0x18b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3187 {0x18e,0x18e,-1,79}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3188 {0x18f,0x18f,-1,202}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3189 {0x190,0x190,-1,203}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3190 {0x191,0x191,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3191 {0x193,0x193,-1,205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3192 {0x194,0x194,-1,207}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3193 {0x196,0x196,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3194 {0x197,0x197,-1,209}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3195 {0x198,0x198,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3196 {0x19c,0x19c,-1,211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3197 {0x19d,0x19d,-1,213}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3198 {0x19f,0x19f,-1,214}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3199 {0x1a0,0x1a4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3200 {0x1a6,0x1a6,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3201 {0x1a7,0x1a7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3202 {0x1a9,0x1a9,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3203 {0x1ac,0x1ac,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3204 {0x1ae,0x1ae,-1,218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3205 {0x1af,0x1af,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3206 {0x1b1,0x1b2,1,217}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3207 {0x1b3,0x1b5,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3208 {0x1b7,0x1b7,-1,219}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3209 {0x1b8,0x1bc,4,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3210 {0x1c4,0x1c4,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3211 {0x1c5,0x1c5,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3212 {0x1c7,0x1c7,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3213 {0x1c8,0x1c8,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3214 {0x1ca,0x1ca,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3215 {0x1cb,0x1db,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3216 {0x1de,0x1ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3217 {0x1f1,0x1f1,-1,2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3218 {0x1f2,0x1f4,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3219 {0x1f6,0x1f6,-1,-97}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3220 {0x1f7,0x1f7,-1,-56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3221 {0x1f8,0x21e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3222 {0x220,0x220,-1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3223 {0x222,0x232,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3224 {0x23a,0x23a,-1,10795}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3225 {0x23b,0x23b,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3226 {0x23d,0x23d,-1,-163}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3227 {0x23e,0x23e,-1,10792}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3228 {0x241,0x241,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3229 {0x243,0x243,-1,-195}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3230 {0x244,0x244,-1,69}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3231 {0x245,0x245,-1,71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3232 {0x246,0x24e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3233 {0x370,0x372,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3234 {0x376,0x376,-1,1}, |
| 6495 | 3235 {0x37f,0x37f,-1,116}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3236 {0x386,0x386,-1,38}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3237 {0x388,0x38a,1,37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3238 {0x38c,0x38c,-1,64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3239 {0x38e,0x38f,1,63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3240 {0x391,0x3a1,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3241 {0x3a3,0x3ab,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3242 {0x3cf,0x3cf,-1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3243 {0x3d8,0x3ee,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3244 {0x3f4,0x3f4,-1,-60}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3245 {0x3f7,0x3f7,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3246 {0x3f9,0x3f9,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3247 {0x3fa,0x3fa,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3248 {0x3fd,0x3ff,1,-130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3249 {0x400,0x40f,1,80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3250 {0x410,0x42f,1,32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3251 {0x460,0x480,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3252 {0x48a,0x4be,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3253 {0x4c0,0x4c0,-1,15}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3254 {0x4c1,0x4cd,2,1}, |
| 6495 | 3255 {0x4d0,0x52e,2,1}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3256 {0x531,0x556,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3257 {0x10a0,0x10c5,1,7264}, |
| 6495 | 3258 {0x10c7,0x10cd,6,7264}, |
| 6864 | 3259 {0x13a0,0x13ef,1,38864}, |
| 3260 {0x13f0,0x13f5,1,8}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3261 {0x1e00,0x1e94,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3262 {0x1e9e,0x1e9e,-1,-7615}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3263 {0x1ea0,0x1efe,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3264 {0x1f08,0x1f0f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3265 {0x1f18,0x1f1d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3266 {0x1f28,0x1f2f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3267 {0x1f38,0x1f3f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3268 {0x1f48,0x1f4d,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3269 {0x1f59,0x1f5f,2,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3270 {0x1f68,0x1f6f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3271 {0x1f88,0x1f8f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3272 {0x1f98,0x1f9f,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3273 {0x1fa8,0x1faf,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3274 {0x1fb8,0x1fb9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3275 {0x1fba,0x1fbb,1,-74}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3276 {0x1fbc,0x1fbc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3277 {0x1fc8,0x1fcb,1,-86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3278 {0x1fcc,0x1fcc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3279 {0x1fd8,0x1fd9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3280 {0x1fda,0x1fdb,1,-100}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3281 {0x1fe8,0x1fe9,1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3282 {0x1fea,0x1feb,1,-112}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3283 {0x1fec,0x1fec,-1,-7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3284 {0x1ff8,0x1ff9,1,-128}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3285 {0x1ffa,0x1ffb,1,-126}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3286 {0x1ffc,0x1ffc,-1,-9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3287 {0x2126,0x2126,-1,-7517}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3288 {0x212a,0x212a,-1,-8383}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3289 {0x212b,0x212b,-1,-8262}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3290 {0x2132,0x2132,-1,28}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3291 {0x2160,0x216f,1,16}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3292 {0x2183,0x2183,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3293 {0x24b6,0x24cf,1,26}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3294 {0x2c00,0x2c2e,1,48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3295 {0x2c60,0x2c60,-1,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3296 {0x2c62,0x2c62,-1,-10743}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3297 {0x2c63,0x2c63,-1,-3814}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3298 {0x2c64,0x2c64,-1,-10727}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3299 {0x2c67,0x2c6b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3300 {0x2c6d,0x2c6d,-1,-10780}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3301 {0x2c6e,0x2c6e,-1,-10749}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3302 {0x2c6f,0x2c6f,-1,-10783}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3303 {0x2c70,0x2c70,-1,-10782}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3304 {0x2c72,0x2c75,3,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3305 {0x2c7e,0x2c7f,1,-10815}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3306 {0x2c80,0x2ce2,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3307 {0x2ceb,0x2ced,2,1}, |
| 6495 | 3308 {0x2cf2,0xa640,31054,1}, |
| 3309 {0xa642,0xa66c,2,1}, | |
| 3310 {0xa680,0xa69a,2,1}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3311 {0xa722,0xa72e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3312 {0xa732,0xa76e,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3313 {0xa779,0xa77b,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3314 {0xa77d,0xa77d,-1,-35332}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3315 {0xa77e,0xa786,2,1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3316 {0xa78b,0xa78b,-1,1}, |
| 6495 | 3317 {0xa78d,0xa78d,-1,-42280}, |
| 3318 {0xa790,0xa792,2,1}, | |
| 3319 {0xa796,0xa7a8,2,1}, | |
| 3320 {0xa7aa,0xa7aa,-1,-42308}, | |
| 3321 {0xa7ab,0xa7ab,-1,-42319}, | |
| 3322 {0xa7ac,0xa7ac,-1,-42315}, | |
| 3323 {0xa7ad,0xa7ad,-1,-42305}, | |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3324 {0xa7ae,0xa7ae,-1,-42308}, |
| 6495 | 3325 {0xa7b0,0xa7b0,-1,-42258}, |
| 3326 {0xa7b1,0xa7b1,-1,-42282}, | |
| 6864 | 3327 {0xa7b2,0xa7b2,-1,-42261}, |
| 3328 {0xa7b3,0xa7b3,-1,928}, | |
| 3329 {0xa7b4,0xa7b6,2,1}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3330 {0xff21,0xff3a,1,32}, |
| 6495 | 3331 {0x10400,0x10427,1,40}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3332 {0x104b0,0x104d3,1,40}, |
| 6864 | 3333 {0x10c80,0x10cb2,1,64}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3334 {0x118a0,0x118bf,1,32}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3335 {0x1e900,0x1e921,1,34} |
| 7 | 3336 }; |
| 3337 | |
| 297 | 3338 static convertStruct toUpper[] = |
| 7 | 3339 { |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3340 {0x61,0x7a,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3341 {0xb5,0xb5,-1,743}, |
| 6495 | 3342 {0xe0,0xf6,1,-32}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3343 {0xf8,0xfe,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3344 {0xff,0xff,-1,121}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3345 {0x101,0x12f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3346 {0x131,0x131,-1,-232}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3347 {0x133,0x137,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3348 {0x13a,0x148,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3349 {0x14b,0x177,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3350 {0x17a,0x17e,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3351 {0x17f,0x17f,-1,-300}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3352 {0x180,0x180,-1,195}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3353 {0x183,0x185,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3354 {0x188,0x18c,4,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3355 {0x192,0x192,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3356 {0x195,0x195,-1,97}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3357 {0x199,0x199,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3358 {0x19a,0x19a,-1,163}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3359 {0x19e,0x19e,-1,130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3360 {0x1a1,0x1a5,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3361 {0x1a8,0x1ad,5,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3362 {0x1b0,0x1b4,4,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3363 {0x1b6,0x1b9,3,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3364 {0x1bd,0x1bd,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3365 {0x1bf,0x1bf,-1,56}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3366 {0x1c5,0x1c5,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3367 {0x1c6,0x1c6,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3368 {0x1c8,0x1c8,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3369 {0x1c9,0x1c9,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3370 {0x1cb,0x1cb,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3371 {0x1cc,0x1cc,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3372 {0x1ce,0x1dc,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3373 {0x1dd,0x1dd,-1,-79}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3374 {0x1df,0x1ef,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3375 {0x1f2,0x1f2,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3376 {0x1f3,0x1f3,-1,-2}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3377 {0x1f5,0x1f9,4,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3378 {0x1fb,0x21f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3379 {0x223,0x233,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3380 {0x23c,0x23c,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3381 {0x23f,0x240,1,10815}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3382 {0x242,0x247,5,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3383 {0x249,0x24f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3384 {0x250,0x250,-1,10783}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3385 {0x251,0x251,-1,10780}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3386 {0x252,0x252,-1,10782}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3387 {0x253,0x253,-1,-210}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3388 {0x254,0x254,-1,-206}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3389 {0x256,0x257,1,-205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3390 {0x259,0x259,-1,-202}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3391 {0x25b,0x25b,-1,-203}, |
| 6495 | 3392 {0x25c,0x25c,-1,42319}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3393 {0x260,0x260,-1,-205}, |
| 6495 | 3394 {0x261,0x261,-1,42315}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3395 {0x263,0x263,-1,-207}, |
| 6495 | 3396 {0x265,0x265,-1,42280}, |
| 3397 {0x266,0x266,-1,42308}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3398 {0x268,0x268,-1,-209}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3399 {0x269,0x269,-1,-211}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3400 {0x26a,0x26a,-1,42308}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3401 {0x26b,0x26b,-1,10743}, |
| 6495 | 3402 {0x26c,0x26c,-1,42305}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3403 {0x26f,0x26f,-1,-211}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3404 {0x271,0x271,-1,10749}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3405 {0x272,0x272,-1,-213}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3406 {0x275,0x275,-1,-214}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3407 {0x27d,0x27d,-1,10727}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3408 {0x280,0x283,3,-218}, |
| 6495 | 3409 {0x287,0x287,-1,42282}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3410 {0x288,0x288,-1,-218}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3411 {0x289,0x289,-1,-69}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3412 {0x28a,0x28b,1,-217}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3413 {0x28c,0x28c,-1,-71}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3414 {0x292,0x292,-1,-219}, |
| 6864 | 3415 {0x29d,0x29d,-1,42261}, |
| 6495 | 3416 {0x29e,0x29e,-1,42258}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3417 {0x345,0x345,-1,84}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3418 {0x371,0x373,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3419 {0x377,0x377,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3420 {0x37b,0x37d,1,130}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3421 {0x3ac,0x3ac,-1,-38}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3422 {0x3ad,0x3af,1,-37}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3423 {0x3b1,0x3c1,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3424 {0x3c2,0x3c2,-1,-31}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3425 {0x3c3,0x3cb,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3426 {0x3cc,0x3cc,-1,-64}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3427 {0x3cd,0x3ce,1,-63}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3428 {0x3d0,0x3d0,-1,-62}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3429 {0x3d1,0x3d1,-1,-57}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3430 {0x3d5,0x3d5,-1,-47}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3431 {0x3d6,0x3d6,-1,-54}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3432 {0x3d7,0x3d7,-1,-8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3433 {0x3d9,0x3ef,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3434 {0x3f0,0x3f0,-1,-86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3435 {0x3f1,0x3f1,-1,-80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3436 {0x3f2,0x3f2,-1,7}, |
| 6495 | 3437 {0x3f3,0x3f3,-1,-116}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3438 {0x3f5,0x3f5,-1,-96}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3439 {0x3f8,0x3fb,3,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3440 {0x430,0x44f,1,-32}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3441 {0x450,0x45f,1,-80}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3442 {0x461,0x481,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3443 {0x48b,0x4bf,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3444 {0x4c2,0x4ce,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3445 {0x4cf,0x4cf,-1,-15}, |
| 6495 | 3446 {0x4d1,0x52f,2,-1}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3447 {0x561,0x586,1,-48}, |
| 6864 | 3448 {0x13f8,0x13fd,1,-8}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3449 {0x1c80,0x1c80,-1,-6254}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3450 {0x1c81,0x1c81,-1,-6253}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3451 {0x1c82,0x1c82,-1,-6244}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3452 {0x1c83,0x1c84,1,-6242}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3453 {0x1c85,0x1c85,-1,-6243}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3454 {0x1c86,0x1c86,-1,-6236}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3455 {0x1c87,0x1c87,-1,-6181}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3456 {0x1c88,0x1c88,-1,35266}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3457 {0x1d79,0x1d79,-1,35332}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3458 {0x1d7d,0x1d7d,-1,3814}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3459 {0x1e01,0x1e95,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3460 {0x1e9b,0x1e9b,-1,-59}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3461 {0x1ea1,0x1eff,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3462 {0x1f00,0x1f07,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3463 {0x1f10,0x1f15,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3464 {0x1f20,0x1f27,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3465 {0x1f30,0x1f37,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3466 {0x1f40,0x1f45,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3467 {0x1f51,0x1f57,2,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3468 {0x1f60,0x1f67,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3469 {0x1f70,0x1f71,1,74}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3470 {0x1f72,0x1f75,1,86}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3471 {0x1f76,0x1f77,1,100}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3472 {0x1f78,0x1f79,1,128}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3473 {0x1f7a,0x1f7b,1,112}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3474 {0x1f7c,0x1f7d,1,126}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3475 {0x1f80,0x1f87,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3476 {0x1f90,0x1f97,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3477 {0x1fa0,0x1fa7,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3478 {0x1fb0,0x1fb1,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3479 {0x1fb3,0x1fb3,-1,9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3480 {0x1fbe,0x1fbe,-1,-7205}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3481 {0x1fc3,0x1fc3,-1,9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3482 {0x1fd0,0x1fd1,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3483 {0x1fe0,0x1fe1,1,8}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3484 {0x1fe5,0x1fe5,-1,7}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3485 {0x1ff3,0x1ff3,-1,9}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3486 {0x214e,0x214e,-1,-28}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3487 {0x2170,0x217f,1,-16}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3488 {0x2184,0x2184,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3489 {0x24d0,0x24e9,1,-26}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3490 {0x2c30,0x2c5e,1,-48}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3491 {0x2c61,0x2c61,-1,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3492 {0x2c65,0x2c65,-1,-10795}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3493 {0x2c66,0x2c66,-1,-10792}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3494 {0x2c68,0x2c6c,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3495 {0x2c73,0x2c76,3,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3496 {0x2c81,0x2ce3,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3497 {0x2cec,0x2cee,2,-1}, |
| 6495 | 3498 {0x2cf3,0x2cf3,-1,-1}, |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3499 {0x2d00,0x2d25,1,-7264}, |
| 6495 | 3500 {0x2d27,0x2d2d,6,-7264}, |
| 3501 {0xa641,0xa66d,2,-1}, | |
| 3502 {0xa681,0xa69b,2,-1}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3503 {0xa723,0xa72f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3504 {0xa733,0xa76f,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3505 {0xa77a,0xa77c,2,-1}, |
|
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3506 {0xa77f,0xa787,2,-1}, |
| 6495 | 3507 {0xa78c,0xa791,5,-1}, |
| 3508 {0xa793,0xa797,4,-1}, | |
| 3509 {0xa799,0xa7a9,2,-1}, | |
| 6864 | 3510 {0xa7b5,0xa7b7,2,-1}, |
| 3511 {0xab53,0xab53,-1,-928}, | |
| 3512 {0xab70,0xabbf,1,-38864}, | |
|
2041
d5867fd6b2b7
updated for version 7.2.330
Bram Moolenaar <bram@zimbu.org>
parents:
2015
diff
changeset
|
3513 {0xff41,0xff5a,1,-32}, |
| 6495 | 3514 {0x10428,0x1044f,1,-40}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3515 {0x104d8,0x104fb,1,-40}, |
| 6864 | 3516 {0x10cc0,0x10cf2,1,-64}, |
|
9357
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3517 {0x118c0,0x118df,1,-32}, |
|
f9524b765095
commit https://github.com/vim/vim/commit/04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
3518 {0x1e922,0x1e943,1,-34} |
| 7 | 3519 }; |
|
8682
4ce551bd5024
commit https://github.com/vim/vim/commit/d63aff0a65b955447de2fd8bfdaee29b61ce2843
Christian Brabandt <cb@256bit.org>
parents:
8680
diff
changeset
|
3520 |
| 7 | 3521 /* |
| 3522 * Return the upper-case equivalent of "a", which is a UCS-4 character. Use | |
| 3523 * simple case folding. | |
| 3524 */ | |
| 3525 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3526 utf_toupper(int a) |
| 7 | 3527 { |
| 3528 /* If 'casemap' contains "keepascii" use ASCII style toupper(). */ | |
| 3529 if (a < 128 && (cmp_flags & CMP_KEEPASCII)) | |
| 3530 return TOUPPER_ASC(a); | |
| 3531 | |
| 856 | 3532 #if defined(HAVE_TOWUPPER) && defined(__STDC_ISO_10646__) |
| 3533 /* If towupper() is available and handles Unicode, use it. */ | |
| 7 | 3534 if (!(cmp_flags & CMP_INTERNAL)) |
| 3535 return towupper(a); | |
| 3536 #endif | |
| 3537 | |
| 3538 /* For characters below 128 use locale sensitive toupper(). */ | |
| 3539 if (a < 128) | |
| 3540 return TOUPPER_LOC(a); | |
| 3541 | |
| 3542 /* For any other characters use the above mapping table. */ | |
| 3190 | 3543 return utf_convert(a, toUpper, (int)sizeof(toUpper)); |
| 7 | 3544 } |
| 3545 | |
| 3546 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3547 utf_islower(int a) |
| 7 | 3548 { |
| 3551 | 3549 /* German sharp s is lower case but has no upper case equivalent. */ |
| 3550 return (utf_toupper(a) != a) || a == 0xdf; | |
| 7 | 3551 } |
| 3552 | |
| 3553 /* | |
| 3554 * Return the lower-case equivalent of "a", which is a UCS-4 character. Use | |
| 3555 * simple case folding. | |
| 3556 */ | |
| 3557 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3558 utf_tolower(int a) |
| 7 | 3559 { |
| 3560 /* If 'casemap' contains "keepascii" use ASCII style tolower(). */ | |
| 3561 if (a < 128 && (cmp_flags & CMP_KEEPASCII)) | |
| 3562 return TOLOWER_ASC(a); | |
| 3563 | |
| 856 | 3564 #if defined(HAVE_TOWLOWER) && defined(__STDC_ISO_10646__) |
| 257 | 3565 /* If towlower() is available and handles Unicode, use it. */ |
| 7 | 3566 if (!(cmp_flags & CMP_INTERNAL)) |
| 3567 return towlower(a); | |
| 3568 #endif | |
| 3569 | |
| 3570 /* For characters below 128 use locale sensitive tolower(). */ | |
| 3571 if (a < 128) | |
| 3572 return TOLOWER_LOC(a); | |
| 3573 | |
| 3574 /* For any other characters use the above mapping table. */ | |
| 3190 | 3575 return utf_convert(a, toLower, (int)sizeof(toLower)); |
| 7 | 3576 } |
| 3577 | |
| 3578 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3579 utf_isupper(int a) |
| 7 | 3580 { |
| 3581 return (utf_tolower(a) != a); | |
| 3582 } | |
| 3583 | |
| 2961 | 3584 static int |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3585 utf_strnicmp( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3586 char_u *s1, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3587 char_u *s2, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3588 size_t n1, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3589 size_t n2) |
| 2961 | 3590 { |
| 3591 int c1, c2, cdiff; | |
| 3592 char_u buffer[6]; | |
| 3593 | |
| 3594 for (;;) | |
| 3595 { | |
| 3596 c1 = utf_safe_read_char_adv(&s1, &n1); | |
| 3597 c2 = utf_safe_read_char_adv(&s2, &n2); | |
| 3598 | |
| 3599 if (c1 <= 0 || c2 <= 0) | |
| 3600 break; | |
| 3601 | |
| 3602 if (c1 == c2) | |
| 3603 continue; | |
| 3604 | |
| 3605 cdiff = utf_fold(c1) - utf_fold(c2); | |
| 3606 if (cdiff != 0) | |
| 3607 return cdiff; | |
| 3608 } | |
| 3609 | |
| 3610 /* some string ended or has an incomplete/illegal character sequence */ | |
| 3611 | |
| 3612 if (c1 == 0 || c2 == 0) | |
| 3613 { | |
| 3614 /* some string ended. shorter string is smaller */ | |
| 3615 if (c1 == 0 && c2 == 0) | |
| 3616 return 0; | |
| 3617 return c1 == 0 ? -1 : 1; | |
| 3618 } | |
| 3619 | |
| 3620 /* Continue with bytewise comparison to produce some result that | |
| 3621 * would make comparison operations involving this function transitive. | |
| 3622 * | |
| 3623 * If only one string had an error, comparison should be made with | |
| 3624 * folded version of the other string. In this case it is enough | |
| 3625 * to fold just one character to determine the result of comparison. */ | |
| 3626 | |
| 3627 if (c1 != -1 && c2 == -1) | |
| 3628 { | |
| 3629 n1 = utf_char2bytes(utf_fold(c1), buffer); | |
| 3630 s1 = buffer; | |
| 3631 } | |
| 3632 else if (c2 != -1 && c1 == -1) | |
| 3633 { | |
| 3634 n2 = utf_char2bytes(utf_fold(c2), buffer); | |
| 3635 s2 = buffer; | |
| 3636 } | |
| 3637 | |
| 3638 while (n1 > 0 && n2 > 0 && *s1 != NUL && *s2 != NUL) | |
| 3639 { | |
| 3640 cdiff = (int)(*s1) - (int)(*s2); | |
| 3641 if (cdiff != 0) | |
| 3642 return cdiff; | |
| 3643 | |
| 3644 s1++; | |
| 3645 s2++; | |
| 3646 n1--; | |
| 3647 n2--; | |
| 3648 } | |
| 3649 | |
| 3650 if (n1 > 0 && *s1 == NUL) | |
| 3651 n1 = 0; | |
| 3652 if (n2 > 0 && *s2 == NUL) | |
| 3653 n2 = 0; | |
| 3654 | |
| 3655 if (n1 == 0 && n2 == 0) | |
| 3656 return 0; | |
| 3657 return n1 == 0 ? -1 : 1; | |
| 3658 } | |
| 3659 | |
| 7 | 3660 /* |
| 3661 * Version of strnicmp() that handles multi-byte characters. | |
| 4025 | 3662 * Needed for Big5, Shift-JIS and UTF-8 encoding. Other DBCS encodings can |
| 7 | 3663 * probably use strnicmp(), because there are no ASCII characters in the |
| 3664 * second byte. | |
| 3665 * Returns zero if s1 and s2 are equal (ignoring case), the difference between | |
| 3666 * two characters otherwise. | |
| 3667 */ | |
| 3668 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3669 mb_strnicmp(char_u *s1, char_u *s2, size_t nn) |
| 7 | 3670 { |
| 2961 | 3671 int i, l; |
| 7 | 3672 int cdiff; |
| 835 | 3673 int n = (int)nn; |
| 7 | 3674 |
| 2961 | 3675 if (enc_utf8) |
| 7 | 3676 { |
| 2961 | 3677 return utf_strnicmp(s1, s2, nn, nn); |
| 3678 } | |
| 3679 else | |
| 3680 { | |
| 3681 for (i = 0; i < n; i += l) | |
| 7 | 3682 { |
| 2961 | 3683 if (s1[i] == NUL && s2[i] == NUL) /* both strings end */ |
| 3684 return 0; | |
| 3685 | |
| 474 | 3686 l = (*mb_ptr2len)(s1 + i); |
| 7 | 3687 if (l <= 1) |
| 3688 { | |
| 3689 /* Single byte: first check normally, then with ignore case. */ | |
| 3690 if (s1[i] != s2[i]) | |
| 3691 { | |
| 1347 | 3692 cdiff = MB_TOLOWER(s1[i]) - MB_TOLOWER(s2[i]); |
| 7 | 3693 if (cdiff != 0) |
| 3694 return cdiff; | |
| 3695 } | |
| 3696 } | |
| 3697 else | |
| 3698 { | |
| 3699 /* For non-Unicode multi-byte don't ignore case. */ | |
| 3700 if (l > n - i) | |
| 3701 l = n - i; | |
| 3702 cdiff = STRNCMP(s1 + i, s2 + i, l); | |
| 3703 if (cdiff != 0) | |
| 3704 return cdiff; | |
| 3705 } | |
| 3706 } | |
| 3707 } | |
| 3708 return 0; | |
| 3709 } | |
| 3710 | |
| 3711 /* | |
| 3712 * "g8": show bytes of the UTF-8 char under the cursor. Doesn't matter what | |
| 3713 * 'encoding' has been set to. | |
| 3714 */ | |
| 3715 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3716 show_utf8(void) |
| 7 | 3717 { |
| 3718 int len; | |
| 273 | 3719 int rlen = 0; |
| 7 | 3720 char_u *line; |
| 3721 int clen; | |
| 3722 int i; | |
| 3723 | |
| 3724 /* Get the byte length of the char under the cursor, including composing | |
| 3725 * characters. */ | |
| 3726 line = ml_get_cursor(); | |
| 474 | 3727 len = utfc_ptr2len(line); |
| 7 | 3728 if (len == 0) |
| 3729 { | |
| 3730 MSG("NUL"); | |
| 3731 return; | |
| 3732 } | |
| 3733 | |
| 3734 clen = 0; | |
| 3735 for (i = 0; i < len; ++i) | |
| 3736 { | |
| 3737 if (clen == 0) | |
| 3738 { | |
| 3739 /* start of (composing) character, get its length */ | |
| 3740 if (i > 0) | |
| 273 | 3741 { |
| 3742 STRCPY(IObuff + rlen, "+ "); | |
| 3743 rlen += 2; | |
| 3744 } | |
| 474 | 3745 clen = utf_ptr2len(line + i); |
| 7 | 3746 } |
|
2205
54605ada811b
"g8" doesn't work properly on a NUL.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
3747 sprintf((char *)IObuff + rlen, "%02x ", |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
3748 (line[i] == NL) ? NUL : line[i]); /* NUL is stored as NL */ |
| 7 | 3749 --clen; |
| 835 | 3750 rlen += (int)STRLEN(IObuff + rlen); |
| 273 | 3751 if (rlen > IOSIZE - 20) |
| 3752 break; | |
| 7 | 3753 } |
| 3754 | |
| 3755 msg(IObuff); | |
| 3756 } | |
| 3757 | |
| 3758 /* | |
| 3759 * mb_head_off() function pointer. | |
| 3760 * Return offset from "p" to the first byte of the character it points into. | |
| 2015 | 3761 * If "p" points to the NUL at the end of the string return 0. |
| 7 | 3762 * Returns 0 when already at the first byte of a character. |
| 3763 */ | |
| 3764 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3765 latin_head_off(char_u *base UNUSED, char_u *p UNUSED) |
| 7 | 3766 { |
| 3767 return 0; | |
| 3768 } | |
| 3769 | |
| 3770 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3771 dbcs_head_off(char_u *base, char_u *p) |
| 7 | 3772 { |
| 3773 char_u *q; | |
| 3774 | |
| 3775 /* It can't be a trailing byte when not using DBCS, at the start of the | |
| 3776 * string or the previous byte can't start a double-byte. */ | |
| 2015 | 3777 if (p <= base || MB_BYTE2LEN(p[-1]) == 1 || *p == NUL) |
| 7 | 3778 return 0; |
| 3779 | |
| 3780 /* This is slow: need to start at the base and go forward until the | |
| 3781 * byte we are looking for. Return 1 when we went past it, 0 otherwise. */ | |
| 3782 q = base; | |
| 3783 while (q < p) | |
| 474 | 3784 q += dbcs_ptr2len(q); |
| 7 | 3785 return (q == p) ? 0 : 1; |
| 3786 } | |
| 3787 | |
| 3788 /* | |
| 3789 * Special version of dbcs_head_off() that works for ScreenLines[], where | |
| 3790 * single-width DBCS_JPNU characters are stored separately. | |
| 3791 */ | |
| 3792 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3793 dbcs_screen_head_off(char_u *base, char_u *p) |
| 7 | 3794 { |
| 3795 char_u *q; | |
| 3796 | |
| 3797 /* It can't be a trailing byte when not using DBCS, at the start of the | |
| 3798 * string or the previous byte can't start a double-byte. | |
| 3799 * For euc-jp an 0x8e byte in the previous cell always means we have a | |
| 3800 * lead byte in the current cell. */ | |
| 3801 if (p <= base | |
| 3802 || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e) | |
| 2015 | 3803 || MB_BYTE2LEN(p[-1]) == 1 |
| 3804 || *p == NUL) | |
| 7 | 3805 return 0; |
| 3806 | |
| 3807 /* This is slow: need to start at the base and go forward until the | |
| 3808 * byte we are looking for. Return 1 when we went past it, 0 otherwise. | |
| 3809 * For DBCS_JPNU look out for 0x8e, which means the second byte is not | |
| 3810 * stored as the next byte. */ | |
| 3811 q = base; | |
| 3812 while (q < p) | |
| 3813 { | |
| 3814 if (enc_dbcs == DBCS_JPNU && *q == 0x8e) | |
| 3815 ++q; | |
| 3816 else | |
| 474 | 3817 q += dbcs_ptr2len(q); |
| 7 | 3818 } |
| 3819 return (q == p) ? 0 : 1; | |
| 3820 } | |
| 3821 | |
| 3822 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3823 utf_head_off(char_u *base, char_u *p) |
| 7 | 3824 { |
| 3825 char_u *q; | |
| 3826 char_u *s; | |
| 3827 int c; | |
| 2015 | 3828 int len; |
| 7 | 3829 #ifdef FEAT_ARABIC |
| 3830 char_u *j; | |
| 3831 #endif | |
| 3832 | |
| 3833 if (*p < 0x80) /* be quick for ASCII */ | |
| 3834 return 0; | |
| 3835 | |
| 3836 /* Skip backwards over trailing bytes: 10xx.xxxx | |
| 3837 * Skip backwards again if on a composing char. */ | |
| 3838 for (q = p; ; --q) | |
| 3839 { | |
| 3840 /* Move s to the last byte of this char. */ | |
| 3841 for (s = q; (s[1] & 0xc0) == 0x80; ++s) | |
| 3842 ; | |
| 3843 /* Move q to the first byte of this char. */ | |
| 3844 while (q > base && (*q & 0xc0) == 0x80) | |
| 3845 --q; | |
| 3846 /* Check for illegal sequence. Do allow an illegal byte after where we | |
| 3847 * started. */ | |
| 2015 | 3848 len = utf8len_tab[*q]; |
| 3849 if (len != (int)(s - q + 1) && len != (int)(p - q + 1)) | |
| 7 | 3850 return 0; |
| 3851 | |
| 3852 if (q <= base) | |
| 3853 break; | |
| 3854 | |
| 3855 c = utf_ptr2char(q); | |
| 3856 if (utf_iscomposing(c)) | |
| 3857 continue; | |
| 3858 | |
| 3859 #ifdef FEAT_ARABIC | |
| 3860 if (arabic_maycombine(c)) | |
| 3861 { | |
| 3862 /* Advance to get a sneak-peak at the next char */ | |
| 3863 j = q; | |
| 3864 --j; | |
| 3865 /* Move j to the first byte of this char. */ | |
| 3866 while (j > base && (*j & 0xc0) == 0x80) | |
| 3867 --j; | |
| 3868 if (arabic_combine(utf_ptr2char(j), c)) | |
| 3869 continue; | |
| 3870 } | |
| 3871 #endif | |
| 3872 break; | |
| 3873 } | |
| 3874 | |
| 3875 return (int)(p - q); | |
| 3876 } | |
| 3877 | |
| 3878 /* | |
| 99 | 3879 * Copy a character from "*fp" to "*tp" and advance the pointers. |
| 3880 */ | |
| 3881 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3882 mb_copy_char(char_u **fp, char_u **tp) |
| 99 | 3883 { |
| 474 | 3884 int l = (*mb_ptr2len)(*fp); |
| 99 | 3885 |
| 3886 mch_memmove(*tp, *fp, (size_t)l); | |
| 3887 *tp += l; | |
| 3888 *fp += l; | |
| 3889 } | |
| 3890 | |
| 3891 /* | |
| 7 | 3892 * Return the offset from "p" to the first byte of a character. When "p" is |
| 3893 * at the start of a character 0 is returned, otherwise the offset to the next | |
| 3894 * character. Can start anywhere in a stream of bytes. | |
| 3895 */ | |
| 3896 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3897 mb_off_next(char_u *base, char_u *p) |
| 7 | 3898 { |
| 3899 int i; | |
| 3900 int j; | |
| 3901 | |
| 3902 if (enc_utf8) | |
| 3903 { | |
| 3904 if (*p < 0x80) /* be quick for ASCII */ | |
| 3905 return 0; | |
| 3906 | |
| 3907 /* Find the next character that isn't 10xx.xxxx */ | |
| 3908 for (i = 0; (p[i] & 0xc0) == 0x80; ++i) | |
| 3909 ; | |
| 3910 if (i > 0) | |
| 3911 { | |
| 3912 /* Check for illegal sequence. */ | |
| 3913 for (j = 0; p - j > base; ++j) | |
| 3914 if ((p[-j] & 0xc0) != 0x80) | |
| 3915 break; | |
| 3916 if (utf8len_tab[p[-j]] != i + j) | |
| 3917 return 0; | |
| 3918 } | |
| 3919 return i; | |
| 3920 } | |
| 3921 | |
| 3922 /* Only need to check if we're on a trail byte, it doesn't matter if we | |
| 3923 * want the offset to the next or current character. */ | |
| 3924 return (*mb_head_off)(base, p); | |
| 3925 } | |
| 3926 | |
| 3927 /* | |
| 3928 * Return the offset from "p" to the last byte of the character it points | |
| 3929 * into. Can start anywhere in a stream of bytes. | |
| 3930 */ | |
| 3931 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3932 mb_tail_off(char_u *base, char_u *p) |
| 7 | 3933 { |
| 3934 int i; | |
| 3935 int j; | |
| 3936 | |
| 3937 if (*p == NUL) | |
| 3938 return 0; | |
| 3939 | |
| 3940 if (enc_utf8) | |
| 3941 { | |
| 3942 /* Find the last character that is 10xx.xxxx */ | |
| 3943 for (i = 0; (p[i + 1] & 0xc0) == 0x80; ++i) | |
| 3944 ; | |
| 3945 /* Check for illegal sequence. */ | |
| 3946 for (j = 0; p - j > base; ++j) | |
| 3947 if ((p[-j] & 0xc0) != 0x80) | |
| 3948 break; | |
| 3949 if (utf8len_tab[p[-j]] != i + j + 1) | |
| 3950 return 0; | |
| 3951 return i; | |
| 3952 } | |
| 3953 | |
| 3954 /* It can't be the first byte if a double-byte when not using DBCS, at the | |
| 3955 * end of the string or the byte can't start a double-byte. */ | |
| 3956 if (enc_dbcs == 0 || p[1] == NUL || MB_BYTE2LEN(*p) == 1) | |
| 3957 return 0; | |
| 3958 | |
| 3959 /* Return 1 when on the lead byte, 0 when on the tail byte. */ | |
| 3960 return 1 - dbcs_head_off(base, p); | |
| 3961 } | |
| 3962 | |
| 776 | 3963 /* |
| 3964 * Find the next illegal byte sequence. | |
| 3965 */ | |
| 3966 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3967 utf_find_illegal(void) |
| 776 | 3968 { |
| 3969 pos_T pos = curwin->w_cursor; | |
| 3970 char_u *p; | |
| 3971 int len; | |
| 3972 vimconv_T vimconv; | |
| 3973 char_u *tofree = NULL; | |
| 3974 | |
| 3975 vimconv.vc_type = CONV_NONE; | |
| 3976 if (enc_utf8 && (enc_canon_props(curbuf->b_p_fenc) & ENC_8BIT)) | |
| 3977 { | |
| 3978 /* 'encoding' is "utf-8" but we are editing a 8-bit encoded file, | |
| 3979 * possibly a utf-8 file with illegal bytes. Setup for conversion | |
| 3980 * from utf-8 to 'fileencoding'. */ | |
| 3981 convert_setup(&vimconv, p_enc, curbuf->b_p_fenc); | |
| 3982 } | |
| 3983 | |
| 3984 #ifdef FEAT_VIRTUALEDIT | |
| 3985 curwin->w_cursor.coladd = 0; | |
| 3986 #endif | |
| 3987 for (;;) | |
| 3988 { | |
| 3989 p = ml_get_cursor(); | |
| 3990 if (vimconv.vc_type != CONV_NONE) | |
| 3991 { | |
| 3992 vim_free(tofree); | |
| 3993 tofree = string_convert(&vimconv, p, NULL); | |
| 3994 if (tofree == NULL) | |
| 3995 break; | |
| 3996 p = tofree; | |
| 3997 } | |
| 3998 | |
| 3999 while (*p != NUL) | |
| 4000 { | |
| 4001 /* Illegal means that there are not enough trail bytes (checked by | |
| 4002 * utf_ptr2len()) or too many of them (overlong sequence). */ | |
| 4003 len = utf_ptr2len(p); | |
| 4004 if (*p >= 0x80 && (len == 1 | |
| 4005 || utf_char2len(utf_ptr2char(p)) != len)) | |
| 4006 { | |
| 4007 if (vimconv.vc_type == CONV_NONE) | |
| 835 | 4008 curwin->w_cursor.col += (colnr_T)(p - ml_get_cursor()); |
| 776 | 4009 else |
| 4010 { | |
| 4011 int l; | |
| 4012 | |
| 835 | 4013 len = (int)(p - tofree); |
| 776 | 4014 for (p = ml_get_cursor(); *p != NUL && len-- > 0; p += l) |
| 4015 { | |
| 4016 l = utf_ptr2len(p); | |
| 4017 curwin->w_cursor.col += l; | |
| 4018 } | |
| 4019 } | |
| 4020 goto theend; | |
| 4021 } | |
| 4022 p += len; | |
| 4023 } | |
| 4024 if (curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
| 4025 break; | |
| 4026 ++curwin->w_cursor.lnum; | |
| 4027 curwin->w_cursor.col = 0; | |
| 4028 } | |
| 4029 | |
| 4030 /* didn't find it: don't move and beep */ | |
| 4031 curwin->w_cursor = pos; | |
| 4032 beep_flush(); | |
| 4033 | |
| 4034 theend: | |
| 4035 vim_free(tofree); | |
| 4036 convert_setup(&vimconv, NULL, NULL); | |
| 4037 } | |
| 4038 | |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
4039 #if defined(FEAT_GUI_GTK) || defined(PROTO) |
| 26 | 4040 /* |
| 4041 * Return TRUE if string "s" is a valid utf-8 string. | |
| 4042 * When "end" is NULL stop at the first NUL. | |
| 4043 * When "end" is positive stop there. | |
| 4044 */ | |
| 4045 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4046 utf_valid_string(char_u *s, char_u *end) |
| 26 | 4047 { |
| 4048 int l; | |
| 4049 char_u *p = s; | |
| 4050 | |
| 4051 while (end == NULL ? *p != NUL : p < end) | |
| 4052 { | |
| 2015 | 4053 l = utf8len_tab_zero[*p]; |
| 4054 if (l == 0) | |
| 26 | 4055 return FALSE; /* invalid lead byte */ |
| 4056 if (end != NULL && p + l > end) | |
| 4057 return FALSE; /* incomplete byte sequence */ | |
| 4058 ++p; | |
| 4059 while (--l > 0) | |
| 4060 if ((*p++ & 0xc0) != 0x80) | |
| 4061 return FALSE; /* invalid trail byte */ | |
| 4062 } | |
| 4063 return TRUE; | |
| 4064 } | |
| 4065 #endif | |
| 4066 | |
| 7 | 4067 #if defined(FEAT_GUI) || defined(PROTO) |
| 4068 /* | |
| 4069 * Special version of mb_tail_off() for use in ScreenLines[]. | |
| 4070 */ | |
| 4071 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4072 dbcs_screen_tail_off(char_u *base, char_u *p) |
| 7 | 4073 { |
| 4074 /* It can't be the first byte if a double-byte when not using DBCS, at the | |
| 4075 * end of the string or the byte can't start a double-byte. | |
| 4076 * For euc-jp an 0x8e byte always means we have a lead byte in the current | |
| 4077 * cell. */ | |
| 4078 if (*p == NUL || p[1] == NUL | |
| 4079 || (enc_dbcs == DBCS_JPNU && *p == 0x8e) | |
| 4080 || MB_BYTE2LEN(*p) == 1) | |
| 4081 return 0; | |
| 4082 | |
| 4083 /* Return 1 when on the lead byte, 0 when on the tail byte. */ | |
| 4084 return 1 - dbcs_screen_head_off(base, p); | |
| 4085 } | |
| 4086 #endif | |
| 4087 | |
| 4088 /* | |
| 4089 * If the cursor moves on an trail byte, set the cursor on the lead byte. | |
| 4090 * Thus it moves left if necessary. | |
| 4091 * Return TRUE when the cursor was adjusted. | |
| 4092 */ | |
| 4093 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4094 mb_adjust_cursor(void) |
| 7 | 4095 { |
| 2933 | 4096 mb_adjustpos(curbuf, &curwin->w_cursor); |
| 7 | 4097 } |
| 4098 | |
| 4099 /* | |
| 4100 * Adjust position "*lp" to point to the first byte of a multi-byte character. | |
| 4101 * If it points to a tail byte it's moved backwards to the head byte. | |
| 4102 */ | |
| 4103 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4104 mb_adjustpos(buf_T *buf, pos_T *lp) |
| 7 | 4105 { |
| 4106 char_u *p; | |
| 4107 | |
| 4108 if (lp->col > 0 | |
| 4109 #ifdef FEAT_VIRTUALEDIT | |
| 4110 || lp->coladd > 1 | |
| 4111 #endif | |
| 4112 ) | |
| 4113 { | |
| 2933 | 4114 p = ml_get_buf(buf, lp->lnum, FALSE); |
| 7 | 4115 lp->col -= (*mb_head_off)(p, p + lp->col); |
| 4116 #ifdef FEAT_VIRTUALEDIT | |
| 4117 /* Reset "coladd" when the cursor would be on the right half of a | |
| 4118 * double-wide character. */ | |
| 4119 if (lp->coladd == 1 | |
| 4120 && p[lp->col] != TAB | |
| 4121 && vim_isprintc((*mb_ptr2char)(p + lp->col)) | |
| 4122 && ptr2cells(p + lp->col) > 1) | |
| 4123 lp->coladd = 0; | |
| 4124 #endif | |
| 4125 } | |
| 4126 } | |
| 4127 | |
| 4128 /* | |
| 4129 * Return a pointer to the character before "*p", if there is one. | |
| 4130 */ | |
| 4131 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4132 mb_prevptr( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4133 char_u *line, /* start of the string */ |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4134 char_u *p) |
| 7 | 4135 { |
| 4136 if (p > line) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10724
diff
changeset
|
4137 MB_PTR_BACK(line, p); |
| 7 | 4138 return p; |
| 4139 } | |
| 4140 | |
| 4141 /* | |
| 474 | 4142 * Return the character length of "str". Each multi-byte character (with |
| 4143 * following composing characters) counts as one. | |
| 7 | 4144 */ |
| 4145 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4146 mb_charlen(char_u *str) |
| 7 | 4147 { |
| 500 | 4148 char_u *p = str; |
| 4149 int count; | |
| 4150 | |
| 4151 if (p == NULL) | |
| 7 | 4152 return 0; |
| 4153 | |
| 500 | 4154 for (count = 0; *p != NUL; count++) |
| 4155 p += (*mb_ptr2len)(p); | |
| 7 | 4156 |
| 4157 return count; | |
| 4158 } | |
| 4159 | |
| 740 | 4160 #if defined(FEAT_SPELL) || defined(PROTO) |
| 500 | 4161 /* |
| 4162 * Like mb_charlen() but for a string with specified length. | |
| 4163 */ | |
| 4164 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4165 mb_charlen_len(char_u *str, int len) |
| 500 | 4166 { |
| 4167 char_u *p = str; | |
| 4168 int count; | |
| 4169 | |
| 4170 for (count = 0; *p != NUL && p < str + len; count++) | |
| 4171 p += (*mb_ptr2len)(p); | |
| 4172 | |
| 4173 return count; | |
| 4174 } | |
| 4175 #endif | |
| 4176 | |
| 7 | 4177 /* |
| 4178 * Try to un-escape a multi-byte character. | |
| 4179 * Used for the "to" and "from" part of a mapping. | |
| 4180 * Return the un-escaped string if it is a multi-byte character, and advance | |
| 4181 * "pp" to just after the bytes that formed it. | |
| 4182 * Return NULL if no multi-byte char was found. | |
| 4183 */ | |
| 4184 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4185 mb_unescape(char_u **pp) |
| 7 | 4186 { |
| 3812 | 4187 static char_u buf[6]; |
| 4188 int n; | |
| 4189 int m = 0; | |
| 7 | 4190 char_u *str = *pp; |
| 4191 | |
| 4192 /* Must translate K_SPECIAL KS_SPECIAL KE_FILLER to K_SPECIAL and CSI | |
| 3812 | 4193 * KS_EXTRA KE_CSI to CSI. |
| 4194 * Maximum length of a utf-8 character is 4 bytes. */ | |
| 4195 for (n = 0; str[n] != NUL && m < 4; ++n) | |
| 7 | 4196 { |
| 4197 if (str[n] == K_SPECIAL | |
| 4198 && str[n + 1] == KS_SPECIAL | |
| 4199 && str[n + 2] == KE_FILLER) | |
| 4200 { | |
| 4201 buf[m++] = K_SPECIAL; | |
| 4202 n += 2; | |
| 4203 } | |
| 1495 | 4204 else if ((str[n] == K_SPECIAL |
| 7 | 4205 # ifdef FEAT_GUI |
| 1495 | 4206 || str[n] == CSI |
| 4207 # endif | |
| 4208 ) | |
| 7 | 4209 && str[n + 1] == KS_EXTRA |
| 4210 && str[n + 2] == (int)KE_CSI) | |
| 4211 { | |
| 4212 buf[m++] = CSI; | |
| 4213 n += 2; | |
| 4214 } | |
| 4215 else if (str[n] == K_SPECIAL | |
| 4216 # ifdef FEAT_GUI | |
| 4217 || str[n] == CSI | |
| 4218 # endif | |
| 4219 ) | |
| 4220 break; /* a special key can't be a multibyte char */ | |
| 4221 else | |
| 4222 buf[m++] = str[n]; | |
| 4223 buf[m] = NUL; | |
| 4224 | |
| 4225 /* Return a multi-byte character if it's found. An illegal sequence | |
| 4226 * will result in a 1 here. */ | |
| 474 | 4227 if ((*mb_ptr2len)(buf) > 1) |
| 7 | 4228 { |
| 4229 *pp = str + n + 1; | |
| 4230 return buf; | |
| 4231 } | |
| 3812 | 4232 |
| 4233 /* Bail out quickly for ASCII. */ | |
| 4234 if (buf[0] < 128) | |
| 4235 break; | |
| 7 | 4236 } |
| 4237 return NULL; | |
| 4238 } | |
| 4239 | |
| 4240 /* | |
| 4241 * Return TRUE if the character at "row"/"col" on the screen is the left side | |
| 4242 * of a double-width character. | |
| 4243 * Caller must make sure "row" and "col" are not invalid! | |
| 4244 */ | |
| 4245 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4246 mb_lefthalve(int row, int col) |
| 7 | 4247 { |
| 4248 #ifdef FEAT_HANGULIN | |
| 4249 if (composing_hangul) | |
| 4250 return TRUE; | |
| 4251 #endif | |
| 1378 | 4252 return (*mb_off2cells)(LineOffset[row] + col, |
| 4253 LineOffset[row] + screen_Columns) > 1; | |
| 7 | 4254 } |
| 4255 | |
| 4256 /* | |
| 1698 | 4257 * Correct a position on the screen, if it's the right half of a double-wide |
| 4258 * char move it to the left half. Returns the corrected column. | |
| 7 | 4259 */ |
| 4260 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4261 mb_fix_col(int col, int row) |
| 7 | 4262 { |
| 4263 col = check_col(col); | |
| 4264 row = check_row(row); | |
| 4265 if (has_mbyte && ScreenLines != NULL && col > 0 | |
| 4266 && ((enc_dbcs | |
| 4267 && ScreenLines[LineOffset[row] + col] != NUL | |
| 4268 && dbcs_screen_head_off(ScreenLines + LineOffset[row], | |
| 4269 ScreenLines + LineOffset[row] + col)) | |
| 4270 || (enc_utf8 && ScreenLines[LineOffset[row] + col] == 0))) | |
| 1620 | 4271 return col - 1; |
| 7 | 4272 return col; |
| 4273 } | |
| 4274 #endif | |
| 4275 | |
| 4276 #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) || defined(PROTO) | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
4277 static int enc_alias_search(char_u *name); |
| 7 | 4278 |
| 4279 /* | |
| 4280 * Skip the Vim specific head of a 'encoding' name. | |
| 4281 */ | |
| 4282 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4283 enc_skip(char_u *p) |
| 7 | 4284 { |
| 4285 if (STRNCMP(p, "2byte-", 6) == 0) | |
| 4286 return p + 6; | |
| 4287 if (STRNCMP(p, "8bit-", 5) == 0) | |
| 4288 return p + 5; | |
| 4289 return p; | |
| 4290 } | |
| 4291 | |
| 4292 /* | |
| 4293 * Find the canonical name for encoding "enc". | |
| 4294 * When the name isn't recognized, returns "enc" itself, but with all lower | |
| 4295 * case characters and '_' replaced with '-'. | |
| 4296 * Returns an allocated string. NULL for out-of-memory. | |
| 4297 */ | |
| 4298 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4299 enc_canonize(char_u *enc) |
| 7 | 4300 { |
| 4301 char_u *r; | |
| 4302 char_u *p, *s; | |
| 4303 int i; | |
| 4304 | |
| 39 | 4305 # ifdef FEAT_MBYTE |
| 4306 if (STRCMP(enc, "default") == 0) | |
| 4307 { | |
| 4308 /* Use the default encoding as it's found by set_init_1(). */ | |
| 4309 r = get_encoding_default(); | |
| 4310 if (r == NULL) | |
| 4311 r = (char_u *)"latin1"; | |
| 4312 return vim_strsave(r); | |
| 4313 } | |
| 4314 # endif | |
| 4315 | |
| 1205 | 4316 /* copy "enc" to allocated memory, with room for two '-' */ |
| 7 | 4317 r = alloc((unsigned)(STRLEN(enc) + 3)); |
| 4318 if (r != NULL) | |
| 4319 { | |
| 4320 /* Make it all lower case and replace '_' with '-'. */ | |
| 4321 p = r; | |
| 4322 for (s = enc; *s != NUL; ++s) | |
| 4323 { | |
| 4324 if (*s == '_') | |
| 4325 *p++ = '-'; | |
| 4326 else | |
| 4327 *p++ = TOLOWER_ASC(*s); | |
| 4328 } | |
| 4329 *p = NUL; | |
| 4330 | |
| 4331 /* Skip "2byte-" and "8bit-". */ | |
| 4332 p = enc_skip(r); | |
| 4333 | |
| 481 | 4334 /* Change "microsoft-cp" to "cp". Used in some spell files. */ |
| 4335 if (STRNCMP(p, "microsoft-cp", 12) == 0) | |
| 1620 | 4336 STRMOVE(p, p + 10); |
| 481 | 4337 |
| 7 | 4338 /* "iso8859" -> "iso-8859" */ |
| 4339 if (STRNCMP(p, "iso8859", 7) == 0) | |
| 4340 { | |
| 1620 | 4341 STRMOVE(p + 4, p + 3); |
| 7 | 4342 p[3] = '-'; |
| 4343 } | |
| 4344 | |
| 4345 /* "iso-8859n" -> "iso-8859-n" */ | |
| 4346 if (STRNCMP(p, "iso-8859", 8) == 0 && p[8] != '-') | |
| 4347 { | |
| 1620 | 4348 STRMOVE(p + 9, p + 8); |
| 7 | 4349 p[8] = '-'; |
| 4350 } | |
| 4351 | |
| 4352 /* "latin-N" -> "latinN" */ | |
| 4353 if (STRNCMP(p, "latin-", 6) == 0) | |
| 1620 | 4354 STRMOVE(p + 5, p + 6); |
| 7 | 4355 |
| 4356 if (enc_canon_search(p) >= 0) | |
| 4357 { | |
| 4358 /* canonical name can be used unmodified */ | |
| 4359 if (p != r) | |
| 1620 | 4360 STRMOVE(r, p); |
| 7 | 4361 } |
| 4362 else if ((i = enc_alias_search(p)) >= 0) | |
| 4363 { | |
| 4364 /* alias recognized, get canonical name */ | |
| 4365 vim_free(r); | |
| 4366 r = vim_strsave((char_u *)enc_canon_table[i].name); | |
| 4367 } | |
| 4368 } | |
| 4369 return r; | |
| 4370 } | |
| 4371 | |
| 4372 /* | |
| 4373 * Search for an encoding alias of "name". | |
| 4374 * Returns -1 when not found. | |
| 4375 */ | |
| 4376 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4377 enc_alias_search(char_u *name) |
| 7 | 4378 { |
| 4379 int i; | |
| 4380 | |
| 4381 for (i = 0; enc_alias_table[i].name != NULL; ++i) | |
| 4382 if (STRCMP(name, enc_alias_table[i].name) == 0) | |
| 4383 return enc_alias_table[i].canon; | |
| 4384 return -1; | |
| 4385 } | |
| 4386 #endif | |
| 4387 | |
| 4388 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 4389 | |
|
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4390 # ifdef HAVE_LANGINFO_H |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4391 # include <langinfo.h> |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4392 # endif |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4393 |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4394 # ifndef FEAT_GUI_W32 |
| 7 | 4395 /* |
|
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4396 * Get the canonicalized encoding from the specified locale string "locale" |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4397 * or from the environment variables LC_ALL, LC_CTYPE and LANG. |
| 7 | 4398 * Returns an allocated string when successful, NULL when not. |
| 4399 */ | |
| 4400 char_u * | |
|
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4401 enc_locale_env(char *locale) |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4402 { |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4403 char *s = locale; |
| 7 | 4404 char *p; |
| 4405 int i; | |
| 4406 char buf[50]; | |
| 4407 | |
| 4408 if (s == NULL || *s == NUL) | |
|
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4409 if ((s = getenv("LC_ALL")) == NULL || *s == NUL) |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4410 if ((s = getenv("LC_CTYPE")) == NULL || *s == NUL) |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4411 s = getenv("LANG"); |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4412 |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4413 if (s == NULL || *s == NUL) |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4414 return NULL; |
| 7 | 4415 |
| 4416 /* The most generic locale format is: | |
| 4417 * language[_territory][.codeset][@modifier][+special][,[sponsor][_revision]] | |
| 4418 * If there is a '.' remove the part before it. | |
| 4419 * if there is something after the codeset, remove it. | |
| 4420 * Make the name lowercase and replace '_' with '-'. | |
| 4421 * Exception: "ja_JP.EUC" == "euc-jp", "zh_CN.EUC" = "euc-cn", | |
| 4422 * "ko_KR.EUC" == "euc-kr" | |
| 4423 */ | |
| 4424 if ((p = (char *)vim_strchr((char_u *)s, '.')) != NULL) | |
| 4425 { | |
| 4426 if (p > s + 2 && STRNICMP(p + 1, "EUC", 3) == 0 | |
| 4427 && !isalnum((int)p[4]) && p[4] != '-' && p[-3] == '_') | |
| 4428 { | |
| 4429 /* copy "XY.EUC" to "euc-XY" to buf[10] */ | |
| 4430 STRCPY(buf + 10, "euc-"); | |
| 4431 buf[14] = p[-2]; | |
| 4432 buf[15] = p[-1]; | |
| 4433 buf[16] = 0; | |
| 4434 s = buf + 10; | |
| 4435 } | |
| 4436 else | |
| 4437 s = p + 1; | |
| 4438 } | |
|
9495
c086632cca2e
commit https://github.com/vim/vim/commit/5498a41f5a62c3877fee0185adf3bf7245a9a547
Christian Brabandt <cb@256bit.org>
parents:
9477
diff
changeset
|
4439 for (i = 0; i < (int)sizeof(buf) - 1 && s[i] != NUL; ++i) |
| 7 | 4440 { |
| 4441 if (s[i] == '_' || s[i] == '-') | |
| 4442 buf[i] = '-'; | |
| 4443 else if (isalnum((int)s[i])) | |
| 4444 buf[i] = TOLOWER_ASC(s[i]); | |
| 4445 else | |
| 4446 break; | |
| 4447 } | |
| 4448 buf[i] = NUL; | |
| 4449 | |
| 4450 return enc_canonize((char_u *)buf); | |
| 4451 } | |
|
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4452 # endif |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4453 |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4454 /* |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4455 * Get the canonicalized encoding of the current locale. |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4456 * Returns an allocated string when successful, NULL when not. |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4457 */ |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4458 char_u * |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4459 enc_locale(void) |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4460 { |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4461 # ifdef WIN3264 |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4462 char buf[50]; |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4463 long acp = GetACP(); |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4464 |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4465 if (acp == 1200) |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4466 STRCPY(buf, "ucs-2le"); |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4467 else if (acp == 1252) /* cp1252 is used as latin1 */ |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4468 STRCPY(buf, "latin1"); |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4469 else |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4470 sprintf(buf, "cp%ld", acp); |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4471 |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4472 return enc_canonize((char_u *)buf); |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4473 # else |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4474 char *s; |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4475 |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4476 # ifdef HAVE_NL_LANGINFO_CODESET |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4477 if ((s = nl_langinfo(CODESET)) == NULL || *s == NUL) |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4478 # endif |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4479 # if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4480 if ((s = setlocale(LC_CTYPE, NULL)) == NULL || *s == NUL) |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4481 # endif |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4482 s = NULL; |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4483 |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4484 return enc_locale_env(s); |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4485 # endif |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4486 } |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4487 |
|
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4488 # if defined(WIN3264) || defined(PROTO) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD) |
| 7 | 4489 /* |
| 4490 * Convert an encoding name to an MS-Windows codepage. | |
| 4491 * Returns zero if no codepage can be figured out. | |
| 4492 */ | |
| 4493 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4494 encname2codepage(char_u *name) |
| 7 | 4495 { |
| 4496 int cp; | |
| 4497 char_u *p = name; | |
| 4498 int idx; | |
| 4499 | |
| 4500 if (STRNCMP(p, "8bit-", 5) == 0) | |
| 4501 p += 5; | |
| 4502 else if (STRNCMP(p_enc, "2byte-", 6) == 0) | |
| 4503 p += 6; | |
| 4504 | |
| 4505 if (p[0] == 'c' && p[1] == 'p') | |
|
5136
28e6f5f88968
updated for version 7.3.1311
Bram Moolenaar <bram@vim.org>
parents:
5025
diff
changeset
|
4506 cp = atoi((char *)p + 2); |
| 7 | 4507 else if ((idx = enc_canon_search(p)) >= 0) |
| 4508 cp = enc_canon_table[idx].codepage; | |
| 4509 else | |
| 4510 return 0; | |
| 4511 if (IsValidCodePage(cp)) | |
| 4512 return cp; | |
| 4513 return 0; | |
| 4514 } | |
|
12547
aa3f6d093f4b
patch 8.0.1152: encoding of error message wrong in Cygwin terminal
Christian Brabandt <cb@256bit.org>
parents:
12439
diff
changeset
|
4515 # endif |
| 7 | 4516 |
| 4517 # if defined(USE_ICONV) || defined(PROTO) | |
| 4518 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
4519 static char_u *iconv_string(vimconv_T *vcp, char_u *str, int slen, int *unconvlenp, int *resultlenp); |
| 7 | 4520 |
| 4521 /* | |
| 4522 * Call iconv_open() with a check if iconv() works properly (there are broken | |
| 4523 * versions). | |
| 4524 * Returns (void *)-1 if failed. | |
| 4525 * (should return iconv_t, but that causes problems with prototypes). | |
| 4526 */ | |
| 4527 void * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4528 my_iconv_open(char_u *to, char_u *from) |
| 7 | 4529 { |
| 4530 iconv_t fd; | |
| 4531 #define ICONV_TESTLEN 400 | |
| 4532 char_u tobuf[ICONV_TESTLEN]; | |
| 4533 char *p; | |
| 4534 size_t tolen; | |
| 4535 static int iconv_ok = -1; | |
| 4536 | |
| 4537 if (iconv_ok == FALSE) | |
| 4538 return (void *)-1; /* detected a broken iconv() previously */ | |
| 4539 | |
| 4540 #ifdef DYNAMIC_ICONV | |
| 4541 /* Check if the iconv.dll can be found. */ | |
| 4542 if (!iconv_enabled(TRUE)) | |
| 4543 return (void *)-1; | |
| 4544 #endif | |
| 4545 | |
| 4546 fd = iconv_open((char *)enc_skip(to), (char *)enc_skip(from)); | |
| 4547 | |
| 4548 if (fd != (iconv_t)-1 && iconv_ok == -1) | |
| 4549 { | |
| 4550 /* | |
| 4551 * Do a dummy iconv() call to check if it actually works. There is a | |
| 4552 * version of iconv() on Linux that is broken. We can't ignore it, | |
| 4553 * because it's wide-spread. The symptoms are that after outputting | |
| 4554 * the initial shift state the "to" pointer is NULL and conversion | |
| 4555 * stops for no apparent reason after about 8160 characters. | |
| 4556 */ | |
| 4557 p = (char *)tobuf; | |
| 4558 tolen = ICONV_TESTLEN; | |
| 4559 (void)iconv(fd, NULL, NULL, &p, &tolen); | |
| 4560 if (p == NULL) | |
| 4561 { | |
| 4562 iconv_ok = FALSE; | |
| 4563 iconv_close(fd); | |
| 4564 fd = (iconv_t)-1; | |
| 4565 } | |
| 4566 else | |
| 4567 iconv_ok = TRUE; | |
| 4568 } | |
| 4569 | |
| 4570 return (void *)fd; | |
| 4571 } | |
| 4572 | |
| 4573 /* | |
| 4574 * Convert the string "str[slen]" with iconv(). | |
| 4575 * If "unconvlenp" is not NULL handle the string ending in an incomplete | |
| 4576 * sequence and set "*unconvlenp" to the length of it. | |
| 4577 * Returns the converted string in allocated memory. NULL for an error. | |
| 1904 | 4578 * If resultlenp is not NULL, sets it to the result length in bytes. |
| 7 | 4579 */ |
| 4580 static char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4581 iconv_string( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4582 vimconv_T *vcp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4583 char_u *str, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4584 int slen, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4585 int *unconvlenp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4586 int *resultlenp) |
| 7 | 4587 { |
| 4588 const char *from; | |
| 4589 size_t fromlen; | |
| 4590 char *to; | |
| 4591 size_t tolen; | |
| 4592 size_t len = 0; | |
| 4593 size_t done = 0; | |
| 4594 char_u *result = NULL; | |
| 4595 char_u *p; | |
| 4596 int l; | |
| 4597 | |
| 4598 from = (char *)str; | |
| 4599 fromlen = slen; | |
| 4600 for (;;) | |
| 4601 { | |
| 4602 if (len == 0 || ICONV_ERRNO == ICONV_E2BIG) | |
| 4603 { | |
| 4604 /* Allocate enough room for most conversions. When re-allocating | |
| 4605 * increase the buffer size. */ | |
| 4606 len = len + fromlen * 2 + 40; | |
| 4607 p = alloc((unsigned)len); | |
| 4608 if (p != NULL && done > 0) | |
| 4609 mch_memmove(p, result, done); | |
| 4610 vim_free(result); | |
| 4611 result = p; | |
| 4612 if (result == NULL) /* out of memory */ | |
| 4613 break; | |
| 4614 } | |
| 4615 | |
| 4616 to = (char *)result + done; | |
| 4617 tolen = len - done - 2; | |
| 4618 /* Avoid a warning for systems with a wrong iconv() prototype by | |
| 4619 * casting the second argument to void *. */ | |
| 4620 if (iconv(vcp->vc_fd, (void *)&from, &fromlen, &to, &tolen) | |
| 4621 != (size_t)-1) | |
| 4622 { | |
| 4623 /* Finished, append a NUL. */ | |
| 4624 *to = NUL; | |
| 4625 break; | |
| 4626 } | |
| 4627 | |
| 4628 /* Check both ICONV_EINVAL and EINVAL, because the dynamically loaded | |
| 4629 * iconv library may use one of them. */ | |
| 4630 if (!vcp->vc_fail && unconvlenp != NULL | |
| 4631 && (ICONV_ERRNO == ICONV_EINVAL || ICONV_ERRNO == EINVAL)) | |
| 4632 { | |
| 4633 /* Handle an incomplete sequence at the end. */ | |
| 4634 *to = NUL; | |
| 835 | 4635 *unconvlenp = (int)fromlen; |
| 7 | 4636 break; |
| 4637 } | |
| 4638 | |
| 4639 /* Check both ICONV_EILSEQ and EILSEQ, because the dynamically loaded | |
| 4640 * iconv library may use one of them. */ | |
| 4641 else if (!vcp->vc_fail | |
| 4642 && (ICONV_ERRNO == ICONV_EILSEQ || ICONV_ERRNO == EILSEQ | |
| 4643 || ICONV_ERRNO == ICONV_EINVAL || ICONV_ERRNO == EINVAL)) | |
| 4644 { | |
| 4645 /* Can't convert: insert a '?' and skip a character. This assumes | |
| 4646 * conversion from 'encoding' to something else. In other | |
| 4647 * situations we don't know what to skip anyway. */ | |
| 4648 *to++ = '?'; | |
| 4649 if ((*mb_ptr2cells)((char_u *)from) > 1) | |
| 4650 *to++ = '?'; | |
| 221 | 4651 if (enc_utf8) |
| 835 | 4652 l = utfc_ptr2len_len((char_u *)from, (int)fromlen); |
| 221 | 4653 else |
| 4654 { | |
| 474 | 4655 l = (*mb_ptr2len)((char_u *)from); |
| 227 | 4656 if (l > (int)fromlen) |
| 835 | 4657 l = (int)fromlen; |
| 221 | 4658 } |
| 7 | 4659 from += l; |
| 4660 fromlen -= l; | |
| 4661 } | |
| 4662 else if (ICONV_ERRNO != ICONV_E2BIG) | |
| 4663 { | |
| 4664 /* conversion failed */ | |
| 4665 vim_free(result); | |
| 4666 result = NULL; | |
| 4667 break; | |
| 4668 } | |
| 4669 /* Not enough room or skipping illegal sequence. */ | |
| 4670 done = to - (char *)result; | |
| 4671 } | |
| 1904 | 4672 |
| 2766 | 4673 if (resultlenp != NULL && result != NULL) |
| 1904 | 4674 *resultlenp = (int)(to - (char *)result); |
| 7 | 4675 return result; |
| 4676 } | |
| 4677 | |
| 4678 # if defined(DYNAMIC_ICONV) || defined(PROTO) | |
| 4679 /* | |
| 4680 * Dynamically load the "iconv.dll" on Win32. | |
| 4681 */ | |
| 4682 | |
|
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4683 # ifndef DYNAMIC_ICONV /* must be generating prototypes */ |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4684 # define HINSTANCE int |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4685 # endif |
| 297 | 4686 static HINSTANCE hIconvDLL = 0; |
| 4687 static HINSTANCE hMsvcrtDLL = 0; | |
| 7 | 4688 |
|
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4689 # ifndef DYNAMIC_ICONV_DLL |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4690 # define DYNAMIC_ICONV_DLL "iconv.dll" |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4691 # define DYNAMIC_ICONV_DLL_ALT1 "libiconv.dll" |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4692 # define DYNAMIC_ICONV_DLL_ALT2 "libiconv2.dll" |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4693 # define DYNAMIC_ICONV_DLL_ALT3 "libiconv-2.dll" |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4694 # endif |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4695 # ifndef DYNAMIC_MSVCRT_DLL |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4696 # define DYNAMIC_MSVCRT_DLL "msvcrt.dll" |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4697 # endif |
| 7 | 4698 |
| 4699 /* | |
| 4700 * Try opening the iconv.dll and return TRUE if iconv() can be used. | |
| 4701 */ | |
| 4702 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4703 iconv_enabled(int verbose) |
| 7 | 4704 { |
| 4705 if (hIconvDLL != 0 && hMsvcrtDLL != 0) | |
| 4706 return TRUE; | |
|
7162
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4707 |
|
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4708 /* The iconv DLL file goes under different names, try them all. |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4709 * Do the "2" version first, it's newer. */ |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4710 #ifdef DYNAMIC_ICONV_DLL_ALT2 |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4711 if (hIconvDLL == 0) |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4712 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT2); |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4713 #endif |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4714 #ifdef DYNAMIC_ICONV_DLL_ALT3 |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4715 if (hIconvDLL == 0) |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4716 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT3); |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4717 #endif |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4718 if (hIconvDLL == 0) |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4719 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL); |
|
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4720 #ifdef DYNAMIC_ICONV_DLL_ALT1 |
|
7162
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4721 if (hIconvDLL == 0) |
|
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4722 hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT1); |
|
7734
616769d423fc
commit https://github.com/vim/vim/commit/938ee834d345062cd94f8fdfd54fad0019432a83
Christian Brabandt <cb@256bit.org>
parents:
7330
diff
changeset
|
4723 #endif |
|
7162
fe090e9cd10a
commit https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f
Christian Brabandt <cb@256bit.org>
parents:
6864
diff
changeset
|
4724 |
| 7 | 4725 if (hIconvDLL != 0) |
| 2612 | 4726 hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL); |
| 7 | 4727 if (hIconvDLL == 0 || hMsvcrtDLL == 0) |
| 4728 { | |
| 4729 /* Only give the message when 'verbose' is set, otherwise it might be | |
| 4730 * done whenever a conversion is attempted. */ | |
| 4731 if (verbose && p_verbose > 0) | |
| 292 | 4732 { |
| 4733 verbose_enter(); | |
| 7 | 4734 EMSG2(_(e_loadlib), |
| 4735 hIconvDLL == 0 ? DYNAMIC_ICONV_DLL : DYNAMIC_MSVCRT_DLL); | |
| 292 | 4736 verbose_leave(); |
| 4737 } | |
| 7 | 4738 iconv_end(); |
| 4739 return FALSE; | |
| 4740 } | |
| 4741 | |
| 344 | 4742 iconv = (void *)GetProcAddress(hIconvDLL, "libiconv"); |
| 4743 iconv_open = (void *)GetProcAddress(hIconvDLL, "libiconv_open"); | |
| 4744 iconv_close = (void *)GetProcAddress(hIconvDLL, "libiconv_close"); | |
| 4745 iconvctl = (void *)GetProcAddress(hIconvDLL, "libiconvctl"); | |
|
10571
b726d3ea70bc
patch 8.0.0175: setting language on MS-Windows does not always work
Christian Brabandt <cb@256bit.org>
parents:
10460
diff
changeset
|
4746 iconv_errno = get_dll_import_func(hIconvDLL, "_errno"); |
| 4025 | 4747 if (iconv_errno == NULL) |
| 4748 iconv_errno = (void *)GetProcAddress(hMsvcrtDLL, "_errno"); | |
| 7 | 4749 if (iconv == NULL || iconv_open == NULL || iconv_close == NULL |
| 4750 || iconvctl == NULL || iconv_errno == NULL) | |
| 4751 { | |
| 4752 iconv_end(); | |
| 4753 if (verbose && p_verbose > 0) | |
| 292 | 4754 { |
| 4755 verbose_enter(); | |
| 7 | 4756 EMSG2(_(e_loadfunc), "for libiconv"); |
| 292 | 4757 verbose_leave(); |
| 4758 } | |
| 7 | 4759 return FALSE; |
| 4760 } | |
| 4761 return TRUE; | |
| 4762 } | |
| 4763 | |
| 4764 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4765 iconv_end(void) |
| 7 | 4766 { |
| 4767 /* Don't use iconv() when inputting or outputting characters. */ | |
| 4768 if (input_conv.vc_type == CONV_ICONV) | |
| 4769 convert_setup(&input_conv, NULL, NULL); | |
| 4770 if (output_conv.vc_type == CONV_ICONV) | |
| 4771 convert_setup(&output_conv, NULL, NULL); | |
| 4772 | |
| 4773 if (hIconvDLL != 0) | |
| 4774 FreeLibrary(hIconvDLL); | |
| 4775 if (hMsvcrtDLL != 0) | |
| 4776 FreeLibrary(hMsvcrtDLL); | |
| 4777 hIconvDLL = 0; | |
| 4778 hMsvcrtDLL = 0; | |
| 4779 } | |
| 4780 # endif /* DYNAMIC_ICONV */ | |
| 4781 # endif /* USE_ICONV */ | |
| 4782 | |
| 4783 #endif /* FEAT_MBYTE */ | |
| 4784 | |
| 4785 #if defined(FEAT_XIM) || defined(PROTO) | |
| 4786 | |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
4787 # if defined(FEAT_GUI_GTK) || defined(PROTO) |
| 7 | 4788 static int xim_has_preediting INIT(= FALSE); /* IM current status */ |
| 4789 | |
| 4790 /* | |
| 4791 * Set preedit_start_col to the current cursor position. | |
| 4792 */ | |
| 4793 static void | |
| 4794 init_preedit_start_col(void) | |
| 4795 { | |
| 4796 if (State & CMDLINE) | |
| 4797 preedit_start_col = cmdline_getvcol_cursor(); | |
|
7330
8ab712f2c3b8
commit https://github.com/vim/vim/commit/9ec021a2b0dd35ba744a8e2a9430a643c85b922a
Christian Brabandt <cb@256bit.org>
parents:
7162
diff
changeset
|
4798 else if (curwin != NULL && curwin->w_buffer != NULL) |
| 7 | 4799 getvcol(curwin, &curwin->w_cursor, &preedit_start_col, NULL, NULL); |
| 4800 /* Prevent that preediting marks the buffer as changed. */ | |
| 4801 xim_changed_while_preediting = curbuf->b_changed; | |
| 4802 } | |
| 4803 | |
| 4804 static int im_is_active = FALSE; /* IM is enabled for current mode */ | |
| 1668 | 4805 static int preedit_is_active = FALSE; |
| 7 | 4806 static int im_preedit_cursor = 0; /* cursor offset in characters */ |
| 4807 static int im_preedit_trailing = 0; /* number of characters after cursor */ | |
| 4808 | |
| 4809 static unsigned long im_commit_handler_id = 0; | |
| 4810 static unsigned int im_activatekey_keyval = GDK_VoidSymbol; | |
| 4811 static unsigned int im_activatekey_state = 0; | |
| 4812 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4813 static GtkWidget *preedit_window = NULL; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4814 static GtkWidget *preedit_label = NULL; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4815 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4816 static void im_preedit_window_set_position(void); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4817 |
| 7 | 4818 void |
| 4819 im_set_active(int active) | |
| 4820 { | |
| 4821 int was_active; | |
| 4822 | |
|
5008
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4823 was_active = !!im_get_status(); |
| 7 | 4824 im_is_active = (active && !p_imdisable); |
| 4825 | |
| 4826 if (im_is_active != was_active) | |
| 4827 xim_reset(); | |
| 4828 } | |
| 4829 | |
| 4830 void | |
| 4831 xim_set_focus(int focus) | |
| 4832 { | |
| 4833 if (xic != NULL) | |
| 4834 { | |
| 4835 if (focus) | |
| 4836 gtk_im_context_focus_in(xic); | |
| 4837 else | |
| 4838 gtk_im_context_focus_out(xic); | |
| 4839 } | |
| 4840 } | |
| 4841 | |
| 4842 void | |
| 4843 im_set_position(int row, int col) | |
| 4844 { | |
| 4845 if (xic != NULL) | |
| 4846 { | |
| 4847 GdkRectangle area; | |
| 4848 | |
| 4849 area.x = FILL_X(col); | |
| 4850 area.y = FILL_Y(row); | |
| 4851 area.width = gui.char_width * (mb_lefthalve(row, col) ? 2 : 1); | |
| 4852 area.height = gui.char_height; | |
| 4853 | |
| 4854 gtk_im_context_set_cursor_location(xic, &area); | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4855 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4856 if (p_imst == IM_OVER_THE_SPOT) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4857 im_preedit_window_set_position(); |
| 7 | 4858 } |
| 4859 } | |
| 4860 | |
| 4861 # if 0 || defined(PROTO) /* apparently only used in gui_x11.c */ | |
| 4862 void | |
| 4863 xim_set_preedit(void) | |
| 4864 { | |
| 4865 im_set_position(gui.row, gui.col); | |
| 4866 } | |
| 4867 # endif | |
| 4868 | |
| 4869 static void | |
| 4870 im_add_to_input(char_u *str, int len) | |
| 4871 { | |
| 4872 /* Convert from 'termencoding' (always "utf-8") to 'encoding' */ | |
| 4873 if (input_conv.vc_type != CONV_NONE) | |
| 4874 { | |
| 4875 str = string_convert(&input_conv, str, &len); | |
| 4876 g_return_if_fail(str != NULL); | |
| 4877 } | |
| 4878 | |
| 4879 add_to_input_buf_csi(str, len); | |
| 4880 | |
| 4881 if (input_conv.vc_type != CONV_NONE) | |
| 4882 vim_free(str); | |
| 4883 | |
| 4884 if (p_mh) /* blank out the pointer if necessary */ | |
| 4885 gui_mch_mousehide(TRUE); | |
| 4886 } | |
| 4887 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4888 static void |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4889 im_preedit_window_set_position(void) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4890 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4891 int x, y, w, h, sw, sh; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4892 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4893 if (preedit_window == NULL) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4894 return; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4895 |
|
12409
2c020bc30f62
patch 8.0.1084: GTK build has compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
12361
diff
changeset
|
4896 gui_gtk_get_screen_size_of_win(preedit_window, &sw, &sh); |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4897 #if GTK_CHECK_VERSION(3,0,0) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4898 gdk_window_get_origin(gtk_widget_get_window(gui.drawarea), &x, &y); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4899 #else |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4900 gdk_window_get_origin(gui.drawarea->window, &x, &y); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4901 #endif |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4902 gtk_window_get_size(GTK_WINDOW(preedit_window), &w, &h); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4903 x = x + FILL_X(gui.col); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4904 y = y + FILL_Y(gui.row); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4905 if (x + w > sw) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4906 x = sw - w; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4907 if (y + h > sh) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4908 y = sh - h; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4909 gtk_window_move(GTK_WINDOW(preedit_window), x, y); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4910 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4911 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4912 static void |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4913 im_preedit_window_open() |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4914 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4915 char *preedit_string; |
|
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4916 #if !GTK_CHECK_VERSION(3,16,0) |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4917 char buf[8]; |
|
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4918 #endif |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4919 PangoAttrList *attr_list; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4920 PangoLayout *layout; |
|
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4921 #if GTK_CHECK_VERSION(3,0,0) |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4922 # if !GTK_CHECK_VERSION(3,16,0) |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4923 GdkRGBA color; |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4924 # endif |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4925 #else |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4926 GdkColor color; |
|
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4927 #endif |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4928 gint w, h; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4929 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4930 if (preedit_window == NULL) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4931 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4932 preedit_window = gtk_window_new(GTK_WINDOW_POPUP); |
|
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4933 gtk_window_set_transient_for(GTK_WINDOW(preedit_window), |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4934 GTK_WINDOW(gui.mainwin)); |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4935 preedit_label = gtk_label_new(""); |
|
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4936 gtk_widget_set_name(preedit_label, "vim-gui-preedit-area"); |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4937 gtk_container_add(GTK_CONTAINER(preedit_window), preedit_label); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4938 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
4939 |
|
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4940 #if GTK_CHECK_VERSION(3,16,0) |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4941 { |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4942 GtkStyleContext * const context |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4943 = gtk_widget_get_style_context(gui.drawarea); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4944 GtkCssProvider * const provider = gtk_css_provider_new(); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4945 gchar *css = NULL; |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4946 const char * const fontname |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4947 = pango_font_description_get_family(gui.norm_font); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4948 gint fontsize |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4949 = pango_font_description_get_size(gui.norm_font) / PANGO_SCALE; |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4950 gchar *fontsize_propval = NULL; |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4951 |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4952 if (!pango_font_description_get_size_is_absolute(gui.norm_font)) |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4953 { |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4954 /* fontsize was given in points. Convert it into that in pixels |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4955 * to use with CSS. */ |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4956 GdkScreen * const screen |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4957 = gdk_window_get_screen(gtk_widget_get_window(gui.mainwin)); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4958 const gdouble dpi = gdk_screen_get_resolution(screen); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4959 fontsize = dpi * fontsize / 72; |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4960 } |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4961 if (fontsize > 0) |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4962 fontsize_propval = g_strdup_printf("%dpx", fontsize); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4963 else |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4964 fontsize_propval = g_strdup_printf("inherit"); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4965 |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4966 css = g_strdup_printf( |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4967 "widget#vim-gui-preedit-area {\n" |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4968 " font-family: %s,monospace;\n" |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4969 " font-size: %s;\n" |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4970 " color: #%.2lx%.2lx%.2lx;\n" |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4971 " background-color: #%.2lx%.2lx%.2lx;\n" |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4972 "}\n", |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4973 fontname != NULL ? fontname : "inherit", |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4974 fontsize_propval, |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4975 (gui.norm_pixel >> 16) & 0xff, |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4976 (gui.norm_pixel >> 8) & 0xff, |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4977 gui.norm_pixel & 0xff, |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4978 (gui.back_pixel >> 16) & 0xff, |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4979 (gui.back_pixel >> 8) & 0xff, |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4980 gui.back_pixel & 0xff); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4981 |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4982 gtk_css_provider_load_from_data(provider, css, -1, NULL); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4983 gtk_style_context_add_provider(context, |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4984 GTK_STYLE_PROVIDER(provider), G_MAXUINT); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4985 |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4986 g_free(css); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4987 g_free(fontsize_propval); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4988 g_object_unref(provider); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4989 } |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4990 #elif GTK_CHECK_VERSION(3,0,0) |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4991 gtk_widget_override_font(preedit_label, gui.norm_font); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4992 |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4993 vim_snprintf(buf, sizeof(buf), "#%06X", gui.norm_pixel); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4994 gdk_rgba_parse(&color, buf); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4995 gtk_widget_override_color(preedit_label, GTK_STATE_FLAG_NORMAL, &color); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4996 |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4997 vim_snprintf(buf, sizeof(buf), "#%06X", gui.back_pixel); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4998 gdk_rgba_parse(&color, buf); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
4999 gtk_widget_override_background_color(preedit_label, GTK_STATE_FLAG_NORMAL, |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5000 &color); |
|
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5001 #else |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5002 gtk_widget_modify_font(preedit_label, gui.norm_font); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5003 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5004 vim_snprintf(buf, sizeof(buf), "#%06X", gui.norm_pixel); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5005 gdk_color_parse(buf, &color); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5006 gtk_widget_modify_fg(preedit_label, GTK_STATE_NORMAL, &color); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5007 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5008 vim_snprintf(buf, sizeof(buf), "#%06X", gui.back_pixel); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5009 gdk_color_parse(buf, &color); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5010 gtk_widget_modify_bg(preedit_window, GTK_STATE_NORMAL, &color); |
|
12439
683fdeb89017
patch 8.0.1099: warnings for GDK calls
Christian Brabandt <cb@256bit.org>
parents:
12409
diff
changeset
|
5011 #endif |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5012 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5013 gtk_im_context_get_preedit_string(xic, &preedit_string, &attr_list, NULL); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5014 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5015 if (preedit_string[0] != NUL) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5016 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5017 gtk_label_set_text(GTK_LABEL(preedit_label), preedit_string); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5018 gtk_label_set_attributes(GTK_LABEL(preedit_label), attr_list); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5019 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5020 layout = gtk_label_get_layout(GTK_LABEL(preedit_label)); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5021 pango_layout_get_pixel_size(layout, &w, &h); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5022 h = MAX(h, gui.char_height); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5023 gtk_window_resize(GTK_WINDOW(preedit_window), w, h); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5024 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5025 gtk_widget_show_all(preedit_window); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5026 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5027 im_preedit_window_set_position(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5028 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5029 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5030 g_free(preedit_string); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5031 pango_attr_list_unref(attr_list); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5032 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5033 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5034 static void |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5035 im_preedit_window_close() |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5036 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5037 if (preedit_window != NULL) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5038 gtk_widget_hide(preedit_window); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5039 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5040 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5041 static void |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5042 im_show_preedit() |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5043 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5044 im_preedit_window_open(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5045 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5046 if (p_mh) /* blank out the pointer if necessary */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5047 gui_mch_mousehide(TRUE); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5048 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5049 |
| 7 | 5050 static void |
| 5051 im_delete_preedit(void) | |
| 5052 { | |
| 5053 char_u bskey[] = {CSI, 'k', 'b'}; | |
| 5054 char_u delkey[] = {CSI, 'k', 'D'}; | |
| 5055 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5056 if (p_imst == IM_OVER_THE_SPOT) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5057 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5058 im_preedit_window_close(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5059 return; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5060 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5061 |
|
12361
d3175a3bd8cd
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
5062 if (State & NORMAL |
|
d3175a3bd8cd
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
5063 #ifdef FEAT_TERMINAL |
|
d3175a3bd8cd
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
5064 && !term_use_loop() |
|
d3175a3bd8cd
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
5065 #endif |
|
d3175a3bd8cd
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
5066 ) |
| 7 | 5067 { |
| 5068 im_preedit_cursor = 0; | |
| 5069 return; | |
| 5070 } | |
| 5071 for (; im_preedit_cursor > 0; --im_preedit_cursor) | |
| 5072 add_to_input_buf(bskey, (int)sizeof(bskey)); | |
| 5073 | |
| 5074 for (; im_preedit_trailing > 0; --im_preedit_trailing) | |
| 5075 add_to_input_buf(delkey, (int)sizeof(delkey)); | |
| 5076 } | |
| 5077 | |
| 941 | 5078 /* |
| 5079 * Move the cursor left by "num_move_back" characters. | |
| 5080 * Note that ins_left() checks im_is_preediting() to avoid breaking undo for | |
| 5081 * these K_LEFT keys. | |
| 5082 */ | |
| 7 | 5083 static void |
| 5084 im_correct_cursor(int num_move_back) | |
| 5085 { | |
| 5086 char_u backkey[] = {CSI, 'k', 'l'}; | |
| 5087 | |
| 5088 if (State & NORMAL) | |
| 5089 return; | |
| 5090 # ifdef FEAT_RIGHTLEFT | |
| 5091 if ((State & CMDLINE) == 0 && curwin != NULL && curwin->w_p_rl) | |
| 5092 backkey[2] = 'r'; | |
| 5093 # endif | |
| 5094 for (; num_move_back > 0; --num_move_back) | |
| 5095 add_to_input_buf(backkey, (int)sizeof(backkey)); | |
| 5096 } | |
| 5097 | |
| 5098 static int xim_expected_char = NUL; | |
| 5099 static int xim_ignored_char = FALSE; | |
| 5100 | |
| 5101 /* | |
| 5102 * Update the mode and cursor while in an IM callback. | |
| 5103 */ | |
| 5104 static void | |
| 5105 im_show_info(void) | |
| 5106 { | |
| 5107 int old_vgetc_busy; | |
| 822 | 5108 |
| 7 | 5109 old_vgetc_busy = vgetc_busy; |
| 5110 vgetc_busy = TRUE; | |
| 5111 showmode(); | |
| 5112 vgetc_busy = old_vgetc_busy; | |
| 3402 | 5113 if ((State & NORMAL) || (State & INSERT)) |
| 5114 setcursor(); | |
| 7 | 5115 out_flush(); |
| 5116 } | |
| 5117 | |
| 5118 /* | |
| 5119 * Callback invoked when the user finished preediting. | |
| 5120 * Put the final string into the input buffer. | |
| 5121 */ | |
| 5122 static void | |
| 1883 | 5123 im_commit_cb(GtkIMContext *context UNUSED, |
| 5124 const gchar *str, | |
| 5125 gpointer data UNUSED) | |
| 7 | 5126 { |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5127 int slen = (int)STRLEN(str); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5128 int add_to_input = TRUE; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5129 int clen; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5130 int len = slen; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5131 int commit_with_preedit = TRUE; |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
5132 char_u *im_str; |
| 7 | 5133 |
| 5134 #ifdef XIM_DEBUG | |
| 5135 xim_log("im_commit_cb(): %s\n", str); | |
| 5136 #endif | |
| 5137 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5138 if (p_imst == IM_ON_THE_SPOT) |
| 7 | 5139 { |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5140 /* The imhangul module doesn't reset the preedit string before |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5141 * committing. Call im_delete_preedit() to work around that. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5142 im_delete_preedit(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5143 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5144 /* Indicate that preediting has finished. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5145 if (preedit_start_col == MAXCOL) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5146 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5147 init_preedit_start_col(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5148 commit_with_preedit = FALSE; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5149 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5150 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5151 /* The thing which setting "preedit_start_col" to MAXCOL means that |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5152 * "preedit_start_col" will be set forcedly when calling |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5153 * preedit_changed_cb() next time. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5154 * "preedit_start_col" should not reset with MAXCOL on this part. Vim |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5155 * is simulating the preediting by using add_to_input_str(). when |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5156 * preedit begin immediately before committed, the typebuf is not |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5157 * flushed to screen, then it can't get correct "preedit_start_col". |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5158 * Thus, it should calculate the cells by adding cells of the committed |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5159 * string. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5160 if (input_conv.vc_type != CONV_NONE) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5161 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5162 im_str = string_convert(&input_conv, (char_u *)str, &len); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5163 g_return_if_fail(im_str != NULL); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5164 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5165 else |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5166 im_str = (char_u *)str; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5167 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5168 clen = mb_string2cells(im_str, len); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5169 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5170 if (input_conv.vc_type != CONV_NONE) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5171 vim_free(im_str); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5172 preedit_start_col += clen; |
| 7 | 5173 } |
| 5174 | |
| 5175 /* Is this a single character that matches a keypad key that's just | |
| 5176 * been pressed? If so, we don't want it to be entered as such - let | |
| 5177 * us carry on processing the raw keycode so that it may be used in | |
| 5178 * mappings as <kSomething>. */ | |
| 5179 if (xim_expected_char != NUL) | |
| 5180 { | |
| 5181 /* We're currently processing a keypad or other special key */ | |
| 5182 if (slen == 1 && str[0] == xim_expected_char) | |
| 5183 { | |
| 5184 /* It's a match - don't do it here */ | |
| 5185 xim_ignored_char = TRUE; | |
| 5186 add_to_input = FALSE; | |
| 5187 } | |
| 5188 else | |
| 5189 { | |
| 5190 /* Not a match */ | |
| 5191 xim_ignored_char = FALSE; | |
| 5192 } | |
| 5193 } | |
| 5194 | |
| 5195 if (add_to_input) | |
| 5196 im_add_to_input((char_u *)str, slen); | |
| 5197 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5198 if (p_imst == IM_ON_THE_SPOT) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5199 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5200 /* Inserting chars while "im_is_active" is set does not cause a |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5201 * change of buffer. When the chars are committed the buffer must be |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5202 * marked as changed. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5203 if (!commit_with_preedit) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5204 preedit_start_col = MAXCOL; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5205 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5206 /* This flag is used in changed() at next call. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5207 xim_changed_while_preediting = TRUE; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5208 } |
| 7 | 5209 |
| 5210 if (gtk_main_level() > 0) | |
| 5211 gtk_main_quit(); | |
| 5212 } | |
| 5213 | |
| 5214 /* | |
| 5215 * Callback invoked after start to the preedit. | |
| 5216 */ | |
| 5217 static void | |
| 1883 | 5218 im_preedit_start_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) |
| 7 | 5219 { |
| 5220 #ifdef XIM_DEBUG | |
| 5221 xim_log("im_preedit_start_cb()\n"); | |
| 5222 #endif | |
| 5223 | |
| 5224 im_is_active = TRUE; | |
| 1668 | 5225 preedit_is_active = TRUE; |
| 7 | 5226 gui_update_cursor(TRUE, FALSE); |
| 1668 | 5227 im_show_info(); |
| 7 | 5228 } |
| 5229 | |
| 5230 /* | |
| 5231 * Callback invoked after end to the preedit. | |
| 5232 */ | |
| 5233 static void | |
| 1883 | 5234 im_preedit_end_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) |
| 7 | 5235 { |
| 5236 #ifdef XIM_DEBUG | |
| 5237 xim_log("im_preedit_end_cb()\n"); | |
| 5238 #endif | |
| 5239 im_delete_preedit(); | |
| 5240 | |
| 5241 /* Indicate that preediting has finished */ | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5242 if (p_imst == IM_ON_THE_SPOT) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5243 preedit_start_col = MAXCOL; |
| 7 | 5244 xim_has_preediting = FALSE; |
| 5245 | |
| 1620 | 5246 #if 0 |
| 5247 /* Removal of this line suggested by Takuhiro Nishioka. Fixes that IM was | |
| 1668 | 5248 * switched off unintentionally. We now use preedit_is_active (added by |
| 5249 * SungHyun Nam). */ | |
| 7 | 5250 im_is_active = FALSE; |
| 1620 | 5251 #endif |
| 1668 | 5252 preedit_is_active = FALSE; |
| 7 | 5253 gui_update_cursor(TRUE, FALSE); |
| 5254 im_show_info(); | |
| 5255 } | |
| 5256 | |
| 5257 /* | |
| 5258 * Callback invoked after changes to the preedit string. If the preedit | |
| 5259 * string was empty before, remember the preedit start column so we know | |
| 5260 * where to apply feedback attributes. Delete the previous preedit string | |
| 5261 * if there was one, save the new preedit cursor offset, and put the new | |
| 5262 * string into the input buffer. | |
| 5263 * | |
| 5264 * TODO: The pragmatic "put into input buffer" approach used here has | |
| 5265 * several fundamental problems: | |
| 5266 * | |
| 5267 * - The characters in the preedit string are subject to remapping. | |
| 5268 * That's broken, only the finally committed string should be remapped. | |
| 5269 * | |
| 5270 * - There is a race condition involved: The retrieved value for the | |
| 5271 * current cursor position will be wrong if any unprocessed characters | |
| 5272 * are still queued in the input buffer. | |
| 5273 * | |
| 5274 * - Due to the lack of synchronization between the file buffer in memory | |
| 5275 * and any typed characters, it's practically impossible to implement the | |
| 5276 * "retrieve_surrounding" and "delete_surrounding" signals reliably. IM | |
| 5277 * modules for languages such as Thai are likely to rely on this feature | |
| 5278 * for proper operation. | |
| 5279 * | |
| 5280 * Conclusions: I think support for preediting needs to be moved to the | |
| 5281 * core parts of Vim. Ideally, until it has been committed, the preediting | |
| 5282 * string should only be displayed and not affect the buffer content at all. | |
| 5283 * The question how to deal with the synchronization issue still remains. | |
| 5284 * Circumventing the input buffer is probably not desirable. Anyway, I think | |
| 5285 * implementing "retrieve_surrounding" is the only hard problem. | |
| 5286 * | |
| 5287 * One way to solve all of this in a clean manner would be to queue all key | |
| 5288 * press/release events "as is" in the input buffer, and apply the IM filtering | |
| 5289 * at the receiving end of the queue. This, however, would have a rather large | |
| 5290 * impact on the code base. If there is an easy way to force processing of all | |
| 5291 * remaining input from within the "retrieve_surrounding" signal handler, this | |
| 5292 * might not be necessary. Gotta ask on vim-dev for opinions. | |
| 5293 */ | |
| 5294 static void | |
| 1883 | 5295 im_preedit_changed_cb(GtkIMContext *context, gpointer data UNUSED) |
| 7 | 5296 { |
| 5297 char *preedit_string = NULL; | |
| 5298 int cursor_index = 0; | |
| 5299 int num_move_back = 0; | |
| 5300 char_u *str; | |
| 5301 char_u *p; | |
| 5302 int i; | |
| 5303 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5304 if (p_imst == IM_ON_THE_SPOT) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5305 gtk_im_context_get_preedit_string(context, |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5306 &preedit_string, NULL, |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5307 &cursor_index); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5308 else |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5309 gtk_im_context_get_preedit_string(context, |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5310 &preedit_string, NULL, |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5311 NULL); |
| 7 | 5312 |
| 5313 #ifdef XIM_DEBUG | |
| 5314 xim_log("im_preedit_changed_cb(): %s\n", preedit_string); | |
| 5315 #endif | |
| 5316 | |
| 5317 g_return_if_fail(preedit_string != NULL); /* just in case */ | |
| 5318 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5319 if (p_imst == IM_OVER_THE_SPOT) |
| 7 | 5320 { |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5321 if (preedit_string[0] == NUL) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5322 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5323 xim_has_preediting = FALSE; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5324 im_delete_preedit(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5325 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5326 else |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5327 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5328 xim_has_preediting = TRUE; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5329 im_show_preedit(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5330 } |
| 7 | 5331 } |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5332 else |
| 7 | 5333 { |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5334 /* If preedit_start_col is MAXCOL set it to the current cursor position. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5335 if (preedit_start_col == MAXCOL && preedit_string[0] != '\0') |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5336 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5337 xim_has_preediting = TRUE; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5338 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5339 /* Urgh, this breaks if the input buffer isn't empty now */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5340 init_preedit_start_col(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5341 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5342 else if (cursor_index == 0 && preedit_string[0] == '\0') |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5343 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5344 xim_has_preediting = FALSE; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5345 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5346 /* If at the start position (after typing backspace) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5347 * preedit_start_col must be reset. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5348 preedit_start_col = MAXCOL; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5349 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5350 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5351 im_delete_preedit(); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5352 |
| 7 | 5353 /* |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5354 * Compute the end of the preediting area: "preedit_end_col". |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5355 * According to the documentation of gtk_im_context_get_preedit_string(), |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5356 * the cursor_pos output argument returns the offset in bytes. This is |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5357 * unfortunately not true -- real life shows the offset is in characters, |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5358 * and the GTK+ source code agrees with me. Will file a bug later. |
| 7 | 5359 */ |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5360 if (preedit_start_col != MAXCOL) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5361 preedit_end_col = preedit_start_col; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5362 str = (char_u *)preedit_string; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5363 for (p = str, i = 0; *p != NUL; p += utf_byte2len(*p), ++i) |
| 7 | 5364 { |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5365 int is_composing; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5366 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5367 is_composing = ((*p & 0x80) != 0 && utf_iscomposing(utf_ptr2char(p))); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5368 /* |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5369 * These offsets are used as counters when generating <BS> and <Del> |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5370 * to delete the preedit string. So don't count composing characters |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5371 * unless 'delcombine' is enabled. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5372 */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5373 if (!is_composing || p_deco) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5374 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5375 if (i < cursor_index) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5376 ++im_preedit_cursor; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5377 else |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5378 ++im_preedit_trailing; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5379 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5380 if (!is_composing && i >= cursor_index) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5381 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5382 /* This is essentially the same as im_preedit_trailing, except |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5383 * composing characters are not counted even if p_deco is set. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5384 ++num_move_back; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5385 } |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5386 if (preedit_start_col != MAXCOL) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5387 preedit_end_col += utf_ptr2cells(p); |
| 7 | 5388 } |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5389 |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5390 if (p > str) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5391 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5392 im_add_to_input(str, (int)(p - str)); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5393 im_correct_cursor(num_move_back); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5394 } |
| 7 | 5395 } |
| 5396 | |
| 5397 g_free(preedit_string); | |
| 5398 | |
| 5399 if (gtk_main_level() > 0) | |
| 5400 gtk_main_quit(); | |
| 5401 } | |
| 5402 | |
| 5403 /* | |
| 5404 * Translate the Pango attributes at iter to Vim highlighting attributes. | |
| 5405 * Ignore attributes not supported by Vim highlighting. This shouldn't have | |
| 5406 * too much impact -- right now we handle even more attributes than necessary | |
| 5407 * for the IM modules I tested with. | |
| 5408 */ | |
| 5409 static int | |
| 5410 translate_pango_attributes(PangoAttrIterator *iter) | |
| 5411 { | |
| 5412 PangoAttribute *attr; | |
| 5413 int char_attr = HL_NORMAL; | |
| 5414 | |
| 5415 attr = pango_attr_iterator_get(iter, PANGO_ATTR_UNDERLINE); | |
| 5416 if (attr != NULL && ((PangoAttrInt *)attr)->value | |
| 5417 != (int)PANGO_UNDERLINE_NONE) | |
| 5418 char_attr |= HL_UNDERLINE; | |
| 5419 | |
| 5420 attr = pango_attr_iterator_get(iter, PANGO_ATTR_WEIGHT); | |
| 5421 if (attr != NULL && ((PangoAttrInt *)attr)->value >= (int)PANGO_WEIGHT_BOLD) | |
| 5422 char_attr |= HL_BOLD; | |
| 5423 | |
| 5424 attr = pango_attr_iterator_get(iter, PANGO_ATTR_STYLE); | |
| 5425 if (attr != NULL && ((PangoAttrInt *)attr)->value | |
| 5426 != (int)PANGO_STYLE_NORMAL) | |
| 5427 char_attr |= HL_ITALIC; | |
| 5428 | |
| 5429 attr = pango_attr_iterator_get(iter, PANGO_ATTR_BACKGROUND); | |
| 5430 if (attr != NULL) | |
| 5431 { | |
| 5432 const PangoColor *color = &((PangoAttrColor *)attr)->color; | |
| 5433 | |
| 5434 /* Assume inverse if black background is requested */ | |
| 5435 if ((color->red | color->green | color->blue) == 0) | |
| 5436 char_attr |= HL_INVERSE; | |
| 5437 } | |
| 5438 | |
| 5439 return char_attr; | |
| 5440 } | |
| 5441 | |
| 5442 /* | |
| 5443 * Retrieve the highlighting attributes at column col in the preedit string. | |
| 5444 * Return -1 if not in preediting mode or if col is out of range. | |
| 5445 */ | |
| 5446 int | |
| 5447 im_get_feedback_attr(int col) | |
| 5448 { | |
| 5449 char *preedit_string = NULL; | |
| 5450 PangoAttrList *attr_list = NULL; | |
| 5451 int char_attr = -1; | |
| 5452 | |
| 5453 if (xic == NULL) | |
| 5454 return char_attr; | |
| 5455 | |
| 5456 gtk_im_context_get_preedit_string(xic, &preedit_string, &attr_list, NULL); | |
| 5457 | |
| 5458 if (preedit_string != NULL && attr_list != NULL) | |
| 5459 { | |
| 944 | 5460 int idx; |
| 7 | 5461 |
| 5462 /* Get the byte index as used by PangoAttrIterator */ | |
| 944 | 5463 for (idx = 0; col > 0 && preedit_string[idx] != '\0'; --col) |
| 5464 idx += utfc_ptr2len((char_u *)preedit_string + idx); | |
| 5465 | |
| 5466 if (preedit_string[idx] != '\0') | |
| 7 | 5467 { |
| 5468 PangoAttrIterator *iter; | |
| 5469 int start, end; | |
| 5470 | |
| 5471 char_attr = HL_NORMAL; | |
| 5472 iter = pango_attr_list_get_iterator(attr_list); | |
| 5473 | |
| 5474 /* Extract all relevant attributes from the list. */ | |
| 5475 do | |
| 5476 { | |
| 5477 pango_attr_iterator_range(iter, &start, &end); | |
| 5478 | |
| 944 | 5479 if (idx >= start && idx < end) |
| 7 | 5480 char_attr |= translate_pango_attributes(iter); |
| 5481 } | |
| 5482 while (pango_attr_iterator_next(iter)); | |
| 5483 | |
| 5484 pango_attr_iterator_destroy(iter); | |
| 5485 } | |
| 5486 } | |
| 5487 | |
| 5488 if (attr_list != NULL) | |
| 5489 pango_attr_list_unref(attr_list); | |
| 5490 g_free(preedit_string); | |
| 5491 | |
| 5492 return char_attr; | |
| 5493 } | |
| 5494 | |
| 5495 void | |
| 5496 xim_init(void) | |
| 5497 { | |
| 5498 #ifdef XIM_DEBUG | |
| 5499 xim_log("xim_init()\n"); | |
| 5500 #endif | |
| 5501 | |
| 5502 g_return_if_fail(gui.drawarea != NULL); | |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5503 #if GTK_CHECK_VERSION(3,0,0) |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5504 g_return_if_fail(gtk_widget_get_window(gui.drawarea) != NULL); |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5505 #else |
| 7 | 5506 g_return_if_fail(gui.drawarea->window != NULL); |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5507 #endif |
| 7 | 5508 |
| 5509 xic = gtk_im_multicontext_new(); | |
| 5510 g_object_ref(xic); | |
| 5511 | |
| 5512 im_commit_handler_id = g_signal_connect(G_OBJECT(xic), "commit", | |
| 5513 G_CALLBACK(&im_commit_cb), NULL); | |
| 5514 g_signal_connect(G_OBJECT(xic), "preedit_changed", | |
| 5515 G_CALLBACK(&im_preedit_changed_cb), NULL); | |
| 5516 g_signal_connect(G_OBJECT(xic), "preedit_start", | |
| 5517 G_CALLBACK(&im_preedit_start_cb), NULL); | |
| 5518 g_signal_connect(G_OBJECT(xic), "preedit_end", | |
| 5519 G_CALLBACK(&im_preedit_end_cb), NULL); | |
| 5520 | |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5521 #if GTK_CHECK_VERSION(3,0,0) |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5522 gtk_im_context_set_client_window(xic, gtk_widget_get_window(gui.drawarea)); |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5523 #else |
| 7 | 5524 gtk_im_context_set_client_window(xic, gui.drawarea->window); |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5525 #endif |
| 7 | 5526 } |
| 5527 | |
| 5528 void | |
| 5529 im_shutdown(void) | |
| 5530 { | |
| 5531 #ifdef XIM_DEBUG | |
| 5532 xim_log("im_shutdown()\n"); | |
| 5533 #endif | |
| 5534 | |
| 5535 if (xic != NULL) | |
| 5536 { | |
| 5537 gtk_im_context_focus_out(xic); | |
| 5538 g_object_unref(xic); | |
| 5539 xic = NULL; | |
| 5540 } | |
| 5541 im_is_active = FALSE; | |
| 5542 im_commit_handler_id = 0; | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5543 if (p_imst == IM_ON_THE_SPOT) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5544 preedit_start_col = MAXCOL; |
| 7 | 5545 xim_has_preediting = FALSE; |
| 5546 } | |
| 5547 | |
| 5548 /* | |
| 5549 * Convert the string argument to keyval and state for GdkEventKey. | |
| 5550 * If str is valid return TRUE, otherwise FALSE. | |
| 5551 * | |
| 5552 * See 'imactivatekey' for documentation of the format. | |
| 5553 */ | |
| 5554 static int | |
| 5555 im_string_to_keyval(const char *str, unsigned int *keyval, unsigned int *state) | |
| 5556 { | |
| 5557 const char *mods_end; | |
| 5558 unsigned tmp_keyval; | |
| 5559 unsigned tmp_state = 0; | |
| 5560 | |
| 5561 mods_end = strrchr(str, '-'); | |
| 5562 mods_end = (mods_end != NULL) ? mods_end + 1 : str; | |
| 5563 | |
| 5564 /* Parse modifier keys */ | |
| 5565 while (str < mods_end) | |
| 5566 switch (*str++) | |
| 5567 { | |
| 5568 case '-': break; | |
| 5569 case 'S': case 's': tmp_state |= (unsigned)GDK_SHIFT_MASK; break; | |
| 5570 case 'L': case 'l': tmp_state |= (unsigned)GDK_LOCK_MASK; break; | |
| 5571 case 'C': case 'c': tmp_state |= (unsigned)GDK_CONTROL_MASK;break; | |
| 5572 case '1': tmp_state |= (unsigned)GDK_MOD1_MASK; break; | |
| 5573 case '2': tmp_state |= (unsigned)GDK_MOD2_MASK; break; | |
| 5574 case '3': tmp_state |= (unsigned)GDK_MOD3_MASK; break; | |
| 5575 case '4': tmp_state |= (unsigned)GDK_MOD4_MASK; break; | |
| 5576 case '5': tmp_state |= (unsigned)GDK_MOD5_MASK; break; | |
| 5577 default: | |
| 5578 return FALSE; | |
| 5579 } | |
| 5580 | |
| 5581 tmp_keyval = gdk_keyval_from_name(str); | |
| 5582 | |
| 5583 if (tmp_keyval == 0 || tmp_keyval == GDK_VoidSymbol) | |
| 5584 return FALSE; | |
| 5585 | |
| 5586 if (keyval != NULL) | |
| 5587 *keyval = tmp_keyval; | |
| 5588 if (state != NULL) | |
| 5589 *state = tmp_state; | |
| 5590 | |
| 5591 return TRUE; | |
| 5592 } | |
| 5593 | |
| 5594 /* | |
| 5595 * Return TRUE if p_imak is valid, otherwise FALSE. As a special case, an | |
| 5596 * empty string is also regarded as valid. | |
| 5597 * | |
| 5598 * Note: The numerical key value of p_imak is cached if it was valid; thus | |
| 5599 * boldly assuming im_xim_isvalid_imactivate() will always be called whenever | |
| 5600 * 'imak' changes. This is currently the case but not obvious -- should | |
| 5601 * probably rename the function for clarity. | |
| 5602 */ | |
| 5603 int | |
| 5604 im_xim_isvalid_imactivate(void) | |
| 5605 { | |
| 5606 if (p_imak[0] == NUL) | |
| 5607 { | |
| 5608 im_activatekey_keyval = GDK_VoidSymbol; | |
| 5609 im_activatekey_state = 0; | |
| 5610 return TRUE; | |
| 5611 } | |
| 5612 | |
| 5613 return im_string_to_keyval((const char *)p_imak, | |
| 5614 &im_activatekey_keyval, | |
| 5615 &im_activatekey_state); | |
| 5616 } | |
| 5617 | |
| 5618 static void | |
| 5619 im_synthesize_keypress(unsigned int keyval, unsigned int state) | |
| 5620 { | |
| 5621 GdkEventKey *event; | |
| 5622 | |
| 5623 event = (GdkEventKey *)gdk_event_new(GDK_KEY_PRESS); | |
|
11474
621e41f6dcc2
patch 8.0.0620: checking for HAVE_GTK_MULTIHEAD is not needed
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
5624 # if GTK_CHECK_VERSION(3,0,0) |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5625 g_object_ref(gtk_widget_get_window(gui.drawarea)); |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5626 /* unreffed by gdk_event_free() */ |
|
11474
621e41f6dcc2
patch 8.0.0620: checking for HAVE_GTK_MULTIHEAD is not needed
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
5627 # else |
| 7 | 5628 g_object_ref(gui.drawarea->window); /* unreffed by gdk_event_free() */ |
| 5629 # endif | |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5630 # if GTK_CHECK_VERSION(3,0,0) |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5631 event->window = gtk_widget_get_window(gui.drawarea); |
|
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5632 # else |
| 7 | 5633 event->window = gui.drawarea->window; |
|
8218
3456e2ebebd4
commit https://github.com/vim/vim/commit/9892189d2e7ab94b750f99e6da4cbfc3c8014517
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
5634 # endif |
| 7 | 5635 event->send_event = TRUE; |
| 5636 event->time = GDK_CURRENT_TIME; | |
| 5637 event->state = state; | |
| 5638 event->keyval = keyval; | |
| 5639 event->hardware_keycode = /* needed for XIM */ | |
| 5640 XKeysymToKeycode(GDK_WINDOW_XDISPLAY(event->window), (KeySym)keyval); | |
| 5641 event->length = 0; | |
| 5642 event->string = NULL; | |
| 5643 | |
| 5644 gtk_im_context_filter_keypress(xic, event); | |
| 5645 | |
| 5646 /* For consistency, also send the corresponding release event. */ | |
| 5647 event->type = GDK_KEY_RELEASE; | |
| 5648 event->send_event = FALSE; | |
| 5649 gtk_im_context_filter_keypress(xic, event); | |
| 5650 | |
| 5651 gdk_event_free((GdkEvent *)event); | |
| 5652 } | |
| 5653 | |
| 5654 void | |
| 5655 xim_reset(void) | |
| 5656 { | |
| 5657 if (xic != NULL) | |
| 5658 { | |
| 5659 gtk_im_context_reset(xic); | |
| 5660 | |
| 5661 if (p_imdisable) | |
| 5662 im_shutdown(); | |
| 5663 else | |
| 5664 { | |
| 5665 xim_set_focus(gui.in_focus); | |
| 5666 | |
|
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5667 # ifdef FEAT_EVAL |
|
5008
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5668 if (p_imaf[0] != NUL) |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5669 { |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5670 char_u *argv[1]; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5671 |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5672 if (im_is_active) |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5673 argv[0] = (char_u *)"1"; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5674 else |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5675 argv[0] = (char_u *)"0"; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5676 (void)call_func_retnr(p_imaf, 1, argv, FALSE); |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5677 } |
|
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5678 else |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5679 # endif |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5680 if (im_activatekey_keyval != GDK_VoidSymbol) |
| 7 | 5681 { |
| 5682 if (im_is_active) | |
| 5683 { | |
| 5684 g_signal_handler_block(xic, im_commit_handler_id); | |
| 5685 im_synthesize_keypress(im_activatekey_keyval, | |
| 5686 im_activatekey_state); | |
| 5687 g_signal_handler_unblock(xic, im_commit_handler_id); | |
| 5688 } | |
| 5689 } | |
| 5690 else | |
| 5691 { | |
| 5692 im_shutdown(); | |
| 5693 xim_init(); | |
| 5694 xim_set_focus(gui.in_focus); | |
| 5695 } | |
| 5696 } | |
| 5697 } | |
| 5698 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5699 if (p_imst == IM_ON_THE_SPOT) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5700 preedit_start_col = MAXCOL; |
| 7 | 5701 xim_has_preediting = FALSE; |
| 5702 } | |
| 5703 | |
| 5704 int | |
| 5705 xim_queue_key_press_event(GdkEventKey *event, int down) | |
| 5706 { | |
| 5707 if (down) | |
| 5708 { | |
| 5709 /* | |
| 5710 * Workaround GTK2 XIM 'feature' that always converts keypad keys to | |
| 5711 * chars., even when not part of an IM sequence (ref. feature of | |
| 5712 * gdk/gdkkeyuni.c). | |
| 5713 * Flag any keypad keys that might represent a single char. | |
| 5714 * If this (on its own - i.e., not part of an IM sequence) is | |
| 5715 * committed while we're processing one of these keys, we can ignore | |
| 5716 * that commit and go ahead & process it ourselves. That way we can | |
| 5717 * still distinguish keypad keys for use in mappings. | |
| 1620 | 5718 * Also add GDK_space to make <S-Space> work. |
| 7 | 5719 */ |
| 5720 switch (event->keyval) | |
| 5721 { | |
| 5722 case GDK_KP_Add: xim_expected_char = '+'; break; | |
| 5723 case GDK_KP_Subtract: xim_expected_char = '-'; break; | |
| 5724 case GDK_KP_Divide: xim_expected_char = '/'; break; | |
| 5725 case GDK_KP_Multiply: xim_expected_char = '*'; break; | |
| 5726 case GDK_KP_Decimal: xim_expected_char = '.'; break; | |
| 5727 case GDK_KP_Equal: xim_expected_char = '='; break; | |
| 5728 case GDK_KP_0: xim_expected_char = '0'; break; | |
| 5729 case GDK_KP_1: xim_expected_char = '1'; break; | |
| 5730 case GDK_KP_2: xim_expected_char = '2'; break; | |
| 5731 case GDK_KP_3: xim_expected_char = '3'; break; | |
| 5732 case GDK_KP_4: xim_expected_char = '4'; break; | |
| 5733 case GDK_KP_5: xim_expected_char = '5'; break; | |
| 5734 case GDK_KP_6: xim_expected_char = '6'; break; | |
| 5735 case GDK_KP_7: xim_expected_char = '7'; break; | |
| 5736 case GDK_KP_8: xim_expected_char = '8'; break; | |
| 5737 case GDK_KP_9: xim_expected_char = '9'; break; | |
| 1620 | 5738 case GDK_space: xim_expected_char = ' '; break; |
| 7 | 5739 default: xim_expected_char = NUL; |
| 5740 } | |
| 5741 xim_ignored_char = FALSE; | |
| 5742 } | |
| 5743 | |
| 5744 /* | |
| 5745 * When typing fFtT, XIM may be activated. Thus it must pass | |
| 5746 * gtk_im_context_filter_keypress() in Normal mode. | |
| 5747 * And while doing :sh too. | |
| 5748 */ | |
| 5749 if (xic != NULL && !p_imdisable | |
| 5750 && (State & (INSERT | CMDLINE | NORMAL | EXTERNCMD)) != 0) | |
| 5751 { | |
| 5752 /* | |
| 5753 * Filter 'imactivatekey' and map it to CTRL-^. This way, Vim is | |
| 5754 * always aware of the current status of IM, and can even emulate | |
| 5755 * the activation key for modules that don't support one. | |
| 5756 */ | |
| 5757 if (event->keyval == im_activatekey_keyval | |
| 5758 && (event->state & im_activatekey_state) == im_activatekey_state) | |
| 5759 { | |
| 5760 unsigned int state_mask; | |
| 5761 | |
| 5762 /* Require the state of the 3 most used modifiers to match exactly. | |
| 5763 * Otherwise e.g. <S-C-space> would be unusable for other purposes | |
| 5764 * if the IM activate key is <S-space>. */ | |
| 5765 state_mask = im_activatekey_state; | |
| 5766 state_mask |= ((int)GDK_SHIFT_MASK | (int)GDK_CONTROL_MASK | |
| 5767 | (int)GDK_MOD1_MASK); | |
| 5768 | |
| 5769 if ((event->state & state_mask) != im_activatekey_state) | |
| 5770 return FALSE; | |
| 5771 | |
| 5772 /* Don't send it a second time on GDK_KEY_RELEASE. */ | |
| 5773 if (event->type != GDK_KEY_PRESS) | |
| 5774 return TRUE; | |
| 5775 | |
| 781 | 5776 if (map_to_exists_mode((char_u *)"", LANGMAP, FALSE)) |
| 7 | 5777 { |
| 5778 im_set_active(FALSE); | |
| 5779 | |
| 5780 /* ":lmap" mappings exists, toggle use of mappings. */ | |
| 5781 State ^= LANGMAP; | |
| 5782 if (State & LANGMAP) | |
| 5783 { | |
| 5784 curbuf->b_p_iminsert = B_IMODE_NONE; | |
| 5785 State &= ~LANGMAP; | |
| 5786 } | |
| 5787 else | |
| 5788 { | |
| 5789 curbuf->b_p_iminsert = B_IMODE_LMAP; | |
| 5790 State |= LANGMAP; | |
| 5791 } | |
| 5792 return TRUE; | |
| 5793 } | |
| 5794 | |
| 5795 return gtk_im_context_filter_keypress(xic, event); | |
| 5796 } | |
| 5797 | |
| 5798 /* Don't filter events through the IM context if IM isn't active | |
| 5799 * right now. Unlike with GTK+ 1.2 we cannot rely on the IM module | |
| 5800 * not doing anything before the activation key was sent. */ | |
| 5801 if (im_activatekey_keyval == GDK_VoidSymbol || im_is_active) | |
| 5802 { | |
| 5803 int imresult = gtk_im_context_filter_keypress(xic, event); | |
| 5804 | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5805 if (p_imst == IM_ON_THE_SPOT) |
| 7 | 5806 { |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5807 /* Some XIM send following sequence: |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5808 * 1. preedited string. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5809 * 2. committed string. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5810 * 3. line changed key. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5811 * 4. preedited string. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5812 * 5. remove preedited string. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5813 * if 3, Vim can't move back the above line for 5. |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5814 * thus, this part should not parse the key. */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5815 if (!imresult && preedit_start_col != MAXCOL |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5816 && event->keyval == GDK_Return) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5817 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5818 im_synthesize_keypress(GDK_Return, 0U); |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5819 return FALSE; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
5820 } |
| 7 | 5821 } |
| 5822 | |
| 5823 /* If XIM tried to commit a keypad key as a single char., | |
| 5824 * ignore it so we can use the keypad key 'raw', for mappings. */ | |
| 5825 if (xim_expected_char != NUL && xim_ignored_char) | |
| 5826 /* We had a keypad key, and XIM tried to thieve it */ | |
| 5827 return FALSE; | |
| 5828 | |
| 2988 | 5829 /* This is supposed to fix a problem with iBus, that space |
| 5830 * characters don't work in input mode. */ | |
| 5831 xim_expected_char = NUL; | |
| 5832 | |
| 7 | 5833 /* Normal processing */ |
| 5834 return imresult; | |
| 5835 } | |
| 5836 } | |
| 5837 | |
| 5838 return FALSE; | |
| 5839 } | |
| 5840 | |
| 5841 int | |
| 5842 im_get_status(void) | |
| 5843 { | |
|
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5844 # ifdef FEAT_EVAL |
|
5008
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5845 if (p_imsf[0] != NUL) |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5846 { |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5847 int is_active; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5848 |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5849 /* FIXME: Don't execute user function in unsafe situation. */ |
|
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5850 if (exiting |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5851 # ifdef FEAT_AUTOCMD |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5852 || is_autocmd_blocked() |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5853 # endif |
|
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5854 ) |
|
5008
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5855 return FALSE; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5856 /* FIXME: :py print 'xxx' is shown duplicate result. |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5857 * Use silent to avoid it. */ |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5858 ++msg_silent; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5859 is_active = call_func_retnr(p_imsf, 0, NULL, FALSE); |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5860 --msg_silent; |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5861 return (is_active > 0); |
|
3717d569027d
updated for version 7.3.1248
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5862 } |
|
5025
322441058afc
updated for version 7.3.1256
Bram Moolenaar <bram@vim.org>
parents:
5008
diff
changeset
|
5863 # endif |
| 7 | 5864 return im_is_active; |
| 5865 } | |
| 5866 | |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5867 int |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5868 preedit_get_status(void) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5869 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5870 return preedit_is_active; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5871 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5872 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5873 int |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5874 im_is_preediting(void) |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5875 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5876 return xim_has_preediting; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5877 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
5878 |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
5879 # else /* !FEAT_GUI_GTK */ |
| 7 | 5880 |
| 5881 static int xim_is_active = FALSE; /* XIM should be active in the current | |
| 5882 mode */ | |
| 5883 static int xim_has_focus = FALSE; /* XIM is really being used for Vim */ | |
| 5884 #ifdef FEAT_GUI_X11 | |
| 5885 static XIMStyle input_style; | |
| 5886 static int status_area_enabled = TRUE; | |
| 5887 #endif | |
| 5888 | |
| 5889 /* | |
| 5890 * Switch using XIM on/off. This is used by the code that changes "State". | |
| 5891 */ | |
| 5892 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5893 im_set_active(int active) |
| 7 | 5894 { |
| 5895 if (xic == NULL) | |
| 5896 return; | |
| 5897 | |
| 5898 /* If 'imdisable' is set, XIM is never active. */ | |
| 5899 if (p_imdisable) | |
| 5900 active = FALSE; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2205
diff
changeset
|
5901 #if !defined(FEAT_GUI_GTK) |
| 7 | 5902 else if (input_style & XIMPreeditPosition) |
| 5903 /* There is a problem in switching XIM off when preediting is used, | |
| 5904 * and it is not clear how this can be solved. For now, keep XIM on | |
| 5905 * all the time, like it was done in Vim 5.8. */ | |
| 5906 active = TRUE; | |
| 5907 #endif | |
| 5908 | |
| 5909 /* Remember the active state, it is needed when Vim gets keyboard focus. */ | |
| 5910 xim_is_active = active; | |
| 5911 xim_set_preedit(); | |
| 5912 } | |
| 5913 | |
| 5914 /* | |
| 5915 * Adjust using XIM for gaining or losing keyboard focus. Also called when | |
| 5916 * "xim_is_active" changes. | |
| 5917 */ | |
| 5918 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5919 xim_set_focus(int focus) |
| 7 | 5920 { |
| 5921 if (xic == NULL) | |
| 5922 return; | |
| 5923 | |
| 5924 /* | |
| 5925 * XIM only gets focus when the Vim window has keyboard focus and XIM has | |
| 5926 * been set active for the current mode. | |
| 5927 */ | |
| 5928 if (focus && xim_is_active) | |
| 5929 { | |
| 5930 if (!xim_has_focus) | |
| 5931 { | |
| 5932 xim_has_focus = TRUE; | |
| 5933 XSetICFocus(xic); | |
| 5934 } | |
| 5935 } | |
| 5936 else | |
| 5937 { | |
| 5938 if (xim_has_focus) | |
| 5939 { | |
| 5940 xim_has_focus = FALSE; | |
| 5941 XUnsetICFocus(xic); | |
| 5942 } | |
| 5943 } | |
| 5944 } | |
| 5945 | |
| 5946 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5947 im_set_position(int row UNUSED, int col UNUSED) |
| 7 | 5948 { |
| 5949 xim_set_preedit(); | |
| 5950 } | |
| 5951 | |
| 5952 /* | |
| 5953 * Set the XIM to the current cursor position. | |
| 5954 */ | |
| 5955 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5956 xim_set_preedit(void) |
| 7 | 5957 { |
| 2580 | 5958 XVaNestedList attr_list; |
| 5959 XRectangle spot_area; | |
| 5960 XPoint over_spot; | |
| 5961 int line_space; | |
| 5962 | |
| 7 | 5963 if (xic == NULL) |
| 5964 return; | |
| 5965 | |
| 5966 xim_set_focus(TRUE); | |
| 5967 | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5968 if (!xim_has_focus) |
| 7 | 5969 { |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5970 /* 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
|
5971 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
|
5972 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
|
5973 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
|
5974 XNSpotLocation, |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5975 &over_spot, |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5976 NULL); |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5977 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
|
5978 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
|
5979 return; |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5980 } |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5981 |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5982 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
|
5983 { |
| 7 | 5984 if (xim_fg_color == INVALCOLOR) |
| 5985 { | |
| 5986 xim_fg_color = gui.def_norm_pixel; | |
| 5987 xim_bg_color = gui.def_back_pixel; | |
| 5988 } | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
5989 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
|
5990 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
|
5991 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
|
5992 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
|
5993 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
|
5994 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
|
5995 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
|
5996 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
|
5997 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
|
5998 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
|
5999 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
|
6000 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
|
6001 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
|
6002 NULL); |
|
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6003 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
|
6004 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
|
6005 XFree(attr_list); |
| 7 | 6006 } |
| 6007 } | |
| 6008 | |
|
2275
e4d849f4df03
Remove the old and not well supported GTK 1 code. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
6009 #if defined(FEAT_GUI_X11) |
| 7 | 6010 static char e_xim[] = N_("E285: Failed to create input context"); |
| 6011 #endif | |
| 6012 | |
| 6013 #if defined(FEAT_GUI_X11) || defined(PROTO) | |
|
10460
7fd589f46801
commit https://github.com/vim/vim/commit/a899e6ecc4523c7e411eaf6fbaa4197d70f6f39e
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
6014 # if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 && !defined(SUN_SYSTEM) |
| 7 | 6015 # define USE_X11R6_XIM |
| 6016 # endif | |
| 6017 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
6018 static int xim_real_init(Window x11_window, Display *x11_display); |
| 7 | 6019 |
| 6020 | |
| 6021 #ifdef USE_X11R6_XIM | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7734
diff
changeset
|
6022 static void xim_destroy_cb(XIM im, XPointer client_data, XPointer call_data); |
| 7 | 6023 |
| 6024 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6025 xim_instantiate_cb( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6026 Display *display, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6027 XPointer client_data UNUSED, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6028 XPointer call_data UNUSED) |
| 7 | 6029 { |
| 6030 Window x11_window; | |
| 6031 Display *x11_display; | |
| 6032 | |
| 6033 #ifdef XIM_DEBUG | |
| 6034 xim_log("xim_instantiate_cb()\n"); | |
| 6035 #endif | |
| 6036 | |
| 6037 gui_get_x11_windis(&x11_window, &x11_display); | |
| 6038 if (display != x11_display) | |
| 6039 return; | |
| 6040 | |
| 6041 xim_real_init(x11_window, x11_display); | |
| 811 | 6042 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 6043 if (xic != NULL) |
| 6044 XUnregisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
| 6045 xim_instantiate_cb, NULL); | |
| 6046 } | |
| 6047 | |
| 6048 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6049 xim_destroy_cb( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6050 XIM im UNUSED, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6051 XPointer client_data UNUSED, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6052 XPointer call_data UNUSED) |
| 7 | 6053 { |
| 6054 Window x11_window; | |
| 6055 Display *x11_display; | |
| 6056 | |
| 6057 #ifdef XIM_DEBUG | |
| 6058 xim_log("xim_destroy_cb()\n"); | |
| 6059 #endif | |
| 6060 gui_get_x11_windis(&x11_window, &x11_display); | |
| 6061 | |
| 6062 xic = NULL; | |
| 6063 status_area_enabled = FALSE; | |
| 6064 | |
| 811 | 6065 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 6066 |
| 6067 XRegisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
| 6068 xim_instantiate_cb, NULL); | |
| 6069 } | |
| 6070 #endif | |
| 6071 | |
| 6072 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6073 xim_init(void) |
| 7 | 6074 { |
| 6075 Window x11_window; | |
| 6076 Display *x11_display; | |
| 6077 | |
| 6078 #ifdef XIM_DEBUG | |
| 6079 xim_log("xim_init()\n"); | |
| 6080 #endif | |
| 6081 | |
| 6082 gui_get_x11_windis(&x11_window, &x11_display); | |
| 6083 | |
| 6084 xic = NULL; | |
| 6085 | |
| 6086 if (xim_real_init(x11_window, x11_display)) | |
| 6087 return; | |
| 6088 | |
| 811 | 6089 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 6090 |
| 6091 #ifdef USE_X11R6_XIM | |
| 6092 XRegisterIMInstantiateCallback(x11_display, NULL, NULL, NULL, | |
| 6093 xim_instantiate_cb, NULL); | |
| 6094 #endif | |
| 6095 } | |
| 6096 | |
| 6097 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6098 xim_real_init(Window x11_window, Display *x11_display) |
| 7 | 6099 { |
| 6100 int i; | |
| 6101 char *p, | |
| 6102 *s, | |
| 6103 *ns, | |
| 6104 *end, | |
| 6105 tmp[1024]; | |
| 6106 #define IMLEN_MAX 40 | |
| 6107 char buf[IMLEN_MAX + 7]; | |
| 6108 XIM xim = NULL; | |
| 6109 XIMStyles *xim_styles; | |
| 6110 XIMStyle this_input_style = 0; | |
| 6111 Boolean found; | |
| 6112 XPoint over_spot; | |
| 6113 XVaNestedList preedit_list, status_list; | |
| 6114 | |
| 6115 input_style = 0; | |
| 6116 status_area_enabled = FALSE; | |
| 6117 | |
| 6118 if (xic != NULL) | |
| 6119 return FALSE; | |
| 6120 | |
| 6121 if (gui.rsrc_input_method != NULL && *gui.rsrc_input_method != NUL) | |
| 6122 { | |
| 6123 strcpy(tmp, gui.rsrc_input_method); | |
| 6124 for (ns = s = tmp; ns != NULL && *s != NUL;) | |
| 6125 { | |
| 6126 s = (char *)skipwhite((char_u *)s); | |
| 6127 if (*s == NUL) | |
| 6128 break; | |
| 6129 if ((ns = end = strchr(s, ',')) == NULL) | |
| 6130 end = s + strlen(s); | |
| 6131 while (isspace(((char_u *)end)[-1])) | |
| 6132 end--; | |
| 6133 *end = NUL; | |
| 6134 | |
| 6135 if (strlen(s) <= IMLEN_MAX) | |
| 6136 { | |
| 6137 strcpy(buf, "@im="); | |
| 6138 strcat(buf, s); | |
| 6139 if ((p = XSetLocaleModifiers(buf)) != NULL && *p != NUL | |
| 6140 && (xim = XOpenIM(x11_display, NULL, NULL, NULL)) | |
| 6141 != NULL) | |
| 6142 break; | |
| 6143 } | |
| 6144 | |
| 6145 s = ns + 1; | |
| 6146 } | |
| 6147 } | |
| 6148 | |
| 6149 if (xim == NULL && (p = XSetLocaleModifiers("")) != NULL && *p != NUL) | |
| 6150 xim = XOpenIM(x11_display, NULL, NULL, NULL); | |
| 6151 | |
| 6152 /* This is supposed to be useful to obtain characters through | |
| 6153 * XmbLookupString() without really using a XIM. */ | |
| 6154 if (xim == NULL && (p = XSetLocaleModifiers("@im=none")) != NULL | |
| 6155 && *p != NUL) | |
| 6156 xim = XOpenIM(x11_display, NULL, NULL, NULL); | |
| 6157 | |
| 6158 if (xim == NULL) | |
| 6159 { | |
| 6160 /* Only give this message when verbose is set, because too many people | |
| 6161 * got this message when they didn't want to use a XIM. */ | |
| 6162 if (p_verbose > 0) | |
| 292 | 6163 { |
| 6164 verbose_enter(); | |
| 7 | 6165 EMSG(_("E286: Failed to open input method")); |
| 292 | 6166 verbose_leave(); |
| 6167 } | |
| 7 | 6168 return FALSE; |
| 6169 } | |
| 6170 | |
| 6171 #ifdef USE_X11R6_XIM | |
| 6172 { | |
| 6173 XIMCallback destroy_cb; | |
| 6174 | |
| 6175 destroy_cb.callback = xim_destroy_cb; | |
| 6176 destroy_cb.client_data = NULL; | |
| 6177 if (XSetIMValues(xim, XNDestroyCallback, &destroy_cb, NULL)) | |
| 6178 EMSG(_("E287: Warning: Could not set destroy callback to IM")); | |
| 6179 } | |
| 6180 #endif | |
| 6181 | |
| 6182 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) || !xim_styles) | |
| 6183 { | |
| 6184 EMSG(_("E288: input method doesn't support any style")); | |
| 6185 XCloseIM(xim); | |
| 6186 return FALSE; | |
| 6187 } | |
| 6188 | |
| 6189 found = False; | |
| 6190 strcpy(tmp, gui.rsrc_preedit_type_name); | |
| 6191 for (s = tmp; s && !found; ) | |
| 6192 { | |
| 6193 while (*s && isspace((unsigned char)*s)) | |
| 6194 s++; | |
| 6195 if (!*s) | |
| 6196 break; | |
| 6197 if ((ns = end = strchr(s, ',')) != 0) | |
| 6198 ns++; | |
| 6199 else | |
| 6200 end = s + strlen(s); | |
| 6201 while (isspace((unsigned char)*end)) | |
| 6202 end--; | |
| 6203 *end = '\0'; | |
| 6204 | |
| 6205 if (!strcmp(s, "OverTheSpot")) | |
| 6206 this_input_style = (XIMPreeditPosition | XIMStatusArea); | |
| 6207 else if (!strcmp(s, "OffTheSpot")) | |
| 6208 this_input_style = (XIMPreeditArea | XIMStatusArea); | |
| 6209 else if (!strcmp(s, "Root")) | |
| 6210 this_input_style = (XIMPreeditNothing | XIMStatusNothing); | |
| 6211 | |
| 6212 for (i = 0; (unsigned short)i < xim_styles->count_styles; i++) | |
| 6213 { | |
| 6214 if (this_input_style == xim_styles->supported_styles[i]) | |
| 6215 { | |
| 6216 found = True; | |
| 6217 break; | |
| 6218 } | |
| 6219 } | |
| 6220 if (!found) | |
| 6221 for (i = 0; (unsigned short)i < xim_styles->count_styles; i++) | |
| 6222 { | |
| 6223 if ((xim_styles->supported_styles[i] & this_input_style) | |
| 6224 == (this_input_style & ~XIMStatusArea)) | |
| 6225 { | |
| 6226 this_input_style &= ~XIMStatusArea; | |
| 6227 found = True; | |
| 6228 break; | |
| 6229 } | |
| 6230 } | |
| 6231 | |
| 6232 s = ns; | |
| 6233 } | |
| 6234 XFree(xim_styles); | |
| 6235 | |
| 6236 if (!found) | |
| 6237 { | |
| 6238 /* Only give this message when verbose is set, because too many people | |
| 6239 * got this message when they didn't want to use a XIM. */ | |
| 6240 if (p_verbose > 0) | |
| 292 | 6241 { |
| 6242 verbose_enter(); | |
| 7 | 6243 EMSG(_("E289: input method doesn't support my preedit type")); |
| 292 | 6244 verbose_leave(); |
| 6245 } | |
| 7 | 6246 XCloseIM(xim); |
| 6247 return FALSE; | |
| 6248 } | |
| 6249 | |
| 6250 over_spot.x = TEXT_X(gui.col); | |
| 6251 over_spot.y = TEXT_Y(gui.row); | |
| 6252 input_style = this_input_style; | |
| 6253 | |
| 6254 /* A crash was reported when trying to pass gui.norm_font as XNFontSet, | |
| 6255 * thus that has been removed. Hopefully the default works... */ | |
| 6256 #ifdef FEAT_XFONTSET | |
| 6257 if (gui.fontset != NOFONTSET) | |
| 6258 { | |
| 6259 preedit_list = XVaCreateNestedList(0, | |
| 6260 XNSpotLocation, &over_spot, | |
| 6261 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 6262 XNBackground, (Pixel)gui.def_back_pixel, | |
| 6263 XNFontSet, (XFontSet)gui.fontset, | |
| 6264 NULL); | |
| 6265 status_list = XVaCreateNestedList(0, | |
| 6266 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 6267 XNBackground, (Pixel)gui.def_back_pixel, | |
| 6268 XNFontSet, (XFontSet)gui.fontset, | |
| 6269 NULL); | |
| 6270 } | |
| 6271 else | |
| 6272 #endif | |
| 6273 { | |
| 6274 preedit_list = XVaCreateNestedList(0, | |
| 6275 XNSpotLocation, &over_spot, | |
| 6276 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 6277 XNBackground, (Pixel)gui.def_back_pixel, | |
| 6278 NULL); | |
| 6279 status_list = XVaCreateNestedList(0, | |
| 6280 XNForeground, (Pixel)gui.def_norm_pixel, | |
| 6281 XNBackground, (Pixel)gui.def_back_pixel, | |
| 6282 NULL); | |
| 6283 } | |
| 6284 | |
| 6285 xic = XCreateIC(xim, | |
| 6286 XNInputStyle, input_style, | |
| 6287 XNClientWindow, x11_window, | |
| 6288 XNFocusWindow, gui.wid, | |
| 6289 XNPreeditAttributes, preedit_list, | |
| 6290 XNStatusAttributes, status_list, | |
| 6291 NULL); | |
| 6292 XFree(status_list); | |
| 6293 XFree(preedit_list); | |
| 6294 if (xic != NULL) | |
| 6295 { | |
| 6296 if (input_style & XIMStatusArea) | |
| 6297 { | |
| 6298 xim_set_status_area(); | |
| 6299 status_area_enabled = TRUE; | |
| 6300 } | |
| 6301 else | |
| 811 | 6302 gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); |
| 7 | 6303 } |
| 6304 else | |
| 6305 { | |
| 6306 EMSG(_(e_xim)); | |
| 6307 XCloseIM(xim); | |
| 6308 return FALSE; | |
| 6309 } | |
| 6310 | |
| 6311 return TRUE; | |
| 6312 } | |
| 6313 | |
| 6314 #endif /* FEAT_GUI_X11 */ | |
| 6315 | |
| 6316 /* | |
| 6317 * Get IM status. When IM is on, return TRUE. Else return FALSE. | |
| 6318 * FIXME: This doesn't work correctly: Having focus doesn't always mean XIM is | |
| 6319 * active, when not having focus XIM may still be active (e.g., when using a | |
| 6320 * tear-off menu item). | |
| 6321 */ | |
| 6322 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6323 im_get_status(void) |
| 7 | 6324 { |
| 6325 return xim_has_focus; | |
| 6326 } | |
| 6327 | |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
6328 # endif /* !FEAT_GUI_GTK */ |
|
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2275
diff
changeset
|
6329 |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6330 # if !defined(FEAT_GUI_GTK) || defined(PROTO) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6331 /* |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6332 * Set up the status area. |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6333 * |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6334 * 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
|
6335 * 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
|
6336 * 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
|
6337 * window... |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6338 */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6339 void |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6340 xim_set_status_area(void) |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6341 { |
| 2580 | 6342 XVaNestedList preedit_list = 0, status_list = 0, list = 0; |
| 6343 XRectangle pre_area, status_area; | |
| 6344 | |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6345 if (xic == NULL) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6346 return; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6347 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6348 if (input_style & XIMStatusArea) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6349 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6350 if (input_style & XIMPreeditArea) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6351 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6352 XRectangle *needed_rect; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6353 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6354 /* to get status_area width */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6355 status_list = XVaCreateNestedList(0, XNAreaNeeded, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6356 &needed_rect, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6357 XGetICValues(xic, XNStatusAttributes, status_list, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6358 XFree(status_list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6359 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6360 status_area.width = needed_rect->width; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6361 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6362 else |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6363 status_area.width = gui.char_width * Columns; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6364 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6365 status_area.x = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6366 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
|
6367 if (gui.which_scrollbars[SBAR_BOTTOM]) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6368 status_area.y += gui.scrollbar_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6369 #ifdef FEAT_MENU |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6370 if (gui.menu_is_active) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6371 status_area.y += gui.menu_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6372 #endif |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6373 status_area.height = gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6374 status_list = XVaCreateNestedList(0, XNArea, &status_area, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6375 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6376 else |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6377 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6378 status_area.x = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6379 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
|
6380 if (gui.which_scrollbars[SBAR_BOTTOM]) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6381 status_area.y += gui.scrollbar_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6382 #ifdef FEAT_MENU |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6383 if (gui.menu_is_active) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6384 status_area.y += gui.menu_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6385 #endif |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6386 status_area.width = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6387 status_area.height = gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6388 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6389 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6390 if (input_style & XIMPreeditArea) /* off-the-spot */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6391 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6392 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
|
6393 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
|
6394 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
|
6395 if (gui.which_scrollbars[SBAR_BOTTOM]) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6396 pre_area.y += gui.scrollbar_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6397 #ifdef FEAT_MENU |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6398 if (gui.menu_is_active) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6399 pre_area.y += gui.menu_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6400 #endif |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6401 pre_area.height = gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6402 preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6403 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6404 else if (input_style & XIMPreeditPosition) /* over-the-spot */ |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6405 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6406 pre_area.x = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6407 pre_area.y = 0; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6408 pre_area.height = gui.char_height * Rows; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6409 pre_area.width = gui.char_width * Columns; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6410 preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6411 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6412 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6413 if (preedit_list && status_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6414 list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6415 XNStatusAttributes, status_list, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6416 else if (preedit_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6417 list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6418 NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6419 else if (status_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6420 list = XVaCreateNestedList(0, XNStatusAttributes, status_list, |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6421 NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6422 else |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6423 list = NULL; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6424 |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6425 if (list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6426 { |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6427 XSetICValues(xic, XNVaNestedList, list, NULL); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6428 XFree(list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6429 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6430 if (status_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6431 XFree(status_list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6432 if (preedit_list) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6433 XFree(preedit_list); |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6434 } |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6435 |
| 1668 | 6436 int |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6437 xim_get_status_area_height(void) |
| 1668 | 6438 { |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6439 if (status_area_enabled) |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6440 return gui.char_height; |
|
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
6441 return 0; |
| 1668 | 6442 } |
| 6443 # endif | |
| 6444 | |
| 7 | 6445 #endif /* FEAT_XIM */ |
| 6446 | |
| 6447 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 6448 | |
| 6449 /* | |
| 6450 * Setup "vcp" for conversion from "from" to "to". | |
| 6451 * The names must have been made canonical with enc_canonize(). | |
| 6452 * vcp->vc_type must have been initialized to CONV_NONE. | |
| 6453 * Note: cannot be used for conversion from/to ucs-2 and ucs-4 (will use utf-8 | |
| 6454 * instead). | |
| 6455 * Afterwards invoke with "from" and "to" equal to NULL to cleanup. | |
| 6456 * Return FAIL when conversion is not supported, OK otherwise. | |
| 6457 */ | |
| 6458 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6459 convert_setup(vimconv_T *vcp, char_u *from, char_u *to) |
| 7 | 6460 { |
| 1904 | 6461 return convert_setup_ext(vcp, from, TRUE, to, TRUE); |
| 6462 } | |
| 6463 | |
| 6464 /* | |
| 6465 * As convert_setup(), but only when from_unicode_is_utf8 is TRUE will all | |
| 6466 * "from" unicode charsets be considered utf-8. Same for "to". | |
| 6467 */ | |
| 6468 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6469 convert_setup_ext( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6470 vimconv_T *vcp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6471 char_u *from, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6472 int from_unicode_is_utf8, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6473 char_u *to, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6474 int to_unicode_is_utf8) |
| 1904 | 6475 { |
| 7 | 6476 int from_prop; |
| 6477 int to_prop; | |
| 1904 | 6478 int from_is_utf8; |
| 6479 int to_is_utf8; | |
| 7 | 6480 |
| 6481 /* Reset to no conversion. */ | |
| 6482 # ifdef USE_ICONV | |
| 6483 if (vcp->vc_type == CONV_ICONV && vcp->vc_fd != (iconv_t)-1) | |
| 6484 iconv_close(vcp->vc_fd); | |
| 6485 # endif | |
| 6486 vcp->vc_type = CONV_NONE; | |
| 6487 vcp->vc_factor = 1; | |
| 6488 vcp->vc_fail = FALSE; | |
| 6489 | |
| 6490 /* No conversion when one of the names is empty or they are equal. */ | |
| 6491 if (from == NULL || *from == NUL || to == NULL || *to == NUL | |
| 6492 || STRCMP(from, to) == 0) | |
| 6493 return OK; | |
| 6494 | |
| 6495 from_prop = enc_canon_props(from); | |
| 6496 to_prop = enc_canon_props(to); | |
| 1904 | 6497 if (from_unicode_is_utf8) |
| 6498 from_is_utf8 = from_prop & ENC_UNICODE; | |
| 6499 else | |
| 6500 from_is_utf8 = from_prop == ENC_UNICODE; | |
| 6501 if (to_unicode_is_utf8) | |
| 6502 to_is_utf8 = to_prop & ENC_UNICODE; | |
| 6503 else | |
| 6504 to_is_utf8 = to_prop == ENC_UNICODE; | |
| 6505 | |
| 6506 if ((from_prop & ENC_LATIN1) && to_is_utf8) | |
| 7 | 6507 { |
| 6508 /* Internal latin1 -> utf-8 conversion. */ | |
| 6509 vcp->vc_type = CONV_TO_UTF8; | |
| 6510 vcp->vc_factor = 2; /* up to twice as long */ | |
| 6511 } | |
| 1904 | 6512 else if ((from_prop & ENC_LATIN9) && to_is_utf8) |
| 26 | 6513 { |
| 6514 /* Internal latin9 -> utf-8 conversion. */ | |
| 6515 vcp->vc_type = CONV_9_TO_UTF8; | |
| 6516 vcp->vc_factor = 3; /* up to three as long (euro sign) */ | |
| 6517 } | |
| 1904 | 6518 else if (from_is_utf8 && (to_prop & ENC_LATIN1)) |
| 7 | 6519 { |
| 6520 /* Internal utf-8 -> latin1 conversion. */ | |
| 6521 vcp->vc_type = CONV_TO_LATIN1; | |
| 6522 } | |
| 1904 | 6523 else if (from_is_utf8 && (to_prop & ENC_LATIN9)) |
| 26 | 6524 { |
| 6525 /* Internal utf-8 -> latin9 conversion. */ | |
| 6526 vcp->vc_type = CONV_TO_LATIN9; | |
| 6527 } | |
| 7 | 6528 #ifdef WIN3264 |
| 6529 /* Win32-specific codepage <-> codepage conversion without iconv. */ | |
| 1904 | 6530 else if ((from_is_utf8 || encname2codepage(from) > 0) |
| 6531 && (to_is_utf8 || encname2codepage(to) > 0)) | |
| 7 | 6532 { |
| 6533 vcp->vc_type = CONV_CODEPAGE; | |
| 6534 vcp->vc_factor = 2; /* up to twice as long */ | |
| 1904 | 6535 vcp->vc_cpfrom = from_is_utf8 ? 0 : encname2codepage(from); |
| 6536 vcp->vc_cpto = to_is_utf8 ? 0 : encname2codepage(to); | |
| 7 | 6537 } |
| 6538 #endif | |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
6539 #ifdef MACOS_CONVERT |
| 7 | 6540 else if ((from_prop & ENC_MACROMAN) && (to_prop & ENC_LATIN1)) |
| 6541 { | |
| 6542 vcp->vc_type = CONV_MAC_LATIN1; | |
| 6543 } | |
| 1904 | 6544 else if ((from_prop & ENC_MACROMAN) && to_is_utf8) |
| 7 | 6545 { |
| 6546 vcp->vc_type = CONV_MAC_UTF8; | |
| 6547 vcp->vc_factor = 2; /* up to twice as long */ | |
| 6548 } | |
| 6549 else if ((from_prop & ENC_LATIN1) && (to_prop & ENC_MACROMAN)) | |
| 6550 { | |
| 6551 vcp->vc_type = CONV_LATIN1_MAC; | |
| 6552 } | |
| 1904 | 6553 else if (from_is_utf8 && (to_prop & ENC_MACROMAN)) |
| 7 | 6554 { |
| 6555 vcp->vc_type = CONV_UTF8_MAC; | |
| 6556 } | |
| 6557 #endif | |
| 6558 # ifdef USE_ICONV | |
| 6559 else | |
| 6560 { | |
| 6561 /* Use iconv() for conversion. */ | |
| 6562 vcp->vc_fd = (iconv_t)my_iconv_open( | |
| 1904 | 6563 to_is_utf8 ? (char_u *)"utf-8" : to, |
| 6564 from_is_utf8 ? (char_u *)"utf-8" : from); | |
| 7 | 6565 if (vcp->vc_fd != (iconv_t)-1) |
| 6566 { | |
| 6567 vcp->vc_type = CONV_ICONV; | |
| 6568 vcp->vc_factor = 4; /* could be longer too... */ | |
| 6569 } | |
| 6570 } | |
| 6571 # endif | |
| 6572 if (vcp->vc_type == CONV_NONE) | |
| 6573 return FAIL; | |
| 167 | 6574 |
| 7 | 6575 return OK; |
| 6576 } | |
| 6577 | |
| 6578 #if defined(FEAT_GUI) || defined(AMIGA) || defined(WIN3264) \ | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8080
diff
changeset
|
6579 || defined(PROTO) |
| 7 | 6580 /* |
| 6581 * Do conversion on typed input characters in-place. | |
| 6582 * The input and output are not NUL terminated! | |
| 6583 * Returns the length after conversion. | |
| 6584 */ | |
| 6585 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6586 convert_input(char_u *ptr, int len, int maxlen) |
| 7 | 6587 { |
| 6588 return convert_input_safe(ptr, len, maxlen, NULL, NULL); | |
| 6589 } | |
| 6590 #endif | |
| 6591 | |
| 6592 /* | |
| 6593 * Like convert_input(), but when there is an incomplete byte sequence at the | |
| 6594 * end return that as an allocated string in "restp" and set "*restlenp" to | |
| 6595 * the length. If "restp" is NULL it is not used. | |
| 6596 */ | |
| 6597 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6598 convert_input_safe( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6599 char_u *ptr, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6600 int len, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6601 int maxlen, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6602 char_u **restp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6603 int *restlenp) |
| 7 | 6604 { |
| 6605 char_u *d; | |
| 6606 int dlen = len; | |
| 6607 int unconvertlen = 0; | |
| 6608 | |
| 6609 d = string_convert_ext(&input_conv, ptr, &dlen, | |
| 6610 restp == NULL ? NULL : &unconvertlen); | |
| 6611 if (d != NULL) | |
| 6612 { | |
| 6613 if (dlen <= maxlen) | |
| 6614 { | |
| 6615 if (unconvertlen > 0) | |
| 6616 { | |
| 6617 /* Move the unconverted characters to allocated memory. */ | |
| 6618 *restp = alloc(unconvertlen); | |
| 6619 if (*restp != NULL) | |
| 6620 mch_memmove(*restp, ptr + len - unconvertlen, unconvertlen); | |
| 6621 *restlenp = unconvertlen; | |
| 6622 } | |
| 6623 mch_memmove(ptr, d, dlen); | |
| 6624 } | |
| 6625 else | |
| 6626 /* result is too long, keep the unconverted text (the caller must | |
| 6627 * have done something wrong!) */ | |
| 6628 dlen = len; | |
| 6629 vim_free(d); | |
| 6630 } | |
| 6631 return dlen; | |
| 6632 } | |
| 6633 | |
| 6634 /* | |
| 6635 * Convert text "ptr[*lenp]" according to "vcp". | |
| 6636 * Returns the result in allocated memory and sets "*lenp". | |
| 6637 * When "lenp" is NULL, use NUL terminated strings. | |
| 6638 * Illegal chars are often changed to "?", unless vcp->vc_fail is set. | |
| 6639 * When something goes wrong, NULL is returned and "*lenp" is unchanged. | |
| 6640 */ | |
| 6641 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6642 string_convert( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6643 vimconv_T *vcp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6644 char_u *ptr, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6645 int *lenp) |
| 7 | 6646 { |
| 6647 return string_convert_ext(vcp, ptr, lenp, NULL); | |
| 6648 } | |
| 6649 | |
| 6650 /* | |
| 6651 * Like string_convert(), but when "unconvlenp" is not NULL and there are is | |
| 6652 * an incomplete sequence at the end it is not converted and "*unconvlenp" is | |
| 6653 * set to the number of remaining bytes. | |
| 6654 */ | |
| 6655 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6656 string_convert_ext( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6657 vimconv_T *vcp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6658 char_u *ptr, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6659 int *lenp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6660 int *unconvlenp) |
| 7 | 6661 { |
| 6662 char_u *retval = NULL; | |
| 6663 char_u *d; | |
| 6664 int len; | |
| 6665 int i; | |
| 6666 int l; | |
| 6667 int c; | |
| 6668 | |
| 6669 if (lenp == NULL) | |
| 6670 len = (int)STRLEN(ptr); | |
| 6671 else | |
| 6672 len = *lenp; | |
| 6673 if (len == 0) | |
| 6674 return vim_strsave((char_u *)""); | |
| 6675 | |
| 6676 switch (vcp->vc_type) | |
| 6677 { | |
| 6678 case CONV_TO_UTF8: /* latin1 to utf-8 conversion */ | |
| 6679 retval = alloc(len * 2 + 1); | |
| 6680 if (retval == NULL) | |
| 6681 break; | |
| 6682 d = retval; | |
| 6683 for (i = 0; i < len; ++i) | |
| 6684 { | |
| 26 | 6685 c = ptr[i]; |
| 6686 if (c < 0x80) | |
| 6687 *d++ = c; | |
| 7 | 6688 else |
| 6689 { | |
| 26 | 6690 *d++ = 0xc0 + ((unsigned)c >> 6); |
| 6691 *d++ = 0x80 + (c & 0x3f); | |
| 7 | 6692 } |
| 6693 } | |
| 6694 *d = NUL; | |
| 6695 if (lenp != NULL) | |
| 6696 *lenp = (int)(d - retval); | |
| 6697 break; | |
| 6698 | |
| 26 | 6699 case CONV_9_TO_UTF8: /* latin9 to utf-8 conversion */ |
| 6700 retval = alloc(len * 3 + 1); | |
| 6701 if (retval == NULL) | |
| 6702 break; | |
| 6703 d = retval; | |
| 6704 for (i = 0; i < len; ++i) | |
| 6705 { | |
| 6706 c = ptr[i]; | |
| 6707 switch (c) | |
| 6708 { | |
| 6709 case 0xa4: c = 0x20ac; break; /* euro */ | |
| 6710 case 0xa6: c = 0x0160; break; /* S hat */ | |
| 6711 case 0xa8: c = 0x0161; break; /* S -hat */ | |
| 6712 case 0xb4: c = 0x017d; break; /* Z hat */ | |
| 6713 case 0xb8: c = 0x017e; break; /* Z -hat */ | |
| 6714 case 0xbc: c = 0x0152; break; /* OE */ | |
| 6715 case 0xbd: c = 0x0153; break; /* oe */ | |
| 6716 case 0xbe: c = 0x0178; break; /* Y */ | |
| 6717 } | |
| 6718 d += utf_char2bytes(c, d); | |
| 6719 } | |
| 6720 *d = NUL; | |
| 6721 if (lenp != NULL) | |
| 6722 *lenp = (int)(d - retval); | |
| 6723 break; | |
| 6724 | |
| 7 | 6725 case CONV_TO_LATIN1: /* utf-8 to latin1 conversion */ |
| 26 | 6726 case CONV_TO_LATIN9: /* utf-8 to latin9 conversion */ |
| 7 | 6727 retval = alloc(len + 1); |
| 6728 if (retval == NULL) | |
| 6729 break; | |
| 6730 d = retval; | |
| 6731 for (i = 0; i < len; ++i) | |
| 6732 { | |
| 2015 | 6733 l = utf_ptr2len_len(ptr + i, len - i); |
| 7 | 6734 if (l == 0) |
| 6735 *d++ = NUL; | |
| 6736 else if (l == 1) | |
| 6737 { | |
| 2015 | 6738 int l_w = utf8len_tab_zero[ptr[i]]; |
| 6739 | |
| 6740 if (l_w == 0) | |
| 6741 { | |
| 6742 /* Illegal utf-8 byte cannot be converted */ | |
| 6743 vim_free(retval); | |
| 6744 return NULL; | |
| 6745 } | |
| 6746 if (unconvlenp != NULL && l_w > len - i) | |
| 7 | 6747 { |
| 6748 /* Incomplete sequence at the end. */ | |
| 6749 *unconvlenp = len - i; | |
| 6750 break; | |
| 6751 } | |
| 6752 *d++ = ptr[i]; | |
| 6753 } | |
| 6754 else | |
| 6755 { | |
| 6756 c = utf_ptr2char(ptr + i); | |
| 26 | 6757 if (vcp->vc_type == CONV_TO_LATIN9) |
| 6758 switch (c) | |
| 6759 { | |
| 6760 case 0x20ac: c = 0xa4; break; /* euro */ | |
| 6761 case 0x0160: c = 0xa6; break; /* S hat */ | |
| 6762 case 0x0161: c = 0xa8; break; /* S -hat */ | |
| 6763 case 0x017d: c = 0xb4; break; /* Z hat */ | |
| 6764 case 0x017e: c = 0xb8; break; /* Z -hat */ | |
| 6765 case 0x0152: c = 0xbc; break; /* OE */ | |
| 6766 case 0x0153: c = 0xbd; break; /* oe */ | |
| 6767 case 0x0178: c = 0xbe; break; /* Y */ | |
| 6768 case 0xa4: | |
| 6769 case 0xa6: | |
| 6770 case 0xa8: | |
| 6771 case 0xb4: | |
| 6772 case 0xb8: | |
| 6773 case 0xbc: | |
| 6774 case 0xbd: | |
| 6775 case 0xbe: c = 0x100; break; /* not in latin9 */ | |
| 6776 } | |
| 7 | 6777 if (!utf_iscomposing(c)) /* skip composing chars */ |
| 6778 { | |
| 6779 if (c < 0x100) | |
| 6780 *d++ = c; | |
| 6781 else if (vcp->vc_fail) | |
| 6782 { | |
| 6783 vim_free(retval); | |
| 6784 return NULL; | |
| 6785 } | |
| 6786 else | |
| 6787 { | |
| 6788 *d++ = 0xbf; | |
| 6789 if (utf_char2cells(c) > 1) | |
| 6790 *d++ = '?'; | |
| 6791 } | |
| 6792 } | |
| 6793 i += l - 1; | |
| 6794 } | |
| 6795 } | |
| 6796 *d = NUL; | |
| 6797 if (lenp != NULL) | |
| 6798 *lenp = (int)(d - retval); | |
| 6799 break; | |
| 6800 | |
| 765 | 6801 # ifdef MACOS_CONVERT |
| 7 | 6802 case CONV_MAC_LATIN1: |
| 6803 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6804 'm', 'l', unconvlenp); |
| 7 | 6805 break; |
| 6806 | |
| 6807 case CONV_LATIN1_MAC: | |
| 6808 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6809 'l', 'm', unconvlenp); |
| 7 | 6810 break; |
| 6811 | |
| 6812 case CONV_MAC_UTF8: | |
| 6813 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6814 'm', 'u', unconvlenp); |
| 7 | 6815 break; |
| 6816 | |
| 6817 case CONV_UTF8_MAC: | |
| 6818 retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail, | |
| 18 | 6819 'u', 'm', unconvlenp); |
| 7 | 6820 break; |
| 6821 # endif | |
| 6822 | |
| 6823 # ifdef USE_ICONV | |
| 6824 case CONV_ICONV: /* conversion with output_conv.vc_fd */ | |
| 1904 | 6825 retval = iconv_string(vcp, ptr, len, unconvlenp, lenp); |
| 7 | 6826 break; |
| 6827 # endif | |
| 6828 # ifdef WIN3264 | |
| 6829 case CONV_CODEPAGE: /* codepage -> codepage */ | |
| 6830 { | |
| 6831 int retlen; | |
| 6832 int tmp_len; | |
| 6833 short_u *tmp; | |
| 6834 | |
| 6835 /* 1. codepage/UTF-8 -> ucs-2. */ | |
| 6836 if (vcp->vc_cpfrom == 0) | |
| 1752 | 6837 tmp_len = utf8_to_utf16(ptr, len, NULL, NULL); |
| 7 | 6838 else |
| 4122 | 6839 { |
| 6840 tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, | |
| 6841 unconvlenp ? MB_ERR_INVALID_CHARS : 0, | |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6842 (char *)ptr, len, 0, 0); |
| 4122 | 6843 if (tmp_len == 0 |
| 6844 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION) | |
| 6845 { | |
| 6846 if (lenp != NULL) | |
| 6847 *lenp = 0; | |
| 6848 if (unconvlenp != NULL) | |
| 6849 *unconvlenp = len; | |
| 6850 retval = alloc(1); | |
| 6851 if (retval) | |
| 6852 retval[0] = NUL; | |
| 6853 return retval; | |
| 6854 } | |
| 6855 } | |
| 7 | 6856 tmp = (short_u *)alloc(sizeof(short_u) * tmp_len); |
| 6857 if (tmp == NULL) | |
| 6858 break; | |
| 6859 if (vcp->vc_cpfrom == 0) | |
| 1752 | 6860 utf8_to_utf16(ptr, len, tmp, unconvlenp); |
| 7 | 6861 else |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6862 MultiByteToWideChar(vcp->vc_cpfrom, 0, |
|
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6863 (char *)ptr, len, tmp, tmp_len); |
| 7 | 6864 |
| 6865 /* 2. ucs-2 -> codepage/UTF-8. */ | |
| 6866 if (vcp->vc_cpto == 0) | |
| 1752 | 6867 retlen = utf16_to_utf8(tmp, tmp_len, NULL); |
| 7 | 6868 else |
| 6869 retlen = WideCharToMultiByte(vcp->vc_cpto, 0, | |
| 6870 tmp, tmp_len, 0, 0, 0, 0); | |
| 6871 retval = alloc(retlen + 1); | |
| 6872 if (retval != NULL) | |
| 6873 { | |
| 6874 if (vcp->vc_cpto == 0) | |
| 1752 | 6875 utf16_to_utf8(tmp, tmp_len, retval); |
| 7 | 6876 else |
| 6877 WideCharToMultiByte(vcp->vc_cpto, 0, | |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6878 tmp, tmp_len, |
|
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
6879 (char *)retval, retlen, 0, 0); |
| 7 | 6880 retval[retlen] = NUL; |
| 6881 if (lenp != NULL) | |
| 6882 *lenp = retlen; | |
| 6883 } | |
| 6884 vim_free(tmp); | |
| 6885 break; | |
| 6886 } | |
| 6887 # endif | |
| 6888 } | |
| 6889 | |
| 6890 return retval; | |
| 6891 } | |
| 6892 #endif |