alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Log Xwayland startup failures

Browse source 
Though unlikely, this commit makes server initialization totally
explicit in the logs.
This commit is contained in:
Tudor Brindus 2020-05-27 12:48:07 -04:00 committed by Simon Ser
parent d71fed95da
commit 704d675a36
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sway/server.c
View file

@ -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,
&server->xwayland_ready);
server->xwayland_ready.notify = handle_xwayland_ready;
setenv("DISPLAY", server->xwayland.wlr_xwayland->display_name, true); setenv("DISPLAY", server->xwayland.wlr_xwayland->display_name, true);
/* xcursor configured by the default seat */ /* xcursor configured by the default seat */
}
} }
#endif #endif