rubytext 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0ecdb93b304aab7078cc28528723533823a3ed30
-  data.tar.gz: 038e5bf83d0f0061cce07944310f6b814e7b1905
+SHA256:
+  metadata.gz: 01d2a45364981d0139df502a40e86e0b3cbd1186bae314e1f987dc704ba0c5cc
+  data.tar.gz: bab37c6c328abe1d33fd75c8a8f2c0e2a691a211f6f272d334802b5e4a219486
 SHA512:
-  metadata.gz: 83d286e2e30f318357df6dc4083679df4d439e0fd4a95d04643cd896a83cc569c56e53ee577295985764cd9c9f0a4ee6d7ed5e01c8bf66478e90bcfc43601edb
-  data.tar.gz: 3b59e05d9c04b167369cad55fc7cb6d295b9cb99eacd30e3a3f9f856a7ff26258b9666773b82191008ef919e2f665731b055acc99479918503709366f9b79f69
+  metadata.gz: 6cb6a7992dfc787cceffcef1036ec5678fddde72ea2ec22cbeef9e00e1fc01bb36ac9ae81c17102bb31ca948a5b7f0fe5d00e433dcf10faf9d18850c65d1160c
+  data.tar.gz: 39f142d6bc3136ff4bfefa80926753ffdec548a522b4a6d0ac363de83ca2417425ee53d7416e53a9ae3748b6247529acff52dc09663205b83dec74b3739026ee

data/lib/rubytext.rb

@@ -11,17 +11,27 @@ def debug(*args)
   $debug.puts *args
 end
 
+def fb2cp(fg, bg)
+  debug "Colors are: #{fg} on #{bg}"
+  fg = X.const_get("COLOR_#{fg.upcase}")
+  bg = X.const_get("COLOR_#{bg.upcase}")
+  debug "Curses colors are: #{fg} on #{bg}"
+  cp = $ColorPairs[[fg, bg]]
+  debug "cp is: #{cp}"
+  [fg, bg, cp]
+end
+
 module RubyText
 
   Colors = %w[black blue cyan green magenta red white yellow]
-  ColorPairs = {}
+  $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}")
       X.init_pair(num+=1, fg, bg)  # FIXME backwards?
-      ColorPairs[[fg, bg]] = num
+      $ColorPairs[[fg, bg]] = num
     end
   end
 
@@ -46,20 +56,22 @@ module RubyText
   end
 
   class Window
-    def self.main
-      debug "Entering Window.main"
+    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.init_pair(1, X::COLOR_BLACK, X::COLOR_WHITE)
-#     X.stdscr.bkgd(X.color_pair(1)|X::A_NORMAL)
+      X.stdscr.bkgd(cp|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, "white", "black")
+      @screen = self.make(@main_win, rows, cols, 0, 0, false)
       @screen
     end
 
-    def self.make(cwin, high, wide, r0, c0, border, fg, bg)
-      debug "make: #{[cwin, high, wide, r0, c0, border, fg, bg]}"
+    def self.make(cwin, high, wide, r0, c0, border)
+      debug "make: #{[cwin, high, wide, r0, c0, border]}"
       obj = self.allocate
       debug "Allocate returned a #{obj.class}"
       obj.instance_eval do 
@@ -77,42 +89,36 @@ end
 
 # debug "Setting STDSCR to Window.main"
 
-STDSCR = RubyText::Window.main
-$stdscr = STDSCR
+# STDSCR = RubyText::Window.main
+# $stdscr = STDSCR
 
-###
-
-module RubyText
+=begin
+  Logic flow - 
+    main
+      initscreen
+      start_color
+      make
+    STDSCR = RubyText::Window.main
+    $stdscr = STDSCR
 
-  # For passing through arbitrary method calls
-  # to the lower level...
+=end
 
-  def self.method_missing(name, *args)
-    debug "method_missing: #{name}  #{args.inspect}"
-    if name[0] == '_'
-      X.send(name[1..-1], *args)
-    else
-      raise "#{name} #{args.inspect}" # NoMethodError
-    end
-  end
+###
 
-  def RubyText.window(high, wide, r0, c0, border=false, fg="white", bg="black")
-    RubyText::Window.new(high, wide, r0, c0, border, fg, bg)
-  end
+module RubyText
 
   def self.start(*args, log: nil, fg: nil, bg: nil)
     $debug = File.new(log, "w") if log
+    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)
-debug "Colors are: #{fg} on #{bg}"
-    fg = X.const_get("COLOR_#{fg.upcase}")
-    bg = X.const_get("COLOR_#{bg.upcase}")
-debug "Curses colors are: #{fg} on #{bg}"
-    cp = ColorPairs[[fg, bg]]
-debug "cp is: #{cp}"
-    X.stdscr.bkgd(cp|X::A_NORMAL)
+    fg, bg, cp = fb2cp(fg, bg)
+#   X.bkgd(cp|X::A_NORMAL)
+#   X.clear
     X.noecho
     X.stdscr.keypad(true)
     X.cbreak   # by default
@@ -131,6 +137,22 @@ debug "cp is: #{cp}"
     end
   end
 
+  # For passing through arbitrary method calls
+  # to the lower level...
+
+  def self.method_missing(name, *args)
+    debug "method_missing: #{name}  #{args.inspect}"
+    if name[0] == '_'
+      X.send(name[1..-1], *args)
+    else
+      raise "#{name} #{args.inspect}" # NoMethodError
+    end
+  end
+
+  def RubyText.window(high, wide, r0, c0, border=false, fg=nil, bg=nil)
+    RubyText::Window.new(high, wide, r0, c0, border, fg, bg)
+  end
+
   def self.hide_cursor
     X.curs_set(0)
   end

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module RubyText
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 
   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.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Hal Fulton
@@ -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