* ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.

* ext/tk/tcltklib.c: avoid error on a shared object.

* ext/tk/extconf.rb: support --with-tcltkversion

* ext/tk/README.tcltklib: add document about --with-tcltkversion

* ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb, ext/tk/lib/remote-tk.rb: 
  not work on $SAFE==4

* ext/tk/lib/multi-tk.rb: Object#methods returns Symbols on Ruby1.9.

* ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the 
  procedure which called at end of the timer.

* ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb: 
  support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options.

* ext/tk/lib/*: treat __IGNORE_UNKNOWN_CONFIGURE_OPTION__

* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb, 
  ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb, 
  ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix. 

* ext/tk/lib/tk/text.rb: typo. call a wrong method.

* ext/tk/lib/tk/itemconfig.rb: ditto.

* ext/tk/lib/tk.rb, ext/tk/lib/tk/itemconfig.rb, 
  ext/tk/lib/tk/canvas.rb: support alias names of option keys.

* ext/tk/lib/tk/grid.rb: lack of module-method definitions.

* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported 
  parameter patterns of configure method.

* ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row.

* ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot
  pass the given block to methods of Tk::Wm module.

* ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites arguemnt to 
  an invalid value.

* ext/tk/lib/tk.rb: fix memory (object) leak bug.

* ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak.

* ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb:
  bug fix.

* ext/tk/lib/tkextlib/blt/component.rb, 
  ext/tk/lib/tkextlib/tile/tentry.rb, 
  ext/tk/lib/tkextlib/tile/treeview.rb: ditto.

* ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add.

* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget, 
  ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb, 
  ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb: 
  bug fix.

* ext/tk/sample/ttk_wrapper.rb: ditto.

* ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom.

* ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode.

* ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, 
  ext/tk/sample/ttk_wrapper.rb: improve treating and control themes. 
  add Tk::Tile.themes and Tk::Tile.set_theme(theme).

* ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions.

* ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8) 
  characters for headings.

* ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name.

* ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys. 
  Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still
  not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g. 
  :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on; 
  those are attributes of event object). It means that Ruby/Tk accepts
  not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but 
  also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }". 
  It is potentially incompatible, when user passes symbols to the
  arguments of the callback block (the block receives the symbols as
  strings). I think that is very rare case (probably, used by Ruby/Tk
  experts only). When causes such trouble, please give strings instead
  of such symbol parameters (e.g. call Symbol#to_s method).

* ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb, 
  ext/tk/lib/tkextlib/blt/treeview.rb, 
  ext/tk/lib/tkextlib/winico/winico.rb: ditto.

* ext/tk/tkutil/tkutil.c: strings are available on subst_tables on 
  TkUtil::CallbackSubst class (it is useful on Ruby 1.9). 

* ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb, 
  ext/tk/lib/tkextlib/iwidgets/spinner.rb, 
  ext/tk/lib/tkextlib/iwidgets/entryfield.rb, 
  ext/tk/lib/tkextlib/iwidgets/calendar.rb, 
  ext/tk/lib/tkextlib/blt/dragdrop.rb, 
  ext/tk/lib/tkextlib/tkDND/tkdnd.rb, 
  ext/tk/lib/tkextlib/treectrl/tktreectrl.rb, 
  ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became 
  unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c.

* ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb: change strategy to define
  the constant WITH_ENCODING.

* ext/tk/lib/tk.rb: fix bug on Tk::Encoding.tk_encoding_names.


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

1 files changed, 132 insertions, 18 deletions

diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index fd9a863888..4f39874d30 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -28,7 +28,13 @@ class << TclTkIp
     if Thread.current.group != ThreadGroup::Default
       raise SecurityError, 'only ThreadGroup::Default can call TclTkIp.new'
     end
-    __new__(*args)
+    obj = __new__(*args)
+    obj.instance_eval{
+      @force_default_encoding ||= [false].taint
+      @encoding ||= [nil].taint
+      def @encoding.to_s; self.join(nil); end
+    }
+    obj
   end
 end
 
@@ -115,7 +121,8 @@ class MultiTkIp
   BASE_DIR = File.dirname(__FILE__)
 
   WITH_RUBY_VM  = Object.const_defined?(:VM) && ::VM.class == Class
-  WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
+  WITH_ENCODING = defined?(::Encoding.default_external)
+  #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
 
   (@@SLAVE_IP_ID = ['slave'.freeze, '0'.taint]).instance_eval{
     @mutex = Mutex.new
@@ -226,8 +233,8 @@ class MultiTkIp
     def call(*args)
       unless @ip.deleted?
         current = Thread.current
-        backup_ip = current['callback_ip']
-        current['callback_ip'] = @ip
+        backup_ip = current[:callback_ip]
+        current[:callback_ip] = @ip
         begin
           ret = @ip.cb_eval(@cmd, *args)
           fail ret if ret.kind_of?(Exception)
@@ -260,7 +267,7 @@ class MultiTkIp
             fail e
           end
         ensure
-          current['callback_ip'] = backup_ip
+          current[:callback_ip] = backup_ip
         end
       end
     end
@@ -753,14 +760,23 @@ class MultiTkIp
         current[:mutex] = mutex = Mutex.new
         current[:root_check] = cond_var = ConditionVariable.new
 
+        status = [nil]
+        def status.value
+          self[0]
+        end
+        def status.value=(val)
+          self[0] = val
+        end
+        current[:status] = status
+
         begin
-          current[:status] = interp.mainloop(true)
+          current[:status].value = interp.mainloop(true)
         rescue Exception=>e
-          current[:status] = e
+          current[:status].value = e
         ensure
           mutex.synchronize{ cond_var.broadcast }
         end
-        current[:status] = interp.mainloop(false)
+        current[:status].value = interp.mainloop(false)
       }
       until @interp_thread[:interp]
         Thread.pass
@@ -778,6 +794,12 @@ class MultiTkIp
       end
     end
 
+    @interp.instance_eval{
+      @force_default_encoding ||= [false].taint
+      @encoding ||= [nil].taint
+      def @encoding.to_s; self.join(nil); end
+    }
+
     @ip_name = nil
 
     @callback_status = [].taint
@@ -951,8 +973,9 @@ class MultiTkIp
       begin
         class << subclass
           self.methods.each{|m|
+            name = m.to_s
             begin
-              unless m == '__id__' || m == '__send__' || m == 'freeze'
+              unless name == '__id__' || name == '__send__' || name == 'freeze'
                 undef_method(m)
               end
             rescue Exception
@@ -1157,6 +1180,11 @@ class MultiTkIp
     # safe interpreter
     ip_name = _create_slave_ip_name
     slave_ip = @interp.create_slave(ip_name, true)
+    slave_ip.instance_eval{
+      @force_default_encoding ||= [false].taint
+      @encoding ||= [nil].taint
+      def @encoding.to_s; self.join(nil); end
+    }
     @slave_ip_tbl[ip_name] = slave_ip
     def slave_ip.safe_base?
       true
@@ -1199,6 +1227,11 @@ class MultiTkIp
 
     ip_name = _create_slave_ip_name
     slave_ip = @interp.create_slave(ip_name, false)
+    slave_ip.instance_eval{
+      @force_default_encoding ||= [false].taint
+      @encoding ||= [nil].taint
+      def @encoding.to_s; self.join(nil); end
+    }
     slave_ip._invoke('set', 'argv0', name) if name.kind_of?(String)
     slave_ip._invoke('set', 'argv', _keys2opts(keys))
     @interp._invoke('load', '', 'Tk', ip_name)
@@ -1268,9 +1301,21 @@ class MultiTkIp
       # create master-ip
       unless WITH_RUBY_VM
         @interp = TclTkIp.new(name, _keys2opts(tk_opts))
+        @interp.instance_eval{
+          @force_default_encoding ||= [false].taint
+          @encoding ||= [nil].taint
+          def @encoding.to_s; self.join(nil); end
+        }
+
       else ### Ruby 1.9 !!!!!!!!!!!
         @interp_thread = Thread.new{
           Thread.current[:interp] = interp = TclTkIp.new(name, _keys2opts(tk_opts))
+          interp.instance_eval{
+            @force_default_encoding ||= [false].taint
+            @encoding ||= [nil].taint
+            def @encoding.to_s; self.join(nil); end
+          }
+
           #sleep
           TclTkLib.mainloop(true)
         }
@@ -1400,8 +1445,8 @@ class MultiTkIp
 
   def self.__getip
     current = Thread.current
-    if TclTkLib.mainloop_thread? != false && current['callback_ip']
-      return current['callback_ip']
+    if TclTkLib.mainloop_thread? != false && current[:callback_ip]
+      return current[:callback_ip]
     end
     if current.group == ThreadGroup::Default
       @@DEFAULT_MASTER
@@ -1993,12 +2038,12 @@ class MultiTkIp
       cmd = args.shift
     end
     current = Thread.current
-    backup_ip = current['callback_ip']
-    current['callback_ip'] = self
+    backup_ip = current[:callback_ip]
+    current[:callback_ip] = self
     begin
       eval_proc_core(false, cmd, *args)
     ensure
-      current['callback_ip'] = backup_ip
+      current[:callback_ip] = backup_ip
     end
   end
 
@@ -2016,8 +2061,8 @@ class MultiTkIp
     if TclTkLib.mainloop_thread? == true
       # call from eventloop
       current = Thread.current
-      backup_ip = current['callback_ip']
-      current['callback_ip'] = self
+      backup_ip = current[:callback_ip]
+      current[:callback_ip] = self
       begin
         eval_proc_core(false, 
 	               proc{|safe, *params|
@@ -2025,7 +2070,7 @@ class MultiTkIp
                          cmd.call(*params)
                        }, *args)
       ensure
-        current['callback_ip'] = backup_ip
+        current[:callback_ip] = backup_ip
       end
     else
       eval_proc_core(true, 
@@ -2170,6 +2215,10 @@ end
 # event loop
 # all master/slave IPs are controled by only one event-loop
 class << MultiTkIp
+  def default_master?
+    __getip == @@DEFAULT_MASTER
+  end
+
   def mainloop(check_root = true)
     __getip.mainloop(check_root)
   end
@@ -2431,7 +2480,7 @@ class MultiTkIp
   def mainloop(check_root = true, restart_on_dead = true)
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
 
-    unless WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
+    if WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
       return @interp_thread.value if @interp_thread
     end
 
@@ -3289,6 +3338,42 @@ class << MultiTkIp
   def encoding_table
     __getip.encoding_table
   end
+
+  def force_default_encoding=(mode)
+    __getip.force_default_encoding=(mode)
+  end
+
+  def force_default_encoding?
+    __getip.force_default_encoding?
+  end
+
+  def default_encoding=(enc)
+    __getip.default_encoding=(enc)
+  end
+
+  def encoding=(enc)
+    __getip.encoding=(enc)
+  end
+
+  def encoding_name
+    __getip.encoding_name
+  end
+
+  def encoding_obj
+    __getip.encoding_obj
+  end
+  alias encoding encoding_name
+  alias default_encoding encoding_name
+
+  def encoding_convertfrom(str, enc=None)
+    __getip.encoding_convertfrom(str, enc)
+  end
+  alias encoding_convert_from encoding_convertfrom
+
+  def encoding_convertto(str, enc=None)
+    __getip.encoding_convertto(str, enc)
+  end
+  alias encoding_convert_to encoding_convertto
 end
 class MultiTkIp
   def encoding_table
@@ -3339,6 +3424,7 @@ end
 
 
 # remove methods for security
+=begin
 class MultiTkIp
   INTERP_THREAD = @@DEFAULT_MASTER.instance_variable_get('@interp_thread')
   INTERP_MUTEX  = INTERP_THREAD[:mutex]
@@ -3362,6 +3448,34 @@ class MultiTkIp
   remove_const(:INTERP_MUTEX)
   remove_const(:INTERP_ROOT_CHECK)
 end
+=end
+if MultiTkIp::WITH_RUBY_VM && 
+    ! MultiTkIp::RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
+  class MultiTkIp
+    INTERP_THREAD = @@DEFAULT_MASTER.instance_variable_get('@interp_thread')
+    INTERP_THREAD_STATUS = INTERP_THREAD[:status]
+    INTERP_MUTEX  = INTERP_THREAD[:mutex]
+    INTERP_ROOT_CHECK = INTERP_THREAD[:root_check]
+  end
+  module TkCore
+    INTERP_THREAD = MultiTkIp::INTERP_THREAD
+    INTERP_THREAD_STATUS = MultiTkIp::INTERP_THREAD_STATUS
+    INTERP_MUTEX  = MultiTkIp::INTERP_MUTEX
+    INTERP_ROOT_CHECK = MultiTkIp::INTERP_ROOT_CHECK
+  end
+  class MultiTkIp
+    remove_const(:INTERP_THREAD)
+    remove_const(:INTERP_THREAD_STATUS)
+    remove_const(:INTERP_MUTEX)
+    remove_const(:INTERP_ROOT_CHECK)
+  end
+end
+
+class MultiTkIp
+  # undef_method :instance_eval
+  undef_method :instance_variable_get
+  undef_method :instance_variable_set
+end
 # end of MultiTkIp definition
 
 # defend against modification