alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

send keyboard enter on keyboard configuration

Browse source
This commit is contained in:
Tony Crisci 2017-12-17 08:30:20 -05:00
parent c41801b75e
commit e27eff8a29
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/input/input-manager.c
View file

@ -145,6 +145,7 @@ static void input_add_notify(struct wl_listener *listener, void *data) {
struct sway_seat *seat = NULL; struct sway_seat *seat = NULL;
if (!input_has_seat_configuration(input)) { if (!input_has_seat_configuration(input)) {
sway_log(L_DEBUG, "no seat configuration, using default seat");
seat = input_manager_get_seat(input, default_seat); seat = input_manager_get_seat(input, default_seat);
sway_seat_add_device(seat, input_device); sway_seat_add_device(seat, input_device);
return; return;
@ -245,6 +246,7 @@ void sway_input_manager_apply_input_config(struct sway_input_manager *input,
void sway_input_manager_apply_seat_config(struct sway_input_manager *input, void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
struct seat_config *seat_config) { struct seat_config *seat_config) {
sway_log(L_DEBUG, "applying new seat config for seat %s", seat_config->name);
struct sway_seat *seat = input_manager_get_seat(input, seat_config->name); struct sway_seat *seat = input_manager_get_seat(input, seat_config->name);
// the old config is invalid so clear it // the old config is invalid so clear it
sway_seat_set_config(seat, NULL); sway_seat_set_config(seat, NULL);

9
sway/input/seat.c
View file

@ -68,6 +68,13 @@ static void seat_configure_keyboard(struct sway_seat *seat,
sway_keyboard_create(seat, seat_device); sway_keyboard_create(seat, seat_device);
} }
sway_keyboard_configure(seat_device->keyboard); sway_keyboard_configure(seat_device->keyboard);
wlr_seat_set_keyboard(seat->wlr_seat,
seat_device->input_device->wlr_device);
if (seat->focus) {
// force notify reenter to pick up the new configuration
wlr_seat_keyboard_clear_focus(seat->wlr_seat);
wlr_seat_keyboard_notify_enter(seat->wlr_seat, seat->focus->sway_view->surface);
}
} }
static struct sway_seat_device *sway_seat_get_device(struct sway_seat *seat, static struct sway_seat_device *sway_seat_get_device(struct sway_seat *seat,
@ -101,8 +108,6 @@ void sway_seat_configure_device(struct sway_seat *seat,
break; break;
case WLR_INPUT_DEVICE_KEYBOARD: case WLR_INPUT_DEVICE_KEYBOARD:
seat_configure_keyboard(seat, seat_device); seat_configure_keyboard(seat, seat_device);
wlr_seat_set_keyboard(seat->wlr_seat,
seat_device->input_device->wlr_device);
break; break;
case WLR_INPUT_DEVICE_TOUCH: case WLR_INPUT_DEVICE_TOUCH:
case WLR_INPUT_DEVICE_TABLET_PAD: case WLR_INPUT_DEVICE_TABLET_PAD: