rubytext 0.0.77 → 0.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7c6312edf48700460e3ac66588a92de3809dddb2eeef6fe33a4174e355ef81
-  data.tar.gz: ada7f3ee8c716f7be23affaa9ef790f51df1acfb0f11be30c876e8e6d18f4fa4
+  metadata.gz: 4e354c6fdb94b4939d7c3fbe944b852d783db1235f571b6b882250be184ea531
+  data.tar.gz: 5d1924c94b30a6a54df89a16fdcb0e9ca5885921fc29b6c882a32c9cfc0dd40a
 SHA512:
-  metadata.gz: 551a09d2ddf6a41f90e7e6c85ac3a4738d597dbe2ee6e55970a1268a4e2f0a4c7881196e92f4614da8ca4feb016fc67101114cd769bb06b5b7e8b327646d0d42
-  data.tar.gz: e5ab24e1cd086a8a43534f37af73146ed6dad0fec0beab3333b7d6d5d87d220fe127c1c1d45073c3b5817fa8069990241ed1daedd11f4fe4c0441c6aa1c0e5e9
+  metadata.gz: 2abaa8f1c0d14fbc306a94b99e971ba72b923b6cc6986408292c1e6c3610e613ad5f3db634322f8338e43c794efebf8f189ad844d886ff17251df29702608914
+  data.tar.gz: 0bd784d37d361c964cd15aa7c3c6f14bd46980ba2509bee9dd8303ed4f6578b4f0c71e6d6a4c2b2c3c9c19053e68814d165c80b6d3fe146acea3fcbb9f26680b

data/examples/crap.rb

@@ -0,0 +1,16 @@
+require 'rubytext'
+
+RubyText.start
+
+STDSCR.go 1, 2
+STDSCR.putch "0"
+
+STDSCR.putch '1', r: 3,  c: 6,  fx: RubyText::Effects.new(Red)
+STDSCR.putch '2', r: 5,  c: 10, fx: RubyText::Effects.new(Yellow, :reverse)
+STDSCR.putch '3', r: 7,  c: 14
+STDSCR.putch '4', r: 9,  c: 18, fx: RubyText::Effects.new(Green, :normal)
+STDSCR.putch '5', r: 11, c: 22, fx: RubyText::Effects.new(Red, :normal)
+
+STDSCR.home
+
+getch

data/examples/prog21.rb

@@ -1,15 +1,17 @@
-puts "This very crude menu is also EXPERIMENTAL."
-puts "At the moment, it only works inside STDSCR!\n"
-puts "It knows up, down, Enter, and Escape.\n "
-puts "Press any key to display the menu..."
+win = RubyText.window(10, 45, 1, 20, fg: Black, bg: Red)
+win.puts "This very crude menu is also EXPERIMENTAL."
+win.puts "It knows up, down, Enter, and Escape.\n "
+win.puts "Press any key to display the menu..."
+win.puts
+
 getch
 
 days = %w[Monday Tuesday Wednesday Thursday Friday]
-num, day = RubyText.menu(c: 30, items: days)
+num, day = RubyText.menu(win: win, r: 2, c: 5, items: days)
 
 puts
 if day.nil?
-  puts "You picked nothing!"
+  win.puts "You picked nothing!"
 else
-  puts "You picked item #{num} which is #{day.inspect}"
+  win.puts "You picked item #{num} which is #{day.inspect}"
 end

data/examples/prog23.rb

@@ -0,0 +1,19 @@
+puts "\n Methods such as go, rcprint, and putch \n can accept symbols such as"
+puts " :top :bottom :left :right :center"
+puts "\n Of course, printing starting at the far right \n can be problematic."
+
+win = RubyText.window(7, 29, 1, 60, fg: Red, bg: Black)
+
+win.putch "1", r: :bottom, c: :left;                 sleep 0.4
+win.go :center, :left;               win.puts "abc"; sleep 0.4
+win.go :top, :left;                  win.puts "def"; sleep 0.4
+win.rcprint :top, :center, "4";                      sleep 0.4
+
+others = [[:top, :right, "5"], [:center, :right, "6"], [:bottom, :right, "7"], 
+          [:bottom, :center, "8"], [:center, :center, "9"]] 
+others.each do |args| 
+  r, c, ch = *args
+  win.go r,c
+  win.putch(ch)
+  sleep 0.4
+end

data/examples/prog24.rb

@@ -0,0 +1,13 @@
+puts "\n\n\n putch can take optional row/column keyword arguments"
+puts " as well as 'fx' (text effects)"
+
+STDSCR.go 1, 55;   sleep 0.4
+STDSCR.putch "0";  sleep 0.4
+
+STDSCR.putch '1', r: 3,  c: 59,  fx: RubyText::Effects.new(Red);               sleep 0.4 
+STDSCR.putch '2', r: 5,  c: 63, fx: RubyText::Effects.new(Yellow, :reverse);   sleep 0.4 
+STDSCR.putch '3', r: 7,  c: 67;                                                sleep 0.4 
+STDSCR.putch '4', r: 9,  c: 71, fx: RubyText::Effects.new(Green, :normal);     sleep 0.4 
+STDSCR.putch '5', r: 11, c: 75, fx: RubyText::Effects.new(Red, :normal)
+
+STDSCR.home

data/lib/menu.rb

@@ -1,32 +1,11 @@
 module RubyText
 
-  def self.saveback(high, wide, r, c)
-    @pos = STDSCR.rc
-    @save = []
-    0.upto(high-1) do |h|
-      0.upto(wide-1) do |w|
-        @save << STDSCR[h+r, w+c]
-      end
-    end
-  end
-
-  def self.restback(high, wide, r, c)
-    0.upto(high-1) do |h|
-      0.upto(wide-1) do |w|
-        STDSCR[h+r, w+c] = @save.shift
-      end
-    end
-    STDSCR.go *@pos
-    STDSCR.refresh
-  end
-
-  def self.menu(r: 0, c: 0, items:, curr: 0,
+  def self.menu(win: STDSCR, r: 0, c: 0, items:, curr: 0,
                 fg: White, bg: Blue)
     high = items.size + 2
     wide = items.map(&:length).max + 4
-    saveback(high, wide, r, c)
-    win = RubyText.window(high, wide, r, c, fg: fg, bg: bg)
-#   RubyText.set(:raw)
+    win.saveback(high, wide, r, c)
+    mwin = RubyText.window(high, wide, r+win.r0, c+win.c0, fg: fg, bg: bg)
     X.stdscr.keypad(true)
     RubyText.hide_cursor
     sel = curr
@@ -35,9 +14,9 @@ module RubyText
     rev = RubyText::Effects.new(:reverse)
     loop do
       items.each.with_index do |item, row|
-        win.go row, 0
+        mwin.go row, 0
         style = (sel == row) ? rev : norm
-        win.print style, " #{item} "
+        mwin.print style, " #{item} "
       end
       ch = getch
       case ch
@@ -46,25 +25,23 @@ module RubyText
         when X::KEY_DOWN
           sel += 1 if sel < max
         when 27
-          restback(high, wide, r, c)
+          win.restback(high, wide, r, c)
           return [nil, nil]
         when 10
-          restback(high, wide, r, c)
+          win.restback(high, wide, r, c)
           return [sel, items[sel]]
       end
     end
   end
 
-  def self.selector(r: 0, c: 0, rows: 10, cols: 20, 
+  def self.selector(win: STDSCR, r: 0, c: 0, rows: 10, cols: 20, 
                     items:, fg: White, bg: Blue,
-                    win:, callback:, enter: nil, quit: "q")
+                    win2:, callback:, enter: nil, quit: "q")
     high = rows
     wide = cols
-    saveback(high, wide, r, c)
-    menu_win = RubyText.window(high, wide, r, c, fg: fg, bg: bg)
-    win2 = win
+    win.saveback(high, wide, r, c)
+    mwin = RubyText.window(high, wide, r, c, fg: fg, bg: bg)
     handler = callback
-#   RubyText.set(:raw)
     X.stdscr.keypad(true)
     RubyText.hide_cursor
     norm = RubyText::Effects.new(:normal)
@@ -73,11 +50,11 @@ module RubyText
     max = items.size - 1
     send(handler, sel, items[sel], win2)
     loop do
-      menu_win.home
+      mwin.home
       items.each.with_index do |item, row|
-        menu_win.left
+        mwin.left
         style = (sel == row) ? rev : norm
-        menu_win.puts style, " #{item} "
+        mwin.puts style, " #{item} "
       end
       ch = getch
       case ch

data/lib/navigation.rb

@@ -24,8 +24,9 @@ class RubyText::Window
     [r, c]
   end
 
-  def go(r, c)
-    r, c = coords(r, c)
+  def go(r0, c0)
+    r, c = coords(r0, c0)
+    debug("go: #{[r0, c0].inspect} => #{[r, c].inspect}")
     save = self.rc
     @cwin.setpos(r, c)
     if block_given?

data/lib/output.rb

@@ -63,16 +63,27 @@ class RubyText::Window
     self.print *args
   end
 
+  def _putch(ch)
+    @cwin.addch(ch)
+  end
+
   def putch(ch, r: nil, c: nil, fx: nil)
-    r0, c0 = self.rc
-    r ||= r0
-    c ||= c0
-    go(r, c) do
-      fx.set(self) if fx
-      val = fx.value rescue 0
-      @cwin.addch(ch.ord|val)
+    debug("putch: #{[ch, r, c, fx].inspect}")
+    if r.nil? && c.nil? && fx.nil?
+      _putch(ch) 
+    else
+      r0, c0 = self.rc
+      r ||= r0
+      c ||= c0
+      go(r, c) do
+        fx.set(self) if fx
+        val = fx.value rescue 0
+        @cwin.addch(ch.ord|val)
+        # @cwin.addch(ch)
+      end
+      fx.reset(self) if fx
     end
-    fx.reset(self) if fx
+    @cwin.refresh
   end
 
   def crlf     # Technically not output...
@@ -181,6 +192,9 @@ module WindowIO
   end
 
   def putch(ch, r: nil, c: nil, fx: nil)
+    r, c = STDSCR.rc
+    r ||= r0
+    c ||= c0
     STDSCR.putch(ch, r: r, c: c, fx: fx)
   end
 end

data/lib/rubytext.rb

@@ -52,7 +52,12 @@ end
 
 make_exception(:RTError, "General error: $1 $2 $3")
 
+def debugging(onoff)
+  $debugging = onoff
+end
+
 def debug(*args)
+  return unless $debugging
   return unless $debug
   $debug.puts *args
   $debug.flush

data/lib/version.rb

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

data/lib/window.rb

@@ -2,6 +2,7 @@ class RubyText::Window
   Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
 
   attr_reader :cwin, :rows, :cols, :width, :height, :scrolling
+  attr_reader :r0, :c0
   attr_accessor :fg, :bg
 
   # Better to use Window.window IRL
@@ -92,6 +93,26 @@ class RubyText::Window
     lines
   end
 
+  def saveback(high, wide, r, c)
+    @pos = self.rc
+    @save = []
+    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-1) do |h|
+      0.upto(wide-1) do |w|
+        self[h+r-1, w+c-1] = @save.shift
+      end
+    end
+    self.go *@pos
+    @cwin.refresh
+  end
+
   def fg=(sym)
     set_colors(fg, @bg)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.77
+  version: 0.0.78
 platform: ruby
 authors:
 - Hal Fulton
@@ -42,6 +42,7 @@ files:
 - bin/rubytext
 - examples/README
 - examples/check.rb
+- examples/crap.rb
 - examples/demo.rb
 - examples/ide.rb
 - examples/multitest.rb
@@ -68,6 +69,8 @@ files:
 - examples/prog20a.rb
 - examples/prog21.rb
 - examples/prog22.rb
+- examples/prog23.rb
+- examples/prog24.rb
 - examples/showme.rb
 - examples/slides
 - lib/color.rb