diff options
-rw-r--r-- | include/sway/commands.h | 3 | ||||
-rw-r--r-- | include/sway/config.h | 2 | ||||
-rw-r--r-- | sway/commands.c | 4 | ||||
-rw-r--r-- | sway/commands/input/accel_profile.c | 3 | ||||
-rw-r--r-- | sway/commands/input/click_method.c | 3 | ||||
-rw-r--r-- | sway/commands/input/drag_lock.c | 3 | ||||
-rw-r--r-- | sway/commands/input/dwt.c | 3 | ||||
-rw-r--r-- | sway/commands/input/events.c | 3 | ||||
-rw-r--r-- | sway/commands/input/left_handed.c | 3 | ||||
-rw-r--r-- | sway/commands/input/middle_emulation.c | 3 | ||||
-rw-r--r-- | sway/commands/input/natural_scroll.c | 3 | ||||
-rw-r--r-- | sway/commands/input/pointer_accel.c | 3 | ||||
-rw-r--r-- | sway/commands/input/scroll_method.c | 3 | ||||
-rw-r--r-- | sway/commands/input/tap.c | 3 | ||||
-rw-r--r-- | sway/commands/input/xkb_layout.c | 3 | ||||
-rw-r--r-- | sway/commands/input/xkb_model.c | 3 | ||||
-rw-r--r-- | sway/commands/input/xkb_options.c | 3 | ||||
-rw-r--r-- | sway/commands/input/xkb_rules.c | 3 | ||||
-rw-r--r-- | sway/commands/input/xkb_variant.c | 3 | ||||
-rw-r--r-- | sway/commands/seat/attach.c | 2 |
20 files changed, 37 insertions, 22 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 61950d0d..5008831d 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -42,9 +42,6 @@ enum expected_args { | |||
42 | EXPECTED_EQUAL_TO | 42 | EXPECTED_EQUAL_TO |
43 | }; | 43 | }; |
44 | 44 | ||
45 | void input_cmd_apply(struct input_config *input); | ||
46 | void seat_cmd_apply(struct seat_config *seat); | ||
47 | |||
48 | struct cmd_results *checkarg(int argc, const char *name, | 45 | struct cmd_results *checkarg(int argc, const char *name, |
49 | enum expected_args type, int val); | 46 | enum expected_args type, int val); |
50 | 47 | ||
diff --git a/include/sway/config.h b/include/sway/config.h index 777fb5a8..eb642dc2 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -384,6 +384,7 @@ int input_identifier_cmp(const void *item, const void *data); | |||
384 | struct input_config *new_input_config(const char* identifier); | 384 | struct input_config *new_input_config(const char* identifier); |
385 | void merge_input_config(struct input_config *dst, struct input_config *src); | 385 | void merge_input_config(struct input_config *dst, struct input_config *src); |
386 | void free_input_config(struct input_config *ic); | 386 | void free_input_config(struct input_config *ic); |
387 | void apply_input_config(struct input_config *input); | ||
387 | 388 | ||
388 | int seat_name_cmp(const void *item, const void *data); | 389 | int seat_name_cmp(const void *item, const void *data); |
389 | struct seat_config *new_seat_config(const char* name); | 390 | struct seat_config *new_seat_config(const char* name); |
@@ -392,6 +393,7 @@ void free_seat_config(struct seat_config *ic); | |||
392 | struct seat_attachment_config *seat_attachment_config_new(); | 393 | struct seat_attachment_config *seat_attachment_config_new(); |
393 | struct seat_attachment_config *seat_config_get_attachment( | 394 | struct seat_attachment_config *seat_config_get_attachment( |
394 | struct seat_config *seat_config, char *identifier); | 395 | struct seat_config *seat_config, char *identifier); |
396 | void apply_seat_config(struct seat_config *seat); | ||
395 | 397 | ||
396 | int output_name_cmp(const void *item, const void *data); | 398 | int output_name_cmp(const void *item, const void *data); |
397 | struct output_config *new_output_config(); | 399 | struct output_config *new_output_config(); |
diff --git a/sway/commands.c b/sway/commands.c index 7485f2f6..3fb1842d 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -57,7 +57,7 @@ struct cmd_results *checkarg(int argc, const char *name, enum expected_args type | |||
57 | return error; | 57 | return error; |
58 | } | 58 | } |
59 | 59 | ||
60 | void input_cmd_apply(struct input_config *input) { | 60 | void apply_input_config(struct input_config *input) { |
61 | int i; | 61 | int i; |
62 | i = list_seq_find(config->input_configs, input_identifier_cmp, input->identifier); | 62 | i = list_seq_find(config->input_configs, input_identifier_cmp, input->identifier); |
63 | if (i >= 0) { | 63 | if (i >= 0) { |
@@ -74,7 +74,7 @@ void input_cmd_apply(struct input_config *input) { | |||
74 | sway_input_manager_apply_input_config(input_manager, input); | 74 | sway_input_manager_apply_input_config(input_manager, input); |
75 | } | 75 | } |
76 | 76 | ||
77 | void seat_cmd_apply(struct seat_config *seat) { | 77 | void apply_seat_config(struct seat_config *seat) { |
78 | int i; | 78 | int i; |
79 | i = list_seq_find(config->seat_configs, seat_name_cmp, seat->name); | 79 | i = list_seq_find(config->seat_configs, seat_name_cmp, seat->name); |
80 | if (i >= 0) { | 80 | if (i >= 0) { |
diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c index 9b5fb7a2..f72b7d48 100644 --- a/sway/commands/input/accel_profile.c +++ b/sway/commands/input/accel_profile.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/config.h" | ||
3 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | 6 | ||
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_accel_profile(int argc, char **argv) { | |||
24 | "Expected 'accel_profile <adaptive|flat>'"); | 25 | "Expected 'accel_profile <adaptive|flat>'"); |
25 | } | 26 | } |
26 | 27 | ||
27 | input_cmd_apply(new_config); | 28 | apply_input_config(new_config); |
28 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 29 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
29 | } | 30 | } |
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c index a0e3bddf..dcf64c1a 100644 --- a/sway/commands/input/click_method.c +++ b/sway/commands/input/click_method.c | |||
@@ -1,6 +1,7 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
4 | #include "sway/config.h" | ||
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | #include "log.h" | 6 | #include "log.h" |
6 | 7 | ||
@@ -29,6 +30,6 @@ struct cmd_results *input_cmd_click_method(int argc, char **argv) { | |||
29 | "Expected 'click_method <none|button_areas|clickfinger'"); | 30 | "Expected 'click_method <none|button_areas|clickfinger'"); |
30 | } | 31 | } |
31 | 32 | ||
32 | input_cmd_apply(new_config); | 33 | apply_input_config(new_config); |
33 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 34 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
34 | } | 35 | } |
diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c index 149a6183..1783978a 100644 --- a/sway/commands/input/drag_lock.c +++ b/sway/commands/input/drag_lock.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/config.h" | ||
3 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | 6 | ||
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_drag_lock(int argc, char **argv) { | |||
24 | "Expected 'drag_lock <enabled|disabled>'"); | 25 | "Expected 'drag_lock <enabled|disabled>'"); |
25 | } | 26 | } |
26 | 27 | ||
27 | input_cmd_apply(new_config); | 28 | apply_input_config(new_config); |
28 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 29 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
29 | } | 30 | } |
diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c index 0954575c..8108a110 100644 --- a/sway/commands/input/dwt.c +++ b/sway/commands/input/dwt.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/config.h" | ||
3 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | 6 | ||
@@ -23,6 +24,6 @@ struct cmd_results *input_cmd_dwt(int argc, char **argv) { | |||
23 | "Expected 'dwt <enabled|disabled>'"); | 24 | "Expected 'dwt <enabled|disabled>'"); |
24 | } | 25 | } |
25 | 26 | ||
26 | input_cmd_apply(new_config); | 27 | apply_input_config(new_config); |
27 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 28 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
28 | } | 29 | } |
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c index f44c0ec7..8a74c11e 100644 --- a/sway/commands/input/events.c +++ b/sway/commands/input/events.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/config.h" | ||
3 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | #include "log.h" | 6 | #include "log.h" |
@@ -30,6 +31,6 @@ struct cmd_results *input_cmd_events(int argc, char **argv) { | |||
30 | "Expected 'events <enabled|disabled|disabled_on_external_mouse>'"); | 31 | "Expected 'events <enabled|disabled|disabled_on_external_mouse>'"); |
31 | } | 32 | } |
32 | 33 | ||
33 | input_cmd_apply(new_config); | 34 | apply_input_config(new_config); |
34 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 35 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
35 | } | 36 | } |
diff --git a/sway/commands/input/left_handed.c b/sway/commands/input/left_handed.c index dc8fcd56..35740df3 100644 --- a/sway/commands/input/left_handed.c +++ b/sway/commands/input/left_handed.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/config.h" | ||
3 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | 6 | ||
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_left_handed(int argc, char **argv) { | |||
24 | "Expected 'left_handed <enabled|disabled>'"); | 25 | "Expected 'left_handed <enabled|disabled>'"); |
25 | } | 26 | } |
26 | 27 | ||
27 | input_cmd_apply(new_config); | 28 | apply_input_config(new_config); |
28 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 29 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
29 | } | 30 | } |
diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c index e19964d8..7bc08ae6 100644 --- a/sway/commands/input/middle_emulation.c +++ b/sway/commands/input/middle_emulation.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/config.h" | ||
3 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | 6 | ||
@@ -25,6 +26,6 @@ struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) { | |||
25 | "Expected 'middle_emulation <enabled|disabled>'"); | 26 | "Expected 'middle_emulation <enabled|disabled>'"); |
26 | } | 27 | } |
27 | 28 | ||
28 | input_cmd_apply(new_config); | 29 | apply_input_config(new_config); |
29 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 30 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
30 | } | 31 | } |
diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c index 8272c5b3..a7dcdc2c 100644 --- a/sway/commands/input/natural_scroll.c +++ b/sway/commands/input/natural_scroll.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/config.h" | ||
3 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | 6 | ||
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) { | |||
24 | "Expected 'natural_scroll <enabled|disabled>'"); | 25 | "Expected 'natural_scroll <enabled|disabled>'"); |
25 | } | 26 | } |
26 | 27 | ||
27 | input_cmd_apply(new_config); | 28 | apply_input_config(new_config); |
28 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 29 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
29 | } | 30 | } |
diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c index 2c9db5bf..d2261a63 100644 --- a/sway/commands/input/pointer_accel.c +++ b/sway/commands/input/pointer_accel.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <string.h> | 2 | #include <string.h> |
3 | #include "sway/config.h" | ||
3 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | 6 | ||
@@ -22,6 +23,6 @@ struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) { | |||
22 | } | 23 | } |
23 | new_config->pointer_accel = pointer_accel; | 24 | new_config->pointer_accel = pointer_accel; |
24 | 25 | ||
25 | input_cmd_apply(new_config); | 26 | apply_input_config(new_config); |
26 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 27 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
27 | } | 28 | } |
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c index 40277155..035262cf 100644 --- a/sway/commands/input/scroll_method.c +++ b/sway/commands/input/scroll_method.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/config.h" | ||
3 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | 6 | ||
@@ -28,6 +29,6 @@ struct cmd_results *input_cmd_scroll_method(int argc, char **argv) { | |||
28 | "Expected 'scroll_method <none|two_finger|edge|on_button_down>'"); | 29 | "Expected 'scroll_method <none|two_finger|edge|on_button_down>'"); |
29 | } | 30 | } |
30 | 31 | ||
31 | input_cmd_apply(new_config); | 32 | apply_input_config(new_config); |
32 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 33 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
33 | } | 34 | } |
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c index 18a54087..8547c0cd 100644 --- a/sway/commands/input/tap.c +++ b/sway/commands/input/tap.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/config.h" | ||
3 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
4 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
5 | #include "log.h" | 6 | #include "log.h" |
@@ -27,6 +28,6 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) { | |||
27 | 28 | ||
28 | sway_log(L_DEBUG, "apply-tap for device: %s", | 29 | sway_log(L_DEBUG, "apply-tap for device: %s", |
29 | current_input_config->identifier); | 30 | current_input_config->identifier); |
30 | input_cmd_apply(new_config); | 31 | apply_input_config(new_config); |
31 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 32 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
32 | } | 33 | } |
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c index 9a9ce044..4470fb1d 100644 --- a/sway/commands/input/xkb_layout.c +++ b/sway/commands/input/xkb_layout.c | |||
@@ -1,4 +1,5 @@ | |||
1 | #define _XOPEN_SOURCE 700 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include "sway/config.h" | ||
2 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
3 | #include "sway/input/input-manager.h" | 4 | #include "sway/input/input-manager.h" |
4 | #include "log.h" | 5 | #include "log.h" |
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) { | |||
19 | 20 | ||
20 | sway_log(L_DEBUG, "apply-xkb_layout for device: %s", | 21 | sway_log(L_DEBUG, "apply-xkb_layout for device: %s", |
21 | current_input_config->identifier); | 22 | current_input_config->identifier); |
22 | input_cmd_apply(new_config); | 23 | apply_input_config(new_config); |
23 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
24 | } | 25 | } |
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c index 14a50ffb..167ce2e7 100644 --- a/sway/commands/input/xkb_model.c +++ b/sway/commands/input/xkb_model.c | |||
@@ -1,4 +1,5 @@ | |||
1 | #define _XOPEN_SOURCE 700 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include "sway/config.h" | ||
2 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
3 | #include "sway/input/input-manager.h" | 4 | #include "sway/input/input-manager.h" |
4 | #include "log.h" | 5 | #include "log.h" |
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_model(int argc, char **argv) { | |||
19 | 20 | ||
20 | sway_log(L_DEBUG, "apply-xkb_model for device: %s", | 21 | sway_log(L_DEBUG, "apply-xkb_model for device: %s", |
21 | current_input_config->identifier); | 22 | current_input_config->identifier); |
22 | input_cmd_apply(new_config); | 23 | apply_input_config(new_config); |
23 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
24 | } | 25 | } |
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c index 67eb5342..180f40d5 100644 --- a/sway/commands/input/xkb_options.c +++ b/sway/commands/input/xkb_options.c | |||
@@ -1,4 +1,5 @@ | |||
1 | #define _XOPEN_SOURCE 700 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include "sway/config.h" | ||
2 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
3 | #include "sway/input/input-manager.h" | 4 | #include "sway/input/input-manager.h" |
4 | #include "log.h" | 5 | #include "log.h" |
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_options(int argc, char **argv) { | |||
19 | 20 | ||
20 | sway_log(L_DEBUG, "apply-xkb_options for device: %s", | 21 | sway_log(L_DEBUG, "apply-xkb_options for device: %s", |
21 | current_input_config->identifier); | 22 | current_input_config->identifier); |
22 | input_cmd_apply(new_config); | 23 | apply_input_config(new_config); |
23 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
24 | } | 25 | } |
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c index 3eda0bdd..047e8c84 100644 --- a/sway/commands/input/xkb_rules.c +++ b/sway/commands/input/xkb_rules.c | |||
@@ -1,4 +1,5 @@ | |||
1 | #define _XOPEN_SOURCE 700 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include "sway/config.h" | ||
2 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
3 | #include "sway/input/input-manager.h" | 4 | #include "sway/input/input-manager.h" |
4 | #include "log.h" | 5 | #include "log.h" |
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) { | |||
19 | 20 | ||
20 | sway_log(L_DEBUG, "apply-xkb_rules for device: %s", | 21 | sway_log(L_DEBUG, "apply-xkb_rules for device: %s", |
21 | current_input_config->identifier); | 22 | current_input_config->identifier); |
22 | input_cmd_apply(new_config); | 23 | apply_input_config(new_config); |
23 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
24 | } | 25 | } |
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c index c7f93ad4..0e998457 100644 --- a/sway/commands/input/xkb_variant.c +++ b/sway/commands/input/xkb_variant.c | |||
@@ -1,4 +1,5 @@ | |||
1 | #define _XOPEN_SOURCE 700 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include "sway/config.h" | ||
2 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
3 | #include "sway/input/input-manager.h" | 4 | #include "sway/input/input-manager.h" |
4 | #include "log.h" | 5 | #include "log.h" |
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) { | |||
19 | 20 | ||
20 | sway_log(L_DEBUG, "apply-xkb_variant for device: %s", | 21 | sway_log(L_DEBUG, "apply-xkb_variant for device: %s", |
21 | current_input_config->identifier); | 22 | current_input_config->identifier); |
22 | input_cmd_apply(new_config); | 23 | apply_input_config(new_config); |
23 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
24 | } | 25 | } |
diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c index 996c1bda..80ec63ce 100644 --- a/sway/commands/seat/attach.c +++ b/sway/commands/seat/attach.c | |||
@@ -21,6 +21,6 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) { | |||
21 | new_attachment->identifier = strdup(argv[0]); | 21 | new_attachment->identifier = strdup(argv[0]); |
22 | list_add(new_config->attachments, new_attachment); | 22 | list_add(new_config->attachments, new_attachment); |
23 | 23 | ||
24 | seat_cmd_apply(new_config); | 24 | apply_seat_config(new_config); |
25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
26 | } | 26 | } |