typr 1.6.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e9446e4b4389a720e2bda6b8e95f7a7144eb5b731b72f325b80f4bdea2866ed
-  data.tar.gz: 2c8d5867850febf6db6cebcee4acb6fde4b4c023007af4af54124f12f927e19f
+  metadata.gz: 02fb4a45192b9a6bc2b3a751033a71e058b2abcb33b77d8873c991a2d6031dd1
+  data.tar.gz: 878f286e0c40eb45b0b5c5216633bc0a9ff82c7f6bc03d18531a80090936e2af
 SHA512:
-  metadata.gz: 670f5b22e356fd91507a3335038d228c06d8eef5cb404c76783c6dfa37126f073ad90253b062b26aedc81ef15c9fcb95fde0074ffff3b15dac5fd670fa53045b
-  data.tar.gz: 8dd835d95fb86ac1a56c9390ac7a485ea17d5f5e70e917db4f18d5f6491517dfc31dc56cf07a13ffffed58ae3dc92d9f1a0600ed944c7e2ca9ecc0b67389ad94
+  metadata.gz: 921906f7edae965d3ea48ed62e8eae91a770ad63dcf7cc3f20bb8463c9bbef280bcca2d2577317e4dd6c71d48b3740630bfaedf2d8c617cc9878d01381eebb9e
+  data.tar.gz: d0db793255d8969a1181193dee6b06227efc2c0248fff99ca6407f6d5944ece37dc330e8cdabafa26229e98a299a576ebc245ea4e4ebd5a25661b20526d094cc

data/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 ## [vx.y.z] — __DATE__
 
+## [v1.8.0] — 2026-10-11
+
+### Changed
+- Sort indicator uses solid triangles (▲▼) instead of thin arrows, for a heavier mark at the same single-cell width
+
+### Fixed
+- Text paints new spans once at entry and rebuilds only reflow: scheme and content colors survive resizes and appends without stacking or stripping
+- Terminal self-test renders without scrolling and covers all named colors — status line uses raw output on the last row (`p` scrolled with inspect quotes and a newline), rows are capped to the visible area, the 256-ramp starts at a known position, the color list includes all `COLOR_MAP` names plus the full grey ramp, and the fg/bg steppers clamp to valid ids
+- String headers fit inside minimal-width boxes — the box ignored the margin in the header width, so the border overwrote the last header character; single `:max` columns provably span the widget width
+- Word jumps are documented as alt-arrow, not ctrl-arrow — README, the `read_line` doc comment, and the v1.2.0 entry called them ctrl-arrow while the bindings are `KEY_ALT_LEFT`/`KEY_ALT_RIGHT` (SGR modifier 3 = alt); the package's key modifier is alt everywhere
+- Command-line redraw overwrites in place — `read_line` cleared the row on every keypress, flashing on cursor moves; each frame now pads to end-of-line with spaces instead, so shrinking content leaves no ghosts either
+- Cursor stays hidden while the command line redraws — every keypress parked the visible cursor at the prompt between the home move and the edit-position move; each frame now hides it first and shows it at the edit position
+- Mode table corrected to standard SGR order (`dim` restored, so `slow→5` and `invert→7`) with `:steady` at position 25 for blink-off; `mode_code` stays index-by-position
+
+## [v1.7.0] — 2026-10-02
+
+### Fixed
+- Column hints in `pick :column` sit in the gap cell left of each column — `draw_hints` positioned them from the widget edge while rows render past the margin, so every hint landed one margin-width left of its column; overlaying the column starts overshot right instead
+- Default bottom-bar commands work in a bare browser — the key labels were display-only, so `h / f s v r m M a i ~ H` did nothing; the default bindings now populate the keymap like explicit ones, and the pick loop discards command results instead of misreading them as picks
+- `[d]irectories` left the default bar — directory history is a filecon feature; typr's unrelated `Browser#directories` row query is unchanged
+- Explicit nil widget boundaries fall back to safe defaults — the unified clamp referenced the accessor itself, recursing until `SystemStackError` (and the bottom default assumed subclass-only methods); per-name fallbacks are restored inside the clamp
+
+### Changed
+- Regex color schemes are named and opt-in — `regex:` accepts a Hash as before or a Symbol that `Typr.paint` resolves through `REGEX_SCHEMES` (`:generic` paints numbers, colon keys, quotes, brackets, and punctuation; `:shell` paints a command line's first word and `--options`); unknown symbols raise `ArgumentError`. `Text` and `Line` no longer install a default scheme, so `regex:` is empty by default and help pages, error popups, and unconfigured views render unpainted
+
 ## [v1.6.1] — 2026-10-02
 
 ### Fixed
@@ -89,7 +114,7 @@
 ## [v1.2.0] — 2026-08-02
 
 ### Added
-- `Typr.read_key` / `Typr.read_line` — the public terminal input API: `read_key` reads a raw key; `read_line` is the shared interactive line editor that renders a prompt + query at any position with arrow keys, ctrl-arrow word jumps, Home/End/Delete/Backspace, Escape aborts (`nil`), Enter confirms, and an optional block runs after each keypress
+- `Typr.read_key` / `Typr.read_line` — the public terminal input API: `read_key` reads a raw key; `read_line` is the shared interactive line editor that renders a prompt + query at any position with arrow keys, alt-arrow word jumps, Home/End/Delete/Backspace, Escape aborts (`nil`), Enter confirms, and an optional block runs after each keypress
 - `Line#ask` strict question types — `Array` (pick from an object/column), `:key`, `:line`; the question and answer are rendered in `@colors[:question]`/`@colors[:answer]`
 - `Line#align` attribute (`:left`/`:right`) for text alignment in draw
 - `dark_*` named colors (`dark_red`, `dark_green`, `dark_yellow`, `dark_blue`, `dark_magenta`, `dark_cyan`) and a `COLOR_MAP` of popular named colors in `color_code`

data/README.md

@@ -31,9 +31,9 @@ The default terminal frontend is pure ANSI on raw TTY input — **no ncurses**.
 
 ### Colors
 
-Named colors (basic, shades, and `dark_*`), grey shades `grey0`–`grey100`, the terminal's 8-bit palette, and RGB triplets for true-color terminals. Every component takes a per-part `colors:` hash (columns, headers, hints, search matches, …). A component-level `regex:` key maps `Regexp => color` to tint typed input (`Typr.read_line`/`Line#cli`) and the rows of `Typr::Text` areas; when two patterns match the same span the earlier key wins, so order overlapping patterns longest-first. Colors may be any value `color_code` accepts — named color, `greyN`, an 8-bit index, an RGB triplet like `[10, 200, 30]`, or a `[fg, bg]` pair. Header bars render bold by default.
+Named colors (basic, shades, and `dark_*`), grey shades `grey0`–`grey100`, the terminal's 8-bit palette, and RGB triplets for true-color terminals. Every component takes a per-part `colors:` hash (columns, headers, hints, search matches, …). A component-level `regex:` key maps `Regexp => color` to tint typed input (`Typr.read_line`/`Line#cli`) and the rows of `Typr::Text` areas, or names a scheme — `:generic` or `:shell`; when two patterns match the same span the earlier key wins, so order overlapping patterns longest-first. Colors may be any value `color_code` accepts — named color, `greyN`, an 8-bit index, an RGB triplet like `[10, 200, 30]`, or a `[fg, bg]` pair. Header bars render bold by default.
 
-`Typr::Text` paints numbers cyan, colon-separated keys yellow, quoted strings green, bracketed groups magenta, and remaining punctuation grey — override with `regex:`, disable with `regex: {}`. Each painted span restores only the `default` foreground, so the row's own background (alternating stripes, search highlight, padding) survives; `Line#cli` colors the typed command (first word red, `--options` blue); it no longer tints the completion grid. Set `regex: {}` to turn a scheme off.
+Pass `regex: :generic` and `Typr::Text` paints numbers cyan, colon-separated keys yellow, quoted strings green, bracketed groups magenta, and remaining punctuation grey — override with a custom map, disable with `regex: {}` (the default: unpainted). Each painted span restores only the `default` foreground, so the row's own background (alternating stripes, search highlight, padding) survives; `Line#cli` colors the typed command with the `:shell` scheme (first word red, `--options` blue) when configured; it no longer tints the completion grid. Set `regex: {}` to turn a scheme off.
 
 ### Frontends
 
@@ -114,8 +114,7 @@ Typr.init
 
 @browser = Typr::Browser.new(
   directory: "/tmp",
-  right: -1, bottom: -1,
-  colors: { hints: [:white, :black] }
+  right: -1, bottom: -1
 )
 
 selected = @browser.pick   # interactive file picker, returns the absolute path
@@ -186,7 +185,7 @@ Clears the full screen or a single line (`:line`).
 Reads a single keypress in raw mode. Returns the key as a String (`KEY_ESCAPE`, `?q`, arrow escape sequences), a `Typr::Mouse` struct for mouse reports, or `nil` when input is unavailable.
 
 ### `Typr.read_line(prompt, ...)`
-The shared interactive line editor. Renders a prompt and query at any position with arrow keys, ctrl-arrow word jumps, Home/End/Delete/Backspace; Enter confirms, Escape aborts (`nil`). An optional block runs after each keypress and may short-circuit with a result. Pass `completions:` — a callable `->(query, cursor) { candidates }` — and TAB matches the current word against `candidates` in a pick grid: a candidate is either a string or `[text, color-pair]` to tint its pick entry. Pass `regex:` — a Hash of `Regexp => color` — and matching regions of the query are colored as they are typed, restoring the prompt's trailing color code. The editor is agnostic to where candidates come from.
+The shared interactive line editor. Renders a prompt and query at any position with arrow keys, alt-arrow word jumps, Home/End/Delete/Backspace; Enter confirms, Escape aborts (`nil`). An optional block runs after each keypress and may short-circuit with a result. Pass `completions:` — a callable `->(query, cursor) { candidates }` — and TAB matches the current word against `candidates` in a pick grid: a candidate is either a string or `[text, color-pair]` to tint its pick entry. Pass `regex:` — a Hash of `Regexp => color`, or a scheme name (`:generic`, `:shell`) — and matching regions of the query are colored as they are typed, restoring the prompt's trailing color code. The editor is agnostic to where candidates come from.
 
 ```ruby
 Typr.read_line "/", completions: ->(query, cursor) {
@@ -203,7 +202,7 @@ Strict question types:
 The question and answer are rendered in `@colors[:question]`/`@colors[:answer]`.
 
 ### `Line#cli`
-Prompts for a single command line with TAB completion matched against the shell (bash commands, options, and files). `completions: true` switches on the content; `initial:` seeds the line; `redraw:` repaints while the completion grid is up. The typed command tints with `@colors[:regex]` — default red for the first word, blue for `--options`. Completion candidates are plain strings.
+Prompts for a single command line with TAB completion matched against the shell (bash commands, options, and files). `completions: true` switches on the content; `initial:` seeds the line; `redraw:` repaints while the completion grid is up. With `regex: :shell` the typed command tints red for the first word, blue for `--options`. Completion candidates are plain strings.
 
 ```ruby
 line.cli "> ", initial: "cp %name %dir", completions: true, redraw: -> { show }

data/example/browser

@@ -4,35 +4,40 @@
 # Usage:
 #   cd example && ruby browser
 #   ruby browser /path/to/dir         Start in a specific directory
-#   ruby browser --select             Start in pick mode (returns path)
 #
 # Navigates directories and displays files with size and type.
 # Pass a directory path as an argument to start there.
-# Pass --select to enter pick mode — selected file is printed to stdout on exit.
+# The picked file path is printed to stdout on exit.
 #
 # Keys:
-#   arrows / jk   Navigate up/down
-#   enter          Open directory or pick file (in select mode)
-#   /              Filter files by name
-#   esc            Exit
+#   arrows        Scroll up/down
+#   pgup/pgdn     Page up/down
+#   home/end      Jump to top/bottom
+#   tab           Cycle hint characters
+#   1-9,0         Jump to the hinted row (directories change into, files pick)
+#   enter         Open directory or pick file (returns current directory)
+#   h             Keybinding help
+#   /             Live-search names
+#   f/s/v         Filter/sort/views popups
+#   r/m/M/a/i     Reset, mark, mark range, mark all, invert marks
+#   ~/H           Home directory, toggle hidden files
+#   esc           Exit
 #
-# When run with --select, the chosen file path is printed
-# to stdout after the TUI exits (piped to calling process).
+# Click a row to open it; click a bottom-bar label to run that command.
 
 require_relative '../lib/typr.rb'
 
 class BrowserTest
   include Typr
   def initialize
-    Typr.init 
-    $conf=$*.map{|arg| [arg.start_with?(/\w/), arg] }.to_h 
-    @browser = Browser.new( right: -1, bottom: -1,
-      directory: $conf[false], colors: { hints: [:white, :black] } )
+    Typr.init
+    dirs = ARGV.reject{|arg| arg.start_with?('--') }
+    @browser = Browser.new( right: -1, bottom: -1, directory: dirs.first )
   end
 
   def run
     Typr.clear
-    $file = @browser.pick $conf[true] 
+    $file = @browser.pick(:file)
   end
 end
 
@@ -40,6 +45,5 @@ begin
   BrowserTest.new.run
 ensure
   Typr.exit
-  puts $file
-end 
-
+  puts $file if $file
+end

data/example/grid

@@ -38,10 +38,11 @@ class GridTest
     @user = Line.new( top: -1, default:
       "(s)ort, (f)ilter, (r)eset, select (R)ows/(C)olumns/(F)ields, [esc] quit")
     @head = Line.new( interval: 1,
-      default: proc{ draw " %s, sort:%s filter:%s selected:%s" %
+      default: proc{ draw " %s, sort:%s filter:%s" %
         [ Time.now.strftime("%D %T"),
           (@grid.header[@grid.sorted_by] if @grid.sorted_by),
-          @grid.filters.join, @grid.selected ] } )
+          @grid.filters.join ] } )
+    @head.reset
   end
 
   def run

data/example/text

@@ -26,9 +26,7 @@
 require_relative '../lib/typr.rb'
 
 class TextTest
-  # extend Typr
   include Typr
-  # Typr.frontend :terminal
   def initialize
     Typr.init 
     @text = Text.new( 
@@ -47,7 +45,7 @@ class TextTest
     loop do
       @text.show 
       @user.show
-      case key = Typr.read( :key )
+      case key = Typr.read_key
         when KEY_ESCAPE; exit
         when ?/; @text.search
         when ?w; @user.ask( 'pick word':  [@text, :field] )

data/lib/browser.rb

@@ -340,6 +340,7 @@ module Typr
           choice = send key
           next if choice == :scroll or choice == :outside
         else
+          if @command_keys.include? key then send key; next end
           next unless choice = send( key )
         end
         next unless choice
@@ -502,7 +503,7 @@ full:    %i[ name size permissions executable printable owner group
         input: [ [->{Etc.getpwuid(Process.euid).name rescue ENV["USER"] || Etc.getlogin}, ->{@parent.directory},
           ->{@parent.filter_display},
           ->{ (s = @parent.sorted_by(true)) &&
-            "#{s} #{@parent.reverse ? "\u2193" : "\u2191"}"},
+            "#{s} #{@parent.reverse ? "\u25BC" : "\u25B2"}"},
           ->{@parent.view} ] ], format: [:min, :max, :min, :min, :min],
         colors: { columns: [@colors[:default], @colors[:default],
           @colors[:actions][:filter], @colors[:actions][:sort],
@@ -529,6 +530,15 @@ full:    %i[ name size permissions executable printable owner group
         ( pre + ( pre.end_with?( "/" ) ? "" : text[pre.length..-1][/\A[^\/]*/] ) ).sub( %r{(?<=.)/$}, "" )
       end
 
+      @command_keys = []
+      wire = ->(label, cmd) {
+        key = extract_key(label)
+        next unless key
+        method = cmd.is_a?(Symbol) ? cmd :
+          (cmd.start_with?('!') ? cmd[1..-1].to_sym : cmd.to_sym)
+        @keymap[method] = key
+        @command_keys << key if key.size == 1
+      }
       if args[:bindings]
         bindings_labels = []
         args[:bindings].each do |label, cmd|
@@ -536,20 +546,27 @@ full:    %i[ name size permissions executable printable owner group
           colored = @colors[:actions][name] ?
             color_code( @colors[:actions][name] ) + label + color_code(@colors[:default]) : label
           bindings_labels << colored
-          key = extract_key(label)
-          next unless key
-          method = cmd.start_with?('!') ? cmd[1..-1].to_sym : cmd.to_sym
-          @keymap[method] = key
+          wire.(label, cmd)
         end
         @user ||= Line.new( parent:self, left:->{@parent.left}, top:->{@parent.bottom+1},
           bindings: bindings_labels )
       else
-        @user ||= Line.new( parent:self, left:->{@parent.left},top:->{@parent.bottom+1},
-          bindings: %w[ [h]elp [/]:search ] + @colors[:actions].map{|name,color|
-            label = "[" + name.to_s[0] + "]" + name.to_s[1..]
-            color_code( color ) + label + color_code(@colors[:default]) } +
-              %w[ [r]eset [d]irectories [m]ark [M]ark_range mark_[a]ll
-              [i]nvert_mark [~]:home [H]idden_files [back]:.. [up] [down] [pageup] [pagedown] [home] [end] [esc]:quit [return]:confirm\  ])
+        cmds = { "[h]elp" => :help, "[/]:search" => :search,
+          "[f]ilter" => :filter_view, "[s]ort" => :sort_view, "[v]iews" => :views,
+          "[r]eset" => :reset_view, "[m]ark" => :mark,
+          "[M]ark_range" => :mark_range, "mark_[a]ll" => :mark_all,
+          "[i]nvert_mark" => :mark_invert, "[~]:home" => :home,
+          "[H]idden_files" => :toggle_hidden }
+        plain = ["[h]elp", "[/]:search"] +
+          @colors[:actions].map { |name, _| "[" + name.to_s[0] + "]" + name.to_s[1..] } +
+          %w[ [r]eset [m]ark [M]ark_range mark_[a]ll
+          [i]nvert_mark [~]:home [H]idden_files [back]:.. [up] [down] [pageup] [pagedown] [home] [end] [esc]:quit [return]:confirm\  ]
+        plain.each { |label| wire.(label, cmds[label]) if cmds[label] }
+        @user ||= Line.new( parent:self, left:->{@parent.left}, top:->{@parent.bottom+1},
+          bindings: plain.map { |label|
+            name = label.gsub( /[\[\]]/, '' ).downcase.to_sym
+            @colors[:actions][name] ?
+              color_code( @colors[:actions][name] ) + label + color_code(@colors[:default]) : label } )
       end
       cd @directory
     end

data/lib/grid.rb

@@ -411,7 +411,7 @@ module Typr
       gaps = @margin.size + @separator.size * (columns - 1)
       sum = @widths.sum
       @max = sum + gaps - 1
-      @max = [ @max, @header.length ].max if @header.is_a?(String)
+      @max = [ @max, @header.length + @margin.size ].max if @header.is_a?(String)
       space = width - gaps
       if (extra = sum - space  ) > 0
         extra.times{ |i| @widths[ @widths.index(@widths.max) ] -= 1 }
@@ -434,7 +434,7 @@ module Typr
     def print row=nil
       return super unless row
       header = ( row == :header )
-      return draw @header[0..width-1].ljust(width) if
+      return draw @header[0...(width - @margin.size)].ljust(width - @margin.size) if
         header and @header.is_a? String
       return unless row_data = header ? @header : @data[row]
       fields = row_data.dup

data/lib/line.rb

@@ -153,19 +153,19 @@ class Line < Space
   # line's default color, typed input in the answer color. When +completions+
   # is truthy, TAB matches the current word against the shell (commands,
   # options, files) and replaces it through the pick grid. Regions of the
-  # typed input matching @colors[:regex] are colored as they are typed: the
-  # first word red (the command), double-dash options blue.
+  # typed input matching @colors[:regex] are colored as they are typed
+  # (with the :shell scheme: the first word red, double-dash options blue).
   #
   #   line.cli "> ", initial: "cp %name"
   #   #=> "cp source.txt" (or nil on Escape)
 
-  def cli prompt, initial: '', redraw: nil, history: nil, prefixes: nil
+  def cli prompt, initial: '', redraw: nil, history: nil, prefixes: nil, regex: nil
     re = /\A[#{Regexp.escape(prefixes || '|+=!')}]/
     source = ->(query) {
       bash_candidates(query.sub(re, '')).split("\n").reject(&:empty?).uniq }
     colored = color_code(@colors[:default]).to_s + prompt + color_code(@colors[:answer])
     Typr.read_line(colored, left: left, top: top, initial: initial,
-      completions: source, redraw: redraw, regex: @colors[:regex], history: history)
+      completions: source, redraw: redraw, regex: regex || @colors[:regex], history: history)
   end
 
   private
@@ -204,9 +204,7 @@ class Line < Space
     @prompt = ?>
     super
     @bottom = @top
-    regex = { /(?:^|\s)--[^\s]+/ => :blue, /\A\S+/ => :red }
     @colors = { question: :green, answer: :yellow }.merge @colors
-    @colors[:regex] = regex if @colors[:regex].nil?
     reset
   end
 end

data/lib/space.rb

@@ -19,8 +19,11 @@ include Typr
   def %s_setting; @%s; end  
   def %s
     max=Typr.#{ name[/left|right/] ? 'width' : 'height' }
-    if !@%s;[max, #{name=='right' ? 'left+@max' :
-      'top+rows-1+headspace'}].min
+    if !@%s;[max, #{ case name
+when 'left' then '0'
+when 'top' then '0'
+when 'right' then 'left+@max'
+else 'top+[(respond_to?(:rows) ? rows : 0), 1].max-1+(respond_to?(:headspace) ? headspace : 0)' end }].min
     elsif @%s.is_a? Proc; @%s.call
     elsif @%s.is_a? Float; (max * @%s).round
     elsif @%s.negative?; max+@%s+1

data/lib/stack.rb

@@ -101,7 +101,7 @@ module Typr
       color @colors[ :hints ]
       if type.to_s[ /column/ ]
         positions( row_id )[ @hints_start..-1 ].each_with_index{ |pos, idx|
-          move( left + pos, top + row_id )
+          move( [left + @margin.size + pos - 1, left].max, top + row_id )
           draw @hints[idx] }
       else
         bottom = top + headspace + [height, rows].min - 1

data/lib/terminal.rb

@@ -86,7 +86,8 @@ module Typr
   end
 
   # Text attributes (reset, bold, italic, ...) and named 8/256-color tables.
-  MODES =  %i[ reset bold italic underline slow fast invert ]
+  MODES =  %i[ reset bold dim italic underline slow fast invert ]
+  MODES[25] = :steady
   COLORS = %i[ black red green yellow blue magenta cyan white ]
   COLOR_MAP = {
     brown: 130, orange: 208, lime: 118, pink: 218,
@@ -239,6 +240,24 @@ module Typr
   module_function :color_code
   public :color_code
 
+  # Named regex color schemes, accepted anywhere a +regex:+ map is (Text,
+  # Line, read_line, paint). +:generic+ paints numbers, colon keys, quoted
+  # strings, bracket groups, and punctuation; +:shell+ paints a command
+  # line's first word and double-dash options.
+  REGEX_SCHEMES = {
+    generic: {
+      /\[[^\]]*\]|\([^)]*\)|\{[^}]*\}/ => :magenta,
+      /".*?"|'.*?'/                   => :green,
+      /\b\d+(?:\.\d+)?\b/             => :cyan,
+      /\b[\w.-]+:/                    => :yellow,
+      /[^\w\s]/                       => :grey60
+    },
+    shell: {
+      /(?:^|\s)--[^\s]+/ => :blue,
+      /\A\S+/            => :red
+    }
+  }
+
   # Returns +str+ with every region matched by the keys of +regex+ wrapped in
   # the associated color, restoring +base+ after each region. Non-matching
   # text passes through untouched. +regex+ may be nil or empty (no-op), and
@@ -254,6 +273,10 @@ module Typr
   #
   #   Typr.paint "fix WARN now", { /WARN/ => :yellow }, "\e[39;49m"
   def self.paint str, regex, base
+    if regex.is_a? Symbol
+      regex = REGEX_SCHEMES.fetch(regex) {
+        raise ArgumentError, "unknown regex scheme: #{regex.inspect}" }
+    end
     return str if regex.nil? or regex.empty?
     union = Regexp.union( regex.keys )
     ansi = /\e(?:\[[0-9;?]*[ -\/]*[@-~]|\][^\a\e]*(?:\a|\e\\)|[()=><0A])|\e/
@@ -385,7 +408,7 @@ module Typr
   ## Interactive line editor used for string prompts (search, %str, ...).
   #
   # Renders +prompt+ and the query at (left, top) and edits it with
-  # arrow keys, ctrl-arrow word jumps, home/end, delete and backspace.
+  # arrow keys, alt-arrow word jumps, home/end, delete and backspace.
   # Returns the query on enter, nil on escape. A block may inspect each
   # keypress after it is applied; a non-nil return short-circuits the
   # editor and becomes its return value. When stdin is not a tty, the
@@ -412,13 +435,16 @@ module Typr
     $>.print CURSOR_NORMAL
     begin
       loop do
+        $>.print CURSOR_INVISIBLE
         $>.print "\e[%i;%if" % [ top + 1, left + 1 ]
-        $>.print ERASE_LINE
         before = text_width( prompt + query[0...cursor] )
         offset = [ left + before - Typr.width, 0 ].max
         display = prompt + paint( query, regex, prompt[/\e\[[0-9;]*m\z/].to_s )
-        $>.print slice_width( display, offset, Typr.width - left + 1 )
+        line = slice_width( display, offset, Typr.width - left + 1 )
+        $>.print line
+        $>.print ' ' * (Typr.width - left + 1 - text_width(line))
         $>.print "\e[%i;%if" % [ top + 1, left + 1 + before - offset ]
+        $>.print CURSOR_NORMAL
         key = read_key
         return nil if key.nil? or key == KEY_ESCAPE
         return query if key == KEY_RETURN or key == "\n"
@@ -597,14 +623,15 @@ if __FILE__ == $0
 begin
   include Typr
   Typr.init
-  colors = COLORS + (1..9).map{|i| "grey#{i*10}" }
+  colors = COLORS + COLOR_MAP.keys.map(&:to_s) + (0..10).map{|i| "grey#{i*10}" }
   chars = (33..126).map(&:chr)
   slice = chars.count / colors.count + 1
   characters = chars.each_slice( slice ).map(&:join)
   key,fg,bg = "",150,0
   Typr.clear
+  rows = [colors.count, Typr.height - 4].min
   loop do
-    colors.each_with_index{ |color,y|
+    colors.first(rows).each_with_index{ |color,y|
       characters.each_with_index{ |chars,x|
         foreground color.to_sym;
         background colors[x].to_sym;
@@ -612,20 +639,21 @@ begin
         draw chars
       }
     }
+    move 0, rows
     (0...256).each{ |i| background i; draw ' ' }
 
     move 0, Typr.height
     color [:white, :black]
-    p "KEY: %s / %s" % [key, key]
+    draw "KEY: %s / %s" % [key, key]
     move 15, Typr.height
     color [fg,bg]
     print "     %s / %s     " % [fg,bg]
     key = Typr.read_key
     case key
-      when KEY_UP; fg+=1
-      when KEY_DOWN; fg-=1
-      when KEY_LEFT; bg-=1
-      when KEY_RIGHT; bg+=1
+      when KEY_UP; fg = [fg + 1, 255].min
+      when KEY_DOWN; fg = [fg - 1, 0].max
+      when KEY_LEFT; bg = [bg - 1, 0].max
+      when KEY_RIGHT; bg = [bg + 1, 255].max
       when KEY_ESCAPE; exit
     end
   end

data/lib/text.rb

@@ -33,13 +33,19 @@ module Typr
     #   text << "appended line"       # alias for build
 
     def build input=nil
-      ( input, @data, @lines = sanitize(@data), "", [0] ) if rebuild = !input
+      ( input, @data, @lines = @data, "", [0] ) if rebuild = !input
       return self if rebuild && input == ""
-      rows = @lines[0...-1].each_index.map{ |i| sanitize(@data[@lines[i]...@lines[i+1]]) }
+      rows = @lines[0...-1].each_index.map{ |i| @data[@lines[i]...@lines[i+1]] }
       @data = rows.join
       off = [ 0 ]; rows.each{ |row| off << off.last + row.length }
       @lines = off
       str = input.respond_to?(:read) ? input.read : input.to_s
+      if !rebuild and (r = @colors[:regex]) and r != {}
+        base = color_code( @colors[:default][0] ).to_s
+        # Paint new spans once, whole (multiline matches included); rebuilds
+        # below only reflow, so paint can neither stack nor need stripping.
+        str = Typr.paint(str, r, base)
+      end
       str = str.gsub("\t", " " * @tabspace)
       @tail = ""
       pos = 0
@@ -85,14 +91,6 @@ module Typr
         end
       end
       @lines << @data.length unless @lines.last == @data.length
-      if (r = @colors[:regex]) and !r.empty?
-        base = color_code( @colors[:default][0] ).to_s
-        painted = @lines[0...-1].each_index.map{ |i|
-          Typr.paint @data[@lines[i]...@lines[i+1]], r, base }
-        @data = painted.join
-        off = [ 0 ]; painted.each{ |line| off << off.last + line.length }
-        @lines = off
-      end
       highlight if @re
     end
     alias :<< :build
@@ -211,15 +209,7 @@ module Typr
       @data, @lines, @tail = "", [0], ""
       @search = { pattern: nil, dir: :forward, last: nil, matches: [] }
       super args
-      regex = {
-      /\[[^\]]*\]|\([^)]*\)|\{[^}]*\}/ => :magenta,
-      /".*?"|'.*?'/                   => :green,
-      /\b\d+(?:\.\d+)?\b/             => :cyan,
-      /\b[\w.-]+:/                    => :yellow,
-      /[^\w\s]/                       => :grey60
-    }
-    @colors = { header: :yellow, search: :grey20 }.merge( @colors || {} )
-    @colors[:regex] = regex if @colors[:regex].nil?
+      @colors = { header: :yellow, search: :grey20 }.merge( @colors || {} )
       @keymap = { search: ?/, search_next: ?n, search_prev: ?p }.merge @keymap
       @lastwidth = width
       self << @input

data/typr.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = "typr"
-  s.version = "1.6.1"
-  s.date = "2026-10-02"
+  s.version = "1.8.0"
+  s.date = "2026-10-11"
   s.homepage = "https://codeberg.org/typr/typr"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: typr
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Kilian Reitmayr
 bindir: bin
 cert_chain: []
-date: 2026-10-02 00:00:00.000000000 Z
+date: 2026-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode-display_width