diff options
author | emersion <contact@emersion.fr> | 2018-07-09 22:54:30 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-07-09 22:54:30 +0100 |
commit | 63b4bf500020cf35cebfdce2d73f8e359ff495c2 (patch) | |
tree | 76624b3d4820551261e5c15f773c403c1a41264e /sway/commands | |
parent | Merge pull request #2223 from RyanDwyer/floating-move (diff) | |
download | sway-63b4bf500020cf35cebfdce2d73f8e359ff495c2.tar.gz sway-63b4bf500020cf35cebfdce2d73f8e359ff495c2.tar.zst sway-63b4bf500020cf35cebfdce2d73f8e359ff495c2.zip |
Update for swaywm/wlroots#1126
Diffstat (limited to 'sway/commands')
38 files changed, 53 insertions, 53 deletions
diff --git a/sway/commands/assign.c b/sway/commands/assign.c index a90498ce..0bc0929a 100644 --- a/sway/commands/assign.c +++ b/sway/commands/assign.c | |||
@@ -45,7 +45,7 @@ struct cmd_results *cmd_assign(int argc, char **argv) { | |||
45 | criteria->target = join_args(argv, target_len); | 45 | criteria->target = join_args(argv, target_len); |
46 | 46 | ||
47 | list_add(config->criteria, criteria); | 47 | list_add(config->criteria, criteria); |
48 | wlr_log(L_DEBUG, "assign: '%s' -> '%s' added", criteria->raw, | 48 | wlr_log(WLR_DEBUG, "assign: '%s' -> '%s' added", criteria->raw, |
49 | criteria->target); | 49 | criteria->target); |
50 | 50 | ||
51 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 51 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/commands/bar.c b/sway/commands/bar.c index d84ce808..f6a70c17 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c | |||
@@ -63,13 +63,13 @@ struct cmd_results *cmd_bar(int argc, char **argv) { | |||
63 | for (int i = 0; i < config->bars->length; ++i) { | 63 | for (int i = 0; i < config->bars->length; ++i) { |
64 | struct bar_config *item = config->bars->items[i]; | 64 | struct bar_config *item = config->bars->items[i]; |
65 | if (strcmp(item->id, argv[0]) == 0) { | 65 | if (strcmp(item->id, argv[0]) == 0) { |
66 | wlr_log(L_DEBUG, "Selecting bar: %s", argv[0]); | 66 | wlr_log(WLR_DEBUG, "Selecting bar: %s", argv[0]); |
67 | bar = item; | 67 | bar = item; |
68 | break; | 68 | break; |
69 | } | 69 | } |
70 | } | 70 | } |
71 | if (!bar) { | 71 | if (!bar) { |
72 | wlr_log(L_DEBUG, "Creating bar: %s", argv[0]); | 72 | wlr_log(WLR_DEBUG, "Creating bar: %s", argv[0]); |
73 | bar = default_bar_config(); | 73 | bar = default_bar_config(); |
74 | if (!bar) { | 74 | if (!bar) { |
75 | return cmd_results_new(CMD_FAILURE, "bar", | 75 | return cmd_results_new(CMD_FAILURE, "bar", |
@@ -108,7 +108,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) { | |||
108 | 108 | ||
109 | // Set current bar | 109 | // Set current bar |
110 | config->current_bar = bar; | 110 | config->current_bar = bar; |
111 | wlr_log(L_DEBUG, "Creating bar %s", bar->id); | 111 | wlr_log(WLR_DEBUG, "Creating bar %s", bar->id); |
112 | } | 112 | } |
113 | 113 | ||
114 | return config_subcommand(argv, argc, bar_handlers, sizeof(bar_handlers)); | 114 | return config_subcommand(argv, argc, bar_handlers, sizeof(bar_handlers)); |
diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c index 3ba5f33f..0c48bee9 100644 --- a/sway/commands/bar/binding_mode_indicator.c +++ b/sway/commands/bar/binding_mode_indicator.c | |||
@@ -15,11 +15,11 @@ struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) { | |||
15 | } | 15 | } |
16 | if (strcasecmp("yes", argv[0]) == 0) { | 16 | if (strcasecmp("yes", argv[0]) == 0) { |
17 | config->current_bar->binding_mode_indicator = true; | 17 | config->current_bar->binding_mode_indicator = true; |
18 | wlr_log(L_DEBUG, "Enabling binding mode indicator on bar: %s", | 18 | wlr_log(WLR_DEBUG, "Enabling binding mode indicator on bar: %s", |
19 | config->current_bar->id); | 19 | config->current_bar->id); |
20 | } else if (strcasecmp("no", argv[0]) == 0) { | 20 | } else if (strcasecmp("no", argv[0]) == 0) { |
21 | config->current_bar->binding_mode_indicator = false; | 21 | config->current_bar->binding_mode_indicator = false; |
22 | wlr_log(L_DEBUG, "Disabling binding mode indicator on bar: %s", | 22 | wlr_log(WLR_DEBUG, "Disabling binding mode indicator on bar: %s", |
23 | config->current_bar->id); | 23 | config->current_bar->id); |
24 | } | 24 | } |
25 | return cmd_results_new(CMD_INVALID, "binding_mode_indicator", | 25 | return cmd_results_new(CMD_INVALID, "binding_mode_indicator", |
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c index f036cbc3..2aa4e895 100644 --- a/sway/commands/bar/font.c +++ b/sway/commands/bar/font.c | |||
@@ -15,7 +15,7 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) { | |||
15 | char *font = join_args(argv, argc); | 15 | char *font = join_args(argv, argc); |
16 | free(config->current_bar->font); | 16 | free(config->current_bar->font); |
17 | config->current_bar->font = font; | 17 | config->current_bar->font = font; |
18 | wlr_log(L_DEBUG, "Settings font '%s' for bar: %s", | 18 | wlr_log(WLR_DEBUG, "Settings font '%s' for bar: %s", |
19 | config->current_bar->font, config->current_bar->id); | 19 | config->current_bar->font, config->current_bar->id); |
20 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 20 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
21 | } | 21 | } |
diff --git a/sway/commands/bar/height.c b/sway/commands/bar/height.c index 3160caed..18258526 100644 --- a/sway/commands/bar/height.c +++ b/sway/commands/bar/height.c | |||
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_height(int argc, char **argv) { | |||
14 | "Invalid height value: %s", argv[0]); | 14 | "Invalid height value: %s", argv[0]); |
15 | } | 15 | } |
16 | config->current_bar->height = height; | 16 | config->current_bar->height = height; |
17 | wlr_log(L_DEBUG, "Setting bar height to %d on bar: %s", | 17 | wlr_log(WLR_DEBUG, "Setting bar height to %d on bar: %s", |
18 | height, config->current_bar->id); | 18 | height, config->current_bar->id); |
19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
20 | } | 20 | } |
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c index 6641f184..502ce2c4 100644 --- a/sway/commands/bar/hidden_state.c +++ b/sway/commands/bar/hidden_state.c | |||
@@ -27,7 +27,7 @@ static struct cmd_results *bar_set_hidden_state(struct bar_config *bar, | |||
27 | if (!config->reading) { | 27 | if (!config->reading) { |
28 | ipc_event_barconfig_update(bar); | 28 | ipc_event_barconfig_update(bar); |
29 | } | 29 | } |
30 | wlr_log(L_DEBUG, "Setting hidden_state: '%s' for bar: %s", | 30 | wlr_log(WLR_DEBUG, "Setting hidden_state: '%s' for bar: %s", |
31 | bar->hidden_state, bar->id); | 31 | bar->hidden_state, bar->id); |
32 | } | 32 | } |
33 | // free old mode | 33 | // free old mode |
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c index 6ce86fef..65fa69fd 100644 --- a/sway/commands/bar/id.c +++ b/sway/commands/bar/id.c | |||
@@ -24,7 +24,7 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) { | |||
24 | } | 24 | } |
25 | } | 25 | } |
26 | 26 | ||
27 | wlr_log(L_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name); | 27 | wlr_log(WLR_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name); |
28 | 28 | ||
29 | // free old bar id | 29 | // free old bar id |
30 | free(config->current_bar->id); | 30 | free(config->current_bar->id); |
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c index 34bb0a4f..28e2d77b 100644 --- a/sway/commands/bar/mode.c +++ b/sway/commands/bar/mode.c | |||
@@ -28,7 +28,7 @@ static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode | |||
28 | if (!config->reading) { | 28 | if (!config->reading) { |
29 | ipc_event_barconfig_update(bar); | 29 | ipc_event_barconfig_update(bar); |
30 | } | 30 | } |
31 | wlr_log(L_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id); | 31 | wlr_log(WLR_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id); |
32 | } | 32 | } |
33 | 33 | ||
34 | // free old mode | 34 | // free old mode |
diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c index 02f845e6..09025fff 100644 --- a/sway/commands/bar/modifier.c +++ b/sway/commands/bar/modifier.c | |||
@@ -30,7 +30,7 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) { | |||
30 | } | 30 | } |
31 | free_flat_list(split); | 31 | free_flat_list(split); |
32 | config->current_bar->modifier = mod; | 32 | config->current_bar->modifier = mod; |
33 | wlr_log(L_DEBUG, | 33 | wlr_log(WLR_DEBUG, |
34 | "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); | 34 | "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); |
35 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 35 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
36 | } | 36 | } |
diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c index f7ca0aa4..72754e05 100644 --- a/sway/commands/bar/output.c +++ b/sway/commands/bar/output.c | |||
@@ -42,7 +42,7 @@ struct cmd_results *bar_cmd_output(int argc, char **argv) { | |||
42 | 42 | ||
43 | if (add_output) { | 43 | if (add_output) { |
44 | list_add(outputs, strdup(output)); | 44 | list_add(outputs, strdup(output)); |
45 | wlr_log(L_DEBUG, "Adding bar: '%s' to output '%s'", | 45 | wlr_log(WLR_DEBUG, "Adding bar: '%s' to output '%s'", |
46 | config->current_bar->id, output); | 46 | config->current_bar->id, output); |
47 | } | 47 | } |
48 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 48 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/commands/bar/pango_markup.c b/sway/commands/bar/pango_markup.c index 480af724..857571fb 100644 --- a/sway/commands/bar/pango_markup.c +++ b/sway/commands/bar/pango_markup.c | |||
@@ -13,11 +13,11 @@ struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) { | |||
13 | } | 13 | } |
14 | if (strcasecmp("enabled", argv[0]) == 0) { | 14 | if (strcasecmp("enabled", argv[0]) == 0) { |
15 | config->current_bar->pango_markup = true; | 15 | config->current_bar->pango_markup = true; |
16 | wlr_log(L_DEBUG, "Enabling pango markup for bar: %s", | 16 | wlr_log(WLR_DEBUG, "Enabling pango markup for bar: %s", |
17 | config->current_bar->id); | 17 | config->current_bar->id); |
18 | } else if (strcasecmp("disabled", argv[0]) == 0) { | 18 | } else if (strcasecmp("disabled", argv[0]) == 0) { |
19 | config->current_bar->pango_markup = false; | 19 | config->current_bar->pango_markup = false; |
20 | wlr_log(L_DEBUG, "Disabling pango markup for bar: %s", | 20 | wlr_log(WLR_DEBUG, "Disabling pango markup for bar: %s", |
21 | config->current_bar->id); | 21 | config->current_bar->id); |
22 | } else { | 22 | } else { |
23 | error = cmd_results_new(CMD_INVALID, "pango_markup", | 23 | error = cmd_results_new(CMD_INVALID, "pango_markup", |
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c index 9c580483..48e7ddbd 100644 --- a/sway/commands/bar/position.c +++ b/sway/commands/bar/position.c | |||
@@ -15,7 +15,7 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) { | |||
15 | char *valid[] = { "top", "bottom", "left", "right" }; | 15 | char *valid[] = { "top", "bottom", "left", "right" }; |
16 | for (size_t i = 0; i < sizeof(valid) / sizeof(valid[0]); ++i) { | 16 | for (size_t i = 0; i < sizeof(valid) / sizeof(valid[0]); ++i) { |
17 | if (strcasecmp(valid[i], argv[0]) == 0) { | 17 | if (strcasecmp(valid[i], argv[0]) == 0) { |
18 | wlr_log(L_DEBUG, "Setting bar position '%s' for bar: %s", | 18 | wlr_log(WLR_DEBUG, "Setting bar position '%s' for bar: %s", |
19 | argv[0], config->current_bar->id); | 19 | argv[0], config->current_bar->id); |
20 | config->current_bar->position = strdup(argv[0]); | 20 | config->current_bar->position = strdup(argv[0]); |
21 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 21 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c index 1e08df6d..392ab730 100644 --- a/sway/commands/bar/separator_symbol.c +++ b/sway/commands/bar/separator_symbol.c | |||
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) { | |||
14 | } | 14 | } |
15 | free(config->current_bar->separator_symbol); | 15 | free(config->current_bar->separator_symbol); |
16 | config->current_bar->separator_symbol = strdup(argv[0]); | 16 | config->current_bar->separator_symbol = strdup(argv[0]); |
17 | wlr_log(L_DEBUG, "Settings separator_symbol '%s' for bar: %s", | 17 | wlr_log(WLR_DEBUG, "Settings separator_symbol '%s' for bar: %s", |
18 | config->current_bar->separator_symbol, config->current_bar->id); | 18 | config->current_bar->separator_symbol, config->current_bar->id); |
19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
20 | } | 20 | } |
diff --git a/sway/commands/bar/status_command.c b/sway/commands/bar/status_command.c index 5e199cde..6f6f81a3 100644 --- a/sway/commands/bar/status_command.c +++ b/sway/commands/bar/status_command.c | |||
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_status_command(int argc, char **argv) { | |||
14 | } | 14 | } |
15 | free(config->current_bar->status_command); | 15 | free(config->current_bar->status_command); |
16 | config->current_bar->status_command = join_args(argv, argc); | 16 | config->current_bar->status_command = join_args(argv, argc); |
17 | wlr_log(L_DEBUG, "Feeding bar with status command: %s", | 17 | wlr_log(WLR_DEBUG, "Feeding bar with status command: %s", |
18 | config->current_bar->status_command); | 18 | config->current_bar->status_command); |
19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
20 | } | 20 | } |
diff --git a/sway/commands/bar/strip_workspace_numbers.c b/sway/commands/bar/strip_workspace_numbers.c index 4f24a356..4e47d047 100644 --- a/sway/commands/bar/strip_workspace_numbers.c +++ b/sway/commands/bar/strip_workspace_numbers.c | |||
@@ -15,11 +15,11 @@ struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) { | |||
15 | } | 15 | } |
16 | if (strcasecmp("yes", argv[0]) == 0) { | 16 | if (strcasecmp("yes", argv[0]) == 0) { |
17 | config->current_bar->strip_workspace_numbers = true; | 17 | config->current_bar->strip_workspace_numbers = true; |
18 | wlr_log(L_DEBUG, "Stripping workspace numbers on bar: %s", | 18 | wlr_log(WLR_DEBUG, "Stripping workspace numbers on bar: %s", |
19 | config->current_bar->id); | 19 | config->current_bar->id); |
20 | } else if (strcasecmp("no", argv[0]) == 0) { | 20 | } else if (strcasecmp("no", argv[0]) == 0) { |
21 | config->current_bar->strip_workspace_numbers = false; | 21 | config->current_bar->strip_workspace_numbers = false; |
22 | wlr_log(L_DEBUG, "Enabling workspace numbers on bar: %s", | 22 | wlr_log(WLR_DEBUG, "Enabling workspace numbers on bar: %s", |
23 | config->current_bar->id); | 23 | config->current_bar->id); |
24 | } else { | 24 | } else { |
25 | return cmd_results_new(CMD_INVALID, | 25 | return cmd_results_new(CMD_INVALID, |
diff --git a/sway/commands/bar/swaybar_command.c b/sway/commands/bar/swaybar_command.c index 520cdd11..04e78e77 100644 --- a/sway/commands/bar/swaybar_command.c +++ b/sway/commands/bar/swaybar_command.c | |||
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) { | |||
14 | } | 14 | } |
15 | free(config->current_bar->swaybar_command); | 15 | free(config->current_bar->swaybar_command); |
16 | config->current_bar->swaybar_command = join_args(argv, argc); | 16 | config->current_bar->swaybar_command = join_args(argv, argc); |
17 | wlr_log(L_DEBUG, "Using custom swaybar command: %s", | 17 | wlr_log(WLR_DEBUG, "Using custom swaybar command: %s", |
18 | config->current_bar->swaybar_command); | 18 | config->current_bar->swaybar_command); |
19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
20 | } | 20 | } |
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c index 6edc3a0d..a4079b2a 100644 --- a/sway/commands/bar/workspace_buttons.c +++ b/sway/commands/bar/workspace_buttons.c | |||
@@ -14,11 +14,11 @@ struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) { | |||
14 | } | 14 | } |
15 | if (strcasecmp("yes", argv[0]) == 0) { | 15 | if (strcasecmp("yes", argv[0]) == 0) { |
16 | config->current_bar->workspace_buttons = true; | 16 | config->current_bar->workspace_buttons = true; |
17 | wlr_log(L_DEBUG, "Enabling workspace buttons on bar: %s", | 17 | wlr_log(WLR_DEBUG, "Enabling workspace buttons on bar: %s", |
18 | config->current_bar->id); | 18 | config->current_bar->id); |
19 | } else if (strcasecmp("no", argv[0]) == 0) { | 19 | } else if (strcasecmp("no", argv[0]) == 0) { |
20 | config->current_bar->workspace_buttons = false; | 20 | config->current_bar->workspace_buttons = false; |
21 | wlr_log(L_DEBUG, "Disabling workspace buttons on bar: %s", | 21 | wlr_log(WLR_DEBUG, "Disabling workspace buttons on bar: %s", |
22 | config->current_bar->id); | 22 | config->current_bar->id); |
23 | } else { | 23 | } else { |
24 | return cmd_results_new(CMD_INVALID, "workspace_buttons", | 24 | return cmd_results_new(CMD_INVALID, "workspace_buttons", |
diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c index 7386f82c..701de00a 100644 --- a/sway/commands/bar/wrap_scroll.c +++ b/sway/commands/bar/wrap_scroll.c | |||
@@ -13,11 +13,11 @@ struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) { | |||
13 | } | 13 | } |
14 | if (strcasecmp("yes", argv[0]) == 0) { | 14 | if (strcasecmp("yes", argv[0]) == 0) { |
15 | config->current_bar->wrap_scroll = true; | 15 | config->current_bar->wrap_scroll = true; |
16 | wlr_log(L_DEBUG, "Enabling wrap scroll on bar: %s", | 16 | wlr_log(WLR_DEBUG, "Enabling wrap scroll on bar: %s", |
17 | config->current_bar->id); | 17 | config->current_bar->id); |
18 | } else if (strcasecmp("no", argv[0]) == 0) { | 18 | } else if (strcasecmp("no", argv[0]) == 0) { |
19 | config->current_bar->wrap_scroll = false; | 19 | config->current_bar->wrap_scroll = false; |
20 | wlr_log(L_DEBUG, "Disabling wrap scroll on bar: %s", | 20 | wlr_log(WLR_DEBUG, "Disabling wrap scroll on bar: %s", |
21 | config->current_bar->id); | 21 | config->current_bar->id); |
22 | } else { | 22 | } else { |
23 | return cmd_results_new(CMD_INVALID, | 23 | return cmd_results_new(CMD_INVALID, |
diff --git a/sway/commands/bind.c b/sway/commands/bind.c index 821f9cd1..83e9e432 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c | |||
@@ -184,7 +184,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv, | |||
184 | for (int i = 0; i < mode_bindings->length; ++i) { | 184 | for (int i = 0; i < mode_bindings->length; ++i) { |
185 | struct sway_binding *config_binding = mode_bindings->items[i]; | 185 | struct sway_binding *config_binding = mode_bindings->items[i]; |
186 | if (binding_key_compare(binding, config_binding)) { | 186 | if (binding_key_compare(binding, config_binding)) { |
187 | wlr_log(L_DEBUG, "overwriting old binding with command '%s'", | 187 | wlr_log(WLR_DEBUG, "overwriting old binding with command '%s'", |
188 | config_binding->command); | 188 | config_binding->command); |
189 | free_sway_binding(config_binding); | 189 | free_sway_binding(config_binding); |
190 | mode_bindings->items[i] = binding; | 190 | mode_bindings->items[i] = binding; |
@@ -196,7 +196,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv, | |||
196 | list_add(mode_bindings, binding); | 196 | list_add(mode_bindings, binding); |
197 | } | 197 | } |
198 | 198 | ||
199 | wlr_log(L_DEBUG, "%s - Bound %s to command %s", | 199 | wlr_log(WLR_DEBUG, "%s - Bound %s to command %s", |
200 | bindtype, argv[0], binding->command); | 200 | bindtype, argv[0], binding->command); |
201 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 201 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
202 | 202 | ||
diff --git a/sway/commands/exec.c b/sway/commands/exec.c index 363d5bef..7fc54123 100644 --- a/sway/commands/exec.c +++ b/sway/commands/exec.c | |||
@@ -8,7 +8,7 @@ struct cmd_results *cmd_exec(int argc, char **argv) { | |||
8 | if (!config->active) return cmd_results_new(CMD_DEFER, "exec", NULL); | 8 | if (!config->active) return cmd_results_new(CMD_DEFER, "exec", NULL); |
9 | if (config->reloading) { | 9 | if (config->reloading) { |
10 | char *args = join_args(argv, argc); | 10 | char *args = join_args(argv, argc); |
11 | wlr_log(L_DEBUG, "Ignoring 'exec %s' due to reload", args); | 11 | wlr_log(WLR_DEBUG, "Ignoring 'exec %s' due to reload", args); |
12 | free(args); | 12 | free(args); |
13 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 13 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
14 | } | 14 | } |
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 1c99de97..c7727857 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c | |||
@@ -20,7 +20,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { | |||
20 | 20 | ||
21 | char *tmp = NULL; | 21 | char *tmp = NULL; |
22 | if (strcmp((char*)*argv, "--no-startup-id") == 0) { | 22 | if (strcmp((char*)*argv, "--no-startup-id") == 0) { |
23 | wlr_log(L_INFO, "exec switch '--no-startup-id' not supported, ignored."); | 23 | wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored."); |
24 | if ((error = checkarg(argc - 1, "exec_always", EXPECTED_MORE_THAN, 0))) { | 24 | if ((error = checkarg(argc - 1, "exec_always", EXPECTED_MORE_THAN, 0))) { |
25 | return error; | 25 | return error; |
26 | } | 26 | } |
@@ -35,11 +35,11 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { | |||
35 | strncpy(cmd, tmp, sizeof(cmd) - 1); | 35 | strncpy(cmd, tmp, sizeof(cmd) - 1); |
36 | cmd[sizeof(cmd) - 1] = 0; | 36 | cmd[sizeof(cmd) - 1] = 0; |
37 | free(tmp); | 37 | free(tmp); |
38 | wlr_log(L_DEBUG, "Executing %s", cmd); | 38 | wlr_log(WLR_DEBUG, "Executing %s", cmd); |
39 | 39 | ||
40 | int fd[2]; | 40 | int fd[2]; |
41 | if (pipe(fd) != 0) { | 41 | if (pipe(fd) != 0) { |
42 | wlr_log(L_ERROR, "Unable to create pipe for fork"); | 42 | wlr_log(WLR_ERROR, "Unable to create pipe for fork"); |
43 | } | 43 | } |
44 | 44 | ||
45 | pid_t pid, child; | 45 | pid_t pid, child; |
@@ -73,7 +73,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { | |||
73 | // cleanup child process | 73 | // cleanup child process |
74 | waitpid(pid, NULL, 0); | 74 | waitpid(pid, NULL, 0); |
75 | if (child > 0) { | 75 | if (child > 0) { |
76 | wlr_log(L_DEBUG, "Child process created with pid %d", child); | 76 | wlr_log(WLR_DEBUG, "Child process created with pid %d", child); |
77 | // TODO: add PID to active workspace | 77 | // TODO: add PID to active workspace |
78 | } else { | 78 | } else { |
79 | return cmd_results_new(CMD_FAILURE, "exec_always", | 79 | return cmd_results_new(CMD_FAILURE, "exec_always", |
diff --git a/sway/commands/for_window.c b/sway/commands/for_window.c index 8c425a1d..ac4d6563 100644 --- a/sway/commands/for_window.c +++ b/sway/commands/for_window.c | |||
@@ -24,7 +24,7 @@ struct cmd_results *cmd_for_window(int argc, char **argv) { | |||
24 | criteria->cmdlist = join_args(argv + 1, argc - 1); | 24 | criteria->cmdlist = join_args(argv + 1, argc - 1); |
25 | 25 | ||
26 | list_add(config->criteria, criteria); | 26 | list_add(config->criteria, criteria); |
27 | wlr_log(L_DEBUG, "for_window: '%s' -> '%s' added", criteria->raw, criteria->cmdlist); | 27 | wlr_log(WLR_DEBUG, "for_window: '%s' -> '%s' added", criteria->raw, criteria->cmdlist); |
28 | 28 | ||
29 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 29 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
30 | } | 30 | } |
diff --git a/sway/commands/input.c b/sway/commands/input.c index 678c57c4..574e1f8c 100644 --- a/sway/commands/input.c +++ b/sway/commands/input.c | |||
@@ -35,7 +35,7 @@ struct cmd_results *cmd_input(int argc, char **argv) { | |||
35 | return error; | 35 | return error; |
36 | } | 36 | } |
37 | 37 | ||
38 | wlr_log(L_DEBUG, "entering input block: %s", argv[0]); | 38 | wlr_log(WLR_DEBUG, "entering input block: %s", argv[0]); |
39 | 39 | ||
40 | config->handler_context.input_config = new_input_config(argv[0]); | 40 | config->handler_context.input_config = new_input_config(argv[0]); |
41 | if (!config->handler_context.input_config) { | 41 | if (!config->handler_context.input_config) { |
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c index e2ccdc94..abfe3b12 100644 --- a/sway/commands/input/events.c +++ b/sway/commands/input/events.c | |||
@@ -16,7 +16,7 @@ struct cmd_results *input_cmd_events(int argc, char **argv) { | |||
16 | return cmd_results_new(CMD_FAILURE, "events", | 16 | return cmd_results_new(CMD_FAILURE, "events", |
17 | "No input device defined."); | 17 | "No input device defined."); |
18 | } | 18 | } |
19 | wlr_log(L_DEBUG, "events for device: %s", | 19 | wlr_log(WLR_DEBUG, "events for device: %s", |
20 | current_input_config->identifier); | 20 | current_input_config->identifier); |
21 | struct input_config *new_config = | 21 | struct input_config *new_config = |
22 | new_input_config(current_input_config->identifier); | 22 | new_input_config(current_input_config->identifier); |
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c index 7d027d5d..a8d1a10c 100644 --- a/sway/commands/input/tap.c +++ b/sway/commands/input/tap.c | |||
@@ -28,7 +28,7 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) { | |||
28 | "Expected 'tap <enabled|disabled>'"); | 28 | "Expected 'tap <enabled|disabled>'"); |
29 | } | 29 | } |
30 | 30 | ||
31 | wlr_log(L_DEBUG, "apply-tap for device: %s", | 31 | wlr_log(WLR_DEBUG, "apply-tap for device: %s", |
32 | current_input_config->identifier); | 32 | current_input_config->identifier); |
33 | apply_input_config(new_config); | 33 | apply_input_config(new_config); |
34 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 34 | 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 867e65d3..9fa5a344 100644 --- a/sway/commands/input/xkb_layout.c +++ b/sway/commands/input/xkb_layout.c | |||
@@ -19,7 +19,7 @@ struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) { | |||
19 | 19 | ||
20 | new_config->xkb_layout = strdup(argv[0]); | 20 | new_config->xkb_layout = strdup(argv[0]); |
21 | 21 | ||
22 | wlr_log(L_DEBUG, "apply-xkb_layout for device: %s layout: %s", | 22 | wlr_log(WLR_DEBUG, "apply-xkb_layout for device: %s layout: %s", |
23 | current_input_config->identifier, new_config->xkb_layout); | 23 | current_input_config->identifier, new_config->xkb_layout); |
24 | apply_input_config(new_config); | 24 | apply_input_config(new_config); |
25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 25 | 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 e8c8e04e..0d082625 100644 --- a/sway/commands/input/xkb_model.c +++ b/sway/commands/input/xkb_model.c | |||
@@ -19,7 +19,7 @@ struct cmd_results *input_cmd_xkb_model(int argc, char **argv) { | |||
19 | 19 | ||
20 | new_config->xkb_model = strdup(argv[0]); | 20 | new_config->xkb_model = strdup(argv[0]); |
21 | 21 | ||
22 | wlr_log(L_DEBUG, "apply-xkb_model for device: %s model: %s", | 22 | wlr_log(WLR_DEBUG, "apply-xkb_model for device: %s model: %s", |
23 | current_input_config->identifier, new_config->xkb_model); | 23 | current_input_config->identifier, new_config->xkb_model); |
24 | apply_input_config(new_config); | 24 | apply_input_config(new_config); |
25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 25 | 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 e9ddd6e3..3059d941 100644 --- a/sway/commands/input/xkb_options.c +++ b/sway/commands/input/xkb_options.c | |||
@@ -19,7 +19,7 @@ struct cmd_results *input_cmd_xkb_options(int argc, char **argv) { | |||
19 | 19 | ||
20 | new_config->xkb_options = strdup(argv[0]); | 20 | new_config->xkb_options = strdup(argv[0]); |
21 | 21 | ||
22 | wlr_log(L_DEBUG, "apply-xkb_options for device: %s options: %s", | 22 | wlr_log(WLR_DEBUG, "apply-xkb_options for device: %s options: %s", |
23 | current_input_config->identifier, new_config->xkb_options); | 23 | current_input_config->identifier, new_config->xkb_options); |
24 | apply_input_config(new_config); | 24 | apply_input_config(new_config); |
25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 25 | 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 926d0ac1..560f088e 100644 --- a/sway/commands/input/xkb_rules.c +++ b/sway/commands/input/xkb_rules.c | |||
@@ -19,7 +19,7 @@ struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) { | |||
19 | 19 | ||
20 | new_config->xkb_rules = strdup(argv[0]); | 20 | new_config->xkb_rules = strdup(argv[0]); |
21 | 21 | ||
22 | wlr_log(L_DEBUG, "apply-xkb_rules for device: %s rules: %s", | 22 | wlr_log(WLR_DEBUG, "apply-xkb_rules for device: %s rules: %s", |
23 | current_input_config->identifier, new_config->xkb_rules); | 23 | current_input_config->identifier, new_config->xkb_rules); |
24 | apply_input_config(new_config); | 24 | apply_input_config(new_config); |
25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 25 | 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 0e3ffd41..0aa03440 100644 --- a/sway/commands/input/xkb_variant.c +++ b/sway/commands/input/xkb_variant.c | |||
@@ -19,7 +19,7 @@ struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) { | |||
19 | 19 | ||
20 | new_config->xkb_variant = strdup(argv[0]); | 20 | new_config->xkb_variant = strdup(argv[0]); |
21 | 21 | ||
22 | wlr_log(L_DEBUG, "apply-xkb_variant for device: %s variant: %s", | 22 | wlr_log(WLR_DEBUG, "apply-xkb_variant for device: %s variant: %s", |
23 | current_input_config->identifier, new_config->xkb_variant); | 23 | current_input_config->identifier, new_config->xkb_variant); |
24 | apply_input_config(new_config); | 24 | apply_input_config(new_config); |
25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/commands/mode.c b/sway/commands/mode.c index d2c14468..b460fcb5 100644 --- a/sway/commands/mode.c +++ b/sway/commands/mode.c | |||
@@ -65,7 +65,7 @@ struct cmd_results *cmd_mode(int argc, char **argv) { | |||
65 | return error; | 65 | return error; |
66 | } | 66 | } |
67 | if ((config->reading && argc > 1) || (!config->reading && argc == 1)) { | 67 | if ((config->reading && argc > 1) || (!config->reading && argc == 1)) { |
68 | wlr_log(L_DEBUG, "Switching to mode `%s' (pango=%d)", | 68 | wlr_log(WLR_DEBUG, "Switching to mode `%s' (pango=%d)", |
69 | mode->name, mode->pango); | 69 | mode->name, mode->pango); |
70 | } | 70 | } |
71 | // Set current mode | 71 | // Set current mode |
diff --git a/sway/commands/output.c b/sway/commands/output.c index f955bf90..15bbd687 100644 --- a/sway/commands/output.c +++ b/sway/commands/output.c | |||
@@ -29,7 +29,7 @@ struct cmd_results *cmd_output(int argc, char **argv) { | |||
29 | 29 | ||
30 | struct output_config *output = new_output_config(argv[0]); | 30 | struct output_config *output = new_output_config(argv[0]); |
31 | if (!output) { | 31 | if (!output) { |
32 | wlr_log(L_ERROR, "Failed to allocate output config"); | 32 | wlr_log(WLR_ERROR, "Failed to allocate output config"); |
33 | return NULL; | 33 | return NULL; |
34 | } | 34 | } |
35 | argc--; argv++; | 35 | argc--; argv++; |
@@ -71,7 +71,7 @@ struct cmd_results *cmd_output(int argc, char **argv) { | |||
71 | list_add(config->output_configs, output); | 71 | list_add(config->output_configs, output); |
72 | } | 72 | } |
73 | 73 | ||
74 | wlr_log(L_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz " | 74 | wlr_log(WLR_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz " |
75 | "position %d,%d scale %f transform %d) (bg %s %s) (dpms %d)", | 75 | "position %d,%d scale %f transform %d) (bg %s %s) (dpms %d)", |
76 | output->name, output->enabled, output->width, output->height, | 76 | output->name, output->enabled, output->width, output->height, |
77 | output->refresh_rate, output->x, output->y, output->scale, | 77 | output->refresh_rate, output->x, output->y, output->scale, |
@@ -85,7 +85,7 @@ struct cmd_results *cmd_output(int argc, char **argv) { | |||
85 | struct sway_output *sway_output; | 85 | struct sway_output *sway_output; |
86 | wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { | 86 | wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { |
87 | output_get_identifier(identifier, sizeof(identifier), sway_output); | 87 | output_get_identifier(identifier, sizeof(identifier), sway_output); |
88 | wlr_log(L_DEBUG, "Checking identifier %s", identifier); | 88 | wlr_log(WLR_DEBUG, "Checking identifier %s", identifier); |
89 | if (all || strcmp(sway_output->wlr_output->name, output->name) == 0 | 89 | if (all || strcmp(sway_output->wlr_output->name, output->name) == 0 |
90 | || strcmp(identifier, output->name) == 0) { | 90 | || strcmp(identifier, output->name) == 0) { |
91 | if (!sway_output->swayc) { | 91 | if (!sway_output->swayc) { |
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c index 65b5f902..c2c138f8 100644 --- a/sway/commands/output/background.c +++ b/sway/commands/output/background.c | |||
@@ -72,7 +72,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { | |||
72 | src = strdup(p.we_wordv[0]); | 72 | src = strdup(p.we_wordv[0]); |
73 | wordfree(&p); | 73 | wordfree(&p); |
74 | if (!src) { | 74 | if (!src) { |
75 | wlr_log(L_ERROR, "Failed to duplicate string"); | 75 | wlr_log(WLR_ERROR, "Failed to duplicate string"); |
76 | return cmd_results_new(CMD_FAILURE, "output", | 76 | return cmd_results_new(CMD_FAILURE, "output", |
77 | "Unable to allocate resource"); | 77 | "Unable to allocate resource"); |
78 | } | 78 | } |
@@ -82,7 +82,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { | |||
82 | 82 | ||
83 | char *conf = strdup(config->current_config); | 83 | char *conf = strdup(config->current_config); |
84 | if (!conf) { | 84 | if (!conf) { |
85 | wlr_log(L_ERROR, "Failed to duplicate string"); | 85 | wlr_log(WLR_ERROR, "Failed to duplicate string"); |
86 | free(src); | 86 | free(src); |
87 | return cmd_results_new(CMD_FAILURE, "output", | 87 | return cmd_results_new(CMD_FAILURE, "output", |
88 | "Unable to allocate resources"); | 88 | "Unable to allocate resources"); |
@@ -94,7 +94,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { | |||
94 | if (!src) { | 94 | if (!src) { |
95 | free(rel_path); | 95 | free(rel_path); |
96 | free(conf); | 96 | free(conf); |
97 | wlr_log(L_ERROR, "Unable to allocate memory"); | 97 | wlr_log(WLR_ERROR, "Unable to allocate memory"); |
98 | return cmd_results_new(CMD_FAILURE, "output", | 98 | return cmd_results_new(CMD_FAILURE, "output", |
99 | "Unable to allocate resources"); | 99 | "Unable to allocate resources"); |
100 | } | 100 | } |
diff --git a/sway/commands/rename.c b/sway/commands/rename.c index 104a3392..a380ff9c 100644 --- a/sway/commands/rename.c +++ b/sway/commands/rename.c | |||
@@ -68,7 +68,7 @@ struct cmd_results *cmd_rename(int argc, char **argv) { | |||
68 | "Workspace already exists"); | 68 | "Workspace already exists"); |
69 | } | 69 | } |
70 | 70 | ||
71 | wlr_log(L_DEBUG, "renaming workspace '%s' to '%s'", workspace->name, new_name); | 71 | wlr_log(WLR_DEBUG, "renaming workspace '%s' to '%s'", workspace->name, new_name); |
72 | free(workspace->name); | 72 | free(workspace->name); |
73 | workspace->name = new_name; | 73 | workspace->name = new_name; |
74 | 74 | ||
diff --git a/sway/commands/resize.c b/sway/commands/resize.c index 6357343e..5efbd8b0 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c | |||
@@ -95,7 +95,7 @@ static void resize_tiled(int amount, enum resize_axis axis) { | |||
95 | return; | 95 | return; |
96 | } | 96 | } |
97 | 97 | ||
98 | wlr_log(L_DEBUG, | 98 | wlr_log(WLR_DEBUG, |
99 | "Found the proper parent: %p. It has %d l conts, and %d r conts", | 99 | "Found the proper parent: %p. It has %d l conts, and %d r conts", |
100 | parent->parent, minor_weight, major_weight); | 100 | parent->parent, minor_weight, major_weight); |
101 | 101 | ||
diff --git a/sway/commands/set.c b/sway/commands/set.c index 84e9b792..ea388d3b 100644 --- a/sway/commands/set.c +++ b/sway/commands/set.c | |||
@@ -32,7 +32,7 @@ struct cmd_results *cmd_set(int argc, char **argv) { | |||
32 | } | 32 | } |
33 | 33 | ||
34 | if (argv[0][0] != '$') { | 34 | if (argv[0][0] != '$') { |
35 | wlr_log(L_INFO, "Warning: variable '%s' doesn't start with $", argv[0]); | 35 | wlr_log(WLR_INFO, "Warning: variable '%s' doesn't start with $", argv[0]); |
36 | 36 | ||
37 | size_t size = snprintf(NULL, 0, "$%s", argv[0]); | 37 | size_t size = snprintf(NULL, 0, "$%s", argv[0]); |
38 | tmp = malloc(size + 1); | 38 | tmp = malloc(size + 1); |
diff --git a/sway/commands/swaybg_command.c b/sway/commands/swaybg_command.c index 770d4821..36f7fdcd 100644 --- a/sway/commands/swaybg_command.c +++ b/sway/commands/swaybg_command.c | |||
@@ -13,7 +13,7 @@ struct cmd_results *cmd_swaybg_command(int argc, char **argv) { | |||
13 | free(config->swaybg_command); | 13 | free(config->swaybg_command); |
14 | } | 14 | } |
15 | config->swaybg_command = join_args(argv, argc); | 15 | config->swaybg_command = join_args(argv, argc); |
16 | wlr_log(L_DEBUG, "Using custom swaybg command: %s", | 16 | wlr_log(WLR_DEBUG, "Using custom swaybg command: %s", |
17 | config->swaybg_command); | 17 | config->swaybg_command); |
18 | 18 | ||
19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c index d15be571..e8b37182 100644 --- a/sway/commands/workspace.c +++ b/sway/commands/workspace.c | |||
@@ -51,7 +51,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) { | |||
51 | free(old); // workspaces can only be assigned to a single output | 51 | free(old); // workspaces can only be assigned to a single output |
52 | list_del(config->workspace_outputs, i); | 52 | list_del(config->workspace_outputs, i); |
53 | } | 53 | } |
54 | wlr_log(L_DEBUG, "Assigning workspace %s to output %s", wso->workspace, wso->output); | 54 | wlr_log(WLR_DEBUG, "Assigning workspace %s to output %s", wso->workspace, wso->output); |
55 | list_add(config->workspace_outputs, wso); | 55 | list_add(config->workspace_outputs, wso); |
56 | } else { | 56 | } else { |
57 | if (config->reading || !config->active) { | 57 | if (config->reading || !config->active) { |