tk 0.1.0 → 0.4.0

data/lib/tkextlib/tkDND/tkdnd.rb

@@ -80,6 +80,53 @@ module Tk
       _setup_subst_table(KEY_TBL, PROC_TBL);
     end
 
+    class DND_SubstText < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?D, ?d, :data ],
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?d, proc do |s|
+                case TclTkLib::WINDOWING_SYSTEM
+                when 'x11', 'win32'
+                  s.force_encoding('utf-8')
+                end
+                s
+              end
+        ],
+        nil
+      ]
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+    end
+    
+    class DND_SubstFileList < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?D, ?d, :data ],
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?d, proc do |s|
+                case TclTkLib::WINDOWING_SYSTEM
+                when 'win32'
+                  s.force_encoding('utf-8')
+                  TkComm.simplelist(s).map { |x| x.tr('\\', '/') }
+                when 'x11'
+                  s = s.encode('iso8859-1', 'utf-8')
+                  s.force_encoding('utf-8')
+                  TkComm.simplelist(s)
+                else
+                  TkComm.simplelist(s)
+                end
+              end
+        ],
+        nil
+      ]
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+    end
+    
+    
     module DND
       def self.version
         begin
@@ -99,24 +146,20 @@ module Tk
         end
       end
 
-      #def dnd_bindtarget(type, event, cmd=Proc.new, prior=50, *args)
-      #  event = tk_event_sequence(event)
-      #  if prior.kind_of?(Numeric)
-      #    tk_call('dnd', 'bindtarget', @path, type, event,
-      #            install_bind_for_event_class(DND_Subst, cmd, *args),
-      #            prior)
-      #  else
-      #    tk_call('dnd', 'bindtarget', @path, type, event,
-      #            install_bind_for_event_class(DND_Subst, cmd, prior, *args))
-      #  end
-      #  self
-      #end
-      def dnd_bindtarget(type, event, *args)
+      def dnd_bindtarget(type, event, *args, &block)
         # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0]) || !block_given?
+        klass = case type
+                when 'text/plain'
+                  DND_SubstText
+                when 'text/uri-list'
+                  DND_SubstFileList
+                else
+                  DND_Subst
+                end
+        if TkComm._callback_entry?(args[0]) || !block
           cmd = args.shift
         else
-          cmd = Proc.new
+          cmd = block
         end
 
         prior = 50
@@ -125,11 +168,11 @@ module Tk
         event = tk_event_sequence(event)
         if prior.kind_of?(Numeric)
           tk_call('dnd', 'bindtarget', @path, type, event,
-                  install_bind_for_event_class(DND_Subst, cmd, *args),
+                  install_bind_for_event_class(klass, cmd, *args),
                   prior)
         else
           tk_call('dnd', 'bindtarget', @path, type, event,
-                  install_bind_for_event_class(DND_Subst, cmd, prior, *args))
+                  install_bind_for_event_class(klass, cmd, prior, *args))
         end
         self
       end
@@ -147,16 +190,12 @@ module Tk
         end
       end
 
-      #def dnd_bindsource(type, cmd=Proc.new, prior=None)
-      #  tk_call('dnd', 'bindsource', @path, type, cmd, prior)
-      #  self
-      #end
-      def dnd_bindsource(type, *args)
+      def dnd_bindsource(type, *args, &block)
         # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0]) || !block_given?
+        if TkComm._callback_entry?(args[0]) || !block
           cmd = args.shift
         else
-          cmd = Proc.new
+          cmd = block
         end
 
         args = [TkComm::None] if args.empty?

data/lib/tkextlib/tkHTML/htmlwidget.rb

@@ -391,7 +391,7 @@ class Tk::HTML_Widget
   end
 
   def token_handler(tag, cmd=nil, &b)
-    cmd = Proc.new(&b) if !cmd && b
+    cmd = b if !cmd && b
     if cmd
       tk_send('token', 'handler', tag, cmd)
       return self

data/lib/tkextlib/tktable/tktable.rb

@@ -132,7 +132,7 @@ class Tk::TkTable::CellTag
 
   CellTagID_TBL = TkCore::INTERP.create_table
 
-  (CellTag_ID = ['tktbl:celltag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (CellTag_ID = ['tktbl:celltag'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -155,7 +155,7 @@ class Tk::TkTable::CellTag
 
   def initialize(parent, keys=nil)
     @parent = @t = parent
-    @tpath - parent.path
+    @tpath = parent.path
     CellTag_ID.mutex.synchronize{
       @path = @id = CellTag_ID.join(TkCore::INTERP._ip_id_)
       CellTag_ID[1].succ!

data/lib/tkextlib/treectrl/tktreectrl.rb

@@ -1294,7 +1294,7 @@ class Tk::TreeCtrl
 
   def item_state_get(item, *args)
     if args.empty?
-      list(tk_send('item', 'state', 'get', item *args))
+      list(tk_send('item', 'state', 'get', item * args))
     else
       bool(tk_send('item', 'state', 'get', item))
     end
@@ -1420,31 +1420,23 @@ class Tk::TreeCtrl
     marquee_visible()
   end
 
-  #def notify_bind(obj, event, cmd=Proc.new, *args)
-  #  _bind([@path, 'notify', 'bind', obj], event, cmd, *args)
-  #  self
-  #end
-  def notify_bind(obj, event, *args)
+  def notify_bind(obj, event, *args, &block)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind([@path, 'notify', 'bind', obj], event, cmd, *args)
     self
   end
 
-  #def notify_bind_append(obj, event, cmd=Proc.new, *args)
-  #  _bind_append([@path, 'notify', 'bind', obj], event, cmd, *args)
-  #  self
-  #end
-  def notify_bind_append(obj, event, *args)
+  def notify_bind_append(obj, event, *args, &block)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind_append([@path, 'notify', 'bind', obj], event, cmd, *args)
     self
@@ -1475,7 +1467,7 @@ class Tk::TreeCtrl
 
   def notify_install(pattern, percents_cmd=nil, &b)
     pattern = "<#{pattern}>"
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
+    percents_cmd = b if !percents_cmd && b
     if percents_cmd
       procedure(tk_send('notify', 'install', pattern, percents_cmd))
     else
@@ -1484,7 +1476,7 @@ class Tk::TreeCtrl
   end
 
   def notify_install_detail(event, detail, percents_cmd=nil, &b)
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
+    percents_cmd = b if !percents_cmd && b
     if percents_cmd
       tk_send('notify', 'install', 'detail', event, detail, percents_cmd)
     else
@@ -1493,7 +1485,7 @@ class Tk::TreeCtrl
   end
 
   def notify_install_event(event, percents_cmd=nil, &b)
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
+    percents_cmd = b if !percents_cmd && b
     if percents_cmd
       tk_send('notify', 'install', 'event', event, percents_cmd)
     else
@@ -1733,7 +1725,7 @@ end
 class Tk::TreeCtrl::Column < TkObject
   TreeCtrlColumnID_TBL = TkCore::INTERP.create_table
 
-  (TreeCtrlColumnID = ['treectrl_column'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (TreeCtrlColumnID = ['treectrl_column'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -1839,7 +1831,7 @@ end
 class Tk::TreeCtrl::Element < TkObject
   TreeCtrlElementID_TBL = TkCore::INTERP.create_table
 
-  (TreeCtrlElementID = ['treectrl_element'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (TreeCtrlElementID = ['treectrl_element'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -2277,7 +2269,7 @@ end
 class Tk::TreeCtrl::Style < TkObject
   TreeCtrlStyleID_TBL = TkCore::INTERP.create_table
 
-  (TreeCtrlStyleID = ['treectrl_style'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (TreeCtrlStyleID = ['treectrl_style'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/lib/tkextlib/vu/pie.rb

@@ -118,7 +118,7 @@ end
 class Tk::Vu::PieSlice
   SliceID_TBL = TkCore::INTERP.create_table
 
-  (Pie_Slice_ID = ['vu:pie'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (Pie_Slice_ID = ['vu:pie'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/sample/binding_sample.rb

@@ -38,8 +38,8 @@ class Button_clone < TkLabel
               })
   end
 
-  def command(cmd = Proc.new)
-    @command = cmd
+  def command(cmd = nil, &block)
+    @command = cmd || block
   end
 
   def invoke

data/sample/cmd_res_test.rb

@@ -9,7 +9,7 @@ cmd2 = TkOptionDB.new_proc_class(:ZZZ, [:show_msg, :bye_msg], 3, false, cmd1)
 cmd3 = TkOptionDB.new_proc_class(:ZZZ, [:show_msg, :bye_msg], 3, false, b)
 cmd4 = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3){
   def self.__check_proc_string__(str)
-    "{|arg| print [arg, $SAFE].inspect, ': '; Proc.new#{str}.call(arg)}"
+    "{|arg| print arg.inspect, ': '; Proc.new#{str}.call(arg)}"
   end
 }
 cmd1.show_msg('cmd1')

data/sample/demos-en/widget

@@ -582,10 +582,10 @@ end
 
 # Pseudo-Toplevel support
 module PseudoToplevel_Evaluable
-  def pseudo_toplevel_eval(body = Proc.new)
+  def pseudo_toplevel_eval(body = nil, &block)
     Thread.current[:TOPLEVEL] = self
     begin
-      body.call
+      (body || block).call
     ensure
       Thread.current[:TOPLEVEL] = nil
     end
@@ -605,25 +605,25 @@ module PseudoToplevel_Evaluable
 end
 
 class Object
-  alias __method_missing__ method_missing
-  private :__method_missing__
-
-  def method_missing(id, *args)
-    begin
-      has_top = (top = Thread.current[:TOPLEVEL]) &&
-                   top.respond_to?(:pseudo_toplevel_evaluable?) &&
-                   top.pseudo_toplevel_evaluable? &&
-                   top.respond_to?(id)
-    rescue Exception => e
-      has_top = false
-    end
+  include(Module.new do
+    private
+    def method_missing(id, *args)
+      begin
+        has_top = (top = Thread.current[:TOPLEVEL]) &&
+                     top.respond_to?(:pseudo_toplevel_evaluable?) &&
+                     top.pseudo_toplevel_evaluable? &&
+                     top.respond_to?(id)
+      rescue Exception => e
+        has_top = false
+      end
 
-    if has_top
-      top.__send__(id, *args)
-    else
-      __method_missing__(id, *args)
+      if has_top
+        top.__send__(id, *args)
+      else
+        super
+      end
     end
-  end
+  end)
 end
 
 class Proc
@@ -649,10 +649,10 @@ class Proc
 end
 
 def proc(&b)
-  Proc.new(&b)
+  b
 end
 def lambda(&b)
-  Proc.new(&b)
+  b
 end
 
 def _null_binding

data/sample/demos-jp/widget

@@ -639,10 +639,10 @@ end
 
 # 疑似トップレベルサポート
 module PseudoToplevel_Evaluable
-  def pseudo_toplevel_eval(body = Proc.new)
+  def pseudo_toplevel_eval(body = nil, &block)
     Thread.current[:TOPLEVEL] = self
     begin
-      body.call
+      (body || block).call
     ensure
       Thread.current[:TOPLEVEL] = nil
     end
@@ -706,10 +706,10 @@ class Proc
 end
 
 def proc(&b)
-  Proc.new(&b)
+  b
 end
 def lambda(&b)
-  Proc.new(&b)
+  b
 end
 
 def _null_binding

data/sample/multi-ip_sample.rb

@@ -80,9 +80,6 @@ safe_slave1.eval_proc(cmd, 'safe1')      # label -> .w00016
 safe_slave2.eval_proc(cmd, 'safe2')      # label -> .w00020
 cmd.call('master')                       # label -> .w00024
 
-#second_master = MultiTkIp.new(&cmd)
-#second_master = MultiTkIp.new(:safe=>2){p [:second_master, $SAFE]}
-
 TkTimer.new(2000, -1, proc{p ['safe1', safe_slave1.deleted?]}).start
 TkTimer.new(2000, -1, proc{p ['safe2', safe_slave2.deleted?]}).start
 TkTimer.new(2000, -1, proc{p ['trusted', trusted_slave.deleted?]}).start

data/sample/multi-ip_sample2.rb

@@ -13,7 +13,7 @@ cmd = proc{|s|
 
   TkButton.new(:text=>'b1: p self', :command=>proc{p self}).pack(:fill=>:x)
   sleep s
-  TkButton.new(:text=>'b2: p $SAFE', :command=>proc{p $SAFE}).pack(:fill=>:x)
+  TkButton.new(:text=>'b2: p 0', :command=>proc{p 0}).pack(:fill=>:x)
   sleep s
   TkButton.new(:text=>'b3: p MultiTkIp.ip_name',
                :command=>proc{p MultiTkIp.ip_name}).pack(:fill=>:x)

data/sample/resource.en

@@ -7,7 +7,7 @@
 *BtnFrame.Button.foreground: red
 *hello.text: HELLO
 *quit.text: QUIT
-*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE}) ";\
+*BTN_CMD.show_msg: {|arg| print "(0) ";\
                           print "Hello!! This is a sample of #{arg}.";\
-                          print "(<<< $SAFE=#{$SAFE})\n"}
-*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) Good-bye��(<<< $SAFE=#{$SAFE})\n"}
+                          print "(<<< 0)\n"}
+*BTN_CMD.bye_msg:  {print "(0 >>>) Good-bye��(<<< 0)\n"}

data/sample/resource.ja

@@ -7,7 +7,7 @@
 *BtnFrame.Button.foreground: red
 *hello.text: こんにちは
 *quit.text: 終了
-*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE} >>>) ";\
+*BTN_CMD.show_msg: {|arg| print "(0 >>>) ";\
                           print "こんにちは！！ #{arg} のサンプルです．";\
-                          print "(<<< $SAFE=#{$SAFE})\n"}
-*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) さようなら．(<<< $SAFE=#{$SAFE})\n"}
+                          print "(<<< 0)\n"}
+*BTN_CMD.bye_msg:  {print "(0 >>>) さようなら．(<<< 0)\n"}

data/sample/tcltklib/sample1.rb

@@ -293,7 +293,7 @@ class Test1
   def test_checkbutton(ip, parent)
     checkbutton, global, pack = ip.commands().values_at(
       "checkbutton", "global", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "checkbutton")
+    t1, b1, _ = inittoplevel(ip, parent, "checkbutton")
 
     ## checkbutton
 
@@ -616,7 +616,7 @@ print "start\n"
 ip = []
 
 # インタプリタ, ウィジェット等の生成.
-for i in 1 .. n
+for _ in 1 .. n
   ip.push(Test1.new())
 end
 

data/sample/tkballoonhelp.rb

@@ -84,8 +84,8 @@ class Tk::RbWidget::BalloonHelp<TkLabel
     end
   end
 
-  def command(cmd = Proc.new)
-    @command = cmd
+  def command(cmd = nil, &block)
+    @command = cmd || block
     self
   end