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
282 lines
5.4 KiB
Ruby
282 lines
5.4 KiB
Ruby
#
|
|
# ::vu::pie widget
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
require 'tk'
|
|
|
|
# create module/class
|
|
module Tk
|
|
module Vu
|
|
module PieSliceConfigMethod
|
|
end
|
|
class Pie < TkWindow
|
|
end
|
|
class PieSlice < TkObject
|
|
end
|
|
class NamedPieSlice < PieSlice
|
|
end
|
|
end
|
|
end
|
|
|
|
# call setup script -- <libdir>/tkextlib/vu.rb
|
|
require 'tkextlib/vu.rb'
|
|
|
|
module Tk::Vu::PieSliceConfigMethod
|
|
include TkItemConfigMethod
|
|
|
|
def __item_pathname(tagOrId)
|
|
if tagOrId.kind_of?(Tk::Vu::PieSlice)
|
|
self.path + ';' + tagOrId.id.to_s
|
|
else
|
|
self.path + ';' + tagOrId.to_s
|
|
end
|
|
end
|
|
private :__item_pathname
|
|
end
|
|
|
|
class Tk::Vu::Pie < TkWindow
|
|
TkCommandNames = ['::vu::pie'.freeze].freeze
|
|
WidgetClassName = 'Pie'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
def __destroy_hook__
|
|
Tk::Vu::PieSlice::SliceID_TBL.delete(@path)
|
|
end
|
|
|
|
###############################
|
|
|
|
include Tk::Vu::PieSliceConfigMethod
|
|
|
|
def tagid(tag)
|
|
if tag.kind_of?(Tk::Vu::PieSlice)
|
|
tag.id
|
|
else
|
|
# tag
|
|
_get_eval_string(tag)
|
|
end
|
|
end
|
|
|
|
###############################
|
|
|
|
def delete(*glob_pats)
|
|
tk_call(@path, 'delete', *glob_pats)
|
|
self
|
|
end
|
|
|
|
def explode(slice, *args)
|
|
tk_call(@path, 'explode', slice, *args)
|
|
self
|
|
end
|
|
|
|
def explode_value(slice)
|
|
num_or_str(tk_call(@path, 'explode', slice))
|
|
end
|
|
|
|
def lower(slice, below=None)
|
|
tk_call(@path, 'lower', slice, below)
|
|
self
|
|
end
|
|
|
|
def names(*glob_pats)
|
|
simplelist(tk_call(@path, 'names', *glob_pats))
|
|
end
|
|
alias slices names
|
|
|
|
def order(*args)
|
|
tk_call(@path, 'order', *args)
|
|
self
|
|
end
|
|
|
|
def raise(slice, above=None)
|
|
tk_call(@path, 'raise', slice, above)
|
|
self
|
|
end
|
|
|
|
def swap(slice1, slice2)
|
|
tk_call(@path, 'swap', slice1, slice2)
|
|
self
|
|
end
|
|
|
|
def set(slice, *args)
|
|
num_or_str(tk_call(@path, 'set', slice, *args))
|
|
end
|
|
alias set_value set
|
|
alias set_values set
|
|
alias create set
|
|
|
|
def slice_value(slice)
|
|
num_or_str(tk_call(@path, 'set', slice))
|
|
end
|
|
|
|
def value(val = None)
|
|
num_or_str(tk_call_without_enc(@path, 'value'))
|
|
end
|
|
alias sum_value value
|
|
end
|
|
|
|
class Tk::Vu::PieSlice
|
|
SliceID_TBL = TkCore::INTERP.create_table
|
|
|
|
(Pie_Slice_ID = ['vu:pie'.freeze, '00000'.taint]).instance_eval{
|
|
@mutex = Mutex.new
|
|
def mutex; @mutex; end
|
|
freeze
|
|
}
|
|
|
|
TkCore::INTERP.init_ip_env{
|
|
SliceID_TBL.mutex.synchronize{ SliceID_TBL.clear }
|
|
}
|
|
|
|
def self.id2obj(pie, id)
|
|
pie_path = pie.path
|
|
SliceID_TBL.mutex.synchronize{
|
|
if SliceID_TBL[pie_path]
|
|
SliceID_TBL[pie_path][id]? SliceID_TBL[pie_path][id]: id
|
|
else
|
|
id
|
|
end
|
|
}
|
|
end
|
|
|
|
def initialize(parent, *args)
|
|
unless parent.kind_of?(Tk::Vu::Pie)
|
|
fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
|
|
end
|
|
@parent = @pie = parent
|
|
@ppath = parent.path
|
|
Pie_Slice_ID.mutex.synchronize{
|
|
@path = @id = Pie_Slice_ID.join(TkCore::INTERP._ip_id_)
|
|
Pie_Slice_ID[1].succ!
|
|
}
|
|
SliceID_TBL.mutex.synchronize{
|
|
SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
|
|
SliceID_TBL[@ppath][@id] = self
|
|
}
|
|
|
|
if args[-1].kind_of?(Hash)
|
|
keys = args.unshift
|
|
end
|
|
@pie.set(@id, *args)
|
|
configure(keys)
|
|
end
|
|
|
|
def id
|
|
@id
|
|
end
|
|
|
|
def [](key)
|
|
cget key
|
|
end
|
|
|
|
def []=(key,val)
|
|
configure key, val
|
|
val
|
|
end
|
|
|
|
def cget(slot)
|
|
@pie.itemcget(@id, slot)
|
|
end
|
|
|
|
def cget_strict(slot)
|
|
@pie.itemcget_strict(@id, slot)
|
|
end
|
|
|
|
def configure(*args)
|
|
@pie.itemconfigure(@id, *args)
|
|
self
|
|
end
|
|
|
|
def configinfo(*args)
|
|
@pie.itemconfiginfo(@id, *args)
|
|
end
|
|
|
|
def current_configinfo(*args)
|
|
@pie.current_itemconfiginfo(@id, *args)
|
|
end
|
|
|
|
def delete
|
|
@pie.delete(@id)
|
|
end
|
|
|
|
def explode(value)
|
|
@pie.explode(@id, value)
|
|
self
|
|
end
|
|
|
|
def explode_value
|
|
@pie.explode_value(@id)
|
|
end
|
|
|
|
def lower(other=None)
|
|
@pie.lower(@id, other)
|
|
self
|
|
end
|
|
|
|
def raise(other=None)
|
|
@pie.raise(@id, other)
|
|
self
|
|
end
|
|
|
|
def set(value)
|
|
@pie.set(@id, value)
|
|
self
|
|
end
|
|
alias set_value set
|
|
|
|
def value
|
|
@pie.set(@id)
|
|
end
|
|
end
|
|
|
|
class Tk::Vu::NamedPieSlice
|
|
def self.new(parent, name, *args)
|
|
obj = nil
|
|
SliceID_TBL.mutex.synchronize{
|
|
if SliceID_TBL[parent.path] && SliceID_TBL[parent.path][name]
|
|
obj = SliceID_TBL[parent.path][name]
|
|
else
|
|
#super(parent, name, *args)
|
|
unless parent.kind_of?(Tk::Vu::Pie)
|
|
fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
|
|
end
|
|
obj = self.allocate
|
|
obj.instance_eval{
|
|
@parent = @pie = parent
|
|
@ppath = parent.path
|
|
@path = @id = name.to_s
|
|
SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
|
|
SliceID_TBL[@ppath][@id] = self
|
|
}
|
|
end
|
|
}
|
|
obj.instance_eval{
|
|
if args[-1].kind_of?(Hash)
|
|
keys = args.unshift
|
|
end
|
|
@pie.set(@id, *args)
|
|
configure(keys)
|
|
}
|
|
|
|
obj
|
|
end
|
|
|
|
def initialize(parent, name, *args)
|
|
# dummy:: not called by 'new' method
|
|
unless parent.kind_of?(Tk::Vu::Pie)
|
|
fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
|
|
end
|
|
@parent = @pie = parent
|
|
@ppath = parent.path
|
|
@path = @id = name.to_s
|
|
SliceID_TBL.mutex.synchronize{
|
|
SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
|
|
SliceID_TBL[@ppath][@id] = self
|
|
}
|
|
|
|
if args[-1].kind_of?(Hash)
|
|
keys = args.unshift
|
|
end
|
|
@pie.set(@id, *args)
|
|
configure(keys)
|
|
end
|
|
end
|