rubytext 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f6d0f9395aff805aef7b9ce76c03da6206e0afeb50229fc972ca7706d6337ad
-  data.tar.gz: e63447baea0dadb372e5e1927f68fa4d364a47324be448ae825a5db87e72b896
+  metadata.gz: b67f09e356a4a6791fd17ad598b3dbabbf2d2bcb4e22c3aa3d7a44394255e183
+  data.tar.gz: e121b61f5b8e29942bd9a807a3fea1a42c9324cce9a743a76576e3f59084f5dd
 SHA512:
-  metadata.gz: d0c3b3ccc3eae4595eef9711eadacab112bc7d41e925e6a04b4de57d3278ef0e430d4a2d3efea309e47afea617f6fd213605223bcdd5b34314309c59a9d68b39
-  data.tar.gz: e7e2d3eac33a5d10374e111a9d1abbe04ceb59efcb486b48f2b1794ba3fcfbf55019c8cd391f2a1fcd7a0ae62bf0bddbdc64f5f2db8d975010e62577fe99115b
+  metadata.gz: 5fdee3ed7ccd0a5113c58f7d7f512ca7aee795b9484c8496c940e250ad8b57e5f645e9c7d59dcb5708c6b57c59a3817e7fce857d8002453697be57f204d637fa
+  data.tar.gz: bea38489db79ac0f1d5a6333c3965acd99f23b63c905050db894e9bd0043d02bef34517c863f86056b6515341e75046189b567685f6dc2ec8cc68e263ca00fe0

data/lib/rubytext.rb

@@ -1,7 +1,6 @@
 $LOAD_PATH << "lib"
 
 require 'curses'
-
 require 'version'   # skeleton + version
 
 X = Curses  # shorthand
@@ -58,6 +57,7 @@ module RubyText
   end
 
   class Window
+    attr_reader :fg, :bg
 
     def self.colors(win, fg, bg)
       cfg, cbg, cp = fb2cp(fg, bg)
@@ -65,26 +65,36 @@ module RubyText
       win.color_set(cp|X::A_NORMAL)
     end
 
+    def self.colors!(win, fg, bg)
+      colors(win, fg, bg)
+      num = win.maxx * win.maxy
+      win.setpos(0, 0)
+      win.addstr(' '*num)
+      win.setpos(0, 0)
+      win.refresh
+    end
+
     def self.main(fg: nil, bg: nil)
       debug "Entering Window.main (#{fg}, #{bg}) => "
       @main_win = X.init_screen
       X.start_color
-      colors(@main_win, fg, bg)
-      # FIXME clear??
+      colors!(@main_win, fg, bg)
       debug "About to call .make"
       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, false,
+                          fg: fg, bg: bg)
       @screen
     end
 
-    def self.make(cwin, high, wide, r0, c0, border)
-      debug "make: #{[cwin, high, wide, r0, c0, border]}"
+    def self.make(cwin, high, wide, r0, c0, border, fg: :white, bg: :black)
+      debug "make: #{[cwin, high, wide, r0, c0, border, fg, bg]}"
       obj = self.allocate
       debug "Allocate returned a #{obj.class}"
       obj.instance_eval do 
         debug "  Inside instance_eval..."
         @outer = @win = 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
@@ -92,28 +102,9 @@ module RubyText
       obj
     end
   end
-
 end
 
 
-# debug "Setting STDSCR to Window.main"
-
-# STDSCR = RubyText::Window.main
-# $stdscr = STDSCR
-
-=begin
-  Logic flow - 
-    main
-      initscreen
-      start_color
-      make
-    STDSCR = RubyText::Window.main
-    $stdscr = STDSCR
-
-=end
-
-###
-
 module RubyText
 
   def self.start(*args, log: nil, fg: nil, bg: nil)
@@ -121,6 +112,7 @@ module RubyText
     Object.const_set(:STDSCR, RubyText::Window.main(fg: fg, bg: bg))
     $stdscr = STDSCR
 
+debug "STDSCR has #{STDSCR.fg} on #{STDSCR.bg}" 
     debug "fg = #{fg} is not a valid color" unless Colors.include?(fg.to_s)
     debug "bg = #{bg} is not a valid color" unless Colors.include?(bg.to_s)
     fg, bg, cp = fb2cp(fg, bg)
@@ -136,8 +128,6 @@ module RubyText
           X.echo
         when :noecho
           X.noecho
-        when :color
-          X.start_color
       end
     end
   end
@@ -185,15 +175,15 @@ class RubyText::Window
     debug "outer = #{@win.inspect}"
     debug "@border = #@border"
     debug "Calling 'colors': #{[@win, fg, bg]}"
-    RubyText::Window.colors(@win, fg, bg)
-    self.clear
+    RubyText::Window.colors!(@win, fg, bg)
+#   self.clear(@main_win)
     if @border
       @win.box(Vert, Horiz)
       @outer = @win
       @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) # , false, fg, bg)  # relative now??
-      RubyText::Window.colors(@win, fg, bg)
+      RubyText::Window.colors!(@win, fg, bg)
     else
       @outer = @win
     end
@@ -202,9 +192,15 @@ class RubyText::Window
     @win.refresh
   end
 
+  def center(row, str)
+    n = @win.maxx - str.length
+    rcprint row, n/2, str
+  end
+
   def delegate_output(sym, *args)
     args = [""] if args.empty?
-    RubyText::Window.colors(@win, fg, bg)  # FIXME?
+debug "delegate: colors are #@fg, #@bg"
+    RubyText::Window.colors(@win, @fg, @bg)  # FIXME?
 #   debug "#{sym}: args = #{args.inspect}"
     if sym == :p
       args.map!(&:inspect) 
@@ -266,6 +262,14 @@ class RubyText::Window
     [@win.cury, @win.curx]
   end
 
+  def self.clear(win)
+    num = win.maxx * win.maxy
+    win.setpos(0, 0)
+    win.addstr(' '*num)
+    win.setpos(0, 0)
+    win.refresh
+  end
+
   def clear
     win = @win
     num = win.maxx * win.maxy

data/lib/version.rb

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

metadata

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