aboutsummaryrefslogtreecommitdiff
path: root/sway/input/keyboard.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/input/keyboard.c')
-rw-r--r--sway/input/keyboard.c46
1 files changed, 30 insertions, 16 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index f71a7909..2cfcd126 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -659,6 +659,11 @@ static bool keymaps_match(struct xkb_keymap *km1, struct xkb_keymap *km2) {
return result;
}
+static bool repeat_info_match(struct sway_keyboard *a, struct wlr_keyboard *b) {
+ return a->repeat_rate == b->repeat_info.rate &&
+ a->repeat_delay == b->repeat_info.delay;
+}
+
static void destroy_empty_wlr_keyboard_group(void *data) {
wlr_keyboard_group_destroy(data);
}
@@ -711,9 +716,10 @@ static void sway_keyboard_group_remove_invalid(struct sway_keyboard *keyboard) {
sway_keyboard_group_remove(keyboard);
break;
case KEYBOARD_GROUP_DEFAULT: /* fallthrough */
- case KEYBOARD_GROUP_KEYMAP:;
+ case KEYBOARD_GROUP_SMART:;
struct wlr_keyboard_group *group = wlr_keyboard->group;
- if (!keymaps_match(keyboard->keymap, group->keyboard.keymap)) {
+ if (!keymaps_match(keyboard->keymap, group->keyboard.keymap) ||
+ !repeat_info_match(keyboard, &group->keyboard)) {
sway_keyboard_group_remove(keyboard);
}
break;
@@ -741,9 +747,10 @@ static void sway_keyboard_group_add(struct sway_keyboard *keyboard) {
// Nothing to do. This shouldn't even be reached
return;
case KEYBOARD_GROUP_DEFAULT: /* fallthrough */
- case KEYBOARD_GROUP_KEYMAP:;
+ case KEYBOARD_GROUP_SMART:;
struct wlr_keyboard_group *wlr_group = group->wlr_group;
- if (keymaps_match(keyboard->keymap, wlr_group->keyboard.keymap)) {
+ if (keymaps_match(keyboard->keymap, wlr_group->keyboard.keymap) &&
+ repeat_info_match(keyboard, &wlr_group->keyboard)) {
sway_log(SWAY_DEBUG, "Adding keyboard %s to group %p",
device->identifier, wlr_group);
wlr_keyboard_group_add_keyboard(wlr_group, wlr_keyboard);
@@ -767,6 +774,8 @@ static void sway_keyboard_group_add(struct sway_keyboard *keyboard) {
}
sway_group->wlr_group->data = sway_group;
wlr_keyboard_set_keymap(&sway_group->wlr_group->keyboard, keyboard->keymap);
+ wlr_keyboard_set_repeat_info(&sway_group->wlr_group->keyboard,
+ keyboard->repeat_rate, keyboard->repeat_delay);
sway_log(SWAY_DEBUG, "Created keyboard group %p", sway_group->wlr_group);
sway_group->seat_device = calloc(1, sizeof(struct sway_seat_device));
@@ -836,14 +845,30 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
keyboard->keymap ? !keymaps_match(keyboard->keymap, keymap) : true;
bool effective_layout_changed = keyboard->effective_layout != 0;
- if (keymap_changed || config->reloading) {
+ int repeat_rate = 25;
+ if (input_config && input_config->repeat_rate != INT_MIN) {
+ repeat_rate = input_config->repeat_rate;
+ }
+ int repeat_delay = 600;
+ if (input_config && input_config->repeat_delay != INT_MIN) {
+ repeat_delay = input_config->repeat_delay;
+ }
+
+ bool repeat_info_changed = keyboard->repeat_rate != repeat_rate ||
+ keyboard->repeat_delay != repeat_delay;
+
+ if (keymap_changed || repeat_info_changed || config->reloading) {
xkb_keymap_unref(keyboard->keymap);
keyboard->keymap = keymap;
keyboard->effective_layout = 0;
+ keyboard->repeat_rate = repeat_rate;
+ keyboard->repeat_delay = repeat_delay;
sway_keyboard_group_remove_invalid(keyboard);
wlr_keyboard_set_keymap(wlr_device->keyboard, keyboard->keymap);
+ wlr_keyboard_set_repeat_info(wlr_device->keyboard,
+ keyboard->repeat_rate, keyboard->repeat_delay);
if (!wlr_device->keyboard->group) {
sway_keyboard_group_add(keyboard);
@@ -890,17 +915,6 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
}
}
- int repeat_rate = 25;
- if (input_config && input_config->repeat_rate != INT_MIN) {
- repeat_rate = input_config->repeat_rate;
- }
- int repeat_delay = 600;
- if (input_config && input_config->repeat_delay != INT_MIN) {
- repeat_delay = input_config->repeat_delay;
- }
- wlr_keyboard_set_repeat_info(wlr_device->keyboard, repeat_rate,
- repeat_delay);
-
struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat;
wlr_seat_set_keyboard(seat, wlr_device);