From 452a615bb8f546fbeaddd7bacc71b5c597ab5629 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Sun, 15 Dec 2019 01:33:33 -0500 Subject: seat_cmd_keyboard_grouping: change keymap to smart This removes `seat keyboard_grouping keymap` and replaces it with `seat keyboard_grouping smart`. The smart keyboard grouping will group based on both the keymap and repeat info. The reasoning for this is that deciding what the repeat info should be for a group is either arbitrary or non-deterministic when multiple keyboards in the group have repeat info configured (unless somehow exposed to the user in a reproducible uniquely identifiable fashion). --- include/sway/config.h | 4 ++-- include/sway/input/keyboard.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'include/sway') diff --git a/include/sway/config.h b/include/sway/config.h index 3e3d2725..aef6694d 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -177,9 +177,9 @@ enum seat_config_allow_constrain { }; enum seat_keyboard_grouping { - KEYBOARD_GROUP_DEFAULT, // the default is currently keymap + KEYBOARD_GROUP_DEFAULT, // the default is currently smart KEYBOARD_GROUP_NONE, - KEYBOARD_GROUP_KEYMAP + KEYBOARD_GROUP_SMART // keymap and repeat info }; enum sway_input_idle_source { diff --git a/include/sway/input/keyboard.h b/include/sway/input/keyboard.h index 72a29ba6..13fcafcc 100644 --- a/include/sway/input/keyboard.h +++ b/include/sway/input/keyboard.h @@ -54,6 +54,9 @@ struct sway_keyboard { struct xkb_keymap *keymap; xkb_layout_index_t effective_layout; + int32_t repeat_rate; + int32_t repeat_delay; + struct wl_listener keyboard_key; struct wl_listener keyboard_modifiers; -- cgit v1.2.3-54-g00ecf