To: vim_dev@googlegroups.com Subject: Patch 8.1.2085 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2085 Problem: MS-Windows: draw error moving cursor over double-cell character. Solution: Move the cursor to the left edge if needed. (Nobuhiro Takasaki, closes #4986) Files: src/os_win32.c *** ../vim-8.1.2084/src/os_win32.c 2019-09-21 23:09:00.979830687 +0200 --- src/os_win32.c 2019-09-27 14:13:52.261612976 +0200 *************** *** 5831,5837 **** /* ! * Set the cursor position */ static void gotoxy( --- 5831,5837 ---- /* ! * Set the cursor position to (x,y) (1-based). */ static void gotoxy( *************** *** 5841,5854 **** if (x < 1 || x > (unsigned)Columns || y < 1 || y > (unsigned)Rows) return; - /* external cursor coords are 1-based; internal are 0-based */ - g_coord.X = x - 1; - g_coord.Y = y - 1; - if (!USE_VTP) SetConsoleCursorPosition(g_hConOut, g_coord); else vtp_printf("\033[%d;%dH", y, x); } --- 5841,5865 ---- if (x < 1 || x > (unsigned)Columns || y < 1 || y > (unsigned)Rows) return; if (!USE_VTP) + { + // external cursor coords are 1-based; internal are 0-based + g_coord.X = x - 1; + g_coord.Y = y - 1; SetConsoleCursorPosition(g_hConOut, g_coord); + } else + { + // Move the cursor to the left edge of the screen to prevent screen + // destruction. Insider build bug. + if (conpty_type == 3) + vtp_printf("\033[%d;%dH", g_coord.Y + 1, 1); + vtp_printf("\033[%d;%dH", y, x); + + g_coord.X = x - 1; + g_coord.Y = y - 1; + } } *************** *** 7266,7272 **** * Confirm until this version. Also the logic changes. * insider preview. */ ! #define CONPTY_INSIDER_BUILD MAKE_VER(10, 0, 18898) /* * Not stable now. --- 7277,7283 ---- * Confirm until this version. Also the logic changes. * insider preview. */ ! #define CONPTY_INSIDER_BUILD MAKE_VER(10, 0, 18990) /* * Not stable now. *** ../vim-8.1.2084/src/version.c 2019-09-27 13:38:52.782752934 +0200 --- src/version.c 2019-09-27 14:14:03.577562089 +0200 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 2085, /**/ -- CUSTOMER: Well, can you hang around a couple of minutes? He won't be long. MORTICIAN: Naaah, I got to go on to Robinson's -- they've lost nine today. CUSTOMER: Well, when is your next round? MORTICIAN: Thursday. DEAD PERSON: I think I'll go for a walk. The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///