From ac2034df99e1ec19e8bca60a802cd9f9d8fbbf83 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 23 Aug 2015 13:08:04 -0400 Subject: Handle wlc log events --- sway/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'sway/main.c') diff --git a/sway/main.c b/sway/main.c index ffbcdbdf..f8959009 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; -- cgit v1.2.3 From e78221e6a0413b8cccd41f75288798ae15b792b6 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 23 Aug 2015 13:31:16 -0400 Subject: Prefix log events from wlc with [wlc] --- sway/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sway/main.c') diff --git a/sway/main.c b/sway/main.c index f8959009..3f2fcd94 100644 --- a/sway/main.c +++ b/sway/main.c @@ -23,11 +23,11 @@ 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); + sway_log(L_ERROR, "[wlc] %s", str); } else if (type == WLC_LOG_WARN) { - sway_log(L_INFO, "%s", str); + sway_log(L_INFO, "[wlc] %s", str); } else { - sway_log(L_DEBUG, "%s", str); + sway_log(L_DEBUG, "[wlc] %s", str); } } -- cgit v1.2.3