From 1d9155864d2bfe21554c424be49d8c23fc9a5fea Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Thu, 11 Apr 2024 18:35:33 +0200
Subject: [PATCH] fix: prevent mini/overlay modes from stomping each other

Also, allow cancelling modes by clicking the flow button.
---
 src/tui/status/modestate.zig | 11 ++++++++++-
 src/tui/tui.zig              | 18 +++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/tui/status/modestate.zig b/src/tui/status/modestate.zig
index caf6308..2d91189 100644
--- a/src/tui/status/modestate.zig
+++ b/src/tui/status/modestate.zig
@@ -34,6 +34,10 @@ fn is_mini_mode() bool {
     return if (tui.current().mini_mode) |_| true else false;
 }
 
+fn is_overlay_mode() bool {
+    return if (tui.current().input_mode_outer) |_| true else false;
+}
+
 pub fn render(_: *void, self: *Button.State(void), theme: *const Widget.Theme) bool {
     tui.set_base_style(&self.plane, " ", if (self.active) theme.editor_cursor else if (self.hover) theme.editor_selection else theme.statusbar_hover);
     self.plane.on_styles(nc.style.bold);
@@ -53,5 +57,10 @@ fn render_separator(self: *Button.State(void), theme: *const Widget.Theme) void
 }
 
 fn on_click(_: *void, _: *Button.State(void)) void {
-    command.executeName("toggle_input_mode", .{}) catch {};
+    command.executeName(if (is_mini_mode())
+        "exit_mini_mode"
+    else if (is_overlay_mode())
+        "exit_overlay_mode"
+    else
+        "toggle_input_mode", .{}) catch {};
 }
diff --git a/src/tui/tui.zig b/src/tui/tui.zig
index 6b4c26b..492a24b 100644
--- a/src/tui/tui.zig
+++ b/src/tui/tui.zig
@@ -795,12 +795,9 @@ const cmds = struct {
         var mode: []const u8 = undefined;
         if (!try ctx.args.match(.{tp.extract(&mode)}))
             return tp.exit_error(error.InvalidArgument);
-        if (self.mini_mode) |_| try cmds.exit_mini_mode(self, .{});
+        if (self.mini_mode) |_| try exit_mini_mode(self, .{});
+        if (self.input_mode_outer) |_| try exit_overlay_mode(self, .{});
         if (self.input_mode) |*m| m.deinit();
-        if (self.input_mode_outer) |*m| {
-            m.deinit();
-            self.input_mode_outer = null;
-        }
         self.input_mode = if (std.mem.eql(u8, mode, "vim/normal"))
             @import("mode/input/vim/normal.zig").create(self.a) catch |e| return tp.exit_error(e)
         else if (std.mem.eql(u8, mode, "vim/insert"))
@@ -826,11 +823,8 @@ const cmds = struct {
         var mode: []const u8 = undefined;
         if (!try ctx.args.match(.{tp.extract(&mode)}))
             return tp.exit_error(error.InvalidArgument);
-        if (self.mini_mode) |_| try cmds.exit_mini_mode(self, .{});
-        if (self.input_mode_outer) |*m| {
-            m.deinit();
-            self.input_mode_outer = null;
-        }
+        if (self.mini_mode) |_| try exit_mini_mode(self, .{});
+        if (self.input_mode_outer) |_| try exit_overlay_mode(self, .{});
         self.input_mode = if (std.mem.eql(u8, mode, "open_recent")) ret: {
             self.input_mode_outer = self.input_mode;
             break :ret @import("mode/overlay/open_recent.zig").create(self.a) catch |e| return tp.exit_error(e);
@@ -842,7 +836,7 @@ const cmds = struct {
     }
 
     pub fn exit_overlay_mode(self: *Self, _: Ctx) tp.result {
-        if (self.input_mode_outer) |_| {} else return;
+        if (self.input_mode_outer == null) return;
         defer {
             self.input_mode = self.input_mode_outer;
             self.input_mode_outer = null;
@@ -873,6 +867,8 @@ const cmds = struct {
     const MiniModeFactory = fn (Allocator, Ctx) error{ NotFound, OutOfMemory }!EventHandler;
 
     fn enter_mini_mode(self: *Self, comptime mode: anytype, ctx: Ctx) tp.result {
+        if (self.mini_mode) |_| try exit_mini_mode(self, .{});
+        if (self.input_mode_outer) |_| try exit_overlay_mode(self, .{});
         self.input_mode_outer = self.input_mode;
         errdefer {
             self.input_mode = self.input_mode_outer;