diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-12-15 01:33:33 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-12-16 12:03:11 -0500 |
commit | 452a615bb8f546fbeaddd7bacc71b5c597ab5629 (patch) | |
tree | a8a2b726fd510e906f7c27eb8510eae2bdd986b3 /include | |
parent | input/seatop_default: fix focusing floating titles (diff) | |
download | sway-452a615bb8f546fbeaddd7bacc71b5c597ab5629.tar.gz sway-452a615bb8f546fbeaddd7bacc71b5c597ab5629.tar.zst sway-452a615bb8f546fbeaddd7bacc71b5c597ab5629.zip |
seat_cmd_keyboard_grouping: change keymap to smart
This removes `seat <seat> keyboard_grouping keymap` and replaces it with
`seat <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).
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/config.h | 4 | ||||
-rw-r--r-- | include/sway/input/keyboard.h | 3 |
2 files changed, 5 insertions, 2 deletions
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 { | |||
177 | }; | 177 | }; |
178 | 178 | ||
179 | enum seat_keyboard_grouping { | 179 | enum seat_keyboard_grouping { |
180 | KEYBOARD_GROUP_DEFAULT, // the default is currently keymap | 180 | KEYBOARD_GROUP_DEFAULT, // the default is currently smart |
181 | KEYBOARD_GROUP_NONE, | 181 | KEYBOARD_GROUP_NONE, |
182 | KEYBOARD_GROUP_KEYMAP | 182 | KEYBOARD_GROUP_SMART // keymap and repeat info |
183 | }; | 183 | }; |
184 | 184 | ||
185 | enum sway_input_idle_source { | 185 | 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 { | |||
54 | struct xkb_keymap *keymap; | 54 | struct xkb_keymap *keymap; |
55 | xkb_layout_index_t effective_layout; | 55 | xkb_layout_index_t effective_layout; |
56 | 56 | ||
57 | int32_t repeat_rate; | ||
58 | int32_t repeat_delay; | ||
59 | |||
57 | struct wl_listener keyboard_key; | 60 | struct wl_listener keyboard_key; |
58 | struct wl_listener keyboard_modifiers; | 61 | struct wl_listener keyboard_modifiers; |
59 | 62 | ||