mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-15 22:05:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: use kbd-focus instead of visual focus for hollow block cursor

Browse source 
When determining whether we should render a hollow block cursor,
i.e. to signal that we're unfocused, base the decision on the
terminals current keyboard focus, not visual focus.
This commit is contained in:
Daniel Eklöf 2020-07-11 09:06:36 +02:00
parent 7d8974f930
commit 12a1688ce3
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
render.c
View file

@ -328,7 +328,7 @@ draw_cursor(const struct terminal *term, const struct cell *cell,
switch (term->cursor_style) {
case CURSOR_BLOCK:
if (!term->visual_focus)
if (!term->kbd_focus)
draw_unfocused_block(term, pix, &cursor_color, x, y, cols);
else if (term->cursor_blink.state == CURSOR_BLINK_ON) {
@ -340,12 +340,12 @@ draw_cursor(const struct terminal *term, const struct cell *cell,
break;
case CURSOR_BAR:
if (term->cursor_blink.state == CURSOR_BLINK_ON || !term->visual_focus)
if (term->cursor_blink.state == CURSOR_BLINK_ON || !term->kbd_focus)
draw_bar(term, pix, font, &cursor_color, x, y);
break;
case CURSOR_UNDERLINE:
if (term->cursor_blink.state == CURSOR_BLINK_ON || !term->visual_focus) {
if (term->cursor_blink.state == CURSOR_BLINK_ON || !term->kbd_focus) {
draw_underline(
term, pix, attrs_to_font(term, &cell->attrs), &cursor_color,
x, y, cols);
@ -435,7 +435,7 @@ render_cell(struct terminal *term, pixman_image_t *pix,
if (cell->attrs.blink)
term_arm_blink_timer(term);
if (has_cursor && term->cursor_style == CURSOR_BLOCK && term->visual_focus)
if (has_cursor && term->cursor_style == CURSOR_BLOCK && term->kbd_focus)
draw_cursor(term, cell, font, pix, &fg, &bg, x, y, cell_cols);
if (cell->wc == 0 || cell->attrs.conceal)
@ -495,7 +495,7 @@ render_cell(struct terminal *term, pixman_image_t *pix,
}
draw_cursor:
if (has_cursor && (term->cursor_style != CURSOR_BLOCK || !term->visual_focus))
if (has_cursor && (term->cursor_style != CURSOR_BLOCK || !term->kbd_focus))
draw_cursor(term, cell, font, pix, &fg, &bg, x, y, cell_cols);
pixman_image_set_clip_region32(pix, NULL);