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
278 lines
5.4 KiB
Ruby
278 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 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
|