echoes 0.2.0 → 0.3.0

data/lib/echoes/screen.rb

@@ -8,6 +8,14 @@ module Echoes
                 :command_marks
     attr_accessor :cell_pixel_width, :cell_pixel_height, :title, :current_directory,
                   :pending_wrap, :background, :bg_fills
+    # Tracks what kitty-graphics images are currently visible on
+    # this pane's grid. Each entry: {image_id:, anchor_row:,
+    # anchor_col:, cell_cols:, cell_rows:, x_off:, y_off:, image:}.
+    # image: is the {rgba:, width:, height:} hash put_kitty_image
+    # received (held by reference, not a deep copy — the parser's
+    # bitmap cache and the placement share the same object so a
+    # later a=d ;d=I … can delete by image id without re-decoding).
+    attr_reader :placements
 
     def self.scrollback_limit
       Echoes.config.scrollback_limit
@@ -30,6 +38,7 @@ module Echoes
       @application_cursor_keys = false
       @bracketed_paste_mode = false
       @focus_reporting = false
+      @sync_active = false  # DEC private mode 2026 (synchronized output)
       @auto_wrap = true
       @mouse_tracking = :off   # :off, :x10, :normal, :button_event, :any_event
       @mouse_encoding = :default  # :default, :sgr
@@ -54,6 +63,7 @@ module Echoes
       @pending_wrap = false
       @last_char = nil
       @title_stack = []
+      @placements = []
       @dirty_rows = Set.new((0...rows).to_a)
       @bg_fills = []  # OSC 7772 ;bg-fill regions; each: {rect:[r1,c1,r2,c2], color:[r,g,b,a]}
       # OSC 133 prompt-boundary markers: each entry is a Hash with
@@ -163,12 +173,13 @@ module Echoes
       n.times { put_char(@last_char) }
     end
 
-    def put_multicell(text, scale:, width:, frac_n:, frac_d:, valign:, halign:, family: nil)
+    def put_multicell(text, scale:, width:, frac_n:, frac_d:, valign:, halign:,
+                       family: nil, flip_h: false, flip_v: false)
       mc_rows = scale
 
       if width > 0
         # Explicit width: entire text in one block of scale*width cols × scale rows
-        place_multicell_block(text, scale * width, mc_rows, scale, frac_n, frac_d, valign, halign, family)
+        place_multicell_block(text, scale * width, mc_rows, scale, frac_n, frac_d, valign, halign, family, flip_h, flip_v)
       elsif halign != 0
         # h= is set: render the whole string as one block of
         # `scale × source_chars` cells, so the renderer's halign math
@@ -188,7 +199,7 @@ module Echoes
           mc_cols = [mc_cols, measured_cells].max
         end
         mc_cols = [mc_cols, 1].max
-        place_multicell_block(text, mc_cols, mc_rows, scale, frac_n, frac_d, valign, halign, family)
+        place_multicell_block(text, mc_cols, mc_rows, scale, frac_n, frac_d, valign, halign, family, flip_h, flip_v)
       elsif family && @glyph_measurer && @cell_pixel_width && @cell_pixel_width > 0
         # Proportional fonts have variable glyph widths, so reserving
         # `char_width(grapheme) * scale` cells per grapheme leaves big
@@ -200,18 +211,126 @@ module Echoes
         measured_px = @glyph_measurer.call(text, family, scale, frac_n, frac_d).to_f
         mc_cols = (measured_px / @cell_pixel_width).ceil
         mc_cols = [mc_cols, 1].max
-        place_multicell_block(text, mc_cols, mc_rows, scale, frac_n, frac_d, valign, halign, family)
+        place_multicell_block(text, mc_cols, mc_rows, scale, frac_n, frac_d, valign, halign, family, flip_h, flip_v)
       else
         # Auto width: each grapheme gets its own block (monospace
         # assumption — fine for the configured terminal font).
         text.each_grapheme_cluster do |grapheme|
           cw = char_width(grapheme)
           mc_cols = scale * cw
-          place_multicell_block(grapheme, mc_cols, mc_rows, scale, frac_n, frac_d, valign, halign, family)
+          place_multicell_block(grapheme, mc_cols, mc_rows, scale, frac_n, frac_d, valign, halign, family, flip_h, flip_v)
         end
       end
     end
 
+    # Place a Kitty-graphics-protocol image as a multicell anchor.
+    # `rgba` is a Ruby string of width*height*4 bytes (RGBA8, top
+    # row first). `cells_w` / `cells_h` come from the wire's `c=` /
+    # `r=` options; when nil we size to the image's natural pixel
+    # dims divided by cell pixel size. `suppress_cursor` honors the
+    # `C=1` request to leave the cursor where it was.
+    #
+    # The renderer is format-agnostic: it just blits `multicell.sixel`'s
+    # RGBA into the reserved cell rect, so we reuse that storage key
+    # rather than introducing a parallel `:image` key.
+    def put_kitty_image(rgba:, width:, height:, cells_w: nil, cells_h: nil,
+                         px_x_offset: 0, px_y_offset: 0,
+                         suppress_cursor: false, image_id: nil)
+      return if rgba.nil? || width <= 0 || height <= 0
+      return if @cell_pixel_width.to_f <= 0 || @cell_pixel_height.to_f <= 0
+
+      mc_cols = cells_w && cells_w > 0 ? cells_w : (width  / @cell_pixel_width ).ceil
+      mc_rows = cells_h && cells_h > 0 ? cells_h : (height / @cell_pixel_height).ceil
+      mc_cols = [mc_cols, 1].max
+      mc_rows = [mc_rows, 1].max
+      return if mc_cols > @cols || mc_rows > @rows
+
+      if suppress_cursor
+        # C=1 (slide-presentation mode): anchor at the current
+        # cursor without wrapping or scrolling. A multi-image
+        # slideshow would otherwise accumulate a cumulative
+        # scroll offset every time an image landed near the
+        # bottom, dragging earlier rows off-screen. If the image
+        # doesn't fit at the current position, bail — the client
+        # positions the cursor deliberately and would rather see
+        # nothing than have the layout shift out from under it.
+        return if @cursor.col + mc_cols > @cols
+        return if @cursor.row + mc_rows > @rows
+      else
+        if @cursor.col + mc_cols > @cols
+          @cursor.col = 0
+          line_feed
+        end
+        while @cursor.row + mc_rows > @rows
+          scroll_up(1)
+          @cursor.row = [@cursor.row - 1, 0].max
+        end
+      end
+
+      anchor_row = @cursor.row
+      anchor_col = @cursor.col
+
+      mc_rows.times do |dr|
+        mc_cols.times do |dc|
+          erase_multicell_at(anchor_row + dr, anchor_col + dc)
+        end
+      end
+
+      anchor = @grid[anchor_row][anchor_col]
+      anchor.reset!
+      anchor.char = " "
+      anchor.width = 1
+      # Multicell anchor reserves the cell rect (cursor flow,
+      # `:cont` neighbors stay skipped by the renderer); the
+      # actual image is drawn by the GUI's placement re-blit
+      # pass off `screen.placements`, not via mc[:sixel]. Keeps
+      # the kitty path independent of the cell loop so deletes,
+      # scrolls, and font changes affect drawing through one
+      # code path.
+      anchor.multicell = {
+        cols: mc_cols, rows: mc_rows, scale: 1,
+        frac_n: 0, frac_d: 0, valign: 0, halign: 0,
+      }
+
+      mc_rows.times do |dr|
+        mc_cols.times do |dc|
+          next if dr == 0 && dc == 0
+          cont = @grid[anchor_row + dr][anchor_col + dc]
+          cont.reset!
+          cont.multicell = :cont
+        end
+      end
+
+      # Record the placement BEFORE any post-place scroll fires —
+      # if the cursor advance below pushes us past the bottom and
+      # triggers scroll_up, that path needs the placement already
+      # in @placements so its anchor_row gets decremented along
+      # with the rest of the content.
+      @placements << {
+        image_id:   image_id,
+        anchor_row: anchor_row,
+        anchor_col: anchor_col,
+        cell_cols:  mc_cols,
+        cell_rows:  mc_rows,
+        x_off:      px_x_offset.to_i,
+        y_off:      px_y_offset.to_i,
+        image:      {rgba: rgba, width: width, height: height},
+      }
+
+      unless suppress_cursor
+        # Sixel parity: cursor lands at column 0 of the row after
+        # the image. If that row is past the bottom, scroll.
+        @cursor.col = 0
+        @cursor.row += mc_rows
+        while @cursor.row >= @rows
+          scroll_up(1)
+          @cursor.row -= 1
+        end
+      end
+
+      mark_all_dirty
+    end
+
     def put_sixel(data, params)
       decoder = SixelDecoder.new(params).decode(data)
       return if decoder.width == 0 || decoder.height == 0
@@ -382,6 +501,7 @@ module Echoes
         (0...@cursor.row).each { |r| clear_row(r); @line_wrapped[r] = false; mark_dirty(r) }
       when 2
         (0...@rows).each { |r| clear_row(r); @line_wrapped[r] = false }
+        @placements.clear
         mark_all_dirty
       when 3
         @scrollback.clear
@@ -475,9 +595,20 @@ module Echoes
         @grid.insert(@scroll_bottom, Array.new(@cols) { Cell.new })
         @line_wrapped.insert(@scroll_bottom, false)
       end
+      shift_placements(-n)
       (@scroll_top..@scroll_bottom).each { |r| mark_dirty(r) }
     end
 
+    # Move every placement anchor by `delta` rows and drop entries
+    # that have scrolled entirely off-screen. Called by scroll_up
+    # so the placement list tracks the same visual shift the grid
+    # rows just took.
+    def shift_placements(delta)
+      return if @placements.empty?
+      @placements.each { |p| p[:anchor_row] += delta }
+      @placements.reject! { |p| p[:anchor_row] + p[:cell_rows] <= 0 }
+    end
+
     def scroll_down(n = 1)
       @pending_wrap = false
       n.times do
@@ -679,7 +810,7 @@ module Echoes
       @pending_wrap = false
     end
 
-    attr_accessor :mouse_tracking, :mouse_encoding, :insert_mode, :active_charset, :application_keypad, :cursor_style, :bell, :single_shift
+    attr_accessor :mouse_tracking, :mouse_encoding, :insert_mode, :active_charset, :application_keypad, :cursor_style, :bell, :single_shift, :sync_active
 
     def push_title
       @title_stack.push(@title)
@@ -868,7 +999,9 @@ module Echoes
       end
     end
 
-    attr_accessor :clipboard_handler, :palette_handler, :glyph_measurer
+    attr_accessor :clipboard_handler, :palette_handler, :glyph_measurer,
+                  :capture_handler, :notification_handler,
+                  :display_info_handler, :open_window_handler
 
     def set_clipboard(text)
       @clipboard_handler&.call(:set, text)
@@ -1019,6 +1152,7 @@ module Echoes
       @application_cursor_keys = false
       @bracketed_paste_mode = false
       @focus_reporting = false
+      @sync_active = false  # DEC private mode 2026 (synchronized output)
       @charset_g0 = :ascii
       @charset_g1 = :ascii
       @charset_g2 = :ascii
@@ -1057,6 +1191,7 @@ module Echoes
       @scrollback_wrapped = []
       @tab_stops = default_tab_stops
       @pending_wrap = false
+      @placements = []
       mark_all_dirty
     end
 
@@ -1265,7 +1400,7 @@ module Echoes
       end
     end
 
-    def place_multicell_block(text, mc_cols, mc_rows, scale, frac_n, frac_d, valign, halign, family = nil)
+    def place_multicell_block(text, mc_cols, mc_rows, scale, frac_n, frac_d, valign, halign, family = nil, flip_h = false, flip_v = false)
       # Discard if block is larger than screen
       return if mc_cols > @cols || mc_rows > @rows
 
@@ -1299,7 +1434,7 @@ module Echoes
       anchor.multicell = {
         cols: mc_cols, rows: mc_rows, scale: scale,
         frac_n: frac_n, frac_d: frac_d, valign: valign, halign: halign,
-        family: family
+        family: family, flip_h: flip_h, flip_v: flip_v,
       }
 
       # Mark continuation cells

data/lib/echoes/tab.rb

@@ -5,13 +5,13 @@ module Echoes
     attr_reader :pane_tree
     attr_accessor :title
 
-    def initialize(command:, rows:, cols:, cwd: nil, embedded: false, editor_file: nil)
+    def initialize(command:, rows:, cols:, cwd: nil, embedded: false, editor_file: nil, env: nil)
       @command = command
       @rows = rows
       @cols = cols
       @embedded = embedded
       pane = Pane.new(command: command, rows: rows, cols: cols, cwd: cwd,
-                      embedded: embedded, editor_file: editor_file)
+                      embedded: embedded, editor_file: editor_file, env: env)
       @pane_tree = PaneTree.new(pane)
       @title = pane.title
     end

data/lib/echoes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Echoes
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: echoes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
   - Akira Matsuda
@@ -75,11 +75,15 @@ files:
   - lib/echoes/embedded_shell_helper.rb
   - lib/echoes/gui.rb
   - lib/echoes/installer.rb
+  - lib/echoes/iterm2_images.rb
+  - lib/echoes/kitty_graphics.rb
+  - lib/echoes/kitty_graphics_appkit.rb
   - lib/echoes/objc.rb
   - lib/echoes/pane.rb
   - lib/echoes/pane_tree.rb
   - lib/echoes/parser.rb
   - lib/echoes/preferences.rb
+  - lib/echoes/profile.rb
   - lib/echoes/screen.rb
   - lib/echoes/sixel_decoder.rb
   - lib/echoes/tab.rb