mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
![nagai](/assets/img/avatar_default.png)
* 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
365 lines
7.7 KiB
Ruby
365 lines
7.7 KiB
Ruby
#
|
|
# tkextlib/iwidgets/hierarchy.rb
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
|
|
require 'tk'
|
|
require 'tk/text'
|
|
require 'tkextlib/iwidgets.rb'
|
|
|
|
module Tk
|
|
module Iwidgets
|
|
class Hierarchy < Tk::Iwidgets::Scrolledwidget
|
|
end
|
|
end
|
|
end
|
|
|
|
class Tk::Iwidgets::Hierarchy
|
|
ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
|
|
include TkTextTagConfig
|
|
|
|
TkCommandNames = ['::iwidgets::hierarchy'.freeze].freeze
|
|
WidgetClassName = 'Hierarchy'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
####################################
|
|
|
|
include Tk::ValidateConfigure
|
|
|
|
class QueryCommand < TkValidateCommand
|
|
class ValidateArgs < TkUtil::CallbackSubst
|
|
KEY_TBL = [ [?n, ?s, :node], nil ]
|
|
PROC_TBL = [ [?s, TkComm.method(:string) ], nil ]
|
|
|
|
=begin
|
|
# 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
|
|
}
|
|
=end
|
|
|
|
_setup_subst_table(KEY_TBL, PROC_TBL);
|
|
|
|
def self.ret_val(val)
|
|
val
|
|
end
|
|
end
|
|
|
|
def self._config_keys
|
|
# array of config-option key (string or symbol)
|
|
['querycommand']
|
|
end
|
|
end
|
|
|
|
class IndicatorCommand < TkValidateCommand
|
|
class ValidateArgs < TkUtil::CallbackSubst
|
|
KEY_TBL = [
|
|
[ ?n, ?s, :node ],
|
|
[ ?s, ?b, :status ],
|
|
nil
|
|
]
|
|
|
|
PROC_TBL = [
|
|
[ ?s, TkComm.method(:string) ],
|
|
[ ?b, TkComm.method(:bool) ],
|
|
nil
|
|
]
|
|
|
|
=begin
|
|
# 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
|
|
}
|
|
=end
|
|
|
|
_setup_subst_table(KEY_TBL, PROC_TBL);
|
|
|
|
def self.ret_val(val)
|
|
val
|
|
end
|
|
end
|
|
|
|
def self._config_keys
|
|
# array of config-option key (string or symbol)
|
|
['iconcommand', 'icondblcommand', 'imagedblcommand']
|
|
end
|
|
end
|
|
|
|
class IconCommand < TkValidateCommand
|
|
class ValidateArgs < TkUtil::CallbackSubst
|
|
KEY_TBL = [
|
|
[ ?n, ?s, :node ],
|
|
[ ?i, ?s, :icon ],
|
|
nil
|
|
]
|
|
PROC_TBL = [ [ ?s, TkComm.method(:string) ], nil ]
|
|
|
|
=begin
|
|
# 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
|
|
}
|
|
=end
|
|
|
|
_setup_subst_table(KEY_TBL, PROC_TBL);
|
|
|
|
def self.ret_val(val)
|
|
val
|
|
end
|
|
end
|
|
|
|
def self._config_keys
|
|
# array of config-option key (string or symbol)
|
|
['dblclickcommand', 'imagecommand', 'selectcommand']
|
|
end
|
|
end
|
|
|
|
def __validation_class_list
|
|
super() << QueryCommand << IndicatorCommand << IconCommand
|
|
end
|
|
|
|
Tk::ValidateConfigure.__def_validcmd(binding, QueryCommand)
|
|
Tk::ValidateConfigure.__def_validcmd(binding, IndicatorCommand)
|
|
Tk::ValidateConfigure.__def_validcmd(binding, IconCommand)
|
|
|
|
####################################
|
|
|
|
def __boolval_optkeys
|
|
super() << 'alwaysquery' << 'expanded' << 'filter'
|
|
end
|
|
private :__boolval_optkeys
|
|
|
|
def __strval_optkeys
|
|
super() << 'markbackground' << 'markforeground' << 'textbackground'
|
|
end
|
|
private :__strval_optkeys
|
|
|
|
def __font_optkeys
|
|
super() << 'textfont'
|
|
end
|
|
private :__font_optkeys
|
|
|
|
def clear
|
|
tk_call(@path, 'clear')
|
|
self
|
|
end
|
|
|
|
def collapse(node)
|
|
tk_call(@path, 'collapse')
|
|
self
|
|
end
|
|
|
|
def current
|
|
tk_call(@path, 'current')
|
|
end
|
|
|
|
def draw(mode=None)
|
|
case mode
|
|
when None
|
|
# do nothing
|
|
when 'now', :now
|
|
mode = '-now'
|
|
when 'eventually', :eventually
|
|
mode = '-eventually'
|
|
when String, Symbol
|
|
mode = mode.to_s
|
|
mode = '-' << mode if mode[0] != ?-
|
|
end
|
|
tk_call(@path, 'draw', mode)
|
|
end
|
|
|
|
def expand(node)
|
|
tk_call(@path, 'expand', node)
|
|
self
|
|
end
|
|
|
|
def expanded?(node)
|
|
bool(tk_call(@path, 'expanded', node))
|
|
end
|
|
|
|
def exp_state
|
|
list(tk_call(@path, 'expState'))
|
|
end
|
|
alias expand_state exp_state
|
|
alias expanded_list exp_state
|
|
|
|
def mark_clear
|
|
tk_call(@path, 'mark', 'clear')
|
|
self
|
|
end
|
|
def mark_add(*nodes)
|
|
tk_call(@path, 'mark', 'add', *nodes)
|
|
self
|
|
end
|
|
def mark_remove(*nodes)
|
|
tk_call(@path, 'mark', 'remove', *nodes)
|
|
self
|
|
end
|
|
def mark_get
|
|
list(tk_call(@path, 'mark', 'get'))
|
|
end
|
|
|
|
def refresh(node)
|
|
tk_call(@path, 'refresh', node)
|
|
self
|
|
end
|
|
|
|
def prune(node)
|
|
tk_call(@path, 'prune', node)
|
|
self
|
|
end
|
|
|
|
def selection_clear
|
|
tk_call(@path, 'selection', 'clear')
|
|
self
|
|
end
|
|
def selection_add(*nodes)
|
|
tk_call(@path, 'selection', 'add', *nodes)
|
|
self
|
|
end
|
|
def selection_remove(*nodes)
|
|
tk_call(@path, 'selection', 'remove', *nodes)
|
|
self
|
|
end
|
|
def selection_get
|
|
list(tk_call(@path, 'selection', 'get'))
|
|
end
|
|
|
|
def toggle(node)
|
|
tk_call(@path, 'toggle', node)
|
|
self
|
|
end
|
|
|
|
# based on Tk::Text widget
|
|
|
|
def bbox(index)
|
|
list(tk_send_without_enc('bbox', _get_eval_enc_str(index)))
|
|
end
|
|
|
|
def compare(idx1, op, idx2)
|
|
bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
|
|
op, _get_eval_enc_str(idx2)))
|
|
end
|
|
|
|
def debug
|
|
bool(tk_send_without_enc('debug'))
|
|
end
|
|
def debug=(boolean)
|
|
tk_send_without_enc('debug', boolean)
|
|
#self
|
|
boolean
|
|
end
|
|
|
|
def delete(first, last=None)
|
|
tk_send_without_enc('delete', first, last)
|
|
self
|
|
end
|
|
|
|
def dlineinfo(index)
|
|
list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
|
|
end
|
|
|
|
def get(*index)
|
|
_fromUTF8(tk_send_without_enc('get', *index))
|
|
end
|
|
|
|
def index(index)
|
|
tk_send_without_enc('index', _get_eval_enc_str(index))
|
|
end
|
|
|
|
def insert(index, chars, *tags)
|
|
if tags[0].kind_of? Array
|
|
# multiple chars-taglist argument :: str, [tag,...], str, [tag,...], ...
|
|
args = [chars]
|
|
while tags.size > 0
|
|
args << tags.shift.collect{|x|_get_eval_string(x)}.join(' ') # taglist
|
|
args << tags.shift if tags.size > 0 # chars
|
|
end
|
|
super(index, *args)
|
|
else
|
|
# single chars-taglist argument :: str, tag, tag, ...
|
|
if tags.size == 0
|
|
super(index, chars)
|
|
else
|
|
super(index, chars, tags.collect{|x|_get_eval_string(x)}.join(' '))
|
|
end
|
|
end
|
|
end
|
|
|
|
def scan_mark(x, y)
|
|
tk_send_without_enc('scan', 'mark', x, y)
|
|
self
|
|
end
|
|
def scan_dragto(x, y)
|
|
tk_send_without_enc('scan', 'dragto', x, y)
|
|
self
|
|
end
|
|
def see(index)
|
|
tk_send_without_enc('see', index)
|
|
self
|
|
end
|
|
|
|
# based on tk/scrollable.rb
|
|
def xview(*index)
|
|
if index.size == 0
|
|
list(tk_send_without_enc('xview'))
|
|
else
|
|
tk_send_without_enc('xview', *index)
|
|
self
|
|
end
|
|
end
|
|
def xview_moveto(*index)
|
|
xview('moveto', *index)
|
|
end
|
|
def xview_scroll(*index)
|
|
xview('scroll', *index)
|
|
end
|
|
|
|
def yview(*index)
|
|
if index.size == 0
|
|
list(tk_send_without_enc('yview'))
|
|
else
|
|
tk_send_without_enc('yview', *index)
|
|
self
|
|
end
|
|
end
|
|
def yview_moveto(*index)
|
|
yview('moveto', *index)
|
|
end
|
|
def yview_scroll(*index)
|
|
yview('scroll', *index)
|
|
end
|
|
end
|