aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-17 10:39:22 -0500
committerLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-17 10:39:22 -0500
commit88bcd43ebf59cfa03a9e9a158c6f7a258c1f7db2 (patch)
tree4c2b9321ab9d5f7a9aeed35c7d6826c5da4e496f /sway/config
parentsend keyboard enter on keyboard configuration (diff)
downloadsway-88bcd43ebf59cfa03a9e9a158c6f7a258c1f7db2.tar.gz
sway-88bcd43ebf59cfa03a9e9a158c6f7a258c1f7db2.tar.zst
sway-88bcd43ebf59cfa03a9e9a158c6f7a258c1f7db2.zip
seat fallback config
Diffstat (limited to 'sway/config')
-rw-r--r--sway/config/seat.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/config/seat.c b/sway/config/seat.c
index 3a2fdaa6..4c9e8d0d 100644
--- a/sway/config/seat.c
+++ b/sway/config/seat.c
@@ -17,6 +17,7 @@ struct seat_config *new_seat_config(const char* name) {
17 return NULL; 17 return NULL;
18 } 18 }
19 19
20 seat->fallback = -1;
20 seat->attachments = create_list(); 21 seat->attachments = create_list();
21 if (!sway_assert(seat->attachments, 22 if (!sway_assert(seat->attachments,
22 "could not allocate seat attachments list")) { 23 "could not allocate seat attachments list")) {
@@ -66,6 +67,10 @@ void merge_seat_config(struct seat_config *dest, struct seat_config *source) {
66 dest->name = strdup(source->name); 67 dest->name = strdup(source->name);
67 } 68 }
68 69
70 if (source->fallback != -1) {
71 dest->fallback = source->fallback;
72 }
73
69 for (int i = 0; i < source->attachments->length; ++i) { 74 for (int i = 0; i < source->attachments->length; ++i) {
70 struct seat_attachment_config *source_attachment = 75 struct seat_attachment_config *source_attachment =
71 source->attachments->items[i]; 76 source->attachments->items[i];