aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortokyo4j <hrak1529@gmail.com>2024-08-14 16:18:57 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-08-20 04:59:33 +0000
commita2fc2a986eedc5ac7c83ae21618acedcb7b7aab8 (patch)
tree7a423f6235043f711ca8b80fd4bb5b766953ba6c
parentterm: thrd_join() returns thrd_success on success, not 0 (diff)
render: follow cursor.unfocused-style regardless of cursor.style
Before this commit, cursor.unfocused-style was effective only with cursor.style=block
-rw-r--r--CHANGELOG.md5
-rw-r--r--render.c24
2 files changed, 17 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 625ca4dd..00cf0b63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,11 @@
## Unreleased
### Added
### Changed
+
+* `cursor.unfocused-style` is now effective even when `cursor.style`
+ is not `block`.
+
+
### Deprecated
### Removed
### Fixed
diff --git a/render.c b/render.c
index d9630983..d9317b68 100644
--- a/render.c
+++ b/render.c
@@ -591,22 +591,22 @@ draw_cursor(const struct terminal *term, const struct cell *cell,
pixman_color_t text_color;
cursor_colors_for_cell(term, cell, fg, bg, &cursor_color, &text_color);
- switch (term->cursor_style) {
- case CURSOR_BLOCK:
- if (unlikely(!term->kbd_focus)) {
- switch (term->conf->cursor.unfocused_style) {
- case CURSOR_UNFOCUSED_UNCHANGED:
- break;
+ if (unlikely(!term->kbd_focus)) {
+ switch (term->conf->cursor.unfocused_style) {
+ case CURSOR_UNFOCUSED_UNCHANGED:
+ break;
- case CURSOR_UNFOCUSED_HOLLOW:
- draw_hollow_block(term, pix, &cursor_color, x, y, cols);
- return;
+ case CURSOR_UNFOCUSED_HOLLOW:
+ draw_hollow_block(term, pix, &cursor_color, x, y, cols);
+ return;
- case CURSOR_UNFOCUSED_NONE:
- return;
- }
+ case CURSOR_UNFOCUSED_NONE:
+ return;
}
+ }
+ switch (term->cursor_style) {
+ case CURSOR_BLOCK:
if (likely(term->cursor_blink.state == CURSOR_BLINK_ON) ||
!term->kbd_focus)
{