mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyboard: set keyboard layout on reconfigure

Browse source 
If keyboard-layout-per-toplevel-window is used, reset the group (index)
for each window on --reconfigure whenever the keymap has changed.

Refactor to use a common configure function for reconfigure and
keyboard-group creation.

Co-authored-by: @johanmalm

Fixes #1407
This commit is contained in:
Simon Long 2024-01-16 12:43:18 +00:00 • committed by Johan Malm
parent dfb6664906
commit 8c9be2f0d1
5 changed files with 67 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/seat.c
View file

@ -506,13 +506,16 @@ seat_finish(struct server *server)
}
static void
configure_keyboard(struct wlr_input_device *device)
configure_keyboard(struct seat *seat, struct input *input)
{
struct wlr_input_device *device = input->wlr_input_device;
assert(device->type == WLR_INPUT_DEVICE_KEYBOARD);
struct keyboard *keyboard = (struct keyboard *)input;
struct wlr_keyboard *kb = wlr_keyboard_from_input_device(device);
wlr_keyboard_set_repeat_info(kb, rc.repeat_rate, rc.repeat_delay);
keyboard_configure(seat, kb, keyboard->is_virtual);
}
/* This is called on SIGHUP (generally in response to labwc --reconfigure */
void
seat_reconfigure(struct server *server)
{
@ -521,7 +524,7 @@ seat_reconfigure(struct server *server)
wl_list_for_each(input, &seat->inputs, link) {
switch (input->wlr_input_device->type) {
case WLR_INPUT_DEVICE_KEYBOARD:
configure_keyboard(input->wlr_input_device);
configure_keyboard(seat, input);
break;
case WLR_INPUT_DEVICE_POINTER:
configure_libinput(input->wlr_input_device);