From 0e9ecb6051ad0a424befcd0cd4b72d5f1aa614de Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 2 Jun 2020 14:04:23 +0200 Subject: Rename focus -> focus-view --- contrib/config.sh | 4 +-- river/command.zig | 4 +-- river/command/focus.zig | 67 -------------------------------------------- river/command/focus_view.zig | 67 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 river/command/focus.zig create mode 100644 river/command/focus_view.zig diff --git a/contrib/config.sh b/contrib/config.sh index eb7ec43..18c6d68 100755 --- a/contrib/config.sh +++ b/contrib/config.sh @@ -13,8 +13,8 @@ riverctl map normal $mod Q close riverctl map normal $mod E exit # Mod+J and Mod+K to focus the next/previous view in the layout stack -riverctl map normal $mod J focus next -riverctl map normal $mod K focus previous +riverctl map normal $mod J focus-view next +riverctl map normal $mod K focus-view previous # Mod+Period and Mod+Comma to focus the next/previous output riverctl map normal $mod Period focus-output next diff --git a/river/command.zig b/river/command.zig index 2435dee..fd3cd28 100644 --- a/river/command.zig +++ b/river/command.zig @@ -24,7 +24,7 @@ const impl = struct { const declareMode = @import("command/declare_mode.zig").declareMode; const enterMode = @import("command/enter_mode.zig").enterMode; const exit = @import("command/exit.zig").exit; - const focus = @import("command/focus.zig").focus; + const focusView = @import("command/focus_view.zig").focusView; const focusAllTags = @import("command/focus_all_tags.zig").focusAllTags; const focusOutput = @import("command/focus_output.zig").focusOutput; const map = @import("command/map.zig").map; @@ -68,7 +68,7 @@ const str_to_impl_fn = [_]Definition{ .{ .name = "declare-mode", .impl = impl.declareMode}, .{ .name = "enter-mode", .impl = impl.enterMode }, .{ .name = "exit", .impl = impl.exit }, - .{ .name = "focus", .impl = impl.focus }, + .{ .name = "focus-view", .impl = impl.focusView }, .{ .name = "focus-all-tags", .impl = impl.focusAllTags }, .{ .name = "focus-output", .impl = impl.focusOutput }, .{ .name = "focus-tag", .impl = impl.focusTag }, diff --git a/river/command/focus.zig b/river/command/focus.zig deleted file mode 100644 index 0e2c9e0..0000000 --- a/river/command/focus.zig +++ /dev/null @@ -1,67 +0,0 @@ -// This file is part of river, a dynamic tiling wayland compositor. -// -// Copyright 2020 Isaac Freund -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -const std = @import("std"); - -const c = @import("../c.zig"); - -const Error = @import("../command.zig").Error; -const Direction = @import("../command.zig").Direction; -const Seat = @import("../Seat.zig"); -const View = @import("../View.zig"); -const ViewStack = @import("../view_stack.zig").ViewStack; - -/// Focus either the next or the previous visible view, depending on the enum -/// passed. Does nothing if there are 1 or 0 views in the stack. -pub fn focus( - allocator: *std.mem.Allocator, - seat: *Seat, - args: []const []const u8, - failure_message: *[]const u8, -) Error!void { - if (args.len < 2) return Error.NotEnoughArguments; - if (args.len > 2) return Error.TooManyArguments; - - const direction = try Direction.parse(args[1]); - const output = seat.focused_output; - - if (seat.focused_view) |current_focus| { - // If there is a currently focused view, focus the next visible view in the stack. - const focused_node = @fieldParentPtr(ViewStack(View).Node, "view", current_focus); - var it = switch (direction) { - .Next => ViewStack(View).iterator(focused_node, output.current_focused_tags), - .Prev => ViewStack(View).reverseIterator(focused_node, output.current_focused_tags), - }; - - // Skip past the focused node - _ = it.next(); - // Focus the next visible node if there is one - if (it.next()) |node| { - seat.focus(&node.view); - return; - } - } - - // There is either no currently focused view or the last visible view in the - // stack is focused and we need to wrap. - var it = switch (direction) { - .Next => ViewStack(View).iterator(output.views.first, output.current_focused_tags), - .Prev => ViewStack(View).reverseIterator(output.views.last, output.current_focused_tags), - }; - - seat.focus(if (it.next()) |node| &node.view else null); -} diff --git a/river/command/focus_view.zig b/river/command/focus_view.zig new file mode 100644 index 0000000..972993d --- /dev/null +++ b/river/command/focus_view.zig @@ -0,0 +1,67 @@ +// This file is part of river, a dynamic tiling wayland compositor. +// +// Copyright 2020 Isaac Freund +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +const std = @import("std"); + +const c = @import("../c.zig"); + +const Error = @import("../command.zig").Error; +const Direction = @import("../command.zig").Direction; +const Seat = @import("../Seat.zig"); +const View = @import("../View.zig"); +const ViewStack = @import("../view_stack.zig").ViewStack; + +/// Focus either the next or the previous visible view, depending on the enum +/// passed. Does nothing if there are 1 or 0 views in the stack. +pub fn focusView( + allocator: *std.mem.Allocator, + seat: *Seat, + args: []const []const u8, + failure_message: *[]const u8, +) Error!void { + if (args.len < 2) return Error.NotEnoughArguments; + if (args.len > 2) return Error.TooManyArguments; + + const direction = try Direction.parse(args[1]); + const output = seat.focused_output; + + if (seat.focused_view) |current_focus| { + // If there is a currently focused view, focus the next visible view in the stack. + const focused_node = @fieldParentPtr(ViewStack(View).Node, "view", current_focus); + var it = switch (direction) { + .Next => ViewStack(View).iterator(focused_node, output.current_focused_tags), + .Prev => ViewStack(View).reverseIterator(focused_node, output.current_focused_tags), + }; + + // Skip past the focused node + _ = it.next(); + // Focus the next visible node if there is one + if (it.next()) |node| { + seat.focus(&node.view); + return; + } + } + + // There is either no currently focused view or the last visible view in the + // stack is focused and we need to wrap. + var it = switch (direction) { + .Next => ViewStack(View).iterator(output.views.first, output.current_focused_tags), + .Prev => ViewStack(View).reverseIterator(output.views.last, output.current_focused_tags), + }; + + seat.focus(if (it.next()) |node| &node.view else null); +} -- cgit v1.2.3