rubytext 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fe02a727ad28e192c4578215c9135f418f1c0e88
-  data.tar.gz: fa7091c1920092f1d449499ee1cf969977d2963a
+SHA256:
+  metadata.gz: 4536ed9e2ce1dbd28d40a9e19adf2a5aa4a0e8c5bf6bc13666d3ea00708bece1
+  data.tar.gz: 996510b10225a5dd569ebcbb7f022308b10f4d8f050870b686bba5c30ecff64e
 SHA512:
-  metadata.gz: 2ba3f8c5d824a60039d9d982dce8709f914ec47136fe2c38b449df58deec73c16777fee6a8a8143fb2d8e28003eb1bc7a191b369849ddc772873f6acc564c1be
-  data.tar.gz: b7df132242683378422ec75c576cbf8e8fd2880fcac97496a2806770c5adcb8464b0426bddbaf535e82ade9ca0e6291a0dc72d9a1c6c6e9183a47695e142b042
+  metadata.gz: c97fef25f08072ea4eeb038e749e825bff73b50db6e904bffb5b838b62840bcd7913be177726c2ae29059a589d4a73d65f571ef9b80da0d9ed8f6967c79a07da
+  data.tar.gz: 55fb8641d81332daccfbdc484ffa9e328593d84a0b36ee9c9da72004ae56055ca2508ce06df711725c1bf0f0c54048a2c3e566f84f7fcc5a5d2e3807acf97328

data/lib/rubytext.rb

@@ -13,6 +13,18 @@ end
 
 module RubyText
 
+  Colors = %w[black blue cyan green magenta red white yellow]
+  ColorPairs = {}
+  num = 0
+  Colors.each do |fc|
+    Colors.each do |bc|
+      fg = X.const_get("COLOR_#{fc.upcase}")
+      bg = X.const_get("COLOR_#{bc.upcase}")
+      pair = X.init_pair(num+=1, fg, bg)  # FIXME backwards?
+      ColorPairs[[fg, bg]] = pair
+    end
+  end
+
   module Keys
     Down  = 258
     Up    = 259
@@ -33,9 +45,6 @@ module RubyText
     F12   = 276
   end
 
-  Colors = %w[black blue cyan green 
-              magenta red white yellow]
-
   class Window
     def self.main
       debug "Entering Window.main"
@@ -45,12 +54,12 @@ module RubyText
       X.stdscr.bkgd(X.color_pair(1)|X::A_NORMAL)
       rows, cols = @main_win.maxy, @main_win.maxx
       debug "About to call .make"
-      @screen = self.make(@main_win, rows, cols, 0, 0, false)
+      @screen = self.make(@main_win, rows, cols, 0, 0, false, "white", "black")
       @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, bg)
+      debug "make: #{[cwin, high, wide, r0, c0, border, fg, bg]}"
       obj = self.allocate
       debug "Allocate returned a #{obj.class}"
       obj.instance_eval do 
@@ -87,8 +96,8 @@ module RubyText
     end
   end
 
-  def RubyText.window(high, wide, r0, c0, border=false)
-    RubyText::Window.new(high, wide, r0, c0, border)
+  def RubyText.window(high, wide, r0, c0, border=false, fg="white", bg="black")
+    RubyText::Window.new(high, wide, r0, c0, border, fg, bg)
   end
 
   def self.start(*args, log: nil, fg: nil, bg: nil)
@@ -136,21 +145,22 @@ end
 class RubyText::Window
   Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL  # ?|, ?-    # "\u2502", "\u2500"
 
-  attr_reader :win, :rows, :cols, :width, :height
+  attr_reader :win, :rows, :cols, :width, :height, :fg, :bg
 
-  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false)
+  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=:white, bg=:black)
     debug "RT::Win.init: #{[high, wide, r0, c0, border]}"
     @wide, @high, @r0, @c0 = wide, high, r0, c0
     @border = border
+    @fg, @bg = fg, bg
     @win = X::Window.new(high, wide, r0, c0)
-debug "outer = #{@win.inspect}"
-debug "@border = #@border"
+    debug "outer = #{@win.inspect}"
+    debug "@border = #@border"
     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)  # relative now??
+      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??
     else
       @outer = @win
     end
@@ -162,9 +172,14 @@ debug "About to call again: params = #{[high-2, wide-2, r0+1, c0+1]}"
   def delegate_output(sym, *args)
     args = [""] if args.empty?
     debug "#{sym}: args = #{args.inspect}"
-    args.map!(&:inspect) if sym == :p
+    if sym == :p
+      args.map!(&:inspect) 
+    else
+      args.map!(&:to_s) 
+    end
     str = sprintf(*args)
     str << "\n" if sym != :print && str[-1] != "\n"
+    # color-handling code here
     @win.addstr(str)
     @win.refresh
   end
@@ -243,7 +258,7 @@ end
 ### Stick stuff into Kernel for top level
 
 module Kernel
-  private 
+  # private 
   def puts(*args)       # Doesn't affect STDOUT.puts, etc.
     $stdscr.puts(*args)
   end

data/lib/version.rb

@@ -1,6 +1,6 @@
 
-class RubyText
-  VERSION = "0.0.15"
+module RubyText
+  VERSION = "0.0.16"
 
   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.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-14 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.2.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A thick wrapper for Curses