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

seat: use separate 'enter' serials for keyboard and mouse

Browse source
This commit is contained in:
Daniel Eklöf 2020-07-09 11:20:46 +02:00
parent 4e48d550ef
commit 71584aed38
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
input.c
View file

@ -306,7 +306,7 @@ keyboard_enter(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
term_kbd_focus_in(term);
seat->kbd_focus = term;
seat->input_serial = serial;
seat->kbd.serial = serial;
}
static bool
@ -773,7 +773,7 @@ const struct wl_keyboard_listener keyboard_listener = {
void
input_repeat(struct seat *seat, uint32_t key)
{
keyboard_key(seat, NULL, seat->input_serial, 0, key, XKB_KEY_DOWN);
keyboard_key(seat, NULL, seat->kbd.serial, 0, key, XKB_KEY_DOWN);
}
static bool
@ -842,6 +842,8 @@ wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
struct wl_window *win = wl_surface_get_user_data(surface);
struct terminal *term = win->term;
seat->pointer.serial = serial;
LOG_DBG("pointer-enter: pointer=%p, serial=%u, surface = %p, new-moused = %p",
wl_pointer, serial, surface, term);
@ -1297,8 +1299,8 @@ mouse_scroll(struct seat *seat, int amount)
xkb_keycode_t key = button == BTN_BACK ? key_arrow_up : key_arrow_down;
for (int i = 0; i < amount; i++)
keyboard_key(seat, NULL, seat->input_serial, 0, key - 8, XKB_KEY_DOWN);
keyboard_key(seat, NULL, seat->input_serial, 0, key - 8, XKB_KEY_UP);
keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_DOWN);
keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_UP);
} else {
if (!term_mouse_grabbed(term, seat)) {
for (int i = 0; i < amount; i++) {