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
220 lines
7.5 KiB
Ruby
220 lines
7.5 KiB
Ruby
# entry3.rb --
|
|
#
|
|
# This demonstration script creates several entry widgets whose
|
|
# permitted input is constrained in some way. It also shows off a
|
|
# password entry.
|
|
#
|
|
# based on Tcl/Tk8.4.4 widget demos
|
|
|
|
if defined?($entry3_demo) && $entry3_demo
|
|
$entry3_demo.destroy
|
|
$entry3_demo = nil
|
|
end
|
|
|
|
$entry3_demo = TkToplevel.new {|w|
|
|
title("Constrained Entry Demonstration")
|
|
iconname("entry3")
|
|
positionWindow(w)
|
|
}
|
|
|
|
base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
TkLabel.new(base_frame,
|
|
:font=>$font, :wraplength=>'5i', :justify=>:left,
|
|
:text=><<EOL).pack(:side=>:top)
|
|
Four different entries are displayed below. You can add characters \
|
|
by pointing, clicking and typing, though each is constrained in what \
|
|
it will accept. The first only accepts integers or the empty string \
|
|
(checking when focus leaves it) and will flash to indicate any \
|
|
problem. The second only accepts strings with fewer than ten \
|
|
characters and sounds the bell when an attempt to go over the limit \
|
|
is made. The third accepts US phone numbers, mapping letters to \
|
|
their digit equivalent and sounding the bell on encountering an \
|
|
invalid character or if trying to type over a character that is not \
|
|
a digit. The fourth is a password field that accepts up to eight \
|
|
characters (silently ignoring further ones), and displaying them as \
|
|
asterisk characters.
|
|
EOL
|
|
|
|
TkFrame.new(base_frame){|f|
|
|
pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
|
|
|
|
TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
|
|
$entry3_demo.destroy
|
|
$entry3_demo = nil
|
|
}).pack(:side=>:left, :expand=>true)
|
|
|
|
TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
|
|
showCode 'entry3'
|
|
}).pack(:side=>:left, :expand=>true)
|
|
}
|
|
|
|
# focusAndFlash --
|
|
# Error handler for entry widgets that forces the focus onto the
|
|
# widget and makes the widget flash by exchanging the foreground and
|
|
# background colours at intervals of 200ms (i.e. at approximately
|
|
# 2.5Hz).
|
|
#
|
|
# Arguments:
|
|
# widget - entry widget to flash
|
|
# fg - Initial foreground colour
|
|
# bg - Initial background colour
|
|
# count - Counter to control the number of times flashed
|
|
def focusAndFlash(widget, fg, bg, count=5)
|
|
return if count <= 0
|
|
if fg && !fg.empty? && bg && !bg.empty?
|
|
TkTimer.new(200, count,
|
|
proc{widget.configure(:foreground=>bg, :background=>fg)},
|
|
proc{widget.configure(:foreground=>fg, :background=>bg)}
|
|
).start
|
|
else
|
|
# TkTimer.new(150, 3){Tk.bell}.start
|
|
Tk.bell
|
|
TkTimer.new(200, count,
|
|
proc{widget.configure(:foreground=>'white',
|
|
:background=>'black')},
|
|
proc{widget.configure(:foreground=>'black',
|
|
:background=>'white')}
|
|
).at_end{begin
|
|
widget.configure(:foreground=>fg,
|
|
:background=>bg)
|
|
rescue
|
|
# ignore
|
|
end}.start
|
|
end
|
|
widget.focus(true)
|
|
end
|
|
|
|
l1 = TkLabelFrame.new(base_frame, :text=>"Integer Entry")
|
|
TkEntry.new(l1, :validate=>:focus,
|
|
:vcmd=>[
|
|
proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
|
|
]) {|e|
|
|
fg = e.foreground
|
|
bg = e.background
|
|
invalidcommand [proc{|w| focusAndFlash(w, fg, bg)}, '%W']
|
|
pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
|
|
}
|
|
|
|
l2 = TkLabelFrame.new(base_frame, :text=>"Length-Constrained Entry")
|
|
TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
|
|
:vcmd=>[proc{|s| s.length < 10}, '%P']
|
|
).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
|
|
|
|
### PHONE NUMBER ENTRY ###
|
|
# Note that the source to this is quite a bit longer as the behaviour
|
|
# demonstrated is a lot more ambitious than with the others.
|
|
|
|
# Initial content for the third entry widget
|
|
entry3content = TkVariable.new("1-(000)-000-0000")
|
|
|
|
# Mapping from alphabetic characters to numbers.
|
|
$phoneNumberMap = {}
|
|
Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
|
|
chars.split('').each{|c|
|
|
$phoneNumberMap[c] = n
|
|
$phoneNumberMap[c.upcase] = n
|
|
}
|
|
}
|
|
|
|
# phoneSkipLeft --
|
|
# Skip over fixed characters in a phone-number string when moving left.
|
|
#
|
|
# Arguments:
|
|
# widget - The entry widget containing the phone-number.
|
|
def phoneSkipLeft(widget)
|
|
idx = widget.index('insert')
|
|
if idx == 8
|
|
# Skip back two extra characters
|
|
widget.cursor = idx - 2
|
|
elsif idx == 7 || idx == 12
|
|
# Skip back one extra character
|
|
widget.cursor = idx - 1
|
|
elsif idx <= 3
|
|
# Can't move any further
|
|
Tk.bell
|
|
Tk.callback_break
|
|
end
|
|
end
|
|
|
|
# phoneSkipRight --
|
|
# Skip over fixed characters in a phone-number string when moving right.
|
|
#
|
|
# Arguments:
|
|
# widget - The entry widget containing the phone-number.
|
|
# add - Offset to add to index before calculation (used by validation.)
|
|
def phoneSkipRight(widget, add = 0)
|
|
idx = widget.index('insert')
|
|
if (idx + add == 5)
|
|
# Skip forward two extra characters
|
|
widget.cursor = idx + 2
|
|
elsif (idx + add == 6 || idx + add == 10)
|
|
# Skip forward one extra character
|
|
widget.cursor = idx + 1
|
|
elsif (idx + add == 15 && add == 0)
|
|
# Can't move any further
|
|
Tk.bell
|
|
Tk.callback_break
|
|
end
|
|
end
|
|
|
|
# validatePhoneChange --
|
|
# Checks that the replacement (mapped to a digit) of the given
|
|
# character in an entry widget at the given position will leave a
|
|
# valid phone number in the widget.
|
|
#
|
|
# widget - entry widget to validate
|
|
# vmode - The widget's validation mode
|
|
# idx - The index where replacement is to occur
|
|
# char - The character (or string, though that will always be
|
|
# refused) to be overwritten at that point.
|
|
|
|
def validatePhoneChange(widget, vmode, idx, char)
|
|
return true if idx == nil
|
|
Tk.after_idle(proc{widget.configure(:validate=>vmode,
|
|
:invcmd=>proc{Tk.bell})})
|
|
if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
|
|
widget.delete(idx)
|
|
widget.insert(idx, $phoneNumberMap[char] || char)
|
|
Tk.after_idle(proc{phoneSkipRight(widget, -1)})
|
|
return true
|
|
# Tk.update(true) # <- Don't work 'update' inter validation callback.
|
|
# It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1).
|
|
end
|
|
return false
|
|
end
|
|
|
|
|
|
l3 = TkLabelFrame.new(base_frame, :text=>"US Phone-Number Entry")
|
|
TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
|
|
:textvariable=>entry3content,
|
|
:vcmd=>[
|
|
proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
|
|
"%W %v %i %S"
|
|
]){|e|
|
|
# Click to focus goes to the first editable character...
|
|
bind('FocusIn', proc{|d,w|
|
|
if d != "NotifyAncestor"
|
|
w.cursor = 3
|
|
Tk.after_idle(proc{w.selection_clear})
|
|
end
|
|
}, '%d %W')
|
|
bind('Left', proc{|w| phoneSkipLeft(w)}, '%W')
|
|
bind('Right', proc{|w| phoneSkipRight(w)}, '%W')
|
|
pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
|
|
}
|
|
|
|
l4 = TkLabelFrame.new(base_frame, :text=>"Password Entry")
|
|
TkEntry.new(l4, :validate=>:key, :show=>'*',
|
|
:vcmd=>[
|
|
proc{|s| s.length <= 8},
|
|
'%P'
|
|
]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
|
|
|
|
TkFrame.new(base_frame){|f|
|
|
lower
|
|
TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
|
|
TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
|
|
TkGrid.columnconfigure(f, [0,1], :uniform=>1)
|
|
pack(:fill=>:both, :expand=>true)
|
|
}
|