diff options
author | Thomas Adam <thomas@xteddy.org> | 2021-10-05 16:01:13 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2021-10-05 16:01:13 +0100 |
commit | 479c9563c70343af7c8afc3f6bd02599d1fd1269 (patch) | |
tree | 2ffd9e20602a3a73d6556151c9d36f1bc92881a4 /screen.c | |
parent | bf595a0cb0eb132b7365e8f1d19f07b255cbf191 (diff) | |
parent | 9f6164a05cc0de372f6859127f72c8b242596bf5 (diff) | |
download | rtmux-479c9563c70343af7c8afc3f6bd02599d1fd1269.tar.gz rtmux-479c9563c70343af7c8afc3f6bd02599d1fd1269.tar.bz2 rtmux-479c9563c70343af7c8afc3f6bd02599d1fd1269.zip |
Merge branch 'obsd-master' into master
Diffstat (limited to 'screen.c')
-rw-r--r-- | screen.c | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -162,27 +162,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; } } @@ -679,8 +679,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) |