mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00

* 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
175 lines
3.6 KiB
Ruby
175 lines
3.6 KiB
Ruby
#
|
|
# tkextlib/blt/watch.rb
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
|
|
require 'tk'
|
|
require 'tkextlib/blt.rb'
|
|
|
|
module Tk::BLT
|
|
class Watch < TkObject
|
|
extend TkCore
|
|
|
|
TkCommandNames = ['::blt::watch'.freeze].freeze
|
|
|
|
WATCH_ID_TBL = TkCore::INTERP.create_table
|
|
|
|
(BLT_WATCH_ID = ['blt_watch_id'.freeze, '00000'.taint]).instance_eval{
|
|
@mutex = Mutex.new
|
|
def mutex; @mutex; end
|
|
freeze
|
|
}
|
|
|
|
TkCore::INTERP.init_ip_env{
|
|
WATCH_ID_TBL.mutex.synchronize{ WATCH_ID_TBL.clear }
|
|
}
|
|
|
|
def self.names(state = None)
|
|
lst = tk_split_list(tk_call('::blt::watch', 'names', state))
|
|
WATCH_ID_TBL.mutex.synchronize{
|
|
lst.collect{|name|
|
|
WATCH_ID_TBL[name] || name
|
|
}
|
|
}
|
|
end
|
|
|
|
def __numval_optkeys
|
|
['maxlevel']
|
|
end
|
|
private :__numval_optkeys
|
|
|
|
def __boolval_optkeys
|
|
['active']
|
|
end
|
|
private :__boolval_optkeys
|
|
|
|
def __config_cmd
|
|
['::blt::watch', 'configure', self.path]
|
|
end
|
|
private :__config_cmd
|
|
|
|
def initialize(name = nil, keys = {})
|
|
if name.kind_of?(Hash)
|
|
keys = name
|
|
name = nil
|
|
end
|
|
|
|
if name
|
|
@id = name.to_s
|
|
else
|
|
BLT_WATCH_ID.mutex.synchronize{
|
|
@id = BLT_WATCH_ID.join(TkCore::INTERP._ip_id_)
|
|
BLT_WATCH_ID[1].succ!
|
|
}
|
|
end
|
|
|
|
@path = @id
|
|
|
|
WATCH_ID_TBL.mutex.synchronize{
|
|
WATCH_ID_TBL[@id] = self
|
|
}
|
|
tk_call('::blt::watch', 'create', @id, *hash_kv(keys))
|
|
end
|
|
|
|
def activate
|
|
tk_call('::blt::watch', 'activate', @id)
|
|
self
|
|
end
|
|
def deactivate
|
|
tk_call('::blt::watch', 'deactivate', @id)
|
|
self
|
|
end
|
|
def delete
|
|
tk_call('::blt::watch', 'delete', @id)
|
|
self
|
|
end
|
|
def info
|
|
ret = []
|
|
lst = tk_split_simplelist(tk_call('::blt::watch', 'info', @id))
|
|
until lst.empty?
|
|
k, v, *lst = lst
|
|
k = k[1..-1]
|
|
case k
|
|
when /^(#{__strval_optkeys.join('|')})$/
|
|
# do nothing
|
|
|
|
when /^(#{__numval_optkeys.join('|')})$/
|
|
begin
|
|
v = number(v)
|
|
rescue
|
|
v = nil
|
|
end
|
|
|
|
when /^(#{__numstrval_optkeys.join('|')})$/
|
|
v = num_or_str(v)
|
|
|
|
when /^(#{__boolval_optkeys.join('|')})$/
|
|
begin
|
|
v = bool(v)
|
|
rescue
|
|
v = nil
|
|
end
|
|
|
|
when /^(#{__listval_optkeys.join('|')})$/
|
|
v = simplelist(v)
|
|
|
|
when /^(#{__numlistval_optkeys.join('|')})$/
|
|
v = list(v)
|
|
|
|
else
|
|
if v.index('{')
|
|
v = tk_split_list(v)
|
|
else
|
|
v = tk_tcl2ruby(v)
|
|
end
|
|
end
|
|
|
|
ret << [k, v]
|
|
end
|
|
|
|
ret
|
|
end
|
|
def configinfo(slot = nil)
|
|
if slot
|
|
slot = slot.to_s
|
|
v = cget(slot)
|
|
if TkComm::GET_CONFIGINFO_AS_ARRAY
|
|
[slot, v]
|
|
else
|
|
{slot=>v}
|
|
end
|
|
else
|
|
if TkComm::GET_CONFIGINFO_AS_ARRAY
|
|
info
|
|
else
|
|
Hash[*(info.flatten)]
|
|
end
|
|
end
|
|
end
|
|
def cget_strict(key)
|
|
key = key.to_s
|
|
begin
|
|
info.assoc(key)[1]
|
|
rescue
|
|
fail ArgumentError, "unknown option '#{key}'"
|
|
end
|
|
end
|
|
def cget(key)
|
|
unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
|
|
cget_strict(key)
|
|
else
|
|
begin
|
|
cget_strict(key)
|
|
rescue => e
|
|
if current_configinfo.has_key?(key.to_s)
|
|
# error on known option
|
|
fail e
|
|
else
|
|
# unknown option
|
|
nil
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|