From 397be5d3805baf3df4e43c0b506986651b54dcbc Mon Sep 17 00:00:00 2001
From: erw7 <erw7.github@gmail.com>
Date: Sat, 12 Sep 2020 11:38:49 -0700
Subject: UI: fix cursor not displayed after hiding and un-hiding #12811

- TUI: Fix a case where the cursor was not displayed after hiding the
  cursor and then setting it to be displayed again.
- Change to reset everything before setting guicursor.

fixes #12800
close #12811

Steps to reproduce:

    nvim -u NORC
    :set termguicolors
    :hi nCursor guifg=red guibg=red
    :hi iCursor guifg=green guibg=green
    :hi cCursor guifg=blue guibg=blue
    :set guicursor=n:block-nCursor,i:hor25-iCursor,c:ver25-cCursor
    :set guicursor-=c:ver25-cCursor

Actual behaviour: Cursor is a blue vertical.
Expected behaviour: Cursor should be the default color block.
---
 src/nvim/cursor_shape.c | 41 +++++++++++++++++++++++++++++------------
 src/nvim/tui/tui.c      |  1 +
 2 files changed, 30 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index 3f06340611..0d21080aa5 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -13,6 +13,10 @@
 #include "nvim/api/private/helpers.h"
 #include "nvim/ui.h"
 
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "cursor_shape.c.generated.h"
+#endif
+
 /// Handling of cursor and mouse pointer shapes in various modes.
 cursorentry_T shape_table[SHAPE_IDX_COUNT] =
 {
@@ -77,7 +81,9 @@ Array mode_style_array(void)
   return all;
 }
 
-/// Parse the 'guicursor' option
+/// Parses the 'guicursor' option.
+///
+/// Clears `shape_table` if 'guicursor' is empty.
 ///
 /// @param what SHAPE_CURSOR or SHAPE_MOUSE ('mouseshape')
 ///
@@ -99,11 +105,17 @@ char_u *parse_shape_opt(int what)
 
   // First round: check for errors; second round: do it for real.
   for (round = 1; round <= 2; round++) {
+    if (round == 2 || *p_guicursor == NUL) {
+      // Set all entries to default (block, blinkon0, default color).
+      // This is the default for anything that is not set.
+      clear_shape_table();
+      if (*p_guicursor == NUL) {
+        ui_mode_info_set();
+        return NULL;
+      }
+    }
     // Repeat for all comma separated parts.
     modep = p_guicursor;
-    if (*p_guicursor == NUL) {
-      modep = (char_u *)"a:block-blinkon0";
-    }
     while (modep != NULL && *modep != NUL) {
       colonp = vim_strchr(modep, ':');
       commap = vim_strchr(modep, ',');
@@ -144,14 +156,6 @@ char_u *parse_shape_opt(int what)
 
         if (all_idx >= 0) {
           idx = all_idx--;
-        } else if (round == 2) {
-          {
-            // Set the defaults, for the missing parts
-            shape_table[idx].shape = SHAPE_BLOCK;
-            shape_table[idx].blinkwait = 0L;
-            shape_table[idx].blinkon = 0L;
-            shape_table[idx].blinkoff = 0L;
-          }
         }
 
         /* Parse the part after the colon */
@@ -330,3 +334,16 @@ int cursor_get_mode_idx(void)
     return SHAPE_IDX_N;
   }
 }
+
+/// Clears all entries in shape_table to block, blinkon0, and default color.
+static void clear_shape_table(void)
+{
+  for (int idx = 0; idx < SHAPE_IDX_COUNT; idx++) {
+    shape_table[idx].shape = SHAPE_BLOCK;
+    shape_table[idx].blinkwait = 0L;
+    shape_table[idx].blinkon = 0L;
+    shape_table[idx].blinkoff = 0L;
+    shape_table[idx].id = 0;
+    shape_table[idx].id_lm = 0;
+  }
+}
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index dde17726fd..2ef9bf5a2e 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -1083,6 +1083,7 @@ static void tui_set_mode(UI *ui, ModeShape mode)
     }
   } else if (c.id == 0) {
     // No cursor color for this mode; reset to default.
+    data->want_invisible = false;
     unibi_out_ext(ui, data->unibi_ext.reset_cursor_color);
   }
 
-- 
cgit