mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
e6697a6405
* 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
453 lines
9.2 KiB
Ruby
453 lines
9.2 KiB
Ruby
#
|
|
# tkextlib/bwidget/tree.rb
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
|
|
require 'tk'
|
|
require 'tk/canvas'
|
|
require 'tkextlib/bwidget.rb'
|
|
|
|
module Tk
|
|
module BWidget
|
|
class Tree < TkWindow
|
|
class Node < TkObject
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
class Tk::BWidget::Tree
|
|
include TkItemConfigMethod
|
|
include Scrollable
|
|
|
|
TkCommandNames = ['Tree'.freeze].freeze
|
|
WidgetClassName = 'Tree'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
class Event_for_Items < TkEvent::Event
|
|
def self._get_extra_args_tbl
|
|
[
|
|
TkComm.method(:string) # item idenfier
|
|
]
|
|
end
|
|
end
|
|
|
|
def __strval_optkeys
|
|
super() << 'crossfill' << 'linesfill'
|
|
end
|
|
private :__strval_optkeys
|
|
|
|
def __boolval_optkeys
|
|
super() << 'dragenabled' << 'dropenabled' <<
|
|
'redraw' << 'selectfill' << 'showlines'
|
|
end
|
|
private :__boolval_optkeys
|
|
|
|
def __tkvariable_optkeys
|
|
super() << 'helpvar'
|
|
end
|
|
private :__tkvariable_optkeys
|
|
|
|
def tagid(tag)
|
|
if tag.kind_of?(Tk::BWidget::Tree::Node)
|
|
tag.id
|
|
else
|
|
# tag
|
|
_get_eval_string(tag)
|
|
end
|
|
end
|
|
|
|
#def imagebind(*args)
|
|
# _bind_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
|
|
# self
|
|
#end
|
|
def imagebind(context, *args)
|
|
#if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
|
|
if TkComm._callback_entry?(args[0]) || !block_given?
|
|
cmd = args.shift
|
|
else
|
|
cmd = Proc.new
|
|
end
|
|
_bind_for_event_class(Event_for_Items, [path, 'bindImage'],
|
|
context, cmd, *args)
|
|
self
|
|
end
|
|
|
|
#def imagebind_append(*args)
|
|
# _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
|
|
# self
|
|
#end
|
|
def imagebind_append(context, *args)
|
|
#if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
|
|
if TkComm._callback_entry?(args[0]) || !block_given?
|
|
cmd = args.shift
|
|
else
|
|
cmd = Proc.new
|
|
end
|
|
_bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
|
|
context, cmd, *args)
|
|
self
|
|
end
|
|
|
|
def imagebind_remove(*args)
|
|
_bind_remove_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
|
|
self
|
|
end
|
|
|
|
def imagebindinfo(*args)
|
|
_bindinfo_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
|
|
end
|
|
|
|
#def textbind(*args)
|
|
# _bind_for_event_class(Event_for_Items, [path, 'bindText'], *args)
|
|
# self
|
|
#end
|
|
def textbind(context, *args)
|
|
#if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
|
|
if TkComm._callback_entry?(args[0]) || !block_given?
|
|
cmd = args.shift
|
|
else
|
|
cmd = Proc.new
|
|
end
|
|
_bind_for_event_class(Event_for_Items, [path, 'bindText'],
|
|
context, cmd, *args)
|
|
self
|
|
end
|
|
|
|
#def textbind_append(*args)
|
|
# _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], *args)
|
|
# self
|
|
#end
|
|
def textbind_append(context, *args)
|
|
#if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
|
|
if TkComm._callback_entry?(args[0]) || !block_given?
|
|
cmd = args.shift
|
|
else
|
|
cmd = Proc.new
|
|
end
|
|
_bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
|
|
context, cmd, *args)
|
|
self
|
|
end
|
|
|
|
def textbind_remove(*args)
|
|
_bind_remove_for_event_class(Event_for_Items, [path, 'bindText'], *args)
|
|
self
|
|
end
|
|
|
|
def textbindinfo(*args)
|
|
_bindinfo_for_event_class(Event_for_Items, [path, 'bindText'], *args)
|
|
end
|
|
|
|
def close_tree(node, recurse=None)
|
|
tk_send('closetree', tagid(node), recurse)
|
|
self
|
|
end
|
|
|
|
def delete(*args)
|
|
tk_send('delete', *(args.collect{|node| tagid(node)}))
|
|
self
|
|
end
|
|
|
|
def edit(node, text, *args)
|
|
tk_send('edit', tagid(node), text, *args)
|
|
self
|
|
end
|
|
|
|
def exist?(node)
|
|
bool(tk_send('exists', tagid(node)))
|
|
end
|
|
|
|
def index(node)
|
|
num_or_str(tk_send('index', tagid(node)))
|
|
end
|
|
|
|
def insert(idx, parent, node, keys={})
|
|
tk_send('insert', idx, tagid(parent), tagid(node), *hash_kv(keys))
|
|
self
|
|
end
|
|
|
|
def move(parent, node, idx)
|
|
tk_send('move', tagid(parent), tagid(node), idx)
|
|
self
|
|
end
|
|
|
|
def get_node(node, idx)
|
|
Tk::BWidget::Tree::Node.id2obj(self, tk_send('nodes', tagid(node), idx))
|
|
end
|
|
|
|
def nodes(node, first=None, last=None)
|
|
simplelist(tk_send('nodes', tagid(node), first, last)).collect{|node|
|
|
Tk::BWidget::Tree::Node.id2obj(self, node)
|
|
}
|
|
end
|
|
|
|
def open?(node)
|
|
bool(@tree.itemcget(tagid(node), 'open'))
|
|
end
|
|
|
|
def open_tree(node, recurse=None)
|
|
tk_send('opentree', tagid(node), recurse)
|
|
self
|
|
end
|
|
|
|
def parent(node)
|
|
Tk::BWidget::Tree::Node.id2obj(self, tk_send('parent', tagid(node)))
|
|
end
|
|
|
|
def reorder(node, neworder)
|
|
tk_send('reorder', tagid(node), neworder)
|
|
self
|
|
end
|
|
|
|
def see(node)
|
|
tk_send('see', tagid(node))
|
|
self
|
|
end
|
|
|
|
def selection_add(*args)
|
|
tk_send_without_enc('selection', 'add',
|
|
*(args.collect{|node| tagid(node)}))
|
|
self
|
|
end
|
|
|
|
def selection_clear
|
|
tk_send_without_enc('selection', 'clear')
|
|
self
|
|
end
|
|
|
|
def selection_get
|
|
list(tk_send_without_enc('selection', 'get'))
|
|
end
|
|
|
|
def selection_include?(*args)
|
|
bool(tk_send_without_enc('selection', 'get',
|
|
*(args.collect{|node| tagid(node)})))
|
|
end
|
|
|
|
def selection_range(*args)
|
|
tk_send_without_enc('selection', 'range',
|
|
*(args.collect{|node| tagid(node)}))
|
|
self
|
|
end
|
|
|
|
def selection_remove(*args)
|
|
tk_send_without_enc('selection', 'remove',
|
|
*(args.collect{|node| tagid(node)}))
|
|
self
|
|
end
|
|
|
|
def selection_set(*args)
|
|
tk_send_without_enc('selection', 'set',
|
|
*(args.collect{|node| tagid(node)}))
|
|
self
|
|
end
|
|
|
|
def selection_toggle(*args)
|
|
tk_send_without_enc('selection', 'toggle',
|
|
*(args.collect{|node| tagid(node)}))
|
|
self
|
|
end
|
|
|
|
def toggle(node)
|
|
tk_send_without_enc('toggle', tagid(node))
|
|
self
|
|
end
|
|
|
|
def visible(node)
|
|
bool(tk_send_without_enc('visible', tagid(node)))
|
|
end
|
|
end
|
|
|
|
class Tk::BWidget::Tree::Node
|
|
include TkTreatTagFont
|
|
|
|
TreeNode_TBL = TkCore::INTERP.create_table
|
|
|
|
(TreeNode_ID = ['bw:node'.freeze, '00000'.taint]).instance_eval{
|
|
@mutex = Mutex.new
|
|
def mutex; @mutex; end
|
|
freeze
|
|
}
|
|
|
|
TkCore::INTERP.init_ip_env{
|
|
TreeNode_TBL.mutex.synchronize{ TreeNode_TBL.clear }
|
|
}
|
|
|
|
def self.id2obj(tree, id)
|
|
tpath = tree.path
|
|
TreeNode_TBL.mutex.synchronize{
|
|
if TreeNode_TBL[tpath]
|
|
TreeNode_TBL[tpath][id]? TreeNode_TBL[tpath][id]: id
|
|
else
|
|
id
|
|
end
|
|
}
|
|
end
|
|
|
|
def initialize(tree, *args)
|
|
if tree.kind_of?(Tk::BWidget::Tree)
|
|
@tree = tree
|
|
parent = args.shift
|
|
if parent.kind_of?(Tk::BWidget::Tree::Node)
|
|
if parent.tree.path != @tree.path
|
|
fail RuntimeError, 'tree of parent node is not match'
|
|
end
|
|
end
|
|
elsif tree.kind_of?(Tk::BWidget::Tree::Node)
|
|
@tree = tree.tree
|
|
parent = tree.parent
|
|
else
|
|
fail RuntimeError,
|
|
"expect Tk::BWidget::Tree or Tk::BWidget::Tree::Node for 1st argument"
|
|
end
|
|
|
|
if args[-1].kind_of?(Hash)
|
|
keys = _symbolkey2str(args.pop)
|
|
else
|
|
keys = {}
|
|
end
|
|
|
|
index = keys.delete('index')
|
|
unless args.empty?
|
|
index = args.shift
|
|
end
|
|
index = 'end' unless index
|
|
|
|
unless args.empty?
|
|
fail RuntimeError, 'too much arguments'
|
|
end
|
|
|
|
@tpath = @tree.path
|
|
|
|
if keys.key?('nodename')
|
|
@path = @id = keys.delete('nodename')
|
|
else
|
|
TreeNode_ID.mutex.synchronize{
|
|
@path = @id = TreeNode_ID.join(TkCore::INTERP._ip_id_)
|
|
TreeNode_ID[1].succ!
|
|
}
|
|
end
|
|
|
|
TreeNode_TBL.mutex.synchronize{
|
|
TreeNode_TBL[@id] = self
|
|
TreeNode_TBL[@tpath] = {} unless TreeNode_TBL[@tpath]
|
|
TreeNode_TBL[@tpath][@id] = self
|
|
}
|
|
|
|
@tree.insert(index, parent, @id, keys)
|
|
end
|
|
|
|
def tree
|
|
@tree
|
|
end
|
|
|
|
def id
|
|
@id
|
|
end
|
|
|
|
def [](key)
|
|
cget(key)
|
|
end
|
|
|
|
def []=(key, val)
|
|
configure(key, val)
|
|
val
|
|
end
|
|
|
|
def cget(key)
|
|
@tree.itemcget(@id, key)
|
|
end
|
|
def cget_strict(key)
|
|
@tree.itemcget_strict(@id, key)
|
|
end
|
|
|
|
def configure(key, val=None)
|
|
@tree.itemconfigure(@id, key, val)
|
|
end
|
|
|
|
def configinfo(key=nil)
|
|
@tree.itemconfiginfo(@id, key)
|
|
end
|
|
|
|
def current_configinfo(key=nil)
|
|
@tree.current_itemconfiginfo(@id, key)
|
|
end
|
|
|
|
def close_tree(recurse=None)
|
|
@tree.close_tree(@id, recurse)
|
|
self
|
|
end
|
|
|
|
def delete
|
|
@tree.delete(@id)
|
|
self
|
|
end
|
|
|
|
def edit(*args)
|
|
@tree.edit(@id, *args)
|
|
self
|
|
end
|
|
|
|
def exist?
|
|
@tree.exist?(@id)
|
|
end
|
|
|
|
def index
|
|
@tree.index(@id)
|
|
end
|
|
|
|
def move(index, parent=nil)
|
|
if parent
|
|
@tree.move(parent, @id, index)
|
|
else
|
|
@tree.move(self.parent, @id, index)
|
|
end
|
|
end
|
|
|
|
def open_tree(recurse=None)
|
|
@tree.open_tree(@id, recurse)
|
|
self
|
|
end
|
|
|
|
def open?
|
|
bool(@tree.itemcget(@id, 'open'))
|
|
end
|
|
|
|
def parent
|
|
@tree.parent(@id)
|
|
end
|
|
|
|
def reorder(neworder)
|
|
@tree.reorder(@id, neworder)
|
|
end
|
|
|
|
def see
|
|
@tree.see(@id)
|
|
end
|
|
|
|
def selection_add
|
|
@tree.selection_add(@id)
|
|
end
|
|
|
|
def selection_remove
|
|
@tree.selection_remove(@id)
|
|
end
|
|
|
|
def selection_set
|
|
@tree.selection_set(@id)
|
|
end
|
|
|
|
def selection_toggle
|
|
@tree.selection_toggle(@id)
|
|
end
|
|
|
|
def toggle
|
|
@tree.toggle(@id)
|
|
end
|
|
|
|
def visible
|
|
@tree.visible(@id)
|
|
end
|
|
end
|
|
|