diff options
| -rw-r--r-- | sway/input/input-manager.c | 18 | ||||
| -rw-r--r-- | sway/input/seat.c | 15 |
2 files changed, 30 insertions, 3 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c index dc07cbf0..c576a593 100644 --- a/sway/input/input-manager.c +++ b/sway/input/input-manager.c @@ -4,15 +4,17 @@ #include <string.h> #include <math.h> #include <wlr/backend/libinput.h> +#include <wlr/types/wlr_cursor.h> +#include <wlr/types/wlr_keyboard_group.h> #include <wlr/types/wlr_input_inhibitor.h> #include <wlr/types/wlr_virtual_keyboard_v1.h> #include <wlr/types/wlr_virtual_pointer_v1.h> -#include <wlr/types/wlr_cursor.h> #include "sway/config.h" +#include "sway/input/cursor.h" #include "sway/input/input-manager.h" +#include "sway/input/keyboard.h" #include "sway/input/libinput.h" #include "sway/input/seat.h" -#include "sway/input/cursor.h" #include "sway/ipc-server.h" #include "sway/server.h" #include "sway/tree/view.h" @@ -553,6 +555,18 @@ void input_manager_reset_all_inputs() { wl_list_for_each(input_device, &server.input->devices, link) { input_manager_reset_input(input_device); } + + // If there is at least one keyboard using the default keymap, repeat delay, + // and repeat rate, then it is possible that there is a keyboard group that + // needs to be reset. This will disarm the keyboards as well as exit and + // re-enter any focus views. + struct sway_seat *seat; + wl_list_for_each(seat, &server.input->seats, link) { + struct sway_keyboard_group *group; + wl_list_for_each(group, &seat->keyboard_groups, link) { + seat_reset_device(seat, group->seat_device->input_device); + } + } } diff --git a/sway/input/seat.c b/sway/input/seat.c index a4e06c57..1d45b256 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -7,6 +7,7 @@ #include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_idle.h> +#include <wlr/types/wlr_keyboard_group.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_primary_selection.h> #include <wlr/types/wlr_tablet_v2.h> @@ -691,7 +692,12 @@ static void seat_configure_keyboard(struct sway_seat *seat, if (!seat_device->keyboard) { sway_keyboard_create(seat, seat_device); } - sway_keyboard_configure(seat_device->keyboard); + if (!wlr_keyboard_group_from_wlr_keyboard( + seat_device->input_device->wlr_device->keyboard)) { + // Do not configure keyboard group keyboards. They will be configured + // based on the keyboards in the group. + sway_keyboard_configure(seat_device->keyboard); + } wlr_seat_set_keyboard(seat->wlr_seat, seat_device->input_device->wlr_device); struct sway_node *focus = seat_get_focus(seat); @@ -746,6 +752,13 @@ static struct sway_seat_device *seat_get_device(struct sway_seat *seat, } } + struct sway_keyboard_group *group = NULL; + wl_list_for_each(group, &seat->keyboard_groups, link) { + if (group->seat_device->input_device == input_device) { + return group->seat_device; + } + } + return NULL; } |