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

wlr-output-management: leverage new wlroots APIs

Browse Source 
These new functions allow testing commits without messing up the
pending state of the output and needing to rollback. The new apply()
function also makes the code considerably more concise.
This commit is contained in:
Isaac Freund 2023-01-24 13:55:40 +01:00
parent 4c6f47669b
commit 946173005d
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 19 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/zig-wlroots vendored

@ -1 +1 @@
Subproject commit 04bcd67d520f736f8223e2699a363be763c3c418 Subproject commit 0c3165f483d322a7b95f06ed5105782736444961

41
river/Root.zig
View File

@ -19,6 +19,7 @@ const Self = @This();
const build_options = @import("build_options"); const build_options = @import("build_options");
const std = @import("std"); const std = @import("std");
const assert = std.debug.assert; const assert = std.debug.assert;
const mem = std.mem;
const wlr = @import("wlroots"); const wlr = @import("wlroots");
const wl = @import("wayland").server.wl; const wl = @import("wayland").server.wl;
@ -450,50 +451,23 @@ fn processOutputConfig(
const wlr_output = head.state.output; const wlr_output = head.state.output;
const output = @intToPtr(*Output, wlr_output.data); const output = @intToPtr(*Output, wlr_output.data);
if (head.state.enabled) { var proposed_state = wlr.Output.State.init();
wlr_output.enable(true); head.state.apply(&proposed_state);
if (head.state.mode) |mode| {
wlr_output.setMode(mode);
} else {
const custom_mode = &head.state.custom_mode;
wlr_output.setCustomMode(custom_mode.width, custom_mode.height, custom_mode.refresh);
}
wlr_output.setScale(head.state.scale);
wlr_output.setTransform(head.state.transform);
wlr_output.enableAdaptiveSync(head.state.adaptive_sync_enabled);
switch (action) { switch (action) {
.test_only => { .test_only => {
if (!output.wlr_output.testCommit()) success = false; if (!wlr_output.testState(&proposed_state)) success = false;
output.wlr_output.rollback();
}, },
.apply => { .apply => {
if (output.wlr_output.commit()) { if (wlr_output.commitState(&proposed_state)) {
if (head.state.enabled) {
// Just updates the output's position if it is already in the layout // Just updates the output's position if it is already in the layout
self.output_layout.add(output.wlr_output, head.state.x, head.state.y); self.output_layout.add(output.wlr_output, head.state.x, head.state.y);
output.arrangeLayers(.mapped); output.arrangeLayers(.mapped);
} else |_| {
std.log.scoped(.output_manager).err("failed to apply config to output {s}", .{output.wlr_output.name});
success = false;
}
},
}
} else { } else {
// The output is already disabled, so there's nothing to do
if (!wlr_output.enabled) continue;
wlr_output.enable(false);
switch (action) {
.test_only => {
if (!output.wlr_output.testCommit()) success = false;
output.wlr_output.rollback();
},
.apply => {
if (output.wlr_output.commit()) {
self.removeOutput(output); self.removeOutput(output);
self.output_layout.remove(output.wlr_output); self.output_layout.remove(output.wlr_output);
}
} else |_| { } else |_| {
std.log.scoped(.output_manager).err("failed to apply config to output {s}", .{ std.log.scoped(.output_manager).err("failed to apply config to output {s}", .{
output.wlr_output.name, output.wlr_output.name,
@ -503,7 +477,6 @@ fn processOutputConfig(
}, },
} }
} }
}
if (action == .apply) self.startTransaction(); if (action == .apply) self.startTransaction();