rubytext 0.0.61 → 0.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0001d23647ee6db8889ba9022e93b4d7335c5186448f3574cc87df0b4524e478
-  data.tar.gz: 07f657f4e4718a0e89a596db1d00e5577e7a41931a647506212ef21a831fef31
+  metadata.gz: 67a616d1aeab9989c5b6c06c427b34867ee1d9f37d9d555f2a576158aee9da92
+  data.tar.gz: 5b611824f529a56c5e768df667c377cb01f695d4baa12912c9cff9440a711376
 SHA512:
-  metadata.gz: 3c0dd0a9f005c53df842d658188fff9832cc47e20d483ad7ae23c0f1ef68e88eef024cb4fdce23e15e3792bff562b5a05b22ec1326242619f55ca833d0f8de9f
-  data.tar.gz: a19b18a988750dfc52010c41787c08ffc2f92ba6b33c6cc2ab11dfd7bc45b1956a1c29a938a1697112ae2411a6da87ce51c1b7e658bb8c0803c4b695133af022
+  metadata.gz: '00129ff170a92b6c62c4c39674ec56ab3cd1c51a164c696755d72386178e8ea03c1c7037d88d6da4a0f6ef3e51acd13de0cabd300d147563510da6d6648370fe'
+  data.tar.gz: cc26dad3e9f198b51196d28baac80b229b8a816b588a1e98c3f8baf47a05fd2662a322a4ceb63728484388c2401b749cf645957f95049f1bcb9850cef43dbeda

data/lib/navigation.rb

@@ -62,10 +62,10 @@ class RubyText::Window
     go 0, 0
   end
 
-  def crlf
-    r, c = rc
-    go r+1, 0
-  end
+# def crlf
+#   r, c = rc
+#   go r+1, 0
+# end
 
   def rc
     [@cwin.cury, @cwin.curx]

data/lib/output.rb

@@ -1,11 +1,6 @@
 $LOAD_PATH << "lib"
 
-require 'global'  # FIXME later
-
-def debug(*args)
-  return unless $debug
-  $debug.puts *args
-end
+# require 'global'  # FIXME later
 
 class RubyText::Window
   def center(str)
@@ -25,6 +20,8 @@ class RubyText::Window
     args[-1][-1] != "\n"  # last char is a literal linefeed
   end
 
+# FIXME Please refactor the Hal out of this.
+
   def delegate_output(sym, *args)
     args = [""] if args.empty?
     RubyText::Window.colors(@cwin, @fg, @bg)  # FIXME?
@@ -39,16 +36,20 @@ class RubyText::Window
         end
       end
     end
-# STDOUT.puts "again: #{args.inspect}"
-    flag = need_crlf?(sym, args)
-    # Limitation: Can't print color symbols!
+    flag = need_crlf?(sym, args)   # Limitation: Can't print color symbols!
     args.each do |arg|  
       if arg.is_a? Symbol # must be a color
         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 : @cwin.addch(ch) }
+        arg.each_char do |ch| 
+          if ch == "\n" 
+            crlf 
+          else
+            @cwin.addch(ch)
+          end
+        end
       end
     end
     crlf if flag
@@ -77,13 +78,21 @@ class RubyText::Window
     self.print *args
   end
 
-  def crlf
-    # Technically not output...
+  def crlf     # Technically not output...
     r, c = rc
-    if r < @rows - 1 && !@scrolling
-      go r+1, 0
+    if @scrolling
+      if r == @rows - 1  # bottom row
+        scroll
+        left!
+      else
+        go r+1, 0
+      end
     else
-      scroll
+      if r == @rows - 1  # bottom row
+        left!
+      else
+        go r+1, 0
+      end
     end
   end
 

data/lib/rubytext.rb

@@ -55,3 +55,8 @@ end
 
 make_exception(:RTError, "General error: $1 $2 $3")
 
+def debug(*args)
+  return unless $debug
+  $debug.puts *args
+end
+

data/lib/version.rb

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

data/lib/window.rb

@@ -1,25 +1,20 @@
 class RubyText::Window
   Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
 
-  attr_reader :cwin, :rows, :cols, :width, :height
+  attr_reader :cwin, :rows, :cols, :width, :height, :scrolling
   attr_writer :fg, :bg
 
   # Better to use Window.window IRL
 
   def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=nil, bg=nil, scroll=false)
-    debug "RT::Win.init: #{[high, wide, r0, c0, border]}"
     @wide, @high, @r0, @c0 = wide, high, r0, c0
     @border, @fg, @bg      = border, fg, bg
     @cwin = X::Window.new(high, wide, r0, c0)
-    debug "outer = #{@cwin.inspect}"
-    debug "@border = #@border"
-    debug "Calling 'colors': #{[@cwin, fg, bg]}"
     RubyText::Window.colors!(@cwin, fg, bg)
     if @border
       @cwin.box(Vert, Horiz)
       @outer = @cwin
       @outer.refresh
-      debug "About to call again: params = #{[high-2, wide-2, r0+1, c0+1]}"
       @cwin = X::Window.new(high-2, wide-2, r0+1, c0+1)
       RubyText::Window.colors!(@cwin, fg, bg)
     else
@@ -33,33 +28,17 @@ class RubyText::Window
   end
 
   def self.main(fg: nil, bg: nil, scroll: false)
-    @main_win = X.init_screen
+    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, border: false,
-                        fg: fg, bg: bg, scroll: scroll)
-# FIXME Why is this hard to inline?
-##  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 = @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
-#     obj.scrolling(scroll)
-#     obj
+    colors!(main_win, fg, bg)
+    rows, cols = main_win.maxy, main_win.maxx
+    self.make(main_win, rows, cols, 0, 0, border: false,
+              fg: fg, bg: bg, scroll: scroll)
   end
 
   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 = @cwin = cwin
       @wide, @high, @r0, @c0 = wide, high, r0, c0
       @fg, @bg = fg, bg
@@ -74,21 +53,26 @@ class RubyText::Window
   # FIXME refactor bad code
 
   def scrolling(flag=true)
+    @scrolling = flag
     @cwin.scrollok(flag)
   end
 
   def noscroll
+    @scrolling = false
     @cwin.scrollok(false)
   end
 
   def scroll(n=1)
-    n.times do |i|
-      @cwin.scroll
-      go(@rows-1, 0)
-      noscroll
-      print(' '*@cols)
-      scrolling
-      left!
+    if n < 0
+      @cwin.scrl(n)
+      (-n).times {|i| rcprint i, 0, (' '*@cols) }
+    else
+      n.times do |i|
+        @cwin.scroll
+        scrolling(false)
+        rcprint @rows-1, 0, (' '*@cols)
+        scrolling
+      end
     end
     @cwin.refresh
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.61
+  version: 0.0.62
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses