Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Xwayland: don't inherit rlimit changes from river

Browse Source
This commit is contained in:
Isaac Freund 2025-01-07 11:00:44 -06:00
parent 6abcc68a19
commit 543697847f
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
river/main.zig
View File

@ -84,7 +84,7 @@ pub fn main() anyerror!void {
posix.exit(1); posix.exit(1);
} }
} }
const enable_xwayland = !result.flags.@"no-xwayland"; const runtime_xwayland = !result.flags.@"no-xwayland";
const startup_command = blk: { const startup_command = blk: {
if (result.flags.c) |command| { if (result.flags.c) |command| {
break :blk try util.gpa.dupeZ(u8, command); break :blk try util.gpa.dupeZ(u8, command);
@ -95,17 +95,25 @@ pub fn main() anyerror!void {
log.info("river version {s}, initializing server", .{build_options.version}); log.info("river version {s}, initializing server", .{build_options.version});
process.setup();
river_init_wlroots_log(switch (runtime_log_level) { river_init_wlroots_log(switch (runtime_log_level) {
.debug => .debug, .debug => .debug,
.info => .info, .info => .info,
.warn, .err => .err, .warn, .err => .err,
}); });
try server.init(enable_xwayland); try server.init(runtime_xwayland);
defer server.deinit(); defer server.deinit();
// wlroots starts the Xwayland process from an idle event source, the reasoning being that
// this gives the compositor time to set up event listeners before Xwayland is actually
// started. We want Xwayland to be started by wlroots before we modify our rlimits in
// process.setup() since wlroots does not offer a way for us to reset the rlimit post-fork.
if (build_options.xwayland and runtime_xwayland) {
server.wl_server.getEventLoop().dispatchIdle();
}
process.setup();
try server.start(); try server.start();
// Run the child in a new process group so that we can send SIGTERM to all // Run the child in a new process group so that we can send SIGTERM to all