rubytext 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fdecc3c5bfb6c33fbd4a818d2f376f0bde01c416cc4639ccc30d251b656968b
-  data.tar.gz: 168b787efee37e97b674c4a3cc176245e9d4449db96a31cd875b97ab1dc6c86f
+  metadata.gz: 639051dd8b75b79ea2fcd3b2b3c348393221429528c3fee94ba2d477d9021878
+  data.tar.gz: 4bcc89047ec533e1b9b517f3cf0cb236f7ed9474d855ec82c5ec8e8310417e68
 SHA512:
-  metadata.gz: 2c179cce895108856d7a8aa0d0d52d2a2a3775254452a4c3abd27402a7e62e62ab321a0cb921dbc75614a84ce2303fb0020ca878582d2ccf4aa099fdb1c483df
-  data.tar.gz: 92d2b5858741a6a22f10dac8d7da62498dee78829e5b6d4c46db164b9e89520e2b39344452def8b28fc8612d2afed4449c2b61250f02c9bdf7f72cac57c69373
+  metadata.gz: bde3e200841bb7f2b308c975d8d5553a897cbce44c8d7f47f940e7d5b324e35177701465a76f505eea35fa77b1fd9873e983333d40639b64b8330aee201b2171
+  data.tar.gz: 58aa416a667d26001f78346cc0d91194a598ad1521cb1d593a62f203c2a4d5e2eaf46940c703583fc37fc074ca8d68bb5f9241c27c255591f0cb2c460830d9ad

data/bin/rubytext

@@ -10,7 +10,7 @@ case cmd
   when nil
     STDOUT.puts "Usage: rubytext [demo|slides]"
   when "demo"
-    system("ruby #{path}/../examples/demo.rb")
+    system("ruby #{path}/../examples/demo.rb #{arg}")
   when "slides"
     system("#{path}/../examples/slides")
   when "tutorial"

data/examples/demo.rb

@@ -2,15 +2,15 @@ $LOAD_PATH.unshift "lib"
 
 require 'rubytext'
 
-def delay(sec, speed=1.0)
-  sleep sec/speed
+def delay(sec)
+  sleep sec/@speed
 end
 
 speed = ARGV.first || 1.0
-speed = speed.to_f
-delay(speed)
+@speed = speed.to_f
+delay 1
 
-RubyText.start(log: "mylog.txt", fg: :green, bg: :black)
+RubyText.start(log: "mylog.txt", fg: Blue, bg: Black)
 
 print "Here goes... "
 delay 2

data/examples/ide.rb

@@ -15,9 +15,9 @@ def shell(str)
   system("stty sane")   # FIXME - dumb hack
   STDSCR.puts "\n\n  When you exit, you will\n  return to the IDE.\n "
   system(str)
-  X.noecho   # FIXME Shouldn't have to do this stuff
-  X.stdscr.keypad(true)
-  X.cbreak   # by default
+  Curses.noecho   # FIXME Shouldn't have to do this stuff
+  Curses.stdscr.keypad(true)
+  Curses.cbreak   # by default
 end
 
 items = ["Edit lib",   # 0

data/examples/scrolling.rb

@@ -0,0 +1,17 @@
+STDSCR.scrolling(true)
+
+puts "We use #scrolling to turn the scrolling feature on or off"
+puts "for any window (including STDSCR). It's off by default."
+
+win2 = RubyText.window(6, 50, r: 6, c: 29, fg: Blue, bg: Black)
+win2.puts "\nThis is\njust some more\nrandom text..."
+win2.scrolling(true)
+
+puts "\nNote that we can scroll up or down... but there is no \"buffer\" for text."
+sleep 3
+3.times { win2.scroll(1); sleep 0.2 };  sleep 1
+3.times { win2.scroll(-1); sleep 0.2 }; sleep 4
+
+puts "\nNOTE: If you scroll STDSCR, other windows will disappear! This may be fixed later."
+sleep 3
+3.times { STDSCR.scroll(-1); sleep 0.2 }

data/examples/slides

@@ -36,5 +36,6 @@ showme("no_scroll")
 showme("window_full")
 showme("spin")
 showme("ticker_threads", 11)
+showme("scrolling")
 showme("simple_menu")
 

data/lib/color.rb

@@ -12,7 +12,7 @@ class RubyText::Color
 # TODO  add color-pair constants
 
   def self.sym2const(color)   # to curses constant
-    X.const_get("COLOR_#{color.to_s.upcase}")
+    Curses.const_get("COLOR_#{color.to_s.upcase}")
   end
 
   def self.index(color)
@@ -22,7 +22,7 @@ class RubyText::Color
   def self.pair(fg, bg)
     nf, nb = index(fg), index(bg)
     num = 8*nf + nb
-    X.init_pair(num, sym2const(fg), sym2const(bg))
+    Curses.init_pair(num, sym2const(fg), sym2const(bg))
     num
   end
 end

data/lib/effects.rb

@@ -6,10 +6,10 @@ def fx(str, *args, bg: nil)
 end
 
 class RubyText::Effects   # dumb name?
-  Modes  = {bold:    X::A_BOLD,
-            normal:  X::A_NORMAL,
-            reverse: X::A_REVERSE, 
-            under:   X::A_UNDERLINE}
+  Modes  = {bold:    Curses::A_BOLD,
+            normal:  Curses::A_NORMAL,
+            reverse: Curses::A_REVERSE, 
+            under:   Curses::A_UNDERLINE}
 
   Others = %[:show, :hide]  # show/hide cursor; more later??
 

data/lib/menu.rb

@@ -22,7 +22,7 @@ module RubyText
           self.print fx("[ #{title} ]", :bold, fg, bg: bg)
         end
       end
-      X.stdscr.keypad(true)
+      Curses.stdscr.keypad(true)
       sel = curr
       max = items.size - 1
       loop do
@@ -35,9 +35,9 @@ module RubyText
         end
         ch = getch
         case ch
-          when X::KEY_UP
+          when Curses::KEY_UP
             sel -= 1 if sel > 0
-          when X::KEY_DOWN
+          when Curses::KEY_DOWN
             sel += 1 if sel < max
           when 27
             self.restback(high, wide, r, c)
@@ -47,7 +47,7 @@ module RubyText
             self.restback(high, wide, r, c)
             RubyText.show_cursor
             return [sel, items[sel]]
-          else X.beep
+          else Curses.beep
         end
         RubyText.show_cursor
       end
@@ -60,9 +60,9 @@ module RubyText
                     win2:, callback:, enter: nil, quit: "q")
     high = rows
     wide = cols
-    mwin = RubyText.indow(high, wide, r: r, c: c, fg: fg, bg: bg)
+    mwin = RubyText.window(high, wide, r: r, c: c, fg: fg, bg: bg)
     handler = callback
-    X.stdscr.keypad(true)
+    Curses.stdscr.keypad(true)
     RubyText.hide_cursor
     sel = 0
     max = items.size - 1
@@ -76,12 +76,12 @@ module RubyText
       end
       ch = getch
       case ch
-        when X::KEY_UP
+        when Curses::KEY_UP
           if sel > 0
             sel -= 1
             handler.call(sel, items[sel], win2)
           end
-        when X::KEY_DOWN
+        when Curses::KEY_DOWN
           if sel < max
             sel += 1
             handler.call(sel, items[sel], win2)
@@ -95,10 +95,10 @@ module RubyText
             end
           end
         when 9  # tab
-          X.flash
+          Curses.flash
         when quit  # parameter
           exit
-        else X.beep    # all else is trash
+        else Curses.beep    # all else is trash
       end
     end
   rescue

data/lib/output.rb

@@ -124,7 +124,7 @@ class RubyText::Window
 
   def []=(r, c, char)
     @cwin.setpos(r, c)
-    @cwin.addch(char[0].ord|X::A_NORMAL)
+    @cwin.addch(char[0].ord|Curses::A_NORMAL)
     @cwin.setpos(r, c)
     @cwin.refresh
   end
@@ -239,7 +239,7 @@ class RubyText::Window
           next if @history.nil?  # move this?
           gs.history_next
         when Integer
-          X.beep
+          Curses.beep
         else
           gs.add(ch)
       end
@@ -273,7 +273,7 @@ module WindowIO
   # FIXME These don't/can't honor @started flag...
 
   def getch
-    X.getch
+    Curses.getch
   end
 
   def gets  # still needs improvement

data/lib/rubytext.rb

@@ -2,8 +2,6 @@ $LOAD_PATH << "lib"
 
 require 'curses'
 
-X = Curses  # shorthand. klunky I know
-
 module RubyText
 end
 

data/lib/rubytext_version.rb

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

data/lib/settings.rb

@@ -61,16 +61,16 @@ module RubyText
       @flags.uniq!
       flag = arg.to_s
       if standard.include?(flag.to_sym) || standard.include?(flag.sub(/no/, "_").to_sym)
-        X.send(flag)
+        Curses.send(flag)
       elsif flag[0] == "_" && standard.include?(flag[1..-1].to_sym)
         flag.sub!(/^_/, "no")
-        X.send(flag)
+        Curses.send(flag)
       else
         case flag.to_sym
           when :cursor
-            X.curs_set(1)
+            Curses.curs_set(1)
           when :_cursor, :nocursor
-            X.curs_set(0)
+            Curses.curs_set(0)
           when :keypad
             STDSCR.cwin.keypad(true)
           when :_keypad
@@ -109,7 +109,7 @@ module RubyText
 
   def self.stop
     @started = false
-    X.close_screen
+    Curses.close_screen
   end
 
   # For passing through arbitrary method calls
@@ -118,22 +118,22 @@ module RubyText
   def self.method_missing(name, *args)
     debug "method_missing: #{name}  #{args.inspect}"
     if name[0] == '_'
-      X.send(name[1..-1], *args)
+      Curses.send(name[1..-1], *args)
     else
       raise "#{name} #{args.inspect}" # NoMethodError
     end
   end
 
   def self.hide_cursor
-    X.curs_set(0)
+    Curses.curs_set(0)
   end
 
   def self.show_cursor
-    X.curs_set(1)
+    Curses.curs_set(1)
   end
 
   def self.show_cursor!
-    X.curs_set(2)  # Doesn't work? Device-dependent?
+    Curses.curs_set(2)  # Doesn't work? Device-dependent?
   end
 end
 

data/lib/window.rb

@@ -10,7 +10,7 @@ module RubyText
 end
 
 class RubyText::Window
-  Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
+  Vert, Horiz = Curses::A_VERTICAL, Curses::A_HORIZONTAL
 
   attr_reader :cwin, :rows, :cols, :width, :height, :scrolling
   attr_reader :r0, :c0
@@ -22,13 +22,13 @@ class RubyText::Window
                  fg=White, bg=Blue, scroll=false)
     @wide, @high, @r0, @c0 = wide, high, r0, c0
     @border, @fg, @bg      = border, fg, bg
-    @cwin = X::Window.new(high, wide, r0, c0)
+    @cwin = Curses::Window.new(high, wide, r0, c0)
     colorize!(fg, bg)
     if @border
       @cwin.box(Vert, Horiz)
       @outer = @cwin
       @outer.refresh
-      @cwin = X::Window.new(high-2, wide-2, r0+1, c0+1)
+      @cwin = Curses::Window.new(high-2, wide-2, r0+1, c0+1)
       colorize!(fg, bg)
     else
       @outer = @cwin
@@ -42,8 +42,8 @@ class RubyText::Window
 
   def self.main(fg: White, bg: Blue, scroll: false)
     debug "Starting #main..."
-    main_win = X.init_screen
-    X.start_color
+    main_win = Curses.init_screen
+    Curses.start_color
     self.colorize!(main_win, fg, bg)
     rows, cols = main_win.maxy, main_win.maxx
     win = self.make(main_win, rows, cols, 0, 0, border: false,
@@ -77,11 +77,6 @@ class RubyText::Window
     @cwin.scrollok(flag)
   end
 
-  def noscroll
-    @scrolling = false
-    @cwin.scrollok(false)
-  end
-
   def scroll(n=1)
     if n < 0
       @cwin.scrl(n)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-01 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -61,6 +61,7 @@ files:
 - examples/putch.rb
 - examples/puts_print.rb
 - examples/rcprint.rb
+- examples/scrolling.rb
 - examples/showme.rb
 - examples/simple_menu.rb
 - examples/simple_win.rb