typr 1.1.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf5925e72ba2632808c7ab3b981b00ed2a94cf1f4fbb634768c4b544251b822
-  data.tar.gz: 5786405ffab8b20d1bc1623f070483cc6f39d519e1fdc71e8d8ebe9464a7489d
+  metadata.gz: cdcaef4b1bc2c40e6fab6bd7d1462ddf19aeca03babcdbb9be74629551230647
+  data.tar.gz: b4e927b5237f27e2366ed15057054b33d9f070ef5a50c234533699182c7228ee
 SHA512:
-  metadata.gz: b15ea70ada75c5608a69d55e1220dd93a50dda8ce0af64b44ab0f15e6a6da7d075b70159267313d8cdd1f36495a848c38c8827ce267d2f2db503d46445fb2ed1
-  data.tar.gz: d1368cfd4af314c40ca8af3646e4e10facd508281e9e3180b79c30d17c7fd1b2466e0375826be4e86609898eb4253501c4a3540e8904f78a29eabb41146f515b
+  metadata.gz: 889fd403e345e89dc6777c02c6736d0865b7266b16157e13e4cf2469b9a3664d68f4fe672d1f9b5b6d72316d697c2c8e20e1f920853ae495014c9fb049fed6cd
+  data.tar.gz: 662df0d3ef61d964cd8a03a1cd1f7caa7fb14a15d87c22afa3a2cdf9115f4780b944446ebcdc9f538c33ee80753e48c362fea7f716d2ef7fca2070f07fe5483f

data/CHANGELOG.md

@@ -1,5 +1,46 @@
 # Changelog
 
+## [v1.3.0] — 2026-08-03
+
+### Added
+- Mouse support — `Typr.init`/`Typr.exit` enable/disable mouse reporting (buttons + SGR coordinates, `CSI ? 1000 h/l` + `CSI ? 1006 h/l`); `read_key` decodes SGR and legacy X10 reports into a `Typr::Mouse` struct (`button`, `x`, `y`, `action`, `modifiers`) with `press?`/`release?`/`wheel?`/`left?`/`middle?`/`right?` predicates
+- `Stack#hit` — maps a 1-based terminal row/col to the data row id under the cursor (nil for header/margins/outside)
+- Click-to-act in pickers — a left click on a row in `Stack#pick`/`Browser#pick` acts like pressing its hint digit (selects the row; in `Browser` cd's into directories and returns file paths)
+- Wheel-to-scroll in pickers — mouse wheel up/down scrolls the listing in `Stack#pick`/`Browser#pick`
+
+## [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
+- `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`
+- `Text#search` / `Text#search_next` / `Text#search_prev` (`/`, `n`, `p`) — less-style live search with smart-case matching, String/Regexp queries, and wrap-around; `Text#highlight` / `Text#highlight_clear` per-line match highlighting (`@colors[:search]`)
+- `Browser#search` — `/` binding routing through `pick :none, column: NAME`
+- `Browser#cd` data rows include an `executable` column (`Typr::EXECUTABLE`, after `permissions`), shown in the `:full` view
+- `Browser#pick` returns raw absolute paths (double-quoted, joined with a space for multi-select)
+- `Space` symbolizes string keys in the `colors:` hash, so string-keyed config (as loaded from YAML) is honored
+- Full documentation comments for the `Typr` module and `Line#ask`
+
+### Changed
+- Renamed `Typr.read` → `Typr.read_key` and `Typr.edit` → `Typr.read_line`
+- Renamed the frontend `show` → `draw` and the widget render `draw` → `show`
+- `Line#ask` dispatch is strict — only `Array`, `:key`, and `:line` question types; `:string`/`:integer` are gone
+- Removed the Readline dependency
+- `Typr.init` duplicates the default color array instead of aliasing the caller's
+
+### Removed
+- Alphabet hinting from `Grid#pick` and `Stack` — hints are numbers only
+
+### Fixed
+- `Grid#pick column:` live-filter/search — prompt drawn at `self.bottom + 1`, backspace broadens the result set, Escape restores the pre-search state, PageUp/PageDown/Home/End scroll, TAB cycles hints, `:none` pick works
+- `Stack#send` key normalization — only printable ASCII normalized so control keys match keymap entries
+- `Browser#cd` MIME lookup handles filenames with `:`, `'`, `(`, and full-width UTF-8 (argv invocation, greedy regex parsing)
+- `Typr.read_line` renders colored prompts without shifting the cursor (`Typr.text_width` is escape-aware)
+- `Grid#sort` re-applies active filters after sorting
+- `Typr.height`/`width` consistency so `bottom: -1` stays on screen
+- Suppressed constant-redefinition warnings from `Grid#header=`
+
 ## [v1.1.4] — 2026-07-28
 
 ### Added

data/README.md

@@ -1,29 +1,44 @@
 # typr — Terminal UI Toolkit
 
-typr is a Ruby library for building interactive terminal-based user interfaces. It provides data-object based views and keyboard-driven interaction.
+typr is a Ruby library for building interactive, keyboard-driven terminal user interfaces. It is built from data-object based components: grids for arrays, a pager for text, a file picker, and lines for user interaction — each of which renders itself, handles its own keymap, and can be combined into full applications.
+
+typr is designed for speed: every interactive choice is one keystroke away. Selectable rows and columns carry number hints, popups open in `/` search mode so long lists can be distilled down and picked from in a couple of keystrokes. It is the toolkit behind the [Filecon](https://codeberg.org/typr/filecon) file manager.
+
+typr's terminal layer is self-contained: it ships a precompiled terminfo key table and a MIME-type database inside the gem, so it has no ncurses dependency and works on any raw, ANSI-capable terminal — including Android/Termux.
 
 ## Features
 
-### Views
+### Components
 
-- **Grid** — sortable, filterable table with formatted columns, colors, and row selection
-- **Text** — scrollable text viewer with word/line picking, search, and borders
-- **Browser** — file-system directory browser with MIME type detection
-- **Stack, Space** — layout containers for composing views
-- **Line** — interactive prompt/input with colored questions and answers
+- **Grid** — sortable, filterable table with formatted columns, per-cell colors, and row selection. Columns can be `:min`/`:max`/fixed-width, with built-in processors for dates, file sizes, and file trees. `Grid#pick column:` adds live `/` search
+- **Text** — scrollable text viewer with word/row picking, `/` search with `n`/`p` navigation and match highlighting, and borders
+- **Browser** — file-system directory browser with MIME-type detection (bundled database, optional magic detection), per-type coloring, and an interactive picker
+- **Line** — interactive prompt/input with colored questions and answers, configurable bindings, and strict `ask` question types (`Array`, `:key`, `:line`)
 
-### Frontends
+### Keyboard interaction
 
-typr supports two rendering backends, selectable via `require`:
+Navigation uses **hint numbers** displayed next to selectable items — rows in grids, words in text, and other elements. Press the number to select that item directly. When more items are visible than fit in one set of hints (1–9, 0), press **Tab** to cycle through hint groups. Arrow keys, Page Up/Down, Home/End work as expected, and all keys are dispatched through a configurable keymap.
 
-- **Terminal** (`require 'typr'`) — raw terminal IO, no dependencies beyond Ruby stdlib
-- **Graphical** (`require 'typr/graphical'`) — SDL2-based, for desktop GUI windows
+**Live `/` search** is built into listings and pickers: popups open in search mode, so you start typing to distill the list down to the matches, then press a number hint to pick from the few remaining results. `Text` adds less-style search (`/`, `n`, `p`) with smart-case matching and wrap-around.
 
-All views work identically across frontends.
+### Mouse support
 
-### Keyboard interaction
+typr reports and decodes mouse input. `Typr.init` enables mouse reporting and `Typr.exit` disables it; `Typr.read_key` decodes SGR and legacy X10 reports into a `Typr::Mouse` struct (`button`, `x`, `y`, `action`, `modifiers`) with `press?`/`release?`/`wheel?`/`left?`/`middle?`/`right?` predicates. Pickers accept the mouse directly: a left click acts like pressing the row's hint digit, and the wheel scrolls the listing.
 
-Navigation uses **hint numbers** displayed next to selectable items — rows in grids, columns, or other elements. Press the number to select that item directly. When more items are visible than fit in one set of hints (1-9, 0), press **Tab** to cycle through hint groups. Arrow keys, Page Up/Down, Home/End work as expected. All keys are dispatched through a configurable keymap.
+### Terminal layer
+
+The default terminal frontend is pure ANSI on raw TTY input — **no ncurses**. Key sequences and keypad escapes are precompiled into a bundled terminfo table (`share/terminfo`), and MIME types come from a bundled database (`share/mimetypes`); both ship with the gem, so typr runs anywhere a raw, ANSI-capable terminal exists. The only runtime dependency is `unicode-display_width`.
+
+### 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, …).
+
+### Frontends
+
+- **Terminal** (`require 'typr'`) — the default: raw terminal IO, no ncurses, works over SSH and on Termux
+- **Graphical** (`require 'typr/graphical'`) — experimental: SDL2-based windows
+
+All components work identically across frontends.
 
 ## Installation
 
@@ -34,7 +49,7 @@ gem install typr
 Or in your Gemfile:
 
 ```ruby
-gem 'typr', '~> 1.0'
+gem 'typr', '~> 1.2'
 ```
 
 ## Usage
@@ -58,9 +73,9 @@ Typr.init
 )
 
 Typr.clear
-@grid.draw
-key = Typr.read(:key)   # reads a single keypress
-@grid.reset               # reset grid to default view
+@grid.show
+key = Typr.read_key   # reads a single keypress
+@grid.reset            # reset grid to default view
 Typr.exit
 ```
 
@@ -81,8 +96,8 @@ Typr.init
 
 Typr.clear
 loop do
-  @text.draw
-  key = Typr.read(:key)
+  @text.show
+  key = Typr.read_key
   case key
   when ?q then break
   else     @text.send(key)  # spacebar scrolls, j/k move up/down, etc.
@@ -104,7 +119,7 @@ Typr.init
   colors: { hints: [:white, :black] }
 )
 
-selected = @browser.pick("/home")   # interactive file picker, returns path
+selected = @browser.pick   # interactive file picker, returns the absolute path
 puts "You selected: #{selected}"
 Typr.exit
 ```
@@ -138,9 +153,9 @@ class MyApp
   def run
     Typr.clear
     loop do
-      @grid.draw
-      @prompt.draw
-      key = Typr.read(:key)
+      @grid.show
+      @prompt.show
+      key = Typr.read_key
       case key
       when ?s then @grid.sort_by(@prompt.ask("sort column": [@grid, :column]))
       when ?f then @grid.add_filter(*@prompt.ask("filter column": [@grid, :column], with: :line))
@@ -163,31 +178,46 @@ end
 ## API Reference
 
 ### `Typr.init` / `Typr.exit`
-Initialize and tear down the terminal UI. Always call these at the start and end of your program.
+Initialize and tear down the terminal UI (hides the cursor, enables key-mode and mouse reporting; restores them on exit). Always call these at the start and end of your program.
 
 ### `Typr.clear([scope])`
 Clears the full screen or a single line (`:line`).
 
-### `Typr.read(type)`
-Reads input from the terminal. Types:
-- `:key` — a single keypress (returns `KEY_ESCAPE`, `?q`, etc.)
-- `:line` — a full line of text input
+### `Typr.read_key`
+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:
+
+```ruby
+Typr.read_line "/" do |key, query, cursor|
+  filter query
+  nil
+end
+```
+
+### `Line#ask`
+Strict question types:
+- `Array` — pick a row from an object/column (hint-driven)
+- `:key` — read a single key
+- `:line` — read a line of text
+
+The question and answer are rendered in `@colors[:question]`/`@colors[:answer]`.
 
-### Layout properties (all views)
+### Layout properties (all components)
 - `top`, `bottom`, `left`, `right` — placement. Integers for absolute offsets, floats (0-1) for relative sizing. Negative values position from the opposite edge. (`bottom: -1` = last row)
 
 ### Grid options
 | Option | Description |
 |---|---|
 | `input` | Array of arrays (data rows) |
-| `header` | Column titles array |
+| `header` | Column titles array (symbols define `Typr::NAME`-style constants) |
 | `format` | Per-column format: `:min`, `:max`, or a number for fixed width |
+| `procs` | Per-column processors (built-ins: `:datetime`, `:magnitudes`, `:filetree`, `:convert`) |
 | `colors` | `{ columns: [:yellow, :cyan], header: [:white, :black] }` etc. |
-| `sorted_by` | Column index the grid is sorted by (setter) |
-| `filters` | Active filters array (getter) |
-| `selected` | Selected row indices (getter/setter) |
-| `.sort_by` | Sort the grid on a given column |
-| `.select_rows / select_columns` | Multi-select via index picker |
+| `.sort_by` | Sort the grid on a given column (toggles direction) |
+| `.add_filter` | Add a substring/regex filter on a column (or `:all`) |
+| `.pick :row, column:` | Interactive row picker with live `/` search and number hints |
 
 ### Text options
 | Option | Description |
@@ -195,12 +225,13 @@ Reads input from the terminal. Types:
 | `input` | String or IO-like stream to display |
 | `header` | Header bar text |
 | `border` | Border style: `:round`, `" "`, etc. |
+| `.search` | Search the text (`/`); `.search_next`/`.search_prev` (`n`/`p`) |
 
 ### Browser options
 | Option | Description |
 |---|---|
 | `directory` | Root directory to start browsing |
-| `.pick(start_dir)` | Interactive file picker, returns the selected path |
+| `.pick([type])` | Interactive file picker, returns the absolute path; `type` filters by MIME family (`"image"`, `"audio"`, `"video"`, `"text"`, `"application"`, `"inode"`) |
 
 ## License
 

data/example/grid

@@ -43,7 +43,7 @@ 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{ show " %s, sort:%s filter:%s selected:%s" % 
+      default: proc{ draw " %s, sort:%s filter:%s selected:%s" % 
         [ Time.now.strftime("%D %T"), 
           (@grid.header[@grid.sorted_by.abs] if @grid.sorted_by),
           @grid.filters.join, @grid.selected ||= [] ] } )
@@ -52,14 +52,14 @@ class GridTest
   def run
     Typr.clear
     loop do       
-      @grid.draw
-      @user.draw
+      @grid.show
+      @user.show
       @head.start  
       key = Typr.read( :key )
       @head.stop
       case key
       	when KEY_ESCAPE; exit
-      	when ?` then @user.draw eval( Typr.read(:line) )
+      	when ?` then (line = Typr.read(:line)) and @user.show(eval(line))
         when ?s then @grid.sort_by( @user.ask "sort column": [@grid, :column] )
         when ?F then @user.ask("pick fields": [@grid, :fields])
         when ?R then @user.ask("pick rows": [@grid, :rows])

data/example/text

@@ -9,6 +9,9 @@
 # word-wrapped scrollable viewport with a border.
 #
 # Keys:
+#   /         Search (type pattern, Enter to run)
+#   n         Next match
+#   p         Previous match
 #   arrows    Scroll up/down
 #   w         Pick a single word (hint-driven)
 #   W         Pick multiple words
@@ -35,18 +38,18 @@ class TextTest
       colors: { header: [:yellow, :grey30], hints: [:black, :white] }
     )
     @user = Line.new( top: -1, 
-      default: "pick [r]ow / [R]ows, pick [w]ord / [W]ords, [esc] quit",
+      default: "[/]:search [n]ext [p]rev, pick [r]ow/[R]ows, [w]ord/[W]ords, [esc] quit",
       colors: { question: :blue, answer: :yellow } )
   end
   
   def run
     Typr.clear
     loop do
-      @text.draw 
-      @user.draw
+      @text.show 
+      @user.show
       case key = Typr.read( :key )
         when KEY_ESCAPE; exit
-        # when ?/; @text.search( @user.ask filter: :string )
+        when ?/; @text.search
         when ?w; @user.ask( 'pick word':  [@text, :field] )
         when ?W; @user.ask( 'pick words': [@text, :fields] )
         when ?r; @user.ask( 'pick rows': [@text, :row] )

data/lib/browser.rb

@@ -33,7 +33,7 @@ module Typr
   #   Escape          | quit, returns nil
 
   class Browser < Grid
-    attr_accessor :directory, :user, :pwd, :view, :dir_history
+    attr_accessor :directory, :user, :pwd, :view
     attr_accessor :mimetype_db, :mimetype_magic
 
     ## Height minus 2 rows reserved for path bar and command line.
@@ -59,21 +59,17 @@ module Typr
       data, missing = [],{}
       unless append
         @colors[:fields] = {}
-        dir = @dir_history[dir+1] if dir.is_a? Integer
         clear
         Dir.chdir( @directory = File.expand_path( dir ) )
-        unless [?/, ENV["HOME"]].include? dir
-          @dir_history.unshift @directory
-          @dir_history.uniq!
-        end
       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] + [??]*7 + ["inode","symlink"] unless File.exist?(file)
+          next [file, target, "????", false, "?", "?", 0, 0, 0, 0, "inode", "symlink"] unless File.exist?(file)
         end
-        stat = File.stat(file)
+        stat = File.stat(file) rescue nil
+        next [file, "", "????", false, "?", "?", 0, 0, 0, 0, "?", "?"] unless stat
         type = stat.ftype.to_sym
 
         mime = { "directory": "inode/directory",
@@ -88,17 +84,23 @@ module Typr
         ( 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,
-          stat.uid, stat.gid, stat.size,
+          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
 
-      `file --mime-type '#{missing.keys.join "' '"}'
-        `.split($/).each.with_index{ |line,id|
-          next unless line[/^.+:\s+\w+\/[\w\-\.]+$/]
-          file, mime = line.split(/:\s*/)
-          data[ missing[file] ][-2,2] = mime.rstrip.split( ?/ ) } if
-            @mimetype_magic and not missing.empty?
+      if @mimetype_magic and not missing.empty?
+        begin
+          out = IO.popen(['file', '--mime-type', *missing.keys]){ |io| io.read }
+        rescue Errno::ENOENT
+          out = ''
+        end
+        out.split($/).each{ |line|
+          file, mime = line.match(/^(.*):\s+(\w+\/[\w\-\.]+)$/)&.captures
+          next unless file
+          data[ missing[file] ][-2,2] = mime.split( ?/ ) if missing[file] }
+      end
+      data.each { |row| row[0] = File.join(@directory, row[0]) }
       self << data
       sort
       filter
@@ -214,17 +216,7 @@ module Typr
     def help; @user.help end
 
     ##
-    # Recurse through the directory tree, adding subdirectory entries inline
-    # via +cd(path, true)+. Sorts by name with the filetree processor.
-    #
-    #   browser.recurse   # flattens tree into leaf names
-
-    def recurse
-      sort_by NAME
-      @procs[NAME] = :filetree
-    end
-
-    ## Reset display, selection, and position state then re-sort.
+    # Reset display, selection, and position state then re-sort.
     #
     #   browser.reset_view
 
@@ -235,7 +227,17 @@ module Typr
     #   browser.filter_view   # prompts for filter text
 
     def filter_view; add_filter *@user.ask(
-      filter: [ popup( type: :"[f]ilter" ), :row], with: :line ) end
+      filter: [ popup( type: :"[f]ilter" ), :row, NAME], with: :line ) end
+
+    ## Open live `/` search filtered on the name column.
+    #
+    #   browser.search   # type to narrow, Escape restores, Enter commits
+
+    def search
+      @suppress_user = true
+      pick :none, column: NAME
+      @suppress_user = false
+    end
 
     ## Open a sort-picker popup to choose a column to sort by.
     #
@@ -249,47 +251,52 @@ module Typr
 
     def views; switch_to( popup( type: :"[v]iews", input: @views.keys ).pick :row )  end
 
-    ## Open a directory history picker and cd to the chosen entry.
-    #
-    #   browser.dir_history   # pick from previously visited dirs
-
-    def dir_history; cd( popup( { input: @dir_history[1..-1],
-      colors: { columns: [ colors[:dir_history] ] },
-      align: [:left], left: left } ).pick(:row) )  end
-
     ## True when the row is a directory or passes base Grid filtering.
     #
     #   browser.check 0   # => true if navigable
 
-    def check row; super or @data[row][SUBTYPE] == "directory" end
+    def check row; super or ( !@filter_dirs and @data[row][SUBTYPE] == "directory" ) end
 
     ##
     # Interactive file/directory picker. Blocks until a selection or Escape.
-    # Return on a file wraps the path in single quotes. Enter on a directory
-    # triggers cd. +type+ optionally filters by MIME family (audio, video,
-    # image, text, application, inode).
+    # Return on a file yields its raw absolute path; multi-select joins the
+    # chosen paths double-quoted with spaces. Enter on a directory triggers
+    # cd. +type+ optionally filters by MIME family (audio, video, image,
+    # text, application, inode). Mouse: left-click a row to pick it; wheel
+    # up/down scrolls the listing.
     #
-    #   browser.pick              # => '/home/user/file.txt'
-    #   browser.pick 'image'      # => '/path/to/photo.png' (images only)
+    #   browser.pick              # => /home/user/file.txt
+    #   browser.pick 'image'      # => /path/to/photo.png (images only)
     #   browser.pick nil          # => anything, same as 'file'
 
-    def pick type='file'
+    def pick type='file', **kw
       type ||= 'file'
       type = type.to_s
-      return super if type[/row|column|field|none/]
+      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'
       loop do
-        draw
+        show
         draw_hints :row
-        key = Typr.read( :key )
-        next unless choice = send( key )
+        key = Typr.read_key
+        if key == @keymap[:exit]
+          reset :display
+          return
+        end
+        if key.is_a?(Typr::Mouse)
+          if key.wheel? and key.press?
+            send( key.wheel_up? ? @keymap[:up] : @keymap[:down] )
+            next
+          elsif key.press? and key.left? and choice = hit( key.y, key.x )
+          else next end
+        else
+          next unless choice = send( key )
+        end
         case choice
-          when Array; choice = ?' + choice.map{ |id|
-            @directory+?/+@data[id][NAME] }.join("' '") + ?'
+          when Array; choice = choice.map{ |id| @data[id][NAME] }.join('" "')
           when Integer; file = @data[ choice ]
             if file[SUBTYPE] == 'directory'; cd file[TARGET] || file[NAME]; next
-            else choice = ?'+@directory+?/+file[NAME]+?' end
+            else choice = file[NAME] end
         end
         reset :display
         return choice
@@ -300,19 +307,35 @@ module Typr
     # Renders the grid with an info bar above showing the current directory
     # path and colored status items for filter, sort, and view.
     #
-    #   browser.draw   # draws browser with info bar
-
-    def draw; super
-      info = { "[f]ilter": @filters.empty? ? "no filter" : @filters.to_s[1..-2],
-        "[s]ort": sorted_by(true), "[v]iews": @view }
-      move left, top - 1
-      show prepare( @directory, width - info.values.join.size - 3, :left, :left, 5 )
-      @colors[:actions].each do |type,col|
-        color col
-        show ' ' + info[type].to_s
-        @positions[type] = Typr.column - (type==@positions.keys.last ? 0:1 )
-      end
-      @user.draw
+    #   browser.show   # shows browser with info bar
+
+    def show; super
+      user = Etc.getpwuid(Process.euid).name rescue ENV["USER"] || Etc.getlogin
+      @head.colors[:columns][0] = user == "root" ? [:red, :black] : [:green, :black]
+      @head.reset :format
+      @head.show
+      move @head.positions(0)[1] - @head.separator.size, @parent.top - 1
+      color @colors[:default]
+      draw '@'
+      @positions = { :"[f]ilter" => 2, :"[s]ort" => 3, :"[v]iews" => 4
+        }.transform_values do |col|
+          @head.left + @head.positions(0)[col] + @head.width_for(col) - 1
+        end
+      @user.show unless @suppress_user
+    end
+
+    ## Formats active filters as 'column: query', joined by ' / '.
+    #
+    #   browser.filter_display  # => "name: foo / size: big"
+    #
+    # @return [String]
+
+    def filter_display
+      return "no filter" if @filters.empty?
+      @filters.map { |col, q|
+        q = "/#{q.source}/" if q.is_a?(Regexp)
+        "#{col.is_a?(Symbol) ? col : @header[col] || col}:#{q}"
+      }.join(" / ")
     end
 
     ## Returns row ids for all directories in the current listing.
@@ -370,15 +393,15 @@ module Typr
     #   'x-msdownload': :red  'x-pie-executable': :red
 
     def initialize args={}
-      @dir_history, @mimetype_db, @mimetype_magic = [], true, true
+      @mimetype_db, @mimetype_magic = true, true
       @view, @sort, @views, @positions, @show_hidden = :compact, 0, {}, {}, false
+      @filter_dirs = args[:filter_dirs]
       super
       @left ||= 0
       @top ||= 0
       @directory ||= ?~
       @colors[:actions] = { "[f]ilter": :red, "[s]ort": :blue, "[v]iews": :green
         }.merge @colors[:actions] || {}
-      @colors[:dir_history] ||= :yellow
       @colors[ :types ] = {
             image: :blue,
             audio: :green,
@@ -393,13 +416,13 @@ module Typr
       }.merge( @colors[ :types ] || {} )
 
       @keymap = { back: KEY_BACKSPACE, confirm: KEY_RETURN, help: ?h,
-        home: ?~, views: ?v, sort_view: ?s, dir_history: ?d,
+        home: ?~, views: ?v,         sort_view: ?s, search: ?/,
         mark: ?m, mark_range: ?M, mark_all: ?a, mark_invert: ?i,
-        filter_view: ?f, reset_view: ?r, recurse: ?R,
+        filter_view: ?f, reset_view: ?r,
         toggle_hidden: ?H}.merge @keymap
 
-      self.header = %w[ name target permissions owner group size accessed
-        modified created type subtype ]
+      self.header = %w[ name target permissions executable owner group size
+        accessed modified created type subtype ]
 
       @format[NAME] = :max
       @format[TYPE] = 5
@@ -413,26 +436,31 @@ module Typr
       @procs[GROUP] = Proc.new{|gid| Etc.getgrgid(gid).name rescue gid }
 
       @procs[NAME] = Proc.new{ |name, row| target = @data[row][TARGET]
-        name + ( target ? " > " + color_code(File.exist?(target) ? :green : :red) +
+        File.basename(name.to_s) + ( target ? " > " + color_code(File.exist?(target) ? :green : :red) +
           target : "" ) }
 
       @views = { simple: %i[ name ],
         compact: %i[ name size type],
         stats:   %i[ name size permissions owner group modified ],
-        full:    %i[ name size permissions owner group
+        full:    %i[ name size permissions executable owner group
                      accessed modified created type subtype ] }.merge @views
       @parent = self
-      @head ||= Grid.new( parent:self, left: ->{@parent.left}, top: ->{@parent.top-1},
-        input: [ [->{@parent.directory}, ->{@parent.filters.empty? ? "no filter" :
-          @parent.filters.to_s[1..-2] }, ->{@parent.sorted_by(true)},
-          ->{@parent.view} ] ], format: [:max, :min, :min, :min],
-        colors: { columns: [@colors[:default]] + @colors[:actions].values } )
+      @head ||= Grid.new( parent:self, left: ->{@parent.left}, margin: '',
+        right: ->{@parent.width + @parent.left - 1}, top: ->{@parent.top-1},
+        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"}"},
+          ->{@parent.view} ] ], format: [:min, :max, :min, :min, :min],
+        colors: { columns: [@colors[:default], @colors[:default],
+          @colors[:actions][:"[f]ilter"], @colors[:actions][:"[s]ort"],
+          @colors[:actions][:"[v]iews"]] } )
 
       @user ||= Line.new( parent:self, left:->{@parent.left},top:->{@parent.bottom+1},
-        bindings: %w[ [h]elp ] + @colors[:actions].map{|name,color|
+        bindings: %w[ [h]elp [/]:search ] + @colors[:actions].map{|name,color|
           color_code( color ) + name.to_s + color_code(@colors[:default]) } +
-            %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\  ])
+            %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\  ])
       cd @directory
     end
   end

data/lib/frontend.rb

@@ -1,5 +1,3 @@
-require 'readline'
-
 module Visuals
 
   COLORS = {
@@ -11,7 +9,13 @@ module Visuals
     magenta: [ 180,  100,  180],
     cyan:    [ 100,  180,  180],
     white:   [ 255,  255,  255],
-    grey:    [ 158,  158,  158] }
+    grey:    [ 158,  158,  158],
+    dark_red:     [  90,   30,   30],
+    dark_green:   [  30,   90,   30],
+    dark_yellow:  [  90,   80,   30],
+    dark_blue:    [  30,   30,   90],
+    dark_magenta: [  90,   30,   90],
+    dark_cyan:    [  30,   80,   80] }
 
   COLORS.merge! 1.upto(9).map{ |i|
     ["grey#{ i*10 }".to_sym, [i*25]*3 ] }.to_h