Mercurial > vim
view src/vimrun.c @ 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 | 2559dc02bd64 |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * this file by Vince Negri * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. * See README.txt for an overview of the Vim source code. */ /* * vimrun.c - Tiny Win32 program to safely run an external command in a * DOS console. * This program is required to avoid that typing CTRL-C in the DOS * console kills Vim. Now it only kills vimrun. */ #include <stdio.h> #include <stdlib.h> #include <conio.h> #ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif #include <windows.h> int main(void) { const wchar_t *p; wchar_t *cmd; size_t cmdlen; int retval; int inquote = 0; int silent = 0; HANDLE hstdout; DWORD written; p = (const wchar_t *)GetCommandLineW(); /* * Skip the executable name, which might be in "". */ while (*p) { if (*p == L'"') inquote = !inquote; else if (!inquote && *p == L' ') { ++p; break; } ++p; } while (*p == L' ') ++p; /* * "-s" argument: don't wait for a key hit. */ if (p[0] == L'-' && p[1] == L's' && p[2] == L' ') { silent = 1; p += 3; while (*p == L' ') ++p; } // Print the command, including quotes and redirection. hstdout = GetStdHandle(STD_OUTPUT_HANDLE); WriteConsoleW(hstdout, p, wcslen(p), &written, NULL); WriteConsoleW(hstdout, L"\r\n", 2, &written, NULL); // If the command starts and ends with double quotes, // Enclose the command in parentheses. cmd = NULL; cmdlen = wcslen(p); if (cmdlen >= 2 && p[0] == L'"' && p[cmdlen - 1] == L'"') { cmdlen += 3; cmd = malloc(cmdlen * sizeof(wchar_t)); if (cmd == NULL) { perror("vimrun malloc(): "); return -1; } _snwprintf(cmd, cmdlen, L"(%s)", p); p = cmd; } /* * Do it! */ retval = _wsystem(p); if (cmd) free(cmd); if (retval == -1) perror("vimrun system(): "); else if (retval != 0) printf("shell returned %d\n", retval); if (!silent) { puts("Hit any key to close this window..."); while (_kbhit()) (void)_getch(); (void)_getch(); } return retval; }