rcurses 3.0 → 3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 706550c12ee9965c33b958c6ce4ec5cb0aa12fb37196b4dd623cea43b982528f
-  data.tar.gz: 17e20e12a50a34f2d36069041b3f1dfbedbf27ab7dddf8f3681fd8b289e6fe00
+  metadata.gz: 07bf042dcaa49e65d87441e77e32cb04f6d8738abe081979bc8589966b2ec65f
+  data.tar.gz: 234ad19f3e79216d0dd0561e2cfbb43318d7f308c596ab2a847eeda6fefe9563
 SHA512:
-  metadata.gz: 68fe3d1c80b12fae7ad09b49efdec40a889bf36f6d269e68ab09971bf9f057874ac122cff4d1c08c9b0673e13e65857c98e9e888977138a1c51a385544520901
-  data.tar.gz: aa6d784ef29afbb0b5e09ada56b2caadf2b474e0bf909eaa92dc161f88d6d1e6c33424d3c1ed2c407148d9ce502bd5563bf1eb1118e3b2a7a15444df18494a89
+  metadata.gz: d8d764879351431d6057dd1fa573ca2bba3134c207c8c4f1ad4f511d1d12ca93c392e163401a9592c18b6af48f590d7509e510592f4191bf156c89c1c89d644a
+  data.tar.gz: 8ffe0551b49238aa84ef6811d140c398a96736c92f77afd10afd0116431d6856d6472f619345b96827391a9b83d152965704f586119bcd56410b626100da71e1

data/lib/rcurses/pane.rb

@@ -8,22 +8,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 +77,13 @@ module Rcurses
       refresh
     end
 
-    # Optimized refresh using double buffering to minimize flicker.
+    # 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.
     def refresh(cont = @text)
       @max_h, @max_w = IO.console.winsize
 
-      # Adjust pane dimensions (unchanged logic)
+      # 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
@@ -94,21 +99,26 @@ module Rcurses
       # Save current cursor position.
       o_row, o_col = pos
 
-      # 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"
+      STDOUT.print "\e[?25l"  # Hide cursor
 
-      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|
+      # 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
         if @txt[l].to_s != ""
           pl = @w - @txt[l].pure.length
@@ -116,53 +126,60 @@ 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 is enabled, add vertical border characters.
+        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
+        # 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
 
-      # 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.
+        bottom_border = ("└" + "─" * @w + "┘").c(fmt)
+        new_frame << bottom_border
       end
 
-      # Restore original cursor position.
-      buf << "\e[#{o_row};#{o_col}H"
-
-      # Print the whole buffer at once.
-      print buf
+      # 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))
+          diff_buf << "\e[#{row_num};#{col_num}H" << line
+        end
+      end
 
-      # Uncomment the next line to switched to the alternate screen buffer.
-      #STDOUT.print "\e[?1049l"
+      diff_buf << "\e[#{o_row};#{o_col}H"
+      print diff_buf
+      #STDOUT.print "\e[?25h"  # Show cursor - but use Cursor.show instead if needed
 
-      @txt
+      @prev_frame = new_frame
+      new_frame.join("\n")
     end
 
     def textformat(cont)
@@ -439,7 +456,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

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.1: Flicker reduction by diff rendering
 
 require 'io/console' # Basic gem for rcurses
 require 'io/wait'    # stdin handling

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rcurses
 version: !ruby/object:Gem::Version
-  version: '3.0'
+  version: '3.1'
 platform: ruby
 authors:
 - Geir Isene
@@ -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.1: Flicker reduction by
+  diff rendering.'
 email: g@isene.com
 executables: []
 extensions: []