typr 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdcaef4b1bc2c40e6fab6bd7d1462ddf19aeca03babcdbb9be74629551230647
-  data.tar.gz: b4e927b5237f27e2366ed15057054b33d9f070ef5a50c234533699182c7228ee
+  metadata.gz: 65f06238b297e2c6f925f139336c89b5606e23c7a08a6fb94ed82848490e9e71
+  data.tar.gz: d958ec7e5f7cd5857c2b559b3e32327b590652c8fb759f0557effb33d8c27551
 SHA512:
-  metadata.gz: 889fd403e345e89dc6777c02c6736d0865b7266b16157e13e4cf2469b9a3664d68f4fe672d1f9b5b6d72316d697c2c8e20e1f920853ae495014c9fb049fed6cd
-  data.tar.gz: 662df0d3ef61d964cd8a03a1cd1f7caa7fb14a15d87c22afa3a2cdf9115f4780b944446ebcdc9f538c33ee80753e48c362fea7f716d2ef7fca2070f07fe5483f
+  metadata.gz: 8d651d702b4e5d019636814a021ef4ab62f300b841f482de5ed4aac8f3cc3fe636802ac34551b107bfaef2c19723805e7742fafa95ada76cb6c20f91066e101b
+  data.tar.gz: 723ef1823511febee158925266361dbe0afda106ad3974fc1f75edd83f31e5a2ed6be272e634762bbf6797df41e6e27d24c908fe48902892fcf1c34271f1d6d1

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [v1.4.0] — 2026-08-15
+
+### Added
+- `Browser#pick :directory` confirms the current directory with Return (clearing filters and sorting first), so callers can accept the directory itself; the `pick` type filter only applies to directory and MIME-type picks — `:file` and custom types like `:cmd` show the full listing
+- `sanitize` terminal helper — strips ANSI escape sequences and control characters (except `\n`, `\t`) from shell-generated text
+- Alt+digit hint selection — pressing Alt + a hint digit (sent as `ESC` + digit) selects that hint row and sets a `modifier` accessor on the picker (`:alt`), so callers can detect the modified selection; `Stack#pick` and `Grid#pick` both reset `modifier` to `nil` at the start of each pick
+
+### Changed
+- `Browser#switch_to` renamed to `change_view` — clearer name for switching column views (callers in `cd` and the `views` popup updated)
+- `read_line` scrolls horizontally instead of wrapping when the query exceeds the terminal width — the cursor stays pinned to the right edge of the line while overflowing
+- `read_line` now shows the terminal cursor while editing and hides it again on exit (previously the cursor stayed invisible after `Typr.init`)
+- `real_size` now measures via `sanitize`, so non-SGR CSI/OSC sequences and control characters count as zero width; the `printables` helper was removed in favor of `sanitize`
+- Sort, filter, and view popups open in `/` search mode — typing narrows the list and a hint digit picks the result; `Line#ask` Array questions can forward pick options as a 4th element (e.g. `{ column: 0 }`)
+- Default hints are digits only (`0-9`) — typing letters in any picker always filters/navigates instead of selecting by hint; explicit `hints:` overrides removed from `Browser`
+
+### Fixed
+- Popup grids keep their height while live-filtering in `/` search mode — the box no longer collapses as rows are filtered out
+- `read_key` assembles split escape sequences — CSI input (cursor keys, SGR mouse) reads on to its final byte, SS3 (`\eO`) completes to three bytes, and a lone `ESC` briefly polls for an Alt+key continuation, so a split key can no longer be mistaken for a plain Escape (which would close a popup or exit)
+- Spec cleanup — merged the duplicated `Text#print` describes, removed the redundant empty-input edge case, dropped stack-spec `#pick` examples that duplicated grid-spec coverage, and updated the browser username specs to stub the passwd lookup (the info bar intentionally shows the real user, not stale `$USER`) plus the grid format-reset spec to assert `@widths` clearing instead of the removed `@maxed` state
+
 ## [v1.3.0] — 2026-08-03
 
 ### Added

data/lib/browser.rb

@@ -63,33 +63,25 @@ module Typr
         Dir.chdir( @directory = File.expand_path( dir ) )
       end
       data = Dir.new(@directory).children.reject{|f|
-        !@show_hidden and f[0] == ?. }.map.with_index do |file,id|
-        if File.symlink? file
-          target = File.readlink( file ) rescue $!.to_s
-          next [file, target, "????", false, "?", "?", 0, 0, 0, 0, "inode", "symlink"] unless File.exist?(file)
+        !@show_hidden and f[0] == ?. }.map { |file| scan_file file }
+
+      data.each_with_index{ |row, id|
+        file = row[NAME]
+        ftype = File.ftype(file) rescue next
+        ftype = File.stat(file).ftype if ftype == 'link' and File.exist?(file)
+        mime = { 'directory' => 'inode/directory', 'characterSpecial' => 'inode/chardevice',
+          'blockSpecial' => 'inode/blockdevice', 'link' => 'inode/symlink',
+          'fifo' => 'inode/fifo', 'socket' => 'inode/socket' }[ftype]
+        unless mime
+          if @mimetype_db and ext = file.match(/.+\.(\w+)$/)
+            mime = MIMETYPES[ext[1].to_sym]
+          end
+          missing[file] = id unless mime
         end
-        stat = File.stat(file) rescue nil
-        next [file, "", "????", false, "?", "?", 0, 0, 0, 0, "?", "?"] unless stat
-        type = stat.ftype.to_sym
-
-        mime = { "directory": "inode/directory",
-          "characterSpecial": "inode/chardevice",
-          "blockSpecial": "inode/blockdevice", "link": "inode/symlink",
-          "fifo": "inode/fifo", "socket": "inode/socket"}[type]
-        if type == :file and @mimetype_db
-          ext = file.match(/.+\.(\w+)$/)
-          mime ||= MIMETYPES[ext[1].to_sym] if ext
-        end
-
-        ( missing[file] = id ; mime = "?/?" ) unless mime
-        [  file, target, stat.mode.to_s(8)[-3..-1].chars.map{|d|
-          "rwx".chars.map.with_index{|c,i| d.to_i[2-i]==0 ? ?- : c } }.join,
-          File.executable?(file), stat.uid, stat.gid, stat.size,
-          stat.atime.to_i, stat.mtime.to_i, stat.ctime.to_i,
-          *mime.to_s.split( ?/ ) ]
-      end
+        row[-2,2] = mime.to_s.split( ?/ ) if mime
+      }
 
-      if @mimetype_magic and not missing.empty?
+      if @mimetype_magic and missing.any?
         begin
           out = IO.popen(['file', '--mime-type', *missing.keys]){ |io| io.read }
         rescue Errno::ENOENT
@@ -106,12 +98,33 @@ module Typr
       filter
       unless append
         @directory += ?/ unless @directory == ?/
-        switch_to @view
+        change_view @view
         reset :position
       end
       return
     end
 
+    ##
+    # Build a row for a single directory entry from filesystem metadata only.
+    # MIME type detection (extension database and +file --mime-type+) happens
+    # in a batch pass inside {#cd}; type/subtype are left as +"?"+ here.
+    #
+    #   browser.scan_file "image.png"   # => 12-column row
+
+    def scan_file file
+      target = nil
+      if File.symlink? file
+        target = File.readlink( file ) rescue $!.to_s
+        return [file, target, "????", false, "?", "?", 0, 0, 0, 0, "?", "?"] unless File.exist?(file)
+      end
+      stat = File.stat(file) rescue nil
+      return [file, "", "????", false, "?", "?", 0, 0, 0, 0, "?", "?"] unless stat
+      [  file, target, stat.mode.to_s(8)[-3..-1].chars.map{|d|
+        "rwx".chars.map.with_index{|c,i| d.to_i[2-i]==0 ? ?- : c } }.join,
+        ( File.executable?(file) and stat.file? ), stat.uid, stat.gid, stat.size,
+        stat.atime.to_i, stat.mtime.to_i, stat.ctime.to_i, "?", "?" ]
+    end
+
     ##
     # Colors symlink names green/red based on target existence and applies
     # per-MIME-type foreground colors from +@colors[:types]+.
@@ -127,11 +140,11 @@ module Typr
     ##
     # Switch to a named or indexed column view. Resets format widths.
     #
-    #   browser.switch_to :full      # all columns
-    #   browser.switch_to 0          # first view key
-    #   browser.switch_to :stats     # name, size, perms, owner, group, modified
+    #   browser.change_view :full      # all columns
+    #   browser.change_view 0          # first view key
+    #   browser.change_view :stats     # name, size, perms, owner, group, modified
 
-    def switch_to view=nil
+    def change_view view=nil
       return unless view
       view = @views.keys[ view ] if view.is_a? Integer
       @sequence = @views[ view ].map{|title| @header.index title.to_s}
@@ -227,7 +240,7 @@ module Typr
     #   browser.filter_view   # prompts for filter text
 
     def filter_view; add_filter *@user.ask(
-      filter: [ popup( type: :"[f]ilter" ), :row, NAME], with: :line ) end
+      filter: [ popup( type: :"[f]ilter" ), :row, NAME, { column: 0 }], with: :line ) end
 
     ## Open live `/` search filtered on the name column.
     #
@@ -243,13 +256,13 @@ module Typr
     #
     #   browser.sort_view   # pick a column header to sort
 
-    def sort_view; sort_by @user.ask( "sort by": [ popup( type: :"[s]ort" ), :row] ) end
+    def sort_view; sort_by @user.ask( "sort by": [ popup( type: :"[s]ort" ), :row, nil, { column: 0 }] ) end
 
     ## Open a view-picker popup and switch to the selected view.
     #
     #   browser.views   # choose :simple, :compact, :stats, or :full
 
-    def views; switch_to( popup( type: :"[v]iews", input: @views.keys ).pick :row )  end
+    def views; change_view( popup( type: :"[v]iews", input: @views.keys ).pick( :row, column: 0 ) )  end
 
     ## True when the row is a directory or passes base Grid filtering.
     #
@@ -273,16 +286,22 @@ module Typr
       type ||= 'file'
       type = type.to_s
       return super(type, **kw) if type[/row|column|field|none/]
-      add_filter ( %w[audio video image text application inode].include?(
-        type) ? TYPE : SUBTYPE ), type if type != 'file'
+      types = %w[audio video image text application inode]
+      add_filter( types.include?( type ) ? TYPE : SUBTYPE, type ) if type == 'directory' or types.include?( type )
       loop do
         show
         draw_hints :row
         key = Typr.read_key
         if key == @keymap[:exit]
-          reset :display
+          @filters.clear
+          sort
           return
         end
+        if key == @keymap[:confirm] and type == 'directory'
+          @filters.clear
+          sort
+          return @directory
+        end
         if key.is_a?(Typr::Mouse)
           if key.wheel? and key.press?
             send( key.wheel_up? ? @keymap[:up] : @keymap[:down] )
@@ -298,7 +317,8 @@ module Typr
             if file[SUBTYPE] == 'directory'; cd file[TARGET] || file[NAME]; next
             else choice = file[NAME] end
         end
-        reset :display
+        @filters.clear
+        sort
         return choice
       end
     end

data/lib/graphical.rb

@@ -1,4 +1,4 @@
-require 'sdl2'
+require 'sdl3'
 require_relative 'frontend'
 
 module Visuals

data/lib/grid.rb

@@ -262,12 +262,18 @@ module Typr
       @filters = [[column, '']]
       @map = base.select{ |id| check id }
       @start = 0
+      @bottom ||= bottom
       show
       draw_hints
+      @modifier = nil
       result = Typr.read_line '/', left: left, top: self.bottom + 1,
         &->(key, query, _) {
           if key.is_a?(String) and idx = @hints[0..height-@hints_start-1].index(key)
             return page.to_a[idx + @hints_start]
+          elsif key.is_a?(String) and digit = key[/\A\e(\d)\z/, 1] and
+            idx = @hints[0..height-@hints_start-1].index(digit)
+            @modifier = :alt
+            return page.to_a[idx + @hints_start]
           end
           if key.is_a?(String) and !key.each_char.all?{ |c| c.ord.between?(32, 126) } and
             @keymap.values.include?(key) and ![KEY_BACKSPACE, "\b"].include?(key)
@@ -406,7 +412,8 @@ module Typr
       header = ( row == :header )
       return draw @header[0..width-1].ljust(width) if
         header and @header.is_a? String
-      fields = (header ? @header : @data[row] ).dup
+      return unless row_data = header ? @header : @data[row]
+      fields = row_data.dup
       @layer[row].each{ |col,value| fields[col] = value } if
         @layer[row] if @layer unless header
   	    for col,id in sequence.each_with_index

data/lib/line.rb

@@ -64,7 +64,9 @@ class Line < Space
   #
   # The +type+ selects how the answer is collected:
   #   Array - interactive pick via <widget>.pick(<type>); an optional third
-  #           element renders the chosen row's field into the line
+  #           element renders the chosen row's field into the line, and an
+  #           optional fourth element is passed as pick keyword arguments
+  #           (e.g. { column: 0 } to open the pick in / search mode)
   #   :key  - a single keypress via Typr.read_key
   #   :line - interactive line editor via Typr.read_line at the cursor
   #
@@ -95,7 +97,7 @@ class Line < Space
         draw prepare( colored, width, @align, @trim )
         color( @colors[:answer] )
         case object
-          when Array then answer << object.first.pick( object[1] )
+          when Array then answer << object.first.pick( object[1], **(object[3] || {}) )
           when :key then answer << Typr.read_key
           when :line then answer << Typr.read_line( colored + color_code( @colors[:answer] ),
             left: left, top: top )

data/lib/stack.rb

@@ -21,7 +21,7 @@ module Typr
     ## +alternate+ toggles striped rows (+:grey10+ background alternating with the default bg).
 
     attr_accessor :start, :keymap, :selected, :header
-    attr_accessor :separator, :hints, :hints_start
+    attr_accessor :separator, :hints, :hints_start, :modifier
 
     ##
     # Returns a +Range+ of internal data indices visible on the current page.
@@ -213,6 +213,7 @@ module Typr
     def pick type = :row, row=0 #, key=nil
       type = type.to_s
       multiple = type[-1] == ?s
+      @modifier = nil
       loop do
         if type['field']
           row = pick( :row ) or return
@@ -237,6 +238,13 @@ module Typr
             relative = value + @start if type['relative_']
             if type['row'] then value = page.to_a[ value ]
             elsif type['column'] and @sequence; value = @sequence[value] end
+          elsif key.is_a?(String) and digit = key[/\A\e(\d)\z/, 1] and
+            value = @hints[0..limit-@hints_start-1].index(digit)
+            @modifier = :alt
+            value += @hints_start
+            relative = value + @start if type['relative_']
+            if type['row'] then value = page.to_a[ value ]
+            elsif type['column'] and @sequence; value = @sequence[value] end
           end unless type['none']
         end
 
@@ -294,7 +302,7 @@ module Typr
       @keymap = { cycle: KEY_TAB, confirm: KEY_RETURN, exit: KEY_ESCAPE,
         page_down: KEY_PAGEDOWN, page_up: KEY_PAGEUP, up: KEY_UP,
         down: KEY_DOWN, to_top: KEY_HOME, to_bottom: KEY_END }.merge @keymap
-      @hints ||= "1234567890qwertyuiopasdfghjklzxcvbnm-=[];'\,./"
+      @hints ||= "1234567890"
     end
   end
 

data/lib/terminal.rb

@@ -166,11 +166,16 @@ module Typr
       str[0..-num-1] + chars )
   end
 
-  # Strip ANSI escape sequences from +str+.
-  def printables str; str.gsub(/\x1b\[[^m]+m|/,'') end
+  # Strip ANSI escape sequences and control characters (except \n, \t)
+  # from shell-generated text, leaving only printable content.
+  def sanitize str
+    str.scrub
+       .gsub(/\e(?:\[[0-9;?]*[ -\/]*[@-~]|\][^\a\e]*(?:\a|\e\\)|[()=><0A])/, '')
+       .gsub(/[\x00-\x08\x0b-\x1f\x7f]/, '')
+  end
 
-  # Display width of +str+ after stripping ANSI escapes.
-  def real_size str; Unicode::DisplayWidth.of( printables(str) ) end
+  # Display width of +str+ after stripping ANSI escapes and control chars.
+  def real_size str; Unicode::DisplayWidth.of( sanitize(str) ) end
 
   # Coerce a string into Integer, Float, or Boolean when it matches those
   # forms (yes/no, true/false); otherwise return it unchanged.
@@ -250,11 +255,15 @@ module Typr
   def self.read_key
     read = ->(tty) do
       str = tty.sysread 6
-      if str.start_with?("\e[<")
-        # SGR mouse reports (CSI < b ; x ; y M/m) can exceed six bytes.
+      if str.start_with?("\e[M") and str.size < 6
+        str << tty.sysread(6 - str.size) # X10 mouse reports
+      elsif str.start_with?("\e[")
+        # CSI sequences (arrows, SGR mouse, ...) end with a byte >= 0x40.
         str << tty.sysread(1) until str[-1].ord >= 0x40
-      elsif str.start_with?("\e[M") and str.size < 6
-        str << tty.sysread(6 - str.size)
+      elsif str.start_with?("\eO") and str.size < 3
+        str << tty.sysread(3 - str.size) # SS3 (application) cursor keys
+      elsif str == "\e" and IO.select([tty], nil, nil, 0.03)
+        str << tty.read_nonblock(6) rescue nil # alt+key continuation
       end
       str
     end
@@ -304,38 +313,44 @@ module Typr
   def self.read_line prompt='', left: 0, top: 0, initial: '', &block
     return $stdin.gets&.chomp unless $stdin.tty?
     query, cursor = initial.dup, initial.length
-    loop do
-      $>.print "\e[%i;%if" % [ top + 1, left + 1 ]
-      $>.print ERASE_LINE
-      $>.print prompt + query
-      $>.print "\e[%i;%if" % [ top + 1, left + 1 +
-        text_width( prompt + query[0...cursor] ) ]
-      key = read_key
-      return nil if key.nil? or key == KEY_ESCAPE
-      return query if key == KEY_RETURN or key == "\n"
-      case key
-        when KEY_LEFT, "\e[D";    cursor -= 1 if cursor > 0
-        when KEY_RIGHT, "\e[C";   cursor += 1 if cursor < query.length
-        when "\e[1;5D", "\eOd";   cursor = word_prev query, cursor
-        when "\e[1;5C", "\eOc";   cursor = word_next query, cursor
-        when KEY_HOME;            cursor = 0
-        when KEY_END;             cursor = query.length
-        when KEY_DC, "\e[3~";     query.slice!(cursor, 1) if cursor < query.length
-        when KEY_BACKSPACE, "\b"
-          if cursor > 0
-            query.slice!(cursor - 1, 1)
-            cursor -= 1
-          end
-        else
-          if key.is_a?(String) and key.each_char.all?{ |char| char.ord.between?(32, 126) }
-            query.insert(cursor, key)
-            cursor += key.length
-          end
+    $>.print CURSOR_NORMAL
+    begin
+      loop do
+        $>.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
+        $>.print slice_width( prompt + query, offset, Typr.width - left + 1 )
+        $>.print "\e[%i;%if" % [ top + 1, left + 1 + before - offset ]
+        key = read_key
+        return nil if key.nil? or key == KEY_ESCAPE
+        return query if key == KEY_RETURN or key == "\n"
+        case key
+          when KEY_LEFT, "\e[D";    cursor -= 1 if cursor > 0
+          when KEY_RIGHT, "\e[C";   cursor += 1 if cursor < query.length
+          when "\e[1;5D", "\eOd";   cursor = word_prev query, cursor
+          when "\e[1;5C", "\eOc";   cursor = word_next query, cursor
+          when KEY_HOME;            cursor = 0
+          when KEY_END;             cursor = query.length
+          when KEY_DC, "\e[3~";     query.slice!(cursor, 1) if cursor < query.length
+          when KEY_BACKSPACE, "\b"
+            if cursor > 0
+              query.slice!(cursor - 1, 1)
+              cursor -= 1
+            end
+          else
+            if key.is_a?(String) and key.each_char.all?{ |char| char.ord.between?(32, 126) }
+              query.insert(cursor, key)
+              cursor += key.length
+            end
+        end
+        cursor = 0 if cursor < 0
+        cursor = query.length if cursor > query.length
+        result = block.call( key, query, cursor ) if block
+        return result unless result.nil?
       end
-      cursor = 0 if cursor < 0
-      cursor = query.length if cursor > query.length
-      result = block.call( key, query, cursor ) if block
-      return result unless result.nil?
+    ensure
+      $>.print CURSOR_INVISIBLE
     end
   end
 
@@ -344,6 +359,28 @@ module Typr
     Unicode::DisplayWidth.of( str.gsub(/\x1b\[[^m]+m/, '') )
   end
 
+  # Visible substring of +str+ starting at display-width +offset+, at most
+  # +width+ cells wide. ANSI escapes are zero-width and carried through so
+  # color state applies inside the window.
+  def self.slice_width str, offset, width
+    vis = 0
+    slice = +""
+    i = 0
+    while i < str.length
+      if str[i] == "\e"
+        seq = str[i..][/\A\e(\[[0-9;?]*[ -\/]*[@-~]|\][^\a\e]*(?:\a|\e\\)|[()=>0-9])/]
+        slice << seq if seq
+        i += seq ? seq.length : 1
+        next
+      end
+      cell = Unicode::DisplayWidth.of(str[i])
+      vis += cell
+      slice << str[i] if vis > offset and vis <= offset + width
+      i += 1
+    end
+    slice
+  end
+
   # Move the cursor back to the start of the previous word in +str+.
   def self.word_prev str, cursor
     cursor -= 1 while cursor > 0 and str[cursor - 1] == ' '

data/typr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "typr"
-  s.version = "1.3.0"
+  s.version = "1.4.0"
   s.date = "2026-07-25"
   s.homepage = "https://codeberg.org/typr/typr"
   s.licenses = ["MIT"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typr
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Kilian Reitmayr