sway

commit ac2034df99e1ec19e8bca60a802cd9f9d8fbbf83
parent 1e18ba9f2d170c89c4cf202a9dfd7b87da4fa769
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sun, 23 Aug 2015 13:08:04 -0400

Handle wlc log events

Diffstat:
M
sway/handlers.c
 | 
1
-
M
sway/main.c
 | 
12
++++++++++++

2 files changed, 12 insertions(+), 1 deletion(-)
diff --git 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
@@ -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;