rubytext 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90fd407e8a80cfc0fb79bdfed6f97184984ed43df8598b23bc166a5427402c5e
-  data.tar.gz: 491e23b7274377c3e26f5b5375d965eaf666d009f373c74c72fc563c4f2ee4a2
+  metadata.gz: dc35032215721ae6cc67dcb1a801f94ea6eaabd68716362f62a1f82c84cf9c8e
+  data.tar.gz: 4298fe621d895c5392a2170f0ec29ba043516e4f245d80d80ef5c99cc01e9526
 SHA512:
-  metadata.gz: a434a77e4195559a342ff089dc764999b36faeb33de55a9d703b6c3d87051c1643c13ab7f41600587f26757ef38fd3d598a291c595d94d9c4b3e8befcd06a56c
-  data.tar.gz: e6b6b2e88ba130c1da44316d911925a4ed9743d5368e69f7d28a71425d8fa07dd449dde25bac7681c1cff69b2b53946f55bf4b1933778c803a8b6d513177c400
+  metadata.gz: 210598d6cacdfbe8ae32ef68f9997d094038486068e2fb5b453578aea53cd4b075cc26a1d2f191419b79e22c800989312f8a1c4ffe23f322a3cd74ba3dfe25d3
+  data.tar.gz: 63a08f8589711d9cb0b8c7224aba3fc5630dc474b24d92678c4ab0f3165d95689db0c1bee38a924c3f541a0a86863a83ca0de8a2f80607dc9e63aa73d7c18bb2

data/lib/menu.rb

@@ -1,10 +1,8 @@
 module RubyText
 
   class Window
-    def topmenu(items:, curr: 0, 
-             title: nil, fg: Green, bg: Black)
+    def topmenu(items:, curr: 0, fg: Green, bg: Black)
       r, c = 0, 0
-      border = false
       high = 1
 
       RubyText.hide_cursor
@@ -16,7 +14,6 @@ module RubyText
         results = items
       end
 
-      tlen = title.length + 8 rescue 0
       width = 0   # total width
       cols = []   # start-column of each item
       items.each do |item| 
@@ -26,13 +23,9 @@ module RubyText
       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)
+      mwin = RubyText.window(high, width, r: mr, c: mc, fg: fg, bg: bg, border: false, title: nil)
       Curses.stdscr.keypad(true)
       sel = curr
       max = items.size - 1
@@ -45,18 +38,16 @@ module RubyText
         end
         ch = getch
         case ch
-          when Curses::KEY_LEFT
+          when Left
             sel -= 1 if sel > 0
-          when Curses::KEY_RIGHT
+          when Right
             sel += 1 if sel < max
-          when 27
+          when Esc, " "   # spacebar also quits
             self.restback(high, width, r, c)
             RubyText.show_cursor
             return [nil, nil]
-          when 10
+          when Down, Enter
             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
@@ -93,8 +84,6 @@ 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
@@ -113,15 +102,15 @@ module RubyText
         end
         ch = getch
         case ch
-          when Curses::KEY_UP
+          when Up
             sel -= 1 if sel > 0
-          when Curses::KEY_DOWN
+          when Down
             sel += 1 if sel < max
-          when 27
+          when Esc
             self.restback(high, wide, r, c)
             RubyText.show_cursor
             return [nil, nil]
-          when 10
+          when Enter
             self.restback(high, wide, r, c)
             RubyText.show_cursor
             choice = results[sel]
@@ -165,15 +154,15 @@ module RubyText
         end
         ch = getch
         case ch
-          when Curses::KEY_UP
+          when Up
             sel -= 1 if sel > 0
-          when Curses::KEY_DOWN
+          when Down
             sel += 1 if sel < max
-          when 27
+          when Esc
             self.restback(high, wide, r, c)
             RubyText.show_cursor
             return []
-          when 10
+          when Enter
             self.restback(high, wide, r, c)
             RubyText.show_cursor
             return selected.map {|i| items[i] }
@@ -192,6 +181,75 @@ module RubyText
       num, str = STDSCR.menu(r: r, c: c+6, items: ["yes", "no"])
       num == 0
     end
+
+    def radio_menu(r: :center, c: :center, items:, curr: 0, 
+             # Handle current value better?
+             border: true,
+             title: nil, fg: Green, bg: Black)
+      RubyText.hide_cursor
+      if items.is_a?(Hash)
+        results = items.values
+        items = items.keys
+        hash_flag = true
+      else
+        results = items
+      end
+      
+      high = items.size
+      wide = items.map(&:length).max + 3
+      high += 2 if border
+      wide += 2 if border
+
+      tlen = title.length + 8 rescue 0
+      wide = [wide, tlen].max
+      row, col = self.coords(r, c)
+      row = row - high/2 if r == :center
+      col = col - wide/2 if c == :center
+      r, c = row, col
+      self.saveback(high, wide, r, c)
+      mr, mc = r+self.r0, c+self.c0
+      title = nil unless border
+      mwin = RubyText.window(high, wide, r: mr, c: mc, border: border,
+                             fg: fg, bg: bg, title: title)
+      Curses.stdscr.keypad(true)
+      sel = curr
+      max = items.size - 1
+      loop do
+        RubyText.hide_cursor  # FIXME should be unnecessary
+        items.each.with_index do |item, row|
+          mark = row == curr ? ">" : " "
+          mwin.go row, 0
+          style = (sel == row) ? :reverse : :normal
+          label = "#{mark} #{item}"
+          mwin.print fx(label, style)
+        end
+        ch = getch
+        case ch
+          when Up
+            sel -= 1 if sel > 0
+          when Down
+            sel += 1 if sel < max
+          when Esc
+            self.restback(high, wide, r, c)
+            RubyText.show_cursor
+            return [nil, nil]
+          when " "
+            mwin[curr, 0] = " "
+            mwin[sel, 0] = ">"
+            curr = sel
+          when Enter
+            self.restback(high, wide, r, c)
+            RubyText.show_cursor
+            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
+      end
+    end
   end
 
   def self.selector(win: STDSCR, r: 0, c: 0, rows: 10, cols: 20, 
@@ -215,17 +273,17 @@ module RubyText
       end
       ch = getch
       case ch
-        when Curses::KEY_UP
+        when Up
           if sel > 0
             sel -= 1
             handler.call(sel, items[sel], win2)
           end
-        when Curses::KEY_DOWN
+        when Down
           if sel < max
             sel += 1
             handler.call(sel, items[sel], win2)
           end
-        when 10  # Enter
+        when Enter
           if enter
             del = enter.call(sel, items[sel], win2)
             if del
@@ -233,7 +291,7 @@ module RubyText
               raise 
             end
           end
-        when 9  # tab
+        when Tab
           Curses.flash
         when quit  # parameter
           exit

data/lib/output.rb

@@ -147,7 +147,7 @@ class RubyText::Window
   end
 
   class GetString
-    def initialize(win = STDSCR, str = "", i = 0, history: [], limit: nil, tab: [])
+    def initialize(win = STDSCR, str = "", i = 0, history: [], limit: nil, tab: [], capture: [])
       @win = win
       @r0, @c0 = @win.rc
       @limit = limit || (@win.cols - @r0 - 1)
@@ -249,15 +249,20 @@ class RubyText::Window
     end
   end
 
-  def gets(history: [], limit: nil, tab: [], default: "")  # still needs improvement
+  def gets(history: [], limit: nil, tab: [], default: "", capture: [])
+    # needs improvement
     # echo assumed to be OFF, keypad ON
     @history = history
-    gs = GetString.new(self, default, history: history, limit: limit, tab: tab)
+    gs = GetString.new(self, default, history: history, limit: limit, tab: tab, 
+                       capture: capture)
     count = 0
     loop do
-      count += 1      # Escape has special meaning if first char
+      count += 1      # Escape and 'capture' chars have special meaning if first char
       ch = self.getch
       case ch
+        when *capture 
+          return ch if count == 1
+          gs.add(ch)
         when Escape
           return Escape if count == 1
           gs.enter

data/lib/rubytext_version.rb

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

data/lib/window.rb

@@ -1,6 +1,5 @@
 
 module RubyText
-  # TODO add title:?
   def self.window(high, wide, r: nil, c: nil, border: true, 
                   fg: White, bg: Blue, scroll: false, title: nil)
     r ||= (STDSCR.rows - high)/2

metadata

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