merge

1 files changed, 12 insertions, 0 deletions

diff --git a/sway/main.c b/sway/main.c
index ffbcdbdf..3f2fcd94 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, "[wlc] %s", str);
+	} else if (type == WLC_LOG_WARN) {
+		sway_log(L_INFO, "[wlc] %s", str);
+	} else {
+		sway_log(L_DEBUG, "[wlc] %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;