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

river: add -no-xwayland cli flag

Browse Source 
Add a cli flag to disable xwayland at runtime even if river has been
built with xwayland support.
This commit is contained in:
Hugo Machet
2024-02-19 11:30:26 +01:00
committed by Isaac Freund
parent ec9a1b4303
commit 7f1f9152f2
5 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
river/main.zig
View File

@ -43,6 +43,7 @@ const usage: []const u8 =
\\ -version Print the version number and exit.
\\ -c <command> Run `sh -c <command>` on startup.
\\ -log-level <level> Set the log level to error, warning, info, or debug.
\\ -no-xwayland Disable xwayland even if built with support.
\\
;
@ -54,6 +55,7 @@ pub fn main() anyerror!void {
.{ .name = "version", .kind = .boolean },
.{ .name = "c", .kind = .arg },
.{ .name = "log-level", .kind = .arg },
.{ .name = "no-xwayland", .kind = .boolean },
}).parse(os.argv[1..]) catch {
try io.getStdErr().writeAll(usage);
os.exit(1);
@ -87,6 +89,7 @@ pub fn main() anyerror!void {
os.exit(1);
}
}
const enable_xwayland = !result.flags.@"no-xwayland";
const startup_command = blk: {
if (result.flags.c) |command| {
break :blk try util.gpa.dupeZ(u8, command);
@ -111,7 +114,7 @@ pub fn main() anyerror!void {
try os.sigaction(os.SIG.PIPE, &sig_ign, null);
log.info("river version {s}, initializing server", .{build_options.version});
try server.init();
try server.init(enable_xwayland);
defer server.deinit();
try server.start();