rubytext 0.0.88 → 0.0.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ced3715f5877f91e96305a6812dd3c463a6793ad262366e808abf03bfdb3f786
-  data.tar.gz: b862bb4a9ad54826f2b9ee35d0dc6d9ee1cdd1a8750df45b6a28b60eb5f2d40b
+  metadata.gz: a8d6049a03577c6aa5919abd27092093e46a57484285f3a79f49c01465d86fce
+  data.tar.gz: 51acb3997e4112519f88247d13e42c3857d3213ea16101696a3437aa5dc5f016
 SHA512:
-  metadata.gz: fc2e23b54010d3a90630098f8a7550b791ba593582cd99949ab1f466b1ba877c2ad9ef33f8ef03e54e2cd3714ef50254f9f45e0cd0cbb3da83f3d9f79a37d3b1
-  data.tar.gz: 80ba06c198af61e490b870b3cd917e794e4668d9a53f9af6d1b0d0b620b32d087343fc4d6d5a50cd051b37c859040182725b227aec31a27d3725f86188c2a4f2
+  metadata.gz: 2b3c8b90adfafc39d23bf4f14fe6c3251c725b38a8c63dadcd7f42f245977efae6b02801d3cec43becea64be1c554fe6187d6e1602c4498442e846846be33435
+  data.tar.gz: ca0598628940b1681e04ad820ea6b42d0142098dece9e1852f9c1bba9eea97b27cc3c14ac53deb4d8c2b7981b8aa8c3de9eb5d3e7ddd97eff9e09111dc1977c3

data/lib/menu.rb

@@ -1,12 +1,13 @@
 module RubyText
 
-  def self.menu(win: STDSCR, r: 0, c: 0, items:, curr: 0,
+  def self.menu(win: STDSCR, r: :center, c: :center, items:, curr: 0,
                 title: nil, fg: White, bg: Blue)
     RubyText.hide_cursor
     high = items.size + 2
     wide = items.map(&:length).max + 4
     tlen = title.length + 8  
     wide = [wide, tlen].max
+    r, c = win.coords(r, c)
     win.saveback(high, wide, r, c)
     mr, mc = r+win.r0, c+win.c0
     debug "menu: rc = #{[r,c].inspect} win r0c0 = #{[win.r0, win.c0].inspect}"
@@ -14,8 +15,10 @@ module RubyText
     mwin = RubyText.window(high, wide, r: mr, c: mc, 
                            fg: fg, bg: bg)
 
+    where = win == STDSCR ? [r, c+1] : [r-1, c+1]  # wtf?
+
     unless title.nil?
-      win.go(r-1, c+1) do   # same row as corner but farther right
+      win.go(*where) do   # same row as corner but farther right
         win.print fx("[ #{title} ]", :bold, fg, bg: bg)
       end
     end

data/lib/output.rb

@@ -19,7 +19,7 @@ class RubyText::Window
     args = [""] if args.empty?
     args += ["\n"] if sym == :puts
     set_colors(@fg, @bg)
-    debug "  set colors: #{[@fg, @bg].inspect}"
+#   debug "  set colors: #{[@fg, @bg].inspect}"
     if sym == :p
       args.map! {|x| effect?(x) ? x : x.inspect }
     else

data/lib/version.rb

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

data/lib/window.rb

@@ -7,7 +7,7 @@ class RubyText::Window
 
   # Better to use Window.window IRL
 
-  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, 
+  def initialize(high=nil, wide=nil, r0=0, c0=0, border=false, 
                  fg=White, bg=Blue, scroll=false)
     @wide, @high, @r0, @c0 = wide, high, r0, c0
     @border, @fg, @bg      = border, fg, bg
@@ -103,7 +103,10 @@ class RubyText::Window
     @save = []
     0.upto(high-1) do |h|
       0.upto(wide-1) do |w|
-        @save << self[h+r-1, w+c-1]
+        row, col = h+r-1, w+c-1
+        row += 1 if self == STDSCR   # wtf?
+        col += 1 if self == STDSCR
+        @save << self[row, col]
       end
     end
   end
@@ -112,7 +115,10 @@ class RubyText::Window
     0.upto(high-1) do |h|
       line = ""
       0.upto(wide-1) {|w| line << @save.shift }
-      self.go h+r-1, c-1
+      row, col = h+r-1, c-1
+      row += 1 if self == STDSCR   # wtf?
+      col += 1 if self == STDSCR
+      self.go row, col
       self.print line
     end
     self.go *@pos

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.88
+  version: 0.0.89
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses