From ac2034df99e1ec19e8bca60a802cd9f9d8fbbf83 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 23 Aug 2015 13:08:04 -0400 Subject: [PATCH] Handle wlc log events --- sway/handlers.c | 1 - sway/main.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sway/handlers.c b/sway/handlers.c index cb42196f4..e40188110 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -498,7 +498,6 @@ static void handle_wlc_ready(void) { config->active = true; } - struct wlc_interface interface = { .output = { .created = handle_output_created, diff --git a/sway/main.c b/sway/main.c index ffbcdbdfd..f89590099 100644 --- a/sway/main.c +++ b/sway/main.c @@ -21,6 +21,16 @@ void sway_terminate(void) { static void sigchld_handle(int signal); +static void wlc_log_handler(enum wlc_log_type type, const char *str) { + if (type == WLC_LOG_ERROR) { + sway_log(L_ERROR, "%s", str); + } else if (type == WLC_LOG_WARN) { + sway_log(L_INFO, "%s", str); + } else { + sway_log(L_DEBUG, "%s", str); + } +} + int main(int argc, char **argv) { static int verbose = 0, debug = 0, validate = 0; @@ -38,6 +48,8 @@ int main(int argc, char **argv) { setenv("WLC_DIM", "0", 0); + wlc_log_set_handler(wlc_log_handler); + /* Changing code earlier than this point requires detailed review */ if (!wlc_init(&interface, argc, argv)) { return 1;