From 53c9a4a6438824abfb3d539bf55aec92074977e0 Mon Sep 17 00:00:00 2001 From: Kirill Primak Date: Mon, 9 Jan 2023 18:28:59 +0300 Subject: input/tablet: handle focusing NULL surface Additionally, rename the function responsible for switching focus to match its behavior better. --- sway/input/seat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sway/input/seat.c') diff --git a/sway/input/seat.c b/sway/input/seat.c index 151303a9..18b63715 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -177,11 +177,11 @@ static void seat_keyboard_notify_enter(struct sway_seat *seat, state->pressed_keycodes, state->npressed, &keyboard->modifiers); } -static void seat_tablet_pads_notify_enter(struct sway_seat *seat, +static void seat_tablet_pads_set_focus(struct sway_seat *seat, struct wlr_surface *surface) { struct sway_seat_device *seat_device; wl_list_for_each(seat_device, &seat->devices, link) { - sway_tablet_pad_notify_enter(seat_device->tablet_pad, surface); + sway_tablet_pad_set_focus(seat_device->tablet_pad, surface); } } @@ -205,7 +205,7 @@ static void seat_send_focus(struct sway_node *node, struct sway_seat *seat) { #endif seat_keyboard_notify_enter(seat, view->surface); - seat_tablet_pads_notify_enter(seat, view->surface); + seat_tablet_pads_set_focus(seat, view->surface); sway_input_method_relay_set_focus(&seat->im_relay, view->surface); struct wlr_pointer_constraint_v1 *constraint = @@ -1322,7 +1322,7 @@ void seat_set_focus_surface(struct sway_seat *seat, } sway_input_method_relay_set_focus(&seat->im_relay, surface); - seat_tablet_pads_notify_enter(seat, surface); + seat_tablet_pads_set_focus(seat, surface); } void seat_set_focus_layer(struct sway_seat *seat, -- cgit v1.2.3-54-g00ecf