From 9b1fdb291ee8e940311a51cf41f97b07930b4688 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 5 Oct 2021 12:46:02 +0000
Subject: Separate "very visible" flag from blinking flag, it should not affect
 DECSCUSR. GitHub issue 2891.

---
 screen.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'screen.c')

diff --git a/screen.c b/screen.c
index dcbae278..4c13b693 100644
--- a/screen.c
+++ b/screen.c
@@ -163,27 +163,27 @@ screen_set_cursor_style(struct screen *s, u_int style)
 		break;
 	case 1:
 		s->cstyle = SCREEN_CURSOR_BLOCK;
-		s->mode |= MODE_BLINKING;
+		s->mode |= MODE_CURSOR_BLINKING;
 		break;
 	case 2:
 		s->cstyle = SCREEN_CURSOR_BLOCK;
-		s->mode &= ~MODE_BLINKING;
+		s->mode &= ~MODE_CURSOR_BLINKING;
 		break;
 	case 3:
 		s->cstyle = SCREEN_CURSOR_UNDERLINE;
-		s->mode |= MODE_BLINKING;
+		s->mode |= MODE_CURSOR_BLINKING;
 		break;
 	case 4:
 		s->cstyle = SCREEN_CURSOR_UNDERLINE;
-		s->mode &= ~MODE_BLINKING;
+		s->mode &= ~MODE_CURSOR_BLINKING;
 		break;
 	case 5:
 		s->cstyle = SCREEN_CURSOR_BAR;
-		s->mode |= MODE_BLINKING;
+		s->mode |= MODE_CURSOR_BLINKING;
 		break;
 	case 6:
 		s->cstyle = SCREEN_CURSOR_BAR;
-		s->mode &= ~MODE_BLINKING;
+		s->mode &= ~MODE_CURSOR_BLINKING;
 		break;
 	}
 }
@@ -680,8 +680,10 @@ screen_mode_to_string(int mode)
 		strlcat(tmp, "MOUSE_STANDARD,", sizeof tmp);
 	if (mode & MODE_MOUSE_BUTTON)
 		strlcat(tmp, "MOUSE_BUTTON,", sizeof tmp);
-	if (mode & MODE_BLINKING)
-		strlcat(tmp, "BLINKING,", sizeof tmp);
+	if (mode & MODE_CURSOR_BLINKING)
+		strlcat(tmp, "CURSOR_BLINKING,", sizeof tmp);
+	if (mode & MODE_CURSOR_VERY_VISIBLE)
+		strlcat(tmp, "CURSOR_VERY_VISIBLE,", sizeof tmp);
 	if (mode & MODE_MOUSE_UTF8)
 		strlcat(tmp, "UTF8,", sizeof tmp);
 	if (mode & MODE_MOUSE_SGR)
-- 
cgit v1.2.3