rcurses 5.0.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff839fa4bfa8b545649ea90177a931c9fbb445a42b44627579772dc853461106
-  data.tar.gz: b4182b2b2e8829959de75e85c551440cf43e534eae34dc719947c7f0315b793b
+  metadata.gz: 8be17e6f76652103c068e4299b2c0bb1818ae74512aaff66e09362cdf10fecbf
+  data.tar.gz: 13ebe397820e760f3059bd6df1acfea80c1765e8c7ac66bc00caeb09786119f4
 SHA512:
-  metadata.gz: 72f4617b7fdb711a536721626605e996b068dcfcebb02ba8f4244fc333d177fe8130fa37a55d6887d343bd6b8948b1b385f26c4e1de6bd7edc76e910f209e6e9
-  data.tar.gz: f5921342d7c0699c230e0ee7cfd3f3448e436e816bf9b7a5d8cad85efeaa81d0609af818a5cc8cd916ae5899e97416d155feb4eeaf24f567e0fa86b83a704769
+  metadata.gz: dfb744f2464d2e4529180c15851e71ce5f033a7495f96e1f6f9bdaf1aaf7e4c6b788bd1164cdc7536a4ab740c3ac3e6348721712787ede4f09e021c958f5fffe
+  data.tar.gz: b54c0bf4e06484eed793bf07ed779427357b6635a7008e8ac12fe8318715631697cf7ddc8ca18f3aa71a73b8d327df369e5b670aed0582ede49a5ebef36e6dfe

data/README.md

@@ -10,8 +10,15 @@ Here's a somewhat simple example of a TUI program using rcurses: The [T-REX](htt
 
 And here's a much more involved example: The [RTFM](https://github.com/isene/RTFM) terminal file manager.
 
-# NOTE: Version 4.5 gives full RGB support in addition to 256-colors
-Just write a color as a string - e.g. `"d533e0"` for a hexadecimal RGB color (or use the terminal 256 colors by supplying an integer in the range 0-255)
+# NOTE: Version 5.0.0 brings major improvements!
+- **Memory leak fixes** - Better memory management and history limits
+- **Terminal state protection** - Proper terminal restoration on crashes
+- **Enhanced Unicode support** - Better handling of CJK characters and emojis
+- **Error handling improvements** - More robust operation in edge cases
+- **Performance optimizations** - Maintains the speed of version 4.8.3
+- **Full backward compatibility** - All existing applications work unchanged
+
+Version 4.5 gave full RGB support in addition to 256-colors. Just write a color as a string - e.g. `"d533e0"` for a hexadecimal RGB color (or use the terminal 256 colors by supplying an integer in the range 0-255)
 
 # Why?
 Having struggled with the venerable curses library and the ruby interface to it for many years, I finally got around to write an alternative - in pure Ruby.
@@ -92,6 +99,7 @@ full_refresh   | Refreshes/redraws the Pane with content completely (without dif
 edit           | An editor for the Pane. When this is invoked, all existing font dressing is stripped and the user gets to edit the raw text. The user can add font effects similar to Markdown; Use an asterisk before and after text to be drawn in bold, text between forward-slashes become italic, and underline before and after text means the text will be underlined, a hash-sign before and after text makes the text reverse colored. You can also combine a whole set of dressings in this format: `<23,245,biurl\|Hello World!>` - this will make "Hello World!" print in the color 23 with the background color 245 (regardless of the Pane's fg/bg setting) in bold, italic, underlined, reversed colored and blinking. Hitting `ESC` while in edit mode will disregard the edits, while `Ctrl-S` will save the edits
 editline       | Used for one-line Panes. It will print the content of the property `prompt` and then the property `text` that can then be edited by the user. Hitting `ESC` will disregard the edits, while `ENTER` will save the edited text
 clear          | Clears the pane
+cleanup        | Cleans up pane memory (history, caches) - useful for memory management
 say(text)      | Short form for setting panel.text, then doing a refresh of that panel
 ask(prompt,text) | Short form of setting panel.prompt, then panel.text, doing a panel.editline and then returning panel.text
 pagedown       | Scroll down one page height in the text (minus one line), but not longer than the length of the text

data/lib/rcurses/input.rb

@@ -8,6 +8,7 @@ module Rcurses
         rescue Timeout::Error
           return nil
         end
+        
 
         # 2) If it's ESC, grab any quick trailing bytes
         seq = c
@@ -19,6 +20,8 @@ module Rcurses
             end
           end
         end
+        
+        
 
         # 3) Single ESC alone
         return "ESC" if seq == "\e"
@@ -38,6 +41,11 @@ module Rcurses
         if m = seq.match(/\A\e\[\d+;2([ABCD])\z/)
           return { 'A' => "S-UP", 'B' => "S-DOWN", 'C' => "S-RIGHT", 'D' => "S-LEFT" }[m[1]]
         end
+        
+        # 6b) CSI style ctrl-arrows (e.g. ESC [1;5A )
+        if m = seq.match(/\A\e\[\d+;5([ABCD])\z/)
+          return { 'A' => "C-UP", 'B' => "C-DOWN", 'C' => "C-RIGHT", 'D' => "C-LEFT" }[m[1]]
+        end
 
         # 7) Plain arrows
         if m = seq.match(/\A\e\[([ABCD])\z/)
@@ -66,13 +74,17 @@ module Rcurses
                 end
         end
 
-        # 9) SS3 function keys F1-F4
+        # 9) SS3 function keys F1-F4 and Ctrl+arrows
         if seq.start_with?("\eO") && seq.length == 3
           return case seq[2]
                 when 'P' then "F1"
                 when 'Q' then "F2"
                 when 'R' then "F3"
                 when 'S' then "F4"
+                when 'a' then "C-UP"      # Some terminals send ESC O a for Ctrl+Up
+                when 'b' then "C-DOWN"    # Some terminals send ESC O b for Ctrl+Down
+                when 'c' then "C-RIGHT"   # Some terminals send ESC O c for Ctrl+Right
+                when 'd' then "C-LEFT"    # Some terminals send ESC O d for Ctrl+Left
                 else ""
                 end
         end

data/lib/rcurses/pane.rb

@@ -9,7 +9,7 @@ module Rcurses
     attr_accessor :record, :history
 
     def initialize(x = 1, y = 1, w = 1, h = 1, fg = nil, bg = nil)
-      @max_h, @max_w = IO.console.winsize
+      @max_h, @max_w = IO.console ? IO.console.winsize : [24, 80]
       @x          = x
       @y          = y
       @w          = w
@@ -198,6 +198,10 @@ module Rcurses
       STDOUT.print "\e[?25l\e[?7l\e[0m\e[r"
 
       fmt = [@fg.to_s, @bg.to_s].join(',')
+      
+      # Skip color application if fg and bg are both nil or empty
+      @skip_colors = (@fg.nil? && @bg.nil?) || (fmt == ",")
+      
 
       # Lazy evaluation: If the content or pane width has changed, reinitialize the lazy cache.
       if !defined?(@cached_text) || @cached_text != cont || @cached_w != @w
@@ -251,16 +255,31 @@ module Rcurses
           pl = @w - Rcurses.display_width(@txt[l].pure)
           pl = 0 if pl < 0
           hl = pl / 2
-          case @align
-          when "l"
-            line_str = @txt[l].c(fmt) + " ".c(fmt) * pl
-          when "r"
-            line_str = " ".c(fmt) * pl + @txt[l].c(fmt)
-          when "c"
-            line_str = " ".c(fmt) * hl + @txt[l].c(fmt) + " ".c(fmt) * (pl - hl)
+          # Skip color application if pane has no colors set or text has ANY ANSI codes
+          if @skip_colors || @txt[l].include?("\e[")
+            # Don't apply pane colors - text already has ANSI sequences
+            case @align
+            when "l"
+              line_str = @txt[l] + " " * pl
+            when "r"
+              line_str = " " * pl + @txt[l]
+            when "c"
+              line_str = " " * hl + @txt[l] + " " * (pl - hl)
+            end
+          else
+            # Apply pane colors normally
+            case @align
+            when "l"
+              line_str = @txt[l].c(fmt) + " ".c(fmt) * pl
+            when "r"
+              line_str = " ".c(fmt) * pl + @txt[l].c(fmt)
+            when "c"
+              line_str = " ".c(fmt) * hl + @txt[l].c(fmt) + " ".c(fmt) * (pl - hl)
+            end
           end
         else
-          line_str = " ".c(fmt) * @w
+          # Empty line - only apply colors if pane has them
+          line_str = @skip_colors ? " " * @w : " ".c(fmt) * @w
         end
 
         new_frame << line_str
@@ -278,6 +297,16 @@ module Rcurses
       # restore wrap, then also reset SGR and scroll-region one more time
       diff_buf << "\e[#{o_row};#{o_col}H\e[?7h\e[0m\e[r"
       begin
+        # Debug: check what's actually being printed
+        if diff_buf.include?("Purpose") && diff_buf.include?("[38;5;")
+          File.open("/tmp/rcurses_debug.log", "a") do |f|
+            f.puts "=== PRINT DEBUG ==="
+            f.puts "diff_buf sample: #{diff_buf[0..200].inspect}"
+            f.puts "Has escape byte 27: #{diff_buf.bytes.include?(27)}"
+            f.puts "Escape count: #{diff_buf.bytes.count(27)}"
+          end
+        end
+        
         print diff_buf
       rescue => e
         # If printing fails, at least try to restore terminal state
@@ -640,34 +669,94 @@ module Rcurses
       begin
         return [""] if line.nil? || w <= 0
         
-        open_sequences = {
-          "\e[1m" => "\e[22m",
-          "\e[3m" => "\e[23m",
-          "\e[4m" => "\e[24m",
-          "\e[5m" => "\e[25m",
-          "\e[7m" => "\e[27m"
-        }
-        close_sequences = open_sequences.values + ["\e[0m"]
         ansi_regex = /\e\[[0-9;]*m/
         result = []
         tokens = line.scan(/(\e\[[0-9;]*m|[^\e]+)/).flatten.compact
         current_line = ''
         current_line_length = 0
-        active_sequences = []
+        
+        # Track SGR state properly
+        sgr_state = {
+          bold: false,      # 1/22
+          italic: false,    # 3/23  
+          underline: false, # 4/24
+          blink: false,     # 5/25
+          reverse: false,   # 7/27
+          fg_color: nil,    # 38/39 (nil means default)
+          bg_color: nil     # 48/49 (nil means default)
+        }
+        
+        # Helper to parse SGR parameters
+        parse_sgr = lambda do |sequence|
+          return unless sequence =~ /\e\[([0-9;]*)m/
+          param_str = $1
+          params = param_str.empty? ? [0] : param_str.split(';').map(&:to_i)
+          i = 0
+          while i < params.length
+            case params[i]
+            when 0  # Reset all
+              sgr_state[:bold] = false
+              sgr_state[:italic] = false
+              sgr_state[:underline] = false
+              sgr_state[:blink] = false
+              sgr_state[:reverse] = false
+              sgr_state[:fg_color] = nil
+              sgr_state[:bg_color] = nil
+            when 1  then sgr_state[:bold] = true
+            when 3  then sgr_state[:italic] = true
+            when 4  then sgr_state[:underline] = true
+            when 5  then sgr_state[:blink] = true
+            when 7  then sgr_state[:reverse] = true
+            when 22 then sgr_state[:bold] = false
+            when 23 then sgr_state[:italic] = false
+            when 24 then sgr_state[:underline] = false
+            when 25 then sgr_state[:blink] = false
+            when 27 then sgr_state[:reverse] = false
+            when 38 # Foreground color
+              if params[i+1] == 5 && params[i+2]  # 256 color
+                sgr_state[:fg_color] = "38;5;#{params[i+2]}"
+                i += 2
+              elsif params[i+1] == 2 && params[i+4]  # RGB color
+                sgr_state[:fg_color] = "38;2;#{params[i+2]};#{params[i+3]};#{params[i+4]}"
+                i += 4
+              end
+            when 39 then sgr_state[:fg_color] = nil  # Default foreground
+            when 48 # Background color
+              if params[i+1] == 5 && params[i+2]  # 256 color
+                sgr_state[:bg_color] = "48;5;#{params[i+2]}"
+                i += 2
+              elsif params[i+1] == 2 && params[i+4]  # RGB color
+                sgr_state[:bg_color] = "48;2;#{params[i+2]};#{params[i+3]};#{params[i+4]}"
+                i += 4
+              end
+            when 49 then sgr_state[:bg_color] = nil  # Default background
+            # Handle legacy 8-color codes (30-37, 40-47, 90-97, 100-107)
+            when 30..37 then sgr_state[:fg_color] = params[i].to_s
+            when 40..47 then sgr_state[:bg_color] = params[i].to_s
+            when 90..97 then sgr_state[:fg_color] = params[i].to_s
+            when 100..107 then sgr_state[:bg_color] = params[i].to_s
+            end
+            i += 1
+          end
+        end
+        
+        # Helper to reconstruct SGR sequence from state
+        build_sgr = lambda do
+          codes = []
+          codes << "1" if sgr_state[:bold]
+          codes << "3" if sgr_state[:italic]
+          codes << "4" if sgr_state[:underline]
+          codes << "5" if sgr_state[:blink]
+          codes << "7" if sgr_state[:reverse]
+          codes << sgr_state[:fg_color] if sgr_state[:fg_color]
+          codes << sgr_state[:bg_color] if sgr_state[:bg_color]
+          codes.empty? ? "" : "\e[#{codes.join(';')}m"
+        end
         
         tokens.each do |token|
           if token.match?(ansi_regex)
             current_line << token
-            if close_sequences.include?(token)
-              if token == "\e[0m"
-                active_sequences.clear
-              else
-                corresponding_open = open_sequences.key(token)
-                active_sequences.delete(corresponding_open)
-              end
-            else
-              active_sequences << token
-            end
+            parse_sgr.call(token)
           else
             words = token.scan(/\s+|\S+/)
             words.each do |word|
@@ -679,7 +768,8 @@ module Rcurses
                 else
                   if current_line_length > 0
                     result << current_line
-                    current_line = active_sequences.join
+                    # Start new line with current SGR state
+                    current_line = build_sgr.call
                     current_line_length = 0
                   end
                   while word_length > w
@@ -688,7 +778,8 @@ module Rcurses
                     result << current_line
                     word = word[[w, word.length].min..-1] || ""
                     word_length = Rcurses.display_width(word.gsub(ansi_regex, ''))
-                    current_line = active_sequences.join
+                    # Start new line with current SGR state
+                    current_line = build_sgr.call
                     current_line_length = 0
                   end
                   if word_length > 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcurses
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-03 00:00:00.000000000 Z
+date: 2025-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard