rcurses 3.1 → 3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07bf042dcaa49e65d87441e77e32cb04f6d8738abe081979bc8589966b2ec65f
-  data.tar.gz: 234ad19f3e79216d0dd0561e2cfbb43318d7f308c596ab2a847eeda6fefe9563
+  metadata.gz: 79ceb9c8cca6e61988655c520a5b43f5f2a37b95f9c3064b59cefa962795b751
+  data.tar.gz: 67ad97d3a492318eff06f393eb4366d575b1cf2de2bc471b02b15a12d3505aaf
 SHA512:
-  metadata.gz: d8d764879351431d6057dd1fa573ca2bba3134c207c8c4f1ad4f511d1d12ca93c392e163401a9592c18b6af48f590d7509e510592f4191bf156c89c1c89d644a
-  data.tar.gz: 8ffe0551b49238aa84ef6811d140c398a96736c92f77afd10afd0116431d6856d6472f619345b96827391a9b83d152965704f586119bcd56410b626100da71e1
+  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
@@ -78,12 +107,12 @@ 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.
+    # (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 and positions.
       if @border
         @w = @max_w - 2 if @w > @max_w - 2
         @h = @max_h - 2 if @h > @max_h - 2
@@ -96,9 +125,7 @@ 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(',')
@@ -107,15 +134,12 @@ module Rcurses
       @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 = ""
@@ -136,37 +160,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,9 +184,30 @@ 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
-
+      #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
+
+      # 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
+
       new_frame.join("\n")
     end
 
@@ -533,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.1: Flicker reduction by diff rendering
+# 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.1'
+  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.1: Flicker reduction by
-  diff rendering.'
+  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: []