filecon 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df1c9b636fd924aa180e49679581afcb96338d18d854ab359046cbf91e048642
-  data.tar.gz: deb0a271ed914d69e8d4c7a138a83a1d7942c5a451de227b9c23d3637dea89f3
+  metadata.gz: 9f07add892511a6e097e0179f4cef51dc07b63472130a1e346c92384472dfb3d
+  data.tar.gz: 6fa89d833523b2adc8b86fa0f2bee7f5ce0b9077d86d0cf66d181931f60f8081
 SHA512:
-  metadata.gz: cdd7f22ae47392a10f1485dad5fdebd98860604e28bac74e214a13ca9b3d9b4f0b838878e8e523f827c91d724246c620fb8c526dcfbe97fb67817c4d3253bc40
-  data.tar.gz: 75e4a171320400619c0923ed985c9b93f598c454477cec23adad90b78adad58e2f8533e7ff535ac428c595cf39f26c212b7a709c173fc4802b4a405ab54cd6c0
+  metadata.gz: 43c10e4395a6e444ddd831ce98034864706b6be2e380b0d62ed58be4a6ff6d57b49397b12771fe6dad9d785c04df4638c7d0b77c4a104a7971da9fabdb8c8879
+  data.tar.gz: abfcb1c4db8a0ab38f3108469c048c7ca2566d18dd30dfb4212d8edbf03e171da52a0750dc36cc4df2c77233a475897c81f6bce954157f254864bd7c63f05491

data/CHANGELOG.md

@@ -0,0 +1,158 @@
+# Changelog
+
+## [v0.4.1] — 2026-09-11
+
+## [v0.4.0] — 2026-09-05
+
+### Added
+- Shell TAB completion in the command editor — alt+hint opens the edit line with live completions from the shell's completion system, shown in a pickable grid above the input
+- Clickable bottom bar and head — clicking a binding label on the status line runs that action, and clicking the filter/sort/views columns of the head opens the corresponding popup
+- Two-pane help — `h` shows the clickable keybinding grid (the line's `list`) beside the help text; Filecon composes the HELP panel itself, mirrors wheel/arrow navigation to both panels, and clicking a binding row returns its trigger key
+- Clicking outside a popup dismisses it — a click on empty space cancels the command, history, or filter/sort/views picker just like Escape, and the two-pane help closes on a click outside both panes
+- Colored help titles — the FILECON, HINTS, COMMANDS, CONFIG headings and the KEYBINDINGS grid header are yellow; the redundant HELP text header is removed
+
+### Fixed
+- The mouse wheel scrolls the command, history, and filter/sort/views popups — previously the live filter reapplied itself after each wheel tick and snapped the list back to the top
+- The colored `[f]ilter`/`[s]ort`/`[v]iews` bindings on the bottom bar now react to clicks — the trigger-key extraction no longer trips on their ANSI color codes
+- The filter/sort/views columns on the head open their popups when clicked in a real terminal — the head row now matches the 1-based mouse coordinates
+- Clicking the bottom bar binds to the row above it — the clickable row check now uses 1-based mouse coordinates, so bindings activate where they are rendered
+- Clicking a keybinding row in the two-pane help no longer crashes — the clicked row now maps to the line's binding labels (`@user.bindings`) instead of an undefined App `@bindings`, so the trigger key is returned and dispatched
+- `cd` owns the path column flag — array `cd` sets `@show_path` (single dirs clear it), so `reset_view` preserves the path listing after `execute`/`recurse` instead of dropping it; `recurse` just builds the recursive directory array and delegates the loading to `cd`
+- Array `cd` fills the path column after the full load — previously only the first directory's rows got values (the rest stayed blank on `reset_view`), and custom Hash views dropped the column entirely; the trailing `change_view` now runs once on complete data, and computed views keep PATH too
+- Clickable header path — left-clicking the username goes home and each directory segment navigates there, while right-click opens the command list for that path without leaving the current directory
+- Alt+click opens the command list — Alt+left-click on a row or header path behaves like right-click, for touchscreens where right-click is hard to send (Termux)
+- Failed `cd` keeps history and the path flag — directory history, selection clearing, and `@show_path` only commit after a successful navigation, and array loads skip unreadable entries up front
+- A binding picked in help now runs — `fly` re-dispatches a String return from `send` (as it already did for mouse clicks), so pressing `h` and clicking e.g. `[R]ecurse` executes that action instead of just closing the help page
+- The help text panel sits flush with the terminal edge — the text panel's `right: -2` border now draws on the last column, matching the browser edge; the previous inset was caused by an off-by-one in the `draw_border` guard
+
+## [v0.3.0] — 2026-08-15
+
+### Added
+- New `%cmd` substitution — lists the PATH, picks an executable, and inserts its path; the listing is left and the original directory restored afterwards
+- Alt + hint digit in the command and cmd-history popups puts the picked command into a `read_line` for editing before it runs (dir-history entries are not edited); the command popup resolves its `%name`/`%dir`/`%file`/`%str` substitutions before the resulting command is offered for editing
+- Alt + number in the main view opens the command list for the hinted file (replacing the `o` action)
+- Right-click in the main view opens the command list for the clicked file — mirroring Alt+number, with left-click still running the default action
+- Return with marked files (`m`) opens their command list — replacing the `o` action's multi-select behaviour, now reachable through the default confirm key
+
+### Changed
+- `%dir` picking relies on typr's `pick :directory` to confirm the current directory with Return — the `@pick_dir` state is gone, and `%dir`/`%file`/`%cmd` share one substitution branch
+- Renamed the view-switching method to `change_view` (was `switch_to`), matching the clearer typr naming — keybinding, popup, and specs updated
+- Removed the `o` key action — the command list for a file is now opened with Alt+number
+- Shell-generated custom view columns are passed through `coerce_type`, so numeric output (e.g. `wc` counts) sorts and displays numerically
+- Custom view shell output is stripped before display, so trailing newlines no longer yield a trailing `|` in multi-line columns
+- Dropped the now-redundant `hints: "1234567890"` overrides from the command and history popups — digits-only hints are the typr default
+
+### Fixed
+- `%dir` substitution pickers confirm the current directory with Return again — the Return-marked-files action only applies outside substitution mode
+- The file list is redrawn immediately while a `|` command's output is shown — the command picker popup no longer stays on screen behind the statusline, and the statusline keeps showing the command after it returns
+- Per-MIME-type row colors stay correct after deleting a file — `delete_row` now reindexes the `@colors[:fields]` keys together with `@map`, so rows below the deletion no longer show the previous row's color until `[r]eset`
+- PTY driver no longer garbles or hangs — the screen decoder holds partial multi-byte UTF-8 across read chunks (box-drawing glyphs render intact), clamps the cursor to the terminal grid and caps the raw log so the rendered screen stays bounded, key resends ignore a dead pty instead of raising, and `quit` escalates `ESC` → `TERM` → `KILL` so it always reaps the app
+- Spec cleanup — `picker_double`, `test_id`, `with_path`, and `with_cmd_target` helpers removed the grid-picker and id-lookup boilerplate, and duplicated `#change_view`, `#history`, `%cmd`, and colored `%dir`/`%file` examples were merged into looping specs
+
+## [v0.2.1] — 2026-08-03
+
+### Added
+- Mouse support in `fly` — click a row to open it in its default app, wheel up/down scrolls the listing (requires typr `~> 1.3` mouse reporting, enabled by `Typr.init`)
+- PTY integration driver — `spec/integration/pty_driver.rb` is an expect-style smoke suite that spawns the real `bin/filecon` on a pseudo-terminal, drives it with keystrokes, and asserts on the rendered screen; run as part of `rake test` (or manually via `ruby spec/integration/pty_driver.rb`, with `--interactive` for a live probe and `--keep` to retain temp fixtures)
+
+## [v0.2.0] — 2026-08-02
+
+### Added
+- `executable` command category — `commands:` entries under `executable:` (`run`, `run_terminal`) are added to the `open_file` picker ahead of `default` whenever the selected file(s) have the executable bit set, regardless of MIME type; multi-select adds them only when every selection is executable
+- `execute` command (`x`, `e[x]ecute`) — lists every executable from all `$PATH` directories in the main view, with a `path` column showing each binary's containing directory
+- `open_current` (`` ` ``) — opens the directory under the cursor in its default app
+- Full-path filenames: `cd` stores absolute paths in `@data`; `@procs[NAME]` displays basenames via `File.basename`; `build` uses `@data[id][NAME]` directly (no `@directory` prefix)
+- `@directory` accepts an Array (for multi-path listings like `execute`); `draw` joins Array entries with `": "` for the status display
+- `frequency_limit` config var (default 10) — only the top N most-used entries get frequency coloring in history popups, listed frequency-first then most-recent
+- `filter_dirs` config flag (default true) — active filters also hide directories that don't match
+- Shell history importer — `import_shell_history` reads `~/.bash_history`/`~/.zsh_history` once at startup, validates commands against `$PATH` and built-ins, resolves aliases from `.zshrc`/`.bashrc`, and merges new entries into `cmd_history`; a `shell_sync` flag in the state dir prevents re-import
+- `open_file` status line now shows the picked command name first in `colors.commands` colors — `> name:display : output` (name in `colors.commands[0]`, the built command in `colors.commands[1]`; default `["green", "red"]`); the command picker popup uses the same configurable colors
+- `build` prompts for `%dir`/`%file`/`%str` prepend the colored command `name:` prefix, so the partial command stays identifiable while being filled in
+- `term_hold` config — hold flag appended to `@term` at init (e.g. `foot --hold`)
+
+### Changed
+- Config location moved to `~/.config/filecon/config.yaml` — on first run the bundled `config.yaml` is copied there; state/history remain under `~/.local/share/filecon/`; string-keyed `colors:` settings (as loaded from YAML) are now honored
+- `binaries` → `execute` (`x`), reset restored to `[r]eset`, recurse brought back as `[R]ecurse`
+- `recurse` restored to `cd`-based appends (absolute paths), adding a `path` column (`Typr::PATH`) before the filename via a shared `add_path_column` helper
+- `%str` substitution uses the shared `Typr.read_line` editor (renamed from `Typr.edit`): arrow/ctrl-arrow word jumps, in-place editing, Escape aborts the whole command
+- Adapted to typr API renames: `Typr.read` → `read_key`, `Typr.edit` → `read_line`, frontend `show` → `draw` / widget render `draw` → `show`
+- History storage: `@history`/`@frequency` ivars and the separate frequency files replaced with flat `@cmd_history`/`@dir_history` arrays of `[count, entry]` pairs managed by a `record` helper; file format is `count,entry` per line
+- `run` executes unprefixed commands (e.g. from imported shell history) in a terminal window instead of doing nothing; the shell-history import skips `cd`/`pushd` entries (their directory targets still land in `dir_history`)
+- Config command templates restructured (explicit `%str` args, image view alias)
+- `[H]idden_files` binding moved after `[~]:home`; backtick dispatches through `Stack#send` as `open_current`
+- Runtime dependency on typr raised to `~> 1.2` (requires the `read_key`/`read_line` API)
+
+### Removed
+- `Filecon::PATH` constant — paths consolidated into a `@path` hash (`:config`, `:state`, `:dir_history`, `:cmd_history`)
+- Separate `cmd_frequency`/`dir_frequency` files (merged into the `[count, entry]` history pairs)
+
+### Fixed
+- `Grid#sort` used `ids` (which returns `@map` when set), so rows appended by subsequent `$PATH` dirs were invisible — now uses the full row range
+- `cd` Array branch: missing `Dir.chdir(d)` and stale `@directory` before each append `super`, causing procs to resolve relative to the wrong directory
+- `history`: `each_with_index.each_with_object` misrouted the memo block parameter (`fields[[i,0]] = ...` raised `NoMethodError`)
+- `import_shell_history`: `shell_sync` was never written because the `added` flag checked `@cmd_history` after `record` already inserted; every occurrence now increments frequency, and the resolved command text (not the alias name) is stored
+- `open_file` executable-category check skips when no row is selected (`open_current` with a nil id) instead of crashing on `@data[nil]`
+- `recurse` no longer leaks hidden directory contents past the basename-only check
+- `open_file` command picker keeps a fixed height derived from its full command list, so live-filter redraws don't resize/jump the popup
+- History and command-picker popups scroll with arrow keys again — PageUp/PageDown/Home/End and TAB hint cycling are no longer swallowed by the line editor
+- `Stack#send` keymap dispatch only normalizes printable ASCII keys, preserving control characters for correct key matching
+- History popups show frequency entries with a grey background and `:brown` dir foreground; `du`/`wc`/`whatis` outputs trimmed of the trailing filename
+
+---
+
+## [v0.1.2] — 2026-07-28
+
+### Added
+- Help page with keybindings and description (`h` key)
+- Terminal resize handler (`Typr.on_resize`)
+- `new_file` and `new_dir` commands for directories
+- `count` view (chars, words, lines) replaces `lines` view
+- `open_file` accepts optional `types` parameter for filtered command resolution
+- `build` handles nil `id` for directory-level commands (backtick)
+
+### Changed
+- Help page: simplified layout with proper positioning
+- Backtick key opens commands for current directory instead of navigating to root
+- `open_file`: pipe output displayed in status line instead of fork; `+` commands run directly (no terminal spawn)
+- `run` uses instance vars `@cmd_history_path`, `@max_history` instead of module methods
+- Setup code moved from `Filecon` module into `bin/filecon`
+- `Filecon` module: removed `setup_config`, `deep_symbolize_keys`, `config`, `dir_history_path`, `cmd_history_path` — only `PATH` and `VERSION` remain
+- Config uses string keys (no deep symbolization)
+- Rakefile: cleaned to standard targets (build, clean, test, release)
+- config.yaml: `copy` command uses pipe instead of terminal; `lines` view → `count`
+- Man page: full rewrite — Typr references, YAML config, new keybinding docs
+- README updated for YAML config, command prefixes, substitution variables
+- Specs updated for new API (string keys, constructor args)
+
+### Fixed
+- Constant redefinition warnings in tests
+- Removed bundler dependency (Gemfile, Gemfile.lock)
+
+## [v0.1.1] — 2026-07-27
+
+### Added
+- Error logging to `/tmp/filecon.log` for debugging crashes
+- Fallback to `$TERM` when terminal config is missing
+
+### Changed
+- Switched configuration format from TOML to YAML
+- Simplified command execution: only `!` (Ruby eval) and shell commands (`|`, `+`, `=`)
+- Config keys are now strings (no deep symbolization needed)
+- Inlined setup code into `bin/filecon`, stripped `Filecon` module to `PATH` and `VERSION`
+- Require strategy: `require_relative` for development, gem fallback for installed use
+- Restructured as a proper Ruby gem with `bin/filecon` entry point
+
+### Fixed
+- Relative paths in `lib/filecon.rb`
+- `config.yaml` `colors.default` structure
+- Removed obsolete root-level script and config files
+- Updated all links to Codeberg (`typr/filecon`, `typr/typr`)
+
+## [v0.1.0] — 2026-07-20
+
+### Added
+- Initial release: terminal file manager with MIME-type detection
+- Directory and command history
+- Customizable views, keybindings, and colors
+- Configurable command execution with `%name`, `%dir`, `%file`, `%str` substitutions
+- Built on the Typr terminal UI toolkit

data/README.md

@@ -4,7 +4,7 @@
 
 ## Description
 
-Filecon is a terminal-based file manager built on the [Typr](https://codeberg.org/typr/typr) terminal UI toolkit. It packs everything a file manager should do into a keyboard-driven terminal program: every file, command, and directory is reachable in a few keystrokes, and the most common operations take the fewest key presses.
+Filecon is a terminal-based file manager built on the [Typr](https://codeberg.org/typr/typr) terminal UI toolkit. Every file, command, and directory is reachable in a few keystrokes, and the most common operations take the fewest key presses.
 
 Filecon is designed to be **intuitive**, **complete**, **powerful**, and the **fastest possible** file manager. The whole interface is built around that principle:
 
@@ -12,8 +12,6 @@ Filecon is designed to be **intuitive**, **complete**, **powerful**, and the **f
 - **Live search in popups** — command and history popups open in `/` search mode; type to distill the list, then pick one of the few remaining results with a number.
 - **Frequency-ordered history** — directory and command history are ranked by use count, so the most likely choice is always near the top.
 
-Filecon's long-term goal is to become an **interactive shell**: a separate companion program will handle command building, and combined with Filecon the two will form a full interactive shell that competes with interactive CLI shells.
-
 Filecon runs on Typr, whose self-contained terminal layer ships its own precompiled terminfo key table and MIME-type database in the gem — no ncurses or external tooling required — so Filecon works on any raw, ANSI-capable terminal (including Termux).
 
 ## Features
@@ -21,7 +19,7 @@ Filecon runs on Typr, whose self-contained terminal layer ships its own precompi
 - **Directory browsing with MIME-type detection** — files are typed from a packaged MIME database and colored accordingly, with optional `file --mime-type` magic detection for unknowns
 - **Fastest possible navigation** — hint numbers (1–9, 0) open rows directly; TAB pages hints beyond the first ten
 - **Default `[/]:search` in popups** — command and history popups open in search mode: start typing to distill the list down to the matches, then press a number hint to pick from the few remaining results. The listing itself searches the same way
-- **Mouse support** — click a row to open it with its default action, right-click to open its command list; the mouse wheel scrolls the listing (pointer-only mode is planned)
+- **Mouse support** — click a row to open it with its default action, right-click to open its command list, click a binding on the bottom bar or a filter/sort/views column to run that action; the mouse wheel scrolls the listing (pointer-only mode is planned)
 - **Command execution modes** — commands run in one of four ways, chosen by prefix: `|` status line, `=` text viewer, `+` new terminal window, `!` Ruby eval; per-MIME-type command sets with `%name`, `%dir`, `%file`, `%cmd`, `%str` substitution
 - **Customizable column views** — view columns run shell commands with `%name` substitution (content preview, char/word/line counts, type info, disk usage, man-page descriptions)
 - **Directory and command history with a frequency counter** — entries stored as `[count, entry]` pairs, most-used first then most-recent; `frequency_limit` controls how many frequent entries lead the list
@@ -78,7 +76,7 @@ filecon [directory]
 
 ### Mouse
 
-Click a row to open it with its default action, right-click to open its command list; the mouse wheel scrolls the listing. Mouse reporting is enabled automatically when Filecon starts.
+Click a row to open it with its default action, right-click (or Alt+click) to open its command list; click a binding label on the bottom bar or a filter/sort/views column on the head to run that action; the mouse wheel scrolls the listing. Clicking outside a popup dismisses it. `h` shows a two-pane help with the keybinding grid (from the line's `list`) beside the help text — clicking a binding row returns its trigger key, and clicking outside both panes closes it. Mouse reporting is enabled automatically when Filecon starts.
 
 ### Popups and search
 
@@ -106,11 +104,6 @@ State and history files live under `~/.local/share/filecon/`.
 
 See `filecon(1)` for the full manual.
 
-## Roadmap
-
-- **Pointer-only mode** — full mouse-driven operation of the entire interface, building on the click/wheel mouse support already present
-- **Interactive shell** — a separate command-building program that combines with Filecon into an interactive shell competing with interactive CLI shells
-
 ## Development
 
 ```bash

data/config.yaml

@@ -128,13 +128,15 @@ colors:
 commands:
   default:
     # copy: "|rsync --progress %name %dir"
+    edit: "+micro %name"
+    view: "+moor %name"
     info: "=file %name"
     copy: "|cp -R %name %dir"
     move: "|mv %name %dir"
     rename: "|mv %name %str"
     delete: "|rm -rf %name"
-    open_with: "|%file %name %str" 
-    open_with_terminal: "+%file %name %str" 
+    open_with: "|%cmd %name %str" 
+    open_with_terminal: "+%cmd %name %str" 
     xdg_open: "|xdg-open %name"
 
   executable:
@@ -152,10 +154,8 @@ commands:
     disk_use: "|du -hs %name | cut -wf1"
     play: "+mpv %name"
 
-  text:
-    view: "+moor %name"
-    edit: "+micro %name"
-    count: "|wc -l %name | cut -wf1"
+  # text:
+    # count: "|wc -l %name | cut -wf1"
 
   troff:
     manual: "+man %name"
@@ -210,9 +210,9 @@ commands:
   "x-c++":
     run: "+g++ %name && ./a.out"
 
-  markdown:
-    view: "+glow %name"
-    edit: "+micro %name"
+  # markdown:
+  #   view: "+glow %name"
+  #   edit: "+micro %name"
 
   json:
     view: "=cat %name | jq ."

data/lib/filecon/version.rb

@@ -1,3 +1,3 @@
 module Filecon
-  VERSION = "0.3.0"
+  VERSION = "0.4.1"
 end

data/lib/filecon.rb

@@ -12,23 +12,31 @@ class Filecon::App < Typr::Browser
   def cd dir, append=false
     @selected[:rows] = [] unless append
     if dir.is_a? Array
-      dirs = dir.filter_map { |d| d = File.expand_path(d.to_s); Dir.exist?(d) ? d : nil }
+      @show_path = true
+      dirs = dir.filter_map { |d| d = File.expand_path(d.to_s);
+        Dir.exist?(d) && File.readable?(d) && File.executable?(d) ? d : nil }
       dirs.each_with_index { |d, i|
         @directory = d if i.positive?
         Dir.chdir(d) if i.positive?
         super d, i.positive?
       }
       @directory = dirs
+      change_view @view if dirs.any?
       nil
     else
       dir = @dir_history[dir+1][1] if dir.is_a? Integer
-      record :dir, File.expand_path(dir) unless append || [?/, ENV["HOME"]].include?(dir)
-      super dir, append
+      saved = @show_path
+      @show_path = false unless append
+      if ( super dir, append ) == false
+        @show_path = saved
+      else
+        record :dir, File.expand_path(dir) unless append || [?/, ENV["HOME"]].include?(dir)
+      end
       nil
     end
   end
 
-  def execute; cd ENV["PATH"].split(":"); add_path_column end
+  def execute; cd ENV["PATH"].split(":") end
 
   def pick type='file', **kw
     return super unless type == :cmd
@@ -62,6 +70,10 @@ class Filecon::App < Typr::Browser
       @header.index(head.to_s) || (@header += [head.to_s]; @header.count-1) }
     clear
     self << data
+    if @show_path
+      @data.each { |row| row[PATH] = File.dirname(row[NAME]) } if @data.any?
+      @sequence.insert(@sequence.index(NAME) || 0, PATH) unless @sequence.include?(PATH)
+    end
     @current = id
     @view = id
   end
@@ -100,7 +112,7 @@ class Filecon::App < Typr::Browser
     cmd = build pair.last, id, pair.first
     return unless cmd
     if alt
-      edited = Typr.read_line "> ", left: left, top: @user.top, initial: cmd
+      edited = Typr.read_line "> ", left: left, top: @user.top, initial: cmd, completions: true, redraw: method(:show)
       return unless edited
       cmd = edited
     end
@@ -128,7 +140,7 @@ class Filecon::App < Typr::Browser
     name = row[NAME]
     return delete_row id unless File.symlink?(name) || File.exist?(name)
     updated = scan_file name
-    updated[-2,2] = row[-2,2]
+    updated[TYPE, 2] = row[TYPE, 2]
     @data[id] = updated
     process id
   end
@@ -223,7 +235,8 @@ class Filecon::App < Typr::Browser
 
     entry = ordered[n][1]
     if is_cmd and picker.modifier == :alt
-      edited = Typr.read_line "> ", left: left, top: @user.top, initial: entry
+      edited = Typr.read_line "> ", left: left, top: @user.top, initial: entry,
+        completions: true, redraw: -> { picker.show }
       return unless edited
       entry = edited
     end
@@ -306,39 +319,29 @@ class Filecon::App < Typr::Browser
   def recurse
     return if @directory.is_a?(Array)
     root = File.expand_path(@directory)
-    clear
-    cd root
-    Dir.glob("**/*", File::FNM_DOTMATCH, base: root).sort.each { |p|
+    dirs = [root] + Dir.glob("**/*", File::FNM_DOTMATCH, base: root).sort.filter_map { |p|
       next if !@show_hidden && p.split(?/).any? { |c| c.start_with?(?.) }
-      next unless File.directory?(File.join(root, p))
       d = File.expand_path(p, root)
-      @directory = d
-      Dir.chdir d
-      cd d, true
+      d if File.directory?(d)
     }
-    Dir.chdir root
-    @directory = root
-    add_path_column
+    cd dirs
     @current = 0
     nil
   end
 
-  def add_path_column
-    Typr.const_set :PATH, @header.size unless Typr.const_defined?(:PATH)
-    @header << "path" unless @header.include?("path")
-    @data.each { |row| row[PATH] = File.dirname(row[NAME]) }
-    @sequence.insert(@sequence.index(NAME) || 0, PATH) unless @sequence.include?(PATH)
-    # @align[@header.size-1] = :right
-  end
+
 
   def help
-    info = "\nFILECON - a terminal file manager\n\n" \
-      "HINTS: press a number (1-9,0) to open that file with its default action.\n" \
-      "       Alt+number opens the command list for that file instead.\n" \
-      "       Right-click a file to open its command list.\n" \
-      "       Mark files with m, then Return opens their command list.\n" \
-      "       TAB cycles pages of hints.\n\n" \
-      "COMMANDS:\n" \
+    grid = @user.list
+    y = color_code :yellow
+    d = color_code @colors[:default]
+    text = Text.new( input: "\n#{y}FILECON#{d} - a terminal file manager\n\n" \
+      "#{y}HINTS:#{d}\n  press a number (1-9,0) to open that file with its default action.\n" \
+      "  Alt+number opens the command list for that file instead.\n" \
+      "  Right-click a file to open its command list.\n" \
+      "  Mark files with m, then Return opens their command list.\n" \
+      "  TAB cycles pages of hints.\n\n" \
+      "#{y}COMMANDS:#{d}\n" \
       "  e[x]ecute      browse all executables on your PATH\n" \
       "  [R]ecurse      expand the current directory tree (subdirectories listed inline)\n" \
       "  [d]irectories  jump to a recently visited directory\n" \
@@ -347,11 +350,32 @@ class Filecon::App < Typr::Browser
       "  entries first, then the rest in most-recent order. The frequency_limit\n" \
       "  setting in config.yaml (default 10) controls how many frequent entries\n" \
       "  lead the list.\n\n" \
-      "CONFIG: ~/.config/filecon/config.yaml\n\n" \
-      "KEYBINDINGS:\n\n" + @user.bindings.join(?\n)
-    Text.new( input: info, top:2, left:3, right: -3, bottom: -3, header: "HELP",
-      colors: { header: [:black,:white], border:[:white,:grey10] },
-      border: :light ).pick :none
+      "#{y}CONFIG:#{d}\n  ~/.config/filecon/config.yaml\n",
+      top: 2, right: -2, bottom: -3,
+      colors: { border:[:white,:grey10] },
+      border: :light )
+    text.left = -> { grid.right + 2 }
+    loop do
+      grid.show
+      text.show
+      key = Typr.read_key
+      case key
+        when @keymap[:exit], @keymap[:confirm]; return
+        when Typr::Mouse
+          if key.press? and key.left?
+            if row = grid.data_at( key.x, key.y )
+              return extract_key( @user.bindings[ row ] )
+            end
+            return if grid.send( key ) == :outside and text.send( key ) == :outside
+          else
+            grid.send key
+            text.send key
+          end
+        else
+          grid.send key
+          text.send key
+      end
+    end
   end
 
   def initialize args={}
@@ -378,6 +402,13 @@ class Filecon::App < Typr::Browser
 
   def open_current; open_file nil, false, ["directory", "inode"] - [??] + ["default"] end
 
+  def open_path path
+    dir, @directory = @directory, path
+    open_file nil, false, ["directory", "inode"] - [??] + ["default"]
+  ensure
+    @directory = dir
+  end
+
   def fly
     loop do
       show
@@ -387,17 +418,19 @@ class Filecon::App < Typr::Browser
       case key
         when KEY_ESCAPE; exit
         when Typr::Mouse
-          if key.wheel? and key.press?
-            send( key.wheel_up? ? @keymap[:up] : @keymap[:down] )
-          elsif key.press? and ( key.left? or key.right? )
-            id = hit( key.y, key.x )
-            open_file( id, !key.right? ) if id.is_a? Integer
+          alt = key.alt?
+          if key.press? and ( key.left? or key.right? ) and target = @head.path_at( key.x, key.y )
+            ( key.right? or alt ) ? open_path( target ) : cd( target )
+          else
+            value = send( key )
+            open_file( value, !( key.right? or alt ) ) if value.is_a?( Integer )
           end
           @user.reset
         else
           alt = key.is_a?(String) && key[/\A\e(\d)\z/]
           key = key[1] if alt
           id = send( key )
+          id = send( id ) while id.is_a? String
           open_file( id, !alt ) if id.is_a? Integer
           @user.reset
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kilian Reitmayr
@@ -74,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - bin/filecon