cursesx 002 → 003

data/lib/cursesx.rb

@@ -5,9 +5,12 @@ module CursesX
 end
 
 module Curses
+  module_function
+
   alias :standout_orig :standout
   alias :standend_orig :standend
 
+  # Standout within the block.
   def standout
     if block_given?
       standout_orig
@@ -18,6 +21,7 @@ module Curses
     end
   end
 
+  # Standend within the block.
   def standend
     if block_given?
       standend_orig
@@ -31,39 +35,83 @@ module Curses
   alias :echo_orig :echo
   alias :noecho_orig :noecho
 
+  module_function :echo_orig, :noecho_orig
+
+  # Echo within the block.
   def echo
     if block_given?
       echo_orig
-      yield
+      res = yield
       noecho_orig
+      return res
     else
       echo_orig
     end
   end
 
+  # Noecho within the block.
   def noecho
     if block_given?
       noecho_orig
-      yield
+      res = yield
       echo_orig
+      return res
     else
       noecho_orig
     end
   end
 
+  def define_color(name, fg, bg)
+    @@color ||= Hash.new
+    val = @@color.values.sort.last || 0
+    @@color[name] = val + 1
+    fg = color_of(fg) if fg.kind_of?(Symbol)
+    bg = color_of(bg) if bg.kind_of?(Symbol)
+    init_pair(@@color[name], fg, bg)
+  end
+
+  def color(name)
+    color_pair(@@color[name])
+  end
+
+  # Symbol to color.
+  def color_of(name)
+    case name
+    when :black; COLOR_BLACK
+    when :red; COLOR_RED
+    when :green; COLOR_GREEN
+    when :yellow; COLOR_YELLOW
+    when :blue; COLOR_BLUE
+    when :magenta; COLOR_MAGENTA
+    when :cyan; COLOR_CYAN
+    when :white; COLOR_WHITE
+    else raise ArgumentError, name
+    end
+  end
+
+  private :color_of
+
   class Window
-    attr_reader :children
+    attr_reader :__children__
+    attr_accessor :__parent__
+    alias :children :__children__
+    alias :parent :__parent__
+    alias :parent= :__parent__=
 
     alias :subwin_orig :subwin
-    def subwin(height, width, y, x)
-      @children ||= []
-      @children << subwin_orig(height, width, y, x)
-      return @children.last
+    def subwin(height, width, y, x, mod = nil)
+      @__children__ ||= []
+      win = subwin_orig(height, width, y, x)
+      win.parent = self
+      win.extend mod if mod
+      @__children__ << win
+      return win
     end
 
     alias :standout_orig :standout
     alias :standend_orig :standend
 
+    # Standout within the block.
     def standout
       if block_given?
         standout_orig
@@ -74,6 +122,7 @@ module Curses
       end
     end
 
+    # Standend within the block.
     def standend
       if block_given?
         standend_orig
@@ -83,5 +132,34 @@ module Curses
         standend_orig
       end
     end
+
+    # Echo within the block.
+    def echo
+      if block_given?
+        Curses.echo
+        res = yield
+        Curses.noecho
+        return res
+      else
+        Curses.echo
+      end
+    end
+
+    # Noecho within the block.
+    def noecho
+      if block_given?
+        Curses.noecho
+        res = yield
+        Curses.echo
+        return res
+      else
+        Curses.noecho
+      end
+    end
+
+    # Draw the window.
+    def draw; warning "Not implemented"; end
+
+    def color(name); Curses.color(name); end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cursesx
 version: !ruby/object:Gem::Version 
-  version: "002"
+  version: "003"
 platform: ruby
 authors: 
 - Keita Yamaguchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-16 00:00:00 +09:00
+date: 2008-07-27 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -22,11 +22,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gemified
-- History.txt
-- License.txt
-- README.txt
-- Rakefile
+- History.rdoc
+- LICENSE
+- README.rdoc
 - lib/cursesx.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/cursesx/
@@ -50,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cursesx
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: cursesx is an useful extension of standard curses.rb.

data/.gemified

@@ -1,9 +0,0 @@
---- 
-:summary: cursesx is an useful extension of standard curses.rb.
-:email: keita.yamaguchi@gmail.com
-:name: cursesx
-:has_rdoc: true
-:homepage: http://rubyforge.org/projects/cursesx/
-:version: "002"
-:rubyforge_project: cursesx
-:author: Keita Yamaguchi

data/Rakefile

@@ -1,7 +0,0 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
-
-require "rubygems"
-require "cursesx"
-require "rtask"
-
-RTask.new(:use => :all, :version => CursesX::VERSION)