patch 8.2.4400: MS-Windows: cannot use the mouse in the console with VIMDLL

Problem:    MS-Windows: cannot use the mouse in the console with VIMDLL.
Solution:   use add_char2buf() instead of fix_input_buffer(). (closes #9784,
            closes #9769)

diff --git a/src/getchar.c b/src/getchar.c
index 8513679de810b087ff48d1931845560f14f1b3e9..7a1ef8c915de4667547a7c82daf551aee8854f99 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1138,18 +1138,9 @@ ins_char_typebuf(int c, int modifier)
     }
     else
     {
-       char_u  *p = buf + len;
-       int     char_len = (*mb_char2bytes)(c, p);
-#ifdef FEAT_GUI
-       int     save_gui_in_use = gui.in_use;
-
-       gui.in_use = FALSE;
-#endif
-       // if the character contains CSI or K_SPECIAL bytes they need escaping
-       len += fix_input_buffer(p, char_len);
-#ifdef FEAT_GUI
-       gui.in_use = save_gui_in_use;
-#endif
+       char_u *end = add_char2buf(c, buf + len);
+       *end = NUL;
+       len = end - buf;
     }
     (void)ins_typebuf(buf, KeyNoremap, 0, !KeyTyped, cmd_silent);
     return len;
@@ -3671,7 +3662,9 @@ fix_input_buffer(char_u *buf, int len)
            p += 2;
            i -= 2;
        }
-       // When the GUI is not used CSI needs to be escaped.
+# ifndef MSWIN
+       // When not on MS-Windows and the GUI is not used CSI needs to be
+       // escaped.
        else if (!gui.in_use && p[0] == CSI)
        {
            mch_memmove(p + 3, p + 1, (size_t)i);
@@ -3680,6 +3673,7 @@ fix_input_buffer(char_u *buf, int len)
            *p = (int)KE_CSI;
            len += 2;
        }
+# endif
        else
 #endif
        if (p[0] == NUL || (p[0] == K_SPECIAL

diff --git a/src/version.c b/src/version.c
index 4f17acffd4c0c51ab7e6311882d79ba66a2f49e1..abee2ffde53e35b273f4768ab27414cfab687a27 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4400,
 /**/
     4399,
 /**/