rubytext 0.0.69 → 0.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05ecb544b4d51313454758aa89eeb5997ced7b0cc8c8dc5e5609c842957d9aea
-  data.tar.gz: 943e529d5da7f1eba8826e4702e6dd9c12fe644664012af610796805f419b21b
+  metadata.gz: 22c0e83ef4094786d7d68439b96647488238c2b10eb5b686b7229815528e351f
+  data.tar.gz: 8b745f93f8c98c5701135bafd757a9892abe49697c26733cad6660b039451e60
 SHA512:
-  metadata.gz: 06273a824f50b4248fdddda9e72d2c967a42e56a04edbece55af9a0c9a4e80cc45e8c96ad5dc588a277f8d7619e4b2a3b2386f5f6ff9a8844138f1bbd1198c0c
-  data.tar.gz: 3360acf134a66130a6e9aaa373b6ac951af363ff01dcffdea667aa931c2e7d2cf5767b42b626b51370de30d9ab9de1b5d6285803b0193960c293fe7b443ff552
+  metadata.gz: c098bc1edf777f7ff66c07b8b5154049bcacffb1f81f1621302e2fd0568c35e51e7aab4f9c72f76d714c4ec68f5bbb3bf4bbcfb6240ce67aa5deb5e7ee45fd5f
+  data.tar.gz: 33a09d6e1ae1fd78c931ca7f1590ea89704b5d5b83df83a544c28fd5a23644f7691f8746f49b1d5816998334d7029023f898ba2a32b137883eee397bf026f64a

data/lib/effects.rb

@@ -1,8 +1,9 @@
 class RubyText::Effects   # dumb name?
   Modes  = {bold:    X::A_BOLD,
-            normal:  X:: A_NORMAL,
-            reverse: X:: A_REVERSE, 
-            under:   X:: A_UNDERLINE}
+            normal:  X::A_NORMAL,
+            reverse: X::A_REVERSE, 
+            under:   X::A_UNDERLINE}
+
 
   Others = %[:show, :hide]  # show/hide cursor; more later??
 
@@ -10,16 +11,16 @@ class RubyText::Effects   # dumb name?
   
   def initialize(win, *args)
     bits = 0
+    @list = args
     args.each do |arg|
       if Modes.keys.include?(arg)
         val = Modes[arg]
-        bits ||= val
+        bits |= val
       elsif ::Colors.include?(arg)
         @fg = arg   # symbol
       end
     end
     @value = bits
-    X.attrset(bits)
   end
 end
 

data/lib/menu.rb

@@ -65,15 +65,15 @@ module RubyText
     RubyText.set(:raw)
     X.stdscr.keypad(true)
     RubyText.hide_cursor
+    norm = RubyText::Effects.new(:normal, White)
+    rev  = RubyText::Effects.new(:reverse, White)
     sel = 0
     max = items.size - 1
     send(handler, sel, items[sel], win2)
     loop do
       items.each.with_index do |item, row|
-        menu_win.go row, 0
-        norm = RubyText::Effects.new(:normal, White)
-        rev  = RubyText::Effects.new(:reverse, White)
-        style = sel == row ? Yellow : White
+        menu_win.left
+        style = (sel == row) ? rev : norm
         menu_win.puts style, " #{item} "
       end
       ch = getch

data/lib/output.rb

@@ -20,24 +20,35 @@ class RubyText::Window
   end
 
   def delegate_output(sym, *args)
+    self.cwin.attrset(0)
     args = [""] if args.empty?
     args += ["\n"] unless sym == :print
-    set_colors(@fg, @bg)  # FIXME?
+    debug "\ndelegate_output:"
+    debug "  1. args = #{args.inspect}"
+    set_colors(@fg, @bg)
+    debug "  set colors: #{[@fg, @bg].inspect}"
     if sym == :p
-      args.map!(&:inspect) 
+      args.map! {|x| effect?(x) ? x : x.inspect }
+      debug "  2. args = #{args.inspect}"
     else
       args.map! {|x| effect?(x) ? x : x.to_s }
+      debug "  3. args = #{args.inspect}"
     end
     args.each do |arg|  
-    case
-      when arg.is_a?(RubyText::Effects)
-        X.attrset(arg.value)
+      debug "  loop: arg = #{arg.inspect}"
+      if arg.is_a?(RubyText::Effects)
+        debug "    arg.value = #{arg.value.inspect}, fg = #{arg.fg.inspect}"
+        self.cwin.attrset(arg.value)
+        debug "    set colors = #{[arg.fg, @bg]}"
         self.set_colors(arg.fg, @bg) if arg.fg
       else
+        debug "    printing arg = #{arg.inspect}"
         arg.each_char {|ch| ch == "\n" ? crlf : @cwin.addch(ch) }
+        @cwin.refresh
       end
     end
     set_colors(@fg, @bg)
+    debug "  set colors: #{[@fg, @bg].inspect}"
     @cwin.refresh
   end
 

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module RubyText
-  VERSION = "0.0.69"
+  VERSION = "0.0.70"
 
   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.69
+  version: 0.0.70
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-01 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses