tuile 0.3.0 → 0.5.0

data/lib/tuile/screen.rb

@@ -39,8 +39,17 @@ module Tuile
       # stack and status bar.
       @pane = ScreenPane.new
       @on_error = ->(e) { raise e }
+      # App-level keyboard shortcuts dispatched by {#handle_key} before keys
+      # reach the pane. See {#register_global_shortcut}.
+      @global_shortcuts = {}
     end
 
+    # Entry in the global shortcut registry: the block to run, whether it
+    # pre-empts open popups, and an optional preformatted status-bar hint.
+    # @api private
+    Shortcut = Data.define(:block, :over_popups, :hint)
+    private_constant :Shortcut
+
     # @return [ScreenPane] the structural root of the component tree.
     attr_reader :pane
 
@@ -148,15 +157,45 @@ module Tuile
         @pane.on_tree { it.active = active.include?(it) }
         @focused.on_focus
       end
-      # Popups own their own "q Close" prefix in #keyboard_hint; for the tiled
-      # case Screen tacks on the global "q quit" instead.
+      refresh_status_bar
+    end
+
+    # Rebuild the status-bar text from the current focus and global-shortcut
+    # registry. Called from {#focused=} and whenever the global registry
+    # changes. Popups own their own "q Close" prefix in `#keyboard_hint`;
+    # for the tiled case Screen tacks on the global "q quit" instead.
+    # Global-shortcut hints get spliced in too — see {#global_shortcut_hints}
+    # for the over_popups filter rule.
+    # @api private
+    # @return [void]
+    def refresh_status_bar
       top_popup = @pane.popups.last
+      globals = global_shortcut_hints(popup_open: !top_popup.nil?)
       @pane.status_bar.text = if top_popup.nil?
-                                "q #{Rainbow("quit").cadetblue}  #{active_window&.keyboard_hint}".strip
+                                ["q #{Rainbow("quit").cadetblue}", *globals,
+                                 active_window&.keyboard_hint].compact.reject(&:empty?).join("  ")
                               else
-                                top_popup.keyboard_hint
+                                [*globals, top_popup.keyboard_hint].reject(&:empty?).join("  ")
                               end
     end
+    private :refresh_status_bar
+
+    # Status-bar hints from currently-registered global shortcuts.
+    # When a popup is open, only `over_popups: true` shortcuts contribute —
+    # the rest don't fire in that context, so showing them would be a lie.
+    # Insertion order is preserved (Hash iteration order).
+    # @api private
+    # @param popup_open [Boolean]
+    # @return [Array<String>]
+    def global_shortcut_hints(popup_open:)
+      @global_shortcuts.each_value.filter_map do |s|
+        next if s.hint.nil? || s.hint.empty?
+        next if popup_open && !s.over_popups
+
+        s.hint
+      end
+    end
+    private :global_shortcut_hints
 
     # Internal — use {Component::Popup#open} instead. Adds the popup to
     # {#pane}, centers and focuses it.
@@ -172,16 +211,24 @@ module Tuile
 
     # Runs event loop – waits for keys and sends them to active window. The
     # function exits when the 'ESC' or 'q' key is pressed.
+    #
+    # @param capture_mouse [Boolean] when true (default), enables xterm mouse
+    #   tracking so clicks and scroll wheel arrive as {MouseEvent}s and feed
+    #   {Component#handle_mouse}. When false, no tracking escape sequence is
+    #   written: the terminal keeps its native click handling, which is what
+    #   you want if the app benefits more from select-to-copy than from
+    #   click-to-focus. Components' `handle_mouse` is simply never invoked
+    #   from the loop in that mode (the terminal stops sending the bytes).
     # @return [void]
-    def run_event_loop
+    def run_event_loop(capture_mouse: true)
       @pretend_ui_lock = false
       $stdin.echo = false
-      print MouseEvent.start_tracking
+      print MouseEvent.start_tracking if capture_mouse
       $stdin.raw do
         event_loop
       end
     ensure
-      print MouseEvent.stop_tracking
+      print MouseEvent.stop_tracking if capture_mouse
       print TTY::Cursor.show
       $stdin.echo = true
     end
@@ -197,6 +244,80 @@ module Tuile
     # @return [Boolean] true if focus moved.
     def focus_previous = cycle_focus(forward: false)
 
+    # Registers an app-level keyboard shortcut. When `key` arrives, the block
+    # is invoked on the event-loop thread (so it may freely mutate UI) before
+    # the key reaches any component. Re-registering the same key replaces the
+    # previous binding; use {#unregister_global_shortcut} to remove one.
+    #
+    # Only unprintable keys are accepted — control characters (Ctrl+letter,
+    # ESC, BACKSPACE, ENTER, …) and multi-character escape sequences (arrows,
+    # F-keys, …). Printable keys raise {ArgumentError}: they'd hijack typing
+    # into a {Component::TextField} and should be expressed as
+    # {Component#key_shortcut} instead, which the dispatcher suppresses while
+    # a text widget owns the hardware cursor. TAB and SHIFT_TAB are also
+    # rejected because {#handle_key} intercepts them for focus navigation
+    # before the global registry is consulted, so a binding on them would
+    # silently never fire.
+    #
+    # Pass `hint:` to surface the shortcut in the status bar. It's a
+    # preformatted string the caller fully owns (so colors and the key label
+    # style stay consistent with whatever the host app uses elsewhere). The
+    # framework splices it in like any other status hint: in the tiled case,
+    # right after `q quit` and before the active window's own hint; while a
+    # popup is open, only hints from `over_popups: true` shortcuts are
+    # shown, and they're prepended before the popup's `q Close`.
+    #
+    # Example — open a log popup with Ctrl+L from anywhere, even while a
+    # popup is already on screen:
+    #
+    #   screen.register_global_shortcut(Keys::CTRL_L,
+    #                                   over_popups: true,
+    #                                   hint: "^L #{Rainbow("log").cadetblue}") do
+    #     log_popup.open
+    #   end
+    #
+    # @param key [String] unprintable key (e.g. {Keys::CTRL_L}, {Keys::ESC},
+    #   {Keys::PAGE_UP}).
+    # @param over_popups [Boolean] when true, fires even while a modal popup
+    #   is open (pre-empting the popup's own key handling). When false
+    #   (default), the shortcut is suppressed while any popup is open and
+    #   the popup gets the key instead.
+    # @param hint [String, nil] preformatted status-bar hint (e.g.
+    #   `"^L #{Rainbow("log").cadetblue}"`). When nil (default) the shortcut
+    #   is silent in the status bar.
+    # @yield invoked with no arguments when `key` is pressed.
+    # @return [void]
+    def register_global_shortcut(key, over_popups: false, hint: nil, &block)
+      raise ArgumentError, "block required" if block.nil?
+      raise ArgumentError, "key must be a String, got #{key.inspect}" unless key.is_a?(String)
+      raise ArgumentError, "key cannot be empty" if key.empty?
+      if Keys.printable?(key)
+        raise ArgumentError,
+              "global shortcut key must be unprintable; got #{key.inspect}. " \
+              "Use Component#key_shortcut for printable keys (it's suppressed " \
+              "while a text widget owns the cursor, so it won't hijack typing)."
+      end
+      if [Keys::TAB, Keys::SHIFT_TAB].include?(key)
+        raise ArgumentError,
+              "#{key == Keys::TAB ? "TAB" : "SHIFT_TAB"} is reserved for focus navigation"
+      end
+      unless hint.nil? || hint.is_a?(String)
+        raise ArgumentError, "hint must be a String or nil, got #{hint.inspect}"
+      end
+
+      @global_shortcuts[key] = Shortcut.new(block: block, over_popups: over_popups, hint: hint)
+      refresh_status_bar
+    end
+
+    # Removes a shortcut previously installed by {#register_global_shortcut}.
+    # No-op if `key` was not registered.
+    # @param key [String]
+    # @return [void]
+    def unregister_global_shortcut(key)
+      @global_shortcuts.delete(key)
+      refresh_status_bar
+    end
+
     # @return [Component, nil] current active tiled component.
     def active_window
       check_locked
@@ -289,6 +410,14 @@ module Tuile
       @frame_buffer = +""
       begin
         until @invalidated.empty?
+          # Defensive filter: a component can become detached between enqueue
+          # and drain (popup close, sibling removed mid-event-handling, focus
+          # repair). Detached components have no place on the screen and must
+          # never paint, even though Component#invalidate already gates them
+          # out — this catches the case where attachment changed since.
+          @invalidated.delete_if { |c| !c.attached? }
+          break if @invalidated.empty?
+
           did_paint = true
           popups = @pane.popups
 
@@ -417,10 +546,17 @@ module Tuile
     # A key has been pressed on the keyboard. Handle it, or forward to active
     # window.
     #
-    # Tab / Shift+Tab are reserved navigation keys: intercepted here before
-    # the pane sees them, so a focused {Component::TextField} (which would
-    # otherwise swallow printable keys via the standard cursor-owner
-    # suppression) doesn't trap them.
+    # Dispatch order:
+    #   1. Tab / Shift+Tab — reserved focus navigation, intercepted before
+    #      anything else so a focused {Component::TextField} (which would
+    #      otherwise swallow printable keys via cursor-owner suppression)
+    #      doesn't trap them.
+    #   2. App-level shortcuts from {#register_global_shortcut}. An entry
+    #      registered with `over_popups: true` always fires; one with the
+    #      default `over_popups: false` fires only when no popup is open
+    #      (otherwise the popup receives the key normally).
+    #   3. {ScreenPane#handle_key}, which routes to the topmost popup or
+    #      tiled content.
     # @param key [String]
     # @return [Boolean] true if the key was handled by some window.
     def handle_key(key)
@@ -432,7 +568,13 @@ module Tuile
         focus_previous
         true
       else
-        @pane.handle_key(key)
+        shortcut = @global_shortcuts[key]
+        if !shortcut.nil? && (shortcut.over_popups || @pane.popups.empty?)
+          shortcut.block.call
+          true
+        else
+          @pane.handle_key(key)
+        end
       end
     end
 
@@ -456,6 +598,8 @@ module Tuile
           layout
         when EventQueue::EmptyQueueEvent
           repaint
+        when Proc
+          event.call
         end
       rescue StandardError => e
         @on_error.call(e)

data/lib/tuile/styled_string.rb

@@ -53,18 +53,16 @@ module Tuile
     # Raised by {.parse} on malformed or unsupported escape sequences.
     class ParseError < Error; end
 
-    # A frozen value type describing the visual style of a {Span}.
-    #
-    # `fg` and `bg` accept:
-    # - `nil` — the terminal default (SGR 39 / 49)
-    # - a symbol from {COLOR_SYMBOLS} — 8 standard + 8 bright ANSI colors
-    # - an Integer 0..255 — 256-color palette index (SGR 38;5;N / 48;5;N)
-    # - an `[r, g, b]` Array of three 0..255 Integers — 24-bit RGB
+    # A frozen value type describing the visual style of a {Span}. Colors are
+    # stored as {Color} instances (or `nil` for the terminal default); inputs
+    # to {.new} and {#merge} are coerced via {Color.coerce}, so the four
+    # accepted color forms — `nil`, Symbol, Integer 0..255, RGB Array — work
+    # transparently.
     #
     # @!attribute [r] fg
-    #   @return [Symbol, Integer, Array<Integer>, nil]
+    #   @return [Color, nil]
     # @!attribute [r] bg
-    #   @return [Symbol, Integer, Array<Integer>, nil]
+    #   @return [Color, nil]
     # @!attribute [r] bold
     #   @return [Boolean]
     # @!attribute [r] italic
@@ -72,42 +70,16 @@ module Tuile
     # @!attribute [r] underline
     #   @return [Boolean]
     class Style < Data.define(:fg, :bg, :bold, :italic, :underline)
-      # Symbolic color names recognized by {#fg} and {#bg}. Order is
-      # significant: indices 0..7 map to standard ANSI colors (SGR 30..37 fg
-      # / 40..47 bg); indices 8..15 map to bright variants (SGR 90..97 /
-      # 100..107).
-      # @return [Array<Symbol>]
-      COLOR_SYMBOLS = %i[
-        black red green yellow blue magenta cyan white
-        bright_black bright_red bright_green bright_yellow
-        bright_blue bright_magenta bright_cyan bright_white
-      ].freeze
-
-      # @param fg [Symbol, Integer, Array<Integer>, nil]
-      # @param bg [Symbol, Integer, Array<Integer>, nil]
+      # @param fg [Color, Symbol, Integer, Array<Integer>, nil] coerced via {Color.coerce}.
+      # @param bg [Color, Symbol, Integer, Array<Integer>, nil] coerced via {Color.coerce}.
       # @param bold [Boolean]
       # @param italic [Boolean]
       # @param underline [Boolean]
       # @return [Style]
       # @raise [ArgumentError] when a color is not one of the accepted forms.
       def self.new(fg: nil, bg: nil, bold: false, italic: false, underline: false)
-        validate_color!(fg, :fg)
-        validate_color!(bg, :bg)
-        super(fg:, bg:, bold:, italic:, underline:)
-      end
-
-      # @param color [Object]
-      # @param which [Symbol]
-      # @return [void]
-      def self.validate_color!(color, which)
-        return if color.nil? || COLOR_SYMBOLS.include?(color)
-        return if color.is_a?(Integer) && color.between?(0, 255)
-        return if color.is_a?(Array) && color.length == 3 &&
-                  color.all? { |v| v.is_a?(Integer) && v.between?(0, 255) }
-
-        raise ArgumentError, "invalid #{which} color: #{color.inspect}"
+        super(fg: Color.coerce(fg), bg: Color.coerce(bg), bold:, italic:, underline:)
       end
-      private_class_method :validate_color!
 
       # The style with no color and no attributes — what the terminal shows
       # without any SGR applied.
@@ -149,11 +121,11 @@ module Tuile
     # supported SGR alphabet raises {ParseError}.
     class Parser
       # @return [Array<Symbol>]
-      STANDARD_COLORS = Style::COLOR_SYMBOLS[0, 8].freeze
+      STANDARD_COLORS = Color::COLOR_SYMBOLS[0, 8].freeze
       private_constant :STANDARD_COLORS
 
       # @return [Array<Symbol>]
-      BRIGHT_COLORS = Style::COLOR_SYMBOLS[8, 8].freeze
+      BRIGHT_COLORS = Color::COLOR_SYMBOLS[8, 8].freeze
       private_constant :BRIGHT_COLORS
 
       # @param input [String]
@@ -487,14 +459,27 @@ module Tuile
     # `underline`). Useful for row-level highlights — the new bg overlays
     # without dropping foreground colors the original styling carried.
     #
-    # @param bg [Symbol, Integer, Array<Integer>, nil] background color, in
-    #   any of the forms accepted by {Style.new}. `nil` clears bg back to
-    #   the terminal default.
+    # @param bg [Color, Symbol, Integer, Array<Integer>, nil] background
+    #   color, coerced via {Color.coerce}. `nil` clears bg back to the
+    #   terminal default.
     # @return [StyledString]
     def with_bg(bg)
       self.class.new(@spans.map { |span| Span.new(text: span.text, style: span.style.merge(bg: bg)) })
     end
 
+    # Returns a new {StyledString} with `fg` applied to every span, preserving
+    # each span's text and other style attributes (`bg`, `bold`, `italic`,
+    # `underline`). The new fg overlays without dropping background colors or
+    # text attributes the original styling carried.
+    #
+    # @param fg [Color, Symbol, Integer, Array<Integer>, nil] foreground
+    #   color, coerced via {Color.coerce}. `nil` clears fg back to the
+    #   terminal default.
+    # @return [StyledString]
+    def with_fg(fg)
+      self.class.new(@spans.map { |span| Span.new(text: span.text, style: span.style.merge(fg: fg)) })
+    end
+
     # @return [String]
     def inspect
       "#<#{self.class.name} #{to_s.inspect}>"
@@ -543,26 +528,21 @@ module Tuile
       codes << (to.bold ? 1 : 22) if from.bold != to.bold
       codes << (to.italic ? 3 : 23) if from.italic != to.italic
       codes << (to.underline ? 4 : 24) if from.underline != to.underline
-      codes.concat(color_codes(to.fg, base: 30, ext: 38)) if from.fg != to.fg
-      codes.concat(color_codes(to.bg, base: 40, ext: 48)) if from.bg != to.bg
+      codes.concat(color_codes(to.fg, target: :fg)) if from.fg != to.fg
+      codes.concat(color_codes(to.bg, target: :bg)) if from.bg != to.bg
       return "" if codes.empty?
 
       "\e[#{codes.join(";")}m"
     end
 
-    # @param color [Symbol, Integer, Array<Integer>, nil]
-    # @param base [Integer] base SGR code — 30 for fg, 40 for bg.
-    # @param ext [Integer] extended-color SGR code — 38 for fg, 48 for bg.
-    # @return [Array<Integer>]
-    def color_codes(color, base:, ext:)
-      case color
-      when nil then [base + 9]
-      when Symbol
-        idx = Style::COLOR_SYMBOLS.index(color)
-        idx < 8 ? [base + idx] : [base + 60 + (idx - 8)]
-      when Integer then [ext, 5, color]
-      when Array then [ext, 2, *color]
-      end
+    # @param color [Color, nil]
+    # @param target [Symbol] `:fg` or `:bg`.
+    # @return [Array<Integer>] SGR codes; `[39]` / `[49]` for the "default" reset
+    #   when `color` is `nil`, otherwise delegated to {Color#sgr_codes}.
+    def color_codes(color, target:)
+      return [target == :fg ? 39 : 49] if color.nil?
+
+      color.sgr_codes(target)
     end
 
     # @param start_or_range [Integer, Range]

data/lib/tuile/version.rb

@@ -2,5 +2,5 @@
 
 module Tuile
   # @return [String]
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end