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

Ignore custom mode requests

Browse source
This commit is contained in:
Marten Ringwelski 2020-12-06 21:47:51 +01:00 committed by Isaac Freund
parent c3b8986054
commit 0fecdf60cb
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
river/OutputManager.zig
View file

@ -271,8 +271,11 @@ fn applyHeadToOutput(head: *c.wlr_output_configuration_head_v1, wlr_output: *c.w
if (head.state.mode != null) { if (head.state.mode != null) {
c.wlr_output_set_mode(wlr_output, head.state.mode); c.wlr_output_set_mode(wlr_output, head.state.mode);
} else { } else {
const custom_mode = &head.state.custom_mode; log.info(.output_manager, "custom modes are not supported until the next wlroots release: ignoring", .{});
c.wlr_output_set_custom_mode(wlr_output, custom_mode.width, custom_mode.height, custom_mode.refresh); // TODO(wlroots) uncomment the following lines when wlroots 0.13.0 is released
// See https://github.com/swaywm/wlroots/pull/2517
//const custom_mode = &head.state.custom_mode;
//c.wlr_output_set_custom_mode(wlr_output, custom_mode.width, custom_mode.height, custom_mode.refresh);
} }
// TODO(wlroots) Figure out if this conversion is needed or if that is a bug in wlroots // TODO(wlroots) Figure out if this conversion is needed or if that is a bug in wlroots
c.wlr_output_set_scale(wlr_output, @floatCast(f32, head.state.scale)); c.wlr_output_set_scale(wlr_output, @floatCast(f32, head.state.scale));