* ext/tk/lib/validate.rb: accept a Method object for the validatecommand option

* ext/tk/lib/tkextlib/winico.rb: add winico extension support


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

7 files changed, 241 insertions, 10 deletions

diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
index 1f680cea88..2d7159d1c7 100644
--- a/ext/tk/ChangeLog.tkextlib
+++ b/ext/tk/ChangeLog.tkextlib
@@ -1,3 +1,7 @@
+2004-07-28  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* add winico support
+
 2004-07-23  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* add TclX support (partially; infox command and XPG/3 MsgCat only)
diff --git a/ext/tk/MANIFEST b/ext/tk/MANIFEST
index 42851bc825..efcb81babc 100644
--- a/ext/tk/MANIFEST
+++ b/ext/tk/MANIFEST
@@ -256,6 +256,9 @@ lib/tkextlib/vu/dial.rb
 lib/tkextlib/vu/pie.rb
 lib/tkextlib/vu/setup.rb
 lib/tkextlib/vu/spinbox.rb
+lib/tkextlib/winico.rb
+lib/tkextlib/winico/setup.rb
+lib/tkextlib/winico/winico.rb
 sample/binding_sample.rb
 sample/bindtag_sample.rb
 sample/binstr_usage.rb
diff --git a/ext/tk/lib/tk/validation.rb b/ext/tk/lib/tk/validation.rb
index 53147178a7..ac99f32bdd 100644
--- a/ext/tk/lib/tk/validation.rb
+++ b/ext/tk/lib/tk/validation.rb
@@ -51,7 +51,7 @@ module Tk
 	if keys[key].kind_of?(Array)
 	  cmd, *args = keys[key]
 	  keys[key] = klass.new(cmd, args.join(' '))
-	elsif keys[key].kind_of? Proc
+	elsif keys[key].kind_of?(Proc) ||  keys[key].kind_of?(Method)
 	  keys[key] = klass.new(keys[key])
 	end
       }
@@ -64,6 +64,15 @@ module Tk
     private :create_self
 
     def configure(slot, value=TkComm::None)
+      if slot.kind_of?(Hash)
+	super(__conv_vcmd_on_hash_kv(slot))
+      else
+	super(__conv_vcmd_on_hash_kv(slot=>value))
+      end
+      self
+    end
+=begin
+    def configure(slot, value=TkComm::None)
       key2class = __get_validate_key2class
 
       if slot.kind_of?(Hash)
@@ -72,7 +81,7 @@ module Tk
 	  if slot[key].kind_of?(Array)
 	    cmd, *args = slot[key]
 	    slot[key] = klass.new(cmd, args.join(' '))
-	  elsif slot[key].kind_of? Proc
+	  elsif slot[key].kind_of?(Proc) || slot[key].kind_of?(Method)
 	    slot[key] = klass.new(slot[key])
 	  end
 	}
@@ -81,10 +90,10 @@ module Tk
       else
 	slot = slot.to_s
 	if (klass = key2class[slot])
-	  if value.kind_of? Array
+	  if value.kind_of?(Array)
 	    cmd, *args = value
 	    value = klass.new(cmd, args.join(' '))
-	  elsif value.kind_of? Proc
+	  elsif value.kind_of?(Proc) || value.kind_of?(Method)
 	    value = klass.new(value)
 	  end
 	end
@@ -93,6 +102,7 @@ module Tk
 
       self
     end
+=end
   end
 
   module ItemValidateConfigure
@@ -141,7 +151,7 @@ module Tk
 	if keys[key].kind_of?(Array)
 	  cmd, *args = keys[key]
 	  keys[key] = klass.new(cmd, args.join(' '))
-	elsif keys[key].kind_of? Proc
+	elsif keys[key].kind_of?(Proc) || keys[key].kind_of?(Method)
 	  keys[key] = klass.new(keys[key])
 	end
       }
@@ -149,6 +159,15 @@ module Tk
     end
 
     def itemconfigure(tagOrId, slot, value=TkComm::None)
+      if slot.kind_of?(Hash)
+	super(__conv_item_vcmd_on_hash_kv(slot))
+      else
+	super(__conv_item_vcmd_on_hash_kv(slot=>value))
+      end
+      self
+    end
+=begin
+    def itemconfigure(tagOrId, slot, value=TkComm::None)
       key2class = __get_item_validate_key2class(tagid(tagOrId))
 
       if slot.kind_of?(Hash)
@@ -157,7 +176,7 @@ module Tk
 	  if slot[key].kind_of?(Array)
 	    cmd, *args = slot[key]
 	    slot[key] = klass.new(cmd, args.join(' '))
-	  elsif slot[key].kind_of? Proc
+	  elsif slot[key].kind_of?(Proc) ||  slot[key].kind_of?(Method)
 	    slot[key] = klass.new(slot[key])
 	  end
 	}
@@ -166,10 +185,10 @@ module Tk
       else
 	slot = slot.to_s
 	if (klass = key2class[slot])
-	  if value.kind_of? Array
+	  if value.kind_of?(Array)
 	    cmd, *args = value
 	    value = klass.new(cmd, args.join(' '))
-	  elsif value.kind_of? Proc
+	  elsif value.kind_of?(Proc) || value.kind_of?(Method)
 	    value = klass.new(value)
 	  end
 	end
@@ -178,6 +197,7 @@ module Tk
 
       self
     end
+=end
   end
 end
 
diff --git a/ext/tk/lib/tkextlib/SUPPORT_STATUS b/ext/tk/lib/tkextlib/SUPPORT_STATUS
index 58744f50ed..cd2130d0b8 100644
--- a/ext/tk/lib/tkextlib/SUPPORT_STATUS
+++ b/ext/tk/lib/tkextlib/SUPPORT_STATUS
@@ -83,6 +83,9 @@ Tile        http://tktable.sourceforge.net/tile/        ==> tile
 
 ===< possibly available (not tested; alpha quality) >=========================
 
+winico      http://tktable.sourceforge.net
+               ==> winico (win32 only)
+
 TkTrans     http://www2.cmp.uea.ac.uk/~fuzz/tktrans/default.html
                ==>  tktrans (win32 only)
 
@@ -92,8 +95,6 @@ TkDND       http://sourceforge.net/projects/tkdnd       ==> tkDND
 
 ===< plan to support (alpha quality libraries may be included) >==============
 
-winico      http://tktable.sourceforge.net
-
 GraphViz    http://www.graphviz.org/
 
 Tkgeomap    http://tkgeomap.sourceforge.net/index.html
diff --git a/ext/tk/lib/tkextlib/winico.rb b/ext/tk/lib/tkextlib/winico.rb
new file mode 100644
index 0000000000..ce7b8eac5c
--- /dev/null
+++ b/ext/tk/lib/tkextlib/winico.rb
@@ -0,0 +1,14 @@
+#
+#  winico -- Windows Icon extension support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tktable/setup.rb'
+
+# load library
+require 'tkextlib/winico/winico'
diff --git a/ext/tk/lib/tkextlib/winico/setup.rb b/ext/tk/lib/tkextlib/winico/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ext/tk/lib/tkextlib/winico/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ext/tk/lib/tkextlib/winico/winico.rb b/ext/tk/lib/tkextlib/winico/winico.rb
new file mode 100644
index 0000000000..959f05ec79
--- /dev/null
+++ b/ext/tk/lib/tkextlib/winico/winico.rb
@@ -0,0 +1,181 @@
+#
+#  tkextlib/winico/winico.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/winico/setup.rb'
+
+# TkPackage.require('winico', '0.5')
+TkPackage.require('winico')
+
+module Tk
+  class Winico < TkObject
+    def self.package_version
+      begin
+	TkPackage.require('winico')
+      rescue
+	''
+      end
+    end
+  end
+end
+
+class Tk::Winico
+  WinicoID_TBL = TkCore::INTERP.create_table
+  TkCore::INTERP.init_ip_env{ WinicoID_TBL.clear }
+
+  def self.id2obj(id)
+    (WinicoID_TBL.key?(id))? WinicoID_TBL[id] : id
+  end
+
+  def self.info
+    simplelist(Tk.tk_call('winico', 'info')).collect{|id| 
+      Tk::Winico.id2obj(id)
+    }
+  end
+
+  def self.icon_info(id)
+    simplelist(Tk.tk_call('winico', 'info', id)).collect{|inf|
+      h = Hash[*list(inf)]
+      h.keys.each{|k| h[k[1..-1]] = h.delete(k)}
+    }
+  end
+
+  #################################
+
+  def self.new_from_file(file_name)
+    self.new(file_name)
+  end
+
+  def self.new_from_resource(resource_name, file_name = nil)
+    self.new(file_name, resource_name)
+  end
+
+  def initialize(file_name, resource_name=nil, winico_id=nil)
+    if resource_name
+      # from resource
+      if file_name
+	@id = Tk.tk_call('winico', 'load', resource_name, file_name)
+      else
+	@id = Tk.tk_call('winico', 'load', resource_name)
+      end
+    elsif file_name
+      # from .ico file
+      @id = Tk.tk_call('winico', 'createfrom', file_name)
+    elsif winico_id
+      @id = winico_id
+    else
+      fail ArgumentError, 
+	   "must be given proper information from where loading icons"
+    end
+    @path = @id
+    WinicoID_TBL[@id] = self
+  end
+
+  def id
+    @id
+  end
+
+  def set_window(win_id, *opts) # opts := ?'big'|'small'?, ?pos?
+    # NOTE:: the window, which is denoted by win_id, MUST BE MAPPED. 
+    #        If not, then this may fail or crash.
+    tk_call('winico', 'setwindow', win_id, @id, *opts)
+  end
+
+  def delete
+    tk_call('winico', 'delete', @id)
+    WinicoID_TBL.delete(@id)
+    self
+  end
+  alias destroy delete
+
+  def info
+    Tk::Winico.icon_info(@id)
+  end
+
+  #################################
+
+  class Winico_callback < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+	[ ?m, ?s, :message ], 
+	[ ?i, ?x, :icon ], 
+	[ ?x, ?n, :x ], 
+	[ ?y, ?n, :y ], 
+	[ ?X, ?n, :last_x ], 
+	[ ?Y, ?n, :last_y ], 
+	[ ?t, ?n, :tickcount ], 
+	[ ?w, ?n, :icon_idnum ], 
+	[ ?l, ?n, :msg_idnum ], 
+	nil
+      ]
+
+      PROC_TBL = [
+	[ ?n, TkComm.method(:number) ], 
+	[ ?s, TkComm.method(:string) ], 
+	[ ?x, proc{|id| 
+	    if Tk::Winico::WinicoID_TBL.key?(id)
+	      Tk::Winico::WinicoID_TBL[id]
+	    else
+	      Tk::Winico.new(nil, nil, id)
+	    end
+	  } ], 
+	nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+	val
+      end
+    end
+
+    def self._config_keys
+      ['callback']
+    end
+  end
+
+  #################################
+
+  def add_to_taskbar(keys = {})
+    keys = _symbolkey2str(keys)
+    Winico_callback._config_keys.each{|k|
+      if keys[k].kind_of?(Array)
+	cmd, *args = keys[k]
+	keys[k] = Winico_callback.new(cmd, args.join(' '))
+      elsif keys[k].kind_of?(Proc)
+	keys[k] = Winico_callback.new(keys[k])
+      end
+    }
+    tk_call('winico', 'taskbar', 'add', @id, *(hash_kv(keys)))
+    self
+  end
+  alias taskbar_add add_to_taskbar
+
+  def modify_taskbar(keys = {})
+    keys = _symbolkey2str(keys)
+    Winico_callback._config_keys.each{|k|
+      if keys[k].kind_of?(Array)
+	cmd, *args = keys[k]
+	keys[k] = Winico_callback.new(cmd, args.join(' '))
+      elsif keys[k].kind_of?(Proc)
+	keys[k] = Winico_callback.new(keys[k])
+      end
+    }
+    tk_call('winico', 'taskbar', 'modify', @id, *(hash_kv(keys)))
+    self
+  end
+  alias taskbar_modify modify_taskbar
+
+  def delete_from_taskbar
+    tk_call('winico', 'taskbar', 'delete', @id)
+    self
+  end
+  alias taskbar_delete delete_from_taskbar
+end