typr 1.1.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddb6c3054fa6559c2a3d531b1711a594445a45dcc91cd4c3c173ba52aed7b51b
-  data.tar.gz: 7300606b1b8b36f68c547bf2e5ddfff2ae6e63c56528ab7d350040c2230ddba6
+  metadata.gz: baf5925e72ba2632808c7ab3b981b00ed2a94cf1f4fbb634768c4b544251b822
+  data.tar.gz: 5786405ffab8b20d1bc1623f070483cc6f39d519e1fdc71e8d8ebe9464a7489d
 SHA512:
-  metadata.gz: 14a5342cd442e3636396d0645b6d38caae12ff139d0fff5519180269623feff4c63cc95318b1f476e1bdb29be158cac028f3539eb0eb71835c9dbb47e5233fbd
-  data.tar.gz: ec63c0588f3e22dc9d0fe7159b9ee1b5c4e706361791ba6c4ca32e10084ef3542a053a2c4c4a813ee7fb0699492964bf93a605a31221c21c02aceb3fb05613c9
+  metadata.gz: b15ea70ada75c5608a69d55e1220dd93a50dda8ce0af64b44ab0f15e6a6da7d075b70159267313d8cdd1f36495a848c38c8827ce267d2f2db503d46445fb2ed1
+  data.tar.gz: d1368cfd4af314c40ca8af3646e4e10facd508281e9e3180b79c30d17c7fd1b2466e0375826be4e86609898eb4253501c4a3540e8904f78a29eabb41146f515b

data/CHANGELOG.md

@@ -1,3 +1,40 @@
+# Changelog
+
+## [v1.1.4] — 2026-07-28
+
+### Added
+- `Browser#toggle_hidden` — show/hide dotfiles with `H` key
+- `Browser#help` keybinding (`?h`)
+- `Terminal.on_resize` — trap SIGWINCH for terminal resize
+- `Stack#draw_hints` clears hint area before redrawing
+
+### Changed
+- `Space` boundary methods: per-boundary nil defaults (`left: 0`, `top: 0`, `right: left + @max`, `bottom: rows + headspace`) instead of a single clamped formula
+- `Space#initialize` no longer sets `@left`/`@top` defaults
+- `Browser#initialize` defaults `@left`/`@top` to 0
+- `Browser#cd` filters dotfiles when `@show_hidden` is false
+- `Browser#reset_view` re-calls `cd` to refresh directory listing
+- `Stack#pick` no longer resets `@hints_start` on each call
+- Removed unused `@totals` from Grid, `@highlight` from Stack
+- Removed shebangs and `frozen_string_literal` comments from library files
+- Terminal: graceful non-TTY handling for non-interactive environments
+- Curses and graphical frontends: cleaned up dead code and whitespace
+
+### Fixed
+- `Space` specs check method returns instead of instance variables
+
+---
+
+## [v1.1.3] — 2026-07-27
+
+### Added
+
+### Changed
+
+### Fixed
+- `Stack#draw_hints` compared a relative offset against an absolute position, drawing one extra hint below the data
+
+---
 
 ## [v1.1.0] — 2026-07-26
 

data/example/top500.csv

@@ -1,3 +1,4 @@
+rank,word,pos,count,quot
 1,the,a,22038615,0.98
 2,be,v,12545825,0.97
 3,and,c,10741073,0.99

data/lib/browser.rb

@@ -1,7 +1,3 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-# frozen_string_literal: true
-
 require 'etc'
 require 'find'
 require_relative 'grid.rb'
@@ -42,7 +38,7 @@ module Typr
 
     ## Height minus 2 rows reserved for path bar and command line.
 
-    def bottom; super - 2 end
+    def bottom; super - 1 end
 
     ## Top offset plus one row for the path info bar.
 
@@ -71,7 +67,8 @@ module Typr
           @dir_history.uniq!
         end
       end
-      data = Dir.new(@directory).children.map.with_index do |file,id|
+      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] + [??]*7 + ["inode","symlink"] unless File.exist?(file)
@@ -203,6 +200,15 @@ module Typr
 
     def home; cd ?~ end
 
+    ## Toggle visibility of hidden files (those starting with a dot).
+    #
+    #   browser.toggle_hidden
+
+    def toggle_hidden
+      @show_hidden = !@show_hidden
+      cd @directory
+    end
+
     ## Display a help grid listing all keybindings.
 
     def help; @user.help end
@@ -222,7 +228,7 @@ module Typr
     #
     #   browser.reset_view
 
-    def reset_view; reset [:display, :selection, :position]; sort end
+    def reset_view; cd @directory; reset [:display, :selection, :position]; sort end
 
     ## Open a filter popup on the chosen row/column and apply the input.
     #
@@ -365,8 +371,10 @@ module Typr
 
     def initialize args={}
       @dir_history, @mimetype_db, @mimetype_magic = [], true, true
-      @view, @sort, @views, @positions = :compact, 0, {}, {}
+      @view, @sort, @views, @positions, @show_hidden = :compact, 0, {}, {}, false
       super
+      @left ||= 0
+      @top ||= 0
       @directory ||= ?~
       @colors[:actions] = { "[f]ilter": :red, "[s]ort": :blue, "[v]iews": :green
         }.merge @colors[:actions] || {}
@@ -385,9 +393,10 @@ module Typr
       }.merge( @colors[ :types ] || {} )
 
       @keymap = { back: KEY_BACKSPACE, confirm: KEY_RETURN, help: ?h,
-        home: ?~, root: ?`, views: ?v, sort_view: ?s, dir_history: ?d,
+        home: ?~, views: ?v, sort_view: ?s, dir_history: ?d,
         mark: ?m, mark_range: ?M, mark_all: ?a, mark_invert: ?i,
-        filter_view: ?f, reset_view: ?r, recurse: ?R}.merge @keymap
+        filter_view: ?f, reset_view: ?r, recurse: ?R,
+        toggle_hidden: ?H}.merge @keymap
 
       self.header = %w[ name target permissions owner group size accessed
         modified created type subtype ]
@@ -422,8 +431,8 @@ module Typr
       @user ||= Line.new( parent:self, left:->{@parent.left},top:->{@parent.bottom+1},
         bindings: %w[ [h]elp ] + @colors[:actions].map{|name,color|
           color_code( color ) + name.to_s + color_code(@colors[:default]) } +
-            %w[ [r]eset [d]irectories [m]ark [M]ark\ range mark\ [a]ll
-            [i]nvert\ mark [`]:root [~]:home [back]:.. [up] [down] [pageup] [pagedown] [home] [end] [esc]:quit [return]:confirm\  ])
+            %w[ [H]idden_files [r]eset [d]irectories [m]ark [M]ark_range mark_[a]ll
+            [i]nvert_mark [~]:home [back]:.. [up] [down] [pageup] [pagedown] [home] [end] [esc]:quit [return]:confirm\  ])
       cd @directory
     end
   end

data/lib/curses.rb

@@ -1,8 +1,6 @@
-#!/usr/bin/ruby
-
 require 'ncursesw'
 require_relative 'frontend'
-  
+
 module Visuals
 
   include Ncurses
@@ -11,50 +9,43 @@ module Visuals
   KEY_TAB = 9
   KEY_PAGEDOWN = KEY_NPAGE
   KEY_PAGEUP = KEY_PPAGE
-  KEY_INSERT = KEY_IC
-  KEY_DELETE = KEY_DC
-  
+
   $colors = COLORS.keys
   $pairs = []
-#  COLORS = %w[ black red green yellow blue magenta cyan white grey]
-#  KEY_TAB = 9
-#  HEIGHT,WIDTH = IO.console.winsize
 
-%w[color pair].each{ |name| method = <<STR 
-  def %s_for obj; #return unless obj
+%w[color pair].each{ |name| method = <<STR
+  def %s_for obj;
     if id = $%ss.index( obj ) then return id
     else last = ( $%ss << obj.dup ).count - 1
-      Ncurses.init_%s( last, *obj ) 
+      Ncurses.init_%s( last, *obj )
       return last
     end
   end
 STR
 eval( method % ([name]*4) )
 }
-  
+
   def self.width;  Ncurses.COLS end
   def self.height; Ncurses.LINES end
-  def self.row; Ncurses.getcury $creen end
-  def self.column; Ncurses.getcurx $creen end
-  
+  def self.row; Ncurses.getcury $screen end
+  def self.column; Ncurses.getcurx $screen end
+
   def self.exit
     Ncurses.echo
     Ncurses.nocbreak
     Ncurses.nl
     Ncurses.endwin
-#    system "reset"
   end
 
-  def read input 
+  def read input
     case input
       when :key
-        key = Ncurses.getch 
-        key = key.chr if key.between? 32, 126 
+        key = Ncurses.getch
+        key = key.chr if key.between? 32, 126
         return key
-      when :line #string
+      when :line
         Ncurses.echo
-        Ncurses.curs_set 1        
-#        Ncurses.getstr str=""
+        Ncurses.curs_set 1
         str = Readline.readline
         Ncurses.curs_set 0
         Ncurses.noecho
@@ -64,88 +55,64 @@ eval( method % ([name]*4) )
 
   def move x=0,y=0; Ncurses.move y, x end
   def refresh; Ncurses.refresh end
-  def enable attr; Ncurses.attron attr end
-  def disable attr; Ncurses.attroff attr end
-  def clear type=:screen; 
-    case type 
+  def clear type=:screen;
+    case type
       when :screen; Ncurses.erase
       when :line; Ncurses.clrtoeol
       when :down; Ncurses.clrtobot
-    end 
+    end
   end
   def change; Ncurses.color_set pair_for( $color ), 0 end
   def show string; Ncurses.addstr string.to_s end
 
   def get_background; $color[1] end
   def get_foreground; $color[0] end
-  def background color; 
-    $color[1] = (color ? color_for( color ) : $default[1]); change  
+  def background color;
+    $color[1] = (color ? color_for( color ) : $default[1]); change
   end
-  def foreground color; 
-    $color[0] = (color ? color_for( color ) : $default[0]); change 
+  def foreground color;
+    $color[0] = (color ? color_for( color ) : $default[0]); change
   end
 
   def color c
     c = [c] unless c.is_a? Array and c.count == 2
-    foreground c[0] if c[0] 
-    background c[1] if c[1] 
+    foreground c[0] if c[0]
+    background c[1] if c[1]
   end
 
-#  def color_pair pair
-#    if id = $color_pairs.index( pair ) return id
-#    else last = ( $color_pairs << c ).count - 1
-#      Ncurses.init_pair( last, *pair ) 
-#      return last
-#    end
-#    pair = p.map{ |col| 
-#      unless id = $colors.index( col ) 
-#        id = ($colors << col).count - 1 
-#        Ncurses.init_color id, *col
-#      end
-#      id
-#    }      
-#    unless ( id = $color_pairs.index( pair ) ) 
-#      id = ( $color_pairs << pair ).count - 1
-#      Ncurses.init_pair id, *pair
-#    end
-#    id
-#  end
-
-  def self.init args={} 
-#    SCREEN = Ncurses.initscr
+  def self.init args={}
     $creen = Ncurses.initscr
-    Ncurses.cbreak           # provide unbuffered input
-    Ncurses.noecho             # turn on input echoing
-    Ncurses.nl             # turn on newline translation
-#    Ncurses.nonl             # turn off newline translation
+    Ncurses.cbreak
+    Ncurses.noecho
+    Ncurses.nl
     Ncurses.curs_set 0
     Ncurses.start_color
-    Ncurses.stdscr.intrflush(false) # turn off flush-on-interrupt
-    Ncurses.stdscr.keypad(true)     # turn on keypad mode
+    Ncurses.stdscr.intrflush(false)
+    Ncurses.stdscr.keypad(true)
 
-    $default = [ 
-      color_for( args[:foreground] || :grey80 ), 
+    $default = [
+      color_for( args[:foreground] || :grey80 ),
       color_for( args[:background] || :grey10 ) ]
     $color = $default.dup
 
-    COLORS.each_with_index{ |c,i| 
-      $pairs << [ i, $default[1] ] 
-      Ncurses.init_color i, *c[1] 
+    COLORS.each_with_index{ |c,i|
+      $pairs << [ i, $default[1] ]
+      Ncurses.init_color i, *c[1]
       Ncurses.init_pair i, i, $default[1] }
-    
+
     Ncurses.bkgd Ncurses::COLOR_PAIR( pair_for $default )
 
-  end  
+  end
 
 end
 
 if __FILE__ == $0
   include Visuals
-  Visuals.init #background: :blue
+  Visuals.init
   characters = (32..126).map(&:chr).join
   loop do
     clear
-    $colors.each_with_index{ |c,i| 
+    $colors.each_with_index{ |c,i|
       foreground c; move 0,i; show characters }
     refresh
     exit if read(:key) == KEY_ESCAPE

data/lib/frontend.rb

@@ -2,18 +2,7 @@ require 'readline'
 
 module Visuals
 
-#   COLORS = { 
-#     black:   [   0,    0,    0],
-#     red:     [ 700,  400,  400],
-#     green:   [ 400,  700,  400],
-#     yellow:  [ 700,  700,  400],
-#     blue:    [ 400,  400,  700],
-#     magenta: [ 700,  400,  700],
-#     cyan:    [ 400,  700,  700],
-#     white:   [ 999,  999,  999],
-#     grey:    [ 618,  618,  618] }
- 
-  COLORS = { 
+  COLORS = {
     black:   [   0,    0,    0],
     red:     [ 180,  100,  100],
     green:   [ 100,  180,  100],
@@ -24,10 +13,7 @@ module Visuals
     white:   [ 255,  255,  255],
     grey:    [ 158,  158,  158] }
 
-  COLORS.merge! 1.upto(9).map{ |i| 
-    ["grey#{ i*10 }".to_sym, [i*25]*3 ] }.to_h  
-
-  # COLORS.merge! 1.upto(9).map{ |i| 
-  #   ["grey#{ i*10 }".to_sym, [i*100]*3 ] }.to_h  
+  COLORS.merge! 1.upto(9).map{ |i|
+    ["grey#{ i*10 }".to_sym, [i*25]*3 ] }.to_h
 
 end

data/lib/graphical.rb

@@ -1,22 +1,16 @@
-#!/usr/bin/ruby
 require 'sdl2'
-#require 'io/console'
-#require 'readline'
 require_relative 'frontend'
-  
+
 module Visuals
   include SDL2
 
-public 
-  i=-1
-#  SDL2.init(SDL2::INIT_EVERYTHING)
   SDL2.init(SDL2::INIT_VIDEO)
   TTF.init
-  WINDOW = Window.create("visuals", 
-    Window::POS_CENTERED, #POS_UNDEFINED,
-    Window::POS_CENTERED, #POS_UNDEFINED,
+  WINDOW = Window.create("visuals",
+    Window::POS_CENTERED,
+    Window::POS_CENTERED,
     1324, 768, 0)
-  GO = WINDOW.create_renderer(-1, 
+  GO = WINDOW.create_renderer(-1,
     Renderer::Flags::ACCELERATED|Renderer::Flags::TARGETTEXTURE)
   Key.constants.each{ |c| c = c.to_s
     eval 'KEY_'+c.upcase+'=Key::'+c }
@@ -27,8 +21,7 @@ public
   def self.column; $col end
   def self.x; $x end
   def self.y; $y end
-  
-  
+
   def color_for c
     return unless c
     c = COLORS[c] if c.is_a?( Symbol )
@@ -39,136 +32,93 @@ public
   def get_foreground; $color[0] end
   def background color; return unless color
     $color[1] = color_for( color ) end
-  def foreground color; 
+  def foreground color;
     $color[0] = (color ? color_for( color ) : $default[0]) end
 
-  def color c 
-    c = [c] unless c.is_a? Array and c.count == 2 #.flatten
+  def color c
+    c = [c] unless c.is_a? Array and c.count == 2
     foreground c[0]
     background c[1]
-#    $letters[c] = (32.upto 126).map{ |n| n = n.chr
-#      [n, $font.render_blended( n, c )] }.to_h unless $letters[c]
   end
 
   def move col, row
-    $x = ($col = col) * $charsize[1] #width
-    $y = ($row = row) * $charsize[0] #$height 
+    $x = ($col = col) * $charsize[1]
+    $y = ($row = row) * $charsize[0]
   end
 
-  def clear type = :screen #bg=
-    GO.draw_color = $default[1] #bg
-    case type 
-#      when Array; GO.fill_rect Rect.new() 
-      when :screen; GO.fill_rect Rect.new(0, 0, *WINDOW.size) 
+  def clear type = :screen
+    GO.draw_color = $default[1]
+    case type
+      when :screen; GO.fill_rect Rect.new(0, 0, *WINDOW.size)
       when :line; GO.fill_rect Rect.new(
         Visuals.x, Visuals.y, WINDOW.size[0], Visuals.y+$charsize[0])
       when :down; GO.fill_rect Rect.new(
         0, Visuals.y, *WINDOW.size)
     end
   end
-   
-  def show( str ) #solid_blended_shaded(
+
+  def show( str )
     return unless str
-#    chars = str.chars.map{ |char| $letters[foreground][char] }
-#    width = chars.map( &:w ).sum 
-#    if $color[1] != $default[1] #get_background
     if get_background
       GO.draw_color = get_background
-      GO.fill_rect Rect.new($x, $y, str.size*$charsize[1], $charsize[0]) 
+      GO.fill_rect Rect.new($x, $y, str.size*$charsize[1], $charsize[0])
     end
-#    GO.fill_rect Rect.new($x, $y, width, $charsize[0]) 
-#    text = Surface.new( width, $charsize[0], 32, 0, 0, 0, 0 )
-#    x=0
-#    for char in chars #.each{|c| 
-#      Surface.blit char, nil, text, Rect.new( x, 0, char.w, char.h )
-#      x += char.w
-#    end
-#    GO.copy GO.create_texture_from(text),nil,Rect.new($x, $y, width, $charsize[0])
     text = str.rstrip
     unless text.empty?
       image = $font.render_blended( text, get_foreground )
       GO.copy GO.create_texture_from( image ), nil,
-        Rect.new($x, $y, image.w, $charsize[0]) 
-    end 
+        Rect.new($x, $y, image.w, $charsize[0])
+    end
     move $col+str.size, $row
   end
 
   def refresh; GO.present end
 
-  def read input 
+  def read input
     case input
       when :event then e = Event.poll until e
-      when :key then 
+      when :key then
         e = Event.poll until e.is_a? Event::KeyDown
-        return e.sym.between?(32, 126) ? e.sym.chr : e.sym 
-      when :line#; line = ''              
-#        File.mkfifo( 'input' ) unless File.exist? 'input'
-#        Readline.output=input=open('input')
-#        Readline.output=input=StringIO.new
-#        fork{ Readline.readline }
+        return e.sym.between?(32, 126) ? e.sym.chr : e.sym
+      when :line
         x, y = Visuals.row, Visuals.column
-        listen = Thread.new{ 
-#          until (char = input.read) == $/
-#          until (line = Readline.line_buffer)[-1] == $/
+        listen = Thread.new{
           loop do
             move x, y
             show line
-            sleep 0.1 
-          end        
-        } 
-        line = Readline.readline 
+            sleep 0.1
+          end
+        }
+        line = Readline.readline
         listen.terminate
-#        until input.string[-1]==$/
         return line
-#        until (key = read :key) == KEY_RETURN
-#          str << key if key.is_a? String
-#        end
-#
-#        text = ""
-#        TextInput.start
-#        loop do
-##          ev = Event.poll
-#          case ev = read( :event )
-#            when Event::KeyDown
-#              if ev.sym == KEY_RETURN
-#                TextInput.stop
-#                return text 
-#              end
-#            when Event::TextInput 
-#              text += ev.text 
-#              show ev.text
-#              p ev.text
-#          end
-#        end
     end
   end
 
   def self.exit
   end
 
-  def self.init args={} 
-    $default = [ 
-      color_for( args[:foreground] || :grey80 ), 
+  def self.init args={}
+    $default = [
+      color_for( args[:foreground] || :grey80 ),
       color_for( args[:background] || :grey10 ) ]
     $color = $default.dup
     $charsize = args[:charsize] || [18,11]
     $font = TTF.open( args[:font] || "/usr/share/fonts/X11/TTF/VeraMono.ttf", $charsize[0] )
     move 0, 0
   end
-  
+
 end
 
 if __FILE__ == $0
-#  require_relative 'base'
   include Visuals
-  Visuals.init font:ARGV[0] #[[200,200,200],[20,20,20]], [80,50]
+  Visuals.init font:ARGV[0]
   characters = (32..126).map(&:chr).join
   loop do
     clear
-    COLORS.keys.each_with_index{ |c,i| 
+    COLORS.keys.each_with_index{ |c,i|
       foreground c; move 0,i; show characters }
     refresh
-#    GO.present
     exit if read(:key) == KEY_ESCAPE
   end
 end

data/lib/grid.rb

@@ -1,7 +1,3 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-# frozen_string_literal: true
-
 require_relative 'space.rb'
 
 module Typr
@@ -127,8 +123,9 @@ module Typr
     # @param h [Array<String, Symbol>]
 
     def header=( h ); super
-      h.each_with_index{ |h,i| Typr.module_eval h.upcase+?=+i.to_s } if
-        h.is_a? Array
+      h.each_with_index{ |h,i|
+        Typr.const_set(h.upcase, i) unless Typr.const_defined?(h.upcase)
+      } if h.is_a? Array
     end
 
     ##
@@ -143,7 +140,7 @@ module Typr
     def reset type=:all
       case type
         when :display; @map = nil; @sort = nil; @filters.clear
-        when :format; @widths.clear; @maxed = false
+        when :format; @widths.clear
         when :all; reset [:display, :format]
       end
       super
@@ -404,8 +401,8 @@ module Typr
       @columns,@functions = 0,{}
       @ignore,@rawfilter,@rawsort,@reverse = [],[],[],false
       @filters,@procs = [],{}
-      @align,@format,@widths,@totals = [],[],[],[]
-      super #args
+      @align,@format,@widths = [],[],[]
+      super
       @colors = { columns: [], fields: {} }.merge ( @colors  )
       @selected = { fields:[], columns:[] }.merge @selected
       @functions = {
@@ -414,12 +411,7 @@ module Typr
         magnitudes: Proc.new{ |size| mag = (size.to_s.length-1) / 3
           mag>0 ? (size.to_s.insert -(mag*3+1), ?.)[0..4] + %w[B K M G T][mag] :
           size rescue size },
-        convert:  Proc.new{ |value|
-          case value.to_s
-            when /^[\d]+$/ then value.to_s.to_i
-            when /^\d*[\.\,]\d+$/ then value.to_s.to_f
-            else value
-          end } }
+        convert:  Proc.new{ |value| coerce_type value } }
 
       if @input
         self << @input

data/lib/stack.rb

@@ -1,7 +1,3 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-# frozen_string_literal: true
-
 module Typr
 
   ##
@@ -85,11 +81,15 @@ module Typr
         positions( row_id )[ @hints_start..-1 ].each_with_index{ |pos, idx|
           move( left + pos, top + row_id )
           show @hints[idx] }
-      else @hints.chars.each_with_index{ |char, idx|
-        pos = idx + @hints_start + headspace
-        break if pos > [height, rows-1+headspace].min
-        move( left, top + pos )
-        show char }
+      else
+        bottom = top + headspace + [height, rows].min - 1
+        (top + headspace..bottom).each{ |pos|
+          move( left, pos ); show ' ' }
+        @hints.chars.each_with_index{ |char, idx|
+          pos = idx + @hints_start + headspace
+          break if top + pos > bottom
+          move( left, top + pos )
+          show char }
       end
     end
 
@@ -195,7 +195,6 @@ module Typr
     #   stack.pick "rows"         # multi-select rows
 
     def pick type = :row, row=0 #, key=nil
-      @hints_start = 0
       type = type.to_s
       multiple = type[-1] == ?s
       loop do
@@ -262,9 +261,9 @@ module Typr
 
     def initialize args={}
       @keymap, @separator, @selected = {}, " ", {}
-      @start, @hints_start, @highlight = 0, 0, 0#A_STANDOUT
+      @start, @hints_start = 0, 0
       @alternate = true
-      super #args
+      super
       @colors = { hints: [255, :black ], header: [232,:grey60 ],
         selected: :grey25, alternate: :grey10, rows: {} }.merge @colors
       @selected = { fields:[], columns:[], rows:[] }.merge @selected

data/lib/terminal.rb

@@ -1,286 +1,200 @@
-#!/usr/bin/ruby
-
 require 'io/console'
 require 'readline'
 require 'unicode/display_width'
 
-module Typr 
-#  alias :show :print
+module Typr
 
-  INPUT = (IO.new IO.sysopen "/dev/tty", "r")
-  OUTPUT = (IO.new IO.sysopen "/dev/stdin", "w")
-  `infocmp -L1`.split.each{ |info| key,value = info[0..-2].split("=") 
+  INPUT = (IO.new IO.sysopen("/dev/tty", "r")) rescue $stdin
+  `infocmp -L1`.split.each{ |info| key,value = info[0..-2].split("=")
     if value
-      # p key + value if key[/dis/]
-      # value[1] = ?e if value[0,2] == "\\E"
       value.gsub! '\E', '\e'
-      # value = '\x' + value[/\d+/].to_i(8).to_s(16).upcase if value[/\\\d+/]
-      # value = "\\x" + value[/\d+/].to_i(8).to_s(16).upcase if value[/\\\d+/]
       value += "\\" if value[-1] == "\\"
-      # eval "%s=\'%s\'" % [key.upcase,value] if key 
-      eval "%s=\"%s\"" % [key.upcase,value] if key 
-      #and key.start_with? "key_" 
+      eval "%s=\"%s\"" % [key.upcase,value] if key
     end }
-  
+
   KEY_ESCAPE = "\e"
   KEY_RETURN = CARRIAGE_RETURN
   KEY_TAB = "\t"
-  KEY_ENTER = CARRIAGE_RETURN
   KEY_PAGEDOWN = KEY_NPAGE
   KEY_PAGEUP = KEY_PPAGE
-  KEY_INSERT = KEY_IC
-  KEY_DELETE = KEY_DC
 
-  MODES =  %i[ reset bold faint italic underline slow fast invert ]
+  MODES =  %i[ reset bold italic underline slow fast invert ]
   COLORS = %i[ black red green yellow blue magenta cyan white ]
 
   def prepare str, max, align=:left, side=:right, fade=false
     stop = width = real_size( str )
-    # unless str[0..max-1].ascii_only? and width == str.size
     unless str.ascii_only? and width == str.size
       stop = width = 0
       str.each_char do |c|
-        if c == ?\e 
+        if c == ?\e
           width -= str[stop..-1][/^\x1b\[[^m]+m|/].size-1
           stop += 1
         elsif (cwidth = (c.ascii_only? ? 1 : Unicode::DisplayWidth.of(c))) +
           width >= max
           break
         else width += cwidth; stop += 1 end
-      end 
+      end
     end
-    # return 
-    if ( space = ( max - width ) ) > 0 #.clamp 0, max
+    if ( space = ( max - width ) ) > 0
       str = [ str[0..stop-1], " " * space ]
       str.reverse! if align == :right
       str.join
-    else #case align
-      # when :left; str = str[0..max-1]
-      # when :right; 
+    else
       str = str[side == :left ? -max..-1 : 0..max-1]
-      # end
-      # str = fade str, align, str.length / 8 + 1 if fade
       str = fade str, side, fade if fade
       return str
     end
-    # return str.join
   end
-  
+
   def fade str, side=:left, num=3
     isleft = side == :left
-    # chars = (side == ? 0..num : (-num-1..-2).to_a.reverse)
     chars = str[ isleft ? 0..num : -num..-1 ]
     chars = chars.chars.map.with_index do |char,id|
       id = chars.size-id unless isleft
       color_code( "grey#{(80/chars.size)*id+10}".to_sym ) + char
     end.join
-    # chars.each.with_index do |pos,id|
-    #   str.insert pos, color_code( "grey#{(80/chars.size)*id+10}".to_sym )
-      # str.insert pos, color_code( "grey#{(100/id+3)*10}".to_sym )
-    # end 
     return ( isleft ? chars + color_code($color[0]) + str[num+1..-1] :
       str[0..-num-1] + chars )
-
-      #+ color_code( $color[1] )
-    # return str
-    # length.times{|i| 
-    #   color [ ("grey"+((i+3)*10).to_s ).to_sym, @colors[:default][1] ]
-    #   show @directory[-space+i] }    
-    # color @colors[:default]
-    # show @directory[-space+6..-1] 
   end
-  # def printables str; str.dump.gsub(/\\e\[.+m|\"/, '') end
+
   def printables str; str.gsub(/\x1b\[[^m]+m|/,'') end
-  # def real_size str; printables(str).size end
   def real_size str; Unicode::DisplayWidth.of( printables(str) ) end
-  
-    # $>.print "\e[%iJ" % %w[down line screen].index(mode.to_s) 
-  def move x=0,y=0; show move_code( x, y ) end	
+
+  def coerce_type value
+    s = value.to_s
+    return nil if s.empty? or /\A(?:nil|NULL)\z/i.match(s)
+    case value
+       when /^-?[\d]+$/ then s.to_i
+       when /^-?\d*[\.\,]\d+$/ then s.to_f
+       when /\byes\z/i then true
+       when /\bno(ot)?\z/i then false
+       when /true\z/i then true
+       when /false\z/i then false
+       else value
+    end
+  end
+
+  def move x=0,y=0; show move_code( x, y ) end
   def move_code x=0,y=0; "\e[%i;%if" % [ y+1, x+1 ] end
-  
-	def mode name; show mode_code(name) end
-	def mode_code name; if id = MODES.index(name.to_s) then "\e[#{ id }m" end end
-  
+
+  def mode name; show mode_code(name) end
+  def mode_code name; if id = MODES.index(name.to_s) then "\e[#{ id }m" end end
+
   def color_code color, bg=false
     color = color.to_sym if color.is_a? String
     case color
-      when Symbol; #color = color.to_s
+      when Symbol;
         if id = COLORS.index(color); "\e[#{ id + (bg ? 40 : 30) }m"
         elsif color[/^gr[ae]y\d{,2}$/]
           "\e[%i;5;%im" % [bg ? 48 : 38, 232 + (color[/\d+/].to_f/100*23).to_i]
         end
       when Integer; "\e[%i;5;%im" % [ bg ? 48 : 38, color]
       when Array; case color.count
-        when 3; "\e[%i;2;%i;%i;%im" % [ bg ? 48 : 38, *color ] 
+        when 3; "\e[%i;2;%i;%i;%im" % [ bg ? 48 : 38, *color ]
         when 2; color_code( color[0] ) +  color_code( color[1], true )
       end
     end
   end
-	
-	def get_background; $color[1] end
+
+  def get_background; $color[1] end
   def get_foreground; $color[0] end
   def foreground c=$default[0]; $color[0]=c; show color_code(c) end
   def background c=$default[1]; $color[1]=c; show color_code(c,true) end
-	# def color c=$default
- #    c = [c] unless c.is_a? Array and c.count == 2
- #    show color_code(c)
- #  end
   def color c=$default
     c = [c] unless c.is_a? Array and c.count == 2
-    foreground c[0] if c[0] 
-    background c[1] if c[1] 
+    foreground c[0] if c[0]
+    background c[1] if c[1]
   end
 
   def show str; $>.print str end
-  # def enable attr; mode attr end
-  # def disable attr=nil; mode :reset end
-  # def refresh; end
-  def self.clear mode=:screen 
+  def self.clear mode=:screen
     $>.print( { screen: CLEAR_SCREEN, line: DELETE_LINE }[mode]  )
   end
 
   def self.read obj, prompt=''
     case obj
-      when :key then INPUT.raw{ |tty| tty.sysread 6 } rescue return
-      when :line then line=Readline.readline prompt; print CURSOR_INVISIBLE;line
+      when :key
+        return INPUT.raw{ |tty| tty.sysread 6 } rescue nil unless INPUT.tty?
+        INPUT.raw{ |tty| tty.sysread 6 } rescue return
+      when :line
+        $stdin.tty? ? (line=Readline.readline prompt; print CURSOR_INVISIBLE; line) : $stdin.gets&.chomp
     end
   end
 
   def self.position
+    return [0, 0] unless $stdin.tty?
     result = ''
     $stdin.raw do |stdin|
-      $stdout << USER7 #"\e[6n"
+      $stdout << USER7
       $stdout.flush
       until (char = stdin.getc) == 'R'
         result << char if char
       end
     end
     result[/[\d;]+/].split(?;).map &:to_i
-    # m = res.match /(?<row>\d+);(?<column>\d+)/
-    # { row: Integer(m[:row]), column: Integer(m[:column]) }
   end
 
-  def self.size; IO.console.winsize end
+  def self.size; IO.console&.winsize || [24, 80] end
   def self.width; size.last-1 end
-  def self.height; size.first end
+  def self.height; size.first - 1 end
   def self.row; position.first end
   def self.column; position.last end
-  def self.init default=[ :white, :black  ] 
+  def self.on_resize &block
+    trap(:WINCH, &block)
+  end
+  def self.init default=[ :white, :black  ]
     $color = $default = default
-    # include Typr
-    # extend self
-    # Object.undef_method :read
-    print CURSOR_INVISIBLE
-    system "tput smkx"
+    if $stdin.tty?
+      print CURSOR_INVISIBLE
+      system "tput smkx"
+    end
   end
-  def self.exit; 
-	# background
+  def self.exit;
   extend self
-  	
-  	$>.print CURSOR_NORMAL; 
-  	$>.print ORIG_COLORS; color; clear 
-  	
+    if $stdin.tty?
+      $>.print CURSOR_NORMAL;
+      $>.print ORIG_COLORS; color; clear
+    end
   end
 end
 
-# include Typr
-# extend Typr
-
 if __FILE__ == $0
 begin
   include Typr
-  Typr.init #background: :blue  
+  Typr.init
   colors = COLORS + (1..9).map{|i| "grey#{i*10}" }
   chars = (33..126).map(&:chr)
   slice = chars.count / colors.count + 1
   characters = chars.each_slice( slice ).map(&:join)
-  # key = read :key
   key,fg,bg = "",150,0
   Typr.clear
   loop do
-    # move 0,0
-    colors.each_with_index{ |color,y| 
-      characters.each_with_index{ |chars,x| 
-        foreground color.to_sym; 
-        background colors[x].to_sym; 
+    colors.each_with_index{ |color,y|
+      characters.each_with_index{ |chars,x|
+        foreground color.to_sym;
+        background colors[x].to_sym;
         move x*slice,y
-        show chars 
+        show chars
       }
     }
     (0...256).each{ |i| background i; show ' ' }
-    
-    move 0, Typr.height-1
+
+    move 0, Typr.height
     color [:white, :black]
-    # show "KEY: #{key}"
     p "KEY: %s / %s" % [key, key]
-    move 15, Typr.height-1
+    move 15, Typr.height
     color [fg,bg]
-    print "     %s / %s     " % [fg,bg] #).center 20
+    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_ESCAPE; exit 
+      when KEY_ESCAPE; exit
     end
   end
 ensure
   Typr.exit
 end
 end
-
-
-#  KEY_ESC = 27
-#  KEY_TAB = 
-#  KEY_ESC = 27
-  # A_STANDOUT = :invert
-  # BG = :black      
-  # `infocmp -L`.read.join.split(', ').each{ |info| }
-  # .split('=').to_h
- 
-#   KEY_PAGEDOWN = "\e[6~"
-#   KEY_PAGEUP = "\e[5~"
-#   KEY_LEFT = "\e[D" 
-#   KEY_RIGHT = "\e[C"
-#   KEY_UP = "\e[A"
-#   KEY_DOWN = "\e[B"
-#   KEY_HOME = "\e[H" #xterm
-#   KEY_END = "\e[F" #xterm
-#   INSERT = "\e[2~" #xterm
-#   DELETE = "\e[3~" #xterm
-#   KEY_BACKSPACE = "\b" #xterm
-
-#    case ENV["TERM"]
-#      when 
-#    DELETE = "\e[P" #st
-#    INSERT = "\e[4h" #st
-#    BACKSPACE = "\x7F" #st 
-#    KEY_END = "\e[4~" #st
-
-#    KEY_HOME = "\e[7~" #urxvt
-#    KEY_END = "\e[8~" #urxvt
-
- 	# HIDE_CURSOR = "\e[?25l"
-	# SHOW_CURSOR = "\e[?25h"
-  # HEIGHT,WIDTH = IO.console.winsize
-
-
-  # def mod key,char,extra; 
-    # if key.length == 1; key = char + key.upcase
-    # elsif key[/~$/]; key[0..-2] + char
-    # else key[0..-2] + extra + key[-1].downcase end 
-  # end
-#    def shift key; mod key, "$" end
-  # def ctrl key; mod key, "^", "O" end
-  # def alt key; KEYMAP[:esc] + key end
-#    def clear mode=2; IO.console.erase_screen 1 end
-  #  def mode name; "\e[%im" % [(MODES.index name.to_s)] end
-  	# def ansi arg, type, inc=0
-  	#   case arg
-   #  	  when Integer; show "\e[%i;5;%im" % [ inc + 8, arg] 
-   #  	  else show "\e[%im" % [ ( type.index arg.to_s ) + inc ] 
-   #  	end
-   #  end 
-  
-  

data/lib/text.rb

@@ -1,7 +1,3 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-# frozen_string_literal: true
-
 require 'stringio'
 require_relative 'stack.rb'
 
@@ -115,13 +111,6 @@ module Typr
 
     def rows; @lines.count end
 
-    # Placeholder for text search. Currently unimplemented.
-    #
-    #   text.search("query")  # => nil
-
-    def search query
-    end
-
     # Creates a new Text widget.
     #
     #   text = Typr::Text.new(input: "hello", header: "Title")

data/typr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "typr"
-  s.version = "1.1.1"
+  s.version = "1.1.4"
   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.1.1
+  version: 1.1.4
 platform: ruby
 authors:
 - Kilian Reitmayr