From 0e9ecb6051ad0a424befcd0cd4b72d5f1aa614de Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 2 Jun 2020 14:04:23 +0200
Subject: [PATCH] Rename focus -> focus-view

---
 contrib/config.sh                           | 4 ++--
 river/command.zig                           | 4 ++--
 river/command/{focus.zig => focus_view.zig} | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename river/command/{focus.zig => focus_view.zig} (99%)

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_view.zig
similarity index 99%
rename from river/command/focus.zig
rename to river/command/focus_view.zig
index 0e2c9e0..972993d 100644
--- a/river/command/focus.zig
+++ b/river/command/focus_view.zig
@@ -27,7 +27,7 @@ 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(
+pub fn focusView(
     allocator: *std.mem.Allocator,
     seat: *Seat,
     args: []const []const u8,