rcurses 6.2.5 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed97ba200bc51c5599c78550f12429ffe8887c01b25a59b509a015b84be7a72
-  data.tar.gz: bfac1a426621f248c11adaca91916cdeed07caf2ed1e8a55319b4fff70ef6b32
+  metadata.gz: 60c52faf2a2b546871a48dc7a4275b474b5cd30a6c645ed5ec25acb738e59402
+  data.tar.gz: '094944dbfc0bdab94c1db6e8acc867e46f777973ee9ab92ae8263f4044c38754'
 SHA512:
-  metadata.gz: 2eb5ed84c91747596cd97c0563140502339ef2d92d65de3652e475d5d6b525affa993d6a98ec0a6f07b79db4c935a1d90ad99e401ecf9c8ffc12c065b4c1a8fb
-  data.tar.gz: de0fba662080514b3cb3db0750a5cd3cfe72b71ef5ec20aa4f303902823f62dd2d370154b16854d4fadaef41f5bcd7e97e5d3e2f71e4eece757f0f3765a3d119
+  metadata.gz: 38fe8fa0c2f06c5247d549d8bb5b955ac09e86a3327da9559694c898ff3a33d1c23ffb8fd5ff3a6b0ed83067bcecd7d68cbc2b97d22b12692988865a9481ff75
+  data.tar.gz: 365e95059cc92d724a91d0e394c9b5b2934c1454aff5e112608c6d7c93f2f89a9e0b291a16415be47778e88075018c0c59a6a9ee89b47bc2d3a3859f375bd093

data/lib/rcurses/general.rb

@@ -23,12 +23,12 @@ module Rcurses
         # Reset terminal
         print "\e[0m\e[?25h\e[?7h\e[r"
         STDOUT.flush
-      rescue
+      rescue StandardError
         # Fallback restoration
         begin
           STDIN.cooked! rescue nil
           STDIN.echo = true rescue nil
-        rescue
+        rescue StandardError
         end
       end
     end

data/lib/rcurses/pane.rb

@@ -159,20 +159,8 @@ module Rcurses
       bottom_row = @y + @h
 
       if @border
-        # Determine border characters based on environment
-        if ENV['RCURSES_BORDERS'] == 'ascii'
-          tl, tr, bl, br, h, v = '+', '+', '+', '+', '-', '|'
-        else
-          # Check if locale supports UTF-8
-          locale = ENV['LANG'] || ENV['LC_ALL'] || ENV['LC_CTYPE'] || ''
-          if locale.downcase.include?('utf-8') || locale.downcase.include?('utf8')
-            tl, tr, bl, br, h, v = '┌', '┐', '└', '┘', '─', '│'
-          else
-            # Fallback to ASCII for non-UTF-8 locales
-            tl, tr, bl, br, h, v = '+', '+', '+', '+', '-', '|'
-          end
-        end
-        
+        tl, tr, bl, br, h, v = border_chars
+
         fmt = [@fg.to_s, @bg.to_s].join(',')
         top = (tl + h * @w + tr).c(fmt)
         STDOUT.print "\e[#{top_row};#{left_col}H" + top
@@ -238,7 +226,7 @@ module Rcurses
       # Lazy evaluation: If the content or pane width has changed, reinitialize the lazy cache.
       if !defined?(@cached_text) || @cached_text != cont || @cached_w != @w
         begin
-          @raw_txt   = (cont || "").split("\n").map { |line| line.chomp("\r") }
+          @raw_txt   = (cont || "").split(/\r?\n|\r/).map { |line| line }
           @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 || "").dup
@@ -344,6 +332,12 @@ module Rcurses
           line_str = @skip_colors ? " " * @w : " ".c(fmt) * @w
         end
 
+        # Strip non-SGR ANSI sequences (cursor movement, clear, etc.)
+        # Keep only SGR sequences (ending in 'm') for colors/styles
+        line_str = line_str.gsub(/\e\[[0-9;]*[A-HJKSTfhlnr]/, '')
+        # Strip any raw control characters (except tab and ANSI ESC sequences)
+        line_str = line_str.gsub(/[\x00-\x08\x0b-\x1a\x7f]/, '?')
+
         # Hard-clip line to pane width to prevent overflow into adjacent panes
         visible_w = Rcurses.display_width(line_str.respond_to?(:pure) ? line_str.pure : line_str.gsub(/\e\[[0-9;]*m/, ''))
         if visible_w > @w
@@ -366,10 +360,10 @@ module Rcurses
       diff_buf << "\e8\e[0m\e[r"
       begin
         print diff_buf
-      rescue => e
+      rescue StandardError
         begin
           print "\e[0m\e[?25h"
-        rescue
+        rescue StandardError
         end
       end
       @prev_frame = new_frame
@@ -389,20 +383,8 @@ module Rcurses
       end
 
       if @border
-        # Determine border characters based on environment
-        if ENV['RCURSES_BORDERS'] == 'ascii'
-          tl, tr, bl, br, h, v = '+', '+', '+', '+', '-', '|'
-        else
-          # Check if locale supports UTF-8
-          locale = ENV['LANG'] || ENV['LC_ALL'] || ENV['LC_CTYPE'] || ''
-          if locale.downcase.include?('utf-8') || locale.downcase.include?('utf8')
-            tl, tr, bl, br, h, v = '┌', '┐', '└', '┘', '─', '│'
-          else
-            # Fallback to ASCII for non-UTF-8 locales
-            tl, tr, bl, br, h, v = '+', '+', '+', '+', '-', '|'
-          end
-        end
-        
+        tl, tr, bl, br, h, v = border_chars
+
         # top
         print "\e[#{@y - 1};#{@x - 1}H" + (tl + h * @w + tr).c(fmt)
         # sides
@@ -473,10 +455,7 @@ module Rcurses
       else
         @line -= 1
       end
-      begin
-        @pos = [@pos, @txt[@ix + @line].length].min
-      rescue
-      end
+      @pos = [@pos, @txt[@ix + @line]&.length || 0].min
     end
 
     def down
@@ -485,10 +464,7 @@ module Rcurses
       elsif @line + @ix + 1 < @txt.length
         @line += 1
       end
-      begin
-        @pos = [@pos, @txt[@ix + @line].length].min
-      rescue
-      end
+      @pos = [@pos, @txt[@ix + @line]&.length || 0].min
     end
 
     def parse(cont)
@@ -777,6 +753,19 @@ module Rcurses
 
     private
 
+    def border_chars
+      if ENV['RCURSES_BORDERS'] == 'ascii'
+        ['+', '+', '+', '+', '-', '|']
+      else
+        locale = ENV['LANG'] || ENV['LC_ALL'] || ENV['LC_CTYPE'] || ''
+        if locale.downcase.include?('utf-8') || locale.downcase.include?('utf8')
+          ["\u250C", "\u2510", "\u2514", "\u2518", "\u2500", "\u2502"]
+        else
+          ['+', '+', '+', '+', '-', '|']
+        end
+      end
+    end
+
     def flush_stdin
       while IO.select([$stdin], nil, nil, 0.005)
         begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcurses
 version: !ruby/object:Gem::Version
-  version: 6.2.5
+  version: 6.3.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-20 00:00:00.000000000 Z
+date: 2026-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard