diff options
| author | M Stoeckl <code@mstoeckl.com> | 2019-01-20 13:51:12 -0500 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2019-01-21 12:59:42 +0100 |
| commit | 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch) | |
| tree | 5c3f60e0219cb8b4a1b7cafb760a871661866e32 /sway/commands/input | |
| parent | 5c834d36e14aaeca4ac1d22b869254d5722af4af (diff) | |
Replace wlr_log with sway_log
This commit mostly duplicates the wlr_log functions, although
with a sway_* prefix. (This is very similar to PR #2009.)
However, the logging function no longer needs to be replaceable,
so sway_log_init's second argument is used to set the exit
callback for sway_abort.
wlr_log_init is still invoked in sway/main.c
This commit makes it easier to remove the wlroots dependency for
the helper programs swaymsg, swaybg, swaybar, and swaynag.
Diffstat (limited to 'sway/commands/input')
| -rw-r--r-- | sway/commands/input/xkb_layout.c | 2 | ||||
| -rw-r--r-- | sway/commands/input/xkb_model.c | 2 | ||||
| -rw-r--r-- | sway/commands/input/xkb_options.c | 2 | ||||
| -rw-r--r-- | sway/commands/input/xkb_rules.c | 2 | ||||
| -rw-r--r-- | sway/commands/input/xkb_variant.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c index c9200aa2..0879e2da 100644 --- a/sway/commands/input/xkb_layout.c +++ b/sway/commands/input/xkb_layout.c @@ -16,7 +16,7 @@ struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) { ic->xkb_layout = strdup(argv[0]); - wlr_log(WLR_DEBUG, "set-xkb_layout for config: %s layout: %s", + sway_log(SWAY_DEBUG, "set-xkb_layout for config: %s layout: %s", ic->identifier, ic->xkb_layout); return cmd_results_new(CMD_SUCCESS, NULL); } diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c index 763ae80e..9e384156 100644 --- a/sway/commands/input/xkb_model.c +++ b/sway/commands/input/xkb_model.c @@ -16,7 +16,7 @@ struct cmd_results *input_cmd_xkb_model(int argc, char **argv) { ic->xkb_model = strdup(argv[0]); - wlr_log(WLR_DEBUG, "set-xkb_model for config: %s model: %s", + sway_log(SWAY_DEBUG, "set-xkb_model for config: %s model: %s", ic->identifier, ic->xkb_model); return cmd_results_new(CMD_SUCCESS, NULL); } diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c index 1ff6e680..8197dd1d 100644 --- a/sway/commands/input/xkb_options.c +++ b/sway/commands/input/xkb_options.c @@ -16,7 +16,7 @@ struct cmd_results *input_cmd_xkb_options(int argc, char **argv) { ic->xkb_options = strdup(argv[0]); - wlr_log(WLR_DEBUG, "set-xkb_options for config: %s options: %s", + sway_log(SWAY_DEBUG, "set-xkb_options for config: %s options: %s", ic->identifier, ic->xkb_options); return cmd_results_new(CMD_SUCCESS, NULL); } diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c index 29172b24..01ccd06f 100644 --- a/sway/commands/input/xkb_rules.c +++ b/sway/commands/input/xkb_rules.c @@ -16,7 +16,7 @@ struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) { ic->xkb_rules = strdup(argv[0]); - wlr_log(WLR_DEBUG, "set-xkb_rules for config: %s rules: %s", + sway_log(SWAY_DEBUG, "set-xkb_rules for config: %s rules: %s", ic->identifier, ic->xkb_rules); return cmd_results_new(CMD_SUCCESS, NULL); } diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c index 9f3baed6..37c82fbd 100644 --- a/sway/commands/input/xkb_variant.c +++ b/sway/commands/input/xkb_variant.c @@ -16,7 +16,7 @@ struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) { ic->xkb_variant = strdup(argv[0]); - wlr_log(WLR_DEBUG, "set-xkb_variant for config: %s variant: %s", + sway_log(SWAY_DEBUG, "set-xkb_variant for config: %s variant: %s", ic->identifier, ic->xkb_variant); return cmd_results_new(CMD_SUCCESS, NULL); } |