rubytext 0.0.45 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 300a9466ed6acf8da10a0f5d941eb37bfa9c9e5d288c9941f8bc29fb5fc698b6
-  data.tar.gz: 970639b6571c00d7726a20b72a12f5b6223400c134a530f578f463c96f5e1325
+  metadata.gz: e5bdd350f25e6f839cc14ed02094834b04500fc4d19d0820528c4f7926e6ad06
+  data.tar.gz: 7b692875289645bfcd7549b55802d3ae71c107d495946577174b3ca90d53cbb2
 SHA512:
-  metadata.gz: d5444630bd193e328eb0be786de4a1f0348b5450e65c36e1f731a89ecccaf4cd8cfcbd263c8b7edf56214371ed1e8df734bcff703d553efca91cbd0340e60f5c
-  data.tar.gz: d8b420ce4fcc40c92d718969efe58f20010b85791efe648d4b570932b74cd81d9b3443a67d5e0fab25925de5c0f12d9ffdaf0ab42397966029197e5fc9f5c9ea
+  metadata.gz: 9c3ed73c4221ead1bfbb6fce563e4b6946e35e5eccda27f3895f24e2c56cd18b49d13987c073b68ddc71b732e054a7423ff3d7cc0a68844091ac912657fb18e3
+  data.tar.gz: cdd9791ff4789cd234fc8ef7c364913f79ab5fa8b73b81d00dd86b9751b477d3aa8aa5af57a29d16f7984a27b7f6bf0061b75995e6b2cc4a8026dbbd8fb3ef03

data/examples/prog01.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(6, 25, 2, 4, 
+win = RubyText.window(6, 25, 2, 34, 
                       # 6 rows, 25 cols; upper left at 2,4
                       true, # has a border
                       fg: :blue, bg: :white) # foreground, background

data/lib/color.rb

@@ -27,7 +27,7 @@ class RubyText::Window
   def self.colors(win, fg, bg)
     cfg, cbg, cp = fb2cp(fg, bg)
     X.init_pair(cp, cfg, cbg)
-    win.color_set(cp|X::A_NORMAL)
+    win.color_set(cp)  # |X::A_NORMAL)
   end
 
   def self.colors!(win, fg, bg)

data/lib/effects.rb

@@ -0,0 +1,21 @@
+class RubyText::Effects   # dumb name?
+  Modes = %w[A_BOLD A_NORMAL A_PROTECT A_REVERSE A_STANDOUT A_UNDERLINE]
+
+  attr_reader :value
+  
+  def initialize(bg, *args)
+    bits = 0
+    args.each do |arg|
+      if Modes.include?(arg)
+        val = eval("X::A_#{arg.to_s.upcase}")
+        bits ||= val
+      elsif RubyText::Colors.include?(arg)
+        val = eval("X::COLOR_#{arg.to_s.upcase}")
+        bits ||= val
+      end
+    end
+    @value = bits
+    X.attrset(bits)
+  end
+end
+

data/lib/output.rb

@@ -30,7 +30,7 @@ class RubyText::Window
       args.map!(&:inspect) 
     else
       args.map! do |x|
-        if RubyText::Colors.include? x
+        if RubyText::Colors.include?(x) || x.is_a?(RubyText::Effects)
           x
         else
           x.to_s
@@ -43,6 +43,8 @@ class RubyText::Window
     args.each do |arg|  
       if arg.is_a? Symbol # must be a color
         RubyText::Window.colors(@win, arg, @bg)  # FIXME?
+      elsif arg.is_a? RubyText::Effects
+        X.attrset(arg.value)
       else
         arg.each_char {|ch| ch == "\n" ? crlf : @win.addch(ch) }
       end

data/lib/rubytext.rb

@@ -11,9 +11,11 @@ require 'keys'         # RubyText::Keys
 require 'menu'         # RubyText
 require 'window'       # RubyText::Window
 require 'color'        # RubyText, RubyText::Window
+require 'effects'
 require 'navigation'   # RubyText::Window
 require 'settings'     # RubyText
 
+
 # Skeleton... Can't put at top because of #initalize
 
 module RubyText

data/lib/settings.rb

@@ -1,33 +1,46 @@
 module RubyText
-  def self.set(*args)
-    # Allow a block?
+  def self.set(*args)   # Allow a block?
     standard = [:cbreak, :raw, :echo, :keypad]
-    @flags = []   # FIXME can set/reset individually. hmmm
+    @defaults = [:cbreak, :echo, :keypad, :cursor]
+    @flags = @defaults.dup
+    save_flags
     args.each do |arg|
-      if standard.include? arg
-        flag = arg.to_s
-        @flags << arg
-        flag.sub!(/_/, "no")
+      @flags << arg
+      flag = arg.to_s
+      if standard.include? flag.to_sym
+        X.send(flag)
+      elsif flag[0] == "_" && standard.include?(flag[1..-1].to_sym)
+        flag.sub!(/^_/, "no")
         X.send(flag)
       else
-        @flags << arg
         case arg
           when :cursor
             X.show_cursor
           when :_cursor, :nocursor
             X.hide_cursor
+          else puts "wtf is #{arg}?"
         end
       end
     end
+    if block_given?
+      yield
+      rest_flags
+    end
+  end
+
+  def self.reset
+    restflags
   end
 
-  def save_flags
+  def self.save_flags
     @fstack ||= []
     @fstack.push @flags
   end
 
-  def rest_flags
+  def self.rest_flags
     @flags = @fstack.pop
+  rescue 
+    @flags = @defaults
   end
 
   def self.start(*args, log: nil, fg: nil, bg: nil)

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.46
 platform: ruby
 authors:
 - Hal Fulton
@@ -68,6 +68,7 @@ files:
 - examples/showme.rb
 - examples/slides
 - lib/color.rb
+- lib/effects.rb
 - lib/keys.rb
 - lib/menu.rb
 - lib/navigation.rb