rcurses 3.0 → 3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 706550c12ee9965c33b958c6ce4ec5cb0aa12fb37196b4dd623cea43b982528f
-  data.tar.gz: 17e20e12a50a34f2d36069041b3f1dfbedbf27ab7dddf8f3681fd8b289e6fe00
+  metadata.gz: 79ceb9c8cca6e61988655c520a5b43f5f2a37b95f9c3064b59cefa962795b751
+  data.tar.gz: 67ad97d3a492318eff06f393eb4366d575b1cf2de2bc471b02b15a12d3505aaf
 SHA512:
-  metadata.gz: 68fe3d1c80b12fae7ad09b49efdec40a889bf36f6d269e68ab09971bf9f057874ac122cff4d1c08c9b0673e13e65857c98e9e888977138a1c51a385544520901
-  data.tar.gz: aa6d784ef29afbb0b5e09ada56b2caadf2b474e0bf909eaa92dc161f88d6d1e6c33424d3c1ed2c407148d9ce502bd5563bf1eb1118e3b2a7a15444df18494a89
+  metadata.gz: b0a668847e6b6f276ed5ee059d3e194184f4313556316ab3c80604d63cc8b99e5a733559b8e6e97da90c6fa2191ecdfc5b15e6639c41caa577f8810b0da87b77
+  data.tar.gz: 95a8a6b48bc7399121b50b3cbeae29631feab2b76a537a93c585bf9e654492e8bebbb30bb881b6b8522ec17866209c657a133511d500cdcdb589d17b2a3585c4

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
@@ -8,22 +37,25 @@ module Rcurses
     attr_accessor :moreup, :moredown
 
     def initialize(x = 1, y = 1, w = 1, h = 1, fg = nil, bg = nil)
+      @max_h, @max_w = IO.console.winsize
       @x       = x
       @y       = y
       @w       = w
       @h       = h
       @fg, @bg = fg, bg
-      @text    = ""              # Initialize text variable
-      @align   = "l"             # Default alignment
-      @scroll  = true            # Enable scroll indicators
-      @prompt  = ""              # Prompt for editline
-      @ix      = 0               # Starting text line index
-      @max_h, @max_w = IO.console.winsize
+      @text    = ""     # Initialize text variable
+      @align   = "l"    # Default alignment
+      @scroll  = true   # Enable scroll indicators
+      @prompt  = ""     # Prompt for editline
+      @ix      = 0      # Starting text line index
+      @prev_frame = nil # Holds the previously rendered frame (array of lines)
+      @line = 0         # For cursor tracking during editing:
+      @pos  = 0         # For cursor tracking during editing:
     end
 
-    def move(x, y)
-      @x += x
-      @y += y
+    def move(dx, dy)
+      @x += dx
+      @y += dy
       refresh
     end
 
@@ -74,11 +106,13 @@ module Rcurses
       refresh
     end
 
-    # Optimized refresh using double buffering to minimize flicker.
+    # Diff-based refresh that minimizes flicker.
+    # (This is your previously best-working code.)
+    # We have removed scroll marker insertion from within the double-buffered frame.
+    # Instead, after printing the frame we reprint the right border column.
     def refresh(cont = @text)
       @max_h, @max_w = IO.console.winsize
 
-      # Adjust pane dimensions (unchanged logic)
       if @border
         @w = @max_w - 2 if @w > @max_w - 2
         @h = @max_h - 2 if @h > @max_h - 2
@@ -91,24 +125,24 @@ 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
 
-      # Hide cursor and switch to alternate screen buffer (if desired). Hide it any case and use Curses.show to bring it back.
-      # Note: The alternate screen buffer means your program’s output won’t mix with the normal terminal content.
-      STDOUT.print "\e[?25l"  # hide cursor
-      # Uncomment the next line to use the alternate screen buffer.
-      #STDOUT.print "\e[?1049h"
-
-      buf = ""
-      buf << "\e[#{@y};#{@x}H"  # Move cursor to start of pane.
       fmt = [@fg, @bg].compact.join(',')
       @txt = cont.split("\n")
       @txt = textformat(cont) if @txt.any? { |line| line.pure.length >= @w }
       @ix = @txt.length - 1 if @ix > @txt.length - 1
       @ix = 0 if @ix < 0
 
-      @h.times do |i|
+      new_frame = []
+      if @border
+        top_border = ("┌" + "─" * @w + "┐").c(fmt)
+        new_frame << top_border
+      end
+
+      content_rows = @h
+      content_rows.times do |i|
+        line_str = ""
         l = @ix + i
         if @txt[l].to_s != ""
           pl = @w - @txt[l].pure.length
@@ -116,53 +150,65 @@ module Rcurses
           hl = pl / 2
           case @align
           when "l"
-            buf << @txt[l].c(fmt) << " ".c(fmt) * pl
+            line_str = @txt[l].c(fmt) + " ".c(fmt) * pl
           when "r"
-            buf << " ".c(fmt) * pl << @txt[l].c(fmt)
+            line_str = " ".c(fmt) * pl + @txt[l].c(fmt)
           when "c"
-            buf << " ".c(fmt) * hl << @txt[l].c(fmt) << " ".c(fmt) * (pl - hl)
+            line_str = " ".c(fmt) * hl + @txt[l].c(fmt) + " ".c(fmt) * (pl - hl)
           end
         else
-          buf << " ".c(fmt) * @w
+          line_str = " ".c(fmt) * @w
         end
-        buf << "\e[#{@y + i + 1};#{@x}H"  # Next line.
-      end
 
-      # Draw scroll markers.
-      if @ix > 0 and @scroll
-        buf << "\e[#{@y};#{@x + @w - 1}H" << "∆".c(fmt)
-        @moreup = true
-      else
-        @moreup = false
-      end
+        if @border
+          line_str = "│" + line_str + "│"
+        end
 
-      if @txt.length - @ix > @h and @scroll
-        buf << "\e[#{@y + @h - 1};#{@x + @w - 1}H" << "∇".c(fmt)
-        @moredown = true
-      else
-        @moredown = false
+        new_frame << line_str
       end
 
-      # Draw border if enabled.
       if @border
-        buf << "\e[#{@y - 1};#{@x - 1}H" << ("┌" + "─" * @w + "┐").c(fmt)
-        @h.times do |i|
-          buf << "\e[#{@y + i};#{@x - 1}H" << "│".c(fmt)
-          buf << "\e[#{@y + i};#{@x + @w}H" << "│".c(fmt)
-        end
-        buf << "\e[#{@y + @h};#{@x - 1}H" << ("└" + "─" * @w + "┘").c(fmt)
+        bottom_border = ("└" + "─" * @w + "┘").c(fmt)
+        new_frame << bottom_border
       end
 
-      # Restore original cursor position.
-      buf << "\e[#{o_row};#{o_col}H"
+      diff_buf = ""
+      new_frame.each_with_index do |line, i|
+        row_num = @border ? (@y - 1 + i) : (@y + i)
+        col_num = @border ? (@x - 1) : @x
+        if @prev_frame.nil? || @prev_frame[i] != line ||
+           (@border && (i == 0 || i == new_frame.size - 1))
+          diff_buf << "\e[#{row_num};#{col_num}H" << line
+        end
+      end
 
-      # Print the whole buffer at once.
-      print buf
+      diff_buf << "\e[#{o_row};#{o_col}H"
+      print diff_buf
+      #STDOUT.print "\e[?25h"  # We leave the cursor hidden unless explicitly shown
+      @prev_frame = new_frame
+
+      # Now, after printing the frame, draw the scroll markers separately.
+      if @scroll
+        # Use the same marker column as before.
+        marker_col = @border ? (@x + @w - 1) : (@x + @w - 1)
+        # Draw top marker at row = @y + 1 (inside the frame)
+        if @ix > 0
+          print "\e[#{@y};#{marker_col}H" + "∆".c(fmt)
+        end
+        # Draw bottom marker at row = @y + @h - 1 (inside the frame)
+        if (@txt.length - @ix) > @h
+          print "\e[#{@y + @h - 1};#{marker_col}H" + "∇".c(fmt)
+        end
+      end
 
-      # Uncomment the next line to switched to the alternate screen buffer.
-      #STDOUT.print "\e[?1049l"
+      # Now, reprint the right border column for each content line to fill any holes.
+      if @border
+        (0...@h).each do |i|
+          print "\e[#{@y + i};#{@x + @w}H" + "│".c(fmt)
+        end
+      end
 
-      @txt
+      new_frame.join("\n")
     end
 
     def textformat(cont)
@@ -439,7 +485,7 @@ module Rcurses
     def calculate_posx
       total_length = 0
       (@ix + @line).times do |i|
-        total_length += @txt[i].pure.length + 1  # +1 for the newline
+        total_length += @txt[i].pure.length + 1  # +1 for newline
       end
       total_length += @pos
       total_length
@@ -516,4 +562,3 @@ module Rcurses
     end
   end
 end
-

data/lib/rcurses.rb

@@ -5,7 +5,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rcurses
 # License:    Public domain
-# Version:    3.0: Flicker reduction by double screen buffer
+# Version:    3.2: Fixed scroll markers and UTF-8 double-wide characters breaking borders
 
 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.0'
+  version: '3.2'
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-02 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.0: Flicker reduction by
-  double screen buffer.'
+  in panes. Cursor movement around the terminal. New in 3.2: Fixed scroll markers
+  and UTF-8 double-wide characters breaking borders.'
 email: g@isene.com
 executables: []
 extensions: []