tk 0.1.0 → 0.4.0

data/lib/remote-tk.rb

@@ -13,8 +13,8 @@ class MultiTkIp; end
 class RemoteTkIp < MultiTkIp; end
 
 class MultiTkIp
-  @@IP_TABLE = TkUtil.untrust({}) unless defined?(@@IP_TABLE)
-  @@TK_TABLE_LIST = TkUtil.untrust([]) unless defined?(@@TK_TABLE_LIST)
+  @@IP_TABLE = {} unless defined?(@@IP_TABLE)
+  @@TK_TABLE_LIST = [] unless defined?(@@TK_TABLE_LIST)
   def self._IP_TABLE; @@IP_TABLE; end
   def self._TK_TABLE_LIST; @@TK_TABLE_LIST; end
 
@@ -87,39 +87,25 @@ class RemoteTkIp
     @slave_ip_tbl = {}
     @slave_ip_top = {}
 
-    @force_default_encoding ||= TkUtil.untrust([false])
-    @encoding ||= TkUtil.untrust([nil])
+    @force_default_encoding ||= [false]
+    @encoding ||= [nil]
     def @encoding.to_s; self.join(nil); end
 
-    TkUtil.untrust(@tk_windows)    unless @tk_windows.tainted?
-    TkUtil.untrust(@tk_table_list) unless @tk_table_list.tainted?
-    TkUtil.untrust(@slave_ip_tbl)  unless @slave_ip_tbl.tainted?
-    TkUtil.untrust(@slave_ip_top)  unless @slave_ip_top.tainted?
-
     @system = Object.new
 
     @threadgroup  = ThreadGroup.new
 
-    @safe_level = [$SAFE]
+    @safe_level = [0]
 
     @wait_on_mainloop = [true, 0]
 
     @cmd_queue = Queue.new
 
-=begin
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog()
-
-    @threadgroup.add @cmd_receiver
-    @threadgroup.add @receiver_watchdog
-
-    @threadgroup.enclose
-=end
     @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
 
     @@IP_TABLE[@threadgroup] = self
     @@TK_TABLE_LIST.size.times{
-      (tbl = {}).tainted? || TkUtil.untrust(tbl)
-      @tk_table_list << tbl
+      @tk_table_list << {}
     }
 
     @ret_val = TkVariable.new
@@ -198,9 +184,6 @@ class RemoteTkIp
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
 
     p ['_appsend', [@remote, @displayof], enc_mode, async, cmds] if $DEBUG
-    if $SAFE >= 1 && cmds.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted commands at level #{$SAFE}"
-    end
 
     cmds = @interp._merge_tklist(*TkUtil::_conv_args([], enc_mode, *cmds))
     if @displayof
@@ -287,7 +270,7 @@ class RemoteTkIp
     false
   end
 
-  def allow_ruby_exit= (mode)
+  def allow_ruby_exit=(mode)
     fail RuntimeError, 'cannot change mode of the remote interpreter'
   end
 
@@ -376,7 +359,7 @@ class RemoteTkIp
   end
 
   def _thread_vwait(var_name)
-    _appsend(false, 'thread_vwait', varname)
+    _appsend(false, 'thread_vwait', var_name)
   end
 
   def _thread_tkwait(mode, target)

data/lib/tk.rb

@@ -31,8 +31,8 @@ class TclTkIp
   def initialize(*args)
     __initialize__(*args)
 
-    @force_default_encoding ||= TkUtil.untrust([false])
-    @encoding ||= TkUtil.untrust([nil])
+    @force_default_encoding ||= [false]
+    @encoding ||= [nil]
     def @encoding.to_s; self.join(nil); end
   end
 end
@@ -42,8 +42,8 @@ module TkComm
   include TkUtil
   extend TkUtil
 
-  WidgetClassNames = TkUtil.untrust({})
-  TkExtlibAutoloadModule = TkUtil.untrust([])
+  WidgetClassNames = {}
+  TkExtlibAutoloadModule = []
 
   # None = Object.new  ### --> definition is moved to TkUtil module
   # def None.to_s
@@ -54,8 +54,8 @@ module TkComm
   #Tk_CMDTBL = {}
   #Tk_WINDOWS = {}
   Tk_IDs = [
-    TkUtil.untrust("00000"), # [0]-cmdid
-    TkUtil.untrust("00000")  # [1]-winid
+    "00000", # [0]-cmdid
+    "00000"  # [1]-winid
   ]
   Tk_IDs.instance_eval{
     @mutex = Mutex.new
@@ -76,7 +76,7 @@ module TkComm
   Tk_WINDOWS.freeze
 
   self.instance_eval{
-    @cmdtbl = TkUtil.untrust([])
+    @cmdtbl = []
   }
 
   unless const_defined?(:GET_CONFIGINFO_AS_ARRAY)
@@ -818,7 +818,7 @@ end
 
   def _curr_cmd_id
     #id = format("c%.4d", Tk_IDs[0])
-    id = "c" + TkCore::INTERP._ip_id_ + TkComm::Tk_IDs[0]
+    "c" + TkCore::INTERP._ip_id_ + TkComm::Tk_IDs[0]
   end
   def _next_cmd_id
     TkComm::Tk_IDs.mutex.synchronize{
@@ -848,7 +848,6 @@ end
       TkCore::INTERP.tk_cmd_tbl[id] = TkCore::INTERP.get_cb_entry(cmd)
     end
     @cmdtbl = [] unless defined? @cmdtbl
-    TkUtil.untrust(@cmdtbl) unless @cmdtbl.tainted?
     @cmdtbl.push id
 
     if local_cmdtbl && local_cmdtbl.kind_of?(Array)
@@ -1070,31 +1069,23 @@ module TkComm
           :_bind_append_for_event_class, :_bind_remove_for_event_class,
           :_bindinfo_for_event_class
 
-  #def bind(tagOrClass, context, cmd=Proc.new, *args)
-  #  _bind(["bind", tagOrClass], context, cmd, *args)
-  #  tagOrClass
-  #end
-  def bind(tagOrClass, context, *args)
+  def bind(tagOrClass, context, *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(["bind", tagOrClass], context, cmd, *args)
     tagOrClass
   end
 
-  #def bind_append(tagOrClass, context, cmd=Proc.new, *args)
-  #  _bind_append(["bind", tagOrClass], context, cmd, *args)
-  #  tagOrClass
-  #end
-  def bind_append(tagOrClass, context, *args)
+  def bind_append(tagOrClass, context, *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(["bind", tagOrClass], context, cmd, *args)
     tagOrClass
@@ -1109,31 +1100,23 @@ module TkComm
     _bindinfo(['bind', tagOrClass], context)
   end
 
-  #def bind_all(context, cmd=Proc.new, *args)
-  #  _bind(['bind', 'all'], context, cmd, *args)
-  #  TkBindTag::ALL
-  #end
-  def bind_all(context, *args)
+  def bind_all(context, *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(['bind', 'all'], context, cmd, *args)
     TkBindTag::ALL
   end
 
-  #def bind_append_all(context, cmd=Proc.new, *args)
-  #  _bind_append(['bind', 'all'], context, cmd, *args)
-  #  TkBindTag::ALL
-  #end
-  def bind_append_all(context, *args)
+  def bind_append_all(context, *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(['bind', 'all'], context, cmd, *args)
     TkBindTag::ALL
@@ -1227,7 +1210,7 @@ module TkCore
 =end
           end
         else
-          RUN_EVENTLOOP_ON_MAIN_THREAD = false
+          RUN_EVENTLOOP_ON_MAIN_THREAD = true
         end
 
       else # Ruby 1.8.x
@@ -1363,11 +1346,10 @@ EOS
     end
 
     INTERP.instance_eval{
-      # @tk_cmd_tbl = TkUtil.untrust({})
       @tk_cmd_tbl =
-        TkUtil.untrust(Hash.new{|hash, key|
+        Hash.new{|hash, key|
                          fail IndexError, "unknown command ID '#{key}'"
-                       })
+                       }
       def @tk_cmd_tbl.[]=(idx,val)
         if self.has_key?(idx) && Thread.current.group != ThreadGroup::Default
           fail SecurityError,"cannot change the entried command"
@@ -1375,15 +1357,15 @@ EOS
         super(idx,val)
       end
 
-      @tk_windows = TkUtil.untrust({})
+      @tk_windows = {}
 
-      @tk_table_list = TkUtil.untrust([])
+      @tk_table_list = []
 
-      @init_ip_env  = TkUtil.untrust([])  # table of Procs
-      @add_tk_procs = TkUtil.untrust([])  # table of [name, args, body]
+      @init_ip_env  = []  # table of Procs
+      @add_tk_procs = []  # table of [name, args, body]
 
-      @force_default_encoding ||= TkUtil.untrust([false])
-      @encoding ||= TkUtil.untrust([nil])
+      @force_default_encoding ||= [false]
+      @encoding ||= [nil]
       def @encoding.to_s; self.join(nil); end
 
       @cb_entry_class = Class.new(TkCallbackEntry){
@@ -1437,15 +1419,7 @@ EOS
     end
     def INTERP.create_table
       id = @tk_table_list.size
-      (tbl = {}).tainted? || TkUtil.untrust(tbl)
-      @tk_table_list << tbl
-#      obj = Object.new
-#      obj.instance_eval <<-EOD
-#        def self.method_missing(m, *args)
-#         TkCore::INTERP.tk_object_table(#{id}).send(m, *args)
-#        end
-#      EOD
-#      return obj
+      @tk_table_list << {}
       Tk_OBJECT_TABLE.new(id)
     end
 
@@ -1456,7 +1430,8 @@ EOS
       TkUtil._get_eval_string(TkUtil.eval_cmd(cmd, *args))
     end
 
-    def INTERP.init_ip_env(script = Proc.new)
+    def INTERP.init_ip_env(script = (use_block = true), &block)
+      script = block if use_block
       @init_ip_env << script
       script.call(self)
     end
@@ -1684,57 +1659,21 @@ EOS
     bool(tk_call('auto_load', tk_cmd))
   end
 
-  def after(ms, cmd=Proc.new)
+  def after(ms, cmd=nil, &block)
+    cmd ||= block
     cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(cmdid); ret})
     after_id = tk_call_without_enc("after",ms,cmdid)
     after_id.instance_variable_set('@cmdid', cmdid)
     after_id
   end
-=begin
-  def after(ms, cmd=Proc.new)
-    crit_bup = Thread.critical
-    Thread.critical = true
-
-    myid = _curr_cmd_id
-    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(myid); ret})
-
-    Thread.critical = crit_bup
-
-    tk_call_without_enc("after",ms,cmdid)  # return id
-#    return
-#    if false #defined? Thread
-#      Thread.start do
-#       ms = Float(ms)/1000
-#       ms = 10 if ms == 0
-#       sleep ms/1000
-#       cmd.call
-#      end
-#    else
-#      cmdid = install_cmd(cmd)
-#      tk_call("after",ms,cmdid)
-#    end
-  end
-=end
 
-  def after_idle(cmd=Proc.new)
+  def after_idle(cmd=nil, &block)
+    cmd ||= block
     cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(cmdid); ret})
     after_id = tk_call_without_enc('after','idle',cmdid)
     after_id.instance_variable_set('@cmdid', cmdid)
     after_id
   end
-=begin
-  def after_idle(cmd=Proc.new)
-    crit_bup = Thread.critical
-    Thread.critical = true
-
-    myid = _curr_cmd_id
-    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(myid); ret})
-
-    Thread.critical = crit_bup
-
-    tk_call_without_enc('after','idle',cmdid)
-  end
-=end
 
   def after_cancel(afterId)
     tk_call_without_enc('after','cancel',afterId)
@@ -1786,9 +1725,6 @@ EOS
   end
 
   def appsend(interp, async, *args)
-    if $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Tk commands at level #{$SAFE}"
-    end
     if async != true && async != false && async != nil
       args.unshift(async)
       async = false
@@ -1801,9 +1737,6 @@ EOS
   end
 
   def rb_appsend(interp, async, *args)
-    if $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Ruby commands at level #{$SAFE}"
-    end
     if async != true && async != false && async != nil
       args.unshift(async)
       async = false
@@ -1817,9 +1750,6 @@ EOS
   end
 
   def appsend_displayof(interp, win, async, *args)
-    if $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Tk commands at level #{$SAFE}"
-    end
     win = '.' if win == nil
     if async != true && async != false && async != nil
       args.unshift(async)
@@ -1833,9 +1763,6 @@ EOS
   end
 
   def rb_appsend_displayof(interp, win, async, *args)
-    if $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Ruby commands at level #{$SAFE}"
-    end
     win = '.' if win == nil
     if async != true && async != false && async != nil
       args.unshift(async)
@@ -2085,7 +2012,6 @@ EOS
     puts 'invoke args => ' + args.inspect if $DEBUG
     ### print "=> ", args.join(" ").inspect, "\n" if $DEBUG
     begin
-      # res = TkUtil.untrust(INTERP._invoke(*args))
       # res = INTERP._invoke(enc_mode, *args)
       res = _ip_invoke_core(enc_mode, *args)
       # >>>>>  _invoke returns a TAINTED string  <<<<<
@@ -2093,7 +2019,6 @@ EOS
       # err = $!
       begin
         args.unshift "unknown"
-        #res = TkUtil.untrust(INTERP._invoke(*args))
         #res = INTERP._invoke(enc_mode, *args)
         res = _ip_invoke_core(enc_mode, *args)
         # >>>>>  _invoke returns a TAINTED string  <<<<<
@@ -3383,28 +3308,22 @@ end
 
 
 module TkBindCore
-  #def bind(context, cmd=Proc.new, *args)
-  #  Tk.bind(self, context, cmd, *args)
-  #end
-  def bind(context, *args)
+  def bind(context, *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
     Tk.bind(self, context, cmd, *args)
   end
 
-  #def bind_append(context, cmd=Proc.new, *args)
-  #  Tk.bind_append(self, context, cmd, *args)
-  #end
-  def bind_append(context, *args)
+  def bind_append(context, *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
     Tk.bind_append(self, context, cmd, *args)
   end
@@ -3568,7 +3487,7 @@ module TkTreatFont
         else
           begin
             tk_call(*(__config_cmd << "-#{optkey}" << ltn))
-          rescue => e
+          rescue
             # ignore
           end
         end
@@ -3628,7 +3547,7 @@ module TkTreatFont
         else
           begin
             tk_call(*(__config_cmd << "-#{optkey}" << knj))
-          rescue => e
+          rescue
             # ignore
           end
         end
@@ -3885,7 +3804,7 @@ module TkConfigMethod
       fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
     end
 
-    alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
+    _, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
     if real_name
       slot = real_name.to_s
     end
@@ -4029,7 +3948,7 @@ module TkConfigMethod
         fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
       end
 
-      alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
+      _, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
       if real_name
         slot = real_name.to_s
       end
@@ -4132,7 +4051,7 @@ module TkConfigMethod
         if slot
           slot = slot.to_s
 
-          alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
+          _, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
           if real_name
             slot = real_name.to_s
           end
@@ -4512,7 +4431,7 @@ module TkConfigMethod
         if slot
           slot = slot.to_s
 
-          alias_name, real_name = __optkey_aliases.find{|k,var| k.to_s == slot}
+          _, real_name = __optkey_aliases.find{|k,var| k.to_s == slot}
           if real_name
             slot = real_name.to_s
           end
@@ -5592,7 +5511,7 @@ class TkWindow<TkObject
     if cmd
       configure_cmd('command', cmd)
     elsif b
-      configure_cmd('command', Proc.new(&b))
+      configure_cmd('command', b)
     else
       cget('command')
     end