mirror of
https://github.com/ruby/ruby.git
synced 2025-08-24 21:44:30 +02:00
* tkfont.rb: Fix bugs on TkFont.init_widget_font for Tk8.x.
* tkafter.rb: Add self to 1st argument of interval- and loop-proc
TkAfter#current_interval returns an interval (sleep) time value
TkAfter#current_args returns an array of arguments
TkAfter#return_value returns a return value of last loop-proc
e.g.
TkAfter.new(
proc{|obj| 500 - obj.current_interval}, 10,
[proc{|obj| p obj.current_args}, 'proc', 1],
proc{|obj| p obj.current_args; ['return', 2]},
[proc{|obj|
p obj.return_value
p ['proc', obj.current_args[0].call(obj.return_value[1],
obj.current_args[1])]},
proc{|*args| args[0] + args[1]}, 1],
proc{p ['proc', 4]} ).start(100)
* tk*.rb: Allow to use Symbols for parameters.
Allow new notation of constructor (also allow old notation).
e.g.
TkFrame.new('classname'=>'User'){|base|
pack
f = TkFrame.new(base, :classname=>'ButtonFrame').pack
TkButton.new(
:parent => f,
:text => 'Quit',
:command => proc{exit}
).pack(
:fill => :x,
:pady => 2
)
}
* tkcanvas.rb: (TkcItem) Add 'coords' parameter to the canvas item
constructor (for new notation of constructor).
e.g.
c = TkCanvas.new.pack
l = TkcLine.new(c, :coords=>[[0,0], [100,100]])
* tcltklib.c: New 'mainloop' and 'mainloop_watchdog'.
The priority of their event-loop can be controlled.
They accept an optional argument.
If it false, they don't exit although the root widget is destroyed.
This function is sometimes useful, if it is used with 'restart'.
'mainloop' can't treat Thread#join/value in a callback routine.
(e.g. TkButton.new(:command=>proc{p Thread.new{button.invoke}.value}) )
'mainloop_watchdog' can treat them, but watchdog thread is always running
(so, a little heavier than 'mainloop').
If the purpose of using Thread#join/value is to do something under some
safe-level, please use Proc object.
(e.g. :command=>proc{$SAFE=1;proc{$SAFE=2;button.invoke}.call;p $SAFE})
* tk.rb: Support functions of new 'mainloop' and 'mainloop_watchdog'.
* tk.rb: (Tk.restart) Add 'app-name' paramater and 'use' parameter.
'app-name' specifies the name and the resource class of the
application. If 'app-name' is specified to 'xxx', the application
class on the resource database is set to 'Xxx' and the application
name is changed by the same rule of Tk.appname method. 'use'
specifies the main window for embedding the root widget instead of
generating a new window.
* tk.rb: Add new parameter 'widgetname' to the widget constructor to
support effective use of Resource Database. For example, the
resource 'Xxx*quit.text: QUIT' can set the text of the button
generated by the following code.
e.g.
Tk.restart('Xxx')
TkButton.new(nil, 'widgetname'=>'quit', 'command'=>proc{exit}).pack
Tk.mainloop
* tk.rb: TkOption::get always returns a tainted string.
Add TkOption::new_proc_class.
It generates a class to import procedures defined on the resource
database. For example, there is a following resource file.
----< resource-test >------------
*CMD.foo: {|*args| p [$SAFE, :foo, args]}
*CMD.XXX.bar: {|*args| p [$SAFE, :bar, args]}
*Button.command: ruby {p self; p $SAFE; TkOption::CMD::XXX.bar(1,2,3)}
---------------------------------
The following code is a sample of use of the resource file.
e.g.
require 'tk'
TkOption.readfile 'resource-test'
p TkOption.new_proc_class(:CMD, [:foo], 1)
p TkOption.new_proc_class(:XXX, [:bar], 2, false, TkOption::CMD)
TkButton.new(:text=>'test').pack
Tk.mainloop
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai
parent
dc010ff515
commit
4cb164ee2a
10 changed files with 722 additions and 172 deletions
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
#
|
||||
# tkcanvas.rb - Tk canvas classes
|
||||
# $Date$
|
||||
# by Yukihiro Matsumoto <matz@caelum.co.jp>
|
||||
|
|
@ -180,7 +180,7 @@ class TkCanvas<TkWindow
|
|||
end
|
||||
|
||||
def itemcget(tagOrId, option)
|
||||
case option
|
||||
case option.to_s
|
||||
when 'dash', 'activedash', 'disableddash'
|
||||
conf = tk_send('itemcget', tagid(tagOrId), "-#{option}")
|
||||
if conf =~ /^[0-9]/
|
||||
|
|
@ -197,6 +197,7 @@ class TkCanvas<TkWindow
|
|||
|
||||
def itemconfigure(tagOrId, key, value=None)
|
||||
if key.kind_of? Hash
|
||||
key = _symbolkey2str(key)
|
||||
if ( key['font'] || key['kanjifont'] \
|
||||
|| key['latinfont'] || key['asciifont'] )
|
||||
tagfont_configure(tagOrId, key.dup)
|
||||
|
|
@ -205,8 +206,10 @@ class TkCanvas<TkWindow
|
|||
end
|
||||
|
||||
else
|
||||
if ( key == 'font' || key == 'kanjifont' \
|
||||
|| key == 'latinfont' || key == 'asciifont' )
|
||||
if ( key == 'font' || key == :font ||
|
||||
key == 'kanjifont' || key == :kanjifont ||
|
||||
key == 'latinfont' || key == :latinfont ||
|
||||
key == 'asciifont' || key == :asciifont )
|
||||
tagfont_configure(tagid(tagOrId), {key=>value})
|
||||
else
|
||||
tk_send 'itemconfigure', tagid(tagOrId), "-#{key}", value
|
||||
|
|
@ -226,7 +229,7 @@ class TkCanvas<TkWindow
|
|||
|
||||
def itemconfiginfo(tagOrId, key=nil)
|
||||
if key
|
||||
case key
|
||||
case key.to_s
|
||||
when 'dash', 'activedash', 'disableddash'
|
||||
conf = tk_split_simplelist(tk_send 'itemconfigure',
|
||||
tagid(tagOrId), "-#{key}")
|
||||
|
|
@ -433,7 +436,7 @@ module TkcTagAccess
|
|||
@c.itemtype @id
|
||||
end
|
||||
|
||||
# Followings operators supports logical expressions of canvas tags
|
||||
# Following operators support logical expressions of canvas tags
|
||||
# (for Tk8.3+).
|
||||
# If tag1.path is 't1' and tag2.path is 't2', then
|
||||
# ltag = tag1 & tag2; ltag.path => "(t1)&&(t2)"
|
||||
|
|
@ -473,6 +476,7 @@ class TkcTag<TkObject
|
|||
include TkcTagAccess
|
||||
|
||||
CTagID_TBL = {}
|
||||
Tk_CanvasTag_ID = ['ctag0000']
|
||||
|
||||
def TkcTag.id2obj(canvas, id)
|
||||
cpath = canvas.path
|
||||
|
|
@ -480,7 +484,6 @@ class TkcTag<TkObject
|
|||
CTagID_TBL[cpath][id]? CTagID_TBL[cpath][id]: id
|
||||
end
|
||||
|
||||
Tk_CanvasTag_ID = ['ctag0000']
|
||||
def initialize(parent, mode=nil, *args)
|
||||
if not parent.kind_of?(TkCanvas)
|
||||
fail format("%s need to be TkCanvas", parent.inspect)
|
||||
|
|
@ -501,7 +504,7 @@ class TkcTag<TkObject
|
|||
|
||||
def delete
|
||||
@c.delete @id
|
||||
CTagID_TBL[@path][@id] = nil if CTagID_TBL[@path]
|
||||
CTagID_TBL[@cpath][@id] = nil if CTagID_TBL[@cpath]
|
||||
end
|
||||
alias remove delete
|
||||
alias destroy delete
|
||||
|
|
@ -565,6 +568,7 @@ class TkcTagString<TkcTag
|
|||
end
|
||||
end
|
||||
end
|
||||
TkcNamedTag = TkcTagString
|
||||
|
||||
class TkcTagAll<TkcTag
|
||||
def initialize(parent)
|
||||
|
|
@ -643,9 +647,16 @@ class TkcItem<TkObject
|
|||
@parent = @c = parent
|
||||
@path = parent.path
|
||||
fontkeys = {}
|
||||
if args.size == 1 && args[0].kind_of?(Hash)
|
||||
args[0] = _symbolkey2str(args[0])
|
||||
coords = args[0].delete('coords')
|
||||
if not coords.kind_of?(Array)
|
||||
fail "coords parameter must be given by an Array"
|
||||
end
|
||||
args[0,0] = coords.flatten
|
||||
end
|
||||
if args[-1].kind_of? Hash
|
||||
args = args.dup
|
||||
keys = args.pop
|
||||
keys = _symbolkey2str(args.pop)
|
||||
['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
|
||||
fontkeys[key] = keys.delete(key) if keys.key?(key)
|
||||
}
|
||||
|
|
@ -797,7 +808,7 @@ class TkPhotoImage<TkImage
|
|||
end
|
||||
|
||||
def cget(option)
|
||||
case option
|
||||
case option.to_s
|
||||
when 'data', 'file'
|
||||
tk_send 'cget', option
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue