rubytext 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 4536ed9e2ce1dbd28d40a9e19adf2a5aa4a0e8c5bf6bc13666d3ea00708bece1
-  data.tar.gz: 996510b10225a5dd569ebcbb7f022308b10f4d8f050870b686bba5c30ecff64e
+SHA1:
+  metadata.gz: 08ffa85b81ca450d7b1df0fba494d0aee54ec671
+  data.tar.gz: 3685f3c683f9009bbff2cc60b0bc716c33d5e892
 SHA512:
-  metadata.gz: c97fef25f08072ea4eeb038e749e825bff73b50db6e904bffb5b838b62840bcd7913be177726c2ae29059a589d4a73d65f571ef9b80da0d9ed8f6967c79a07da
-  data.tar.gz: 55fb8641d81332daccfbdc484ffa9e328593d84a0b36ee9c9da72004ae56055ca2508ce06df711725c1bf0f0c54048a2c3e566f84f7fcc5a5d2e3807acf97328
+  metadata.gz: 2f0f9d3b51e1f72efe4d5d581462afa3d8b66f997b2d5a340df311a5cb8041105645cdefad5e7e3a393e6c4f5f38f9e8b62385632426e6407e5042f790d83fed
+  data.tar.gz: 32b5f34ec3ceca5d567309f6111163a3bac396c90710b0af773d71b09c08d14256b7ec6cee670d604bb6accccfb08c2b4b450aa797f8b05c06e79e1200b0efc1

data/lib/rubytext.rb

@@ -20,8 +20,8 @@ module RubyText
     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
+      X.init_pair(num+=1, fg, bg)  # FIXME backwards?
+      ColorPairs[[fg, bg]] = num
     end
   end
 
@@ -50,8 +50,8 @@ module RubyText
       debug "Entering Window.main"
       @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.init_pair(1, X::COLOR_BLACK, X::COLOR_WHITE)
+#     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, "white", "black")
@@ -102,14 +102,19 @@ module RubyText
 
   def self.start(*args, log: nil, fg: nil, bg: nil)
     $debug = File.new(log, "w") if log
-    fg ||= :white
-    bg ||= :black
+#   fg ||= :white
+#   bg ||= :black
+debug "Version = #{RubyText::Version}"
+$debug.flush
     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}")
-    X.init_pair(1, bg, fg)
-    X.stdscr.bkgd(X.color_pair(1)|X::A_NORMAL)
+debug "Curses colors are: #{fg} on #{bg}"
+    cp = ColorPairs[[fg, bg]]
+debug "cp is: #{cp}"
+    X.stdscr.bkgd(cp|X::A_NORMAL)
     X.noecho
     X.stdscr.keypad(true)
     X.cbreak   # by default
@@ -160,7 +165,7 @@ class RubyText::Window
       @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??
+      @win = X::Window.new(high-2, wide-2, r0+1, c0+1) # , false, fg, bg)  # relative now??
     else
       @outer = @win
     end
@@ -171,7 +176,7 @@ class RubyText::Window
 
   def delegate_output(sym, *args)
     args = [""] if args.empty?
-    debug "#{sym}: args = #{args.inspect}"
+#   debug "#{sym}: args = #{args.inspect}"
     if sym == :p
       args.map!(&:inspect) 
     else
@@ -214,6 +219,11 @@ class RubyText::Window
     end
   end
 
+  def down
+    r, c = rc
+    go r+1, c
+  end
+
   def rc
     [@win.cury, @win.curx]
   end

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module RubyText
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 
   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.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-11-15 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