rubytext 0.0.76 → 0.0.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57dc0a7d99cad64dde62865a3bd48f8e5cd49644390f9089371fe121a742e6b4
-  data.tar.gz: 4e89cb5f8394f4ac36a2e7599720b9a03111f1de4b428545e245c457b0bf7ca3
+  metadata.gz: ee7c6312edf48700460e3ac66588a92de3809dddb2eeef6fe33a4174e355ef81
+  data.tar.gz: ada7f3ee8c716f7be23affaa9ef790f51df1acfb0f11be30c876e8e6d18f4fa4
 SHA512:
-  metadata.gz: 125ff3fe92c91935c218f80da9980242725fd6c47949e394d4b35dfc34b252c378193861041e02275cc8f9b934d6f85ca392209cd50b0a5bff18b90b149a8c41
-  data.tar.gz: bf92b9b47a490046e7ebc35d77d9d7bbe7e664034dae83e06b9eb97990c4db5027aa430b9d4c48b6185360904fff66167c6be329d5003761a21b7b63bf24a095
+  metadata.gz: 551a09d2ddf6a41f90e7e6c85ac3a4738d597dbe2ee6e55970a1268a4e2f0a4c7881196e92f4614da8ca4feb016fc67101114cd769bb06b5b7e8b327646d0d42
+  data.tar.gz: e5ab24e1cd086a8a43534f37af73146ed6dad0fec0beab3333b7d6d5d87d220fe127c1c1d45073c3b5817fa8069990241ed1daedd11f4fe4c0441c6aa1c0e5e9

data/lib/navigation.rb

@@ -1,5 +1,31 @@
 class RubyText::Window
+
+  def coords(r, c)
+    r = case
+          when r == :center
+            self.rows / 2 
+          when r == :top
+            0
+          when r == :bottom
+            self.rows - 1
+          else
+            r
+          end
+    c = case
+          when c == :center
+            self.cols / 2 
+          when c == :left
+            0
+          when c == :right
+            self.cols - 1
+          else
+            c
+          end
+    [r, c]
+  end
+
   def go(r, c)
+    r, c = coords(r, c)
     save = self.rc
     @cwin.setpos(r, c)
     if block_given?

data/lib/output.rb

@@ -59,7 +59,7 @@ class RubyText::Window
   end
 
   def rcprint!(r, c, *args)
-    @cwin.setpos(r, c)  # Cursor isn't restored
+    self.go(r, c)  # Cursor isn't restored
     self.print *args
   end
 
@@ -71,10 +71,8 @@ class RubyText::Window
       fx.set(self) if fx
       val = fx.value rescue 0
       @cwin.addch(ch.ord|val)
-      # @win.refresh
     end
     fx.reset(self) if fx
-    # self[r, c] = ch[0]
   end
 
   def crlf     # Technically not output...
@@ -144,21 +142,27 @@ end
 
 module WindowIO
   def puts(*args)       # Doesn't affect STDOUT.puts, etc.
-    $stdscr.puts(*args)
+    recv = RubyText.started ? $stdscr : Kernel
+    recv.puts(*args)
   end
 
   def print(*args)
-    $stdscr.print(*args)
+    recv = RubyText.started ? $stdscr : Kernel
+    recv.print(*args)
   end
 
   def p(*args)
-    $stdscr.p(*args)
+    recv = RubyText.started ? $stdscr : Kernel
+    recv.p(*args)
   end
 
   def rcprint(r, c, *args)
-    $stdscr.rcprint r, c, *args
+    recv = RubyText.started ? $stdscr : Kernel
+    recv.rcprint r, c, *args
   end
 
+  # FIXME These don't/can't honor @started flag...
+
   def getch
     X.getch
   end
@@ -177,7 +181,7 @@ module WindowIO
   end
 
   def putch(ch, r: nil, c: nil, fx: nil)
-    $stdscr.putch(ch, r: r, c: c, fx: fx)
+    STDSCR.putch(ch, r: r, c: c, fx: fx)
   end
 end
 

data/lib/settings.rb

@@ -3,6 +3,10 @@ module RubyText
 
   ValidArgs = [:raw, :_raw, :echo, :_echo, :cbreak, :_cbreak]
 
+  def self.started
+    @started
+  end
+
   def self.start(*args, log: "/tmp/rubytext.log", 
                  fg: White, bg: Blue, scroll: false)
     $debug ||= File.new(log, "w") if log   # FIXME remove global
@@ -17,6 +21,7 @@ module RubyText
     Object.include(WindowIO)
     self.set(:_echo, :cbreak)  # defaults  (:keypad?)
     self.set(*args)            # override defaults
+    @started = true
   rescue => err
     debug(err.inspect)
     debug(err.backtrace)
@@ -93,6 +98,7 @@ module RubyText
   end
 
   def self.stop
+    @started = false
     X.close_screen
   end
 

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module RubyText
-  VERSION = "0.0.76"
+  VERSION = "0.0.77"
 
   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.76
+  version: 0.0.77
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A thick wrapper for Curses