2 files changed, 16 insertions, 11 deletions

diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index c0d588f4ef..2ae4558f3d 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -187,14 +187,20 @@ size_t input_enqueue(String keys)
     unsigned int new_size = trans_special((uint8_t **)&ptr, buf, false);
 
     if (!new_size) {
+      if (*ptr == '<') {
+        // Invalid key sequence, skip until the next '>' or until *end
+        do {
+          ptr++;
+        } while (ptr < end && *ptr != '>');
+        ptr++;
+        continue;
+      }
       // copy the character unmodified
       *buf = (uint8_t)*ptr++;
       new_size = 1;
     }
 
     new_size = handle_mouse_event(&ptr, buf, new_size);
-    // TODO(tarruda): Don't produce past unclosed '<' characters, except if
-    // there's a lot of characters after the '<'
     rbuffer_write(input_buffer, (char *)buf, new_size);
   }
 
@@ -217,7 +223,8 @@ static unsigned int handle_mouse_event(char **ptr, uint8_t *buf,
     mouse_code = buf[5];
   }
 
-  if (mouse_code < KE_LEFTMOUSE || mouse_code > KE_RIGHTRELEASE) {
+  if (!((mouse_code >= KE_LEFTMOUSE && mouse_code <= KE_RIGHTRELEASE)
+        || (mouse_code >= KE_MOUSEDOWN && mouse_code <= KE_MOUSERIGHT))) {
     return bufsize;
   }
 
@@ -226,7 +233,7 @@ static unsigned int handle_mouse_event(char **ptr, uint8_t *buf,
   // find mouse coordinates, and it would be too expensive to refactor this
   // now.
   int col, row, advance;
-  if (sscanf(*ptr, "<%d,%d>%n", &col, &row, &advance)) {
+  if (sscanf(*ptr, "<%d,%d>%n", &col, &row, &advance) != EOF && advance) {
     if (col >= 0 && row >= 0) {
       mouse_row = row;
       mouse_col = col;
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index d0f8442768..d481d6af56 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -24,7 +24,6 @@
 #include "nvim/option_defs.h"
 #include "nvim/charset.h"
 #include "nvim/strings.h"
-#include "nvim/ui.h"
 
 #define DYNAMIC_BUFFER_INIT {NULL, 0, 0}
 
@@ -414,6 +413,7 @@ static size_t write_output(char *output, size_t remaining, bool to_buffer,
 
   char *start = output;
   size_t off = 0;
+  int lastrow = (int)Rows - 1;
   while (off < remaining) {
     if (output[off] == NL) {
       // Insert the line
@@ -421,10 +421,8 @@ static size_t write_output(char *output, size_t remaining, bool to_buffer,
       if (to_buffer) {
         ml_append(curwin->w_cursor.lnum++, (char_u *)output, 0, false);
       } else {
-        // pending data from the output buffer has been flushed to the screen,
-        // safe to call ui_write directly
-        ui_write((char_u *)output, (int)off);
-        ui_write((char_u *)"\r\n", 2);
+        screen_del_lines(0, 0, 1, (int)Rows, true, NULL);
+        screen_puts_len((char_u *)output, (int)off, lastrow, 0, 0);
       }
       size_t skip = off + 1;
       output += skip;
@@ -448,8 +446,8 @@ static size_t write_output(char *output, size_t remaining, bool to_buffer,
         // remember that the NL was missing
         curbuf->b_no_eol_lnum = curwin->w_cursor.lnum;
       } else {
-        ui_write((char_u *)output, (int)remaining);
-        ui_write((char_u *)"\r\n", 2);
+        screen_del_lines(0, 0, 1, (int)Rows, true, NULL);
+        screen_puts_len((char_u *)output, (int)remaining, lastrow, 0, 0);
       }
       output += remaining;
     } else if (to_buffer) {