mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-13 05:33:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: only call term_kbd_focus_{in,out}() on actual state change

Browse source 
That is, only call term_kbd_focus_in() if we're the *first* seat
focusing that terminal, and only call term_kbd_focus_out() if we're
the *last* seat that focused it.
This commit is contained in:
Daniel Eklöf 2020-07-09 08:46:25 +02:00
parent 98f3ccfe79
commit fc9fde88c3
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
input.c
View file

@ -304,10 +304,19 @@ keyboard_enter(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
LOG_DBG("keyboard_enter: keyboard=%p, serial=%u, surface=%p", LOG_DBG("keyboard_enter: keyboard=%p, serial=%u, surface=%p",
wl_keyboard, serial, surface); wl_keyboard, serial, surface);
bool term_already_focused = false;
tll_foreach(seat->wayl->seats, it) {
if (it->item.kbd_focus == term) {
term_already_focused = true;
break;
}
}
seat->kbd_focus = term; seat->kbd_focus = term;
seat->input_serial = serial; seat->input_serial = serial;
term_kbd_focus_in(seat->kbd_focus); if (!term_already_focused)
term_kbd_focus_in(seat->kbd_focus);
} }
static bool static bool
@ -371,15 +380,19 @@ keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
seat->kbd_focus = NULL; seat->kbd_focus = NULL;
stop_repeater(seat, -1); stop_repeater(seat, -1);
seat->kbd.shift = false;; seat->kbd.shift = false;
seat->kbd.alt = false;; seat->kbd.alt = false;
seat->kbd.ctrl = false;; seat->kbd.ctrl = false;
seat->kbd.meta = false;; seat->kbd.meta = false;
xkb_compose_state_reset(seat->kbd.xkb_compose_state); xkb_compose_state_reset(seat->kbd.xkb_compose_state);
if (old_focused != NULL) if (old_focused != NULL) {
/* Tell term it's unfocused *if* no other seats still have it focused */
tll_foreach(seat->wayl->seats, it)
if (it->item.kbd_focus == old_focused)
return;
term_kbd_focus_out(old_focused); term_kbd_focus_out(old_focused);
else { } else {
/* /*
* Sway bug - under certain conditions we get a * Sway bug - under certain conditions we get a
* keyboard_leave() (and keyboard_key()) without first having * keyboard_leave() (and keyboard_key()) without first having

4
terminal.c
View file

@ -1964,6 +1964,8 @@ term_has_kbd_focus(struct terminal *term)
void void
term_kbd_focus_in(struct terminal *term) term_kbd_focus_in(struct terminal *term)
{ {
assert(term_has_kbd_focus(term));
if (term->focus_events) if (term->focus_events)
term_to_slave(term, "\033[I", 3); term_to_slave(term, "\033[I", 3);
} }
@ -1971,6 +1973,8 @@ term_kbd_focus_in(struct terminal *term)
void void
term_kbd_focus_out(struct terminal *term) term_kbd_focus_out(struct terminal *term)
{ {
assert(!term_has_kbd_focus(term));
if (term->focus_events) if (term->focus_events)
term_to_slave(term, "\033[O", 3); term_to_slave(term, "\033[O", 3);
} }