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
204 lines
6.5 KiB
Ruby
204 lines
6.5 KiB
Ruby
# -*- coding: euc-jp -*-
|
|
#
|
|
# Canvas Text widget demo (called by 'widget')
|
|
#
|
|
|
|
# toplevel widget が存在すれば削除する
|
|
if defined?($ctext_demo) && $ctext_demo
|
|
$ctext_demo.destroy
|
|
$ctext_demo = nil
|
|
end
|
|
|
|
# demo 用の toplevel widget を生成
|
|
$ctext_demo = TkToplevel.new {|w|
|
|
title("Canvas Text Demonstration")
|
|
iconname("Text")
|
|
positionWindow(w)
|
|
}
|
|
|
|
base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
# label 生成
|
|
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
|
|
'text'=>"このウィンドウにはキャンバスwidgetのテキスト機能をデモするためのテキスト文字列が表示されています。マウスを四角の中に持っていき、クリックすると位置ぎめ用の点からの相対位置を変えたり、行揃えを変えたりすることができます。また以下のような編集のための簡単なバインディングをサポートしています。
|
|
|
|
1. マウスを持っていき、クリックし、入力できます。
|
|
2. ボタン1で選択できます。
|
|
3. マウスの位置にボタン2で選択したテキストをコピーできます。
|
|
4.バックスペースをコントロール-Hで挿入カーソルの直前の文字を削除します。
|
|
5. Deleteキーは挿入カーソルの直後の文字を削除します。"){
|
|
pack('side'=>'top')
|
|
}
|
|
|
|
# frame 生成
|
|
$ctext_buttons = TkFrame.new(base_frame) {|frame|
|
|
TkButton.new(frame) {
|
|
#text '了解'
|
|
text '閉じる'
|
|
command proc{
|
|
tmppath = $ctext_demo
|
|
$ctext_demo = nil
|
|
tmppath.destroy
|
|
}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
TkButton.new(frame) {
|
|
text 'コード参照'
|
|
command proc{showCode 'ctext'}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
}
|
|
$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
|
|
|
|
# canvas 生成
|
|
$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
|
|
'borderwidth'=>0, 'width'=>500, 'height'=>350)
|
|
$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
|
|
|
|
# font 設定
|
|
if $tk_version =~ /^4.*/
|
|
textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
|
|
else
|
|
textFont = 'Helvetica 24'
|
|
end
|
|
|
|
# canvas 設定
|
|
TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
|
|
'outline'=>'black', 'fill'=>'red')
|
|
|
|
ctag_text_param = {
|
|
'text'=>"これはキャンバスwidgetのテキスト機能をデモするための文字列です。\n上で述べたような編集を可能とするためのバインディングを施しています。",
|
|
'width'=>440, 'anchor'=>'n', 'justify'=>'left'
|
|
}
|
|
if $tk_version =~ /^4.*/
|
|
ctag_text_param['font'] = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
|
|
ctag_text_param['kanjifont'] = '-*-r-*--24-*-jisx0208.1983-0'
|
|
else
|
|
ctag_text_param['font'] = 'Helvetica 24'
|
|
end
|
|
$ctag_text = TkcTag.new($ctext_canvas)
|
|
$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
|
|
|
|
$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
|
|
$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
|
|
$ctag_text.bind('Shift-1',
|
|
proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"},
|
|
"%x %y")
|
|
$ctag_text.bind('Shift-B1-Motion',
|
|
proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
|
|
$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
|
|
$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
|
|
$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
|
|
$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
|
|
$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
|
|
$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
|
|
"%x %y")
|
|
|
|
# Next, create some items that allow the text's anchor position
|
|
# to be edited.
|
|
|
|
def mkTextConfig(w,x,y,option,value,color)
|
|
item = TkcRectangle.new(w, x, y, x+30, y+30,
|
|
'outline'=>'black', 'fill'=>color, 'width'=>1)
|
|
item.bind('1', proc{$ctag_text.configure option, value})
|
|
w.addtag_withtag('config', item)
|
|
end
|
|
|
|
x = 50
|
|
y = 50
|
|
color = 'LightSkyBlue1'
|
|
mkTextConfig $ctext_canvas, x, y, 'anchor', 'se', color
|
|
mkTextConfig $ctext_canvas, x+30, y, 'anchor', 's', color
|
|
mkTextConfig $ctext_canvas, x+60, y, 'anchor', 'sw', color
|
|
mkTextConfig $ctext_canvas, x, y+30, 'anchor', 'e', color
|
|
mkTextConfig $ctext_canvas, x+30, y+30, 'anchor', 'center', color
|
|
mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
|
|
mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
|
|
mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
|
|
mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
|
|
item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
|
|
'outline'=>'black', 'fill'=>'red')
|
|
item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
|
|
if $tk_version =~ /^4.*/
|
|
TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
|
|
'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
|
|
'anchor'=>'s', 'fill'=>'brown')
|
|
else
|
|
TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
|
|
'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
|
|
end
|
|
|
|
# Lastly, create some items that allow the text's justification to be
|
|
# changed.
|
|
|
|
x = 350
|
|
y = 50
|
|
color = 'SeaGreen2'
|
|
mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
|
|
mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
|
|
mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
|
|
if $tk_version =~ /^4.*/
|
|
TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
|
|
'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
|
|
'anchor'=>'s', 'fill'=>'brown')
|
|
else
|
|
TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
|
|
'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
|
|
end
|
|
|
|
$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
|
|
$ctext_canvas.itembind('config', 'Leave',
|
|
proc{$ctext_canvas\
|
|
.itemconfigure('current',
|
|
'fill'=>$textConfigFill)})
|
|
|
|
$textConfigFill = ''
|
|
|
|
def textEnter(w)
|
|
$textConfigFill = (w.itemconfiginfo 'current', 'fill')[4]
|
|
w.itemconfigure 'current', 'fill', 'black'
|
|
end
|
|
|
|
def textInsert(w, string)
|
|
return if string == ""
|
|
begin
|
|
$ctag_text.dchars 'sel.first', 'sel.last'
|
|
rescue
|
|
end
|
|
$ctag_text.insert 'insert', string
|
|
end
|
|
|
|
def textPaste(w, pos)
|
|
begin
|
|
$ctag_text.insert pos, TkSelection.get
|
|
rescue
|
|
end
|
|
end
|
|
|
|
def textB1Press(w,x,y)
|
|
w.icursor 'current', "@#{x},#{y}"
|
|
w.itemfocus 'current'
|
|
w.focus
|
|
w.select_from 'current', "@#{x},#{y}"
|
|
end
|
|
|
|
def textB1Move(w,x,y)
|
|
w.select_to 'current', "@#{x},#{y}"
|
|
end
|
|
|
|
def textBs(w)
|
|
begin
|
|
$ctag_text.dchars 'sel.first', 'sel.last'
|
|
rescue
|
|
char = $ctag_text.index('insert').to_i - 1
|
|
$ctag_text.dchars(char) if char >= 0
|
|
end
|
|
end
|
|
|
|
def textDel(w)
|
|
begin
|
|
$ctag_text.dchars 'sel.first', 'sel.last'
|
|
rescue
|
|
$ctag_text.dchars 'insert'
|
|
end
|
|
end
|
|
|