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.

1 files changed, 4 insertions, 4 deletions

diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 1ed6c7e6..a5724295 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -24,7 +24,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
 
 	char *tmp = NULL;
 	if (strcmp(argv[0], "--no-startup-id") == 0) {
-		wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored.");
+		sway_log(SWAY_INFO, "exec switch '--no-startup-id' not supported, ignored.");
 		--argc; ++argv;
 		if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) {
 			return error;
@@ -43,11 +43,11 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
 	strncpy(cmd, tmp, sizeof(cmd) - 1);
 	cmd[sizeof(cmd) - 1] = 0;
 	free(tmp);
-	wlr_log(WLR_DEBUG, "Executing %s", cmd);
+	sway_log(SWAY_DEBUG, "Executing %s", cmd);
 
 	int fd[2];
 	if (pipe(fd) != 0) {
-		wlr_log(WLR_ERROR, "Unable to create pipe for fork");
+		sway_log(SWAY_ERROR, "Unable to create pipe for fork");
 	}
 
 	pid_t pid, child;
@@ -84,7 +84,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
 	// cleanup child process
 	waitpid(pid, NULL, 0);
 	if (child > 0) {
-		wlr_log(WLR_DEBUG, "Child process created with pid %d", child);
+		sway_log(SWAY_DEBUG, "Child process created with pid %d", child);
 		root_record_workspace_pid(child);
 	} else {
 		return cmd_results_new(CMD_FAILURE, "Second fork() failed");