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

root: improve handling of 0 -> 1 output transition

Browse Source 
Recover more gracefully from being hotplugged down to 0 outputs and then
gaining a new one. Move all views to the new output and restore the
focused output tags of the last output to be removed.
This commit is contained in:
Isaac Freund 2020-12-30 13:19:40 +01:00
parent a098bbe03a
commit ac20f5aa1d
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
river/Root.zig
View File

@ -163,9 +163,18 @@ pub fn removeOutput(self: *Self, output: *Output) void {
self.outputs.remove(node); self.outputs.remove(node);
// Use the first output in the list as fallback. // Use the first output in the list as fallback. If the last real output
// If there is no other real output, use the noop output. // is being removed, use the noop output.
const fallback_output = if (self.outputs.first) |output_node| &output_node.data else &self.noop_output; const fallback_output = blk: {
if (self.outputs.first) |output_node| {
break :blk &output_node.data;
} else {
// Store the focused output tags if we are hotplugged down to
// 0 real outputs so they can be restored on gaining a new output.
self.noop_output.current.tags = output.current.tags;
break :blk &self.noop_output;
}
};
// Move all views from the destroyed output to the fallback one // Move all views from the destroyed output to the fallback one
while (output.views.last) |view_node| { while (output.views.last) |view_node| {
@ -214,19 +223,27 @@ pub fn addOutput(self: *Self, output: *Output) void {
self.outputs.append(node); self.outputs.append(node);
// Add the new output to the layout. The add_auto function arranges outputs // This aarranges outputs from left-to-right in the order they appear. The
// from left-to-right in the order they appear. A more sophisticated // wlr-output-management protocol may be used to modify this arrangement.
// compositor would let the user configure the arrangement of outputs in the // This also creates a wl_output global which is advertised to clients.
// layout. This automatically creates an output global on the wl_display.
self.output_layout.addAuto(node.data.wlr_output); self.output_layout.addAuto(node.data.wlr_output);
// if we previously had no real outputs, move focus from the noop output // If we previously had no real outputs, move focus from the noop output
// to the new one. // to the new one.
if (self.outputs.len == 1) { if (self.outputs.len == 1) {
// TODO: move views from the noop output to the new one and focus(null) // Restore the focused tags of the last output to be removed
output.pending.tags = self.noop_output.current.tags;
output.current.tags = self.noop_output.current.tags;
// Move all views from noop output to the new output
while (self.noop_output.views.last) |n| n.view.sendToOutput(output);
// Focus the new output with all seats
var it = self.server.input_manager.seats.first; var it = self.server.input_manager.seats.first;
while (it) |seat_node| : (it = seat_node.next) { while (it) |seat_node| : (it = seat_node.next) {
seat_node.data.focusOutput(&self.outputs.first.?.data); const seat = &seat_node.data;
seat.focusOutput(output);
seat.focus(null);
} }
} }
} }