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

output: introduce state struct

Browse Source 
This simplifies the handling of the current/pending tags and will be
used in the future for atomic layout updates involving layer surface
exclusive zones.
This commit is contained in:
Isaac Freund
2020-07-02 21:55:21 +02:00
parent 3b508688ea
commit 86386e84bc
11 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
river/Seat.zig
View File

@ -125,13 +125,13 @@ pub fn focus(self: *Self, _view: ?*View) void {
// If the view is not currently visible, behave as if null was passed
if (view) |v| {
if (v.output != self.focused_output or
v.current.tags & self.focused_output.current_focused_tags == 0) view = null;
v.current.tags & self.focused_output.current.tags == 0) view = null;
}
// If the target view is not fullscreen or null, then a fullscreen view
// will grab focus if visible.
if (if (view) |v| !v.current.fullscreen else true) {
var it = ViewStack(*View).iterator(self.focus_stack.first, self.focused_output.current_focused_tags);
var it = ViewStack(*View).iterator(self.focus_stack.first, self.focused_output.current.tags);
view = while (it.next()) |node| {
if (node.view.output == self.focused_output and node.view.current.fullscreen) break node.view;
} else view;
@ -139,7 +139,7 @@ pub fn focus(self: *Self, _view: ?*View) void {
if (view == null) {
// Set view to the first currently visible view in the focus stack if any
var it = ViewStack(*View).iterator(self.focus_stack.first, self.focused_output.current_focused_tags);
var it = ViewStack(*View).iterator(self.focus_stack.first, self.focused_output.current.tags);
view = while (it.next()) |node| {
if (node.view.output == self.focused_output) break node.view;
} else null;