* ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5.

* ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets' 
  instate/state/identify method to avoid the conflict with standard
  widget options. Those methods are renamed to ttk_instate/ttk_state/
  ttk_identify (tile_instate/tile_state/tile_identify are available 
  too). Although I don't recommend, if you realy need old methods, 
  please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before 
  "require 'tkextlib/tile'".

* ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!"
  is obsolete. It outputs warning. To control default widget set, 
  use "Tk.default_widget_set = :Ttk".

* ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and 
  __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defind 
  as module methods of TkConfigMethod. It may help users to wrap old 
  Ruby/Tk scripts (use standard widgets) to force to use Ttk widgets.
  Ttk widgets don't have some options of standard widgets which are 
  control the view of widgets. When set ignore-mode true, configure 
  method tries to ignoure such unknown options with no exception. 
  Of course, it may raise other troubles on the GUI design. 
  So, those are a little danger methods. 

* ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ 
  method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method 
  are defind as module methods of TkItemConfigMethod as the same 
  purpose as TkConfigMethod's ones.

* ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for 
  wrapping old Ruby/Tk scripts (which use standard widgets) to use 
  Ttk (Tile) widgets as default.

* ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state 
  method instead of instate/state method.

* ext/tk/lib/tk/root, ext/tk/lib/tk/namespace.rb,
  ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's  
  are replaced to "instance_exec(self)".

* ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not 
  a character code on Ruby1.9).

* ext/tk/lib/tk/variable.rb: support new style of operation argument 
  on Tcl/Tk's 'trace' command for variables. 

* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: bug fix

* ext/tk/sammple/demos-jp/textpeer.rb, 
  ext/tk/sammple/demos-en/textpeer.rb: new widget demo.

* ext/tk/tcltklib.c: decrase SEGV troubles (probably)

* ext/tk/lib/tk.rb: remove Thread.critical access if Ruby1.9

* ext/tk/lib/tk/multi-tk.rb: support Ruby1.9 (probably)

* ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command 
  to make Tcl/Tk theme sources (based on different version of Tile 
  extension) available. 
  (Tk::Tile::__define_LoadImages_proc_for_comaptibility__)

* ext/tk/lib/tk.rb, ext/tk/lib/tk/wm.rb: support dockable frames
  (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets 
  as toplevel widgets.

* ext/tk/lib/tkextlib/tile/style.rb: ditto.
  (Tk::Tile::Style.__define_wrapper_proc_for_compatibility__)

* ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get 
  properties as a hash. metrics_hash method returns a boolean value 
  for 'fixed' option. But metrics method returns numeric value 
  (0 or 1) for 'fixed' option, because of backward compatibility. 

* ext/tk/lib/tk/timer.rb: somtimes fail to set callback procedure.

* ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep 
  doesn't block the eventloop. It will be better to use the method 
  in event callbacks.

* ext/tk/sample/tksleep_sample.rb: sample script about Tk.sleep.


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

1 files changed, 134 insertions, 33 deletions

diff --git a/ext/tk/lib/tkextlib/tktable/tktable.rb b/ext/tk/lib/tkextlib/tktable/tktable.rb
index 4edaabc847..fb8a8b0f72 100644
--- a/ext/tk/lib/tkextlib/tktable/tktable.rb
+++ b/ext/tk/lib/tkextlib/tktable/tktable.rb
@@ -118,23 +118,39 @@ class Tk::TkTable::CellTag
   include TkTreatTagFont
 
   CellTagID_TBL = TkCore::INTERP.create_table
-  CellTag_ID = ['tktbl:celltag'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ CellTagID_TBL.clear }
+  (CellTag_ID = ['tktbl:celltag'.freeze, '00000'.taint]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    CellTagID_TBL.mutex.synchronize{ CellTagID_TBL.clear }
+  }
 
   def self.id2obj(table, id)
     tpath = table.path
-    return id unless CellTagID_TBL[tpath]
-    CellTagID_TBL[tpath][id]? CellTagID_TBL[tpath][id] : id
+    CellTagID_TBL.mutex.synchronize{
+      if CellTagID_TBL[tpath]
+        CellTagID_TBL[tpath][id]? CellTagID_TBL[tpath][id] : id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, keys=nil)
     @parent = @t = parent
     @tpath - parent.path
-    @path = @id = CellTag_ID.join(TkCore::INTERP._ip_id_)
-    CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-    CellTagID_TBL[@tpath][@id] = self
-    CellTag_ID[1].succ!
+    CellTag_ID.mutex.synchronize{
+      @path = @id = CellTag_ID.join(TkCore::INTERP._ip_id_)
+      CellTag_ID[1].succ!
+    }
+    CellTagID_TBL.mutex.synchronize{
+      CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
+      CellTagID_TBL[@tpath][@id] = self
+    }
     configure(keys) if keys
   end
 
@@ -144,7 +160,9 @@ class Tk::TkTable::CellTag
 
   def destroy
     tk_call(@tpath, 'tag', 'delete', @id)
-    CellTagID_TBL[@tpath].delete(@id) if CellTagID_TBL[@tpath]
+    CellTagID_TBL.mutex.synchronize{
+      CellTagID_TBL[@tpath].delete(@id) if CellTagID_TBL[@tpath]
+    }
     self
   end
   alias delete destroy
@@ -189,22 +207,35 @@ end
 
 class Tk::TkTable::NamedCellTag < Tk::TkTable::CellTag
   def self.new(parent, name, keys=nil)
-    if CellTagID_TBL[parent.path] && CellTagID_TBL[parent.path][name]
-      cell = CellTagID_TBL[parent.path][name]
-      cell.configure(keys) if keys
-      return cell
-    else
-      super(parent, name, keys)
-    end
+    obj = nil
+    CellTagID_TBL.mutex.synchronize{
+      if CellTagID_TBL[parent.path] && CellTagID_TBL[parent.path][name]
+        obj = CellTagID_TBL[parent.path][name]
+      else
+        #super(parent, name, keys)
+        (obj = self.allocate).instance_eval{
+          @parent = @t = parent
+          @tpath = parent.path
+          @path = @id = name
+          CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
+          CellTagID_TBL[@tpath][@id] = self
+        }
+      end
+    }
+    obj.configure(keys) if keys && ! keys.empty?
+    obj
   end
 
   def initialize(parent, name, keys=nil)
+    # dummy:: not called by 'new' method
     @parent = @t = parent
-    @tpath - parent.path
+    @tpath = parent.path
     @path = @id = name
-    CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-    CellTagID_TBL[@tpath][@id] = self
-    configure(keys) if keys
+    CellTagID_TBL.mutex.synchronize{
+      CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
+      CellTagID_TBL[@tpath][@id] = self
+    }
+    configure(keys) if keys && ! keys.empty?
   end
 end
 
@@ -220,7 +251,9 @@ class Tk::TkTable
   include Tk::ValidateConfigure
 
   def __destroy_hook__
-    Tk::TkTable::CelTag::CellTagID_TBL.delete(@path)
+    Tk::TkTable::CelTag::CellTagID_TBL.mutex.synchronize{
+      Tk::TkTable::CelTag::CellTagID_TBL.delete(@path)
+    }
   end
 
   def __boolval_optkeys
@@ -258,6 +291,22 @@ class Tk::TkTable
         nil
       ]
 
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -291,6 +340,22 @@ class Tk::TkTable
         nil
       ]
 
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -322,6 +387,22 @@ class Tk::TkTable
         nil
       ]
 
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
 
       def self.ret_val(val)
@@ -356,6 +437,22 @@ class Tk::TkTable
         nil
       ]
 
+      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
+      KEY_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
+        end
+        inf
+      }
+
+      PROC_TBL.map!{|inf|
+        if inf.kind_of?(Array)
+          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
+        end
+        inf
+      }
+
       _setup_subst_table(KEY_TBL, PROC_TBL);
     end
 
@@ -746,15 +843,17 @@ class Tk::TkTable
   end
 
   def tagid2obj(tagid)
-    if Tk::TkTable::CellTag::CellTagID_TBL.key?(@path)
-      if Tk::TkTable::CellTag::CellTagID_TBL[@path].key?(tagid)
-        Tk::TkTable::CellTag::CellTagID_TBL[@path][tagid]
+    Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
+      if Tk::TkTable::CellTag::CellTagID_TBL.key?(@path)
+        if Tk::TkTable::CellTag::CellTagID_TBL[@path].key?(tagid)
+          Tk::TkTable::CellTag::CellTagID_TBL[@path][tagid]
+        else
+          tagid
+        end
       else
         tagid
       end
-    else
-      tagid
-    end
+    }
   end
 
   def tag_cell(tag, *cells)
@@ -775,13 +874,15 @@ class Tk::TkTable
   end
   def tag_delete(tag)
     tk_send('tag', 'delete', tagid(tag))
-    if Tk::TkTable::CellTag::CellTagID_TBL[@path]
-      if tag.kind_of? Tk::TkTable::CellTag
-        Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag.id) 
-      else
-        Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag) 
+    Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
+      if Tk::TkTable::CellTag::CellTagID_TBL[@path]
+        if tag.kind_of? Tk::TkTable::CellTag
+          Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag.id) 
+        else
+          Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag) 
+        end
       end
-    end
+    }
     self
   end
   def tag_exist?(tag)