rcurses 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72fa40a32c3bd2d5b8d9b877570cef06ac7717923e5ceb00beb25ff604042d6f
-  data.tar.gz: 4d98c839744b9715286ab94fe4d3f0e71c9c6ac2b755d9642b7ba2957c943200
+  metadata.gz: f120b89280037a3485515b1cc75f7a08f122fde4faff32b2234b602bb37dbecf
+  data.tar.gz: 71aa736312930bf945f8af1e021430e4ff9ce23be9a12402a3ec046c272f5055
 SHA512:
-  metadata.gz: 530c8e9aa1f37ff1fabf89b70c03a6e572afddf6905d3a79d8c5a2f1e9f0ae582499e37168a9585b7e3ff0da1a49c6426e281fbc56d54884dd3cc610bd3575e9
-  data.tar.gz: b9d7694f652427485d65317c931da8399139fdc25436e2526c91ef37b835bda2ed9ef7fe1a4652f9ba1dd6fe50ca3fdf42b7990b578617a3ebed0426868aa016
+  metadata.gz: fa2b26d81b024bd82cdeab5fc643072f4c4b1120cd96720a41926e5bafcc49c535b9df25242f534c99448a501000d3c30fd8331777f2eff03720472c3747182f
+  data.tar.gz: 2153244b482b08beb7234df2dd91fc542f438b6a814016ccdec68c32bd818e92744165bf10b87fa6a4d5167d30106a9bc7bcd4b259ab05eecb581112cbe8b2ab

data/lib/rcurses/pane.rb

@@ -13,6 +13,10 @@ module Rcurses
       @starty  = starty.is_a?(Proc) ? starty : -> { starty }
       @width   = width.is_a?(Proc)  ? width  : -> { width  }
       @height  = height.is_a?(Proc) ? height : -> { height }
+      @x       = @startx.call
+      @y       = @starty.call
+      @w       = @width.call
+      @h       = @height.call
       @fg, @bg = fg, bg
       @text    = ""              # Initialize text variable
       @align   = "l"             # Default alignment

data/lib/rcurses.rb

@@ -5,7 +5,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rcurses
 # License:    Public domain
-# Version:    2.4.2: Added parameters 'min' and 'time' to getchr
+# Version:    2.4.6: Added x,y,w,h at panel creation, not just on refresh
 
 require 'io/console' # Basic gem for rcurses
 require 'io/wait'    # stdin handling

data/lib/string_extensions.rb

@@ -60,10 +60,11 @@ class String
     result
   end
 
-  # Injects the given string at the given visible character position.
-  # A negative position is treated as an insertion at the end.
+  # Inserts the given substring at the provided visible character position.
+  # A negative position means insertion at the end.
+  # When inserting at the end and the string ends with an ANSI escape sequence,
+  # the insertion is placed before that trailing ANSI sequence.
   def inject(insertion, pos)
-    # Work on visible text; if pos is negative, set it to the length (i.e. end).
     pure_text = self.pure
     visible_length = pure_text.length
     pos = visible_length if pos < 0
@@ -74,7 +75,7 @@ class String
     injected = false
 
     while i < self.length
-      if self[i] == "\e" # ANSI escape sequence – copy whole sequence without counting
+      if self[i] == "\e"  # Start of an ANSI sequence.
         if m = self[i..-1].match(/\A(\e\[\d+(?:;\d+)*m)/)
           result << m[1]
           i += m[1].length
@@ -83,7 +84,6 @@ class String
           i += 1
         end
       else
-        # At the point when we've output exactly pos visible characters, do the injection.
         if count == pos && !injected
           result << insertion
           injected = true
@@ -93,10 +93,18 @@ class String
         i += 1
       end
     end
-    # In case pos equals the total visible length (i.e. insertion at the end) and
-    # no injection has occurred inside the loop, append now.
-    result << insertion unless injected
+
+    # If we haven't injected (i.e. pos equals visible_length),
+    # check for a trailing ANSI sequence and insert before it.
+    unless injected
+      if result =~ /(\e\[\d+(?:;\d+)*m)\z/
+        trailing = $1
+        result = result[0...-trailing.length] + insertion + trailing
+      else
+        result << insertion
+      end
+    end
+
     result
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcurses
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-03-21 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 2.4.5: Added functions ''shorten''
-  and ''inject'' to the string class.'
+  in panes. Cursor movement around the terminal. New in 2.4.6: Added x,y,w,h at panel
+  creation, not just on refresh.'
 email: g@isene.com
 executables: []
 extensions: []