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
125 lines
2.7 KiB
Ruby
125 lines
2.7 KiB
Ruby
#
|
|
# tkextlib/tkDND/shape.rb
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
|
|
require 'tk'
|
|
|
|
# call setup script for general 'tkextlib' libraries
|
|
require 'tkextlib/setup.rb'
|
|
|
|
# call setup script
|
|
require 'tkextlib/tkDND/setup.rb'
|
|
|
|
# TkPackage.require('Shape', '0.3')
|
|
TkPackage.require('Shape')
|
|
|
|
module Tk
|
|
module TkDND
|
|
module Shape
|
|
extend TkCore
|
|
|
|
PACKAGE_NAME = 'Shape'.freeze
|
|
def self.package_name
|
|
PACKAGE_NAME
|
|
end
|
|
|
|
=begin
|
|
def self.package_version
|
|
begin
|
|
TkPackage.require('Shape')
|
|
rescue
|
|
''
|
|
end
|
|
end
|
|
=end
|
|
class << self
|
|
def package_version
|
|
Tk.tk_call('set', 'shape_version')
|
|
end
|
|
alias shape_version package_version
|
|
|
|
def package_patchlevel
|
|
Tk.tk_call('set', 'shape_patchLevel')
|
|
end
|
|
alias shape_patchlevel package_patchlevel
|
|
|
|
def version
|
|
tk_call('shape', 'version')
|
|
end
|
|
alias xshape_version version
|
|
end
|
|
|
|
############################
|
|
|
|
def shape_bounds(kind=nil)
|
|
if kind
|
|
ret = tk_call('shape', 'bounds', @path, "-#{kind}")
|
|
else
|
|
ret = tk_call('shape', 'bounds', @path)
|
|
end
|
|
if ret == ""
|
|
nil
|
|
else
|
|
list(ret)
|
|
end
|
|
end
|
|
|
|
def shape_get(kind=nil)
|
|
if kind
|
|
list(tk_call('shape', 'get', @path, "-#{kind}"))
|
|
else
|
|
list(tk_call('shape', 'get', @path))
|
|
end
|
|
end
|
|
|
|
def shape_offset(x, y, kind=nil)
|
|
if kind
|
|
tk_call('shape', 'get', @path, "-#{kind}", x, y)
|
|
else
|
|
tk_call('shape', 'get', @path, x, y)
|
|
end
|
|
self
|
|
end
|
|
|
|
def _parse_shapespec_param(args)
|
|
cmd = []
|
|
|
|
kind_keys = ['bounding', 'clip', 'both']
|
|
offset_keys = ['offset']
|
|
srckind_keys = ['bitmap', 'rectangles', 'reset', 'test', 'window']
|
|
|
|
cmd << "-#{args.shift}" if kind_keys.member?(args[0].to_s)
|
|
|
|
if offset_keys.member?(args[0].to_s)
|
|
cmd << "-#{args.shift}"
|
|
cmd << args.shift # xOffset
|
|
cmd << args.shift # yOffset
|
|
end
|
|
|
|
if srckind_keys.member?(args[0].to_s)
|
|
cmd << "-#{args.shift}"
|
|
end
|
|
|
|
cmd.concat(args)
|
|
|
|
cmd
|
|
end
|
|
private :_parse_shapespec_param
|
|
|
|
def shape_set(*args) # ?kind? ?offset <x> <y>? srckind ?arg ...?
|
|
tk_call('shape', 'set', @path, *(_parse_shapespec_param(args)))
|
|
self
|
|
end
|
|
|
|
def shape_update(op, *args) # ?kind? ?offset <x> <y>? srckind ?arg ...?
|
|
tk_call('shape', 'update', @path, op, *(_parse_shapespec_param(args)))
|
|
self
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
class TkWindow
|
|
include Tk::TkDND::Shape
|
|
end
|