rubytext 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 01d2a45364981d0139df502a40e86e0b3cbd1186bae314e1f987dc704ba0c5cc
-  data.tar.gz: bab37c6c328abe1d33fd75c8a8f2c0e2a691a211f6f272d334802b5e4a219486
+SHA1:
+  metadata.gz: a05b2ae8802e7304f0787f3a8823738d43ff6ee8
+  data.tar.gz: 2232e7b343f4b9410bf4b7e00df24b854b63d7e4
 SHA512:
-  metadata.gz: 6cb6a7992dfc787cceffcef1036ec5678fddde72ea2ec22cbeef9e00e1fc01bb36ac9ae81c17102bb31ca948a5b7f0fe5d00e433dcf10faf9d18850c65d1160c
-  data.tar.gz: 39f142d6bc3136ff4bfefa80926753ffdec548a522b4a6d0ac363de83ca2417425ee53d7416e53a9ae3748b6247529acff52dc09663205b83dec74b3739026ee
+  metadata.gz: 9528eaf48304325b79286e892c6516f15730d46ab0aafe6368f4d1b3db43c8032ad07a2c2fcbc8d708138b66f3f9997d2b051970dbf6bd104c4a31265b151518
+  data.tar.gz: 3d33beb960f317a38e1de21c4f0eda0b90d49ca83d307b38eefc8ed2a60f91981854a9b7af258165711ed319b3ab184f841985d1ccf0dd8244f5dcd0bbf451a7

data/lib/rubytext.rb

@@ -12,6 +12,8 @@ def debug(*args)
 end
 
 def fb2cp(fg, bg)
+  fg ||= :blue
+  bg ||= :white
   debug "Colors are: #{fg} on #{bg}"
   fg = X.const_get("COLOR_#{fg.upcase}")
   bg = X.const_get("COLOR_#{bg.upcase}")
@@ -56,16 +58,24 @@ module RubyText
   end
 
   class Window
+
+    def self.colors(win, fg, bg)
+      cfg, cbg, cp = fb2cp(fg, bg)
+      X.init_pair(cp, cfg, cbg)
+      win.color_set(cp|X::A_NORMAL)
+      num = win.maxx * win.maxy
+      win.addstr(' '*num)
+      win.setpos(0, 0)
+      win.refresh
+    end
+
     def self.main(fg: nil, bg: nil)
       debug "Entering Window.main (#{fg}, #{bg}) => "
-      fg, bg, cp = fb2cp(fg, bg)
-      debug "  computed #{fg}, #{bg}, #{cp}"
-      debug "  cp|A_NORMAL = #{cp|X::A_NORMAL}"
       @main_win = X.init_screen
       X.start_color
-      X.stdscr.bkgd(cp|X::A_NORMAL)
-      rows, cols = @main_win.maxy, @main_win.maxx
+      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
     end
@@ -85,8 +95,10 @@ module RubyText
       obj
     end
   end
+
 end
 
+
 # debug "Setting STDSCR to Window.main"
 
 # STDSCR = RubyText::Window.main
@@ -112,13 +124,9 @@ module RubyText
     Object.const_set(:STDSCR, RubyText::Window.main(fg: fg, bg: bg))
     $stdscr = STDSCR
 
-    fg ||= :white
-    bg ||= :black
     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)
-#   X.bkgd(cp|X::A_NORMAL)
-#   X.clear
     X.noecho
     X.stdscr.keypad(true)
     X.cbreak   # by default
@@ -149,7 +157,7 @@ module RubyText
     end
   end
 
-  def RubyText.window(high, wide, r0, c0, border=false, fg=nil, bg=nil)
+  def RubyText.window(high, wide, r0, c0, border=false, fg: nil, bg: nil)
     RubyText::Window.new(high, wide, r0, c0, border, fg, bg)
   end
 
@@ -168,24 +176,26 @@ module RubyText
 end
 
 class RubyText::Window
-  Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL  # ?|, ?-    # "\u2502", "\u2500"
+  Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
 
   attr_reader :win, :rows, :cols, :width, :height, :fg, :bg
 
-  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=:white, bg=:black)
+  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=nil, bg=nil)
     debug "RT::Win.init: #{[high, wide, r0, c0, border]}"
     @wide, @high, @r0, @c0 = wide, high, r0, c0
-    @border = border
-    @fg, @bg = fg, bg
+    @border, @fg, @bg      = border, fg, bg
     @win = X::Window.new(high, wide, r0, c0)
     debug "outer = #{@win.inspect}"
     debug "@border = #@border"
+    debug "Calling 'colors': #{[@win, fg, bg]}"
+    RubyText::Window.colors(@win, fg, bg)
     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)
     else
       @outer = @win
     end
@@ -203,9 +213,13 @@ class RubyText::Window
       args.map!(&:to_s) 
     end
     str = sprintf(*args)
-    str << "\n" if sym != :print && str[-1] != "\n"
+    flag = true if sym != :print && str[-1] != "\n"
     # color-handling code here
-    @win.addstr(str)
+    str.each_char do |ch|
+      ch == "\n" ? crlf : @win.addch(ch)
+    end
+#   @win.addstr(str)
+    crlf if flag
     @win.refresh
   end
 
@@ -244,12 +258,22 @@ class RubyText::Window
     go r+1, c
   end
 
+  def crlf
+    r, c = rc
+    go r+1, 0
+  end
+
   def rc
     [@win.cury, @win.curx]
   end
 
   def clear
-    @win.clear
+    win = @win
+    num = win.maxx * win.maxy
+    win.setpos(0, 0)
+    win.addstr(' '*num)
+    win.setpos(0, 0)
+    win.refresh
   end
 
   def output(&block)

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A thick wrapper for Curses