* 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, 162 insertions, 71 deletions

diff --git a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
index 12f7cffabf..b72b157dcd 100644
--- a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
+++ b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
@@ -137,6 +137,22 @@ class Tk::TreeCtrl::NotifyEvent
     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 tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
   #
   #     _get_subst_key() and _get_all_subst_keys() generates key-string 
@@ -544,10 +560,18 @@ class Tk::TreeCtrl
   #########################
 
   def __destroy_hook__
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.delete(@path)
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.delete(@path)
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.delete(@path)
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.delete(@path)
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.delete(@path)
+    }
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.delete(@path)
+    }
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.delete(@path)
+    }
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.delete(@path)
+    }
   end
 
   #########################
@@ -638,9 +662,11 @@ class Tk::TreeCtrl
   end
 
   def column_delete(idx)
-    if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path]
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path].delete(idx)
-    end
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path]
+        Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path].delete(idx)
+      end
+    }
     tk_send('column', 'delete', idx)
     self
   end
@@ -750,11 +776,13 @@ class Tk::TreeCtrl
   end
 
   def element_delete(*elems)
-    if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path]
-      elems.each{|elem|
-        Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path].delete(elem)
-      }
-    end
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path]
+        elems.each{|elem|
+          Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path].delete(elem)
+        }
+      end
+    }
     tk_send('element', 'delete', *elems)
     self
   end
@@ -885,22 +913,25 @@ class Tk::TreeCtrl
 
   def _erase_children(item)
     item_children(item).each{|i| _erase_children(i)}
+    # table is already locked
     Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].delete(item)
   end
   private :_erase_children
 
   def item_delete(first, last=None)
-    if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path]
-      if first == 'all' || first == :all || last == 'all' || last == :all
-        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].clear
-      elsif last == None
-        _erase_children(first)
-      else
-        self.range(first, last).each{|id|
-          _erase_children(id)
-        }
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path]
+        if first == 'all' || first == :all || last == 'all' || last == :all
+          Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].clear
+        elsif last == None
+          _erase_children(first)
+        else
+          self.range(first, last).each{|id|
+            _erase_children(id)
+          }
+        end
       end
-    end
+    }
     tk_send('item', 'delete', first, last)
     self
   end
@@ -1520,11 +1551,13 @@ class Tk::TreeCtrl
   end
 
   def style_delete(*args)
-    if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path]
-      args.each{|sty|
-        Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path].delete(sty)
-      }
-    end
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path]
+        args.each{|sty|
+          Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path].delete(sty)
+        }
+      end
+    }
     tk_send('style', 'delete', *args)
     self
   end
@@ -1608,15 +1641,29 @@ end
 
 class Tk::TreeCtrl::Column < TkObject
   TreeCtrlColumnID_TBL = TkCore::INTERP.create_table
-  TreeCtrlColumnID = ['treectrl_column'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.clear}
+  (TreeCtrlColumnID = ['treectrl_column'.freeze, '00000'.taint]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.clear
+    }
+  }
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath]
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id]? \
-                 Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id] : id
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath]
+        Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id]? \
+                   Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id] : id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, keys={})
@@ -1625,17 +1672,19 @@ class Tk::TreeCtrl::Column < TkObject
 
     keys = _symbolkey2str(keys)
 
-    @path = @id = 
-      keys.delete('tag') ||
-      Tk::TreeCtrl::Column::TreeCtrlColumnID.join(TkCore::INTERP._ip_id_)
+    Tk::TreeCtrl::Column::TreeCtrlColumnID.mutex.synchronize{
+      @path = @id = 
+        keys.delete('tag') ||
+        Tk::TreeCtrl::Column::TreeCtrlColumnID.join(TkCore::INTERP._ip_id_)
+      Tk::TreeCtrl::Column::TreeCtrlColumnID[1].succ!
+    }
 
     keys['tag'] = @id
 
-    unless Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath]
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath] = {} 
-    end
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath][@id] = self
-    Tk::TreeCtrl::Column::TreeCtrlColumnID[1].succ!
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath] ||= {} 
+      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath][@id] = self
+    }
 
     @tree.column_create(keys)
   end
@@ -1692,11 +1741,18 @@ end
 
 class Tk::TreeCtrl::Element < TkObject
   TreeCtrlElementID_TBL = TkCore::INTERP.create_table
-  TreeCtrlElementID = ['treectrl_element'.freeze, '00000'.taint].freeze
+
+  (TreeCtrlElementID = ['treectrl_element'.freeze, '00000'.taint]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
   TreeCtrlElemTypeToClass = {}
 
   TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.clear
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.clear
+    }
   }
 
   def self.type2class(type)
@@ -1705,22 +1761,30 @@ class Tk::TreeCtrl::Element < TkObject
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath]
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id]? \
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath]
+        Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id]? \
                  Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id] : id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, type, keys=nil)
     @tree = parent
     @tpath = parent.path
     @type = type.to_s
-    @path = @id = 
-      Tk::TreeCtrl::Element::TreeCtrlElementID.join(TkCore::INTERP._ip_id_)
-    unless Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath]
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath] = {} 
-    end
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath][@id] = self
-    Tk::TreeCtrl::Element::TreeCtrlElementID[1].succ!
+    Tk::TreeCtrl::Element::TreeCtrlElementID.mutex.synchronize{
+      @path = @id = 
+        Tk::TreeCtrl::Element::TreeCtrlElementID.join(TkCore::INTERP._ip_id_)
+      Tk::TreeCtrl::Element::TreeCtrlElementID[1].succ!
+    }
+
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath] ||= {} 
+      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath][@id] = self
+    }
 
     @tree.element_create(@id, @type, keys)
   end
@@ -1800,13 +1864,22 @@ end
 class Tk::TreeCtrl::Item < TkObject
   TreeCtrlItemID_TBL = TkCore::INTERP.create_table
 
-  TkCore::INTERP.init_ip_env{Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.clear}
+  TkCore::INTERP.init_ip_env{
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.clear
+    }
+  }
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath]
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id]? \
-                 Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id] : id
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath]
+        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id]? \
+                        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id] : id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, keys={})
@@ -1814,10 +1887,10 @@ class Tk::TreeCtrl::Item < TkObject
     @tpath = parent.path
     @path = @id = @tree.item_create(keys)
 
-    unless Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath]
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath] = {} 
-    end
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath][@id] = self
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath] ||= {} 
+      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath][@id] = self
+    }
   end
 
   def id
@@ -2088,27 +2161,45 @@ end
 
 class Tk::TreeCtrl::Style < TkObject
   TreeCtrlStyleID_TBL = TkCore::INTERP.create_table
-  TreeCtrlStyleID = ['treectrl_style'.freeze, '00000'.taint].freeze
 
-  TkCore::INTERP.init_ip_env{ Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.clear }
+  (TreeCtrlStyleID = ['treectrl_style'.freeze, '00000'.taint]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.clear
+    }
+  }
 
   def self.id2obj(tree, id)
     tpath = tree.path
-    return id unless Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath]
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id]? \
-                 Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id] : id
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
+      if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath]
+        Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id]? \
+                     Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id] : id
+      else
+        id
+      end
+    }
   end
 
   def initialize(parent, keys=nil)
     @tree = parent
     @tpath = parent.path
-    @path = @id = 
-      Tk::TreeCtrl::Style::TreeCtrlStyleID.join(TkCore::INTERP._ip_id_)
-    unless Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath]
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath] = {} 
-    end
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath][@id] = self
-    Tk::TreeCtrl::Style::TreeCtrlStyleID[1].succ!
+
+    Tk::TreeCtrl::Style::TreeCtrlStyleID.mutex.synchronize{
+      @path = @id = 
+        Tk::TreeCtrl::Style::TreeCtrlStyleID.join(TkCore::INTERP._ip_id_)
+      Tk::TreeCtrl::Style::TreeCtrlStyleID[1].succ!
+    }
+
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
+      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath] ||= {} 
+      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath][@id] = self
+    }
 
     @tree.style_create(@id, keys)
   end