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
120 lines
3.3 KiB
Ruby
120 lines
3.3 KiB
Ruby
# -*- coding: euc-jp -*-
|
|
#
|
|
# animated wave demo (called by 'widget')
|
|
#
|
|
# based on Tcl/Tk8.5a2 widget demos
|
|
|
|
# destroy toplevel widget for this demo script
|
|
if defined?($aniwave_demo) && $aniwave_demo
|
|
$aniwave_demo.destroy
|
|
$aniwave_demo = nil
|
|
end
|
|
|
|
# create toplevel widget
|
|
$aniwave_demo = TkToplevel.new {|w|
|
|
title("Animated Wave Demonstration")
|
|
iconname("aniwave")
|
|
positionWindow(w)
|
|
}
|
|
|
|
base_frame = TkFrame.new($aniwave_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
# create label
|
|
msg = TkLabel.new(base_frame) {
|
|
font $font
|
|
wraplength '4i'
|
|
justify 'left'
|
|
text 'このデモでは、ラインアイテムが一つだけ描かれたキャンバスウィジェットが表示されています。アニメーション処理は、そのラインアイテムの座標値を変更することで実現しています。'
|
|
}
|
|
msg.pack('side'=>'top')
|
|
|
|
# create frame
|
|
TkFrame.new(base_frame) {|frame|
|
|
TkButton.new(frame) {
|
|
#text '了解'
|
|
text '閉じる'
|
|
command proc{
|
|
tmppath = $aniwave_demo
|
|
$aniwave_demo = nil
|
|
tmppath.destroy
|
|
}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
TkButton.new(frame) {
|
|
text 'コード参照'
|
|
command proc{showCode 'aniwave'}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
|
|
|
|
# animated wave
|
|
class AnimatedWaveDemo
|
|
def initialize(frame, dir=:left)
|
|
@direction = dir
|
|
|
|
# create canvas widget
|
|
@c = TkCanvas.new(frame, :width=>300, :height=>200,
|
|
:background=>'black')
|
|
@c.pack(:padx=>10, :pady=>10, :expand=>true)
|
|
|
|
# Creates a coordinates list of a wave.
|
|
@waveCoords = []
|
|
@backupCoords = []
|
|
n = 0
|
|
(-10..300).step(5){|n| @waveCoords << [n, 100]; @backupCoords << [n, 100] }
|
|
n = 305
|
|
@waveCoords << [n, 0]; @backupCoords << [n, 0]
|
|
@waveCoords << [n+5, 200]; @backupCoords << [n+5, 200]
|
|
@coordsLen = @waveCoords.length
|
|
|
|
# Create a smoothed line and arrange for its coordinates to be the
|
|
# contents of the variable waveCoords.
|
|
@line = TkcLine.new(@c, @waveCoords,
|
|
:width=>1, :fill=>'green', :smooth=>true)
|
|
|
|
# Main animation "loop".
|
|
# Theoretically 100 frames-per-second (==10ms between frames)
|
|
@timer = TkTimer.new(10){ basicMotion; reverser }
|
|
|
|
# Arrange for the animation loop to stop when the canvas is deleted
|
|
@c.bindtags_unshift(TkBindTag.new('Destroy'){ @timer.stop })
|
|
end
|
|
|
|
# Basic motion handler. Given what direction the wave is travelling
|
|
# in, it advances the y coordinates in the coordinate-list one step in
|
|
# that direction.
|
|
def basicMotion
|
|
@backupCoords, @waveCoords = @waveCoords, @backupCoords
|
|
(0...@coordsLen).each{|idx|
|
|
if @direction == :left
|
|
@waveCoords[idx][1] = @backupCoords[(idx+1 == @coordsLen)? 0: idx+1][1]
|
|
else
|
|
@waveCoords[idx][1] = @backupCoords[(idx == 0)? -1: idx-1][1]
|
|
end
|
|
}
|
|
@line.coords(@waveCoords)
|
|
end
|
|
|
|
# Oscillation handler. This detects whether to reverse the direction
|
|
# of the wave by checking to see if the peak of the wave has moved off
|
|
# the screen (whose size we know already.)
|
|
def reverser
|
|
if @waveCoords[0][1] < 10
|
|
@direction = :right
|
|
elsif @waveCoords[-1][1] < 10
|
|
@direction = :left
|
|
end
|
|
end
|
|
|
|
# animation control
|
|
def move
|
|
@timer.start
|
|
end
|
|
|
|
def stop
|
|
@timer.stop
|
|
end
|
|
end
|
|
|
|
# Start the animation processing
|
|
AnimatedWaveDemo.new(base_frame, :left).move
|