echoes 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 988274d532cf54ecb84bae874115f635b993e6817c259c41811b33265c55d725
-  data.tar.gz: 73f6868b563a851c1d171908f92ad7cf6ad8dd046f101c178f826a18790f8d0f
+  metadata.gz: d12ae8bf0fab5f169c0d380125005490662167338fb529d6c0a1c3daf725a415
+  data.tar.gz: dabea435d3121c0411048313744738e62f759de537f4afd4e4d28dc378188cea
 SHA512:
-  metadata.gz: 5120ced363551ab708776569564b96754c70d7dfe06056b3c97e0b3749e24b4fd87e060f126cacea6de655fb9b78dd1910a22eb49988b772aace46b6e0a5d99f
-  data.tar.gz: 7131de98f47c8a16d7ae6aeaef86a74af5d58412fa9c2d2b4948ee03734c97ed63d4329e186dbf83c1d4765ae148141119a20a55e4b1facfc26a7db181346dd7
+  metadata.gz: c6306b65e5234b7e35cdb5624ae04b6a0585c5a418bbab22ca8d517a9c8aa928c5e6fdcf0b826d333fa73870275046efd16c4519bccf8d35de7959fba8958d08
+  data.tar.gz: 8481081986ffd00775f18a9fd6a5b8a0f3691e0f030c9f6f601b898f1ffc875d8c266b191ca0489e85e39cf6d7117c19843c68dbf9f2a091ec5fa757addcb5f6

data/lib/echoes/screen.rb

@@ -243,20 +243,20 @@ module Echoes
       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
+        # bottom, dragging earlier rows off-screen. Oversize
+        # placements are registered at the cursor anyway — only
+        # the cells inside the grid get reserved as multicell
+        # anchors / continuations; the rest of the image draws
+        # via the GUI's blit pass and clips at the pane rect.
+        # (Used to bail out entirely on oversize; presentation
+        # clients prefer "show what fits" to "show nothing.")
       else
+        return if mc_cols > @cols || mc_rows > @rows
         if @cursor.col + mc_cols > @cols
           @cursor.col = 0
           line_feed
@@ -270,8 +270,19 @@ module Echoes
       anchor_row = @cursor.row
       anchor_col = @cursor.col
 
-      mc_rows.times do |dr|
-        mc_cols.times do |dc|
+      # How many cells of the multicell footprint actually land
+      # inside the grid. For images that fit, this equals the full
+      # mc_cols / mc_rows; oversize C=1 placements get clamped so
+      # we never index past `@grid`. The placement entry below
+      # still records the full mc_cols × mc_rows so the GUI draws
+      # the unclipped image and the pane-rect clip handles the
+      # overflowing pixels.
+      reservable_cols = [mc_cols, @cols - anchor_col].min
+      reservable_rows = [mc_rows, @rows - anchor_row].min
+      return if reservable_cols < 1 || reservable_rows < 1
+
+      reservable_rows.times do |dr|
+        reservable_cols.times do |dc|
           erase_multicell_at(anchor_row + dr, anchor_col + dc)
         end
       end
@@ -286,14 +297,17 @@ module Echoes
       # 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.
+      # code path. `cols` / `rows` carry the *full* image extent
+      # — the GUI uses those for the pixel draw rect — even when
+      # only `reservable_*` of those cells actually fit on the
+      # grid.
       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|
+      reservable_rows.times do |dr|
+        reservable_cols.times do |dc|
           next if dr == 0 && dc == 0
           cont = @grid[anchor_row + dr][anchor_col + dc]
           cont.reset!

data/lib/echoes/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: echoes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
   - Akira Matsuda