ansiterm 0.4 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92d53d94db9dcd9ed7d7369d4b7df040c5da231bfb2985399b783716f12c7fa0
-  data.tar.gz: 7a50dcdbadfe4cf828de6b98ac674f36052525e0fc5c390a4d018167ccffb4cb
+  metadata.gz: 769f26bf92779ce6c3530bd496dc889cccbcbda18b6447472d910b00810749b4
+  data.tar.gz: 9f4599f5b8146011dcb6b56101536a14b4a4317baa2f528e3f947170d6c42366
 SHA512:
-  metadata.gz: a0c1b315496296dd0a9c6015c5907a0d08eb6d4c4a17756d8ce22f4929b6ff571e448bf9b83a902949be6b625706e9d796d9c59d742f90fb5b0f7b2ffec3c1a9
-  data.tar.gz: c595e0ca1516a21f033317f997f31981bc6899263ce8407065244d76f8bb41bfe339a5435df048be64a149da36e692bcfc04e695e95cc9664e379a5ed8e7e4e6
+  metadata.gz: d2656c8bdee346170e74c725712fe202474cb779d3c74067b9df42769a8fdc736ecc550859a658b1e4f44ff827a5657e49627ab437de464fa5427c8b126cc822
+  data.tar.gz: 998ee1fa03b7d442edcd5f2535d9ad8c5ff16ea7c26795e35e9f42a9540b374608194ab3a32aef627e4e6daf4c1b3e85402c548222333052df4e223c38e497f4

data/lib/ansiterm/buffer.rb

@@ -24,7 +24,7 @@ module AnsiTerm
     end
 
     def cls
-      @lines = (1..@h).map { nil } #AnsiTerm::String.new } #AnsiTerm::String.new("\e[37;40;0m"+(" "*@w)) }
+      @lines = (1..@h).map { nil }
     end
 
     def reset
@@ -46,32 +46,30 @@ module AnsiTerm
       end
     end
 
-    def scroll
-      while @y >= @h
-        @lines.shift
-        @lines << nil #AnsiTerm::String.new #"" #AnsiTerm::String.new("\e[37;40;0m"+(" "*@w))
-        @y -= 1
-      end
-      true
-    end
-
     def print *args
       args.each do |str|
-        @lines[@y] ||= AnsiTerm::String.new("\e[0m")
-        @dirty << @y
+        @lines[@y] ||= AnsiTerm::String.new
         l = @lines[@y]
 
         if l.length < @x
           l << (" "*(@x - l.length))
         end
-        l[@x..@x+str.length] = str
-        #      l[@x] << str
-        #      if @x + s.length > @w
-        #        l[@x .. @w-1] = s[0 .. @w - @x]
-        #        @x = 0
-        #        @y += 1
-        #        scroll if @y >= @h
-        #      end
+
+        r=@x..@x+str.length-1
+        #p [r, str]
+        l[r] = str
+      end
+    end
+
+    # This scrolls the *buffer* up
+    # If you want it to also scroll the *cache*
+    # pass `scroll_cache: true`. This will presume
+    # that you've scrolled the *terminal* yourself.
+    def scroll_up(num=1, scroll_cache: false)
+      @lines.slice!(0)
+      @lines << AnsiTerm::String.new
+      if scroll_cache
+        @cache.slice!(0)
       end
     end
 
@@ -81,27 +79,24 @@ module AnsiTerm
       cachemiss=0
       @lines.each_with_index do |line,y|
         line ||= ""
-        line = line[0..(@w-1)]
+        line = line[0..@w]
         l = line.length
-        #if l > @w
-        #  $editor&.log("WARNING: #{l} > @w #{@w}")
-        #end
         s = line.to_str
         if @cache[y] != s
-          out << ANSI.cup(y,0) << s << ANSI.sgr(:reset) << ANSI.el #<< X\n"
+          # Move to start of line; output line; clear to end
+          #if l > 0
+            out << "\e[#{y+1};1H" << s
+            if l < @w
+              out << "\e[0m\e[0K"
+            end
+          #end
           cachemiss += s.length
           old = @cache[y]
           @cache[y] = s
-          #$editor.pry([y,old, s])
         else
           cachehit += @cache[y].length
         end
-        # FIXME: This is only worthwhile if a background colour is set
-        #if l < @w
-        #  out << ANSI.csi("m",0,38,48,2,48,48,64) << "-"*(@w-l)
-        #end
       end
-      @dirty = Set[]
       out
     end
   end

data/lib/ansiterm/string.rb

@@ -89,11 +89,13 @@ module AnsiTerm
     end
 
     def[]= range, str
-      s = @str
-      a = @attrs
+      s = @str.dup
+      a = @attrs.dup
       parse(str)
-      @str   = s[0..(range.min-1)].to_s + @str   + s[(range.max)..-1].to_s
-      @attrs = a[0..(range.min-1)].to_a + @attrs + a[(range.max)..-1].to_a
+      s[range] = @str
+      @str = s
+      a[range] = @attrs
+      @attrs = a
     end
 
     def[] i

data/lib/ansiterm/version.rb

@@ -1,3 +1,3 @@
 module AnsiTerm
-  VERSION = "0.4"
+  VERSION = "0.4.2"
 end

data/visual-spec/buffer.rb

@@ -0,0 +1,41 @@
+
+$: << File.dirname(__FILE__)+"/../lib"
+
+require 'ansiterm'
+require 'io/console'
+
+h,w = IO.console.winsize
+
+t = AnsiTerm::Buffer.new(w,h-1)
+
+t.cls
+t.move_cursor(1,1)
+t.print([h,w].inspect)
+t.move_cursor(0,0)
+t.print("UL")
+t.move_cursor(w-2,0)
+t.print("UR")
+t.move_cursor(w-2,h-2)
+t.print("LR")
+t.move_cursor(0,h-2)
+t.print("LL")
+t.move_cursor(1,2)
+t.print ("Hello world. UL/UR/LL/LR should fit the corners but one line above the bottom.")
+print t.to_s
+gets
+t.scroll_up
+t.move_cursor(0,0)
+t.print("ul")
+t.move_cursor(w-2,0)
+t.print("ur")
+t.move_cursor(w-2,h-2)
+t.print("lr")
+t.move_cursor(0,h-2)
+t.print("ll")
+
+t.move_cursor(1,2)
+t.print ("We've scrolled one line up. This should display right below the Hello World.")
+t.move_cursor(1,3)
+t.print ("Old LL/LR should be visible one line up; new, lower case ones replacing them")
+print t.to_s
+gets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansiterm
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.2
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - lib/ansiterm/buffer.rb
 - lib/ansiterm/string.rb
 - lib/ansiterm/version.rb
+- visual-spec/buffer.rb
 homepage: https://github.com/vidarh/ansiterm
 licenses:
 - MIT