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

Grab seats focused on the output for layer shell

Browse Source
This commit is contained in:
Isaac Freund 2020-04-18 21:15:03 +02:00
parent 5244618b01
commit cd9d4ee395
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output.zig
View File

@ -252,8 +252,8 @@ pub const Output = struct {
self.arrangeLayer(self.layers[layer], full_box, &usable_box, false); self.arrangeLayer(self.layers[layer], full_box, &usable_box, false);
} }
// If there is any layer surface in the top or overlay layers which requests // Find the topmost layer surface in the top or overlay layers which
// keyboard interactivity, give it focus. // requests keyboard interactivity if any.
const topmost_surface = outer: for (layer_idxs[0..2]) |layer| { const topmost_surface = outer: for (layer_idxs[0..2]) |layer| {
// Iterate in reverse order since the last layer is rendered on top // Iterate in reverse order since the last layer is rendered on top
var it = self.layers[layer].last; var it = self.layers[layer].last;
@ -268,6 +268,12 @@ pub const Output = struct {
var it = self.root.server.input_manager.seats.first; var it = self.root.server.input_manager.seats.first;
while (it) |node| : (it = node.next) { while (it) |node| : (it = node.next) {
const seat = &node.data; const seat = &node.data;
// Only grab focus of seats which have the output focused
if (seat.focused_output != self) {
continue;
}
if (topmost_surface) |to_focus| { if (topmost_surface) |to_focus| {
// If we found a surface that requires focus, grab the focus of all // If we found a surface that requires focus, grab the focus of all
// seats. // seats.

2
src/seat.zig
View File

@ -155,7 +155,7 @@ pub const Seat = struct {
// Focus the layer surface // Focus the layer surface
self.sendKeyboardEnter(layer_to_focus.wlr_layer_surface.surface); self.sendKeyboardEnter(layer_to_focus.wlr_layer_surface.surface);
self.focused_layer = layer_to_focus; self.focused_layer = layer_to_focus;
self.focused_output = layer_to_focus.output; std.debug.assert(self.focused_output == layer_to_focus.output);
} else { } else {
// If there is a layer currently focused, unfocus it // If there is a layer currently focused, unfocus it
if (self.focused_layer != null) { if (self.focused_layer != null) {