rubytext 0.0.60 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed8fcf2a8a7d86a9bf6638f1cd79c5c17c3529098a38a068bb13ed46e5593064
-  data.tar.gz: 15151447c9e3d9cc3f512e3633587a619c9964243145fbbd351725f0513caedf
+  metadata.gz: 0001d23647ee6db8889ba9022e93b4d7335c5186448f3574cc87df0b4524e478
+  data.tar.gz: 07f657f4e4718a0e89a596db1d00e5577e7a41931a647506212ef21a831fef31
 SHA512:
-  metadata.gz: 2b568b4c93804d87ed8b2a594ea384fbe055d7b0fdee9eecaa242f3991b8f764f907d2024a6669b89bed4a7122a25dc0f2fcbed9b1b586f95300267a239caa30
-  data.tar.gz: 19dc65ee79dc0bf985a98631f0eef878c02c263be11664f2c94f75b43bc784a51bad9f59d7ec78dbb3401e0d1d5a65562eda7f12200d2ab4ef1451a471c68eca
+  metadata.gz: 3c0dd0a9f005c53df842d658188fff9832cc47e20d483ad7ae23c0f1ef68e88eef024cb4fdce23e15e3792bff562b5a05b22ec1326242619f55ca833d0f8de9f
+  data.tar.gz: a19b18a988750dfc52010c41787c08ffc2f92ba6b33c6cc2ab11dfd7bc45b1956a1c29a938a1697112ae2411a6da87ce51c1b7e658bb8c0803c4b695133af022

data/examples/demo.rb

@@ -6,6 +6,10 @@ def delay(sec, speed=1.0)
   sleep sec/speed
 end
 
+speed = ARGV.first || 1.0
+speed = speed.to_f
+delay(speed)
+
 RubyText.start(:_cbreak, log: "mylog.txt", fg: :green, bg: :black)
 
 print "Here goes... "
@@ -46,7 +50,7 @@ delay 3
 
 puts "\n\nNow watch as I create a window:"
 
-mywin = RubyText.window(16, 40, 8, 14, true, fg: :blue, bg: :yellow)
+mywin = RubyText.window(16, 40, 8, 14, fg: :blue, bg: :yellow)
 
 delay 3
 mywin.puts "\nNow I'm writing in a window."
@@ -94,7 +98,7 @@ mywin.output do
     c = rand(mywin.cols)
     mywin[r, c] =  "*"
   end
-  mywin.win.refresh 
+  mywin.cwin.refresh 
 end
 
 delay 5

data/lib/color.rb

@@ -39,6 +39,6 @@ class RubyText::Window
   end
 
   def fg=(sym)
-    self.colors(@win, fg, @bg)
+    self.colors(@cwin, fg, @bg)
   end
 end

data/lib/navigation.rb

@@ -1,7 +1,7 @@
 class RubyText::Window
   def go(r, c)
     save = self.rc
-    @win.setpos(r, c)
+    @cwin.setpos(r, c)
     if block_given?
       yield
       go(*save)   # No block here!
@@ -68,6 +68,6 @@ class RubyText::Window
   end
 
   def rc
-    [@win.cury, @win.curx]
+    [@cwin.cury, @cwin.curx]
   end
 end

data/lib/output.rb

@@ -1,5 +1,7 @@
 $LOAD_PATH << "lib"
 
+require 'global'  # FIXME later
+
 def debug(*args)
   return unless $debug
   $debug.puts *args
@@ -8,7 +10,7 @@ end
 class RubyText::Window
   def center(str)
     r, c = self.rc
-    n = @win.maxx - str.length
+    n = @cwin.maxx - str.length
     go r, n/2
     puts str
   end
@@ -25,7 +27,7 @@ class RubyText::Window
 
   def delegate_output(sym, *args)
     args = [""] if args.empty?
-    RubyText::Window.colors(@win, @fg, @bg)  # FIXME?
+    RubyText::Window.colors(@cwin, @fg, @bg)  # FIXME?
     if sym == :p
       args.map!(&:inspect) 
     else
@@ -42,16 +44,16 @@ class RubyText::Window
     # Limitation: Can't print color symbols!
     args.each do |arg|  
       if arg.is_a? Symbol # must be a color
-        RubyText::Window.colors(@win, arg, @bg)  # FIXME?
+        RubyText::Window.colors(@cwin, arg, @bg)  # FIXME?
       elsif arg.is_a? RubyText::Effects
         X.attrset(arg.value)
       else
-        arg.each_char {|ch| ch == "\n" ? crlf : @win.addch(ch) }
+        arg.each_char {|ch| ch == "\n" ? crlf : @cwin.addch(ch) }
       end
     end
     crlf if flag
-    RubyText::Window.colors(@win, @fg, @bg)  # FIXME?
-    @win.refresh
+    RubyText::Window.colors(@cwin, @fg, @bg)  # FIXME?
+    @cwin.refresh
   end
 
   def puts(*args)
@@ -71,14 +73,18 @@ class RubyText::Window
   end
 
   def rcprint!(r, c, *args)
-    @win.setpos(r, c)  # Cursor isn't restored
+    @cwin.setpos(r, c)  # Cursor isn't restored
     self.print *args
   end
 
   def crlf
     # Technically not output...
     r, c = rc
-    go r+1, 0
+    if r < @rows - 1 && !@scrolling
+      go r+1, 0
+    else
+      scroll
+    end
   end
 
   def self.clear(win)
@@ -90,7 +96,7 @@ class RubyText::Window
   end
 
   def clear
-    win = @win
+    win = @cwin
     num = win.maxx * win.maxy
     win.setpos(0, 0)
     win.addstr(' '*num)
@@ -106,17 +112,17 @@ class RubyText::Window
 
   def [](r, c)
     save = self.rc
-    @win.setpos r, c
-    ch = @win.inch
-    @win.setpos *save
+    @cwin.setpos r, c
+    ch = @cwin.inch
+    @cwin.setpos *save
     ch.chr
-#   go(r, c) { ch = @win.inch }
+#   go(r, c) { ch = @cwin.inch }
   end
 
   def []=(r, c, char)
-    @win.setpos(r, c)
-    @win.addch(char[0])
-    @win.refresh
+    @cwin.setpos(r, c)
+    @cwin.addch(char[0])
+    @cwin.refresh
   end
 
   def boxme
@@ -125,7 +131,7 @@ class RubyText::Window
   end
 
   def refresh
-    @win.refresh
+    @cwin.refresh
   end
 end
 

data/lib/rubytext.rb

@@ -8,6 +8,9 @@ X = Curses  # shorthand
 Black, Blue, Cyan, Green, Magenta, Red, White, Yellow = 
   :black, :blue, :cyan, :green, :magenta, :red, :white, :yellow
 
+module RubyText
+end
+
 require 'version'
 require 'output'       # RubyText, RubyText::Window, Kernel
 require 'keys'         # RubyText::Keys

data/lib/settings.rb

@@ -70,9 +70,9 @@ module RubyText
     @flags = @defaults
   end
 
-  def self.start(*args, log: nil, fg: nil, bg: nil)
+  def self.start(*args, log: nil, fg: nil, bg: nil, scroll: false)
     $debug = File.new(log, "w") if log
-    Object.const_set(:STDSCR, RubyText::Window.main(fg: fg, bg: bg))
+    Object.const_set(:STDSCR, RubyText::Window.main(fg: fg, bg: bg, scroll: scroll))
     $stdscr = STDSCR
     fg, bg, cp = fb2cp(fg, bg)
     self.set(:_echo, :cbreak, :raw)  # defaults

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module RubyText
-  VERSION = "0.0.60"
+  VERSION = "0.0.61"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/lib/window.rb

@@ -1,7 +1,7 @@
 class RubyText::Window
   Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
 
-  attr_reader :win, :rows, :cols, :width, :height
+  attr_reader :cwin, :rows, :cols, :width, :height
   attr_writer :fg, :bg
 
   # Better to use Window.window IRL
@@ -10,82 +10,87 @@ class RubyText::Window
     debug "RT::Win.init: #{[high, wide, r0, c0, border]}"
     @wide, @high, @r0, @c0 = wide, high, r0, c0
     @border, @fg, @bg      = border, fg, bg
-    @win = X::Window.new(high, wide, r0, c0)
-    debug "outer = #{@win.inspect}"
+    @cwin = X::Window.new(high, wide, r0, c0)
+    debug "outer = #{@cwin.inspect}"
     debug "@border = #@border"
-    debug "Calling 'colors': #{[@win, fg, bg]}"
-    RubyText::Window.colors!(@win, fg, bg)
+    debug "Calling 'colors': #{[@cwin, fg, bg]}"
+    RubyText::Window.colors!(@cwin, fg, bg)
     if @border
-      @win.box(Vert, Horiz)
-      @outer = @win
+      @cwin.box(Vert, Horiz)
+      @outer = @cwin
       @outer.refresh
       debug "About to call again: params = #{[high-2, wide-2, r0+1, c0+1]}"
-      @win = X::Window.new(high-2, wide-2, r0+1, c0+1)
-      RubyText::Window.colors!(@win, fg, bg)
+      @cwin = X::Window.new(high-2, wide-2, r0+1, c0+1)
+      RubyText::Window.colors!(@cwin, fg, bg)
     else
-      @outer = @win
+      @outer = @cwin
     end
-    @rows, @cols = @win.maxy, @win.maxx  # unnecessary really...
+    @rows, @cols = @cwin.maxy, @cwin.maxx  # unnecessary really...
     @width, @height = @cols + 2, @rows + 2 if @border
-    @win.scrollok(true) if scroll
-    @win.refresh
+    @scrolling = scroll
+    @cwin.scrollok(scroll) 
+    @cwin.refresh
   end
 
   def self.main(fg: nil, bg: nil, scroll: false)
     @main_win = X.init_screen
     X.start_color
     colors!(@main_win, fg, bg)
+    @cwin = @main_win  # FIXME?
     rows, cols = @main_win.maxy, @main_win.maxx
-    @screen = self.make(@main_win, rows, cols, 0, 0, false,
+    @screen = self.make(@main_win, rows, cols, 0, 0, border: false,
                         fg: fg, bg: bg, scroll: scroll)
 # FIXME Why is this hard to inline?
-#     @win = @main_win
+##  Must be params...?
+##  def self.make(cwin, high, wide, r0, c0, border, fg: White, bg: Black, scroll: false)
 #     obj = self.allocate
 #     obj.instance_eval do 
-#       @outer = @win = @main_win
+#       @outer = @cwin = @main_win
 #       @wide, @high, @r0, @c0 = cols, rows, 0, 0
 #       @fg, @bg = fg, bg
 #       @border = false
 #       @rows, @cols = @high, @wide
 #       @width, @height = @cols + 2, @rows + 2 if @border
 #     end
-#     @win = @main_win  # FIXME?
+#     obj.scrolling(scroll)
 #     obj
-    @screen
   end
 
-  def self.make(cwin, high, wide, r0, c0, border, fg: White, bg: Black, scroll: false)
+  def self.make(cwin, high, wide, r0, c0, border: true, fg: White, bg: Black, scroll: false)
     obj = self.allocate
     obj.instance_eval do 
       #  debug "  Inside instance_eval..."
-      @outer = @win = cwin
+      @outer = @cwin = cwin
       @wide, @high, @r0, @c0 = wide, high, r0, c0
       @fg, @bg = fg, bg
       @border = border
       @rows, @cols = high, wide
       @width, @height = @cols + 2, @rows + 2 if @border
     end
+    obj.scrolling(scroll)
     obj
   end
 
-  def scrolling
-    @win.scrollok(true)
+  # FIXME refactor bad code
+
+  def scrolling(flag=true)
+    @cwin.scrollok(flag)
   end
 
   def noscroll
-    @win.scrollok(false)
+    @cwin.scrollok(false)
   end
 
   def scroll(n=1)
     n.times do |i|
-      @win.scroll
+      @cwin.scroll
       go(@rows-1, 0)
       noscroll
       print(' '*@cols)
       scrolling
       left!
     end
-    @win.refresh
+    @cwin.refresh
   end
 
   def screen_text(file = nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.61
 platform: ruby
 authors:
 - Hal Fulton