mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-01 07:15:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

term: remove term_has_kbd_focus(), use term->kbd_focus instead

Browse source
This commit is contained in:
Daniel Eklöf 2020-07-11 09:06:20 +02:00
parent 8c72e9434e
commit 7d8974f930
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
terminal.c
View file

@ -1717,7 +1717,7 @@ void
term_cursor_blink_enable(struct terminal *term) term_cursor_blink_enable(struct terminal *term)
{ {
term->cursor_blink.state = CURSOR_BLINK_ON; term->cursor_blink.state = CURSOR_BLINK_ON;
term->cursor_blink.active = term_has_kbd_focus(term) term->cursor_blink.active = term->kbd_focus
? cursor_blink_start_timer(term) : true; ? cursor_blink_start_timer(term) : true;
} }
@ -1734,7 +1734,7 @@ term_cursor_blink_restart(struct terminal *term)
{ {
if (term->cursor_blink.active) { if (term->cursor_blink.active) {
term->cursor_blink.state = CURSOR_BLINK_ON; term->cursor_blink.state = CURSOR_BLINK_ON;
term->cursor_blink.active = term_has_kbd_focus(term) term->cursor_blink.active = term->kbd_focus
? cursor_blink_start_timer(term) : true; ? cursor_blink_start_timer(term) : true;
} }
} }
@ -1957,18 +1957,6 @@ term_visual_focus_out(struct terminal *term)
cursor_refresh(term); cursor_refresh(term);
} }
bool
term_has_kbd_focus(struct terminal *term)
{
tll_foreach(term->wl->seats, it) {
if (it->item.kbd_focus == term)
return true;
}
return false;
}
#endif
void void
term_kbd_focus_in(struct terminal *term) term_kbd_focus_in(struct terminal *term)
{ {
@ -2108,7 +2096,7 @@ term_mouse_down(struct terminal *term, int button, int row, int col,
return; return;
bool has_focus = term_has_kbd_focus(term); bool has_focus = term->kbd_focus;
bool shift = has_focus ? _shift : false; bool shift = has_focus ? _shift : false;
bool alt = has_focus ? _alt : false; bool alt = has_focus ? _alt : false;
bool ctrl = has_focus ? _ctrl : false; bool ctrl = has_focus ? _ctrl : false;
@ -2150,7 +2138,7 @@ term_mouse_up(struct terminal *term, int button, int row, int col,
if (encoded == -1) if (encoded == -1)
return; return;
bool has_focus = term_has_kbd_focus(term); bool has_focus = term->kbd_focus;
bool shift = has_focus ? _shift : false; bool shift = has_focus ? _shift : false;
bool alt = has_focus ? _alt : false; bool alt = has_focus ? _alt : false;
bool ctrl = has_focus ? _ctrl : false; bool ctrl = has_focus ? _ctrl : false;
@ -2192,7 +2180,7 @@ term_mouse_motion(struct terminal *term, int button, int row, int col,
} else } else
encoded = 3; /* "released" */ encoded = 3; /* "released" */
bool has_focus = term_has_kbd_focus(term); bool has_focus = term->kbd_focus;
bool shift = has_focus ? _shift : false; bool shift = has_focus ? _shift : false;
bool alt = has_focus ? _alt : false; bool alt = has_focus ? _alt : false;
bool ctrl = has_focus ? _ctrl : false; bool ctrl = has_focus ? _ctrl : false;

1
terminal.h
View file

@ -518,7 +518,6 @@ void term_restore_cursor(struct terminal *term, const struct cursor *cursor);
void term_visual_focus_in(struct terminal *term); void term_visual_focus_in(struct terminal *term);
void term_visual_focus_out(struct terminal *term); void term_visual_focus_out(struct terminal *term);
bool term_has_kbd_focus(struct terminal *term);
void term_kbd_focus_in(struct terminal *term); void term_kbd_focus_in(struct terminal *term);
void term_kbd_focus_out(struct terminal *term); void term_kbd_focus_out(struct terminal *term);
void term_mouse_down( void term_mouse_down(