mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
3024ffdc3a
* 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
220 lines
5.2 KiB
Ruby
220 lines
5.2 KiB
Ruby
#
|
|
# 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', '0.6')
|
|
TkPackage.require('winico')
|
|
|
|
module Tk
|
|
class Winico < TkObject
|
|
PACKAGE_NAME = 'winico'.freeze
|
|
def self.package_name
|
|
PACKAGE_NAME
|
|
end
|
|
|
|
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.mutex.synchronize{ WinicoID_TBL.clear }
|
|
}
|
|
|
|
def self.id2obj(id)
|
|
WinicoID_TBL.mutex.synchronize{
|
|
(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.mutex.synchronize{
|
|
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.mutex.synchronize{
|
|
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|
|
|
Tk::Winico::WinicoID_TBL.mutex.synchronize{
|
|
if Tk::Winico::WinicoID_TBL.key?(id)
|
|
obj = Tk::Winico::WinicoID_TBL[id]
|
|
else
|
|
# Tk::Winico.new(nil, nil, id)
|
|
obj = Tk::Winico.allocate
|
|
obj.instance_eval{ @path = @id = id }
|
|
Tk::Winico::WinicoID_TBL[id] = obj
|
|
end
|
|
obj
|
|
}
|
|
} ],
|
|
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)
|
|
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)
|
|
elsif TkComm._callback_entry?(keys[k])
|
|
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)
|
|
elsif TkComm._callback_entry?(keys[k])
|
|
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
|