rubytext 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d783de4f9ac0e7be3a29de63f0a4b6ff1fcfa16d8c07ecc2cc6df601323d1a
-  data.tar.gz: ebcf7986f5e01d025937069c02715320a33ec5a9d53aa35a46623d5c536b3310
+  metadata.gz: 8da5161f346670f599c83421e2afce02a97086876fbdf503128b0028e277ff0a
+  data.tar.gz: f32bbf5a7e09479a2b06f02bc85c2918da76f44503ee827722c4d77687874efc
 SHA512:
-  metadata.gz: bd98e89f8feef5d65705de7003c9eed1f36ace3ed28797326709ce7b3d6de4e032ff147b0c7539660c3ddf87c0d7b7aa387de1666b25c45b986bb1073d40949f
-  data.tar.gz: a8c7d0fe7fd1c4174a2cb7f26039778e3dfbe0e55253e2117e115c6620b131efd82a1340e8aca18356640920f0a1418b31da76b4c5b89fcb4a06b6e220c47e06
+  metadata.gz: 3d1a385ecafbb8647617c71ae220221ad6c6f7245063d5cd81b5ca72c7a0524ee0fc909e854d082f31e5532c35bf2b2c49b532adeb1214283d9d0e4550529946
+  data.tar.gz: b695005b05ac1f2a32f5b349c78ea65582aa8d538adf974dd594e29323ad56a64508f5aee21b8ce2c3cb63c085d31997b575a3dbcb4357eb8fd87773c6975c46

data/examples/prog21.rb

@@ -5,11 +5,11 @@ puts "Press any key to display the menu..."
 getch
 
 days = %w[Monday Tuesday Wednesday Thursday Friday]
-picked = RubyText.menu(c: 30, items: days)
+num, day = RubyText.menu(c: 30, items: days)
 
 puts
-if picked.nil?
+if day.nil?
   puts "You picked nothing!"
 else
-  puts "You picked item #{picked} which is #{days[picked].inspect}"
+  puts "You picked item #{num} which is #{day.inspect}"
 end

data/lib/color.rb

@@ -0,0 +1,45 @@
+
+def fb2cp(fg, bg)
+  fg ||= :blue
+  bg ||= :white
+  f2 = X.const_get("COLOR_#{fg.upcase}")
+  b2 = X.const_get("COLOR_#{bg.upcase}")
+  cp = $ColorPairs[[fg, bg]]
+  [f2, b2, cp]
+end
+
+module RubyText
+  Colors = [:black, :blue, :cyan, :green, :magenta, 
+            :red, :white, :yellow]
+  $ColorPairs = {}
+  num = 0
+  Colors.each do |fsym|
+    Colors.each do |bsym|
+      fg = X.const_get("COLOR_#{fsym.upcase}")
+      bg = X.const_get("COLOR_#{bsym.upcase}")
+      X.init_pair(num+=1, fg, bg)  # FIXME backwards?
+      $ColorPairs[[fsym, bsym]] = num
+    end
+  end
+end
+
+class RubyText::Window
+  def self.colors(win, fg, bg)
+    cfg, cbg, cp = fb2cp(fg, bg)
+    X.init_pair(cp, cfg, cbg)
+    win.color_set(cp|X::A_NORMAL)
+  end
+
+  def self.colors!(win, fg, bg)
+    colors(win, fg, bg)
+    num = win.maxx * win.maxy
+    win.setpos(0, 0)
+    win.addstr(' '*num)
+    win.setpos(0, 0)
+    win.refresh
+  end
+
+  def fg=(sym)
+    self.colors(@win, fg, @bg)
+  end
+end

data/lib/menu.rb

@@ -20,21 +20,21 @@ module RubyText
     STDSCR.refresh
   end
 
-  def self.menu(r: 0, c: 0, items:)
+  def self.menu(r: 0, c: 0, items:, curr: 0)
     high = items.size + 2
     wide = items.map(&:length).max + 4
     saveback(high, wide, r, c)
-    @mywin = RubyText.window(high, wide, r, c, true, fg: :white, bg: :blue)
+    win = RubyText.window(high, wide, r, c, true, fg: :white, bg: :blue)
     RubyText.set(:raw)
     X.stdscr.keypad(true)
     RubyText.hide_cursor
-    sel = 0
+    sel = curr
     max = items.size - 1
     loop do
       items.each.with_index do |item, row|
-        @mywin.go row, 0
+        win.go row, 0
         color = sel == row ? :yellow : :white
-        @mywin.puts color, " #{item} "
+        win.puts color, " #{item} "
       end
       ch = getch
       case ch
@@ -44,10 +44,10 @@ module RubyText
           sel += 1 if sel < max
         when 27
           restback(high, wide, r, c)
-          return nil
+          return [nil, nil]
         when 10
           restback(high, wide, r, c)
-          return sel
+          return [sel, items[sel]]
       end
     end
   end
@@ -85,9 +85,6 @@ module RubyText
             handler.call(sel, items[sel])
           end
         when quit  # parameter
-          win2.clear
-          win2.puts "About to quit..."
-          sleep 1
           exit
       end
     end

data/lib/output.rb

@@ -5,34 +5,7 @@ def debug(*args)
   $debug.puts *args
 end
 
-def fb2cp(fg, bg)
-  fg ||= :blue
-  bg ||= :white
-  f2 = X.const_get("COLOR_#{fg.upcase}")
-  b2 = X.const_get("COLOR_#{bg.upcase}")
-  cp = $ColorPairs[[fg, bg]]
-  [f2, b2, cp]
-end
-
-module RubyText
-
-  Colors = [:black, :blue, :cyan, :green, :magenta, :red, :white, :yellow]
-  $ColorPairs = {}
-  num = 0
-  Colors.each do |fsym|
-    Colors.each do |bsym|
-      fg = X.const_get("COLOR_#{fsym.upcase}")
-      bg = X.const_get("COLOR_#{bsym.upcase}")
-      X.init_pair(num+=1, fg, bg)  # FIXME backwards?
-      $ColorPairs[[fsym, bsym]] = num
-    end
-  end
-
-end
-
-
 class RubyText::Window
-
   def center(str)
     r, c = self.rc
     n = @win.maxx - str.length

data/lib/rubytext.rb

@@ -10,6 +10,7 @@ require 'output'       # RubyText, RubyText::Window, Kernel
 require 'keys'         # RubyText::Keys
 require 'menu'         # RubyText
 require 'window'       # RubyText::Window
+require 'colors'       # RubyText, RubyText::Window
 require 'navigation'   # RubyText::Window
 require 'settings'     # RubyText
 

data/lib/version.rb

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

data/lib/window.rb

@@ -27,20 +27,6 @@ class RubyText::Window
     @width, @height = @cols + 2, @rows + 2 if @border
     @win.refresh
   end
-  def self.colors(win, fg, bg)
-    cfg, cbg, cp = fb2cp(fg, bg)
-    X.init_pair(cp, cfg, cbg)
-    win.color_set(cp|X::A_NORMAL)
-  end
-
-  def self.colors!(win, fg, bg)
-    colors(win, fg, bg)
-    num = win.maxx * win.maxy
-    win.setpos(0, 0)
-    win.addstr(' '*num)
-    win.setpos(0, 0)
-    win.refresh
-  end
 
   def self.main(fg: nil, bg: nil)
     @main_win = X.init_screen
@@ -78,14 +64,4 @@ class RubyText::Window
     end
     obj
   end
-
-  def fg=(sym)
-    self.colors(@win, fg, @bg)
-  end
-
-  def self.wocka
-    STDSCR.puts "HELLO!!!!!!"
-    sleep 5
-  end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -67,6 +67,7 @@ files:
 - examples/prog21.rb
 - examples/showme.rb
 - examples/slides
+- lib/color.rb
 - lib/keys.rb
 - lib/menu.rb
 - lib/navigation.rb