rubytext 0.0.73 → 0.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aab3de408243095abccb5ccd7096708f0aff51e5aa27d04fd2e27e8fa1b870c
-  data.tar.gz: f3a0c894e21d5e498287942c078b730cc18431d7455e1f8cf1267691419927fc
+  metadata.gz: a79401a742e0dee3f3fe1e2a75c477ea819b4cb00aa76deba471de0a26fdb0fb
+  data.tar.gz: 67f72468b5ca76116d45f872a8d6626e768c9d66301c20a18bd0a62b497836a0
 SHA512:
-  metadata.gz: 59fdd86f11a6532e19a976b587a163fab2f75b4830e2f37469ec2c48ee621e8f03829198201084d565096bd786581761bc5b59cf36c85d7e12bc07047449093e
-  data.tar.gz: 389232176c392a98f8b2a961d3cb9a21496b154f1be949e615720cb8551a8ae132e09e54bb2f4b34872fcf7ad499064e9a1ee1cc716b354fc1dbdd3a2b0096a7
+  metadata.gz: d28d84e40b096a6e71dc9461ba41d55b97246d8ffd90f2dcc1a090c2d69cb7928380ebca87d50695a7a6ee556162f59be7761dd058cfbba5d257c3bc5faa525b
+  data.tar.gz: 1ee6a3d4fcae0e801b7d5dfd2c2891bace25bc0cbfad4e2489de66fb50c73fb44f8f90137c1aec071d379691e23c73eb438d86a866d7b0c71d9763770f210f32

data/examples/prog10.rb

@@ -1,15 +1,15 @@
-win = RubyText.window(6, 30, 4, 13, fg: Yellow, bg: Blue)
+win = RubyText.window(6, 30, 3, 13, fg: Yellow, bg: Blue)
 
 win.puts "You can write to a window..."
 
 sleep 2
-9.times { STDSCR.puts }
+11.times { STDSCR.puts }
 STDSCR.puts "...or you can write to STDSCR (standard screen)"
 
 sleep 1
 puts "STDSCR is the default receiver."
 
 sleep 2
-STDSCR.go 5, 0
+STDSCR.go 6, 0
 puts "Nothing stops you from overwriting a window."
 

data/examples/prog20.rb

@@ -8,11 +8,11 @@ win = RubyText.window(9, 65, 2, 26, fg: fg, bg: bg)
 win.puts "This is EXPERIMENTAL (and BUGGY)."
 win.puts "Use an \"effect\" to change the text color or \"look\":"
 
-win.puts "This is", effect(win, Yellow), " another color ", 
-          effect(win, White), "and yet another."
-win.puts "We can ", effect(win, :bold), "boldface ",
-         "and ", effect(win, :reverse), "reverse ",
-         "and ", effect(win, :under), "underline ",
-         effect(win, :normal), "text at will.\n "
-win.puts "This is ", effect(win, :bold, Red), "bold red ", 
-         effect(win, :normal, fg), "and this is normal again.\n "
+win.puts "This is", effect(Yellow), " another color ", 
+          effect(White), "and yet another."
+win.puts "We can ", effect(:bold), "boldface ",
+         "and ", effect(:reverse), "reverse ",
+         "and ", effect(:under), "underline ",
+         effect(:normal), "text at will.\n "
+win.puts "This is ", effect(:bold, Red), "bold red ", 
+         effect(:normal, fg), "and this is normal again.\n "

data/examples/prog20a.rb

@@ -0,0 +1,18 @@
+def effect(*args) # find better way
+  RubyText::Effects.new(*args)
+end
+
+fg, bg = White, Blue
+win = RubyText.window(9, 65, 2, 26, fg: fg, bg: bg)
+
+win.puts "This is EXPERIMENTAL (and BUGGY)."
+win.puts "Use an \"effect\" to change the text color or \"look\":"
+
+win.puts "This is", fx(" another color ", Yellow),
+          effect(White), "and yet another."
+win.puts "We can ", effect(:bold), "boldface ",
+         "and ", effect(:reverse), "reverse ",
+         "and ", effect(:under), "underline ",
+         effect(:normal), "text at will.\n "
+win.puts "This is ", effect(:bold, Red), "bold red ", 
+         effect(:normal, fg), "and this is normal again.\n "

data/lib/effects.rb

@@ -1,15 +1,22 @@
+
+
+def fx(str, *args)
+  eff = RubyText::Effects.new(*args)
+  str.define_singleton_method(:effect) { eff } 
+  str  # must return str
+end
+
 class RubyText::Effects   # dumb name?
   Modes  = {bold:    X::A_BOLD,
             normal:  X::A_NORMAL,
             reverse: X::A_REVERSE, 
             under:   X::A_UNDERLINE}
 
-
   Others = %[:show, :hide]  # show/hide cursor; more later??
 
   attr_reader :value, :fg
   
-  def initialize(win, *args)
+  def initialize(*args)
     bits = 0
     @list = args
     args.each do |arg|
@@ -22,5 +29,11 @@ class RubyText::Effects   # dumb name?
     end
     @value = bits
   end
+
+  def set(win)
+    attr, fg = self.value, self.fg
+    win.cwin.attron(attr)
+    win.set_colors(fg, win.bg) if fg
+  end
 end
 

data/lib/menu.rb

@@ -31,8 +31,8 @@ module RubyText
     RubyText.hide_cursor
     sel = curr
     max = items.size - 1
-    norm = RubyText::Effects.new(win, :normal)
-    rev = RubyText::Effects.new(win, :reverse)
+    norm = RubyText::Effects.new(:normal)
+    rev = RubyText::Effects.new(:reverse)
     loop do
       items.each.with_index do |item, row|
         win.go row, 0
@@ -67,8 +67,8 @@ module RubyText
 #   RubyText.set(:raw)
     X.stdscr.keypad(true)
     RubyText.hide_cursor
-    norm = RubyText::Effects.new(menu_win, :normal)
-    rev  = RubyText::Effects.new(menu_win, :reverse)
+    norm = RubyText::Effects.new(:normal)
+    rev  = RubyText::Effects.new(:reverse)
     sel = 0
     max = items.size - 1
     send(handler, sel, items[sel], win2)

data/lib/output.rb

@@ -8,7 +8,7 @@ class RubyText::Window
     self.puts str
   end
 
-  def putch(ch)
+  def putch(ch)    # move to WindowIO?
     r, c = self.rc
     self[r, c] = ch[0]
   end
@@ -32,13 +32,11 @@ class RubyText::Window
     end
     args.each do |arg|  
       if arg.is_a?(RubyText::Effects)
-        attr, fg = arg.value, arg.fg
-        self.cwin.attron(attr)
-        self.set_colors(fg, @bg) if fg
+        arg.set(self)
       elsif arg.respond_to? :effect
-        attr, fg = arg.effect.value, arg.effect.fg
-        self.cwin.attron(attr)
-        self.set_colors(fg, @bg) if fg
+        arg.effect.set(self)
+        arg.each_char {|ch| ch == "\n" ? crlf : @cwin.addch(ch) }
+        @cwin.refresh
       else
         arg.each_char {|ch| ch == "\n" ? crlf : @cwin.addch(ch) }
         @cwin.refresh
@@ -155,5 +153,19 @@ module WindowIO
   def getch
     X.getch
   end
+
+  def gets  # still needs improvement
+    str = ""
+    loop do
+      ch = ::STDSCR.getch
+      if ch == 10
+        ::STDSCR.crlf
+        break 
+      end
+      str << ch
+    end
+    str
+  end
+
 end
 

data/lib/settings.rb

@@ -1,14 +1,15 @@
 module RubyText
   # Hmm, all these are module-level.
 
-  def self.start(*args, log: nil, fg: White, bg: Blue, scroll: false)
-    $debug ||= File.new(log, "w") if log
+  def self.start(*args, log: "/tmp/rubytext.log", 
+                 fg: White, bg: Blue, scroll: false)
+    $debug ||= File.new(log, "w") if log   # FIXME remove global
     main = RubyText::Window.main(fg: fg, bg: bg, scroll: scroll)
     Object.const_set(:STDSCR, main) unless defined? STDSCR
-    $stdscr = STDSCR
+    $stdscr = STDSCR  # FIXME global needed?
     Object.include(WindowIO)
-    self.set(:_echo, :cbreak)  # defaults
-    self.set(*args)  # override defaults
+    self.set(:_echo, :cbreak)  # defaults  (:keypad?)
+    self.set(*args)            # override defaults
   rescue => err
     debug(err.inspect)
     debug(err.backtrace)
@@ -33,7 +34,7 @@ module RubyText
 
   def self.set(*args)   # Allow a block?
     standard = [:cbreak, :raw, :echo, :keypad]
-    @defaults = [:cbreak, :echo, :keypad, :cursor, :_raw]
+    @defaults = [:cbreak, :_echo, :keypad]
     @flags = @defaults.dup
     save_flags
     args.each do |arg|

data/lib/version.rb

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

data/lib/window.rb

@@ -2,7 +2,7 @@ class RubyText::Window
   Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
 
   attr_reader :cwin, :rows, :cols, :width, :height, :scrolling
-  attr_writer :fg, :bg
+  attr_accessor :fg, :bg
 
   # Better to use Window.window IRL
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.73
+  version: 0.0.74
 platform: ruby
 authors:
 - Hal Fulton
@@ -65,6 +65,7 @@ files:
 - examples/prog18.rb
 - examples/prog19.rb
 - examples/prog20.rb
+- examples/prog20a.rb
 - examples/prog21.rb
 - examples/prog22.rb
 - examples/showme.rb