aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-01-02 18:37:21 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-01-02 18:37:21 +0000
commit29483f936f664a17fcf36f55350970dd3891fd10 (patch)
tree6f6064cfe8c35c03de22aefc5b6da54604fd98e9 /render.c
parentwayland: xdg-top-level-configure: call term_visual_focus_{in,out} (diff)
render: draw_cursor: use terminal's visual focus to determine cursor shape
Diffstat (limited to 'render.c')
-rw-r--r--render.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/render.c b/render.c
index d02ada3e..addb8d7a 100644
--- a/render.c
+++ b/render.c
@@ -279,8 +279,6 @@ draw_cursor(const struct terminal *term, const struct cell *cell,
pixman_image_t *pix, pixman_color_t *fg, const pixman_color_t *bg,
int x, int y, int cols)
{
- bool have_focus = term->wl->kbd_focus == term;
-
pixman_color_t cursor_color;
pixman_color_t text_color;
@@ -307,7 +305,7 @@ draw_cursor(const struct terminal *term, const struct cell *cell,
switch (term->cursor_style) {
case CURSOR_BLOCK:
- if (!have_focus)
+ if (!term->visual_focus)
draw_unfocused_block(term, pix, &cursor_color, x, y, cols);
else if (term->cursor_blink.state == CURSOR_BLINK_ON) {
@@ -319,12 +317,12 @@ draw_cursor(const struct terminal *term, const struct cell *cell,
break;
case CURSOR_BAR:
- if (term->cursor_blink.state == CURSOR_BLINK_ON || !have_focus)
+ if (term->cursor_blink.state == CURSOR_BLINK_ON || !term->visual_focus)
draw_bar(term, pix, font, &cursor_color, x, y);
break;
case CURSOR_UNDERLINE:
- if (term->cursor_blink.state == CURSOR_BLINK_ON || !have_focus) {
+ if (term->cursor_blink.state == CURSOR_BLINK_ON || !term->visual_focus) {
draw_underline(
term, pix, attrs_to_font(term, &cell->attrs), &cursor_color,
x, y, cols);