rubytext 0.0.65 → 0.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d60ee098ba99ff96172a641b1e77715ce7c1177b857ca54c7e4502549e2cf3e5
-  data.tar.gz: 34931ad3fc293e543c2a24187a040319a9578879ca69c2b43d3cb4a2d07d3038
+  metadata.gz: 1026a49ec8ff0ecd96f14d6e34cb5bf689e277e2c619ea39f9746c899f5238a9
+  data.tar.gz: 8baa928f1c76383407165447ea3df23876f1fb698cfd05444088e78d5067fd5b
 SHA512:
-  metadata.gz: 2fdbdb36477e756af00e44c36bc76f76e80d62b485910f83b4cbf70ed96a1a2f766ee56e8eb548e4053772163a0ebfcce10f320273f507351659adea3accb25b
-  data.tar.gz: 6cda04f52196315b520a1db9cf4311d7fb09d6bd8f18d729a5aae4bd69d24345f189830c8222a74ae303ca62201484c45f4c131272e9d072ee9cd007cb095360
+  metadata.gz: e4e118a18444c9831ecc6136f6ac36caa16fa6f60adb6fd4de5640d3b66901f623348d46306ac812387183163e30c674e47f0f2533e8c81f650f74d6094e10b4
+  data.tar.gz: 73a1fe904439c2f680dace4927528a7cff96afe84a4f3bb43ecd04ef7e9b9f4af4f191833dd61beef968cb91887b98f8cf88882521af86e511ba864524512bee

data/examples/_demo.rb

@@ -0,0 +1,118 @@
+$LOAD_PATH.unshift "lib"
+
+require 'rubytext'
+
+def delay(sec, speed=1.0)
+  sleep sec/speed
+end
+
+speed = ARGV.first || 1.0
+speed = speed.to_f
+delay(speed)
+
+RubyText.start(log: "mylog.txt", fg: Green, bg: Black)
+
+print "Here goes... "
+delay 2
+
+ymax, xmax = STDSCR.rows, STDSCR.cols
+
+puts "STDSCR is #{ymax.inspect} by #{xmax.inspect}"
+delay 2
+
+print "\nI can write here "
+delay 2
+puts "and then continue."
+
+delay 2
+print "I can jump away "
+
+delay 2
+STDSCR.go(20, 15) { puts "and print somewhere else" }
+# ^ Same as: rcprint(20, 15, "and print somewhere else" }
+
+delay 2
+puts "and then return."
+
+delay 3
+print "I can hide the cursor... "
+delay 1
+RubyText.hide_cursor
+delay 1
+print "then show it again... "
+delay 1
+RubyText.show_cursor
+delay 1
+print "and hide it again. "
+delay 1
+RubyText.hide_cursor
+delay 3
+
+puts "\n\nNow watch as I create a window:"
+
+mywin = RubyText.window(16, 40, 8, 14, fg: :blue, bg: :yellow)
+
+delay 3
+mywin.puts "\nNow I'm writing in a window."
+mywin.puts "\nIts size is  #{mywin.rows} rows by #{mywin.cols} cols"
+mywin.puts "(or #{mywin.height}x#{mywin.width} with the frame).\n "
+
+delay 4
+mywin.puts "I always try to honor the borders of my window."
+
+delay 2
+mywin.puts "\nWatch as I place 50 random stars here..."
+
+delay 2
+
+50.times do
+  r = rand(mywin.rows)
+  c = rand(mywin.cols)
+  delay 0.1
+  mywin.rcprint(r, c, "*")
+end
+
+delay 4
+mywin.output do
+  mywin.clear
+  puts "The window method called 'output'"
+  puts "will temporarily override STDSCR so that (in the code)"
+  puts "we don't have to use the window name over and over for stream I/O."
+  delay 4
+# STDSCR.rcprint 25, 3, "Of course I can still print here if I want."
+  STDSCR.go 25, 3
+  STDSCR.print "Of course I can still print here if I want."
+  delay 3
+  puts "\nOne moment..."
+  delay 4
+end
+
+mywin.output do
+  mywin.clear
+  puts "The []= method allows us to place characters in"
+  puts "the window (without auto-refresh)."
+  puts "\nLet's see the '50 stars' trick again:"
+  delay 5
+  50.times do
+    r = rand(mywin.rows)
+    c = rand(mywin.cols)
+    mywin[r, c] =  "*"
+  end
+  mywin.cwin.refresh 
+end
+
+delay 5
+mywin.output do
+  mywin.clear
+  mywin.puts "The [] method (zero-based) is still buggy, but let's try it."
+  mywin.puts "XYZ"
+  ch = mywin[2,2]
+  mywin.puts "The char at [2,2] is: #{ch.chr.inspect}"
+end
+
+delay 4
+mywin.puts "\nThat's all for now."
+delay 1
+mywin.puts "\nPress any key to exit."
+
+getch

data/examples/_showme.rb

@@ -0,0 +1,58 @@
+require 'rubytext'
+require 'timeout'
+
+def next_slide
+  RubyText.hide_cursor
+  sleep 0.2
+  Timeout.timeout(999) do
+    STDSCR.go @rmax-1-@upward, 0
+    STDSCR.center "Press any key..."
+    getch
+  end
+rescue Timeout::Error
+end
+
+def show_code(prog, upward=0)
+  text = File.read(prog)
+  nlines = text.split("\n").size
+
+  prog_top = @rmax-nlines-3 - upward.to_i
+  code = RubyText.window(nlines+2, @cmax-2, prog_top, 1, 
+                         fg: Green, bg: Black)
+  code.puts text
+
+  right = STDSCR.cols - prog.length - 8
+  STDSCR.go prog_top, right 
+  STDSCR.print "[ #{prog} ]"
+  STDSCR.go 0,0
+end
+
+def check_window
+  if @rmax < 25 || @cmax < 80
+    puts "\n  Your window should be 25x80 or larger,"
+    puts   "  but this one is only  #{@rmax}x#{@cmax}."
+    puts "  Please resize and run again!"
+    getch
+    exit 1
+  end
+end
+
+#### Main
+
+RubyText.start(:cbreak, log: "/tmp/showme.log", fg: White, bg: Black)
+
+@cmax = STDSCR.cols
+@rmax = STDSCR.rows
+
+RubyText.hide_cursor
+
+check_window
+
+prog, @upward = ARGV
+@upward ||= 0
+
+show_code(prog, @upward)
+
+require_relative prog
+
+next_slide # if @upward == 0

data/examples/_slides

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+mylib = `gem which rubytext`.chomp
+examples = mylib.sub(%r[/lib/rubytext.rb], "/examples")
+
+Dir.chdir(examples)
+
+rc = system("ruby check.rb")
+exit unless rc
+
+# FIXME 
+#   - use names instead of numbers?
+#   - convert showme into a method?
+
+1.upto(22) do |n|
+  next if n == 11  # junk this one
+  num = '%02d' % n
+  prog = "prog#{num}.rb"
+  upward = 11 if n == 22  # dumbest hack ever!
+  system("ruby showme.rb #{prog} #{upward}")
+end
+

data/examples/check.rb

@@ -1,6 +1,6 @@
 require 'rubytext'
 
-RubyText.start(:raw, fg: :white, bg: :black)
+RubyText.start(:raw, log: "foo", fg: :white, bg: :black)
 
 cmax = STDSCR.cols
 rmax = STDSCR.rows

data/examples/foo

@@ -0,0 +1,7 @@
+#<ArgumentError: wrong number of arguments (given 2, expected 1)>
+/Users/Hal/.rvm/gems/ruby-2.4.2/gems/rubytext-0.0.65/lib/color.rb:30:in `[]'
+/Users/Hal/.rvm/gems/ruby-2.4.2/gems/rubytext-0.0.65/lib/color.rb:30:in `colors'
+/Users/Hal/.rvm/gems/ruby-2.4.2/gems/rubytext-0.0.65/lib/color.rb:35:in `colors!'
+/Users/Hal/.rvm/gems/ruby-2.4.2/gems/rubytext-0.0.65/lib/window.rb:33:in `main'
+/Users/Hal/.rvm/gems/ruby-2.4.2/gems/rubytext-0.0.65/lib/settings.rb:75:in `start'
+check.rb:3:in `<main>'

data/examples/slides

@@ -16,7 +16,7 @@ exit unless rc
   next if n == 11  # junk this one
   num = '%02d' % n
   prog = "prog#{num}.rb"
-  upward = 15 if n == 22  # dumbest hack ever!
+  upward = 10 if n == 22  # dumbest hack ever!
   system("ruby showme.rb #{prog} #{upward}")
 end
 

data/lib/_color.rb

@@ -0,0 +1,69 @@
+
+def fb2cp(fg, bg)
+  fg ||= Blue
+  bg ||= White
+  f2 = X.const_get("COLOR_#{fg.upcase}")
+  b2 = X.const_get("COLOR_#{bg.upcase}")
+  cp = RubyText::ColorPairs[[fg, bg]]
+  [f2, b2, cp]
+end
+
+class RubyText::Color
+  attr_reader :curses
+
+  def self.pair(fg, bg)
+    RubyText::ColorPairs[[fg, bg]]
+  end
+
+  def initialize(sym)
+    @color  = sym
+    @curses = X.const_get("COLOR_#{sym.upcase}")
+  end
+end
+
+module RubyText
+  Colors = [Black, Blue, Cyan, Green, Magenta, Red, White, Yellow]
+
+  # Initialize all color pairs
+  ColorPairs = {}
+  num = 0
+  color_file = File.new("pairs.out", "w")
+  Colors.each do |fsym|
+    Colors.each do |bsym|
+      cfg, cbg = Color.new(fsym).curses, Color.new(bsym).curses
+      X.init_pair(num+=1, cfg, cbg)
+      ColorPairs[[fsym, bsym]] = num
+#     debug "pair #{num} = #{[fsym, bsym]}"
+      color_file.puts "pair #{num} = #{[fsym, bsym]}"
+    end
+  end
+  color_file.close
+end
+
+class RubyText::Window
+  def self.set_colors(cwin, fg, bg)
+    @cfile = File.new("colors-#{rand(1000)}.out", "w")
+    cp = RubyText::Color.pair(fg, bg)
+    @cfile.puts "Setting: #{cp} = pair #{[fg, bg].inspect}"
+    @cfile.close
+exit
+    cwin.color_set(cp)
+  end
+
+  def self.colorize!(win, fg, bg)
+    set_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.class.set_colors(@cwin, sym, @bg)   # BREAK??
+  end
+
+  def bg=(sym)
+    self.class.set_colors(@cwin, @fg, sym)
+  end
+end

data/lib/_window.rb

@@ -0,0 +1,92 @@
+class RubyText::Window
+  Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
+
+  attr_reader :cwin, :rows, :cols, :width, :height, :scrolling
+  attr_writer :fg, :bg
+
+  # Better to use Window.window IRL
+
+  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=nil, bg=nil, scroll=false)
+    @wide, @high, @r0, @c0 = wide, high, r0, c0
+    @border, @fg, @bg      = border, fg, bg
+    @cwin = X::Window.new(high, wide, r0, c0)
+    RubyText::Window.colorize!(@cwin, fg, bg)
+    if @border
+      @cwin.box(Vert, Horiz)
+      @outer = @cwin
+      @outer.refresh
+      @cwin = X::Window.new(high-2, wide-2, r0+1, c0+1)
+      RubyText::Window.colorize!(@cwin, fg, bg)
+    else
+      @outer = @cwin
+    end
+    @rows, @cols = @cwin.maxy, @cwin.maxx  # unnecessary really...
+    @width, @height = @cols + 2, @rows + 2 if @border
+    @scrolling = scroll
+    @cwin.scrollok(scroll) 
+    @cwin.refresh
+  end
+
+  def self.main(fg: nil, bg: nil, scroll: false)
+    main_win = X.init_screen
+    X.start_color
+    colorize!(main_win, fg, bg)
+    rows, cols = main_win.maxy, main_win.maxx
+    self.make(main_win, rows, cols, 0, 0, border: false,
+              fg: fg, bg: bg, scroll: scroll)
+  end
+
+  def self.make(cwin, high, wide, r0, c0, border: true, fg: White, bg: Black, scroll: false)
+    obj = self.allocate
+    obj.instance_eval do 
+      @outer = @cwin = cwin
+      @wide, @high, @r0, @c0 = wide, high, r0, c0
+      @fg, @bg = fg, bg
+      @border = border
+      @rows, @cols = high, wide
+      @width, @height = @cols + 2, @rows + 2 if @border
+    end
+    obj.scrolling(scroll)
+    obj
+  end
+
+  # FIXME refactor bad code
+
+  def scrolling(flag=true)
+    @scrolling = flag
+    @cwin.scrollok(flag)
+  end
+
+  def noscroll
+    @scrolling = false
+    @cwin.scrollok(false)
+  end
+
+  def scroll(n=1)
+    if n < 0
+      @cwin.scrl(n)
+      (-n).times {|i| rcprint i, 0, (' '*@cols) }
+    else
+      n.times do |i|
+        @cwin.scroll
+        scrolling(false)
+        rcprint @rows-1, 0, (' '*@cols)
+        scrolling
+      end
+    end
+    @cwin.refresh
+  end
+
+  def screen_text(file = nil)
+    lines = []
+    0.upto(self.rows-1) do |r|
+      line = ""
+      0.upto(self.cols-1) do |c|
+        line << self[r, c]
+      end
+      lines << line
+    end
+    File.open(file, "w") {|f| f.puts lines }  if file
+    lines
+  end
+end

data/lib/output.rb

@@ -1,13 +1,11 @@
 $LOAD_PATH << "lib"
 
-# require 'global'  # FIXME later
-
 class RubyText::Window
   def center(str)
     r, c = self.rc
     n = @cwin.maxx - str.length
     go r, n/2
-    puts str
+    self.puts str
   end
 
   def putch(ch)
@@ -15,44 +13,32 @@ class RubyText::Window
     self[r, c] = ch[0]
   end
 
-  def need_crlf?(sym, args)
-    sym != :print &&      # print doesn't default to crlf
-    args[-1][-1] != "\n"  # last char is a literal linefeed
-  end
-
 # FIXME Please refactor the Hal out of this.
 
+  def special?(arg)
+     RubyText::Colors.include?(arg) || 
+       arg.is_a?(RubyText::Effects)
+  end
+
   def delegate_output(sym, *args)
     args = [""] if args.empty?
+    args += ["\n"] unless sym == :print
     RubyText::Window.colors(@cwin, @fg, @bg)  # FIXME?
     if sym == :p
       args.map!(&:inspect) 
     else
-      args.map! do |x|
-        if RubyText::Colors.include?(x) || x.is_a?(RubyText::Effects)
-          x
-        else
-          x.to_s
-        end
-      end
+      args.map! {|x| special?(x) ? x : x.to_s }
     end
-    flag = need_crlf?(sym, args)   # Limitation: Can't print color symbols!
     args.each do |arg|  
-      if arg.is_a? Symbol # must be a color
+    case
+      when arg.is_a?(Symbol) # must be a color
         RubyText::Window.colors(@cwin, arg, @bg)  # FIXME?
-      elsif arg.is_a? RubyText::Effects
+      when arg.is_a?(RubyText::Effects)
         X.attrset(arg.value)
       else
-        arg.each_char do |ch| 
-          if ch == "\n" 
-            crlf 
-          else
-            @cwin.addch(ch)
-          end
-        end
+        arg.each_char {|ch| ch == "\n" ? crlf : @cwin.addch(ch) }
       end
     end
-    crlf if flag
     RubyText::Window.colors(@cwin, @fg, @bg)  # FIXME?
     @cwin.refresh
   end
@@ -105,12 +91,11 @@ class RubyText::Window
   end
 
   def clear
-    win = @cwin
-    num = win.maxx * win.maxy
-    win.setpos(0, 0)
-    win.addstr(' '*num)
-    win.setpos(0, 0)
-    win.refresh
+    num = @cwin.maxx * @cwin.maxy
+    home
+    @cwin.addstr(' '*num)
+    home
+    @cwin.refresh
   end
 
   def output(&block)
@@ -120,12 +105,10 @@ class RubyText::Window
   end
 
   def [](r, c)
-    save = self.rc
-    @cwin.setpos r, c
-    ch = @cwin.inch
-    @cwin.setpos *save
+    ch = nil
+    go(r, c) { ch = @cwin.inch }
+    debug "ch = #{ch}  ch.chr = #{ch.chr}"
     ch.chr
-#   go(r, c) { ch = @cwin.inch }
   end
 
   def []=(r, c, char)

data/lib/rubytext.rb

@@ -11,6 +11,8 @@ Black, Blue, Cyan, Green, Magenta, Red, White, Yellow =
 module RubyText
 end
 
+$debug = File.new("wtf.out", "w")
+
 require 'version'
 require 'output'       # RubyText, RubyText::Window, Kernel
 require 'keys'         # RubyText::Keys

data/lib/settings.rb

@@ -71,8 +71,9 @@ module RubyText
   end
 
   def self.start(*args, log: nil, fg: nil, bg: nil, scroll: false)
-    $debug = File.new(log, "w") if log
-    Object.const_set(:STDSCR, RubyText::Window.main(fg: fg, bg: bg, scroll: scroll))
+    $debug ||= File.new(log, "w") if log
+    main = RubyText::Window.main(fg: fg, bg: bg, scroll: scroll)
+    Object.const_set(:STDSCR, main)
     $stdscr = STDSCR
     fg, bg, cp = fb2cp(fg, bg)
     self.set(:_echo, :cbreak)  # defaults
@@ -80,7 +81,8 @@ module RubyText
   rescue => err
     debug(err.inspect)
     debug(err.backtrace)
-    raise RTError("#{err}")
+exit
+    # raise RTError("#{err}")
   end
 
   def self.stop

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.65
+  version: 0.0.66
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -41,8 +41,12 @@ files:
 - "./rubytext.gemspec"
 - bin/rubytext
 - examples/README
+- examples/_demo.rb
+- examples/_showme.rb
+- examples/_slides
 - examples/check.rb
 - examples/demo.rb
+- examples/foo
 - examples/ide.rb
 - examples/prog01.rb
 - examples/prog02.rb
@@ -68,6 +72,8 @@ files:
 - examples/prog22.rb
 - examples/showme.rb
 - examples/slides
+- lib/_color.rb
+- lib/_window.rb
 - lib/color.rb
 - lib/effects.rb
 - lib/keys.rb