rcurses 3.1 → 3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07bf042dcaa49e65d87441e77e32cb04f6d8738abe081979bc8589966b2ec65f
-  data.tar.gz: 234ad19f3e79216d0dd0561e2cfbb43318d7f308c596ab2a847eeda6fefe9563
+  metadata.gz: c115cb970dc679cf90286b3881c0543de420c76930fe25ae63adf224433f6c62
+  data.tar.gz: d837ebda76384152815d687fd614ad41b48e8a7af4c131f125e1b4ad293b02bf
 SHA512:
-  metadata.gz: d8d764879351431d6057dd1fa573ca2bba3134c207c8c4f1ad4f511d1d12ca93c392e163401a9592c18b6af48f590d7509e510592f4191bf156c89c1c89d644a
-  data.tar.gz: 8ffe0551b49238aa84ef6811d140c398a96736c92f77afd10afd0116431d6856d6472f619345b96827391a9b83d152965704f586119bcd56410b626100da71e1
+  metadata.gz: e9733a2dc05ac13ec49cd8bbd21681da9b0436f845d0a66256e30dc23c5038fb11f25b225174a0b9b008ebb1f0ea5f01a4a8e6571496e4119553ed8f895d2966
+  data.tar.gz: 0fde756777022b0606a041ddecaf3f1e44ef00b2e7f099f09ef25ca1c3fb3b18eaf8f067cccc2debf6c216efcee2c01d875cc2f865a59d36f19845deaec134c6

data/lib/rcurses/pane.rb

@@ -1,4 +1,33 @@
 module Rcurses
+  # A simple display_width function that approximates how many columns a string occupies.
+  # This is a simplified version that may need adjustments for full Unicode support.
+  def self.display_width(str)
+    width = 0
+    str.each_char do |char|
+      cp = char.ord
+      if cp == 0
+        # NUL – no width
+      elsif cp < 32 || (cp >= 0x7F && cp < 0xA0)
+        # Control characters: no width
+        width += 0
+      # Approximate common wide ranges:
+      elsif (cp >= 0x1100 && cp <= 0x115F) ||
+            cp == 0x2329 || cp == 0x232A ||
+            (cp >= 0x2E80 && cp <= 0xA4CF) ||
+            (cp >= 0xAC00 && cp <= 0xD7A3) ||
+            (cp >= 0xF900 && cp <= 0xFAFF) ||
+            (cp >= 0xFE10 && cp <= 0xFE19) ||
+            (cp >= 0xFE30 && cp <= 0xFE6F) ||
+            (cp >= 0xFF00 && cp <= 0xFF60) ||
+            (cp >= 0xFFE0 && cp <= 0xFFE6)
+        width += 2
+      else
+        width += 1
+      end
+    end
+    width
+  end
+
   class Pane
     require 'clipboard'  # Ensure the 'clipboard' gem is installed
     include Cursor
@@ -78,12 +107,10 @@ module Rcurses
     end
 
     # Diff-based refresh that minimizes flicker.
-    # Building a frame (an array of lines) that includes borders (if enabled).
-    # Content lines are wrapped in vertical border characters when @border is true.
+    # In this updated version we lazily process only the raw lines required to fill the pane.
     def refresh(cont = @text)
       @max_h, @max_w = IO.console.winsize
 
-      # Adjust pane dimensions and positions.
       if @border
         @w = @max_w - 2 if @w > @max_w - 2
         @h = @max_h - 2 if @h > @max_h - 2
@@ -96,27 +123,45 @@ module Rcurses
         @y = 1 if @y < 1; @y = @max_h - @h + 1 if @y + @h > @max_h + 1
       end
 
-      # Save current cursor position.
       o_row, o_col = pos
-
       STDOUT.print "\e[?25l"  # Hide cursor
 
       fmt = [@fg, @bg].compact.join(',')
-      @txt = cont.split("\n")
-      @txt = textformat(cont) if @txt.any? { |line| line.pure.length >= @w }
+
+      # Lazy evaluation: If the content or pane width has changed, reinitialize the lazy cache.
+      if !defined?(@cached_text) || @cached_text != cont || @cached_w != @w
+        @raw_txt   = cont.split("\n")
+        @lazy_txt  = []   # This will hold the processed (wrapped) lines as needed.
+        @lazy_index = 0   # Pointer to the next raw line to process.
+        @cached_text = cont
+        @cached_w = @w
+      end
+
+      content_rows = @h
+      # Ensure we have processed enough lines for the current scroll position + visible area.
+      required_lines = @ix + content_rows
+      while @lazy_txt.size < required_lines && @lazy_index < @raw_txt.size
+        raw_line = @raw_txt[@lazy_index]
+        # If the raw line is short, no wrapping is needed.
+        if raw_line.respond_to?(:pure) && raw_line.pure.length < @w
+          processed = [raw_line]
+        else
+          processed = split_line_with_ansi(raw_line, @w)
+        end
+        @lazy_txt.concat(processed)
+        @lazy_index += 1
+      end
+      @txt = @lazy_txt
+
       @ix = @txt.length - 1 if @ix > @txt.length - 1
       @ix = 0 if @ix < 0
 
-      # Build the new frame as an array of strings.
       new_frame = []
       if @border
-        # Top border spans (@w + 2) characters.
         top_border = ("┌" + "─" * @w + "┐").c(fmt)
         new_frame << top_border
       end
 
-      # Build content lines.
-      content_rows = @h
       content_rows.times do |i|
         line_str = ""
         l = @ix + i
@@ -136,37 +181,21 @@ module Rcurses
           line_str = " ".c(fmt) * @w
         end
 
-        # If border is enabled, add vertical border characters.
         if @border
           line_str = "│" + line_str + "│"
         end
 
-        # Add scroll markers (overwrite the last character) if needed.
-        if i == 0 and @ix > 0 and @scroll
-          line_str[-1] = "∆".c(fmt)
-          @moreup = true
-        elsif i == content_rows - 1 and @txt.length - @ix > @h and @scroll
-          line_str[-1] = "∇".c(fmt)
-          @moredown = true
-        else
-          @moreup = false
-          @moredown = false
-        end
         new_frame << line_str
       end
 
       if @border
-        # Bottom border.
         bottom_border = ("└" + "─" * @w + "┘").c(fmt)
         new_frame << bottom_border
       end
 
-      # Diff-based update: update only lines that changed.
       diff_buf = ""
       new_frame.each_with_index do |line, i|
-        # Determine row number:
         row_num = @border ? (@y - 1 + i) : (@y + i)
-        # When border is enabled, all lines (including content) start at column (@x - 1)
         col_num = @border ? (@x - 1) : @x
         if @prev_frame.nil? || @prev_frame[i] != line ||
            (@border && (i == 0 || i == new_frame.size - 1))
@@ -176,13 +205,33 @@ module Rcurses
 
       diff_buf << "\e[#{o_row};#{o_col}H"
       print diff_buf
-      #STDOUT.print "\e[?25h"  # Show cursor - but use Cursor.show instead if needed
-
       @prev_frame = new_frame
+
+      # Draw scroll markers after printing the frame.
+      if @scroll
+        marker_col = @border ? (@x + @w - 1) : (@x + @w - 1)
+        if @ix > 0
+          print "\e[#{@y};#{marker_col}H" + "∆".c(fmt)
+        end
+        # If there are more processed lines than fit in the pane
+        # OR there remain raw lines to process, show the down marker.
+        if (@txt.length - @ix) > @h || (@lazy_index < @raw_txt.size)
+          print "\e[#{@y + @h - 1};#{marker_col}H" + "∇".c(fmt)
+        end
+      end
+
+      if @border
+        (0...@h).each do |i|
+          print "\e[#{@y + i};#{@x + @w}H" + "│".c(fmt)
+        end
+      end
+
       new_frame.join("\n")
     end
 
     def textformat(cont)
+      # This method is no longer used in refresh since we process lazily,
+      # but is kept here if needed elsewhere.
       lines = cont.split("\n")
       result = []
       lines.each do |line|

data/lib/rcurses.rb

@@ -5,7 +5,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rcurses
 # License:    Public domain
-# Version:    3.1: Flicker reduction by diff rendering
+# Version:    3.3: Faster rendering of pane content
 
 require 'io/console' # Basic gem for rcurses
 require 'io/wait'    # stdin handling

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcurses
 version: !ruby/object:Gem::Version
-  version: '3.1'
+  version: '3.3'
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -29,8 +29,8 @@ description: 'Create curses applications for the terminal easier than ever. Crea
   up text (in panes or anywhere in the terminal) in bold, italic, underline, reverse
   color, blink and in any 256 terminal colors for foreground and background. Use a
   simple editor to let users edit text in panes. Left, right or center align text
-  in panes. Cursor movement around the terminal. New in 3.1: Flicker reduction by
-  diff rendering.'
+  in panes. Cursor movement around the terminal. New in 3.3: Faster rendering of pane
+  content.'
 email: g@isene.com
 executables: []
 extensions: []