marvi 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dd503447b94d15e62154562c11505be76de5f380abf17c735aa5f9879ac0ce8
-  data.tar.gz: 234f6152a1797777ad5129307246dd19ad8c564539d060ae5015c8d5afc2284f
+  metadata.gz: 5131e252ac808321286aa802bdd386e5b3bb9b494dda00df1761ef9700088a4e
+  data.tar.gz: 2e9bccb531018e22014e43053b6a05d081e60a422c9107966c54739829cf528d
 SHA512:
-  metadata.gz: d042ca2e2863425922de5ffc43cef959c0dded6a8a63c901d0073ce2d12813f11ddbf3f53bfa402da92bb9df82ae2cb9894124d7333c3b9f5cd62358b45bbfc0
-  data.tar.gz: eb80372539222159afffd907a92b37dff0af63be65b72364cbc1e46449b05fd8dbf0490e9c64438a493400a2afefc51dbf01d4c39f07e0dac52298d0cc3876e6
+  metadata.gz: d87aa8d7de7acd2414e5301416fd09b09d1f33e48f64c93c86b5d0b7fc833e20102c297e89a77396cdcb4176269493459e835a6ab9df2a677d6d112ad9bbb3ed
+  data.tar.gz: 673ca0703a768010c6116fa4cae6b29c723b439a50e7591c3a7ac7f9928e614eda42f2ef2fda7f377ef7453babd37b729786579ef20479b24107f800be453c59

data/lib/marvi/renderer/curses.rb

@@ -18,23 +18,27 @@ module Marvi
 
       ITALIC_ATTR = (defined?(::Curses::A_ITALIC) ? ::Curses::A_ITALIC : 0)
 
+      FILE_POLL_INTERVAL_MS = 500
+
       def render(markdown, file: nil)
         @file     = file
         @markdown = markdown
         @lines    = ASTWalker.new.walk(markdown)
         @scroll   = 0
+        mark_reloaded
 
-        with_safe_term { ::Curses.init_screen }
-        ::Curses.start_color
-        ::Curses.use_default_colors
-        ::Curses.noecho
-        ::Curses.cbreak
-        ::Curses.stdscr.keypad(true)
-        setup_colors
+        init_curses_state
         draw
 
         catch(:quit) do
-          loop { handle_key(::Curses.getch) }
+          loop do
+            key = ::Curses.getch
+            if key.nil? || key == -1
+              check_file_updated
+            else
+              handle_key(key)
+            end
+          end
         end
       ensure
         ::Curses.close_screen
@@ -42,16 +46,48 @@ module Marvi
 
       private
 
-      # xterm-ghostty's `rep` capability mishandles long runs of identical glyphs,
-      # so swap to xterm-256color around initscr to disable that ncurses optimization.
+      # ncurses uses the terminfo `rep` capability ("ESC[Nb") to compress runs of
+      # identical glyphs, but ghostty mishandles it and drops the run from the
+      # screen — table borders and long padding go missing. The bug surfaces both
+      # under xterm-ghostty directly and inside multiplexers like cmux that ship a
+      # terminfo whose xterm-256color entry advertises `rep`. Detect `rep` in the
+      # active terminfo and swap to a known no-rep alternative around initscr only.
+      REP_SAFE_TERMS = %w[screen-256color tmux-256color xterm-color xterm].freeze
+
       def with_safe_term
         original = ENV["TERM"]
-        ENV["TERM"] = "xterm-256color" if original == "xterm-ghostty"
+        replacement = rep_safe_term_for(original)
+        ENV["TERM"] = replacement if replacement
         yield
       ensure
         ENV["TERM"] = original
       end
 
+      def rep_safe_term_for(term)
+        return nil if term.nil? || term.empty?
+        return nil unless terminfo_has_rep?(term)
+
+        REP_SAFE_TERMS.find { |candidate| candidate != term && terminfo_exists?(candidate) && !terminfo_has_rep?(candidate) }
+      end
+
+      def terminfo_has_rep?(term)
+        infocmp(term)&.include?("rep=") || false
+      end
+
+      def terminfo_exists?(term)
+        !infocmp(term).nil?
+      end
+
+      def infocmp(term)
+        @infocmp_cache ||= {}
+        return @infocmp_cache[term] if @infocmp_cache.key?(term)
+
+        output = IO.popen(["infocmp", "-1", term, err: File::NULL], &:read)
+        @infocmp_cache[term] = $?.success? ? output : nil
+      rescue StandardError
+        @infocmp_cache[term] = nil
+      end
+
       def setup_colors
         ::Curses.init_pair(COLOR_PAIRS[:cyan],          ::Curses::COLOR_CYAN,    -1)
         ::Curses.init_pair(COLOR_PAIRS[:green],         ::Curses::COLOR_GREEN,   -1)
@@ -74,9 +110,41 @@ module Marvi
         when "g"                            then @scroll = 0; draw
         when "G"                            then @scroll = max_scroll; draw
         when "e"                            then launch_editor if @file
+        when "r", "R"                       then reload_from_key if @file
         end
       end
 
+      def reload_from_key
+        reload
+        mark_reloaded
+        draw
+      end
+
+      def check_file_updated
+        return unless @file
+        mtime = current_mtime
+        return if mtime.nil? || mtime == @last_mtime
+
+        @last_mtime = mtime
+        return if @file_updated
+
+        @file_updated = true
+        draw_status_bar
+        ::Curses.refresh
+      end
+
+      def mark_reloaded
+        @last_mtime   = current_mtime
+        @file_updated = false
+      end
+
+      def current_mtime
+        return nil unless @file
+        File.mtime(@file)
+      rescue SystemCallError
+        nil
+      end
+
       def launch_editor
         editor = ENV["EDITOR"] || ENV["VISUAL"] || "vi"
         line   = current_source_line
@@ -85,7 +153,8 @@ module Marvi
         ::Curses.close_screen
         system(cmd)
         reload
-        reinit_curses
+        mark_reloaded
+        init_curses_state
         draw
       end
 
@@ -95,13 +164,14 @@ module Marvi
         @scroll   = [@scroll, max_scroll].min
       end
 
-      def reinit_curses
+      def init_curses_state
         with_safe_term { ::Curses.init_screen }
         ::Curses.start_color
         ::Curses.use_default_colors
         ::Curses.noecho
         ::Curses.cbreak
         ::Curses.stdscr.keypad(true)
+        ::Curses.stdscr.timeout = FILE_POLL_INTERVAL_MS
         setup_colors
       end
 
@@ -138,12 +208,20 @@ module Marvi
 
       def draw_status_bar
         ::Curses.setpos(::Curses.lines - 1, 0)
+        top    = @scroll + 1
+        bottom = [@scroll + page_size, @lines.size].min
+        edit_hint = @file ? "  e edit" : ""
+        status = " #{top}-#{bottom}/#{@lines.size}  j/k scroll  g/G top/bottom#{edit_hint}  q quit"
+        updated_hint = @file_updated ? "  ● updated (r to reload) " : ""
+        available = [::Curses.cols - updated_hint.length, 0].max
+
         ::Curses.attron(::Curses.color_pair(COLOR_PAIRS[:cyan])) do
-          top    = @scroll + 1
-          bottom = [@scroll + page_size, @lines.size].min
-          edit_hint = @file ? "  e edit" : ""
-          status = " #{top}-#{bottom}/#{@lines.size}  j/k scroll  g/G top/bottom#{edit_hint}  q quit"
-          ::Curses.addstr(status.ljust(::Curses.cols)[0, ::Curses.cols])
+          ::Curses.addstr(status.ljust(available)[0, available])
+        end
+        unless updated_hint.empty?
+          ::Curses.attron(::Curses.color_pair(COLOR_PAIRS[:yellow]) | ::Curses::A_BOLD) do
+            ::Curses.addstr(updated_hint)
+          end
         end
       end
 

data/lib/marvi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marvi
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marvi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Mitsutaka Mimura