diff options
author | Dominique Martinet <asmadeus@codewreck.org> | 2018-01-05 22:32:51 +0100 |
---|---|---|
committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-01-05 23:39:46 +0100 |
commit | 67985e903188a464e602d04f9ed218bd397f5ab1 (patch) | |
tree | 3589175749c9a2ed746b0cc280ab3ccfb33125e9 /sway/commands/input | |
parent | Merge pull request #1554 from martinetd/cmd_set (diff) | |
download | sway-67985e903188a464e602d04f9ed218bd397f5ab1.tar.gz sway-67985e903188a464e602d04f9ed218bd397f5ab1.tar.zst sway-67985e903188a464e602d04f9ed218bd397f5ab1.zip |
sway: change all sway_log to wlr_log
Diffstat (limited to 'sway/commands/input')
-rw-r--r-- | sway/commands/input/click_method.c | 2 | ||||
-rw-r--r-- | sway/commands/input/events.c | 2 | ||||
-rw-r--r-- | sway/commands/input/tap.c | 4 | ||||
-rw-r--r-- | sway/commands/input/xkb_layout.c | 4 | ||||
-rw-r--r-- | sway/commands/input/xkb_model.c | 4 | ||||
-rw-r--r-- | sway/commands/input/xkb_options.c | 4 | ||||
-rw-r--r-- | sway/commands/input/xkb_rules.c | 4 | ||||
-rw-r--r-- | sway/commands/input/xkb_variant.c | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c index dcf64c1a..22eb15f7 100644 --- a/sway/commands/input/click_method.c +++ b/sway/commands/input/click_method.c | |||
@@ -6,7 +6,7 @@ | |||
6 | #include "log.h" | 6 | #include "log.h" |
7 | 7 | ||
8 | struct cmd_results *input_cmd_click_method(int argc, char **argv) { | 8 | struct cmd_results *input_cmd_click_method(int argc, char **argv) { |
9 | sway_log(L_DEBUG, "click_method for device: %d %s", | 9 | wlr_log(L_DEBUG, "click_method for device: %d %s", |
10 | current_input_config==NULL, current_input_config->identifier); | 10 | current_input_config==NULL, current_input_config->identifier); |
11 | struct cmd_results *error = NULL; | 11 | struct cmd_results *error = NULL; |
12 | if ((error = checkarg(argc, "click_method", EXPECTED_AT_LEAST, 1))) { | 12 | if ((error = checkarg(argc, "click_method", EXPECTED_AT_LEAST, 1))) { |
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c index 8a74c11e..a1bfbacd 100644 --- a/sway/commands/input/events.c +++ b/sway/commands/input/events.c | |||
@@ -6,7 +6,7 @@ | |||
6 | #include "log.h" | 6 | #include "log.h" |
7 | 7 | ||
8 | struct cmd_results *input_cmd_events(int argc, char **argv) { | 8 | struct cmd_results *input_cmd_events(int argc, char **argv) { |
9 | sway_log(L_DEBUG, "events for device: %s", | 9 | wlr_log(L_DEBUG, "events for device: %s", |
10 | current_input_config->identifier); | 10 | current_input_config->identifier); |
11 | struct cmd_results *error = NULL; | 11 | struct cmd_results *error = NULL; |
12 | if ((error = checkarg(argc, "events", EXPECTED_AT_LEAST, 1))) { | 12 | if ((error = checkarg(argc, "events", EXPECTED_AT_LEAST, 1))) { |
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c index 8547c0cd..ecab9a5b 100644 --- a/sway/commands/input/tap.c +++ b/sway/commands/input/tap.c | |||
@@ -6,7 +6,7 @@ | |||
6 | #include "log.h" | 6 | #include "log.h" |
7 | 7 | ||
8 | struct cmd_results *input_cmd_tap(int argc, char **argv) { | 8 | struct cmd_results *input_cmd_tap(int argc, char **argv) { |
9 | sway_log(L_DEBUG, "tap for device: %s", current_input_config->identifier); | 9 | wlr_log(L_DEBUG, "tap for device: %s", current_input_config->identifier); |
10 | struct cmd_results *error = NULL; | 10 | struct cmd_results *error = NULL; |
11 | if ((error = checkarg(argc, "tap", EXPECTED_AT_LEAST, 1))) { | 11 | if ((error = checkarg(argc, "tap", EXPECTED_AT_LEAST, 1))) { |
12 | return error; | 12 | return error; |
@@ -26,7 +26,7 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) { | |||
26 | "Expected 'tap <enabled|disabled>'"); | 26 | "Expected 'tap <enabled|disabled>'"); |
27 | } | 27 | } |
28 | 28 | ||
29 | sway_log(L_DEBUG, "apply-tap for device: %s", | 29 | wlr_log(L_DEBUG, "apply-tap for device: %s", |
30 | current_input_config->identifier); | 30 | current_input_config->identifier); |
31 | apply_input_config(new_config); | 31 | apply_input_config(new_config); |
32 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 32 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c index a25d3850..25db1a33 100644 --- a/sway/commands/input/xkb_layout.c +++ b/sway/commands/input/xkb_layout.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include "log.h" | 5 | #include "log.h" |
6 | 6 | ||
7 | struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) { | 7 | struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) { |
8 | sway_log(L_DEBUG, "xkb layout for device: %s", current_input_config->identifier); | 8 | wlr_log(L_DEBUG, "xkb layout for device: %s", current_input_config->identifier); |
9 | struct cmd_results *error = NULL; | 9 | struct cmd_results *error = NULL; |
10 | if ((error = checkarg(argc, "xkb_layout", EXPECTED_EQUAL_TO, 1))) { | 10 | if ((error = checkarg(argc, "xkb_layout", EXPECTED_EQUAL_TO, 1))) { |
11 | return error; | 11 | return error; |
@@ -18,7 +18,7 @@ struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) { | |||
18 | 18 | ||
19 | new_config->xkb_layout = strdup(argv[0]); | 19 | new_config->xkb_layout = strdup(argv[0]); |
20 | 20 | ||
21 | sway_log(L_DEBUG, "apply-xkb_layout for device: %s layout: %s", | 21 | wlr_log(L_DEBUG, "apply-xkb_layout for device: %s layout: %s", |
22 | current_input_config->identifier, new_config->xkb_layout); | 22 | current_input_config->identifier, new_config->xkb_layout); |
23 | apply_input_config(new_config); | 23 | apply_input_config(new_config); |
24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c index 9729e869..819b796b 100644 --- a/sway/commands/input/xkb_model.c +++ b/sway/commands/input/xkb_model.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include "log.h" | 5 | #include "log.h" |
6 | 6 | ||
7 | struct cmd_results *input_cmd_xkb_model(int argc, char **argv) { | 7 | struct cmd_results *input_cmd_xkb_model(int argc, char **argv) { |
8 | sway_log(L_DEBUG, "xkb model for device: %s", current_input_config->identifier); | 8 | wlr_log(L_DEBUG, "xkb model for device: %s", current_input_config->identifier); |
9 | struct cmd_results *error = NULL; | 9 | struct cmd_results *error = NULL; |
10 | if ((error = checkarg(argc, "xkb_model", EXPECTED_EQUAL_TO, 1))) { | 10 | if ((error = checkarg(argc, "xkb_model", EXPECTED_EQUAL_TO, 1))) { |
11 | return error; | 11 | return error; |
@@ -18,7 +18,7 @@ struct cmd_results *input_cmd_xkb_model(int argc, char **argv) { | |||
18 | 18 | ||
19 | new_config->xkb_model = strdup(argv[0]); | 19 | new_config->xkb_model = strdup(argv[0]); |
20 | 20 | ||
21 | sway_log(L_DEBUG, "apply-xkb_model for device: %s model: %s", | 21 | wlr_log(L_DEBUG, "apply-xkb_model for device: %s model: %s", |
22 | current_input_config->identifier, new_config->xkb_model); | 22 | current_input_config->identifier, new_config->xkb_model); |
23 | apply_input_config(new_config); | 23 | apply_input_config(new_config); |
24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c index 504849cc..ff5f83ec 100644 --- a/sway/commands/input/xkb_options.c +++ b/sway/commands/input/xkb_options.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include "log.h" | 5 | #include "log.h" |
6 | 6 | ||
7 | struct cmd_results *input_cmd_xkb_options(int argc, char **argv) { | 7 | struct cmd_results *input_cmd_xkb_options(int argc, char **argv) { |
8 | sway_log(L_DEBUG, "xkb options for device: %s", current_input_config->identifier); | 8 | wlr_log(L_DEBUG, "xkb options for device: %s", current_input_config->identifier); |
9 | struct cmd_results *error = NULL; | 9 | struct cmd_results *error = NULL; |
10 | if ((error = checkarg(argc, "xkb_options", EXPECTED_EQUAL_TO, 1))) { | 10 | if ((error = checkarg(argc, "xkb_options", EXPECTED_EQUAL_TO, 1))) { |
11 | return error; | 11 | return error; |
@@ -18,7 +18,7 @@ struct cmd_results *input_cmd_xkb_options(int argc, char **argv) { | |||
18 | 18 | ||
19 | new_config->xkb_options = strdup(argv[0]); | 19 | new_config->xkb_options = strdup(argv[0]); |
20 | 20 | ||
21 | sway_log(L_DEBUG, "apply-xkb_options for device: %s options: %s", | 21 | wlr_log(L_DEBUG, "apply-xkb_options for device: %s options: %s", |
22 | current_input_config->identifier, new_config->xkb_options); | 22 | current_input_config->identifier, new_config->xkb_options); |
23 | apply_input_config(new_config); | 23 | apply_input_config(new_config); |
24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c index db7d8abe..aafe0003 100644 --- a/sway/commands/input/xkb_rules.c +++ b/sway/commands/input/xkb_rules.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include "log.h" | 5 | #include "log.h" |
6 | 6 | ||
7 | struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) { | 7 | struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) { |
8 | sway_log(L_DEBUG, "xkb rules for device: %s", current_input_config->identifier); | 8 | wlr_log(L_DEBUG, "xkb rules for device: %s", current_input_config->identifier); |
9 | struct cmd_results *error = NULL; | 9 | struct cmd_results *error = NULL; |
10 | if ((error = checkarg(argc, "xkb_rules", EXPECTED_EQUAL_TO, 1))) { | 10 | if ((error = checkarg(argc, "xkb_rules", EXPECTED_EQUAL_TO, 1))) { |
11 | return error; | 11 | return error; |
@@ -18,7 +18,7 @@ struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) { | |||
18 | 18 | ||
19 | new_config->xkb_rules = strdup(argv[0]); | 19 | new_config->xkb_rules = strdup(argv[0]); |
20 | 20 | ||
21 | sway_log(L_DEBUG, "apply-xkb_rules for device: %s rules: %s", | 21 | wlr_log(L_DEBUG, "apply-xkb_rules for device: %s rules: %s", |
22 | current_input_config->identifier, new_config->xkb_rules); | 22 | current_input_config->identifier, new_config->xkb_rules); |
23 | apply_input_config(new_config); | 23 | apply_input_config(new_config); |
24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c index 855e6abc..89a61fdc 100644 --- a/sway/commands/input/xkb_variant.c +++ b/sway/commands/input/xkb_variant.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include "log.h" | 5 | #include "log.h" |
6 | 6 | ||
7 | struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) { | 7 | struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) { |
8 | sway_log(L_DEBUG, "xkb variant for device: %s", current_input_config->identifier); | 8 | wlr_log(L_DEBUG, "xkb variant for device: %s", current_input_config->identifier); |
9 | struct cmd_results *error = NULL; | 9 | struct cmd_results *error = NULL; |
10 | if ((error = checkarg(argc, "xkb_variant", EXPECTED_EQUAL_TO, 1))) { | 10 | if ((error = checkarg(argc, "xkb_variant", EXPECTED_EQUAL_TO, 1))) { |
11 | return error; | 11 | return error; |
@@ -18,7 +18,7 @@ struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) { | |||
18 | 18 | ||
19 | new_config->xkb_variant = strdup(argv[0]); | 19 | new_config->xkb_variant = strdup(argv[0]); |
20 | 20 | ||
21 | sway_log(L_DEBUG, "apply-xkb_variant for device: %s variant: %s", | 21 | wlr_log(L_DEBUG, "apply-xkb_variant for device: %s variant: %s", |
22 | current_input_config->identifier, new_config->xkb_variant); | 22 | current_input_config->identifier, new_config->xkb_variant); |
23 | apply_input_config(new_config); | 23 | apply_input_config(new_config); |
24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |