Log Xwayland startup failures

Though unlikely, this commit makes server initialization totally
explicit in the logs.
master
Tudor Brindus 5 years ago committed by Simon Ser
parent d71fed95da
commit 704d675a36

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

Loading…
Cancel
Save