rubytext 0.0.87 → 0.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a39b4c532ccbd898dc02313b42d209f287066dedd723ac626bdbce565d33ed1
-  data.tar.gz: b0e729eb203af8688c493464bd4f5e0b029a2951e8a70964bb878f99c02c792b
+  metadata.gz: ced3715f5877f91e96305a6812dd3c463a6793ad262366e808abf03bfdb3f786
+  data.tar.gz: b862bb4a9ad54826f2b9ee35d0dc6d9ee1cdd1a8750df45b6a28b60eb5f2d40b
 SHA512:
-  metadata.gz: f79b5eba776e61bc8ab656c951e01409e25047298eff671ea197d9f1bde14aec83067042c685780154e66db0fa34ffcee36917bd89c6863b675656d111cd2d03
-  data.tar.gz: 1b8638507d0ba10d4807bd2c7a9724e2a222ca1c22e40de3312c4be3935fd0dd2c013c9d2a64c1dcdede16585a1f35de65adca057d49c10589ec83a76e295685
+  metadata.gz: fc2e23b54010d3a90630098f8a7550b791ba593582cd99949ab1f466b1ba877c2ad9ef33f8ef03e54e2cd3714ef50254f9f45e0cd0cbb3da83f3d9f79a37d3b1
+  data.tar.gz: 80ba06c198af61e490b870b3cd917e794e4668d9a53f9af6d1b0d0b620b32d087343fc4d6d5a50cd051b37c859040182725b227aec31a27d3725f86188c2a4f2

data/lib/menu.rb

@@ -5,13 +5,20 @@ module RubyText
     RubyText.hide_cursor
     high = items.size + 2
     wide = items.map(&:length).max + 4
-    tlen = title.length + 6  
+    tlen = title.length + 8  
     wide = [wide, tlen].max
     win.saveback(high, wide, r, c)
-    mr, mc = r+win.r0+1, c+win.c0+1 
+    mr, mc = r+win.r0, c+win.c0
+    debug "menu: rc = #{[r,c].inspect} win r0c0 = #{[win.r0, win.c0].inspect}"
+#   debug "   and mr,mc = #{[mr,mc].inspect}"
     mwin = RubyText.window(high, wide, r: mr, c: mc, 
                            fg: fg, bg: bg)
-    win.go(mr-2, mc-win.c0) { win.print fx("[ #{title} ]", :bold, fg, bg: bg) } unless title.nil?
+
+    unless title.nil?
+      win.go(r-1, c+1) do   # same row as corner but farther right
+        win.print fx("[ #{title} ]", :bold, fg, bg: bg)
+      end
+    end
 
     X.stdscr.keypad(true)
     sel = curr

data/lib/output.rb

@@ -135,7 +135,7 @@ class RubyText::Window
 
   def []=(r, c, char)
     @cwin.setpos(r, c)
-    @cwin.addch(char[0])
+    @cwin.addch(char[0].ord|X::A_NORMAL)
     @cwin.refresh
   end
 

data/lib/version.rb

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

data/lib/window.rb

@@ -98,20 +98,22 @@ class RubyText::Window
   end
 
   def saveback(high, wide, r, c)
+    debug "saveback: #{[high, wide, r, c].inspect}"
     @pos = self.rc
     @save = []
-    0.upto(high) do |h|
-      0.upto(wide) do |w|
-        @save << self[h+r, w+c]
+    0.upto(high-1) do |h|
+      0.upto(wide-1) do |w|
+        @save << self[h+r-1, w+c-1]
       end
     end
   end
 
   def restback(high, wide, r, c)
-    0.upto(high) do |h|
-      0.upto(wide) do |w|
-        self[h+r, w+c] = @save.shift
-      end
+    0.upto(high-1) do |h|
+      line = ""
+      0.upto(wide-1) {|w| line << @save.shift }
+      self.go h+r-1, c-1
+      self.print line
     end
     self.go *@pos
     @cwin.refresh

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.87
+  version: 0.0.88
 platform: ruby
 authors:
 - Hal Fulton