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
268 lines
6.6 KiB
Ruby
268 lines
6.6 KiB
Ruby
#
|
|
# tkextlib/blt/dragdrop.rb
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
|
|
require 'tk'
|
|
require 'tk/itemconfig'
|
|
require 'tkextlib/blt.rb'
|
|
|
|
module Tk::BLT
|
|
module DragDrop
|
|
extend TkCore
|
|
|
|
TkCommandNames = ['::blt::drag&drop'.freeze].freeze
|
|
|
|
class Token < TkWindow
|
|
WidgetClassName = 'DragDropToken'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
def initialize(arg)
|
|
if arg.kind_of?(Hash) # arg is a hash includes the widgetpath of token
|
|
arg = _symbolkey2str(arg)
|
|
install_win(nil, arg['widgetname'])
|
|
else # arg is a drag&drop source
|
|
tk_call('::blt::drag&drop', 'source', arg)
|
|
install_win(nil, tk_call('::blt::drag&drop', 'token', arg))
|
|
end
|
|
end
|
|
end
|
|
|
|
###################################
|
|
|
|
extend TkItemConfigMethod
|
|
extend Tk::ValidateConfigure
|
|
|
|
class << self
|
|
def __item_config_cmd(id) # id := ['source'|'target', win]
|
|
['::blt::drag&drop', id[0], id[1]]
|
|
end
|
|
private :__item_config_cmd
|
|
|
|
def __item_boolval_optkeys(id)
|
|
super(id) << 'selftarget'
|
|
end
|
|
private :__item_boolval_optkeys
|
|
|
|
def __item_listval_optkeys(id)
|
|
super(id) << 'send'
|
|
end
|
|
private :__item_listval_optkeys
|
|
|
|
def __item_strval_optkeys(id)
|
|
super(id) << 'rejectbg' << 'rejectfg' << 'tokenbg'
|
|
end
|
|
private :__item_strval_optkeys
|
|
|
|
undef itemcget
|
|
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
|
|
|
|
def source_configure(win, slot, value=None)
|
|
itemconfigure(['source', win], slot, value)
|
|
end
|
|
def source_configinfo(win, slot=nil)
|
|
itemconfiginfo(['source', win], slot)
|
|
end
|
|
def current_source_configinfo(win, slot=nil)
|
|
current_itemconfiginfo(['source', win], slot)
|
|
end
|
|
end
|
|
|
|
class PackageCommand < TkValidateCommand
|
|
class ValidateArgs < TkUtil::CallbackSubst
|
|
KEY_TBL = [
|
|
[ ?t, ?w, :token ],
|
|
[ ?W, ?w, :widget ],
|
|
nil
|
|
]
|
|
|
|
PROC_TBL = [
|
|
[ ?w, TkComm.method(:window) ],
|
|
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
|
|
['packagecmd']
|
|
end
|
|
end
|
|
|
|
class SiteCommand < TkValidateCommand
|
|
class ValidateArgs < TkUtil::CallbackSubst
|
|
KEY_TBL = [
|
|
[ ?s, ?b, :compatible ],
|
|
[ ?t, ?w, :token ],
|
|
nil
|
|
]
|
|
|
|
PROC_TBL = [
|
|
[ ?b, TkComm.method(:bool) ],
|
|
[ ?w, TkComm.method(:window) ],
|
|
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
|
|
['sitecmd']
|
|
end
|
|
end
|
|
|
|
def self.__validation_class_list
|
|
super() << PackageCommand << SiteCommand
|
|
end
|
|
|
|
class << self
|
|
Tk::ValidateConfigure.__def_validcmd(binding, PackageCommand)
|
|
Tk::ValidateConfigure.__def_validcmd(binding, SiteCommand)
|
|
end
|
|
|
|
###################################
|
|
|
|
class DnD_Handle < TkUtil::CallbackSubst
|
|
KEY_TBL = [
|
|
[ ?i, ?s, :ip_name ],
|
|
[ ?v, ?v, :value ],
|
|
[ ?W, ?w, :widget ],
|
|
nil
|
|
]
|
|
|
|
PROC_TBL = [
|
|
[ ?i, TkComm.method(:string) ],
|
|
[ ?v, TkComm.method(:tk_tcl2ruby) ],
|
|
[ ?w, TkComm.method(:window) ],
|
|
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)
|
|
end
|
|
|
|
def self.source_handler(win, datatype, cmd=Proc.new, *args)
|
|
_bind_for_event_class(DnD_Handle,
|
|
['::blt::drag&drop', 'source', win, 'handler'],
|
|
cmd, *args)
|
|
end
|
|
|
|
def self.target_handler(win, datatype, cmd=Proc.new, *args)
|
|
_bind_for_event_class(DnD_Handle,
|
|
['::blt::drag&drop', 'target', win, 'handler'],
|
|
cmd, *args)
|
|
end
|
|
|
|
###################################
|
|
|
|
def self.init_source(win)
|
|
tk_call('::blt::drag&drop', 'source', win)
|
|
end
|
|
|
|
def self.source()
|
|
list(tk_call('::blt::drag&drop', 'source'))
|
|
end
|
|
|
|
def self.source_handler_list(win)
|
|
simplelist(tk_call('::blt::drag&drop', 'source', win, 'handler'))
|
|
end
|
|
def self.source_handler_info(win, type)
|
|
tk_tcl2ruby(tk_call('::blt::drag&drop', 'source', win, 'handler', type))
|
|
end
|
|
|
|
def self.target
|
|
list(tk_call('::blt::drag&drop', 'target'))
|
|
end
|
|
def self.target_handler_list(win)
|
|
simplelist(tk_call('::blt::drag&drop', 'target', win, 'handler'))
|
|
end
|
|
|
|
def self.handle_target(win, type, val=None)
|
|
tk_call('::blt::drag&drop', 'target', win, 'handle', type, val)
|
|
end
|
|
|
|
def self.token(win)
|
|
window(tk_call('::blt::drag&drop', 'token', win))
|
|
end
|
|
|
|
def self.drag(win, x, y)
|
|
tk_call('::blt::drag&drop', 'drag', win, x, y)
|
|
end
|
|
def self.drop(win, x, y)
|
|
tk_call('::blt::drag&drop', 'drop', win, x, y)
|
|
end
|
|
|
|
def self.errors(cmd=Proc.new)
|
|
tk_call('::blt::drag&drop', 'errors', cmd)
|
|
end
|
|
|
|
def self.active
|
|
bool(tk_call('::blt::drag&drop', 'active'))
|
|
end
|
|
|
|
def self.location(x=None, y=None)
|
|
list(tk_call('::blt::drag&drop', 'location', x, y))
|
|
end
|
|
end
|
|
end
|