rubytext 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb60b745db0f540e875aaec148466bcf8421b14de2d0b4aee92ef9c9416bde5
-  data.tar.gz: 68da81e432734dfd8dc3827b72c7db0440f6ba0a6203bf89b28b25ab5b0c9740
+  metadata.gz: 90fd407e8a80cfc0fb79bdfed6f97184984ed43df8598b23bc166a5427402c5e
+  data.tar.gz: 491e23b7274377c3e26f5b5375d965eaf666d009f373c74c72fc563c4f2ee4a2
 SHA512:
-  metadata.gz: 516c0b907a73e0bd6b4fe4788f198584f4eeb08f36319214520110d8cbb3646f32a833d68289b7d434032f33d45462df5eb4c8f2a956251a467e2ad70619505c
-  data.tar.gz: 1f79d1b030ba7eb1d0d360f672214dfb1b4386c96f434eb560897671c62c967043843567ec5fc26a137835f70683e32a638d21e26aa88103fd119aac588e91aa
+  metadata.gz: a434a77e4195559a342ff089dc764999b36faeb33de55a9d703b6c3d87051c1643c13ab7f41600587f26757ef38fd3d598a291c595d94d9c4b3e8befcd06a56c
+  data.tar.gz: e6b6b2e88ba130c1da44316d911925a4ed9743d5368e69f7d28a71425d8fa07dd449dde25bac7681c1cff69b2b53946f55bf4b1933778c803a8b6d513177c400

data/lib/keys.rb

@@ -1,20 +1,41 @@
 module RubyText::Keys
-  Down  = 258
-  Up    = 259
-  Left  = 260
-  Right = 261
-  Enter = 10
-  F1    = 265
-  F2    = 266
-  F3    = 267
-  F4    = 268
-  F5    = 269
-  F6    = 270
-  F7    = 271
-  F8    = 272
-  F9    = 273
-  F10   = 274
-  F11   = 275
-  F12   = 276
+  Down   = 258
+  Up     = 259
+  Left   = 260
+  Right  = 261
+
+  Enter  =  10
+  NL     =  10
+  LF     =  10
+
+  EOF    =   4
+  CtlD   =   4
+
+  Back   =   8   # backspace
+  BS     =   8
+
+  Tab    =   9
+  TAB    =   9
+
+  Escape =  27
+  ESC    =  27
+  Esc    =  27
+
+  Delete = 127
+  DEL    = 127
+  Del    = 127
+
+  F1     = 265
+  F2     = 266
+  F3     = 267
+  F4     = 268
+  F5     = 269
+  F6     = 270
+  F7     = 271
+  F8     = 272
+  F9     = 273
+  F10    = 274
+  F11    = 275
+  F12    = 276
 end
 

data/lib/menu.rb

@@ -1,6 +1,75 @@
 module RubyText
 
   class Window
+    def topmenu(items:, curr: 0, 
+             title: nil, fg: Green, bg: Black)
+      r, c = 0, 0
+      border = false
+      high = 1
+
+      RubyText.hide_cursor
+      if items.is_a?(Hash)
+        results = items.values
+        items = items.keys
+        hash_flag = true
+      else
+        results = items
+      end
+
+      tlen = title.length + 8 rescue 0
+      width = 0   # total width
+      cols = []   # start-column of each item
+      items.each do |item| 
+        cols << width
+        iwide = item.to_s.length + 2
+        width += iwide
+      end
+
+      r, c = self.coords(r, c)
+# puts "topmenu saved"
+# sleep 2
+      self.saveback(high, width, r, c)
+      mr, mc = r+self.r0, c+self.c0
+      title = nil
+      mwin = RubyText.window(high, width, r: mr, c: mc, border: border,
+                             fg: fg, bg: bg, title: title)
+      Curses.stdscr.keypad(true)
+      sel = curr
+      max = items.size - 1
+      loop do
+        items.each.with_index do |item, num|
+          item = " #{item} "
+          mwin.go 0, cols[num]
+          style = (sel == num) ? :reverse : :normal
+          mwin.print fx(item, style)
+        end
+        ch = getch
+        case ch
+          when Curses::KEY_LEFT
+            sel -= 1 if sel > 0
+          when Curses::KEY_RIGHT
+            sel += 1 if sel < max
+          when 27
+            self.restback(high, width, r, c)
+            RubyText.show_cursor
+            return [nil, nil]
+          when 10
+            self.restback(high, width, r, c)
+# puts "topmenu restored"
+# sleep 2
+            RubyText.show_cursor
+            choice = results[sel]
+            return [sel, choice] if choice.is_a? String
+            result = choice.call
+            next if result.nil?
+            next if result.empty?
+            return result
+          else Curses.beep
+        end
+        RubyText.show_cursor
+      end
+    end
+
     def menu(r: :center, c: :center, items:, curr: 0, 
              border: true,
              title: nil, fg: Green, bg: Black)
@@ -24,6 +93,8 @@ module RubyText
       row = row - high/2 if r == :center
       col = col - wide/2 if c == :center
       r, c = row, col
+# puts "menu2 saved"
+# sleep 2
       self.saveback(high, wide, r, c)
       mr, mc = r+self.r0, c+self.c0
       title = nil unless border
@@ -37,7 +108,7 @@ module RubyText
         items.each.with_index do |item, row|
           mwin.go row, 0
           style = (sel == row) ? :reverse : :normal
-          label = (" "*2 + item + " "*8)[0..wide-1]
+          label = (" "*2 + item.to_s + " "*8)[0..wide-1]
           mwin.print fx(label, style)
         end
         ch = getch
@@ -53,7 +124,11 @@ module RubyText
           when 10
             self.restback(high, wide, r, c)
             RubyText.show_cursor
-            return [sel, results[sel]]
+            choice = results[sel]
+            return [sel, choice] if choice.is_a? String
+            result = choice.call
+            return [nil, nil] if result.nil? || result.empty?
+            return result
           else Curses.beep
         end
         RubyText.show_cursor

data/lib/output.rb

@@ -1,6 +1,10 @@
 $LOAD_PATH << "lib"
 
+require 'keys'
+
 class RubyText::Window
+  include ::RubyText::Keys
+
   def center(str)
     r, c = self.rc
     n = @cwin.maxx - str.length
@@ -249,29 +253,36 @@ class RubyText::Window
     # echo assumed to be OFF, keypad ON
     @history = history
     gs = GetString.new(self, default, history: history, limit: limit, tab: tab)
+    count = 0
     loop do
+      count += 1      # Escape has special meaning if first char
       ch = self.getch
       case ch
-        when 10
+        when Escape
+          return Escape if count == 1
+          gs.enter
+          break
+        when CtlD
+          return CtlD if count == 1
           gs.enter
           break
-        when 8, 127, 63   # backspace, del, ^H (huh?)
+        when Enter
+          gs.enter
+          break
+        when BS, DEL, 63   # backspace, del, ^H (huh?)
           gs.backspace
-        when 9  # tab
+        when Tab
           gs.complete
-        when 260   # left-arrow
+        when Left
           gs.left_arrow
-        when 261   # right-arrow
+        when Right
           gs.right_arrow
-        when 259   # up
+        when Up
           next if @history.nil?  # move this?
           gs.history_prev
-        when 258   # down
+        when Down
           next if @history.nil?  # move this?
           gs.history_next
-        when 27    # escape
-          gs.enter
-          break
         when Integer
           Curses.beep
         else

data/lib/rubytext_version.rb

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

data/lib/widgets.rb

@@ -37,14 +37,17 @@ module RubyText
 
   def self.splash(msg)
     lines = msg.split("\n")
-    high = lines.size + 2
-    wide = lines.map {|x| x.length }.max + 2
-    STDSCR.saveback(high, wide, 10, 20)
-    win = RubyText.window(high, wide, r: 10, c: 20, fg: White, bg: Red)
+    high = lines.size + 4
+    wide = lines.map {|x| x.length }.max + 4
+    r0 = (STDSCR.rows - high)/2
+    c0 = (STDSCR.cols - wide)/2
+    STDSCR.saveback(high, wide, r0, c0)
+    win = RubyText.window(high, wide, r: r0, c: c0, 
+                          fg: White, bg: Red, title: "[Press any key]")
+    win.print "\n "
     win.puts msg
     getch
-    STDSCR.restback(high, wide, 10, 20)
+    STDSCR.restback(high, wide, r0, c0)
   end
 
-  # TODO add splash
 end

data/lib/window.rb

@@ -13,6 +13,7 @@ end
 
 class RubyText::Window
   Vert, Horiz = Curses::A_VERTICAL, Curses::A_HORIZONTAL
+  ScreenStack = []
 
   attr_reader :cwin, :rows, :cols, :width, :height, :scrolling
   attr_reader :r0, :c0
@@ -120,32 +121,45 @@ class RubyText::Window
     lines
   end
 
+  def background(high=STDSCR.rows, wide=STDSCR.cols, r=0, c=0)
+    saveback(high, wide, r, c)
+    yield
+    restback(high, wide, r, c)
+  end
+
   def saveback(high=STDSCR.rows, wide=STDSCR.cols, r=0, c=0)
     debug "saveback: #{[high, wide, r, c].inspect}"
-    @pos = self.rc
-    @save = []
+    save = [self.rc]
     0.upto(high-1) do |h|
       0.upto(wide-1) do |w|
         row, col = h+r-1, w+c-1
         row += 1 if self == STDSCR   # wtf?
         col += 1 if self == STDSCR
-        @save << self[row, col]
+        save << self[row, col]
       end
     end
+    ScreenStack.push save
   end
 
   def restback(high=STDSCR.rows, wide=STDSCR.cols, r=0, c=0)
+    save = ScreenStack.pop
+    pos = save.shift
     0.upto(high-1) do |h|
       line = ""
-      0.upto(wide-1) {|w| line << @save.shift }
+      0.upto(wide-1) {|w| line << save.shift }
       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
+    self.go *pos
     @cwin.refresh
+  rescue => err
+    puts "Error!"
+    puts err
+    puts err.backtrace.join("\n")
+    sleep 8
   end
 
   def fg=(sym)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses