sway

commit 704d675a36811bdf3de5c95d5e0e7ce2b57b3157
parent d71fed95da5af5a489d2ea68b87a306ddc4d238d
Author: Tudor Brindus <me@tbrindus.ca>
Date:   Wed, 27 May 2020 12:48:07 -0400

Log Xwayland startup failures

Though unlikely, this commit makes server initialization totally
explicit in the logs.

Diffstat:
M
sway/server.c
 | 
24
++++++++++++++----------

1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/sway/server.c b/sway/server.c
@@ -196,16 +196,20 @@ bool server_start(struct sway_server *server) {
 		server->xwayland.wlr_xwayland =
 			wlr_xwayland_create(server->wl_display, server->compositor,
 					config->xwayland == XWAYLAND_MODE_LAZY);
-		wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface,
-			&server->xwayland_surface);
-		server->xwayland_surface.notify = handle_xwayland_surface;
-		wl_signal_add(&server->xwayland.wlr_xwayland->events.ready,
-			&server->xwayland_ready);
-		server->xwayland_ready.notify = handle_xwayland_ready;
-
-		setenv("DISPLAY", server->xwayland.wlr_xwayland->display_name, true);
-
-		/* xcursor configured by the default seat */
+		if (!server->xwayland.wlr_xwayland) {
+			sway_log(SWAY_ERROR, "Failed to start Xwayland");
+		} else {
+			wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface,
+				&server->xwayland_surface);
+			server->xwayland_surface.notify = handle_xwayland_surface;
+			wl_signal_add(&server->xwayland.wlr_xwayland->events.ready,
+				&server->xwayland_ready);
+			server->xwayland_ready.notify = handle_xwayland_ready;
+
+			setenv("DISPLAY", server->xwayland.wlr_xwayland->display_name, true);
+
+			/* xcursor configured by the default seat */
+		}
 	}
 #endif