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

Output: retry other modes if preferred fails

Browse Source 
In cases like multiple hi-res monitors connected through a USB dock, the
preferred mode can fail to work. Such an output was then ignored by river,
which made it impossible to even set another mode manually.

Sway has been reported to solve this issue, so let's employ their solution
and fall back to another mode if possible.
This commit is contained in:
tiosgz 2022-07-10 08:57:53 +00:00 committed by Isaac Freund
parent 403eca90a5
commit bc610c8b82
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
river/Output.zig
View File

@ -105,10 +105,21 @@ pub fn init(self: *Self, wlr_output: *wlr.Output) !void {
// refresh rate), and each monitor supports only a specific set of modes. We // refresh rate), and each monitor supports only a specific set of modes. We
// just pick the monitor's preferred mode, a more sophisticated compositor // just pick the monitor's preferred mode, a more sophisticated compositor
// would let the user configure it. // would let the user configure it.
if (wlr_output.preferredMode()) |mode| { if (wlr_output.preferredMode()) |preferred_mode| {
wlr_output.setMode(mode); wlr_output.setMode(preferred_mode);
wlr_output.enable(true); wlr_output.enable(true);
try wlr_output.commit(); wlr_output.commit() catch |err| {
var it = wlr_output.modes.iterator(.forward);
while (it.next()) |mode| {
if (mode == preferred_mode) continue;
wlr_output.setMode(mode);
wlr_output.commit() catch continue;
// This mode works, use it
break;
} else {
return err;
}
};
} }
self.* = .{ self.* = .{