rubyterm 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaf9bef055d78f4fe83be5108bf948285ba3b36df6049dc68b60f97ff5ec2468
-  data.tar.gz: aba855f9e0abe0f223fdacd85a84796eb905b254052c14f4515894a62433a467
+  metadata.gz: dad934f37ee68f63661c2d7bbd2e8c7af64a8811fb8fd27b9d5bd63787a8f021
+  data.tar.gz: 124c7b36ea94bef960b7bbc78f9143149cce43cf443b4e7d9ed99207e40d1f01
 SHA512:
-  metadata.gz: fcf76c9027bc5448199736f5faf67fd4bebd592ed3470981f821374ddb85d22c45bab8cb15d289bf0da32c3fc4edb196d02eee6ee14d14457f688cd528a6a22a
-  data.tar.gz: e37c492d2661b587f952ce3606eaf08e86e69fe5d07c50799b3bb9540003eb863804488fdcb05205962540ded847fa05edc311bacad0ac2482943bdb77741c22
+  metadata.gz: ea7bf3f07aa5088ca07bc79058aa836d20af2c95d5d6887d7fe5e7fd8f44283170c4fa2df7078d5f10a271582b5d339143473e8fc3d1af51d74c42f562e3e0a5
+  data.tar.gz: 491468d6aab9c96754001425718102aaa1c677c994ca1f82c47a3fa07196327bb3ed132ef72c547d77904216f6ed9f700373fdd3c6b08cae3769904f36f562a9

data/bin/record

@@ -0,0 +1,3 @@
+#!/bin/env ruby
+
+exec(%{ruby harness/cli.rb record --out /tmp/#{ARGV[0].gsub("/","_")}.rec -- #{ARGV.join(" ")}})

data/lib/bitmapwindow.rb

@@ -83,10 +83,14 @@ class BitmapWindow
   # for now - it does not affect correctness of the text, only its scale.
   def draw(x, y, str, fg, bg, _lineattrs = nil)
     fillrect(x, y, str.length * @char_w, @char_h, bg)
-    str.each_char.with_index do |ch, i|
-      cp = ch.ord
+    cps = str.each_char.map(&:ord)
+    cps.each_with_index do |cp, i|
       next if cp == 32 || cp == CharWidth::WIDE_SPACER # space / wide-glyph tail
-      blit_glyph(cp, x + i * @char_w, y, fg)
+      # A WIDE_SPACER in the next cell means this is a double-width glyph; render
+      # it two cells wide so it overflows into the (skipped) spacer cell instead
+      # of being shrunk into one.
+      cells = cps[i + 1] == CharWidth::WIDE_SPACER ? 2 : 1
+      blit_glyph(cp, x + i * @char_w, y, fg, cells)
     end
   end
 
@@ -146,8 +150,8 @@ class BitmapWindow
     end
   end
 
-  def blit_glyph(codepoint, cx, cy, fg)
-    g = @cache.glyph(codepoint)
+  def blit_glyph(codepoint, cx, cy, fg, cells = 1)
+    g = @cache.glyph(codepoint, cells)
     return unless g
     if g.color?
       blit_rgba(g, codepoint, cx, cy)

data/lib/charwidth.rb

@@ -11,7 +11,6 @@
 #   * width(cp)  -> 1 or 2 cells (wide = CJK/Hangul/Kana/fullwidth + emoji)
 #   * emoji?(cp) -> whether to render in colour (the non-CJK wide blocks)
 #
-# Combining marks (width 0) are deliberately not handled yet (treated as 1).
 module CharWidth
   # Codepoint stored in the second cell of a double-width glyph: a blank,
   # advancing placeholder. The terminal writes it after a wide char so the
@@ -19,19 +18,62 @@ module CharWidth
   # advancing glyph and the bitmap/virtual backends skip it.
   WIDE_SPACER = 0
 
+  # Zero-width (combining) codepoints. These modify the preceding base glyph
+  # rather than advancing the cursor, so they occupy no column — matching tmux
+  # (a lone U+FE0F reports cursor_x=0; a base+U+FE0F sequence stays the base's
+  # width). Notably this includes the variation selectors: U+FE0F (VS16, emoji
+  # presentation) and U+FE0E (VS15, text presentation) request a presentation
+  # for the preceding char but are themselves invisible and zero-width. Treating
+  # them as width 1 gave each its own cell, drawing a stray glyph over the next
+  # column. Per-script combining marks beyond these blocks are a deferred
+  # non-goal (still treated as width 1).
+  ZERO = [
+    0x0300..0x036F,  # combining diacritical marks
+    0x1AB0..0x1AFF,  # combining diacritical marks extended
+    0x1DC0..0x1DFF,  # combining diacritical marks supplement
+    0x200B..0x200F,  # ZWSP, ZWNJ, ZWJ, LRM, RLM (zero-width format)
+    0x20D0..0x20FF,  # combining diacritical marks for symbols
+    0xFE00..0xFE0F,  # variation selectors (incl. VS15/VS16)
+    0xFE20..0xFE2F,  # combining half marks
+    0xE0100..0xE01EF # variation selectors supplement
+  ].freeze
+
   # Wide (two-cell) blocks: CJK, Hangul, Kana, fullwidth forms, and emoji.
+  #
+  # In the BMP symbol zone (Misc Symbols, Dingbats, Misc Symbols & Arrows)
+  # only the East Asian Wide + emoji-presentation codepoints are double-width;
+  # the surrounding text dingbats are single-width. A broad 0x25FD..0x27BF (and
+  # peers) wrongly widened text characters like U+273B (the spinner ✻ used by
+  # TUIs), shifting the cursor one column on every line that contained one and
+  # corrupting incremental redraws. These ranges now match tmux exactly.
   WIDE = [
-    0x1100..0x115F, 0x231A..0x232A, 0x23E9..0x23F3, 0x25FD..0x27BF,
-    0x2B1B..0x2B55, 0x2E80..0xA4C6, 0xA960..0xA97C, 0xAC00..0xD7A3,
+    0x1100..0x115F,
+    0x231A..0x231B, 0x2329..0x232A, 0x23E9..0x23EC, 0x23F0..0x23F0,
+    0x23F3..0x23F3, 0x25FD..0x25FE, 0x2614..0x2615, 0x2648..0x2653,
+    0x267F..0x267F, 0x2693..0x2693, 0x26A1..0x26A1, 0x26AA..0x26AB,
+    0x26BD..0x26BE, 0x26C4..0x26C5, 0x26CE..0x26CE, 0x26D4..0x26D4,
+    0x26EA..0x26EA, 0x26F2..0x26F3, 0x26F5..0x26F5, 0x26FA..0x26FA,
+    0x26FD..0x26FD, 0x2705..0x2705, 0x270A..0x270B, 0x2728..0x2728,
+    0x274C..0x274C, 0x274E..0x274E, 0x2753..0x2755, 0x2757..0x2757,
+    0x2795..0x2797, 0x27B0..0x27B0, 0x27BF..0x27BF, 0x2B1B..0x2B1C,
+    0x2B50..0x2B50, 0x2B55..0x2B55,
+    0x2E80..0xA4C6, 0xA960..0xA97C, 0xAC00..0xD7A3,
     0xF900..0xFAD9, 0xFE10..0xFE6B, 0xFF01..0xFF60, 0xFFE0..0xFFE6,
     0x16FE0..0x18D08, 0x1B000..0x1B2FB, 0x1F18E..0x1F19A, 0x1F200..0x1F265,
     0x1F300..0x1F5A4, 0x1F5FB..0x1F6FC, 0x1F7E0..0x1F7EB, 0x1F90C..0x1F9FF,
     0x1FA70..0x1FAD6, 0x20000..0x2EBE0, 0x2F800..0x2FA1D, 0x30000..0x3134A
   ].freeze
 
-  # The emoji subset of WIDE (excludes CJK/Hangul/Kana/fullwidth): these render
-  # in colour when a colour font provides them. Digits, '#', '*' etc. are not
-  # here, so they stay as ordinary text even though Noto maps colour keycaps.
+  # Emoji code blocks (excludes CJK/Hangul/Kana/fullwidth): a codepoint renders
+  # in colour only if it is BOTH in one of these blocks AND wide (width 2) —
+  # see emoji?. The width-2 gate is what distinguishes emoji-presentation
+  # codepoints (⚡ U+26A1, ✨ U+2728 — colour, width 2) from text-presentation
+  # dingbats that merely share a block (❤ U+2764, ✔ U+2714, ⚠ U+26A0 — width 1).
+  # Both properties derive from the same Unicode Emoji_Presentation flag, so
+  # this is not "width deciding colour": rather, colour is the subset of these
+  # blocks that is wide enough to render a square colour glyph without spilling
+  # into the next cell. Digits, '#', '*' are absent, so they stay ordinary text
+  # even though Noto maps colour keycaps.
   EMOJI = [
     0x231A..0x232A, 0x23E9..0x23F3, 0x25FD..0x27BF, 0x2B1B..0x2B55,
     0x1F18E..0x1F19A, 0x1F200..0x1F265, 0x1F300..0x1F5A4, 0x1F5FB..0x1F6FC,
@@ -40,18 +82,22 @@ module CharWidth
 
   module_function
 
-  # Number of terminal cells a codepoint occupies (1 or 2).
+  # Number of terminal cells a codepoint occupies (0, 1 or 2).
   def width(cp)
-    return 1 if cp < 0x1100      # fast path: ASCII/Latin and most text
+    return 1 if cp < 0x0300      # fast path: ASCII/Latin-1 (no combining below)
+    return 0 if in_ranges?(ZERO, cp)
+    return 1 if cp < 0x1100      # fast path: most other text
     in_ranges?(WIDE, cp) ? 2 : 1
   end
 
   def wide?(cp) = width(cp) == 2
 
   # Whether a codepoint should render as a colour emoji (when the font has it).
+  # Gated to width-2 emoji: a colour glyph is rasterised square (~2 cells wide),
+  # so colouring a width-1 cell would overflow and corrupt the next column.
   def emoji?(cp)
     return false if cp < 0x231A
-    in_ranges?(EMOJI, cp)
+    in_ranges?(EMOJI, cp) && width(cp) == 2
   end
 
   # Binary search over a sorted array of non-overlapping ranges.

data/lib/rubyterm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class RubyTerm
-  VERSION = "0.2.2"
+  VERSION = "0.2.5"
 end

data/lib/term.rb

@@ -115,6 +115,15 @@ class Term
     @buffer.clear   # the buffer (TrackChanges) also clears the backend
   end
 
+  # Cursor + charset save/restore, shared by DECSC/DECRC (ESC 7 / ESC 8) and
+  # DEC private modes 1048/1049. DECRC with no prior save defaults to the home
+  # position and default charsets rather than leaving @x/@y nil (which would
+  # crash draw_cursor).
+  def save_cursor    = @saved = [@x, @y, @gl, @gr, @g.dup]
+  def restore_cursor
+    @x, @y, @gl, @gr, @g = @saved || [0, 0, 0, nil, [DefaultCharset, nil, nil, nil]]
+  end
+
   # RIS - Reset to Initial State (ESC c). Full reset: restore margins,
   # modes, charsets, tab stops and attributes to their defaults, home the
   # cursor and clear the screen.
@@ -408,6 +417,16 @@ class Term
           # FIXME: Save/restore
           # FIXME: Scrollback should be disabled/enabled.
           clear_screen
+        when 1048
+          # Save (h) / restore (l) cursor, as DECSC / DECRC.
+          set ? save_cursor : restore_cursor
+        when 1049
+          # Alternate screen + cursor save/restore. Like mode 47 this
+          # terminal has no separate alt buffer yet, so it just clears; the
+          # cursor save (on enter) / restore (on leave) is what apps rely on
+          # to land the cursor back where it was before the alt screen.
+          set ? save_cursor : restore_cursor
+          clear_screen
 
         # Extended mouse modes
         # See https://terminalguide.namepad.de/mouse/
@@ -546,6 +565,11 @@ class Term
       return if ch == 127   # DEL is ignored in the data stream
 
       cw = CharWidth.width(ch)
+      # Zero-width codepoints (variation selectors like U+FE0F, combining marks,
+      # zero-width joiners) modify the preceding glyph. This buffer stores one
+      # codepoint per cell and can't compose, so drop them rather than letting
+      # them claim a cell of their own — which would paint over the next column.
+      return if cw == 0
       # A double-width glyph can't straddle the right margin: if only one
       # column is left, blank it and wrap so the glyph starts the next line.
       if cw == 2 && @wraparound && @x == line_width - 1
@@ -596,12 +620,8 @@ class Term
     when ")B"; @g[1] = DefaultCharset
     when "(0"; @g[0] = GraphicsCharset
     when ")0"; @g[1] = GraphicsCharset
-    when "7";  @saved = [@x,@y,@gl,@gr,@g.dup]
-    when "8"
-      # DECRC with no prior DECSC: default to home position and default
-      # charsets rather than leaving @x/@y nil (which crashes draw_cursor).
-      sx, sy, sgl, sgr, sg = @saved || [0, 0, 0, nil, [DefaultCharset, nil, nil, nil]]
-      @x, @y, @gl, @gr, @g = sx, sy, sgl, sgr, sg
+    when "7";  save_cursor    # DECSC
+    when "8";  restore_cursor # DECRC
     else
       unhandled(:escape, s)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyterm
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-22 00:00:00.000000000 Z
+date: 2026-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pure-x11
@@ -95,6 +95,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- bin/record
 - bin/rubyterm
 - example-config.toml
 - lib/ansibackend.rb