Mercurial > vim
annotate src/ascii.h @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Mar 2024 12:15:03 +0100 |
| parents | fb4c30606b4a |
| children |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
6901
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 */ | |
| 8 | |
| 9 /* | |
| 10 * Definitions of various common control characters. | |
| 11 */ | |
| 12 | |
| 13 #define CharOrd(x) ((x) < 'a' ? (x) - 'A' : (x) - 'a') | |
| 14 #define CharOrdLow(x) ((x) - 'a') | |
| 15 #define CharOrdUp(x) ((x) - 'A') | |
| 16 #define ROT13(c, a) (((((c) - (a)) + 13) % 26) + (a)) | |
| 17 | |
| 18 #define NUL '\000' | |
| 19 #define BELL '\007' | |
| 20 #define BS '\010' | |
| 21 #define TAB '\011' | |
| 22 #define NL '\012' | |
| 23 #define NL_STR (char_u *)"\012" | |
| 24 #define FF '\014' | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
25 #define CAR '\015' // CR is used by Mac OS X |
| 7 | 26 #define ESC '\033' |
| 27 #define ESC_STR (char_u *)"\033" | |
| 28 #define ESC_STR_nc "\033" | |
| 29 #define DEL 0x7f | |
| 30 #define DEL_STR (char_u *)"\177" | |
| 31 | |
| 32 #define POUND 0xA3 | |
| 33 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
34 #define Ctrl_chr(x) (TOUPPER_ASC(x) ^ 0x40) // '?' -> DEL, '@' -> ^@, etc. |
| 7 | 35 #define Meta(x) ((x) | 0x80) |
| 36 | |
| 37 #define CTRL_F_STR "\006" | |
| 38 #define CTRL_H_STR "\010" | |
| 39 #define CTRL_V_STR "\026" | |
| 40 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
41 #define Ctrl_AT 0 // @ |
| 7 | 42 #define Ctrl_A 1 |
| 43 #define Ctrl_B 2 | |
| 44 #define Ctrl_C 3 | |
| 45 #define Ctrl_D 4 | |
| 46 #define Ctrl_E 5 | |
| 47 #define Ctrl_F 6 | |
| 48 #define Ctrl_G 7 | |
| 49 #define Ctrl_H 8 | |
| 50 #define Ctrl_I 9 | |
| 51 #define Ctrl_J 10 | |
| 52 #define Ctrl_K 11 | |
| 53 #define Ctrl_L 12 | |
| 54 #define Ctrl_M 13 | |
| 55 #define Ctrl_N 14 | |
| 56 #define Ctrl_O 15 | |
| 57 #define Ctrl_P 16 | |
| 58 #define Ctrl_Q 17 | |
| 59 #define Ctrl_R 18 | |
| 60 #define Ctrl_S 19 | |
| 61 #define Ctrl_T 20 | |
| 62 #define Ctrl_U 21 | |
| 63 #define Ctrl_V 22 | |
| 64 #define Ctrl_W 23 | |
| 65 #define Ctrl_X 24 | |
| 66 #define Ctrl_Y 25 | |
| 67 #define Ctrl_Z 26 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
68 // CTRL- [ Left Square Bracket == ESC |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
69 #define Ctrl_BSL 28 // \ BackSLash |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
70 #define Ctrl_RSB 29 // ] Right Square Bracket |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
71 #define Ctrl_HAT 30 // ^ |
| 7 | 72 #define Ctrl__ 31 |
| 73 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
74 #define CSI 0x9b // Control Sequence Introducer |
| 6901 | 75 #define CSI_STR "\233" |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
76 #define DCS 0x90 // Device Control String |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
77 #define OSC 0x9d // Operating System Command |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
78 #define STERM 0x9c // String Terminator |
| 6901 | 79 |
| 7 | 80 /* |
| 81 * Character that separates dir names in a path. | |
| 82 * For MS-DOS, WIN32 and OS/2 we use a backslash. A slash mostly works | |
| 83 * fine, but there are places where it doesn't (e.g. in a command name). | |
| 84 * For Acorn we use a dot. | |
| 85 */ | |
| 86 #ifdef BACKSLASH_IN_FILENAME | |
| 87 # define PATHSEP psepc | |
| 88 # define PATHSEPSTR pseps | |
| 89 #else | |
| 2823 | 90 # define PATHSEP '/' |
| 91 # define PATHSEPSTR "/" | |
| 7 | 92 #endif |