mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 08:33:58 +02:00
* ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5.
* ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets' instate/state/identify method to avoid the conflict with standard widget options. Those methods are renamed to ttk_instate/ttk_state/ ttk_identify (tile_instate/tile_state/tile_identify are available too). Although I don't recommend, if you realy need old methods, please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before "require 'tkextlib/tile'". * ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!" is obsolete. It outputs warning. To control default widget set, use "Tk.default_widget_set = :Ttk". * ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defind as module methods of TkConfigMethod. It may help users to wrap old Ruby/Tk scripts (use standard widgets) to force to use Ttk widgets. Ttk widgets don't have some options of standard widgets which are control the view of widgets. When set ignore-mode true, configure method tries to ignoure such unknown options with no exception. Of course, it may raise other troubles on the GUI design. So, those are a little danger methods. * ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defind as module methods of TkItemConfigMethod as the same purpose as TkConfigMethod's ones. * ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for wrapping old Ruby/Tk scripts (which use standard widgets) to use Ttk (Tile) widgets as default. * ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state method instead of instate/state method. * ext/tk/lib/tk/root, ext/tk/lib/tk/namespace.rb, ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's are replaced to "instance_exec(self)". * ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not a character code on Ruby1.9). * ext/tk/lib/tk/variable.rb: support new style of operation argument on Tcl/Tk's 'trace' command for variables. * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: bug fix * ext/tk/sammple/demos-jp/textpeer.rb, ext/tk/sammple/demos-en/textpeer.rb: new widget demo. * ext/tk/tcltklib.c: decrase SEGV troubles (probably) * ext/tk/lib/tk.rb: remove Thread.critical access if Ruby1.9 * ext/tk/lib/tk/multi-tk.rb: support Ruby1.9 (probably) * ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command to make Tcl/Tk theme sources (based on different version of Tile extension) available. (Tk::Tile::__define_LoadImages_proc_for_comaptibility__) * ext/tk/lib/tk.rb, ext/tk/lib/tk/wm.rb: support dockable frames (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets as toplevel widgets. * ext/tk/lib/tkextlib/tile/style.rb: ditto. (Tk::Tile::Style.__define_wrapper_proc_for_compatibility__) * ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get properties as a hash. metrics_hash method returns a boolean value for 'fixed' option. But metrics method returns numeric value (0 or 1) for 'fixed' option, because of backward compatibility. * ext/tk/lib/tk/timer.rb: somtimes fail to set callback procedure. * ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep doesn't block the eventloop. It will be better to use the method in event callbacks. * ext/tk/sample/tksleep_sample.rb: sample script about Tk.sleep. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai
parent
b62af05a98
commit
3024ffdc3a
121 changed files with 7879 additions and 2218 deletions
|
|
@ -114,7 +114,14 @@ MultiTkIp_OK.freeze
|
|||
class MultiTkIp
|
||||
BASE_DIR = File.dirname(__FILE__)
|
||||
|
||||
@@SLAVE_IP_ID = ['slave'.freeze, '0'.taint].freeze
|
||||
WITH_RUBY_VM = Object.const_defined?(:VM) && ::VM.class == Class
|
||||
WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
|
||||
|
||||
(@@SLAVE_IP_ID = ['slave'.freeze, '0'.taint]).instance_eval{
|
||||
@mutex = Mutex.new
|
||||
def mutex; @mutex; end
|
||||
freeze
|
||||
}
|
||||
|
||||
@@IP_TABLE = {}.taint unless defined?(@@IP_TABLE)
|
||||
|
||||
|
|
@ -126,7 +133,11 @@ class MultiTkIp
|
|||
unless defined?(@@TK_CMD_TBL)
|
||||
@@TK_CMD_TBL = Object.new.taint
|
||||
|
||||
@@TK_CMD_TBL.instance_variable_set('@tbl', {}.taint)
|
||||
# @@TK_CMD_TBL.instance_variable_set('@tbl', {}.taint)
|
||||
@@TK_CMD_TBL.instance_variable_set('@tbl', Hash.new{|hash,key|
|
||||
fail IndexError,
|
||||
"unknown command ID '#{key}'"
|
||||
}.taint)
|
||||
|
||||
class << @@TK_CMD_TBL
|
||||
allow = [
|
||||
|
|
@ -573,7 +584,11 @@ class MultiTkIp
|
|||
# raise exception
|
||||
begin
|
||||
bt = _toUTF8(e.backtrace.join("\n"))
|
||||
bt.instance_variable_set(:@encoding, 'utf-8')
|
||||
if MultiTkIp::WITH_ENCODING
|
||||
bt.force_encoding('utf-8')
|
||||
else
|
||||
bt.instance_variable_set(:@encoding, 'utf-8')
|
||||
end
|
||||
rescue Exception
|
||||
bt = e.backtrace.join("\n")
|
||||
end
|
||||
|
|
@ -695,7 +710,10 @@ class MultiTkIp
|
|||
|
||||
######################################
|
||||
|
||||
WITH_RUBY_VM = Object.const_defined?(:VM) && ::VM.class == Class
|
||||
unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
|
||||
### Ruby 1.9 !!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
RUN_EVENTLOOP_ON_MAIN_THREAD = false
|
||||
end
|
||||
|
||||
if self.const_defined? :DEFAULT_MASTER_NAME
|
||||
name = DEFAULT_MASTER_NAME.to_s
|
||||
|
|
@ -725,13 +743,24 @@ class MultiTkIp
|
|||
fail ArgumentError, "expecting a Hash object for the 2nd argument"
|
||||
end
|
||||
|
||||
unless WITH_RUBY_VM
|
||||
if !WITH_RUBY_VM || RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
|
||||
@interp = TclTkIp.new(name, _keys2opts(keys))
|
||||
else ### Ruby 1.9 !!!!!!!!!!!
|
||||
@interp_thread = Thread.new{
|
||||
Thread.current[:interp] = interp = TclTkIp.new(name, _keys2opts(keys))
|
||||
current = Thread.current
|
||||
current[:interp] = interp = TclTkIp.new(name, _keys2opts(keys))
|
||||
#sleep
|
||||
interp.mainloop(true)
|
||||
current[:mutex] = mutex = Mutex.new
|
||||
current[:root_check] = cond_var = ConditionVariable.new
|
||||
|
||||
begin
|
||||
current[:status] = interp.mainloop(true)
|
||||
rescue Exception=>e
|
||||
current[:status] = e
|
||||
ensure
|
||||
mutex.synchronize{ cond_var.broadcast }
|
||||
end
|
||||
current[:status] = interp.mainloop(false)
|
||||
}
|
||||
until @interp_thread[:interp]
|
||||
Thread.pass
|
||||
|
|
@ -976,9 +1005,11 @@ class MultiTkIp
|
|||
private :_parse_slaveopts
|
||||
|
||||
def _create_slave_ip_name
|
||||
name = @@SLAVE_IP_ID.join('')
|
||||
@@SLAVE_IP_ID[1].succ!
|
||||
name.freeze
|
||||
@@SLAVE_IP_ID.mutex.synchronize{
|
||||
name = @@SLAVE_IP_ID.join('')
|
||||
@@SLAVE_IP_ID[1].succ!
|
||||
name.freeze
|
||||
}
|
||||
end
|
||||
private :_create_slave_ip_name
|
||||
|
||||
|
|
@ -1309,11 +1340,11 @@ class MultiTkIp
|
|||
@@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
|
||||
|
||||
@@IP_TABLE[@threadgroup] = self
|
||||
_init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
|
||||
@@TK_TABLE_LIST.size.times{
|
||||
(tbl = {}).tainted? || tbl.taint
|
||||
@tk_table_list << tbl
|
||||
}
|
||||
_init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
|
||||
|
||||
class << self
|
||||
undef :instance_eval
|
||||
|
|
@ -1391,8 +1422,13 @@ class << MultiTkIp
|
|||
alias __new new
|
||||
private :__new
|
||||
|
||||
|
||||
def new_master(safe=nil, keys={})
|
||||
if MultiTkIp::WITH_RUBY_VM
|
||||
#### TODO !!!!!!
|
||||
fail RuntimeError,
|
||||
'sorry, still not support multiple master-interpreters on Ruby VM'
|
||||
end
|
||||
|
||||
if safe.kind_of?(Hash)
|
||||
keys = safe
|
||||
elsif safe.kind_of?(Integer)
|
||||
|
|
@ -1609,8 +1645,13 @@ class MultiTkIp
|
|||
return if slave?
|
||||
names.each{|name|
|
||||
name = name.to_s
|
||||
|
||||
return if @interp.deleted?
|
||||
@interp._invoke('rename', name, '')
|
||||
|
||||
return if @interp.deleted?
|
||||
@interp._invoke('interp', 'slaves').split.each{|slave|
|
||||
return if @interp.deleted?
|
||||
@interp._invoke('interp', 'alias', slave, name, '') rescue nil
|
||||
}
|
||||
}
|
||||
|
|
@ -1660,11 +1701,16 @@ class MultiTkIp
|
|||
id = @@TK_TABLE_LIST.size
|
||||
obj = Object.new
|
||||
@@TK_TABLE_LIST << obj
|
||||
obj.instance_eval <<-EOD
|
||||
def self.method_missing(m, *args)
|
||||
MultiTkIp.tk_object_table(#{id}).__send__(m, *args)
|
||||
obj.instance_variable_set(:@id, id)
|
||||
obj.instance_variable_set(:@mutex, Mutex.new)
|
||||
obj.instance_eval{
|
||||
def self.mutex
|
||||
@mutex
|
||||
end
|
||||
EOD
|
||||
def self.method_missing(m, *args)
|
||||
MultiTkIp.tk_object_table(@id).__send__(m, *args)
|
||||
end
|
||||
}
|
||||
obj.freeze
|
||||
@@IP_TABLE.each{|tg, ip| ip._add_new_tables }
|
||||
return obj
|
||||
|
|
@ -2797,9 +2843,10 @@ class MultiTkIp
|
|||
i = -1
|
||||
brace = 1
|
||||
str.each_byte {|c|
|
||||
c = c.chr
|
||||
i += 1
|
||||
brace += 1 if c == ?{
|
||||
brace -= 1 if c == ?}
|
||||
brace += 1 if c == '{'
|
||||
brace -= 1 if c == '}'
|
||||
break if brace == 0
|
||||
}
|
||||
if i == 0
|
||||
|
|
@ -3238,15 +3285,44 @@ end
|
|||
|
||||
|
||||
# encoding convert
|
||||
class MultiTkIp
|
||||
def encoding
|
||||
raise SecurityError, "no permission to manipulate" unless self.manipulable?
|
||||
@interp.encoding
|
||||
class << MultiTkIp
|
||||
def encoding_table
|
||||
__getip.encoding_table
|
||||
end
|
||||
end
|
||||
class MultiTkIp
|
||||
def encoding_table
|
||||
@interp.encoding_table
|
||||
end
|
||||
|
||||
def force_default_encoding=(mode)
|
||||
raise SecurityError, "no permission to manipulate" unless self.manipulable?
|
||||
@interp.force_default_encoding = mode
|
||||
end
|
||||
def force_default_encoding?
|
||||
raise SecurityError, "no permission to manipulate" unless self.manipulable?
|
||||
@interp.force_default_encoding?
|
||||
end
|
||||
|
||||
def default_encoding=(enc)
|
||||
raise SecurityError, "no permission to manipulate" unless self.manipulable?
|
||||
@interp.default_encoding = enc
|
||||
end
|
||||
|
||||
def encoding=(enc)
|
||||
raise SecurityError, "no permission to manipulate" unless self.manipulable?
|
||||
@interp.encoding = enc
|
||||
end
|
||||
def encoding_name
|
||||
raise SecurityError, "no permission to manipulate" unless self.manipulable?
|
||||
@interp.encoding_name
|
||||
end
|
||||
def encoding_obj
|
||||
raise SecurityError, "no permission to manipulate" unless self.manipulable?
|
||||
@interp.encoding_obj
|
||||
end
|
||||
alias encoding encoding_name
|
||||
alias default_encoding encoding_name
|
||||
|
||||
def encoding_convertfrom(str, enc=None)
|
||||
raise SecurityError, "no permission to manipulate" unless self.manipulable?
|
||||
|
|
@ -3264,12 +3340,28 @@ end
|
|||
|
||||
# remove methods for security
|
||||
class MultiTkIp
|
||||
INTERP_THREAD = @@DEFAULT_MASTER.instance_variable_get('@interp_thread')
|
||||
INTERP_MUTEX = INTERP_THREAD[:mutex]
|
||||
INTERP_ROOT_CHECK = INTERP_THREAD[:root_check]
|
||||
|
||||
# undef_method :instance_eval
|
||||
undef_method :instance_variable_get
|
||||
undef_method :instance_variable_set
|
||||
end
|
||||
|
||||
|
||||
module TkCore
|
||||
if MultiTkIp::WITH_RUBY_VM &&
|
||||
! MultiTkIp::RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
|
||||
INTERP_THREAD = MultiTkIp::INTERP_THREAD
|
||||
INTERP_MUTEX = MultiTkIp::INTERP_MUTEX
|
||||
INTERP_ROOT_CHECK = MultiTkIp::INTERP_ROOT_CHECK
|
||||
end
|
||||
end
|
||||
class MultiTkIp
|
||||
remove_const(:INTERP_THREAD)
|
||||
remove_const(:INTERP_MUTEX)
|
||||
remove_const(:INTERP_ROOT_CHECK)
|
||||
end
|
||||
# end of MultiTkIp definition
|
||||
|
||||
# defend against modification
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue