rubytext 0.1.21 → 0.1.25

data/lib/navigation.rb

@@ -1,5 +1,9 @@
+# Reopening: Coordinate handling (1-based!)
+
 class RubyText::Window
 
+  # Handle special coordinate names (symbols)
+
   def coords(r, c)
     r = case
           when r == :center
@@ -24,10 +28,17 @@ class RubyText::Window
     [r, c]
   end
 
+  # Go to specified row/column in current window
+
   def goto(r, c)  # only accepts numbers!
     @cwin.setpos(r, c)
+    @cwin.refresh
   end
 
+
+  # Go to specified row/column in current window,
+  #   execute block, and return cursor
+
   def go(r0, c0)
     r, c = coords(r0, c0)
     save = self.rc
@@ -38,60 +49,84 @@ class RubyText::Window
     end
   end
 
+  # Move cursor up
+
   def up(n=1)
     r, c = rc
     go r-n, c
   end
 
+  # Move cursor down
+
   def down(n=1)
     r, c = rc
     go r+n, c
   end
 
+  # Move cursor left
+
   def left(n=1)
     r, c = rc
     go r, c-n
   end
 
+  # Move cursor right
+
   def right(n=1)
     r, c = rc
     go r, c+n
   end
 
+  # Move cursor to top of window
+
   def top
     r, c = rc
     go 0, c
   end
 
+  # Move cursor to bottom of window
+
   def bottom 
     r, c = rc
     rmax = self.rows - 1
     go rmax, c
   end
 
+  # Move cursor to top of window
+
   def up!
     top
   end
 
+  # Move cursor to bottom of window
+
   def down!
     bottom
   end
 
+  # Move cursor to far left of window
+
   def left!
     r, c = rc
     go r, 0
   end
 
+  # Move cursor to far left of window
+
   def right!
     r, c = rc
     cmax = self.cols - 1
     go r, cmax
   end
 
+  # Move cursor to home (upper left)
+
   def home
     go 0, 0
   end
 
+  # Return current row/column
+
   def rc
     [@cwin.cury, @cwin.curx]
   end

data/lib/output.rb

@@ -123,17 +123,31 @@ class RubyText::Window
     $stdscr = STDSCR
   end
 
+=begin
+  def go(r0, c0)
+    r, c = coords(r0, c0)
+    save = self.rc
+    goto r, c 
+    if block_given?
+      yield 
+      goto *save
+    end
+  end
+=end
+
   def [](r, c)
-    ch = nil
-    go(r, c) { ch = @cwin.inch }
-    debug "ch = #{ch}  ch.chr = #{ch.chr}"
+    r0, c0 = self.rc
+    @cwin.setpos(r, c)
+    ch = @cwin.inch
+    @cwin.setpos(r0, c0)
     ch.chr
   end
 
   def []=(r, c, char)
+    r0, c0 = self.rc
     @cwin.setpos(r, c)
     @cwin.addch(char[0].ord|Curses::A_NORMAL)
-    @cwin.setpos(r, c)
+    @cwin.setpos(r0, c0)
     @cwin.refresh
   end
 
@@ -147,7 +161,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 +263,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.25"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/lib/settings.rb

@@ -9,7 +9,7 @@ module RubyText
       @current = @defaults.dup
       @stack = []
       @stack.push @current   # Note: Never let stack be empty
-      set_curses(@current)   # Set them for real
+      set_curses(**@current)   # Set them for real
       # FIXME To be continued...
     end
 
@@ -39,7 +39,7 @@ module RubyText
       cursor ||= @current[:cursor]
       @stack.push @current
       @current = {raw: raw, echo: echo, cbreak: cbreak, keypad: keypad, cursor: cursor}
-      set_curses(@current)
+      set_curses(**@current)
     end
 
     def reset_boolean
@@ -57,7 +57,7 @@ module RubyText
         sym0 = val ? sym : str[1..-1].to_sym
         list[sym0] = val
       end
-      set_boolean(list)
+      set_boolean(**list)
       # allow a block here?
     end
 
@@ -101,6 +101,7 @@ module RubyText
     Object.const_set(:STDSCR, main) unless defined? STDSCR
     $stdscr = STDSCR  # FIXME global needed?
     Object.include(WindowIO)
+    Curses.ESCDELAY = 10
     @started = true
 # rescue => err
 #   puts(err.inspect)
@@ -129,7 +130,7 @@ module RubyText
     if name[0] == '_'
       Curses.send(name[1..-1], *args)
     else
-      raise "#{name} #{args.inspect}" # NoMethodError
+      raise "Missing: #{name} #{args.inspect}" # NoMethodError
     end
   end
 

data/lib/widgets.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module RubyText
   def self.ticker(row: STDSCR.rows-1, col: 0, width: STDSCR.cols, 
                   fg: White, bg: Blue, text:, delay: 0.1)
@@ -35,14 +37,20 @@ module RubyText
     ret
   end
 
-  def self.splash(msg)
+  def self.splash(msg = nil)
+    io = StringIO.new("")
+    if msg.nil?
+      yield io 
+      msg = io.string
+    end
+
     lines = msg.split("\n")
     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, 
+    win = RubyText.window(high, wide, r: r0, c: c0, scroll: true,
                           fg: White, bg: Red, title: "[Press any key]")
     win.print "\n "
     win.puts msg

data/lib/window.rb

@@ -1,12 +1,12 @@
 
 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
     c ||= (STDSCR.cols - wide)/2
     win = RubyText::Window.new(high, wide, r, c, border, fg, bg, scroll)
     win.add_title(title) if title
+    0.upto(high) {|row| 0.upto(wide) {|col| win[row, col] = " " } }
     win
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.25
 platform: ruby
 authors:
 - Hal Fulton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2022-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -72,11 +72,38 @@ files:
 - examples/sym_navigate.rb
 - examples/ticker_threads.rb
 - examples/topbottom.rb
+- examples/topmenu.rb
 - examples/udlr_bang.rb
 - examples/updown_etc.rb
 - examples/win_centering.rb
 - examples/window_full.rb
+- lib/.yardoc/checksums
+- lib/.yardoc/complete
+- lib/.yardoc/object_types
+- lib/.yardoc/objects/root.dat
+- lib/.yardoc/proxy_types
 - lib/color.rb
+- lib/doc/RubyText.html
+- lib/doc/RubyText/Color.html
+- lib/doc/RubyText/Effects.html
+- lib/doc/RubyText/Keys.html
+- lib/doc/RubyText/Settings.html
+- lib/doc/RubyText/Window.html
+- lib/doc/RubyText/Window/GetString.html
+- lib/doc/WindowIO.html
+- lib/doc/_index.html
+- lib/doc/class_list.html
+- lib/doc/css/common.css
+- lib/doc/css/full_list.css
+- lib/doc/css/style.css
+- lib/doc/file_list.html
+- lib/doc/frames.html
+- lib/doc/index.html
+- lib/doc/js/app.js
+- lib/doc/js/full_list.js
+- lib/doc/js/jquery.js
+- lib/doc/method_list.html
+- lib/doc/top-level-namespace.html
 - lib/effects.rb
 - lib/keys.rb
 - lib/menu.rb
@@ -119,7 +146,7 @@ homepage: https://github.com/Hal9000/rubytext
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A thick wrapper for Curses
 test_files: []