aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-04-09 19:47:57 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-04-09 19:47:57 +0000
commit20849a418390dc427dd04b9146a47741ceaa236a (patch)
treeb6b9ffcef80a9ece96b776ecfa837d5e1c66fd2b
parentchangelog: rewrite entry for OSC 17/117/19/119 (diff)
render: draw underline cursor below text underline
This ensures the cursor is visible on cells where the text is underlined. Closes #415
-rw-r--r--CHANGELOG.md5
-rw-r--r--render.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a30498b4..496920dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,11 @@
### Changed
+
+* Underline cursor is now rendered below text underline
+ (https://codeberg.org/dnkl/foot/issues/415).
+
+
### Deprecated
### Removed
### Fixed
diff --git a/render.c b/render.c
index cee44e54..ddd685b6 100644
--- a/render.c
+++ b/render.c
@@ -387,9 +387,10 @@ draw_cursor(const struct terminal *term, const struct cell *cell,
if (likely(term->cursor_blink.state == CURSOR_BLINK_ON ||
!term->kbd_focus))
{
+ struct fcft_font *font = attrs_to_font(term, &cell->attrs);
draw_underline(
- term, pix, attrs_to_font(term, &cell->attrs), &cursor_color,
- x, y, cols);
+ term, pix, font, &cursor_color,
+ x, y + font->underline.thickness, cols);
}
break;
}