kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/tcltklib/tcltklib.c (ip_init): change flag value for setting 'argv' and 'argv0' variable

Browse source 
* ext/tk/lib/remote-tk.rb: follow changes of multi-tk.rb


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2004-09-09 05:03:21 +00:00
parent a8fc3fb8b0
commit d782aad77d
3 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Sep 9 13:58:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c (ip_init): change flag value for setting
'argv' and 'argv0' variable
* ext/tk/lib/remote-tk.rb: follow changes of multi-tk.rb
Thu Sep 9 11:46:18 2004 Dave Thomas <dave@pragprog.com> Thu Sep 9 11:46:18 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_classes): Allow * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_classes): Allow

9
ext/tcltklib/tcltklib.c
View file

@ -2884,12 +2884,14 @@ ip_init(argc, argv, self)
/* without Tk */ /* without Tk */
with_tk = 0; with_tk = 0;
} else { } else {
Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), 0); /* Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), 0); */
Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), TCL_GLOBAL_ONLY);
} }
case 1: case 1:
/* argv0 */ /* argv0 */
if (!NIL_P(argv0)) { if (!NIL_P(argv0)) {
Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0); /* Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0); */
Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), TCL_GLOBAL_ONLY);
} }
case 0: case 0:
/* no args */ /* no args */
@ -2917,6 +2919,7 @@ ip_init(argc, argv, self)
/* get main window */ /* get main window */
mainWin = Tk_MainWindow(ptr->ip); mainWin = Tk_MainWindow(ptr->ip);
Tk_Preserve((ClientData)mainWin);
/* add ruby command to the interpreter */ /* add ruby command to the interpreter */
#if TCL_MAJOR_VERSION >= 8 #if TCL_MAJOR_VERSION >= 8
@ -3015,6 +3018,8 @@ ip_init(argc, argv, self)
(ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL); (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
#endif #endif
Tk_Release((ClientData)mainWin);
return self; return self;
} }

29
ext/tk/lib/remote-tk.rb
View file

@ -14,6 +14,17 @@ class MultiTkIp
@@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST) @@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST)
def self._IP_TABLE; @@IP_TABLE; end def self._IP_TABLE; @@IP_TABLE; end
def self._TK_TABLE_LIST; @@TK_TABLE_LIST; end def self._TK_TABLE_LIST; @@TK_TABLE_LIST; end
@flag = true
def self._DEFAULT_MASTER
# work only once
if @flag
@flag = nil
@@DEFAULT_MASTER
else
nil
end
end
end end
class RemoteTkIp class RemoteTkIp
@@IP_TABLE = MultiTkIp._IP_TABLE unless defined?(@@IP_TABLE) @@IP_TABLE = MultiTkIp._IP_TABLE unless defined?(@@IP_TABLE)
@ -26,6 +37,15 @@ end
require 'multi-tk' require 'multi-tk'
class RemoteTkIp
if defined?(@@DEFAULT_MASTER)
MultiTkIp._DEFAULT_MASTER
else
@@DEFAULT_MASTER = MultiTkIp._DEFAULT_MASTER
end
end
############################### ###############################
class << RemoteTkIp class << RemoteTkIp
@ -73,14 +93,19 @@ class RemoteTkIp
@threadgroup = ThreadGroup.new @threadgroup = ThreadGroup.new
@safe_level = [$SAFE]
@cmd_queue = Queue.new @cmd_queue = Queue.new
=begin
@cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog() @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog()
@threadgroup.add @cmd_receiver @threadgroup.add @cmd_receiver
@threadgroup.add @receiver_watchdog @threadgroup.add @receiver_watchdog
@threadgroup.enclose @threadgroup.enclose
=end
@@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
@@IP_TABLE[@threadgroup] = self @@IP_TABLE[@threadgroup] = self
@@TK_TABLE_LIST.size.times{ @@TK_TABLE_LIST.size.times{
@ -94,6 +119,10 @@ class RemoteTkIp
end end
@ip_id = _create_connection @ip_id = _create_connection
class << self
undef :instance_eval
end
self.freeze # defend against modification self.freeze # defend against modification
end end