tk 0.2.0 → 0.3.0

data/ext/tk/tkutil/extconf.rb

@@ -3,8 +3,6 @@ begin
   require 'mkmf'
 
   have_func("rb_obj_instance_exec", "ruby.h")
-  have_func("rb_obj_untrust", "ruby.h")
-  have_func("rb_obj_taint", "ruby.h")
   have_func("rb_sym2str", "ruby.h")
   have_func("rb_id2str", "ruby.h")
   have_func("rb_ary_cat", "ruby.h")

data/ext/tk/tkutil/tkutil.c

@@ -171,13 +171,6 @@ tk_obj_untrust(self, obj)
     VALUE self;
     VALUE obj;
 {
-#ifdef HAVE_RB_OBJ_TAINT
-  rb_obj_taint(obj);
-#endif
-#ifdef HAVE_RB_OBJ_UNTRUST
-  rb_obj_untrust(obj);
-#endif
-
   return obj;
 }
 
@@ -190,7 +183,11 @@ tk_eval_cmd(argc, argv, self)
     VALUE cmd, rest;
 
     rb_scan_args(argc, argv, "1*", &cmd, &rest);
+#ifdef RB_PASS_KEYWORDS
+    return rb_eval_cmd_kw(cmd, rest, 0);
+#else
     return rb_eval_cmd(cmd, rest, 0);
+#endif
 }
 
 static VALUE
@@ -1142,7 +1139,7 @@ tcl2rb_string(self, value)
 {
     rb_check_type(value, T_STRING);
 
-    if (RSTRING_PTR(value) == (char*)NULL) return rb_tainted_str_new2("");
+    if (RSTRING_PTR(value) == (char*)NULL) return rb_str_new2("");
 
     return tkstr_to_str(value);
 }
@@ -1154,7 +1151,7 @@ tcl2rb_num_or_str(self, value)
 {
     rb_check_type(value, T_STRING);
 
-    if (RSTRING_PTR(value) == (char*)NULL) return rb_tainted_str_new2("");
+    if (RSTRING_PTR(value) == (char*)NULL) return rb_str_new2("");
 
     return rb_rescue2(tkstr_to_number, value,
                       tkstr_to_str, value,

data/lib/multi-tk.rb

@@ -31,8 +31,8 @@ class << TclTkIp
     end
     obj = __new__(*args)
     obj.instance_eval{
-      @force_default_encoding ||= TkUtil.untrust([false])
-      @encoding ||= TkUtil.untrust([nil])
+      @force_default_encoding ||= [false]
+      @encoding ||= [nil]
       def @encoding.to_s; self.join(nil); end
     }
     obj
@@ -88,26 +88,25 @@ class MultiTkIp
   WITH_ENCODING = defined?(::Encoding.default_external)
   #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
 
-  (@@SLAVE_IP_ID = ['slave'.freeze, TkUtil.untrust('0')]).instance_eval{
+  (@@SLAVE_IP_ID = ['slave'.freeze, '0']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
   }
 
-  @@IP_TABLE = TkUtil.untrust({}) unless defined?(@@IP_TABLE)
+  @@IP_TABLE = {} unless defined?(@@IP_TABLE)
 
-  @@INIT_IP_ENV  = TkUtil.untrust([]) unless defined?(@@INIT_IP_ENV)  # table of Procs
-  @@ADD_TK_PROCS = TkUtil.untrust([]) unless defined?(@@ADD_TK_PROCS) # table of [name, args, body]
+  @@INIT_IP_ENV  = [] unless defined?(@@INIT_IP_ENV)  # table of Procs
+  @@ADD_TK_PROCS = [] unless defined?(@@ADD_TK_PROCS) # table of [name, args, body]
 
-  @@TK_TABLE_LIST = TkUtil.untrust([]) unless defined?(@@TK_TABLE_LIST)
+  @@TK_TABLE_LIST = [] unless defined?(@@TK_TABLE_LIST)
 
   unless defined?(@@TK_CMD_TBL)
-    @@TK_CMD_TBL = TkUtil.untrust(Object.new)
+    @@TK_CMD_TBL = Object.new
 
-    # @@TK_CMD_TBL.instance_variable_set('@tbl', {}.taint)
-    tbl_obj = TkUtil.untrust(Hash.new{|hash,key|
+    tbl_obj = Hash.new{|hash,key|
                                fail IndexError, "unknown command ID '#{key}'"
-                             })
+                             }
     @@TK_CMD_TBL.instance_variable_set('@tbl', tbl_obj)
 
     class << @@TK_CMD_TBL
@@ -187,7 +186,7 @@ class MultiTkIp
   @@CB_ENTRY_CLASS = Class.new(TkCallbackEntry){
     def initialize(ip, cmd)
       @ip = ip
-      @safe = safe = $SAFE
+      @safe = safe = 0
       # @cmd = cmd
       cmd = MultiTkIp._proc_on_safelevel(&cmd)
       @cmd = proc{|*args| cmd.call(safe, *args)}
@@ -302,8 +301,8 @@ class MultiTkIp
 
   ######################################
 
-  def set_cb_error(cmd = Proc.new)
-    @cb_error_proc[0] = cmd
+  def set_cb_error(cmd = nil, &block)
+    @cb_error_proc[0] = cmd || block
   end
 
   def cb_error(e)
@@ -315,26 +314,22 @@ class MultiTkIp
   ######################################
 
   def set_safe_level(safe)
-    if safe > @safe_level[0]
-      @safe_level[0] = safe
-      @cmd_queue.enq([@system, 'set_safe_level', safe])
-    end
-    @safe_level[0]
+    0
   end
   def safe_level=(safe)
-    set_safe_level(safe)
+    0
   end
   def self.set_safe_level(safe)
-    __getip.set_safe_level(safe)
+    0
   end
   def self.safe_level=(safe)
-    self.set_safe_level(safe)
+    0
   end
   def safe_level
-    @safe_level[0]
+    0
   end
   def self.safe_level
-    __getip.safe_level
+    0
   end
 
   def wait_on_mainloop?
@@ -392,13 +387,11 @@ class MultiTkIp
     end
   end
 
-  def _receiver_eval_proc_core(safe_level, thread, cmd, *args)
+  def _receiver_eval_proc_core(_safe_level, thread, cmd, *args)
     begin
-      #ret = proc{$SAFE = safe_level; cmd.call(*args)}.call
-      #ret = cmd.call(safe_level, *args)
       normal_ret = false
       ret = catch(:IRB_EXIT) do  # IRB hack
-        retval = cmd.call(safe_level, *args)
+        retval = cmd.call(0, *args)
         normal_ret = true
         retval
       end
@@ -578,18 +571,18 @@ class MultiTkIp
     end
   end
 
-  def _receiver_eval_proc(last_thread, safe_level, thread, cmd, *args)
+  def _receiver_eval_proc(last_thread, _safe_level, thread, cmd, *args)
     if thread
       Thread.new{
         last_thread.join if last_thread
         unless @interp.deleted?
-          _receiver_eval_proc_core(safe_level, thread, cmd, *args)
+          _receiver_eval_proc_core(0, thread, cmd, *args)
         end
       }
     else
       Thread.new{
         unless  @interp.deleted?
-          _receiver_eval_proc_core(safe_level, thread, cmd, *args)
+          _receiver_eval_proc_core(0, thread, cmd, *args)
         end
       }
       last_thread
@@ -616,11 +609,11 @@ class MultiTkIp
     end
   end
 
-  def _create_receiver_and_watchdog(lvl = $SAFE)
-    lvl = $SAFE if lvl < $SAFE
+  def _create_receiver_and_watchdog(lvl = 0)
+    lvl = 0
 
     # command-procedures receiver
-    receiver = Thread.new(lvl){|safe_level|
+    receiver = Thread.new(lvl){|_safe_level|
       last_thread = {}
 
       loop do
@@ -629,11 +622,6 @@ class MultiTkIp
         if thread == @system
           # control command
           case cmd
-          when 'set_safe_level'
-            begin
-              safe_level = args[0] if safe_level < args[0]
-            rescue Exception
-            end
           when 'call_mainloop'
             thread = args.shift
             _check_and_return(thread,
@@ -645,7 +633,7 @@ class MultiTkIp
         else
           # procedure
           last_thread[thread] = _receiver_eval_proc(last_thread[thread],
-						    safe_level, thread,
+						    0, thread,
 						    cmd, *args)
         end
       end
@@ -717,15 +705,15 @@ class MultiTkIp
 
   @@DEFAULT_MASTER = self.allocate
   @@DEFAULT_MASTER.instance_eval{
-    @tk_windows = TkUtil.untrust({})
+    @tk_windows = {}
 
-    @tk_table_list = TkUtil.untrust([])
+    @tk_table_list = []
 
-    @slave_ip_tbl = TkUtil.untrust({})
+    @slave_ip_tbl = {}
 
-    @slave_ip_top = TkUtil.untrust({})
+    @slave_ip_top = {}
 
-    @evloop_thread = TkUtil.untrust([])
+    @evloop_thread = []
 
     unless keys.kind_of? Hash
       fail ArgumentError, "expecting a Hash object for the 2nd argument"
@@ -808,28 +796,28 @@ class MultiTkIp
     end
 
     @interp.instance_eval{
-      @force_default_encoding ||= TkUtil.untrust([false])
-      @encoding ||= TkUtil.untrust([nil])
+      @force_default_encoding ||= [false]
+      @encoding ||= [nil]
       def @encoding.to_s; self.join(nil); end
     }
 
     @ip_name = nil
 
-    @callback_status = TkUtil.untrust([])
+    @callback_status = []
 
     @system = Object.new
 
-    @wait_on_mainloop = TkUtil.untrust([true, 0])
+    @wait_on_mainloop = [true, 0]
 
     @threadgroup  = Thread.current.group
 
     @safe_base = false
 
-    @safe_level = [$SAFE]
+    @safe_level = [0]
 
     @cmd_queue = MultiTkIp::Command_Queue.new(@interp)
 
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
+    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(0)
 
     @threadgroup.add @cmd_receiver
     @threadgroup.add @receiver_watchdog
@@ -902,7 +890,7 @@ class MultiTkIp
           begin
             req.ret[0] = req.target.instance_eval{
               @cmd_receiver, @receiver_watchdog =
-                _create_receiver_and_watchdog(@safe_level[0])
+                _create_receiver_and_watchdog(0)
               @threadgroup.add @cmd_receiver
               @threadgroup.add @receiver_watchdog
               @threadgroup.enclose
@@ -1194,8 +1182,8 @@ class MultiTkIp
     ip_name = _create_slave_ip_name
     slave_ip = @interp.create_slave(ip_name, true)
     slave_ip.instance_eval{
-      @force_default_encoding ||= TkUtil.untrust([false])
-      @encoding ||= TkUtil.untrust([nil])
+      @force_default_encoding ||= [false]
+      @encoding ||= [nil]
       def @encoding.to_s; self.join(nil); end
     }
     @slave_ip_tbl[ip_name] = slave_ip
@@ -1242,8 +1230,8 @@ class MultiTkIp
     ip_name = _create_slave_ip_name
     slave_ip = @interp.create_slave(ip_name, false)
     slave_ip.instance_eval{
-      @force_default_encoding ||= TkUtil.untrust([false])
-      @encoding ||= TkUtil.untrust([nil])
+      @force_default_encoding ||= [false]
+      @encoding ||= [nil]
       def @encoding.to_s; self.join(nil); end
     }
     slave_ip._invoke('set', 'argv0', name) if name.kind_of?(String)
@@ -1288,14 +1276,6 @@ class MultiTkIp
     @slave_ip_top = {}
     @cb_error_proc = []
     @evloop_thread = []
-
-    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?
-    TkUtil.untrust(@cb_error_proc) unless @cb_error_proc.tainted?
-    TkUtil.untrust(@evloop_thread) unless @evloop_thread.tainted?
-
     @callback_status = []
 
     name, safe, safe_opts, tk_opts = _parse_slaveopts(keys)
@@ -1309,30 +1289,12 @@ class MultiTkIp
       unless WITH_RUBY_VM
         @interp = TclTkIp.new(name, _keys2opts(tk_opts))
         @interp.instance_eval{
-          @force_default_encoding ||= TkUtil.untrust([false])
-          @encoding ||= TkUtil.untrust([nil])
+          @force_default_encoding ||= [false]
+          @encoding ||= [nil]
           def @encoding.to_s; self.join(nil); end
         }
 
       else ### Ruby 1.9 !!!!!!!!!!!
-=begin
-        @interp_thread = Thread.new{
-          Thread.current[:interp] = interp = TclTkIp.new(name, _keys2opts(tk_opts))
-          interp.instance_eval{
-            @force_default_encoding ||= TkUtil.untrust([false])
-            @encoding ||= TkUtil.untrust([nil])
-            def @encoding.to_s; self.join(nil); end
-          }
-
-          #sleep
-          TclTkLib.mainloop(true)
-        }
-        until @interp_thread[:interp]
-          Thread.pass
-        end
-        # INTERP_THREAD.run
-        @interp = @interp_thread[:interp]
-=end
         @interp_thread = Thread.new{
           current = Thread.current
           begin
@@ -1390,20 +1352,13 @@ class MultiTkIp
       end
 
       @interp.instance_eval{
-        @force_default_encoding ||= TkUtil.untrust([false])
-        @encoding ||= TkUtil.untrust([nil])
+        @force_default_encoding ||= [false]
+        @encoding ||= [nil]
         def @encoding.to_s; self.join(nil); end
       }
 
       @ip_name = nil
 
-      if safe
-        safe = $SAFE if safe < $SAFE
-        @safe_level = [safe]
-      else
-        @safe_level = [$SAFE]
-      end
-
     else
       # create slave-ip
       if safeip || master.safe?
@@ -1412,22 +1367,10 @@ class MultiTkIp
                                                            name, tk_opts)
         # @interp_thread = nil if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!
         @interp_thread = nil unless WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
-        if safe
-          safe = master.safe_level if safe < master.safe_level
-          @safe_level = [safe]
-        else
-          @safe_level = [1]
-        end
       else
         @interp, @ip_name = master.__create_trusted_slave_obj(name, tk_opts)
         # @interp_thread = nil if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!
         @interp_thread = nil unless WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
-        if safe
-          safe = master.safe_level if safe < master.safe_level
-          @safe_level = [safe]
-        else
-          @safe_level = [master.safe_level]
-        end
       end
       @set_alias_proc = proc{|name|
         master._invoke('interp', 'alias', @ip_name, name, '', name)
@@ -1436,8 +1379,7 @@ class MultiTkIp
 
     @system = Object.new
 
-    @wait_on_mainloop = TkUtil.untrust([true, 0])
-    # @wait_on_mainloop = TkUtil.untrust([false, 0])
+    @wait_on_mainloop = [true, 0]
 
     @threadgroup  = ThreadGroup.new
 
@@ -1445,19 +1387,11 @@ class MultiTkIp
 
     @cmd_queue = MultiTkIp::Command_Queue.new(@interp)
 
-=begin
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
-
-    @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{
-      @tk_table_list << TkUtil.untrust({})
+      @tk_table_list << {}
     }
     _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
 
@@ -1510,7 +1444,7 @@ class MultiTkIp
       super(interp){|ip| Thread.current[:callback_ip] = ip; blk.call}
     end
 
-    @table = TkUtil.untrust(Hash.new{|h,k| h[k] = TkUtil.untrust([])})
+    @table = Hash.new{|h,k| h[k] = []}
     def self.table
       @table
     end
@@ -1551,7 +1485,7 @@ class << MultiTkIp
   alias __new new
   private :__new
 
-  def new_master(safe=nil, keys={}, &blk)
+  def new_master(_safe=nil, keys={}, &blk)
     if MultiTkIp::WITH_RUBY_VM
       #### TODO !!!!!!
       fail RuntimeError,
@@ -1572,11 +1506,8 @@ class << MultiTkIp
     end
 
     ip = __new(__getip, nil, keys)
-    #ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
     if block_given?
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
-      ip._proc_on_safelevel(&blk).call(ip.safe_level)
+      ip._proc_on_safelevel(&blk).call(0)
     end
     ip
   end
@@ -1598,11 +1529,8 @@ class << MultiTkIp
     end
 
     ip = __new(__getip, false, keys)
-    # ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
     if block_given?
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
-      ip._proc_on_safelevel(&blk).call(ip.safe_level)
+      ip._proc_on_safelevel(&blk).call(0)
     end
     ip
   end
@@ -1621,11 +1549,8 @@ class << MultiTkIp
     end
 
     ip = __new(__getip, true, keys)
-    # ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
     if block_given?
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
-      ip._proc_on_safelevel(&blk).call(ip.safe_level)
+      ip._proc_on_safelevel(&blk).call(0)
     end
     ip
   end
@@ -1759,7 +1684,7 @@ class MultiTkIp
 
   def _add_new_tables
     (@@TK_TABLE_LIST.size - @tk_table_list.size).times{
-      @tk_table_list << TkUtil.untrust({})
+      @tk_table_list << {}
     }
   end
 
@@ -1850,7 +1775,8 @@ class MultiTkIp
     return obj
   end
 
-  def self.init_ip_env(script = Proc.new)
+  def self.init_ip_env(script = nil, &block)
+    script ||= block
     @@INIT_IP_ENV << script
     if __getip.slave?
       begin
@@ -1911,82 +1837,12 @@ class MultiTkIp
     @@CB_ENTRY_CLASS.new(__getip, cmd).freeze
   end
 
-=begin
-  def cb_eval(cmd, *args)
-    #self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
-    #ret = self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
-    ret = self.eval_callback(*args){|safe, *params|
-      $SAFE=safe if $SAFE < safe
-      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
-    }
-    if ret.kind_of?(Exception)
-      raise ret
-    end
-    ret
-  end
-=end
   def cb_eval(cmd, *args)
     self.eval_callback(*args,
                        &_proc_on_safelevel{|*params|
                          TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
                        })
   end
-=begin
-  def cb_eval(cmd, *args)
-    self.eval_callback(*args){|safe, *params|
-      $SAFE=safe if $SAFE < safe
-      # TkUtil.eval_cmd(cmd, *params)
-      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
-    }
-  end
-=end
-=begin
-  def cb_eval(cmd, *args)
-    @callback_status[0] ||= TkVariable.new
-    @callback_status[1] ||= TkVariable.new
-    st, val = @callback_status
-    th = Thread.new{
-      self.eval_callback(*args){|safe, *params|
-        #p [status, val, safe, *params]
-        $SAFE=safe if $SAFE < safe
-        begin
-          TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
-        rescue TkCallbackContinue
-          st.value = 4
-        rescue TkCallbackBreak
-          st.value = 3
-        rescue TkCallbackReturn
-          st.value = 2
-        rescue Exception => e
-          val.value = e.message
-          st.value = 1
-        else
-          st.value = 0
-        end
-      }
-    }
-    begin
-      st.wait
-      status = st.numeric
-      retval = val.value
-    rescue => e
-      fail e
-    end
-
-    if status == 1
-      fail RuntimeError, retval
-    elsif status == 2
-      fail TkCallbackReturn, "Tk callback returns 'return' status"
-    elsif status == 3
-      fail TkCallbackBreak, "Tk callback returns 'break' status"
-    elsif status == 4
-      fail TkCallbackContinue, "Tk callback returns 'continue' status"
-    else
-      ''
-    end
-  end
-=end
-
 end
 
 # pseudo-toplevel operation support
@@ -2038,15 +1894,6 @@ end
 if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) ||
       Use_PseudoToplevel_Feature_of_MultiTkIp)
   module MultiTkIp_PseudoToplevel_Evaluable
-    #def pseudo_toplevel_eval(body = Proc.new)
-    #  Thread.current[:TOPLEVEL] = self
-    #  begin
-    #    body.call
-    #  ensure
-    #    Thread.current[:TOPLEVEL] = nil
-    #  end
-    #end
-
     def pseudo_toplevel_evaluable?
       @pseudo_toplevel_evaluable
     end
@@ -2062,25 +1909,25 @@ if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) ||
   end
 
   class Object
-    alias __method_missing_alias_for_MultiTkIp__ method_missing
-    private :__method_missing_alias_for_MultiTkIp__
-
-    def method_missing(id, *args)
-      begin
-        has_top = (top = MultiTkIp.__getip.__pseudo_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 = MultiTkIp.__getip.__pseudo_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_alias_for_MultiTkIp__(id, *args)
+        if has_top
+          top.__send__(id, *args)
+        else
+          super
+        end
       end
-    end
+    end)
   end
 else
   # dummy
@@ -2104,22 +1951,8 @@ class MultiTkIp
         _proc_on_safelevel(&cmd)
       end
     else
-      #Proc.new{|safe, *args| $SAFE=safe if $SAFE < safe; yield(*args)}
-      Proc.new{|safe, *args|
-        # avoid security error on Exception objects
-        untrust_proc = proc{|err|
-          begin
-            err.untrust if err.respond_to?(:untrust)
-          rescue SecurityError
-          end
-          err
-        }
-        $SAFE=safe if $SAFE < safe;
-        begin
-          yield(*args)
-        rescue Exception => e
-          fail untrust_proc.call(e)
-        end
+      Proc.new{|_safe, *args|
+        yield(*args)
       }
     end
   end
@@ -2128,9 +1961,8 @@ class MultiTkIp
   end
 
   def _proc_on_current_safelevel(cmd=nil, &blk) # require a block for eval
-    safe = $SAFE
     cmd = _proc_on_safelevel(cmd, &blk)
-    Proc.new{|*args| cmd.call(safe, *args)}
+    Proc.new{|*args| cmd.call(0, *args)}
   end
   def MultiTkIp._proc_on_current_safelevel(cmd=nil, &blk)
     MultiTkIp.__getip._proc_on_current_safelevel(cmd, &blk)
@@ -2149,7 +1981,7 @@ class MultiTkIp
     if @cmd_receiver == Thread.current ||
         (!req_val && TclTkLib.mainloop_thread? != false) # callback
       begin
-        ret = cmd.call(safe_level, *args)
+        ret = cmd.call(0, *args)
       rescue SystemExit => e
         # exit IP
         warn("Warning: "+ e.inspect + " on " + self.inspect) if $DEBUG
@@ -2232,12 +2064,8 @@ class MultiTkIp
 
 if false && WITH_RUBY_VM  ### Ruby 1.9
   # Not stable, so disable this feature
-  def eval_callback(*args)
-    if block_given?
-      cmd = Proc.new
-    else
-      cmd = args.shift
-    end
+  def eval_callback(*args, &block)
+    cmd = block || args.shift
     begin
       if @@CALLBACK_SUBTHREAD.table[self].index(Thread.current)
         last_th = nil
@@ -2258,12 +2086,8 @@ if false && WITH_RUBY_VM  ### Ruby 1.9
     end
   end
 else  ### Ruby 1.8
-  def eval_callback(*args)
-    if block_given?
-      cmd = Proc.new
-    else
-      cmd = args.shift
-    end
+  def eval_callback(*args, &block)
+    cmd = block || args.shift
     begin
       eval_proc_core(false, cmd, *args)
     rescue Exception=>e
@@ -2300,47 +2124,11 @@ end
                      *args)
     end
   end
-=begin
-  def eval_proc(*args)
-    # The scope of the eval-block of 'eval_proc' method is different from
-    # the external. If you want to pass local values to the eval-block,
-    # use arguments of eval_proc method. They are passed to block-arguments.
-    if block_given?
-      cmd = Proc.new
-    else
-      unless (cmd = args.shift)
-        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
-      end
-    end
-    if TclTkLib.mainloop_thread? == true
-      # call from eventloop
-      current = Thread.current
-      backup_ip = current[:callback_ip]
-      current[:callback_ip] = self
-      begin
-        eval_proc_core(false,
-	               proc{|safe, *params|
-		         $SAFE=safe if $SAFE < safe
-                         cmd.call(*params)
-                       }, *args)
-      ensure
-        current[:callback_ip] = backup_ip
-      end
-    else
-      eval_proc_core(true,
-                     proc{|safe, *params|
-                       $SAFE=safe if $SAFE < safe
-                       Thread.new(*params, &cmd).value
-                     },
-                     *args)
-    end
-  end
-=end
   alias call eval_proc
 
-  def bg_eval_proc(*args)
-    if block_given?
-      cmd = Proc.new
+  def bg_eval_proc(*args, &block)
+    if block
+      cmd = block
     else
       unless (cmd = args.shift)
         fail ArgumentError, "A Proc or Method object is expected for 1st argument"
@@ -2348,14 +2136,6 @@ end
     end
     Thread.new{
       eval_proc(cmd, *args)
-=begin
-      eval_proc_core(false,
-                     proc{|safe, *params|
-                       $SAFE=safe if $SAFE < safe
-                       Thread.new(*params, &cmd).value
-                     },
-                     safe_level, *args)
-=end
     }
   end
   alias background_eval_proc bg_eval_proc
@@ -2371,8 +2151,7 @@ end
 
     eval_proc_core(true,
                    proc{|safe|
-                     Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
-                                 *eval_args)
+                     Kernel.eval(cmd, *eval_args)
                    })
   end
   alias eval_str eval_string
@@ -2385,8 +2164,7 @@ end
     Thread.new{
       eval_proc_core(true,
                      proc{|safe|
-                       Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
-                                   *eval_args)
+                       Kernel.eval(cmd, *eval_args)
                      })
     }
   end
@@ -3348,21 +3126,22 @@ class MultiTkIp
     self
   end
 
-  def set_bgerror_handler(cmd = Proc.new, slave = nil, &b)
+  def set_bgerror_handler(cmd = nil, slave = nil, &b)
+    cmd ||= b
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
 
     unless TkComm._callback_entry?(cmd)
       if !slave && b
         slave = cmd
-        cmd = Proc.new(&b)
+        cmd = b
       end
     end
     slave = '' unless slave
 
     @interp._invoke('interp', 'bgerror', _slavearg(slave), cmd)
   end
-  def self.bgerror(cmd = Proc.new, slave = nil, &b)
-    __getip.bgerror(cmd, slave, &b)
+  def self.bgerror(cmd = nil, slave = nil, &b)
+    __getip.bgerror(cmd || b, slave, &b)
   end
 
   def get_bgerror_handler(slave = '')
@@ -3579,7 +3358,8 @@ class MultiTkIp
     ip._eval("::safe::interpFindInAccessPath #{@ip_name} #{dir}")
   end
 
-  def safeip_set_log_cmd(cmd = Proc.new)
+  def safeip_set_log_cmd(cmd = nil, &block)
+    cmd ||= block
     ip = MultiTkIp.__getip
     ip._eval("::safe::setLogCmd #{@ip_name} #{_get_eval_string(cmd)}")
   end