* renewal Ruby/Tk

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 291 deletions

diff --git a/ext/tk/lib/tkentry.rb b/ext/tk/lib/tkentry.rb
index fe9a7b6277..2dcfcab5da 100644
--- a/ext/tk/lib/tkentry.rb
+++ b/ext/tk/lib/tkentry.rb
@@ -1,292 +1,4 @@
 #
-#		tkentry.rb - Tk entry classes
-#			$Date$
-#			by Yukihiro Matsumoto <matz@caelum.co.jp>
-
-require 'tk.rb'
-
-class TkEntry<TkLabel
-  include Scrollable
-
-  TkCommandNames = ['entry'.freeze].freeze
-  WidgetClassName = 'Entry'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  class ValidateCmd
-    include TkComm
-
-    module Action
-      Insert = 1
-      Delete = 0
-      Others = -1
-      Focus  = -1
-      Forced = -1
-      Textvariable = -1
-      TextVariable = -1
-    end
-
-    class ValidateArgs
-      VARG_KEY  = 'disvPSVW'
-      VARG_TYPE = 'nxeseesw'
-
-      def self.scan_args(arg_str, arg_val)
-	enc = Tk.encoding
-	arg_cnv = []
-	arg_str.strip.split(/\s+/).each_with_index{|kwd,idx|
-	  if kwd =~ /^%(.)$/
-	    if num = VARG_KEY.index($1)
-	      case VARG_TYPE[num]
-	      when ?n
-		arg_cnv << TkComm::number(arg_val[idx])
-	      when ?s
-		arg_cnv << TkComm::string(arg_val[idx])
-	      when ?e
-		if enc
-		  arg_cnv << Tk.fromUTF8(TkComm::string(arg_val[idx]), enc)
-		else
-		  arg_cnv << TkComm::string(arg_val[idx])
-		end
-	      when ?w
-		arg_cnv << TkComm::window(arg_val[idx])
-	      when ?x
-		idx = TkComm::number(arg_val[idx])
-		if idx < 0
-		  arg_cnv << nil
-		else
-		  arg_cnv << idx
-		end
-	      else
-		arg_cnv << arg_val[idx]
-	      end
-	    else
-	      arg_cnv << arg_val[idx]
-	    end
-	  else
-	    arg_cnv << arg_val[idx]
-	  end
-	}
-	arg_cnv
-      end
-
-      def initialize(d,i,s,v,pp,ss,vv,ww)
-	@action = d
-	@index = i
-	@current = s
-	@type = v
-	@value = pp
-	@string = ss
-	@triggered = vv
-	@widget = ww
-      end
-      attr :action
-      attr :index
-      attr :current
-      attr :type
-      attr :value
-      attr :string
-      attr :triggered
-      attr :widget
-    end
-
-    def initialize(cmd = Proc.new, args=nil)
-      if args
-	@id = 
-	  install_cmd(proc{|*arg|
-			TkUtil.eval_cmd(proc{|*v| (cmd.call(*v))? '1': '0'}, 
-					*ValidateArgs.scan_args(args, arg))
-		      }) + " " + args
-      else
-	args = ' %d %i %s %v %P %S %V %W'
-	@id = 
-	  install_cmd(proc{|*arg|
-			TkUtil.eval_cmd(proc{|*v| (cmd.call(*v))? '1': '0'}, 
-					ValidateArgs.new(*ValidateArgs \
-							 .scan_args(args,arg)))
-	  }) + args
-      end
-    end
-
-    def to_eval
-      @id
-    end
-  end
-
-  def create_self(keys)
-    tk_call 'entry', @path
-    if keys and keys != None
-      configure(keys)
-    end
-  end
-  private :create_self
-
-  def configure(slot, value=None)
-    if slot.kind_of? Hash
-      slot = _symbolkey2str(slot)
-      if slot['vcmd'].kind_of? Array
-	cmd, *args = slot['vcmd']
-	slot['vcmd'] = ValidateCmd.new(cmd, args.join(' '))
-      elsif slot['vcmd'].kind_of? Proc
-	slot['vcmd'] = ValidateCmd.new(slot['vcmd'])
-      end
-      if slot['validatecommand'].kind_of? Array
-	cmd, *args = slot['validatecommand']
-	slot['validatecommand'] = ValidateCmd.new(cmd, args.join(' '))
-      elsif slot['validatecommand'].kind_of? Proc
-	slot['validatecommand'] = ValidateCmd.new(slot['validatecommand'])
-      end
-      if slot['invcmd'].kind_of? Array
-	cmd, *args = slot['invcmd']
-	slot['invcmd'] = ValidateCmd.new(cmd, args.join(' '))
-      elsif slot['invcmd'].kind_of? Proc
-	slot['invcmd'] = ValidateCmd.new(slot['invcmd'])
-      end
-      if slot['invalidcommand'].kind_of? Array
-	cmd, *args = slot['invalidcommand']
-	slot['invalidcommand'] = ValidateCmd.new(cmd, args.join(' '))
-      elsif slot['invalidcommand'].kind_of? Proc
-	slot['invalidcommand'] = ValidateCmd.new(slot['invalidcommand'])
-      end
-      super(slot)
-    else
-      if (slot == 'vcmd' || slot == :vcmd || 
-          slot == 'validatecommand' || slot == :validatecommand || 
-	  slot == 'invcmd' || slot == :invcmd || 
-          slot == 'invalidcommand' || slot == :invalidcommand)
-	if value.kind_of? Array
-	  cmd, *args = value
-	  value = ValidateCmd.new(cmd, args.join(' '))
-	elsif value.kind_of? Proc
-	  value = ValidateCmd.new(value)
-	end
-      end
-      super(slot, value)
-    end
-    self
-  end
-
-  def bbox(index)
-    list(tk_send('bbox', index))
-  end
-  def cursor
-    number(tk_send('index', 'insert'))
-  end
-  def cursor=(index)
-    tk_send 'icursor', index
-    self
-  end
-  def index(index)
-    number(tk_send('index', index))
-  end
-  def insert(pos,text)
-    tk_send 'insert', pos, text
-    self
-  end
-  def delete(first, last=None)
-    tk_send 'delete', first, last
-    self
-  end
-  def mark(pos)
-    tk_send 'scan', 'mark', pos
-    self
-  end
-  def dragto(pos)
-    tk_send 'scan', 'dragto', pos
-    self
-  end
-  def selection_adjust(index)
-    tk_send 'selection', 'adjust', index
-    self
-  end
-  def selection_clear
-    tk_send 'selection', 'clear'
-    self
-  end
-  def selection_from(index)
-    tk_send 'selection', 'from', index
-    self
-  end
-  def selection_present()
-    bool(tk_send('selection', 'present'))
-  end
-  def selection_range(s, e)
-    tk_send 'selection', 'range', s, e
-    self
-  end
-  def selection_to(index)
-    tk_send 'selection', 'to', index
-    self
-  end
-
-  def invoke_validate
-    bool(tk_send('validate'))
-  end
-  def validate(mode = nil)
-    if mode
-      configure 'validate', mode
-    else
-      invoke_validate
-    end
-  end
-
-  def validatecommand(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('validatecommand', cmd)
-    elsif args
-      configure('validatecommand', [cmd, args])
-    else
-      configure('validatecommand', cmd)
-    end
-  end
-  alias vcmd validatecommand
-
-  def invalidcommand(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('invalidcommand', cmd)
-    elsif args
-      configure('invalidcommand', [cmd, args])
-    else
-      configure('invalidcommand', cmd)
-    end
-  end
-  alias invcmd invalidcommand
-
-  def value
-    tk_send 'get'
-  end
-  def value= (val)
-    tk_send 'delete', 0, 'end'
-    tk_send 'insert', 0, val
-  end
-end
-
-class TkSpinbox<TkEntry
-  TkCommandNames = ['spinbox'.freeze].freeze
-  WidgetClassName = 'Spinbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  def create_self(keys)
-    tk_call 'spinbox', @path
-    if keys and keys != None
-      configure(keys)
-    end
-  end
-  private :create_self
-
-  def identify(x, y)
-    tk_send 'identify', x, y
-  end
-
-  def spinup
-    tk_send 'invoke', 'spinup'
-    self
-  end
-
-  def spindown
-    tk_send 'invoke', 'spindown'
-    self
-  end
-
-  def set(str)
-    tk_send 'set', str
-  end
-end
+#   tkentry.rb - load tk/entry.rb
+#
+require 'tk/entry'