Mercurial > vim
annotate src/charset.c @ 32679:1b9a29f7fe86 v9.0.1670
patch 9.0.1670: resetting local option to global value is inconsistent
Commit: https://github.com/vim/vim/commit/bf5f189e449d6517239b79804d7a422a46946838
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jun 27 21:51:07 2023 +0100
patch 9.0.1670: resetting local option to global value is inconsistent
Problem: Resetting local option to global value is inconsistent.
Solution: Handle "<" specifically for 'scrolloff' and 'sidescrolloff'.
(closes #12594)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 27 Jun 2023 23:00:04 +0200 |
| parents | f3987fde6dea |
| children | fbe3a843b6af |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9399
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 #include "vim.h" | |
| 11 | |
|
15595
1ec942f1b648
patch 8.1.0805: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
12 #if defined(HAVE_WCHAR_H) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
13 # include <wchar.h> // for towupper() and towlower() |
|
15595
1ec942f1b648
patch 8.1.0805: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
14 #endif |
| 7 | 15 |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
16 static int win_nolbr_chartabsize(chartabsize_T *cts, int *headp); |
|
7799
af3c41a3c53f
commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
17 static unsigned nr2hex(unsigned c); |
| 7 | 18 |
| 19 static int chartab_initialized = FALSE; | |
| 20 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
21 // b_chartab[] is an array of 32 bytes, each bit representing one of the |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
22 // characters 0-255. |
| 7 | 23 #define SET_CHARTAB(buf, c) (buf)->b_chartab[(unsigned)(c) >> 3] |= (1 << ((c) & 0x7)) |
| 24 #define RESET_CHARTAB(buf, c) (buf)->b_chartab[(unsigned)(c) >> 3] &= ~(1 << ((c) & 0x7)) | |
| 25 #define GET_CHARTAB(buf, c) ((buf)->b_chartab[(unsigned)(c) >> 3] & (1 << ((c) & 0x7))) | |
| 26 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
27 // table used below, see init_chartab() for an explanation |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
28 static char_u g_chartab[256]; |
|
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
29 |
| 7 | 30 /* |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
31 * Flags for g_chartab[]. |
|
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
32 */ |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
33 #define CT_CELL_MASK 0x07 // mask: nr of display cells (1, 2 or 4) |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
34 #define CT_PRINT_CHAR 0x10 // flag: set for printable chars |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
35 #define CT_ID_CHAR 0x20 // flag: set for ID chars |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
36 #define CT_FNAME_CHAR 0x40 // flag: set for file name chars |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
37 |
|
17789
0f7ae8010787
patch 8.1.1891: functions used in one file are global
Bram Moolenaar <Bram@vim.org>
parents:
16819
diff
changeset
|
38 static int in_win_border(win_T *wp, colnr_T vcol); |
|
0f7ae8010787
patch 8.1.1891: functions used in one file are global
Bram Moolenaar <Bram@vim.org>
parents:
16819
diff
changeset
|
39 |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
40 /* |
|
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
41 * Fill g_chartab[]. Also fills curbuf->b_chartab[] with flags for keyword |
| 7 | 42 * characters for current buffer. |
| 43 * | |
| 44 * Depends on the option settings 'iskeyword', 'isident', 'isfname', | |
| 45 * 'isprint' and 'encoding'. | |
| 46 * | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
47 * The index in g_chartab[] depends on 'encoding': |
| 7 | 48 * - For non-multi-byte index with the byte (same as the character). |
| 49 * - For DBCS index with the first byte. | |
| 50 * - For UTF-8 index with the character (when first byte is up to 0x80 it is | |
| 51 * the same as the character, if the first byte is 0x80 and above it depends | |
| 52 * on further bytes). | |
| 53 * | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
54 * The contents of g_chartab[]: |
| 7 | 55 * - The lower two bits, masked by CT_CELL_MASK, give the number of display |
| 56 * cells the character occupies (1 or 2). Not valid for UTF-8 above 0x80. | |
| 57 * - CT_PRINT_CHAR bit is set when the character is printable (no need to | |
| 58 * translate the character before displaying it). Note that only DBCS | |
| 59 * characters can have 2 display cells and still be printable. | |
| 60 * - CT_FNAME_CHAR bit is set when the character can be in a file name. | |
| 61 * - CT_ID_CHAR bit is set when the character can be in an identifier. | |
| 62 * | |
| 63 * Return FAIL if 'iskeyword', 'isident', 'isfname' or 'isprint' option has an | |
| 64 * error, OK otherwise. | |
| 65 */ | |
| 66 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
67 init_chartab(void) |
| 7 | 68 { |
| 69 return buf_init_chartab(curbuf, TRUE); | |
| 70 } | |
| 71 | |
| 72 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
73 buf_init_chartab( |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
74 buf_T *buf, |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
75 int global) // FALSE: only set buf->b_chartab[] |
| 7 | 76 { |
| 77 int c; | |
| 78 int c2; | |
| 79 char_u *p; | |
| 80 int i; | |
| 81 int tilde; | |
| 82 int do_isalpha; | |
| 83 | |
| 84 if (global) | |
| 85 { | |
| 86 /* | |
| 87 * Set the default size for printable characters: | |
| 88 * From <Space> to '~' is 1 (printable), others are 2 (not printable). | |
| 89 * This also inits all 'isident' and 'isfname' flags to FALSE. | |
| 90 */ | |
| 91 c = 0; | |
| 92 while (c < ' ') | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
93 g_chartab[c++] = (dy_flags & DY_UHEX) ? 4 : 2; |
| 7 | 94 while (c <= '~') |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
95 g_chartab[c++] = 1 + CT_PRINT_CHAR; |
| 7 | 96 while (c < 256) |
| 97 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
98 // UTF-8: bytes 0xa0 - 0xff are printable (latin1) |
| 7 | 99 if (enc_utf8 && c >= 0xa0) |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
100 g_chartab[c++] = CT_PRINT_CHAR + 1; |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
101 // euc-jp characters starting with 0x8e are single width |
| 7 | 102 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
103 g_chartab[c++] = CT_PRINT_CHAR + 1; |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
104 // other double-byte chars can be printable AND double-width |
| 7 | 105 else if (enc_dbcs != 0 && MB_BYTE2LEN(c) == 2) |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
106 g_chartab[c++] = CT_PRINT_CHAR + 2; |
| 7 | 107 else |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
108 // the rest is unprintable by default |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
109 g_chartab[c++] = (dy_flags & DY_UHEX) ? 4 : 2; |
| 7 | 110 } |
| 111 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
112 // Assume that every multi-byte char is a filename character. |
| 7 | 113 for (c = 1; c < 256; ++c) |
| 114 if ((enc_dbcs != 0 && MB_BYTE2LEN(c) > 1) | |
| 115 || (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 116 || (enc_utf8 && c >= 0xa0)) | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
117 g_chartab[c] |= CT_FNAME_CHAR; |
| 7 | 118 } |
| 119 | |
| 120 /* | |
| 121 * Init word char flags all to FALSE | |
| 122 */ | |
|
20007
aadd1cae2ff5
patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents:
19195
diff
changeset
|
123 CLEAR_FIELD(buf->b_chartab); |
| 227 | 124 if (enc_dbcs != 0) |
| 125 for (c = 0; c < 256; ++c) | |
| 126 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
127 // double-byte characters are probably word characters |
| 227 | 128 if (MB_BYTE2LEN(c) == 2) |
| 129 SET_CHARTAB(buf, c); | |
| 130 } | |
| 7 | 131 |
| 132 /* | |
| 133 * In lisp mode the '-' character is included in keywords. | |
| 134 */ | |
| 135 if (buf->b_p_lisp) | |
| 136 SET_CHARTAB(buf, '-'); | |
| 137 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
138 // Walk through the 'isident', 'iskeyword', 'isfname' and 'isprint' |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
139 // options Each option is a list of characters, character numbers or |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
140 // ranges, separated by commas, e.g.: "200-210,x,#-178,-" |
| 7 | 141 for (i = global ? 0 : 3; i <= 3; ++i) |
| 142 { | |
| 143 if (i == 0) | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
144 p = p_isi; // first round: 'isident' |
| 7 | 145 else if (i == 1) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
146 p = p_isp; // second round: 'isprint' |
| 7 | 147 else if (i == 2) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
148 p = p_isf; // third round: 'isfname' |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
149 else // i == 3 |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
150 p = buf->b_p_isk; // fourth round: 'iskeyword' |
| 7 | 151 |
| 152 while (*p) | |
| 153 { | |
| 154 tilde = FALSE; | |
| 155 do_isalpha = FALSE; | |
| 156 if (*p == '^' && p[1] != NUL) | |
| 157 { | |
| 158 tilde = TRUE; | |
| 159 ++p; | |
| 160 } | |
| 161 if (VIM_ISDIGIT(*p)) | |
| 162 c = getdigits(&p); | |
|
24665
661d15592d3c
patch 8.2.2871: unnessary VIM_ISDIGIT() calls, badly indented code
Bram Moolenaar <Bram@vim.org>
parents:
24375
diff
changeset
|
163 else if (has_mbyte) |
| 1955 | 164 c = mb_ptr2char_adv(&p); |
| 165 else | |
| 7 | 166 c = *p++; |
| 167 c2 = -1; | |
| 168 if (*p == '-' && p[1] != NUL) | |
| 169 { | |
| 170 ++p; | |
| 171 if (VIM_ISDIGIT(*p)) | |
| 172 c2 = getdigits(&p); | |
|
24665
661d15592d3c
patch 8.2.2871: unnessary VIM_ISDIGIT() calls, badly indented code
Bram Moolenaar <Bram@vim.org>
parents:
24375
diff
changeset
|
173 else if (has_mbyte) |
| 1979 | 174 c2 = mb_ptr2char_adv(&p); |
| 175 else | |
| 7 | 176 c2 = *p++; |
| 177 } | |
| 1979 | 178 if (c <= 0 || c >= 256 || (c2 < c && c2 != -1) || c2 >= 256 |
| 7 | 179 || !(*p == NUL || *p == ',')) |
| 180 return FAIL; | |
| 181 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
182 if (c2 == -1) // not a range |
| 7 | 183 { |
| 184 /* | |
| 185 * A single '@' (not "@-@"): | |
| 186 * Decide on letters being ID/printable/keyword chars with | |
| 187 * standard function isalpha(). This takes care of locale for | |
| 188 * single-byte characters). | |
| 189 */ | |
| 190 if (c == '@') | |
| 191 { | |
| 192 do_isalpha = TRUE; | |
| 193 c = 1; | |
| 194 c2 = 255; | |
| 195 } | |
| 196 else | |
| 197 c2 = c; | |
| 198 } | |
| 199 while (c <= c2) | |
| 200 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
201 // Use the MB_ functions here, because isalpha() doesn't |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
202 // work properly when 'encoding' is "latin1" and the locale is |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
203 // "C". |
|
15850
a6ca8cf07a98
patch 8.1.0932: Farsi support is outdated and unused
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
204 if (!do_isalpha || MB_ISLOWER(c) || MB_ISUPPER(c)) |
| 7 | 205 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
206 if (i == 0) // (re)set ID flag |
| 7 | 207 { |
| 208 if (tilde) | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
209 g_chartab[c] &= ~CT_ID_CHAR; |
| 7 | 210 else |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
211 g_chartab[c] |= CT_ID_CHAR; |
| 7 | 212 } |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
213 else if (i == 1) // (re)set printable |
| 7 | 214 { |
|
27490
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27018
diff
changeset
|
215 if ((c < ' ' || c > '~' |
|
15595
1ec942f1b648
patch 8.1.0805: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
216 // For double-byte we keep the cell width, so |
|
1ec942f1b648
patch 8.1.0805: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
217 // that we can detect it from the first byte. |
|
1ec942f1b648
patch 8.1.0805: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
218 ) && !(enc_dbcs && MB_BYTE2LEN(c) == 2)) |
| 7 | 219 { |
| 220 if (tilde) | |
| 221 { | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
222 g_chartab[c] = (g_chartab[c] & ~CT_CELL_MASK) |
| 7 | 223 + ((dy_flags & DY_UHEX) ? 4 : 2); |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
224 g_chartab[c] &= ~CT_PRINT_CHAR; |
| 7 | 225 } |
| 226 else | |
| 227 { | |
|
29595
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
228 g_chartab[c] = (g_chartab[c] & ~CT_CELL_MASK) |
|
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
229 + 1; |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
230 g_chartab[c] |= CT_PRINT_CHAR; |
| 7 | 231 } |
| 232 } | |
| 233 } | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
234 else if (i == 2) // (re)set fname flag |
| 7 | 235 { |
| 236 if (tilde) | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
237 g_chartab[c] &= ~CT_FNAME_CHAR; |
| 7 | 238 else |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
239 g_chartab[c] |= CT_FNAME_CHAR; |
| 7 | 240 } |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
241 else // i == 3 (re)set keyword flag |
| 7 | 242 { |
| 243 if (tilde) | |
| 244 RESET_CHARTAB(buf, c); | |
| 245 else | |
| 246 SET_CHARTAB(buf, c); | |
| 247 } | |
| 248 } | |
| 249 ++c; | |
| 250 } | |
| 4096 | 251 |
| 252 c = *p; | |
| 7 | 253 p = skip_to_option_part(p); |
| 4096 | 254 if (c == ',' && *p == NUL) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
255 // Trailing comma is not allowed. |
| 4096 | 256 return FAIL; |
| 7 | 257 } |
| 258 } | |
| 259 chartab_initialized = TRUE; | |
| 260 return OK; | |
| 261 } | |
| 262 | |
| 263 /* | |
| 264 * Translate any special characters in buf[bufsize] in-place. | |
| 265 * The result is a string with only printable characters, but if there is not | |
| 266 * enough room, not all characters will be translated. | |
| 267 */ | |
| 268 void | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
269 trans_characters( |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
270 char_u *buf, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
271 int bufsize) |
| 7 | 272 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
273 int len; // length of string needing translation |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
274 int room; // room in buffer after string |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
275 char_u *trs; // translated character |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
276 int trs_len; // length of trs[] |
| 7 | 277 |
| 278 len = (int)STRLEN(buf); | |
| 279 room = bufsize - len; | |
| 280 while (*buf != 0) | |
| 281 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
282 // Assume a multi-byte character doesn't need translation. |
| 474 | 283 if (has_mbyte && (trs_len = (*mb_ptr2len)(buf)) > 1) |
| 7 | 284 len -= trs_len; |
| 285 else | |
| 286 { | |
| 287 trs = transchar_byte(*buf); | |
| 288 trs_len = (int)STRLEN(trs); | |
| 289 if (trs_len > 1) | |
| 290 { | |
| 291 room -= trs_len - 1; | |
| 292 if (room <= 0) | |
| 293 return; | |
| 294 mch_memmove(buf + trs_len, buf + 1, (size_t)len); | |
| 295 } | |
| 296 mch_memmove(buf, trs, (size_t)trs_len); | |
| 297 --len; | |
| 298 } | |
| 299 buf += trs_len; | |
| 300 } | |
| 301 } | |
| 302 | |
| 303 /* | |
| 304 * Translate a string into allocated memory, replacing special chars with | |
| 305 * printable chars. Returns NULL when out of memory. | |
| 306 */ | |
| 307 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
308 transstr(char_u *s) |
| 7 | 309 { |
| 310 char_u *res; | |
| 311 char_u *p; | |
| 312 int l, len, c; | |
| 313 char_u hexbuf[11]; | |
| 314 | |
| 315 if (has_mbyte) | |
| 316 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
317 // Compute the length of the result, taking account of unprintable |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
318 // multi-byte characters. |
| 7 | 319 len = 0; |
| 320 p = s; | |
| 321 while (*p != NUL) | |
| 322 { | |
| 474 | 323 if ((l = (*mb_ptr2len)(p)) > 1) |
| 7 | 324 { |
| 325 c = (*mb_ptr2char)(p); | |
| 326 p += l; | |
| 327 if (vim_isprintc(c)) | |
| 328 len += l; | |
| 329 else | |
| 330 { | |
| 331 transchar_hex(hexbuf, c); | |
| 835 | 332 len += (int)STRLEN(hexbuf); |
| 7 | 333 } |
| 334 } | |
| 335 else | |
| 336 { | |
| 337 l = byte2cells(*p++); | |
| 338 if (l > 0) | |
| 339 len += l; | |
| 340 else | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
341 len += 4; // illegal byte sequence |
| 7 | 342 } |
| 343 } | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16706
diff
changeset
|
344 res = alloc(len + 1); |
| 7 | 345 } |
| 346 else | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16706
diff
changeset
|
347 res = alloc(vim_strsize(s) + 1); |
|
31667
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
348 |
|
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
349 if (res == NULL) |
|
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
350 return NULL; |
|
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
351 |
|
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
352 *res = NUL; |
|
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
353 p = s; |
|
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
354 while (*p != NUL) |
| 7 | 355 { |
|
31667
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
356 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
| 7 | 357 { |
|
31667
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
358 c = (*mb_ptr2char)(p); |
|
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
359 if (vim_isprintc(c)) |
|
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
360 STRNCAT(res, p, l); // append printable multi-byte char |
| 7 | 361 else |
|
31667
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
362 transchar_hex(res + STRLEN(res), c); |
|
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
363 p += l; |
| 7 | 364 } |
|
31667
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
365 else |
|
b89cfd86e18e
patch 9.0.1166: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31489
diff
changeset
|
366 STRCAT(res, transchar_byte(*p++)); |
| 7 | 367 } |
| 368 return res; | |
| 369 } | |
| 370 | |
| 371 /* | |
| 221 | 372 * Convert the string "str[orglen]" to do ignore-case comparing. Uses the |
| 373 * current locale. | |
| 130 | 374 * When "buf" is NULL returns an allocated string (NULL for out-of-memory). |
| 375 * Otherwise puts the result in "buf[buflen]". | |
| 7 | 376 */ |
| 377 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
378 str_foldcase( |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
379 char_u *str, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
380 int orglen, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
381 char_u *buf, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
382 int buflen) |
| 7 | 383 { |
| 384 garray_T ga; | |
| 385 int i; | |
| 130 | 386 int len = orglen; |
| 7 | 387 |
| 388 #define GA_CHAR(i) ((char_u *)ga.ga_data)[i] | |
|
27752
c1d1639b52dd
patch 8.2.4402: missing parenthesis may cause unexpected problems
Bram Moolenaar <Bram@vim.org>
parents:
27490
diff
changeset
|
389 #define GA_PTR(i) ((char_u *)ga.ga_data + (i)) |
| 130 | 390 #define STR_CHAR(i) (buf == NULL ? GA_CHAR(i) : buf[i]) |
|
27752
c1d1639b52dd
patch 8.2.4402: missing parenthesis may cause unexpected problems
Bram Moolenaar <Bram@vim.org>
parents:
27490
diff
changeset
|
391 #define STR_PTR(i) (buf == NULL ? GA_PTR(i) : buf + (i)) |
| 7 | 392 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
393 // Copy "str" into "buf" or allocated memory, unmodified. |
| 130 | 394 if (buf == NULL) |
| 395 { | |
| 396 ga_init2(&ga, 1, 10); | |
| 397 if (ga_grow(&ga, len + 1) == FAIL) | |
| 398 return NULL; | |
| 399 mch_memmove(ga.ga_data, str, (size_t)len); | |
| 400 ga.ga_len = len; | |
| 401 } | |
| 402 else | |
| 403 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
404 if (len >= buflen) // Ugly! |
| 130 | 405 len = buflen - 1; |
| 406 mch_memmove(buf, str, (size_t)len); | |
| 407 } | |
| 408 if (buf == NULL) | |
| 409 GA_CHAR(len) = NUL; | |
| 410 else | |
| 411 buf[len] = NUL; | |
| 7 | 412 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
413 // Make each character lower case. |
| 7 | 414 i = 0; |
| 130 | 415 while (STR_CHAR(i) != NUL) |
| 7 | 416 { |
| 130 | 417 if (enc_utf8 || (has_mbyte && MB_BYTE2LEN(STR_CHAR(i)) > 1)) |
| 7 | 418 { |
| 419 if (enc_utf8) | |
| 420 { | |
| 1654 | 421 int c = utf_ptr2char(STR_PTR(i)); |
| 3263 | 422 int olen = utf_ptr2len(STR_PTR(i)); |
| 1654 | 423 int lc = utf_tolower(c); |
| 7 | 424 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
425 // Only replace the character when it is not an invalid |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
426 // sequence (ASCII character or more than one byte) and |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
427 // utf_tolower() doesn't return the original character. |
| 3263 | 428 if ((c < 0x80 || olen > 1) && c != lc) |
| 7 | 429 { |
| 3263 | 430 int nlen = utf_char2len(lc); |
| 7 | 431 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
432 // If the byte length changes need to shift the following |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
433 // characters forward or backward. |
| 3263 | 434 if (olen != nlen) |
| 7 | 435 { |
| 3263 | 436 if (nlen > olen) |
| 130 | 437 { |
| 3263 | 438 if (buf == NULL |
| 439 ? ga_grow(&ga, nlen - olen + 1) == FAIL | |
| 440 : len + nlen - olen >= buflen) | |
| 7 | 441 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
442 // out of memory, keep old char |
| 7 | 443 lc = c; |
| 3263 | 444 nlen = olen; |
| 7 | 445 } |
| 130 | 446 } |
| 3263 | 447 if (olen != nlen) |
| 7 | 448 { |
| 130 | 449 if (buf == NULL) |
| 450 { | |
| 3263 | 451 STRMOVE(GA_PTR(i) + nlen, GA_PTR(i) + olen); |
| 452 ga.ga_len += nlen - olen; | |
| 130 | 453 } |
| 454 else | |
| 455 { | |
| 3263 | 456 STRMOVE(buf + i + nlen, buf + i + olen); |
| 457 len += nlen - olen; | |
| 130 | 458 } |
| 7 | 459 } |
| 460 } | |
| 130 | 461 (void)utf_char2bytes(lc, STR_PTR(i)); |
| 7 | 462 } |
| 463 } | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
464 // skip to next multi-byte char |
| 474 | 465 i += (*mb_ptr2len)(STR_PTR(i)); |
| 7 | 466 } |
| 467 else | |
| 468 { | |
| 130 | 469 if (buf == NULL) |
| 470 GA_CHAR(i) = TOLOWER_LOC(GA_CHAR(i)); | |
| 471 else | |
| 472 buf[i] = TOLOWER_LOC(buf[i]); | |
| 7 | 473 ++i; |
| 474 } | |
| 475 } | |
| 476 | |
| 130 | 477 if (buf == NULL) |
| 478 return (char_u *)ga.ga_data; | |
| 479 return buf; | |
| 7 | 480 } |
| 481 | |
| 482 /* | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
483 * Catch 22: g_chartab[] can't be initialized before the options are |
| 7 | 484 * initialized, and initializing options may cause transchar() to be called! |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
485 * When chartab_initialized == FALSE don't use g_chartab[]. |
| 7 | 486 * Does NOT work for multi-byte characters, c must be <= 255. |
| 487 * Also doesn't work for the first byte of a multi-byte, "c" must be a | |
| 488 * character! | |
| 489 */ | |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
490 static char_u transchar_charbuf[7]; |
| 7 | 491 |
| 492 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
493 transchar(int c) |
| 7 | 494 { |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
495 return transchar_buf(curbuf, c); |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
496 } |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
497 |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
498 char_u * |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
499 transchar_buf(buf_T *buf, int c) |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
500 { |
| 7 | 501 int i; |
| 502 | |
| 503 i = 0; | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
504 if (IS_SPECIAL(c)) // special key code, display as ~@ char |
| 7 | 505 { |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
506 transchar_charbuf[0] = '~'; |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
507 transchar_charbuf[1] = '@'; |
| 7 | 508 i = 2; |
| 509 c = K_SECOND(c); | |
| 510 } | |
| 511 | |
|
27490
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27018
diff
changeset
|
512 if ((!chartab_initialized && ((c >= ' ' && c <= '~'))) |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27018
diff
changeset
|
513 || (c < 256 && vim_isprintc_strict(c))) |
| 7 | 514 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
515 // printable character |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
516 transchar_charbuf[i] = c; |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
517 transchar_charbuf[i + 1] = NUL; |
| 7 | 518 } |
| 519 else | |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
520 transchar_nonprint(buf, transchar_charbuf + i, c); |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
521 return transchar_charbuf; |
| 7 | 522 } |
| 523 | |
| 524 /* | |
| 525 * Like transchar(), but called with a byte instead of a character. Checks | |
|
31964
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
526 * for an illegal UTF-8 byte. Uses 'fileformat' of the current buffer. |
| 7 | 527 */ |
| 528 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
529 transchar_byte(int c) |
| 7 | 530 { |
|
31964
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
531 return transchar_byte_buf(curbuf, c); |
|
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
532 } |
|
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
533 |
|
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
534 /* |
|
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
535 * Like transchar_buf(), but called with a byte instead of a character. Checks |
|
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
536 * for an illegal UTF-8 byte. Uses 'fileformat' of "buf", unless it is NULL. |
|
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
537 */ |
|
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
538 char_u * |
|
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
539 transchar_byte_buf(buf_T *buf, int c) |
|
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
540 { |
| 7 | 541 if (enc_utf8 && c >= 0x80) |
| 542 { | |
|
31964
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
543 transchar_nonprint(buf, transchar_charbuf, c); |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
544 return transchar_charbuf; |
| 7 | 545 } |
|
31964
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
546 return transchar_buf(buf, c); |
| 7 | 547 } |
| 548 /* | |
| 549 * Convert non-printable character to two or more printable characters in | |
|
31906
9fc3b3928ad5
patch 9.0.1285: various small problems
Bram Moolenaar <Bram@vim.org>
parents:
31667
diff
changeset
|
550 * "charbuf[]". "charbuf" needs to be able to hold five bytes. |
| 7 | 551 * Does NOT work for multi-byte characters, c must be <= 255. |
| 552 */ | |
| 553 void | |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
554 transchar_nonprint(buf_T *buf, char_u *charbuf, int c) |
| 7 | 555 { |
| 556 if (c == NL) | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
557 c = NUL; // we use newline in place of a NUL |
|
31964
c0a9bc376b54
patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Bram Moolenaar <Bram@vim.org>
parents:
31946
diff
changeset
|
558 else if (buf != NULL && c == CAR && get_fileformat(buf) == EOL_MAC) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
559 c = NL; // we use CR in place of NL in this case |
| 7 | 560 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
561 if (dy_flags & DY_UHEX) // 'display' has "uhex" |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
562 transchar_hex(charbuf, c); |
| 7 | 563 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
564 else if (c <= 0x7f) // 0x00 - 0x1f and 0x7f |
| 7 | 565 { |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
566 charbuf[0] = '^'; |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
567 charbuf[1] = c ^ 0x40; // DEL displayed as ^? |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
568 charbuf[2] = NUL; |
| 7 | 569 } |
|
28013
dbf6d5ea7a1f
patch 8.2.4531: LGTM warnings for condition and buffer size
Bram Moolenaar <Bram@vim.org>
parents:
27952
diff
changeset
|
570 else if (enc_utf8) |
| 7 | 571 { |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
572 transchar_hex(charbuf, c); |
| 7 | 573 } |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
574 else if (c >= ' ' + 0x80 && c <= '~' + 0x80) // 0xa0 - 0xfe |
| 7 | 575 { |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
576 charbuf[0] = '|'; |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
577 charbuf[1] = c - 0x80; |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
578 charbuf[2] = NUL; |
| 7 | 579 } |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
580 else // 0x80 - 0x9f and 0xff |
| 7 | 581 { |
|
20782
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
582 charbuf[0] = '~'; |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
583 charbuf[1] = (c - 0x80) ^ 0x40; // 0xff displayed as ~? |
|
c4bce986c31a
patch 8.2.0943: displaying ^M or ^J depends on current buffer
Bram Moolenaar <Bram@vim.org>
parents:
20665
diff
changeset
|
584 charbuf[2] = NUL; |
| 7 | 585 } |
| 586 } | |
| 587 | |
| 588 void | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
589 transchar_hex(char_u *buf, int c) |
| 7 | 590 { |
| 591 int i = 0; | |
| 592 | |
| 593 buf[0] = '<'; | |
| 594 if (c > 255) | |
| 595 { | |
| 596 buf[++i] = nr2hex((unsigned)c >> 12); | |
| 597 buf[++i] = nr2hex((unsigned)c >> 8); | |
| 598 } | |
| 599 buf[++i] = nr2hex((unsigned)c >> 4); | |
| 1869 | 600 buf[++i] = nr2hex((unsigned)c); |
| 7 | 601 buf[++i] = '>'; |
| 602 buf[++i] = NUL; | |
| 603 } | |
| 604 | |
| 605 /* | |
| 606 * Convert the lower 4 bits of byte "c" to its hex character. | |
| 607 * Lower case letters are used to avoid the confusion of <F1> being 0xf1 or | |
| 608 * function key 1. | |
| 609 */ | |
| 1869 | 610 static unsigned |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
611 nr2hex(unsigned c) |
| 7 | 612 { |
| 613 if ((c & 0xf) <= 9) | |
| 614 return (c & 0xf) + '0'; | |
| 615 return (c & 0xf) - 10 + 'a'; | |
| 616 } | |
| 617 | |
| 618 /* | |
| 619 * Return number of display cells occupied by byte "b". | |
| 620 * Caller must make sure 0 <= b <= 255. | |
| 621 * For multi-byte mode "b" must be the first byte of a character. | |
| 622 * A TAB is counted as two cells: "^I". | |
| 623 * For UTF-8 mode this will return 0 for bytes >= 0x80, because the number of | |
| 624 * cells depends on further bytes. | |
| 625 */ | |
| 626 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
627 byte2cells(int b) |
| 7 | 628 { |
| 629 if (enc_utf8 && b >= 0x80) | |
| 630 return 0; | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
631 return (g_chartab[b] & CT_CELL_MASK); |
| 7 | 632 } |
| 633 | |
| 634 /* | |
| 635 * Return number of display cells occupied by character "c". | |
| 636 * "c" can be a special key (negative number) in which case 3 or 4 is returned. | |
| 637 * A TAB is counted as two cells: "^I" or four: "<09>". | |
| 638 */ | |
| 639 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
640 char2cells(int c) |
| 7 | 641 { |
| 642 if (IS_SPECIAL(c)) | |
| 643 return char2cells(K_SECOND(c)) + 2; | |
| 644 if (c >= 0x80) | |
| 645 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
646 // UTF-8: above 0x80 need to check the value |
| 7 | 647 if (enc_utf8) |
| 648 return utf_char2cells(c); | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
649 // DBCS: double-byte means double-width, except for euc-jp with first |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
650 // byte 0x8e |
| 7 | 651 if (enc_dbcs != 0 && c >= 0x100) |
| 652 { | |
| 653 if (enc_dbcs == DBCS_JPNU && ((unsigned)c >> 8) == 0x8e) | |
| 654 return 1; | |
| 655 return 2; | |
| 656 } | |
| 657 } | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
658 return (g_chartab[c & 0xff] & CT_CELL_MASK); |
| 7 | 659 } |
| 660 | |
| 661 /* | |
| 662 * Return number of display cells occupied by character at "*p". | |
| 663 * A TAB is counted as two cells: "^I" or four: "<09>". | |
| 664 */ | |
| 665 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
666 ptr2cells(char_u *p) |
| 7 | 667 { |
|
29597
f2d7f20d83c3
patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents:
29595
diff
changeset
|
668 if (!has_mbyte) |
|
f2d7f20d83c3
patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents:
29595
diff
changeset
|
669 return byte2cells(*p); |
|
f2d7f20d83c3
patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents:
29595
diff
changeset
|
670 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
671 // For UTF-8 we need to look at more bytes if the first byte is >= 0x80. |
| 7 | 672 if (enc_utf8 && *p >= 0x80) |
| 673 return utf_ptr2cells(p); | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
674 // For DBCS we can tell the cell count from the first byte. |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
675 return (g_chartab[*p] & CT_CELL_MASK); |
| 7 | 676 } |
| 677 | |
| 678 /* | |
| 3292 | 679 * Return the number of character cells string "s" will take on the screen, |
| 7 | 680 * counting TABs as two characters: "^I". |
| 681 */ | |
| 682 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
683 vim_strsize(char_u *s) |
| 7 | 684 { |
| 685 return vim_strnsize(s, (int)MAXCOL); | |
| 686 } | |
| 687 | |
| 688 /* | |
| 3292 | 689 * Return the number of character cells string "s[len]" will take on the |
| 690 * screen, counting TABs as two characters: "^I". | |
| 7 | 691 */ |
| 692 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
693 vim_strnsize(char_u *s, int len) |
| 7 | 694 { |
| 695 int size = 0; | |
| 696 | |
| 697 while (*s != NUL && --len >= 0) | |
|
29597
f2d7f20d83c3
patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents:
29595
diff
changeset
|
698 { |
|
f2d7f20d83c3
patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents:
29595
diff
changeset
|
699 int l = (*mb_ptr2len)(s); |
| 7 | 700 |
|
29597
f2d7f20d83c3
patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents:
29595
diff
changeset
|
701 size += ptr2cells(s); |
|
f2d7f20d83c3
patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents:
29595
diff
changeset
|
702 s += l; |
|
f2d7f20d83c3
patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents:
29595
diff
changeset
|
703 len -= l - 1; |
|
f2d7f20d83c3
patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents:
29595
diff
changeset
|
704 } |
|
15595
1ec942f1b648
patch 8.1.0805: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
705 |
| 7 | 706 return size; |
| 707 } | |
| 708 | |
| 709 /* | |
| 710 * Return the number of characters 'c' will take on the screen, taking | |
| 711 * into account the size of a tab. | |
| 712 * Use a define to make it fast, this is used very often!!! | |
| 713 * Also see getvcol() below. | |
| 714 */ | |
| 715 | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
716 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
717 # define RET_WIN_BUF_CHARTABSIZE(wp, buf, p, col) \ |
|
27752
c1d1639b52dd
patch 8.2.4402: missing parenthesis may cause unexpected problems
Bram Moolenaar <Bram@vim.org>
parents:
27490
diff
changeset
|
718 if (*(p) == TAB && (!(wp)->w_p_list || (wp)->w_lcs_chars.tab1)) \ |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
719 { \ |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
720 return tabstop_padding(col, (buf)->b_p_ts, (buf)->b_p_vts_array); \ |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
721 } \ |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
722 else \ |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
723 return ptr2cells(p); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
724 #else |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
725 # define RET_WIN_BUF_CHARTABSIZE(wp, buf, p, col) \ |
|
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23533
diff
changeset
|
726 if (*(p) == TAB && (!(wp)->w_p_list || wp->w_lcs_chars.tab1)) \ |
| 7 | 727 { \ |
| 728 int ts; \ | |
| 729 ts = (buf)->b_p_ts; \ | |
| 730 return (int)(ts - (col % ts)); \ | |
| 731 } \ | |
| 732 else \ | |
| 733 return ptr2cells(p); | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
734 #endif |
| 7 | 735 |
| 736 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
737 chartabsize(char_u *p, colnr_T col) |
| 7 | 738 { |
| 739 RET_WIN_BUF_CHARTABSIZE(curwin, curbuf, p, col) | |
| 740 } | |
| 741 | |
| 742 #ifdef FEAT_LINEBREAK | |
| 743 static int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
744 win_chartabsize(win_T *wp, char_u *p, colnr_T col) |
| 7 | 745 { |
| 746 RET_WIN_BUF_CHARTABSIZE(wp, wp->w_buffer, p, col) | |
| 747 } | |
| 748 #endif | |
| 749 | |
| 750 /* | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
751 * Return the number of characters the string "s" will take on the screen, |
|
2339
01e4b4d37842
Added strdisplaywidth() function.
Bram Moolenaar <bram@vim.org>
parents:
2108
diff
changeset
|
752 * taking into account the size of a tab. |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
753 * Does not handle text properties, since "s" is not a buffer line. |
| 7 | 754 */ |
| 755 int | |
|
30833
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
756 linetabsize_str(char_u *s) |
| 7 | 757 { |
|
2339
01e4b4d37842
Added strdisplaywidth() function.
Bram Moolenaar <bram@vim.org>
parents:
2108
diff
changeset
|
758 return linetabsize_col(0, s); |
|
01e4b4d37842
Added strdisplaywidth() function.
Bram Moolenaar <bram@vim.org>
parents:
2108
diff
changeset
|
759 } |
|
01e4b4d37842
Added strdisplaywidth() function.
Bram Moolenaar <bram@vim.org>
parents:
2108
diff
changeset
|
760 |
|
01e4b4d37842
Added strdisplaywidth() function.
Bram Moolenaar <bram@vim.org>
parents:
2108
diff
changeset
|
761 /* |
|
30833
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
762 * Like linetabsize_str(), but "s" starts at column "startcol". |
|
2339
01e4b4d37842
Added strdisplaywidth() function.
Bram Moolenaar <bram@vim.org>
parents:
2108
diff
changeset
|
763 */ |
|
01e4b4d37842
Added strdisplaywidth() function.
Bram Moolenaar <bram@vim.org>
parents:
2108
diff
changeset
|
764 int |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
765 linetabsize_col(int startcol, char_u *s) |
|
2339
01e4b4d37842
Added strdisplaywidth() function.
Bram Moolenaar <bram@vim.org>
parents:
2108
diff
changeset
|
766 { |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
767 chartabsize_T cts; |
| 7 | 768 |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
769 init_chartabsize_arg(&cts, curwin, 0, startcol, s, s); |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
770 while (*cts.cts_ptr != NUL) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
771 cts.cts_vcol += lbr_chartabsize_adv(&cts); |
|
29678
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
772 #ifdef FEAT_PROP_POPUP |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
773 if (cts.cts_has_prop_with_text && cts.cts_ptr == cts.cts_line) |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
774 { |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
775 // check for virtual text in an empty line |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
776 (void)lbr_chartabsize_adv(&cts); |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
777 cts.cts_vcol += cts.cts_cur_text_width; |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
778 } |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
779 #endif |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
780 clear_chartabsize_arg(&cts); |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
781 return (int)cts.cts_vcol; |
| 7 | 782 } |
| 783 | |
| 784 /* | |
|
30833
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
785 * Like linetabsize_str(), but for a given window instead of the current one. |
| 7 | 786 */ |
| 787 int | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
788 win_linetabsize(win_T *wp, linenr_T lnum, char_u *line, colnr_T len) |
| 7 | 789 { |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
790 chartabsize_T cts; |
| 7 | 791 |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
792 init_chartabsize_arg(&cts, wp, lnum, 0, line, line); |
|
29678
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
793 win_linetabsize_cts(&cts, len); |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
794 clear_chartabsize_arg(&cts); |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
795 return (int)cts.cts_vcol; |
| 7 | 796 } |
| 797 | |
|
30833
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
798 /* |
|
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
799 * Return the number of cells line "lnum" of window "wp" will take on the |
|
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
800 * screen, taking into account the size of a tab and text properties. |
|
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
801 */ |
|
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
802 int |
|
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
803 linetabsize(win_T *wp, linenr_T lnum) |
|
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
804 { |
|
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
805 return win_linetabsize(wp, lnum, |
|
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
806 ml_get_buf(wp->w_buffer, lnum, FALSE), (colnr_T)MAXCOL); |
|
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
807 } |
|
e3d5781c7ec6
patch 9.0.0751: 'scrolloff' does not work well with 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
808 |
|
29678
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
809 void |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
810 win_linetabsize_cts(chartabsize_T *cts, colnr_T len) |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
811 { |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
812 #ifdef FEAT_PROP_POPUP |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
813 cts->cts_with_trailing = len == MAXCOL; |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
814 #endif |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
815 for ( ; *cts->cts_ptr != NUL && (len == MAXCOL || cts->cts_ptr < cts->cts_line + len); |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
816 MB_PTR_ADV(cts->cts_ptr)) |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
817 cts->cts_vcol += win_lbr_chartabsize(cts, NULL); |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
818 #ifdef FEAT_PROP_POPUP |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
819 // check for a virtual text on an empty line |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
820 if (cts->cts_has_prop_with_text && *cts->cts_ptr == NUL |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
821 && cts->cts_ptr == cts->cts_line) |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
822 { |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
823 (void)win_lbr_chartabsize(cts, NULL); |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
824 cts->cts_vcol += cts->cts_cur_text_width; |
|
31946
05414bdc5c2c
patch 9.0.1305: cursor in wrong line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
31938
diff
changeset
|
825 |
|
05414bdc5c2c
patch 9.0.1305: cursor in wrong line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
31938
diff
changeset
|
826 // when properties are above or below the empty line must also be |
|
05414bdc5c2c
patch 9.0.1305: cursor in wrong line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
31938
diff
changeset
|
827 // counted |
|
05414bdc5c2c
patch 9.0.1305: cursor in wrong line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
31938
diff
changeset
|
828 if (cts->cts_prop_lines > 0) |
|
05414bdc5c2c
patch 9.0.1305: cursor in wrong line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
31938
diff
changeset
|
829 ++cts->cts_vcol; |
|
29678
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
830 } |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
831 #endif |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
832 } |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
833 |
| 7 | 834 /* |
| 42 | 835 * Return TRUE if 'c' is a normal identifier character: |
| 836 * Letters and characters from the 'isident' option. | |
| 7 | 837 */ |
| 838 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
839 vim_isIDc(int c) |
| 7 | 840 { |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
841 return (c > 0 && c < 0x100 && (g_chartab[c] & CT_ID_CHAR)); |
| 7 | 842 } |
| 843 | |
| 844 /* | |
|
24375
fe4b6fc7149c
patch 8.2.2728: special key names don't work if 'isident' is cleared
Bram Moolenaar <Bram@vim.org>
parents:
24268
diff
changeset
|
845 * Like vim_isIDc() but not using the 'isident' option: letters, numbers and |
|
fe4b6fc7149c
patch 8.2.2728: special key names don't work if 'isident' is cleared
Bram Moolenaar <Bram@vim.org>
parents:
24268
diff
changeset
|
846 * underscore. |
|
fe4b6fc7149c
patch 8.2.2728: special key names don't work if 'isident' is cleared
Bram Moolenaar <Bram@vim.org>
parents:
24268
diff
changeset
|
847 */ |
|
fe4b6fc7149c
patch 8.2.2728: special key names don't work if 'isident' is cleared
Bram Moolenaar <Bram@vim.org>
parents:
24268
diff
changeset
|
848 int |
|
fe4b6fc7149c
patch 8.2.2728: special key names don't work if 'isident' is cleared
Bram Moolenaar <Bram@vim.org>
parents:
24268
diff
changeset
|
849 vim_isNormalIDc(int c) |
|
fe4b6fc7149c
patch 8.2.2728: special key names don't work if 'isident' is cleared
Bram Moolenaar <Bram@vim.org>
parents:
24268
diff
changeset
|
850 { |
|
fe4b6fc7149c
patch 8.2.2728: special key names don't work if 'isident' is cleared
Bram Moolenaar <Bram@vim.org>
parents:
24268
diff
changeset
|
851 return ASCII_ISALNUM(c) || c == '_'; |
|
fe4b6fc7149c
patch 8.2.2728: special key names don't work if 'isident' is cleared
Bram Moolenaar <Bram@vim.org>
parents:
24268
diff
changeset
|
852 } |
|
fe4b6fc7149c
patch 8.2.2728: special key names don't work if 'isident' is cleared
Bram Moolenaar <Bram@vim.org>
parents:
24268
diff
changeset
|
853 |
|
fe4b6fc7149c
patch 8.2.2728: special key names don't work if 'isident' is cleared
Bram Moolenaar <Bram@vim.org>
parents:
24268
diff
changeset
|
854 /* |
| 7 | 855 * return TRUE if 'c' is a keyword character: Letters and characters from |
|
10549
055b1633aed7
patch 8.0.0164: outdated and misplaced comments
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
856 * 'iskeyword' option for the current buffer. |
| 7 | 857 * For multi-byte characters mb_get_class() is used (builtin rules). |
| 858 */ | |
| 859 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
860 vim_iswordc(int c) |
| 7 | 861 { |
| 4043 | 862 return vim_iswordc_buf(c, curbuf); |
| 863 } | |
| 864 | |
| 865 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
866 vim_iswordc_buf(int c, buf_T *buf) |
| 4043 | 867 { |
| 7 | 868 if (c >= 0x100) |
| 869 { | |
| 870 if (enc_dbcs != 0) | |
| 1869 | 871 return dbcs_class((unsigned)c >> 8, (unsigned)(c & 0xff)) >= 2; |
| 7 | 872 if (enc_utf8) |
|
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10720
diff
changeset
|
873 return utf_class_buf(c, buf) >= 2; |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10720
diff
changeset
|
874 return FALSE; |
| 7 | 875 } |
|
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10720
diff
changeset
|
876 return (c > 0 && GET_CHARTAB(buf, c) != 0); |
| 7 | 877 } |
| 878 | |
| 879 /* | |
| 880 * Just like vim_iswordc() but uses a pointer to the (multi-byte) character. | |
| 881 */ | |
| 882 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
883 vim_iswordp(char_u *p) |
| 7 | 884 { |
|
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10720
diff
changeset
|
885 return vim_iswordp_buf(p, curbuf); |
| 7 | 886 } |
| 887 | |
| 888 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
889 vim_iswordp_buf(char_u *p, buf_T *buf) |
| 7 | 890 { |
|
10724
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10720
diff
changeset
|
891 int c = *p; |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10720
diff
changeset
|
892 |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10720
diff
changeset
|
893 if (has_mbyte && MB_BYTE2LEN(c) > 1) |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10720
diff
changeset
|
894 c = (*mb_ptr2char)(p); |
|
ae1c6bf22e5f
patch 8.0.0252: not properly recognizing word characters between 128 and 255
Christian Brabandt <cb@256bit.org>
parents:
10720
diff
changeset
|
895 return vim_iswordc_buf(c, buf); |
| 7 | 896 } |
| 897 | |
| 898 /* | |
|
29595
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
899 * Return TRUE if 'c' is a valid file-name character as specified with the |
|
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
900 * 'isfname' option. |
| 7 | 901 * Assume characters above 0x100 are valid (multi-byte). |
|
29595
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
902 * To be used for commands like "gf". |
| 7 | 903 */ |
| 904 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
905 vim_isfilec(int c) |
| 7 | 906 { |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
907 return (c >= 0x100 || (c > 0 && (g_chartab[c] & CT_FNAME_CHAR))); |
| 7 | 908 } |
| 909 | |
|
32144
f3987fde6dea
patch 9.0.1403: unused variables and functions
Bram Moolenaar <Bram@vim.org>
parents:
32098
diff
changeset
|
910 #if defined(FEAT_SPELL) || defined(PROTO) |
| 7 | 911 /* |
|
29595
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
912 * Return TRUE if 'c' is a valid file-name character, including characters left |
|
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
913 * out of 'isfname' to make "gf" work, such as comma, space, '@', etc. |
|
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
914 */ |
|
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
915 int |
|
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
916 vim_is_fname_char(int c) |
|
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
917 { |
|
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
918 return vim_isfilec(c) || c == ',' || c == ' ' || c == '@'; |
|
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
919 } |
|
32144
f3987fde6dea
patch 9.0.1403: unused variables and functions
Bram Moolenaar <Bram@vim.org>
parents:
32098
diff
changeset
|
920 #endif |
|
29595
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
921 |
|
5233acfa06f1
patch 9.0.0138: not enough characters accepted for 'spellfile'
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
922 /* |
| 1369 | 923 * return TRUE if 'c' is a valid file-name character or a wildcard character |
| 924 * Assume characters above 0x100 are valid (multi-byte). | |
| 925 * Explicitly interpret ']' as a wildcard character as mch_has_wildcard("]") | |
| 926 * returns false. | |
| 927 */ | |
| 928 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
929 vim_isfilec_or_wc(int c) |
| 1369 | 930 { |
| 931 char_u buf[2]; | |
| 932 | |
| 933 buf[0] = (char_u)c; | |
| 934 buf[1] = NUL; | |
| 935 return vim_isfilec(c) || c == ']' || mch_has_wildcard(buf); | |
| 936 } | |
| 937 | |
| 938 /* | |
|
11333
fef09eb74832
patch 8.0.0552: toupper and tolower don't work properly for Turkish
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
939 * Return TRUE if 'c' is a printable character. |
| 7 | 940 * Assume characters above 0x100 are printable (multi-byte), except for |
| 941 * Unicode. | |
| 942 */ | |
| 943 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
944 vim_isprintc(int c) |
| 7 | 945 { |
| 946 if (enc_utf8 && c >= 0x100) | |
| 947 return utf_printable(c); | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
948 return (c >= 0x100 || (c > 0 && (g_chartab[c] & CT_PRINT_CHAR))); |
| 7 | 949 } |
| 950 | |
| 951 /* | |
| 952 * Strict version of vim_isprintc(c), don't return TRUE if "c" is the head | |
| 953 * byte of a double-byte character. | |
| 954 */ | |
| 955 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
956 vim_isprintc_strict(int c) |
| 7 | 957 { |
| 958 if (enc_dbcs != 0 && c < 0x100 && MB_BYTE2LEN(c) > 1) | |
| 959 return FALSE; | |
| 960 if (enc_utf8 && c >= 0x100) | |
| 961 return utf_printable(c); | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
962 return (c >= 0x100 || (c > 0 && (g_chartab[c] & CT_PRINT_CHAR))); |
| 7 | 963 } |
| 964 | |
| 965 /* | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
966 * Prepare the structure passed to chartabsize functions. |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
967 * "line" is the start of the line, "ptr" is the first relevant character. |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
968 * When "lnum" is zero do not use text properties that insert text. |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
969 */ |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
970 void |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
971 init_chartabsize_arg( |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
972 chartabsize_T *cts, |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
973 win_T *wp, |
|
30152
1e6d387bd51f
patch 9.0.0412: compiler warning for unused argument
Bram Moolenaar <Bram@vim.org>
parents:
30148
diff
changeset
|
974 linenr_T lnum UNUSED, |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
975 colnr_T col, |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
976 char_u *line, |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
977 char_u *ptr) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
978 { |
|
29574
24f01baa27b2
patch 9.0.0128: Coverity complains about possible double free
Bram Moolenaar <Bram@vim.org>
parents:
29568
diff
changeset
|
979 CLEAR_POINTER(cts); |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
980 cts->cts_win = wp; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
981 cts->cts_vcol = col; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
982 cts->cts_line = line; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
983 cts->cts_ptr = ptr; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
984 #ifdef FEAT_PROP_POPUP |
|
30257
45788c16b3a5
patch 9.0.0464: with virtual text "above" indenting doesn't work well
Bram Moolenaar <Bram@vim.org>
parents:
30207
diff
changeset
|
985 if (lnum > 0 && !ignore_text_props) |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
986 { |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
987 char_u *prop_start; |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
988 int count; |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
989 |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
990 count = get_text_props(wp->w_buffer, lnum, &prop_start, FALSE); |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
991 cts->cts_text_prop_count = count; |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
992 if (count > 0) |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
993 { |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
994 // Make a copy of the properties, so that they are properly |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
995 // aligned. Make it twice as long for the sorting below. |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
996 cts->cts_text_props = ALLOC_MULT(textprop_T, count * 2); |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
997 if (cts->cts_text_props == NULL) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
998 cts->cts_text_prop_count = 0; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
999 else |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1000 { |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1001 int i; |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1002 |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1003 mch_memmove(cts->cts_text_props + count, prop_start, |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1004 count * sizeof(textprop_T)); |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1005 for (i = 0; i < count; ++i) |
|
31319
243c35fad9cb
patch 9.0.0993: display errors when adding or removing text property type
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
1006 { |
|
243c35fad9cb
patch 9.0.0993: display errors when adding or removing text property type
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
1007 textprop_T *tp = cts->cts_text_props + i + count; |
|
243c35fad9cb
patch 9.0.0993: display errors when adding or removing text property type
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
1008 if (tp->tp_id < 0 |
|
243c35fad9cb
patch 9.0.0993: display errors when adding or removing text property type
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
1009 && text_prop_type_valid(wp->w_buffer, tp)) |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1010 { |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1011 cts->cts_has_prop_with_text = TRUE; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1012 break; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1013 } |
|
31319
243c35fad9cb
patch 9.0.0993: display errors when adding or removing text property type
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
1014 } |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1015 if (!cts->cts_has_prop_with_text) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1016 { |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1017 // won't use the text properties, free them |
|
29574
24f01baa27b2
patch 9.0.0128: Coverity complains about possible double free
Bram Moolenaar <Bram@vim.org>
parents:
29568
diff
changeset
|
1018 VIM_CLEAR(cts->cts_text_props); |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1019 cts->cts_text_prop_count = 0; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1020 } |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1021 else |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1022 { |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1023 int *text_prop_idxs; |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1024 |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1025 // Need to sort the array to get any truncation right. |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1026 // Do the sorting in the second part of the array, then |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1027 // move the sorted props to the first part of the array. |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1028 text_prop_idxs = ALLOC_MULT(int, count); |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1029 if (text_prop_idxs != NULL) |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1030 { |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1031 for (i = 0; i < count; ++i) |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1032 text_prop_idxs[i] = i + count; |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1033 sort_text_props(curbuf, cts->cts_text_props, |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1034 text_prop_idxs, count); |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1035 // Here we want the reverse order. |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1036 for (i = 0; i < count; ++i) |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1037 cts->cts_text_props[count - i - 1] = |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1038 cts->cts_text_props[text_prop_idxs[i]]; |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1039 vim_free(text_prop_idxs); |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1040 } |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1041 } |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1042 } |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1043 } |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1044 } |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1045 #endif |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1046 } |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1047 |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1048 /* |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1049 * Free any allocated item in "cts". |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1050 */ |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1051 void |
|
29453
decd0a51b99f
patch 9.0.0068: build fails with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
29451
diff
changeset
|
1052 clear_chartabsize_arg(chartabsize_T *cts UNUSED) |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1053 { |
|
29453
decd0a51b99f
patch 9.0.0068: build fails with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
29451
diff
changeset
|
1054 #ifdef FEAT_PROP_POPUP |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1055 if (cts->cts_text_prop_count > 0) |
|
29465
1ae3e2d691a0
patch 9.0.0074: Coverity warns for double free
Bram Moolenaar <Bram@vim.org>
parents:
29453
diff
changeset
|
1056 { |
|
29574
24f01baa27b2
patch 9.0.0128: Coverity complains about possible double free
Bram Moolenaar <Bram@vim.org>
parents:
29568
diff
changeset
|
1057 VIM_CLEAR(cts->cts_text_props); |
|
24f01baa27b2
patch 9.0.0128: Coverity complains about possible double free
Bram Moolenaar <Bram@vim.org>
parents:
29568
diff
changeset
|
1058 cts->cts_text_prop_count = 0; |
|
29465
1ae3e2d691a0
patch 9.0.0074: Coverity warns for double free
Bram Moolenaar <Bram@vim.org>
parents:
29453
diff
changeset
|
1059 } |
|
29453
decd0a51b99f
patch 9.0.0068: build fails with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
29451
diff
changeset
|
1060 #endif |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1061 } |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1062 |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1063 /* |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1064 * Like chartabsize(), but also check for line breaks on the screen and text |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1065 * properties that insert text. |
| 7 | 1066 */ |
| 1067 int | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1068 lbr_chartabsize(chartabsize_T *cts) |
| 7 | 1069 { |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1070 #if defined(FEAT_LINEBREAK) || defined(FEAT_PROP_POPUP) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1071 if (1 |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1072 # ifdef FEAT_LINEBREAK |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1073 && !curwin->w_p_lbr && *get_showbreak_value(curwin) == NUL |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1074 && !curwin->w_p_bri |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1075 # endif |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1076 # ifdef FEAT_PROP_POPUP |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1077 && !cts->cts_has_prop_with_text |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1078 #endif |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1079 ) |
| 7 | 1080 { |
| 1081 #endif | |
| 1082 if (curwin->w_p_wrap) | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1083 return win_nolbr_chartabsize(cts, NULL); |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1084 RET_WIN_BUF_CHARTABSIZE(curwin, curbuf, cts->cts_ptr, cts->cts_vcol) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1085 #if defined(FEAT_LINEBREAK) || defined(FEAT_PROP_POPUP) |
| 7 | 1086 } |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1087 return win_lbr_chartabsize(cts, NULL); |
| 7 | 1088 #endif |
| 1089 } | |
| 1090 | |
| 1091 /* | |
| 1092 * Call lbr_chartabsize() and advance the pointer. | |
| 1093 */ | |
| 1094 int | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1095 lbr_chartabsize_adv(chartabsize_T *cts) |
| 7 | 1096 { |
| 1097 int retval; | |
| 1098 | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1099 retval = lbr_chartabsize(cts); |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1100 MB_PTR_ADV(cts->cts_ptr); |
| 7 | 1101 return retval; |
| 1102 } | |
| 1103 | |
| 1104 /* | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1105 * Return the screen size of the character indicated by "cts". |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1106 * "cts->cts_cur_text_width" is set to the extra size for a text property that |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1107 * inserts text. |
| 7 | 1108 * This function is used very often, keep it fast!!!! |
| 1109 * | |
| 1110 * If "headp" not NULL, set *headp to the size of what we for 'showbreak' | |
| 1111 * string at start of line. Warning: *headp is only set if it's a non-zero | |
| 1112 * value, init to 0 before calling. | |
| 1113 */ | |
| 1114 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1115 win_lbr_chartabsize( |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1116 chartabsize_T *cts, |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1117 int *headp UNUSED) |
| 7 | 1118 { |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1119 win_T *wp = cts->cts_win; |
|
30825
c7983f593fa7
patch 9.0.0747: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
30749
diff
changeset
|
1120 #if defined(FEAT_PROP_POPUP) || defined(FEAT_LINEBREAK) |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1121 char_u *line = cts->cts_line; // start of the line |
|
29453
decd0a51b99f
patch 9.0.0068: build fails with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
29451
diff
changeset
|
1122 #endif |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1123 char_u *s = cts->cts_ptr; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1124 colnr_T vcol = cts->cts_vcol; |
| 7 | 1125 #ifdef FEAT_LINEBREAK |
| 1126 int c; | |
| 1127 int size; | |
| 1128 colnr_T col2; | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1129 colnr_T col_adj = 0; // vcol + screen size of tab |
| 7 | 1130 colnr_T colmax; |
| 1131 int added; | |
| 1132 int mb_added = 0; | |
| 1133 int numberextra; | |
| 1134 char_u *ps; | |
| 1135 int tab_corr = (*s == TAB); | |
| 236 | 1136 int n; |
|
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18082
diff
changeset
|
1137 char_u *sbr; |
|
29633
e80174903fdf
patch 9.0.0157: 'showbreak' displayed below truncated "after" text prop
Bram Moolenaar <Bram@vim.org>
parents:
29613
diff
changeset
|
1138 int no_sbr = FALSE; |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1139 #endif |
| 7 | 1140 |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1141 #if defined(FEAT_PROP_POPUP) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1142 cts->cts_cur_text_width = 0; |
|
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1143 cts->cts_first_char = 0; |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1144 #endif |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1145 |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1146 #if defined(FEAT_LINEBREAK) || defined(FEAT_PROP_POPUP) |
| 7 | 1147 /* |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1148 * No 'linebreak', 'showbreak', 'breakindent' and text properties that |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1149 * insert text: return quickly. |
| 7 | 1150 */ |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1151 if (1 |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1152 # ifdef FEAT_LINEBREAK |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1153 && !wp->w_p_lbr && !wp->w_p_bri && *get_showbreak_value(wp) == NUL |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1154 # endif |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1155 # ifdef FEAT_PROP_POPUP |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1156 && !cts->cts_has_prop_with_text |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1157 # endif |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1158 ) |
| 7 | 1159 #endif |
| 1160 { | |
| 1161 if (wp->w_p_wrap) | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1162 return win_nolbr_chartabsize(cts, headp); |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1163 RET_WIN_BUF_CHARTABSIZE(wp, wp->w_buffer, s, vcol) |
| 7 | 1164 } |
| 1165 | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1166 #if defined(FEAT_LINEBREAK) || defined(FEAT_PROP_POPUP) |
| 7 | 1167 /* |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1168 * First get the normal size, without 'linebreak' or text properties |
| 7 | 1169 */ |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1170 size = win_chartabsize(wp, s, vcol); |
|
31938
96d6d31dd66b
patch 9.0.1301: virtual text below empty line not displayed
Bram Moolenaar <Bram@vim.org>
parents:
31906
diff
changeset
|
1171 if (*s == NUL) |
|
96d6d31dd66b
patch 9.0.1301: virtual text below empty line not displayed
Bram Moolenaar <Bram@vim.org>
parents:
31906
diff
changeset
|
1172 size = 0; // NUL is not displayed |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1173 |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1174 # ifdef FEAT_PROP_POPUP |
|
29678
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1175 if (cts->cts_has_prop_with_text) |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1176 { |
|
29676
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1177 int tab_size = size; |
|
29678
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1178 int charlen = *s == NUL ? 1 : mb_ptr2len(s); |
|
29603
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1179 int i; |
|
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1180 int col = (int)(s - line); |
|
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1181 garray_T *gap = &wp->w_buffer->b_textprop_text; |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1182 |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1183 // The "$" for 'list' mode will go between the EOL and |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1184 // the text prop, account for that. |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1185 if (wp->w_p_list && wp->w_lcs_chars.eol != NUL) |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1186 ++vcol; |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1187 |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1188 for (i = 0; i < cts->cts_text_prop_count; ++i) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1189 { |
|
29918
e6e0f1c39edb
patch 9.0.0297: cursor position wrong after right aligned virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29816
diff
changeset
|
1190 textprop_T *tp = cts->cts_text_props + i; |
|
e6e0f1c39edb
patch 9.0.0297: cursor position wrong after right aligned virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29816
diff
changeset
|
1191 int col_off = win_col_off(wp); |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1192 |
|
29603
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1193 // Watch out for the text being deleted. "cts_text_props" is a |
|
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1194 // copy, the text prop may actually have been removed from the line. |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1195 if (tp->tp_id < 0 |
|
29655
53e434838a85
patch 9.0.0168: cursor positioned wrong with two virtual text properties
Bram Moolenaar <Bram@vim.org>
parents:
29633
diff
changeset
|
1196 && ((tp->tp_col - 1 >= col |
|
29676
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1197 && tp->tp_col - 1 < col + charlen) |
|
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1198 || (tp->tp_col == MAXCOL |
|
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1199 && ((tp->tp_flags & TP_FLAG_ALIGN_ABOVE) |
|
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1200 ? col == 0 |
|
31990
27ab829631df
patch 9.0.1327: cursor in wrong position below line with virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31964
diff
changeset
|
1201 : (s[0] == NUL || s[charlen] == NUL) |
|
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1202 && cts->cts_with_trailing))) |
|
31489
966c87c57912
patch 9.0.1077: can add text property with negative ID before virtual text
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1203 && -tp->tp_id - 1 < gap->ga_len) |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1204 { |
|
29603
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1205 char_u *p = ((char_u **)gap->ga_data)[-tp->tp_id - 1]; |
|
29560
14b139cbec49
patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents:
29477
diff
changeset
|
1206 |
|
29603
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1207 if (p != NULL) |
|
29560
14b139cbec49
patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents:
29477
diff
changeset
|
1208 { |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1209 int cells; |
|
29603
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1210 |
|
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1211 if (tp->tp_col == MAXCOL) |
|
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1212 { |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1213 int n_extra = (int)STRLEN(p); |
|
29740
b167c91b5f6b
patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29730
diff
changeset
|
1214 |
|
30749
6fe513996997
patch 9.0.0709: virtual text "after" not correct with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30304
diff
changeset
|
1215 cells = text_prop_position(wp, tp, vcol, |
|
29918
e6e0f1c39edb
patch 9.0.0297: cursor position wrong after right aligned virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29816
diff
changeset
|
1216 (vcol + size) % (wp->w_width - col_off) + col_off, |
|
31371
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31319
diff
changeset
|
1217 &n_extra, &p, NULL, NULL, FALSE); |
|
29633
e80174903fdf
patch 9.0.0157: 'showbreak' displayed below truncated "after" text prop
Bram Moolenaar <Bram@vim.org>
parents:
29613
diff
changeset
|
1218 #ifdef FEAT_LINEBREAK |
|
e80174903fdf
patch 9.0.0157: 'showbreak' displayed below truncated "after" text prop
Bram Moolenaar <Bram@vim.org>
parents:
29613
diff
changeset
|
1219 no_sbr = TRUE; // don't use 'showbreak' now |
|
e80174903fdf
patch 9.0.0157: 'showbreak' displayed below truncated "after" text prop
Bram Moolenaar <Bram@vim.org>
parents:
29613
diff
changeset
|
1220 #endif |
|
29603
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1221 } |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1222 else |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1223 cells = vim_strsize(p); |
|
29603
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1224 cts->cts_cur_text_width += cells; |
|
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1225 if (tp->tp_flags & TP_FLAG_ALIGN_ABOVE) |
|
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1226 cts->cts_first_char += cells; |
|
29730
0eeab24d3faf
patch 9.0.0205: cursor in wrong position when inserting after virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29718
diff
changeset
|
1227 cts->cts_start_incl = tp->tp_flags & TP_FLAG_START_INCL; |
|
29603
8f01d250793a
patch 9.0.0142: crash when adding and removing virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
1228 size += cells; |
|
29676
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1229 if (*s == TAB) |
|
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1230 { |
|
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1231 // tab size changes because of the inserted text |
|
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1232 size -= tab_size; |
|
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1233 tab_size = win_chartabsize(wp, s, vcol + size); |
|
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1234 size += tab_size; |
|
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1235 } |
|
31946
05414bdc5c2c
patch 9.0.1305: cursor in wrong line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
31938
diff
changeset
|
1236 if (tp->tp_col == MAXCOL && (tp->tp_flags |
|
05414bdc5c2c
patch 9.0.1305: cursor in wrong line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
31938
diff
changeset
|
1237 & (TP_FLAG_ALIGN_ABOVE | TP_FLAG_ALIGN_BELOW))) |
|
05414bdc5c2c
patch 9.0.1305: cursor in wrong line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
31938
diff
changeset
|
1238 // count extra line for property above/below |
|
05414bdc5c2c
patch 9.0.1305: cursor in wrong line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
31938
diff
changeset
|
1239 ++cts->cts_prop_lines; |
|
29560
14b139cbec49
patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents:
29477
diff
changeset
|
1240 } |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1241 } |
|
29613
1a0aea1e23f4
patch 9.0.0147: cursor positioned wrong after two "below" text properties
Bram Moolenaar <Bram@vim.org>
parents:
29605
diff
changeset
|
1242 if (tp->tp_col != MAXCOL && tp->tp_col - 1 > col) |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1243 break; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1244 } |
|
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1245 if (wp->w_p_list && wp->w_lcs_chars.eol != NUL) |
|
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29740
diff
changeset
|
1246 --vcol; |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1247 } |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1248 # endif |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1249 |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1250 # ifdef FEAT_LINEBREAK |
| 7 | 1251 c = *s; |
| 6024 | 1252 if (tab_corr) |
| 1253 col_adj = size - 1; | |
| 7 | 1254 |
| 1255 /* | |
| 1256 * If 'linebreak' set check at a blank before a non-blank if the line | |
| 1257 * needs a break here | |
| 1258 */ | |
| 1259 if (wp->w_p_lbr | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
1260 && VIM_ISBREAK(c) |
|
11133
d8e830e32be9
patch 8.0.0454: compiler warnings for "always true" comparison
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
1261 && !VIM_ISBREAK((int)s[1]) |
| 7 | 1262 && wp->w_p_wrap |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
1263 && wp->w_width != 0) |
| 7 | 1264 { |
| 1265 /* | |
| 1266 * Count all characters from first non-blank after a blank up to next | |
| 1267 * non-blank after a blank. | |
| 1268 */ | |
| 1269 numberextra = win_col_off(wp); | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1270 col2 = vcol; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1271 colmax = (colnr_T)(wp->w_width - numberextra - col_adj); |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1272 if (vcol >= colmax) |
| 236 | 1273 { |
| 6024 | 1274 colmax += col_adj; |
| 1275 n = colmax + win_col_off2(wp); | |
| 236 | 1276 if (n > 0) |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1277 colmax += (((vcol - colmax) / n) + 1) * n - col_adj; |
| 236 | 1278 } |
| 1279 | |
| 7 | 1280 for (;;) |
| 1281 { | |
| 1282 ps = s; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
1283 MB_PTR_ADV(s); |
| 7 | 1284 c = *s; |
| 1285 if (!(c != NUL | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
1286 && (VIM_ISBREAK(c) |
|
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
1287 || (!VIM_ISBREAK(c) |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1288 && (col2 == vcol || !VIM_ISBREAK((int)*ps)))))) |
| 7 | 1289 break; |
| 1290 | |
| 1291 col2 += win_chartabsize(wp, s, col2); | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1292 if (col2 >= colmax) // doesn't fit |
| 7 | 1293 { |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1294 size = colmax - vcol + col_adj; |
| 7 | 1295 break; |
| 1296 } | |
| 1297 } | |
| 1298 } | |
| 1299 else if (has_mbyte && size == 2 && MB_BYTE2LEN(*s) > 1 | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1300 && wp->w_p_wrap && in_win_border(wp, vcol)) |
| 7 | 1301 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1302 ++size; // Count the ">" in the last column. |
| 7 | 1303 mb_added = 1; |
| 1304 } | |
| 1305 | |
| 1306 /* | |
| 5995 | 1307 * May have to add something for 'breakindent' and/or 'showbreak' |
| 1308 * string at start of line. | |
| 7 | 1309 * Set *headp to the size of what we add. |
|
27952
22cdc06b37bf
patch 8.2.4501: with 'showbreak' set cursor displayed in wrong position
Bram Moolenaar <Bram@vim.org>
parents:
27784
diff
changeset
|
1310 * Do not use 'showbreak' at the NUL after the text. |
| 7 | 1311 */ |
| 1312 added = 0; | |
|
29633
e80174903fdf
patch 9.0.0157: 'showbreak' displayed below truncated "after" text prop
Bram Moolenaar <Bram@vim.org>
parents:
29613
diff
changeset
|
1313 sbr = (c == NUL || no_sbr) ? empty_option : get_showbreak_value(wp); |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1314 if ((*sbr != NUL || wp->w_p_bri) && wp->w_p_wrap && vcol != 0) |
| 7 | 1315 { |
| 6503 | 1316 colnr_T sbrlen = 0; |
| 1317 int numberwidth = win_col_off(wp); | |
| 1318 | |
| 1319 numberextra = numberwidth; | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1320 vcol += numberextra + mb_added; |
|
30304
f1fe59179180
patch 9.0.0488: cursor wrong with virtual text "above" and 'showbreak'
Bram Moolenaar <Bram@vim.org>
parents:
30257
diff
changeset
|
1321 #ifdef FEAT_PROP_POPUP |
|
f1fe59179180
patch 9.0.0488: cursor wrong with virtual text "above" and 'showbreak'
Bram Moolenaar <Bram@vim.org>
parents:
30257
diff
changeset
|
1322 vcol -= wp->w_virtcol_first_char; |
|
f1fe59179180
patch 9.0.0488: cursor wrong with virtual text "above" and 'showbreak'
Bram Moolenaar <Bram@vim.org>
parents:
30257
diff
changeset
|
1323 #endif |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1324 if (vcol >= (colnr_T)wp->w_width) |
| 7 | 1325 { |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1326 vcol -= wp->w_width; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1327 numberextra = wp->w_width - (numberextra - win_col_off2(wp)); |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1328 if (vcol >= numberextra && numberextra > 0) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1329 vcol %= numberextra; |
|
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18082
diff
changeset
|
1330 if (*sbr != NUL) |
| 6288 | 1331 { |
|
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18082
diff
changeset
|
1332 sbrlen = (colnr_T)MB_CHARLEN(sbr); |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1333 if (vcol >= sbrlen) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1334 vcol -= sbrlen; |
| 6288 | 1335 } |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1336 if (vcol >= numberextra && numberextra > 0) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1337 vcol = vcol % numberextra; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1338 else if (vcol > 0 && numberextra > 0) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1339 vcol += numberwidth - win_col_off2(wp); |
| 6503 | 1340 |
| 1341 numberwidth -= win_col_off2(wp); | |
| 7 | 1342 } |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1343 if (vcol == 0 || vcol + size + sbrlen > (colnr_T)wp->w_width) |
| 7 | 1344 { |
| 5995 | 1345 added = 0; |
|
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18082
diff
changeset
|
1346 if (*sbr != NUL) |
| 6503 | 1347 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1348 if (size + sbrlen + numberwidth > (colnr_T)wp->w_width) |
| 6503 | 1349 { |
|
16819
91619e48e1a7
patch 8.1.1411: Coverity warns for divide by zero
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
1350 // calculate effective window width |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1351 int width = (colnr_T)wp->w_width - sbrlen - numberwidth; |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1352 int prev_width = vcol |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1353 ? ((colnr_T)wp->w_width - (sbrlen + vcol)) : 0; |
|
16819
91619e48e1a7
patch 8.1.1411: Coverity warns for divide by zero
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
1354 |
|
91619e48e1a7
patch 8.1.1411: Coverity warns for divide by zero
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
1355 if (width <= 0) |
|
91619e48e1a7
patch 8.1.1411: Coverity warns for divide by zero
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
1356 width = (colnr_T)1; |
|
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18082
diff
changeset
|
1357 added += ((size - prev_width) / width) * vim_strsize(sbr); |
| 6503 | 1358 if ((size - prev_width) % width) |
|
16819
91619e48e1a7
patch 8.1.1411: Coverity warns for divide by zero
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
1359 // wrapped, add another length of 'sbr' |
|
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18082
diff
changeset
|
1360 added += vim_strsize(sbr); |
| 6503 | 1361 } |
| 1362 else | |
|
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18082
diff
changeset
|
1363 added += vim_strsize(sbr); |
| 6503 | 1364 } |
| 5995 | 1365 if (wp->w_p_bri) |
| 1366 added += get_breakindent_win(wp, line); | |
| 1367 | |
| 6160 | 1368 size += added; |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1369 if (vcol != 0) |
| 7 | 1370 added = 0; |
| 1371 } | |
| 1372 } | |
| 1373 if (headp != NULL) | |
| 1374 *headp = added + mb_added; | |
| 1375 return size; | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1376 # endif |
| 7 | 1377 #endif |
| 1378 } | |
| 1379 | |
| 1380 /* | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1381 * Like win_lbr_chartabsize(), except that we know 'linebreak' is off, 'wrap' |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1382 * is on and there are no properties that insert text. This means we need to |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1383 * check for a double-byte character that doesn't fit at the end of the screen |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1384 * line. |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1385 * Only uses "cts_win", "cts_ptr" and "cts_vcol" from "cts". |
| 7 | 1386 */ |
| 1387 static int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1388 win_nolbr_chartabsize( |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1389 chartabsize_T *cts, |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1390 int *headp) |
| 7 | 1391 { |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1392 win_T *wp = cts->cts_win; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1393 char_u *s = cts->cts_ptr; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1394 colnr_T col = cts->cts_vcol; |
| 7 | 1395 int n; |
| 1396 | |
|
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23533
diff
changeset
|
1397 if (*s == TAB && (!wp->w_p_list || wp->w_lcs_chars.tab1)) |
| 7 | 1398 { |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1399 # ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1400 return tabstop_padding(col, wp->w_buffer->b_p_ts, |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1401 wp->w_buffer->b_p_vts_array); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1402 # else |
| 7 | 1403 n = wp->w_buffer->b_p_ts; |
| 1404 return (int)(n - (col % n)); | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1405 # endif |
| 7 | 1406 } |
| 1407 n = ptr2cells(s); | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1408 // Add one cell for a double-width character in the last column of the |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1409 // window, displayed with a ">". |
| 7 | 1410 if (n == 2 && MB_BYTE2LEN(*s) > 1 && in_win_border(wp, col)) |
| 1411 { | |
| 1412 if (headp != NULL) | |
| 1413 *headp = 1; | |
| 1414 return 3; | |
| 1415 } | |
| 1416 return n; | |
| 1417 } | |
| 1418 | |
| 1419 /* | |
| 1420 * Return TRUE if virtual column "vcol" is in the rightmost column of window | |
| 1421 * "wp". | |
| 1422 */ | |
|
17789
0f7ae8010787
patch 8.1.1891: functions used in one file are global
Bram Moolenaar <Bram@vim.org>
parents:
16819
diff
changeset
|
1423 static int |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1424 in_win_border(win_T *wp, colnr_T vcol) |
| 7 | 1425 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1426 int width1; // width of first line (after line number) |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1427 int width2; // width of further lines |
| 7 | 1428 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1429 if (wp->w_width == 0) // there is no border |
| 7 | 1430 return FALSE; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1431 width1 = wp->w_width - win_col_off(wp); |
| 1869 | 1432 if ((int)vcol < width1 - 1) |
| 7 | 1433 return FALSE; |
| 1869 | 1434 if ((int)vcol == width1 - 1) |
| 7 | 1435 return TRUE; |
| 1436 width2 = width1 + win_col_off2(wp); | |
| 1970 | 1437 if (width2 <= 0) |
| 1438 return FALSE; | |
| 7 | 1439 return ((vcol - width1) % width2 == width2 - 1); |
| 1440 } | |
| 1441 | |
| 1442 /* | |
| 1443 * Get virtual column number of pos. | |
| 1444 * start: on the first position of this character (TAB, ctrl) | |
| 1445 * cursor: where the cursor is on this character (first char, except for TAB) | |
| 1446 * end: on the last position of this character (TAB, ctrl) | |
| 1447 * | |
| 1448 * This is used very often, keep it fast! | |
| 1449 */ | |
| 1450 void | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1451 getvcol( |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1452 win_T *wp, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1453 pos_T *pos, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1454 colnr_T *start, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1455 colnr_T *cursor, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1456 colnr_T *end) |
| 7 | 1457 { |
| 1458 colnr_T vcol; | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1459 char_u *ptr; // points to current char |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1460 char_u *posptr; // points to char at pos->col |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1461 char_u *line; // start of the line |
| 7 | 1462 int incr; |
| 1463 int head; | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1464 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1465 int *vts = wp->w_buffer->b_p_vts_array; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1466 #endif |
| 7 | 1467 int ts = wp->w_buffer->b_p_ts; |
| 1468 int c; | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1469 chartabsize_T cts; |
|
29678
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1470 #ifdef FEAT_PROP_POPUP |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1471 int on_NUL = FALSE; |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1472 #endif |
| 7 | 1473 |
| 1474 vcol = 0; | |
| 5995 | 1475 line = ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE); |
|
2108
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
1979
diff
changeset
|
1476 if (pos->col == MAXCOL) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1477 posptr = NULL; // continue until the NUL |
|
2108
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
1979
diff
changeset
|
1478 else |
|
10720
44a1661f4cfa
patch 8.0.0250: virtcol() does not work well for multi-byte characters
Christian Brabandt <cb@256bit.org>
parents:
10658
diff
changeset
|
1479 { |
|
26843
1e3c49c09260
patch 8.2.3950: going beyond the end of the line with /%V
Bram Moolenaar <Bram@vim.org>
parents:
26572
diff
changeset
|
1480 colnr_T i; |
|
1e3c49c09260
patch 8.2.3950: going beyond the end of the line with /%V
Bram Moolenaar <Bram@vim.org>
parents:
26572
diff
changeset
|
1481 |
|
1e3c49c09260
patch 8.2.3950: going beyond the end of the line with /%V
Bram Moolenaar <Bram@vim.org>
parents:
26572
diff
changeset
|
1482 // In a few cases the position can be beyond the end of the line. |
|
1e3c49c09260
patch 8.2.3950: going beyond the end of the line with /%V
Bram Moolenaar <Bram@vim.org>
parents:
26572
diff
changeset
|
1483 for (i = 0; i < pos->col; ++i) |
|
1e3c49c09260
patch 8.2.3950: going beyond the end of the line with /%V
Bram Moolenaar <Bram@vim.org>
parents:
26572
diff
changeset
|
1484 if (ptr[i] == NUL) |
|
1e3c49c09260
patch 8.2.3950: going beyond the end of the line with /%V
Bram Moolenaar <Bram@vim.org>
parents:
26572
diff
changeset
|
1485 { |
|
1e3c49c09260
patch 8.2.3950: going beyond the end of the line with /%V
Bram Moolenaar <Bram@vim.org>
parents:
26572
diff
changeset
|
1486 pos->col = i; |
|
1e3c49c09260
patch 8.2.3950: going beyond the end of the line with /%V
Bram Moolenaar <Bram@vim.org>
parents:
26572
diff
changeset
|
1487 break; |
|
1e3c49c09260
patch 8.2.3950: going beyond the end of the line with /%V
Bram Moolenaar <Bram@vim.org>
parents:
26572
diff
changeset
|
1488 } |
|
2108
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
1979
diff
changeset
|
1489 posptr = ptr + pos->col; |
|
10720
44a1661f4cfa
patch 8.0.0250: virtcol() does not work well for multi-byte characters
Christian Brabandt <cb@256bit.org>
parents:
10658
diff
changeset
|
1490 if (has_mbyte) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1491 // always start on the first byte |
|
10720
44a1661f4cfa
patch 8.0.0250: virtcol() does not work well for multi-byte characters
Christian Brabandt <cb@256bit.org>
parents:
10658
diff
changeset
|
1492 posptr -= (*mb_head_off)(line, posptr); |
|
44a1661f4cfa
patch 8.0.0250: virtcol() does not work well for multi-byte characters
Christian Brabandt <cb@256bit.org>
parents:
10658
diff
changeset
|
1493 } |
| 7 | 1494 |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1495 init_chartabsize_arg(&cts, wp, pos->lnum, 0, line, line); |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1496 |
| 7 | 1497 /* |
| 1498 * This function is used very often, do some speed optimizations. | |
| 5995 | 1499 * When 'list', 'linebreak', 'showbreak' and 'breakindent' are not set |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1500 * and there are no text properties with "text" use a simple loop. |
| 7 | 1501 * Also use this when 'list' is set but tabs take their normal size. |
| 1502 */ | |
|
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23533
diff
changeset
|
1503 if ((!wp->w_p_list || wp->w_lcs_chars.tab1 != NUL) |
| 7 | 1504 #ifdef FEAT_LINEBREAK |
|
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18082
diff
changeset
|
1505 && !wp->w_p_lbr && *get_showbreak_value(wp) == NUL && !wp->w_p_bri |
| 7 | 1506 #endif |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1507 #ifdef FEAT_PROP_POPUP |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1508 && !cts.cts_has_prop_with_text |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1509 #endif |
| 7 | 1510 ) |
| 1511 { | |
| 1512 for (;;) | |
| 1513 { | |
| 1514 head = 0; | |
| 1515 c = *ptr; | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1516 // make sure we don't go past the end of the line |
| 7 | 1517 if (c == NUL) |
| 1518 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1519 incr = 1; // NUL at end of line only takes one column |
| 7 | 1520 break; |
| 1521 } | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1522 // A tab gets expanded, depending on the current column |
| 7 | 1523 if (c == TAB) |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1524 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1525 incr = tabstop_padding(vcol, ts, vts); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1526 #else |
| 7 | 1527 incr = ts - (vcol % ts); |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14061
diff
changeset
|
1528 #endif |
| 7 | 1529 else |
| 1530 { | |
| 1531 if (has_mbyte) | |
| 1532 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1533 // For utf-8, if the byte is >= 0x80, need to look at |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1534 // further bytes to find the cell width. |
| 7 | 1535 if (enc_utf8 && c >= 0x80) |
| 1536 incr = utf_ptr2cells(ptr); | |
| 1537 else | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
1538 incr = g_chartab[c] & CT_CELL_MASK; |
| 7 | 1539 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1540 // If a double-cell char doesn't fit at the end of a line |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1541 // it wraps to the next line, it's like this char is three |
|
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1542 // cells wide. |
| 1546 | 1543 if (incr == 2 && wp->w_p_wrap && MB_BYTE2LEN(*ptr) > 1 |
| 1544 && in_win_border(wp, vcol)) | |
| 7 | 1545 { |
| 1546 ++incr; | |
| 1547 head = 1; | |
| 1548 } | |
| 1549 } | |
| 1550 else | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
1551 incr = g_chartab[c] & CT_CELL_MASK; |
| 7 | 1552 } |
| 1553 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1554 if (posptr != NULL && ptr >= posptr) // character at pos->col |
| 7 | 1555 break; |
| 1556 | |
| 1557 vcol += incr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
1558 MB_PTR_ADV(ptr); |
| 7 | 1559 } |
| 1560 } | |
| 1561 else | |
| 1562 { | |
| 1563 for (;;) | |
| 1564 { | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1565 // A tab gets expanded, depending on the current column. |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1566 // Other things also take up space. |
| 7 | 1567 head = 0; |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1568 incr = win_lbr_chartabsize(&cts, &head); |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1569 // make sure we don't go past the end of the line |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1570 if (*cts.cts_ptr == NUL) |
| 7 | 1571 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1572 incr = 1; // NUL at end of line only takes one column |
|
29678
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1573 #ifdef FEAT_PROP_POPUP |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1574 if (cts.cts_cur_text_width > 0) |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1575 incr = cts.cts_cur_text_width; |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1576 on_NUL = TRUE; |
|
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1577 #endif |
| 7 | 1578 break; |
| 1579 } | |
|
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1580 #ifdef FEAT_PROP_POPUP |
|
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1581 if (cursor == &wp->w_virtcol && cts.cts_ptr == cts.cts_line) |
|
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1582 // do not count the virtual text above for w_curswant |
|
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1583 wp->w_virtcol_first_char = cts.cts_first_char; |
|
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30152
diff
changeset
|
1584 #endif |
| 7 | 1585 |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1586 if (posptr != NULL && cts.cts_ptr >= posptr) |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1587 // character at pos->col |
| 7 | 1588 break; |
| 1589 | |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1590 cts.cts_vcol += incr; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1591 MB_PTR_ADV(cts.cts_ptr); |
| 7 | 1592 } |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1593 vcol = cts.cts_vcol; |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1594 ptr = cts.cts_ptr; |
| 7 | 1595 } |
|
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1596 clear_chartabsize_arg(&cts); |
|
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
1597 |
| 7 | 1598 if (start != NULL) |
| 1599 *start = vcol + head; | |
| 1600 if (end != NULL) | |
| 1601 *end = vcol + incr - 1; | |
| 1602 if (cursor != NULL) | |
| 1603 { | |
| 1604 if (*ptr == TAB | |
|
28773
d770568e6c98
patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents:
28013
diff
changeset
|
1605 && (State & MODE_NORMAL) |
| 7 | 1606 && !wp->w_p_list |
| 1607 && !virtual_active() | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10835
diff
changeset
|
1608 && !(VIsual_active |
|
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10835
diff
changeset
|
1609 && (*p_sel == 'e' || LTOREQ_POS(*pos, VIsual))) |
| 7 | 1610 ) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1611 *cursor = vcol + incr - 1; // cursor at end |
| 7 | 1612 else |
|
29676
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1613 { |
|
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1614 #ifdef FEAT_PROP_POPUP |
|
29730
0eeab24d3faf
patch 9.0.0205: cursor in wrong position when inserting after virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29718
diff
changeset
|
1615 // in Insert mode, if "start_incl" is true the text gets inserted |
|
0eeab24d3faf
patch 9.0.0205: cursor in wrong position when inserting after virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29718
diff
changeset
|
1616 // after the virtual text, thus add its width |
|
0eeab24d3faf
patch 9.0.0205: cursor in wrong position when inserting after virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29718
diff
changeset
|
1617 if (((State & MODE_INSERT) == 0 || cts.cts_start_incl) && !on_NUL) |
|
29678
fc0f93590fd4
patch 9.0.0179: cursor pos wrong with wrapping virtual text in empty line
Bram Moolenaar <Bram@vim.org>
parents:
29676
diff
changeset
|
1618 // cursor is after inserted text, unless on the NUL |
|
29676
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1619 vcol += cts.cts_cur_text_width; |
|
30207
7147c6059e80
patch 9.0.0439: cursor wrong if inserting before line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
30205
diff
changeset
|
1620 else |
|
7147c6059e80
patch 9.0.0439: cursor wrong if inserting before line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
30205
diff
changeset
|
1621 // insertion also happens after the "above" virtual text |
|
7147c6059e80
patch 9.0.0439: cursor wrong if inserting before line with virtual text above
Bram Moolenaar <Bram@vim.org>
parents:
30205
diff
changeset
|
1622 vcol += cts.cts_first_char; |
|
29676
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1623 #endif |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1624 *cursor = vcol + head; // cursor at start |
|
29676
b4fea827c20a
patch 9.0.0178: cursor position wrong with virtual text before Tab
Bram Moolenaar <Bram@vim.org>
parents:
29655
diff
changeset
|
1625 } |
| 7 | 1626 } |
| 1627 } | |
| 1628 | |
| 1629 /* | |
| 1630 * Get virtual cursor column in the current window, pretending 'list' is off. | |
| 1631 */ | |
| 1632 colnr_T | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1633 getvcol_nolist(pos_T *posp) |
| 7 | 1634 { |
| 1635 int list_save = curwin->w_p_list; | |
| 1636 colnr_T vcol; | |
| 1637 | |
| 1638 curwin->w_p_list = FALSE; | |
|
13786
0fa21ba32e21
patch 8.0.1765: CTRL-G j in Insert mode is incorrect when 'virtualedit' set
Christian Brabandt <cb@256bit.org>
parents:
13553
diff
changeset
|
1639 if (posp->coladd) |
|
0fa21ba32e21
patch 8.0.1765: CTRL-G j in Insert mode is incorrect when 'virtualedit' set
Christian Brabandt <cb@256bit.org>
parents:
13553
diff
changeset
|
1640 getvvcol(curwin, posp, NULL, &vcol, NULL); |
|
0fa21ba32e21
patch 8.0.1765: CTRL-G j in Insert mode is incorrect when 'virtualedit' set
Christian Brabandt <cb@256bit.org>
parents:
13553
diff
changeset
|
1641 else |
|
0fa21ba32e21
patch 8.0.1765: CTRL-G j in Insert mode is incorrect when 'virtualedit' set
Christian Brabandt <cb@256bit.org>
parents:
13553
diff
changeset
|
1642 getvcol(curwin, posp, NULL, &vcol, NULL); |
| 7 | 1643 curwin->w_p_list = list_save; |
| 1644 return vcol; | |
| 1645 } | |
| 1646 | |
| 1647 /* | |
| 1648 * Get virtual column in virtual mode. | |
| 1649 */ | |
| 1650 void | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1651 getvvcol( |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1652 win_T *wp, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1653 pos_T *pos, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1654 colnr_T *start, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1655 colnr_T *cursor, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1656 colnr_T *end) |
| 7 | 1657 { |
| 1658 colnr_T col; | |
| 1659 colnr_T coladd; | |
| 1660 colnr_T endadd; | |
| 1661 char_u *ptr; | |
| 1662 | |
| 1663 if (virtual_active()) | |
| 1664 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1665 // For virtual mode, only want one value |
| 7 | 1666 getvcol(wp, pos, &col, NULL, NULL); |
| 1667 | |
| 1668 coladd = pos->coladd; | |
| 1669 endadd = 0; | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1670 // Cannot put the cursor on part of a wide character. |
| 7 | 1671 ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE); |
| 1869 | 1672 if (pos->col < (colnr_T)STRLEN(ptr)) |
| 7 | 1673 { |
| 1674 int c = (*mb_ptr2char)(ptr + pos->col); | |
| 1675 | |
| 1676 if (c != TAB && vim_isprintc(c)) | |
| 1677 { | |
| 1869 | 1678 endadd = (colnr_T)(char2cells(c) - 1); |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1679 if (coladd > endadd) // past end of line |
| 557 | 1680 endadd = 0; |
| 7 | 1681 else |
| 1682 coladd = 0; | |
| 1683 } | |
| 1684 } | |
| 1685 col += coladd; | |
| 1686 if (start != NULL) | |
| 1687 *start = col; | |
| 1688 if (cursor != NULL) | |
| 1689 *cursor = col; | |
| 1690 if (end != NULL) | |
| 1691 *end = col + endadd; | |
| 1692 } | |
| 1693 else | |
| 1694 getvcol(wp, pos, start, cursor, end); | |
| 1695 } | |
| 1696 | |
| 1697 /* | |
| 1698 * Get the leftmost and rightmost virtual column of pos1 and pos2. | |
| 1699 * Used for Visual block mode. | |
| 1700 */ | |
| 1701 void | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1702 getvcols( |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1703 win_T *wp, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1704 pos_T *pos1, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1705 pos_T *pos2, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1706 colnr_T *left, |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1707 colnr_T *right) |
| 7 | 1708 { |
| 1709 colnr_T from1, from2, to1, to2; | |
| 1710 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10835
diff
changeset
|
1711 if (LT_POSP(pos1, pos2)) |
| 7 | 1712 { |
| 1713 getvvcol(wp, pos1, &from1, NULL, &to1); | |
| 1714 getvvcol(wp, pos2, &from2, NULL, &to2); | |
| 1715 } | |
| 1716 else | |
| 1717 { | |
| 1718 getvvcol(wp, pos2, &from1, NULL, &to1); | |
| 1719 getvvcol(wp, pos1, &from2, NULL, &to2); | |
| 1720 } | |
| 1721 if (from2 < from1) | |
| 1722 *left = from2; | |
| 1723 else | |
| 1724 *left = from1; | |
| 1725 if (to2 > to1) | |
| 1726 { | |
| 1727 if (*p_sel == 'e' && from2 - 1 >= to1) | |
| 1728 *right = from2 - 1; | |
| 1729 else | |
| 1730 *right = to2; | |
| 1731 } | |
| 1732 else | |
| 1733 *right = to1; | |
| 1734 } | |
| 1735 | |
| 1736 /* | |
|
26572
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1737 * Skip over ' ' and '\t'. |
| 7 | 1738 */ |
| 1739 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1740 skipwhite(char_u *q) |
| 7 | 1741 { |
| 1687 | 1742 char_u *p = q; |
| 1743 | |
|
26572
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1744 while (VIM_ISWHITE(*p)) |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1745 ++p; |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1746 return p; |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1747 } |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1748 |
|
27018
268f6a3511df
patch 8.2.4038: various code not used when features are disabled
Bram Moolenaar <Bram@vim.org>
parents:
26843
diff
changeset
|
1749 #if defined(FEAT_EVAL) || defined(PROTO) |
|
26572
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1750 /* |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1751 * skip over ' ', '\t' and '\n'. |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1752 */ |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1753 char_u * |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1754 skipwhite_and_nl(char_u *q) |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1755 { |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1756 char_u *p = q; |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1757 |
|
9f7568104726
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Bram Moolenaar <Bram@vim.org>
parents:
26327
diff
changeset
|
1758 while (VIM_ISWHITE(*p) || *p == NL) |
| 7 | 1759 ++p; |
| 1760 return p; | |
| 1761 } | |
|
27018
268f6a3511df
patch 8.2.4038: various code not used when features are disabled
Bram Moolenaar <Bram@vim.org>
parents:
26843
diff
changeset
|
1762 #endif |
| 7 | 1763 |
| 1764 /* | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1765 * getwhitecols: return the number of whitespace |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1766 * columns (bytes) at the start of a given line |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1767 */ |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1768 int |
|
32009
4545f58c8490
patch 9.0.1336: functions without arguments are not always declared properly
Bram Moolenaar <Bram@vim.org>
parents:
31990
diff
changeset
|
1769 getwhitecols_curline(void) |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1770 { |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1771 return getwhitecols(ml_get_curline()); |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1772 } |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1773 |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1774 int |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1775 getwhitecols(char_u *p) |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1776 { |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1777 return skipwhite(p) - p; |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1778 } |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1779 |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11337
diff
changeset
|
1780 /* |
| 293 | 1781 * skip over digits |
| 7 | 1782 */ |
| 1783 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1784 skipdigits(char_u *q) |
| 7 | 1785 { |
| 1687 | 1786 char_u *p = q; |
| 1787 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1788 while (VIM_ISDIGIT(*p)) // skip to next non-digit |
| 7 | 1789 ++p; |
| 1790 return p; | |
| 1791 } | |
| 1792 | |
| 741 | 1793 #if defined(FEAT_SYN_HL) || defined(FEAT_SPELL) || defined(PROTO) |
| 301 | 1794 /* |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1795 * skip over binary digits |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1796 */ |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1797 char_u * |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1798 skipbin(char_u *q) |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1799 { |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1800 char_u *p = q; |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1801 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1802 while (vim_isbdigit(*p)) // skip to next non-digit |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1803 ++p; |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1804 return p; |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1805 } |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1806 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1807 /* |
| 301 | 1808 * skip over digits and hex characters |
| 1809 */ | |
| 1810 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1811 skiphex(char_u *q) |
| 301 | 1812 { |
| 1687 | 1813 char_u *p = q; |
| 1814 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1815 while (vim_isxdigit(*p)) // skip to next non-digit |
| 301 | 1816 ++p; |
| 1817 return p; | |
| 1818 } | |
| 1819 #endif | |
| 1820 | |
| 293 | 1821 /* |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1822 * skip to bin digit (or NUL after the string) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1823 */ |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1824 char_u * |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1825 skiptobin(char_u *q) |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1826 { |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1827 char_u *p = q; |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1828 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1829 while (*p != NUL && !vim_isbdigit(*p)) // skip to next digit |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1830 ++p; |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1831 return p; |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1832 } |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1833 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1834 /* |
| 293 | 1835 * skip to digit (or NUL after the string) |
| 1836 */ | |
| 1837 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1838 skiptodigit(char_u *q) |
| 293 | 1839 { |
| 1687 | 1840 char_u *p = q; |
| 1841 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1842 while (*p != NUL && !VIM_ISDIGIT(*p)) // skip to next digit |
| 293 | 1843 ++p; |
| 1844 return p; | |
| 1845 } | |
| 1846 | |
| 1847 /* | |
| 1848 * skip to hex character (or NUL after the string) | |
| 1849 */ | |
| 1850 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1851 skiptohex(char_u *q) |
| 293 | 1852 { |
| 1687 | 1853 char_u *p = q; |
| 1854 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1855 while (*p != NUL && !vim_isxdigit(*p)) // skip to next digit |
| 293 | 1856 ++p; |
| 1857 return p; | |
| 1858 } | |
| 1859 | |
| 7 | 1860 /* |
| 1861 * Variant of isdigit() that can handle characters > 0x100. | |
| 1862 * We don't use isdigit() here, because on some systems it also considers | |
| 1863 * superscript 1 to be a digit. | |
| 1864 * Use the VIM_ISDIGIT() macro for simple arguments. | |
| 1865 */ | |
| 1866 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1867 vim_isdigit(int c) |
| 7 | 1868 { |
| 1869 return (c >= '0' && c <= '9'); | |
| 1870 } | |
| 1871 | |
| 1872 /* | |
| 1873 * Variant of isxdigit() that can handle characters > 0x100. | |
| 1874 * We don't use isxdigit() here, because on some systems it also considers | |
| 1875 * superscript 1 to be a digit. | |
| 1876 */ | |
| 1877 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1878 vim_isxdigit(int c) |
| 7 | 1879 { |
| 1880 return (c >= '0' && c <= '9') | |
| 1881 || (c >= 'a' && c <= 'f') | |
| 1882 || (c >= 'A' && c <= 'F'); | |
| 1883 } | |
| 1884 | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1885 /* |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1886 * Corollary of vim_isdigit and vim_isxdigit() that can handle |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1887 * characters > 0x100. |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1888 */ |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1889 int |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1890 vim_isbdigit(int c) |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1891 { |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1892 return (c == '0' || c == '1'); |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1893 } |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
1894 |
|
23533
ee43d943c3bb
patch 8.2.2309: 0o777 not recognized as octal
Bram Moolenaar <Bram@vim.org>
parents:
20782
diff
changeset
|
1895 static int |
|
ee43d943c3bb
patch 8.2.2309: 0o777 not recognized as octal
Bram Moolenaar <Bram@vim.org>
parents:
20782
diff
changeset
|
1896 vim_isodigit(int c) |
|
ee43d943c3bb
patch 8.2.2309: 0o777 not recognized as octal
Bram Moolenaar <Bram@vim.org>
parents:
20782
diff
changeset
|
1897 { |
|
ee43d943c3bb
patch 8.2.2309: 0o777 not recognized as octal
Bram Moolenaar <Bram@vim.org>
parents:
20782
diff
changeset
|
1898 return (c >= '0' && c <= '7'); |
|
ee43d943c3bb
patch 8.2.2309: 0o777 not recognized as octal
Bram Moolenaar <Bram@vim.org>
parents:
20782
diff
changeset
|
1899 } |
|
ee43d943c3bb
patch 8.2.2309: 0o777 not recognized as octal
Bram Moolenaar <Bram@vim.org>
parents:
20782
diff
changeset
|
1900 |
| 492 | 1901 /* |
| 1902 * Vim's own character class functions. These exist because many library | |
| 1903 * islower()/toupper() etc. do not work properly: they crash when used with | |
| 1904 * invalid values or can't handle latin1 when the locale is C. | |
| 1905 * Speed is most important here. | |
| 1906 */ | |
| 1907 #define LATIN1LOWER 'l' | |
| 1908 #define LATIN1UPPER 'U' | |
| 1909 | |
| 497 | 1910 static char_u latin1flags[257] = " UUUUUUUUUUUUUUUUUUUUUUUUUU llllllllllllllllllllllllll UUUUUUUUUUUUUUUUUUUUUUU UUUUUUUllllllllllllllllllllllll llllllll"; |
| 3533 | 1911 static char_u latin1upper[257] = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xf7\xd8\xd9\xda\xdb\xdc\xdd\xde\xff"; |
| 1912 static char_u latin1lower[257] = " !\"#$%&'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xd7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"; | |
| 492 | 1913 |
| 1914 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1915 vim_islower(int c) |
| 492 | 1916 { |
| 1917 if (c <= '@') | |
| 1918 return FALSE; | |
| 1919 if (c >= 0x80) | |
| 1920 { | |
| 1921 if (enc_utf8) | |
| 1922 return utf_islower(c); | |
| 1923 if (c >= 0x100) | |
| 1924 { | |
| 1925 #ifdef HAVE_ISWLOWER | |
| 1926 if (has_mbyte) | |
| 1927 return iswlower(c); | |
| 1928 #endif | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1929 // islower() can't handle these chars and may crash |
| 492 | 1930 return FALSE; |
| 1931 } | |
| 1932 if (enc_latin1like) | |
| 1933 return (latin1flags[c] & LATIN1LOWER) == LATIN1LOWER; | |
| 1934 } | |
| 1935 return islower(c); | |
| 1936 } | |
| 1937 | |
| 1938 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1939 vim_isupper(int c) |
| 492 | 1940 { |
| 1941 if (c <= '@') | |
| 1942 return FALSE; | |
| 1943 if (c >= 0x80) | |
| 1944 { | |
| 1945 if (enc_utf8) | |
| 1946 return utf_isupper(c); | |
| 1947 if (c >= 0x100) | |
| 1948 { | |
| 1949 #ifdef HAVE_ISWUPPER | |
| 1950 if (has_mbyte) | |
| 1951 return iswupper(c); | |
| 1952 #endif | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1953 // islower() can't handle these chars and may crash |
| 492 | 1954 return FALSE; |
| 1955 } | |
| 1956 if (enc_latin1like) | |
| 1957 return (latin1flags[c] & LATIN1UPPER) == LATIN1UPPER; | |
| 1958 } | |
| 1959 return isupper(c); | |
| 1960 } | |
| 1961 | |
| 1962 int | |
|
27784
bfce04a99561
patch 8.2.4418: crash when using special multi-byte character
Bram Moolenaar <Bram@vim.org>
parents:
27752
diff
changeset
|
1963 vim_isalpha(int c) |
|
bfce04a99561
patch 8.2.4418: crash when using special multi-byte character
Bram Moolenaar <Bram@vim.org>
parents:
27752
diff
changeset
|
1964 { |
|
bfce04a99561
patch 8.2.4418: crash when using special multi-byte character
Bram Moolenaar <Bram@vim.org>
parents:
27752
diff
changeset
|
1965 return vim_islower(c) || vim_isupper(c); |
|
bfce04a99561
patch 8.2.4418: crash when using special multi-byte character
Bram Moolenaar <Bram@vim.org>
parents:
27752
diff
changeset
|
1966 } |
|
bfce04a99561
patch 8.2.4418: crash when using special multi-byte character
Bram Moolenaar <Bram@vim.org>
parents:
27752
diff
changeset
|
1967 |
|
bfce04a99561
patch 8.2.4418: crash when using special multi-byte character
Bram Moolenaar <Bram@vim.org>
parents:
27752
diff
changeset
|
1968 int |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1969 vim_toupper(int c) |
| 492 | 1970 { |
| 1971 if (c <= '@') | |
| 1972 return c; | |
|
11333
fef09eb74832
patch 8.0.0552: toupper and tolower don't work properly for Turkish
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
1973 if (c >= 0x80 || !(cmp_flags & CMP_KEEPASCII)) |
| 492 | 1974 { |
| 1975 if (enc_utf8) | |
| 1976 return utf_toupper(c); | |
| 1977 if (c >= 0x100) | |
| 1978 { | |
| 1979 #ifdef HAVE_TOWUPPER | |
| 1980 if (has_mbyte) | |
| 1981 return towupper(c); | |
| 1982 #endif | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
1983 // toupper() can't handle these chars and may crash |
| 492 | 1984 return c; |
| 1985 } | |
| 1986 if (enc_latin1like) | |
| 1987 return latin1upper[c]; | |
| 1988 } | |
|
11337
f0fbebf19b80
patch 8.0.0554: toupper and tolower don't work properly for Turkish
Christian Brabandt <cb@256bit.org>
parents:
11333
diff
changeset
|
1989 if (c < 0x80 && (cmp_flags & CMP_KEEPASCII)) |
|
f0fbebf19b80
patch 8.0.0554: toupper and tolower don't work properly for Turkish
Christian Brabandt <cb@256bit.org>
parents:
11333
diff
changeset
|
1990 return TOUPPER_ASC(c); |
| 492 | 1991 return TOUPPER_LOC(c); |
| 1992 } | |
| 1993 | |
| 1994 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
1995 vim_tolower(int c) |
| 492 | 1996 { |
| 1997 if (c <= '@') | |
| 1998 return c; | |
|
11333
fef09eb74832
patch 8.0.0552: toupper and tolower don't work properly for Turkish
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
1999 if (c >= 0x80 || !(cmp_flags & CMP_KEEPASCII)) |
| 492 | 2000 { |
| 2001 if (enc_utf8) | |
| 2002 return utf_tolower(c); | |
| 2003 if (c >= 0x100) | |
| 2004 { | |
| 2005 #ifdef HAVE_TOWLOWER | |
| 2006 if (has_mbyte) | |
| 2007 return towlower(c); | |
| 2008 #endif | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2009 // tolower() can't handle these chars and may crash |
| 492 | 2010 return c; |
| 2011 } | |
| 2012 if (enc_latin1like) | |
| 2013 return latin1lower[c]; | |
| 2014 } | |
|
11337
f0fbebf19b80
patch 8.0.0554: toupper and tolower don't work properly for Turkish
Christian Brabandt <cb@256bit.org>
parents:
11333
diff
changeset
|
2015 if (c < 0x80 && (cmp_flags & CMP_KEEPASCII)) |
|
f0fbebf19b80
patch 8.0.0554: toupper and tolower don't work properly for Turkish
Christian Brabandt <cb@256bit.org>
parents:
11333
diff
changeset
|
2016 return TOLOWER_ASC(c); |
| 492 | 2017 return TOLOWER_LOC(c); |
| 2018 } | |
| 2019 | |
| 7 | 2020 /* |
| 2021 * skiptowhite: skip over text until ' ' or '\t' or NUL. | |
| 2022 */ | |
| 2023 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2024 skiptowhite(char_u *p) |
| 7 | 2025 { |
| 2026 while (*p != ' ' && *p != '\t' && *p != NUL) | |
| 2027 ++p; | |
| 2028 return p; | |
| 2029 } | |
| 2030 | |
| 2031 /* | |
| 2032 * skiptowhite_esc: Like skiptowhite(), but also skip escaped chars | |
| 2033 */ | |
| 2034 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2035 skiptowhite_esc(char_u *p) |
| 7 | 2036 { |
| 2037 while (*p != ' ' && *p != '\t' && *p != NUL) | |
| 2038 { | |
| 2039 if ((*p == '\\' || *p == Ctrl_V) && *(p + 1) != NUL) | |
| 2040 ++p; | |
| 2041 ++p; | |
| 2042 } | |
| 2043 return p; | |
| 2044 } | |
| 2045 | |
| 2046 /* | |
|
26327
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2047 * Get a number from a string and skip over it. |
| 7 | 2048 * Note: the argument is a pointer to a char_u pointer! |
| 2049 */ | |
| 2050 long | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2051 getdigits(char_u **pp) |
| 7 | 2052 { |
| 2053 char_u *p; | |
| 2054 long retval; | |
| 2055 | |
| 2056 p = *pp; | |
| 2057 retval = atol((char *)p); | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2058 if (*p == '-') // skip negative sign |
| 7 | 2059 ++p; |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2060 p = skipdigits(p); // skip to next non-digit |
| 7 | 2061 *pp = p; |
| 2062 return retval; | |
| 2063 } | |
| 2064 | |
| 2065 /* | |
|
26327
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2066 * Like getdigits() but allow for embedded single quotes. |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2067 */ |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2068 long |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2069 getdigits_quoted(char_u **pp) |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2070 { |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2071 char_u *p = *pp; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2072 long retval = 0; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2073 |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2074 if (*p == '-') |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2075 ++p; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2076 while (VIM_ISDIGIT(*p)) |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2077 { |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2078 if (retval >= LONG_MAX / 10 - 10) |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2079 retval = LONG_MAX; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2080 else |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2081 retval = retval * 10 - '0' + *p; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2082 ++p; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2083 if (in_vim9script() && *p == '\'' && VIM_ISDIGIT(p[1])) |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2084 ++p; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2085 } |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2086 if (**pp == '-') |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2087 { |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2088 if (retval == LONG_MAX) |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2089 retval = LONG_MIN; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2090 else |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2091 retval = -retval; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2092 } |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2093 *pp = p; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2094 return retval; |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2095 } |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2096 |
|
227543e4181f
patch 8.2.3694: cannot use quotes in the count of an Ex command
Bram Moolenaar <Bram@vim.org>
parents:
25978
diff
changeset
|
2097 /* |
| 7 | 2098 * Return TRUE if "lbuf" is empty or only contains blanks. |
| 2099 */ | |
| 2100 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2101 vim_isblankline(char_u *lbuf) |
| 7 | 2102 { |
| 2103 char_u *p; | |
| 2104 | |
| 2105 p = skipwhite(lbuf); | |
| 2106 return (*p == NUL || *p == '\r' || *p == '\n'); | |
| 2107 } | |
| 2108 | |
| 2109 /* | |
| 2110 * Convert a string into a long and/or unsigned long, taking care of | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2111 * hexadecimal, octal, and binary numbers. Accepts a '-' sign. |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2112 * If "prep" is not NULL, returns a flag to indicate the type of the number: |
| 7 | 2113 * 0 decimal |
| 2114 * '0' octal | |
|
20665
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2115 * 'O' octal |
|
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2116 * 'o' octal |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2117 * 'B' bin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2118 * 'b' bin |
| 7 | 2119 * 'X' hex |
| 2120 * 'x' hex | |
| 2121 * If "len" is not NULL, the length of the number in characters is returned. | |
| 2122 * If "nptr" is not NULL, the signed result is returned in it. | |
| 2123 * If "unptr" is not NULL, the unsigned result is returned in it. | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2124 * If "what" contains STR2NR_BIN recognize binary numbers |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2125 * If "what" contains STR2NR_OCT recognize octal numbers |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2126 * If "what" contains STR2NR_HEX recognize hex numbers |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2127 * If "what" contains STR2NR_FORCE always assume bin/oct/hex. |
|
18082
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2128 * If "what" contains STR2NR_QUOTE ignore embedded single quotes |
|
12704
ee5f3f5d3c55
patch 8.0.1230: CTRL-A in Visual mode uses character after selection
Christian Brabandt <cb@256bit.org>
parents:
12702
diff
changeset
|
2129 * If maxlen > 0, check at a maximum maxlen chars. |
|
16706
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2130 * If strict is TRUE, check the number strictly. return *len = 0 if fail. |
| 7 | 2131 */ |
| 2132 void | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2133 vim_str2nr( |
|
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2134 char_u *start, |
|
16706
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2135 int *prep, // return: type of number 0 = decimal, 'x' |
|
20665
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2136 // or 'X' is hex, '0', 'o' or 'O' is octal, |
|
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2137 // 'b' or 'B' is bin |
|
16706
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2138 int *len, // return: detected length of number |
|
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2139 int what, // what numbers to recognize |
|
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2140 varnumber_T *nptr, // return: signed result |
|
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2141 uvarnumber_T *unptr, // return: unsigned result |
|
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2142 int maxlen, // max length of string to check |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2143 int strict, // check strictly |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2144 int *overflow) // when not NULL set to TRUE for overflow |
| 7 | 2145 { |
| 2146 char_u *ptr = start; | |
|
16706
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2147 int pre = 0; // default is decimal |
| 7 | 2148 int negative = FALSE; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
2149 uvarnumber_T un = 0; |
| 39 | 2150 int n; |
| 7 | 2151 |
|
16706
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2152 if (len != NULL) |
|
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2153 *len = 0; |
|
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2154 |
| 7 | 2155 if (ptr[0] == '-') |
| 2156 { | |
| 2157 negative = TRUE; | |
| 2158 ++ptr; | |
| 2159 } | |
| 2160 | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2161 // Recognize hex, octal, and bin. |
| 6927 | 2162 if (ptr[0] == '0' && ptr[1] != '8' && ptr[1] != '9' |
| 2163 && (maxlen == 0 || maxlen > 1)) | |
| 7 | 2164 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2165 pre = ptr[1]; |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2166 if ((what & STR2NR_HEX) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2167 && (pre == 'X' || pre == 'x') && vim_isxdigit(ptr[2]) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2168 && (maxlen == 0 || maxlen > 2)) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2169 // hexadecimal |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2170 ptr += 2; |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2171 else if ((what & STR2NR_BIN) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2172 && (pre == 'B' || pre == 'b') && vim_isbdigit(ptr[2]) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2173 && (maxlen == 0 || maxlen > 2)) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2174 // binary |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2175 ptr += 2; |
|
20665
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2176 else if ((what & STR2NR_OOCT) |
|
23533
ee43d943c3bb
patch 8.2.2309: 0o777 not recognized as octal
Bram Moolenaar <Bram@vim.org>
parents:
20782
diff
changeset
|
2177 && (pre == 'O' || pre == 'o') && vim_isodigit(ptr[2]) |
|
20665
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2178 && (maxlen == 0 || maxlen > 2)) |
|
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2179 // octal with prefix "0o" |
|
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2180 ptr += 2; |
| 7 | 2181 else |
| 2182 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2183 // decimal or octal, default is decimal |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2184 pre = 0; |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2185 if (what & STR2NR_OCT) |
| 39 | 2186 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2187 // Don't interpret "0", "08" or "0129" as octal. |
|
12704
ee5f3f5d3c55
patch 8.0.1230: CTRL-A in Visual mode uses character after selection
Christian Brabandt <cb@256bit.org>
parents:
12702
diff
changeset
|
2188 for (n = 1; n != maxlen && VIM_ISDIGIT(ptr[n]); ++n) |
| 39 | 2189 { |
| 2190 if (ptr[n] > '7') | |
| 2191 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2192 pre = 0; // can't be octal |
| 39 | 2193 break; |
| 2194 } | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2195 pre = '0'; // assume octal |
| 39 | 2196 } |
| 2197 } | |
| 7 | 2198 } |
| 2199 } | |
| 2200 | |
|
16706
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2201 // Do the conversion manually to avoid sscanf() quirks. |
| 6927 | 2202 n = 1; |
|
18082
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2203 if (pre == 'B' || pre == 'b' |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2204 || ((what & STR2NR_BIN) && (what & STR2NR_FORCE))) |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2205 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2206 // bin |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2207 if (pre != 0) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2208 n += 2; // skip over "0b" |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2209 while ('0' <= *ptr && *ptr <= '1') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2210 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2211 // avoid ubsan error for overflow |
|
14061
47b2db8a5709
patch 8.1.0048: vim_str2nr() does not handle numbers close to the maximum
Christian Brabandt <cb@256bit.org>
parents:
13786
diff
changeset
|
2212 if (un <= UVARNUM_MAX / 2) |
|
47b2db8a5709
patch 8.1.0048: vim_str2nr() does not handle numbers close to the maximum
Christian Brabandt <cb@256bit.org>
parents:
13786
diff
changeset
|
2213 un = 2 * un + (uvarnumber_T)(*ptr - '0'); |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2214 else |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2215 { |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2216 un = UVARNUM_MAX; |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2217 if (overflow != NULL) |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2218 *overflow = TRUE; |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2219 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2220 ++ptr; |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2221 if (n++ == maxlen) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2222 break; |
|
18082
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2223 if ((what & STR2NR_QUOTE) && *ptr == '\'' |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2224 && '0' <= ptr[1] && ptr[1] <= '1') |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2225 { |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2226 ++ptr; |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2227 if (n++ == maxlen) |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2228 break; |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2229 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2230 } |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2231 } |
|
20665
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2232 else if (pre == 'O' || pre == 'o' || |
|
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2233 pre == '0' || ((what & STR2NR_OCT) && (what & STR2NR_FORCE))) |
| 7 | 2234 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2235 // octal |
|
20665
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2236 if (pre != 0 && pre != '0') |
|
6ff992bf4c82
patch 8.2.0886: cannot use octal numbers in scriptversion 4
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
2237 n += 2; // skip over "0o" |
| 293 | 2238 while ('0' <= *ptr && *ptr <= '7') |
| 7 | 2239 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2240 // avoid ubsan error for overflow |
|
14061
47b2db8a5709
patch 8.1.0048: vim_str2nr() does not handle numbers close to the maximum
Christian Brabandt <cb@256bit.org>
parents:
13786
diff
changeset
|
2241 if (un <= UVARNUM_MAX / 8) |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2242 un = 8 * un + (uvarnumber_T)(*ptr - '0'); |
|
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2243 else |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2244 { |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2245 un = UVARNUM_MAX; |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2246 if (overflow != NULL) |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2247 *overflow = TRUE; |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2248 } |
| 293 | 2249 ++ptr; |
| 6927 | 2250 if (n++ == maxlen) |
| 2251 break; | |
|
18082
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2252 if ((what & STR2NR_QUOTE) && *ptr == '\'' |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2253 && '0' <= ptr[1] && ptr[1] <= '7') |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2254 { |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2255 ++ptr; |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2256 if (n++ == maxlen) |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2257 break; |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2258 } |
| 7 | 2259 } |
| 293 | 2260 } |
|
18082
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2261 else if (pre != 0 || ((what & STR2NR_HEX) && (what & STR2NR_FORCE))) |
| 293 | 2262 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2263 // hex |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2264 if (pre != 0) |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2265 n += 2; // skip over "0x" |
| 293 | 2266 while (vim_isxdigit(*ptr)) |
| 7 | 2267 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2268 // avoid ubsan error for overflow |
|
14061
47b2db8a5709
patch 8.1.0048: vim_str2nr() does not handle numbers close to the maximum
Christian Brabandt <cb@256bit.org>
parents:
13786
diff
changeset
|
2269 if (un <= UVARNUM_MAX / 16) |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2270 un = 16 * un + (uvarnumber_T)hex2nr(*ptr); |
|
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2271 else |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2272 { |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2273 un = UVARNUM_MAX; |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2274 if (overflow != NULL) |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2275 *overflow = TRUE; |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2276 } |
| 293 | 2277 ++ptr; |
| 6927 | 2278 if (n++ == maxlen) |
| 2279 break; | |
|
18082
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2280 if ((what & STR2NR_QUOTE) && *ptr == '\'' && vim_isxdigit(ptr[1])) |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2281 { |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2282 ++ptr; |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2283 if (n++ == maxlen) |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2284 break; |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2285 } |
| 7 | 2286 } |
| 2287 } | |
| 2288 else | |
| 2289 { | |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2290 // decimal |
| 7 | 2291 while (VIM_ISDIGIT(*ptr)) |
| 2292 { | |
|
14061
47b2db8a5709
patch 8.1.0048: vim_str2nr() does not handle numbers close to the maximum
Christian Brabandt <cb@256bit.org>
parents:
13786
diff
changeset
|
2293 uvarnumber_T digit = (uvarnumber_T)(*ptr - '0'); |
|
47b2db8a5709
patch 8.1.0048: vim_str2nr() does not handle numbers close to the maximum
Christian Brabandt <cb@256bit.org>
parents:
13786
diff
changeset
|
2294 |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2295 // avoid ubsan error for overflow |
|
14061
47b2db8a5709
patch 8.1.0048: vim_str2nr() does not handle numbers close to the maximum
Christian Brabandt <cb@256bit.org>
parents:
13786
diff
changeset
|
2296 if (un < UVARNUM_MAX / 10 |
|
47b2db8a5709
patch 8.1.0048: vim_str2nr() does not handle numbers close to the maximum
Christian Brabandt <cb@256bit.org>
parents:
13786
diff
changeset
|
2297 || (un == UVARNUM_MAX / 10 && digit <= UVARNUM_MAX % 10)) |
|
47b2db8a5709
patch 8.1.0048: vim_str2nr() does not handle numbers close to the maximum
Christian Brabandt <cb@256bit.org>
parents:
13786
diff
changeset
|
2298 un = 10 * un + digit; |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2299 else |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2300 { |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2301 un = UVARNUM_MAX; |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2302 if (overflow != NULL) |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2303 *overflow = TRUE; |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2304 } |
| 7 | 2305 ++ptr; |
| 6927 | 2306 if (n++ == maxlen) |
| 2307 break; | |
|
18082
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2308 if ((what & STR2NR_QUOTE) && *ptr == '\'' && VIM_ISDIGIT(ptr[1])) |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2309 { |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2310 ++ptr; |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2311 if (n++ == maxlen) |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2312 break; |
|
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2313 } |
| 7 | 2314 } |
| 2315 } | |
|
18082
1c7a91cf2356
patch 8.1.2036: the str2nr() tests fail
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
2316 |
|
19195
2ef19eed524a
patch 8.2.0156: various typos in source files and tests
Bram Moolenaar <Bram@vim.org>
parents:
18757
diff
changeset
|
2317 // Check for an alphanumeric character immediately following, that is |
|
16706
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2318 // most likely a typo. |
|
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2319 if (strict && n - 1 != maxlen && ASCII_ISALNUM(*ptr)) |
|
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2320 return; |
| 7 | 2321 |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2322 if (prep != NULL) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7072
diff
changeset
|
2323 *prep = pre; |
| 7 | 2324 if (len != NULL) |
| 2325 *len = (int)(ptr - start); | |
| 2326 if (nptr != NULL) | |
| 16 | 2327 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2328 if (negative) // account for leading '-' for decimal numbers |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2329 { |
|
18757
c469e1930456
patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
2330 // avoid ubsan error for overflow |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2331 if (un > VARNUM_MAX) |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2332 { |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2333 *nptr = VARNUM_MIN; |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2334 if (overflow != NULL) |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2335 *overflow = TRUE; |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2336 } |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2337 else |
|
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2338 *nptr = -(varnumber_T)un; |
|
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2339 } |
| 16 | 2340 else |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2341 { |
|
30986
360f286b5869
patch 9.0.0828: various typos
Bram Moolenaar <Bram@vim.org>
parents:
30833
diff
changeset
|
2342 // prevent a large unsigned number to become negative |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2343 if (un > VARNUM_MAX) |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2344 { |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2345 un = VARNUM_MAX; |
|
32098
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2346 if (overflow != NULL) |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2347 *overflow = TRUE; |
|
39f4126d2a0d
patch 9.0.1380: CTRL-X on 2**64 subtracts two
Bram Moolenaar <Bram@vim.org>
parents:
32009
diff
changeset
|
2348 } |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
2349 *nptr = (varnumber_T)un; |
|
10658
77d66e9ac0ab
patch 8.0.0219: ubsan reports errors for overflow
Christian Brabandt <cb@256bit.org>
parents:
10549
diff
changeset
|
2350 } |
| 16 | 2351 } |
| 7 | 2352 if (unptr != NULL) |
| 2353 *unptr = un; | |
| 2354 } | |
| 2355 | |
| 2356 /* | |
| 2357 * Return the value of a single hex character. | |
| 2358 * Only valid when the argument is '0' - '9', 'A' - 'F' or 'a' - 'f'. | |
| 2359 */ | |
| 2360 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2361 hex2nr(int c) |
| 7 | 2362 { |
| 2363 if (c >= 'a' && c <= 'f') | |
| 2364 return c - 'a' + 10; | |
| 2365 if (c >= 'A' && c <= 'F') | |
| 2366 return c - 'A' + 10; | |
| 2367 return c - '0'; | |
| 2368 } | |
| 2369 | |
| 2370 /* | |
| 2371 * Convert two hex characters to a byte. | |
| 2372 * Return -1 if one of the characters is not hex. | |
| 2373 */ | |
| 2374 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2375 hexhex2nr(char_u *p) |
| 7 | 2376 { |
| 2377 if (!vim_isxdigit(p[0]) || !vim_isxdigit(p[1])) | |
| 2378 return -1; | |
| 2379 return (hex2nr(p[0]) << 4) + hex2nr(p[1]); | |
| 2380 } | |
| 2381 | |
| 2382 /* | |
| 2383 * Return TRUE if "str" starts with a backslash that should be removed. | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
2384 * For MS-DOS, MSWIN and OS/2 this is only done when the character after the |
| 7 | 2385 * backslash is not a normal file name character. |
| 2386 * '$' is a valid file name character, we don't remove the backslash before | |
| 2387 * it. This means it is not possible to use an environment variable after a | |
| 2388 * backslash. "C:\$VIM\doc" is taken literally, only "$VIM\doc" works. | |
| 2389 * Although "\ name" is valid, the backslash in "Program\ files" must be | |
| 2390 * removed. Assume a file name doesn't start with a space. | |
| 2391 * For multi-byte names, never remove a backslash before a non-ascii | |
| 2392 * character, assume that all multi-byte characters are valid file name | |
| 2393 * characters. | |
| 2394 */ | |
| 2395 int | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2396 rem_backslash(char_u *str) |
| 7 | 2397 { |
| 2398 #ifdef BACKSLASH_IN_FILENAME | |
| 2399 return (str[0] == '\\' | |
| 2400 && str[1] < 0x80 | |
| 2401 && (str[1] == ' ' | |
| 2402 || (str[1] != NUL | |
| 2403 && str[1] != '*' | |
| 2404 && str[1] != '?' | |
| 2405 && !vim_isfilec(str[1])))); | |
| 2406 #else | |
| 2407 return (str[0] == '\\' && str[1] != NUL); | |
| 2408 #endif | |
| 2409 } | |
| 2410 | |
| 2411 /* | |
| 2412 * Halve the number of backslashes in a file name argument. | |
| 2413 * For MS-DOS we only do this if the character after the backslash | |
| 2414 * is not a normal file character. | |
| 2415 */ | |
| 2416 void | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2417 backslash_halve(char_u *p) |
| 7 | 2418 { |
| 2419 for ( ; *p; ++p) | |
| 2420 if (rem_backslash(p)) | |
| 1621 | 2421 STRMOVE(p, p + 1); |
| 7 | 2422 } |
| 2423 | |
| 2424 /* | |
| 2425 * backslash_halve() plus save the result in allocated memory. | |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17789
diff
changeset
|
2426 * However, returns "p" when out of memory. |
| 7 | 2427 */ |
| 2428 char_u * | |
|
7817
83861277e6a3
commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents:
7799
diff
changeset
|
2429 backslash_halve_save(char_u *p) |
| 7 | 2430 { |
| 2431 char_u *res; | |
| 2432 | |
| 2433 res = vim_strsave(p); | |
| 2434 if (res == NULL) | |
| 2435 return p; | |
| 2436 backslash_halve(res); | |
| 2437 return res; | |
| 2438 } |