fatty 0.99.0 → 0.99.3

data/lib/fatty/session/keytest_session.rb

@@ -4,85 +4,99 @@ require "tmpdir"
 
 module Fatty
   class KeyTestSession < Session
-    def id = :keytest
+    attr_reader :output_session
 
-    def initialize(owner: nil)
-      super(keymap: nil, views: [])
-      @owner = owner
+    def initialize(output_dir: Dir.tmpdir)
+      super(id: :keytest, keymap: nil)
+      @output_session = OutputSession.new
+      @path = nil
+      @suggestions = []
     end
 
+    #########################################################################################
+    # Session Protocol
+    #########################################################################################
+
     def init(terminal:)
-      super
+      commands = super
       @suggestions = []
-      @owner ||= terminal.focused_session
-      show_quit_status
-      force_scrolling_output!
-      append <<~TEXT
-        Key test mode
 
-        Press keys to inspect Fatty's decoding and binding resolution.
-        Press q, ESC, or C-g to leave key test mode.
-
-      TEXT
-      []
+      commands.concat(output_session.init(terminal: terminal))
+      commands << Command.terminal(:register_session, session: output_session)
+      commands << Command.session(output_session.id, :resize)
+      commands << Command.session(output_session.id, :set_mode, mode: :scrolling)
+      commands << Command.session(output_session.id, :begin_command)
+      commands << Command.session(
+        output_session.id,
+        :append,
+        text: <<~TEXT,
+          Key test mode
+
+          Press keys to inspect Fatty's decoding and binding resolution.
+          Press q, ESC, or C-g to leave key test mode.
+
+        TEXT
+        follow: true,
+      )
+      commands << show_quit_status_command
+      commands
     end
 
-    def update_key(ev)
-      if quit_key?(ev)
-        append "Leaving key test mode.\n\n"
-        return [[:terminal, :pop_modal]]
-      end
-
-      # append "  TERM:      #{terminal_name}\n"
-      append ev.report
-      snippet = ev.suggested_snippet(terminal_name)
-      append snippet + "\n"
-      @suggestions << snippet unless snippet.empty?
-      show_quit_status
-      []
+    def update(command)
+      log_update(command)
+      commands =
+        case command.action
+        when :key
+          ev = command.payload.fetch(:event)
+          if quit_key?(ev)
+            write_suggestions_commands + [
+              Command.session(output_session.id, :append, text: "Leaving key test mode.\n\n", follow: true),
+              Command.session(:status, :clear),
+              Command.terminal(:pop_modal),
+              Command.session(
+                :status,
+                :show,
+                text: "KeyTest suggestions written to #{@path}",
+                role: :good,
+              ),
+            ]
+          else
+            snippet = ev.suggested_snippet(terminal_name)
+            @suggestions << snippet unless snippet.empty?
+            text = [
+              ev.report,
+              "\nSuggested keybindings:\n",
+              snippet,
+              "\n",
+            ].join
+            [
+              Command.session(
+                output_session.id,
+                :append,
+                text: text,
+                follow: true,
+                mode: :scrolling),
+              show_quit_status_command,
+            ]
+          end
+        else
+          []
+        end
+      Array(commands)
     end
 
-    def view(screen:, renderer:)
-      # Intentionally blank. The underlying shell session renders the output
-      # pane; this modal only captures keys and appends diagnostic text.
-      nil
+    def view
+      output_session.view
     end
 
     def close
-      write_suggestions!
-      restore_owner_pager!
-      terminal.clear_status if terminal.respond_to?(:clear_status)
+      output_session.close
       nil
     end
 
     private
 
-    def append(text)
-      return unless @owner&.respond_to?(:append_output)
-
-      force_scrolling_output!
-
-      before = @owner.output.lines.length
-      @owner.append_output(text.to_s, follow: false)
-
-      height = @owner.viewport.height.to_i
-      added = @owner.output.lines.length - before
-
-      if added >= height
-        @owner.viewport.top = before
-        @owner.viewport.clamp!(@owner.output.lines)
-      else
-        @owner.viewport.page_bottom(@owner.output.lines)
-      end
-
-      terminal.renderer.reset_frame_cache if terminal.respond_to?(:renderer)
-    end
-
-    def force_scrolling_output!
-      if @owner&.respond_to?(:pager)
-        @owner.pager.paging_to_scrolling
-      end
-    end
+    # simplecov:disable
 
     def quit_key?(ev)
       ev.key == :q ||
@@ -101,26 +115,38 @@ module Fatty
       env && env[:terminal] || ENV.fetch("TERM", "unknown")
     end
 
-    def show_quit_status
-      terminal.warn("KeyTest — press q, ESC, or C-g to quit  (TERM: #{terminal_name})")
+    def show_quit_status_command
+      Command.session(
+        :status,
+        :show,
+        text: "KeyTest — press q, ESC, or C-g to quit  (terminal: #{terminal_name})",
+        role: :warn,
+      )
     end
 
-    def write_suggestions!
+    def write_suggestions_commands
       suggestions = @suggestions.uniq
-      return if suggestions.empty?
-
-      path = File.join(Dir.tmpdir, "fatty-keytest-#{Time.now.strftime('%Y%m%d-%H%M%S')}.yml")
-
-      File.write(path, suggestion_file_text(suggestions))
-
-      append <<~TEXT
-        =======================================================
-        KeyTest suggestions written to:
-        #{path}
-
-      TEXT
-
-      terminal.good("KeyTest suggestions written to #{path}")
+      return [] if suggestions.empty?
+
+      @path = File.join(
+        Dir.tmpdir,
+        "fatty-keytest-#{Time.now.strftime('%Y%m%d-%H%M%S')}.yml",
+      )
+      File.write(@path, suggestion_file_text(suggestions))
+      [
+        Command.session(
+          output_session.id,
+          :append,
+          text: <<~TEXT,
+            =======================================================
+            KeyTest suggestions written to:
+            #{@path}
+
+          TEXT
+          follow: true,
+          mode: :scrolling,
+        ),
+      ]
     end
 
     def suggestion_file_text(suggestions)
@@ -195,7 +221,7 @@ module Fatty
 
          Mouse events may also be bound in keybindings.yml, for example:
 
-         - mouse: <BUTTONNAME>
+         - button: <BUTTONNAME>
            context: paging
            action: page_up
 
@@ -226,11 +252,5 @@ module Fatty
       out << "\n"
       out
     end
-
-    def restore_owner_pager!
-      if @owner&.respond_to?(:pager)
-        @owner.pager.quit_paging
-      end
-    end
   end
 end

data/lib/fatty/session/modal_session.rb

@@ -5,6 +5,10 @@ module Fatty
     attr_reader :win
     private attr_writer :win
 
+    #########################################################################################
+    # Session Protocol
+    #########################################################################################
+
     def close
       Fatty.debug("#{self.class}#close: object_id=#{object_id}", tag: :session)
       old_win = win
@@ -18,6 +22,10 @@ module Fatty
       []
     end
 
+    private
+
+    # simplecov:disable
+
     def rebuild_windows!
       old_win = win
       self.win = nil
@@ -27,7 +35,8 @@ module Fatty
       rows = ::Curses.lines
       width, height = geometry(cols: cols, rows: rows)
       x = (cols - width) / 2
-      y = (rows - height) / 2
+      input_row = renderer.screen.input_rect.row
+      y = [input_row - height - 1, 0].max
       self.win = ::Curses::Window.new(height, width, y, x)
       nil
     end
@@ -57,5 +66,33 @@ module Fatty
     def clamp_height(height, max_height:, min_height:)
       height.clamp(min_height, max_height)
     end
+
+    def safely_close_window(win)
+      return unless win
+
+      begin
+        win.erase
+      rescue RuntimeError => e
+        raise unless closed_window_error?(e)
+      end
+
+      begin
+        win.noutrefresh if win.respond_to?(:noutrefresh)
+      rescue RuntimeError => e
+        raise unless closed_window_error?(e)
+      end
+
+      begin
+        win.close
+      rescue RuntimeError => e
+        raise unless closed_window_error?(e)
+      end
+      nil
+    end
+
+    def closed_window_error?(error)
+      message = error.message
+      message.include?("closed window") || message.include?("already closed window")
+    end
   end
 end