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

river: add focus-previous-tags command

Browse Source
This commit is contained in:
Viktor Nagy
2021-07-07 08:51:00 +02:00
committed by Isaac Freund
parent 604cf98047
commit 28fc8792d7
7 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
river/Output.zig
View File

@ -72,6 +72,9 @@ views: ViewStack(View) = .{},
current: State = State{ .tags = 1 << 0 },
pending: State = State{ .tags = 1 << 0 },
/// Remembered version of tags (from last run)
previous_tags: u32 = 1 << 0,
/// The currently active LayoutDemand
layout_demand: ?LayoutDemand = null,

1
river/command.zig
View File

@ -83,6 +83,7 @@ const str_to_impl_fn = [_]struct {
.{ .name = "toggle-focused-tags", .impl = @import("command/tags.zig").toggleFocusedTags },
.{ .name = "toggle-fullscreen", .impl = @import("command/toggle_fullscreen.zig").toggleFullscreen },
.{ .name = "toggle-view-tags", .impl = @import("command/tags.zig").toggleViewTags },
.{ .name = "focus-previous-tags", .impl = @import("command/tags.zig").focusPreviousTags },
.{ .name = "unmap", .impl = @import("command/map.zig").unmap },
.{ .name = "unmap-pointer", .impl = @import("command/map.zig").unmapPointer },
.{ .name = "xcursor-theme", .impl = @import("command/xcursor_theme.zig").xcursorTheme },

19
river/command/tags.zig
View File

@ -31,6 +31,7 @@ pub fn setFocusedTags(
) Error!void {
const tags = try parseTags(allocator, args, out);
if (seat.focused_output.pending.tags != tags) {
seat.focused_output.previous_tags = seat.focused_output.pending.tags;
seat.focused_output.pending.tags = tags;
seat.focused_output.arrangeViews();
seat.focus(null);
@ -76,6 +77,7 @@ pub fn toggleFocusedTags(
const output = seat.focused_output;
const new_focused_tags = output.pending.tags ^ tags;
if (new_focused_tags != 0) {
output.previous_tags = output.pending.tags;
output.pending.tags = new_focused_tags;
output.arrangeViews();
seat.focus(null);
@ -102,6 +104,23 @@ pub fn toggleViewTags(
}
}
/// Switch focus to tags that were selected previously
pub fn focusPreviousTags(
allocator: *std.mem.Allocator,
seat: *Seat,
args: []const []const u8,
out: *?[]const u8,
) Error!void {
const previous_tags = seat.focused_output.previous_tags;
if (seat.focused_output.pending.tags != previous_tags) {
seat.focused_output.previous_tags = seat.focused_output.pending.tags;
seat.focused_output.pending.tags = previous_tags;
seat.focused_output.arrangeViews();
seat.focus(null);
server.root.startTransaction();
}
}
fn parseTags(
allocator: *std.mem.Allocator,
args: []const [:0]const u8,