Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

code: refactor Server.start()

Browse source 
This was needlessly verbose
This commit is contained in:
Isaac Freund 2020-06-17 22:17:51 +02:00
parent 189d9f2d8b
commit 582164ce41
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
river/Server.zig
View file

@ -149,27 +149,13 @@ pub fn deinit(self: *Self) void {
self.config.deinit(); self.config.deinit();
} }
/// Create the socket, set WAYLAND_DISPLAY, and start the backend /// Create the socket, start the backend, and setup the environment
pub fn start(self: Self) !void { pub fn start(self: Self) !void {
// Add a Unix socket to the Wayland display. const socket = c.wl_display_add_socket_auto(self.wl_display) orelse return error.CantAddSocket;
const socket = c.wl_display_add_socket_auto(self.wl_display) orelse if (!c.river_wlr_backend_start(self.wlr_backend)) return error.CantStartBackend;
return error.CantAddSocket; if (c.setenv("WAYLAND_DISPLAY", socket, 1) < 0) return error.CantSetEnv;
// Start the backend. This will enumerate outputs and inputs, become the DRM
// master, etc
if (!c.river_wlr_backend_start(self.wlr_backend)) {
return error.CantStartBackend;
}
// Set the WAYLAND_DISPLAY environment variable to our socket
if (c.setenv("WAYLAND_DISPLAY", socket, 1) == -1) {
return error.CantSetEnv;
}
if (build_options.xwayland) { if (build_options.xwayland) {
if (c.setenv("DISPLAY", &self.wlr_xwayland.display_name, 1) == -1) { if (c.setenv("DISPLAY", &self.wlr_xwayland.display_name, 1) < 0) return error.CantSetEnv;
return error.CantSetEnv;
}
} }
} }