diff options
Diffstat (limited to 'sway/config/seat.c')
-rw-r--r-- | sway/config/seat.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/config/seat.c b/sway/config/seat.c index 6c916727..e2702de5 100644 --- a/sway/config/seat.c +++ b/sway/config/seat.c | |||
@@ -30,6 +30,7 @@ struct seat_config *new_seat_config(const char* name) { | |||
30 | } | 30 | } |
31 | seat->hide_cursor_timeout = -1; | 31 | seat->hide_cursor_timeout = -1; |
32 | seat->allow_constrain = CONSTRAIN_DEFAULT; | 32 | seat->allow_constrain = CONSTRAIN_DEFAULT; |
33 | seat->shortcuts_inhibit = SHORTCUTS_INHIBIT_DEFAULT; | ||
33 | seat->keyboard_grouping = KEYBOARD_GROUP_DEFAULT; | 34 | seat->keyboard_grouping = KEYBOARD_GROUP_DEFAULT; |
34 | seat->xcursor_theme.name = NULL; | 35 | seat->xcursor_theme.name = NULL; |
35 | seat->xcursor_theme.size = 24; | 36 | seat->xcursor_theme.size = 24; |
@@ -154,6 +155,10 @@ void merge_seat_config(struct seat_config *dest, struct seat_config *source) { | |||
154 | dest->allow_constrain = source->allow_constrain; | 155 | dest->allow_constrain = source->allow_constrain; |
155 | } | 156 | } |
156 | 157 | ||
158 | if (source->shortcuts_inhibit != SHORTCUTS_INHIBIT_DEFAULT) { | ||
159 | dest->shortcuts_inhibit = source->shortcuts_inhibit; | ||
160 | } | ||
161 | |||
157 | if (source->keyboard_grouping != KEYBOARD_GROUP_DEFAULT) { | 162 | if (source->keyboard_grouping != KEYBOARD_GROUP_DEFAULT) { |
158 | dest->keyboard_grouping = source->keyboard_grouping; | 163 | dest->keyboard_grouping = source->keyboard_grouping; |
159 | } | 164 | } |