diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-29 05:25:45 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-29 05:25:45 +0000 |
commit | aff4ce9c77784a9663852102a717d0385f18a0ea (patch) | |
tree | 4edda8b86d097e14db74ee59d1da40361e30d9f1 /ext/tk/stubs.c | |
parent | 058c981311f809ee48e3db9264ef82ce1e950c1b (diff) |
* 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/branches/ruby_1_8@15849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/stubs.c')
-rw-r--r-- | ext/tk/stubs.c | 78 |
1 files changed, 63 insertions, 15 deletions
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c index 23ff42a4f4..6d3b330f0e 100644 --- a/ext/tk/stubs.c +++ b/ext/tk/stubs.c @@ -1,5 +1,11 @@ -#include "stubs.h" +/************************************************ + + stubs.c - Tcl/Tk stubs support + +************************************************/ + #include "ruby.h" +#include "stubs.h" #include <tcl.h> #include <tk.h> @@ -86,8 +92,12 @@ static DL_HANDLE tcl_dll = (DL_HANDLE)0; static DL_HANDLE tk_dll = (DL_HANDLE)0; int +#ifdef RUBY_VM +ruby_open_tcl_dll(char *appname) +#else ruby_open_tcl_dll(appname) char *appname; +#endif { void (*p_Tcl_FindExecutable)(const char *); int n; @@ -141,8 +151,8 @@ ruby_open_tk_dll() char tk_name[20]; if (!tcl_dll) { - /* int ret = ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */ - int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0); + /* int ret = ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */ + int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0); if (ret != TCLTK_STUBS_OK) return ret; } @@ -169,8 +179,12 @@ ruby_open_tk_dll() } int +#ifdef RUBY_VM +ruby_open_tcltk_dll(char *appname) +#else ruby_open_tcltk_dll(appname) char *appname; +#endif { return( ruby_open_tcl_dll(appname) || ruby_open_tk_dll() ); } @@ -189,8 +203,12 @@ tk_stubs_init_p() Tcl_Interp * +#ifdef RUBY_VM +ruby_tcl_create_ip_and_stubs_init(int *st) +#else ruby_tcl_create_ip_and_stubs_init(st) int *st; +#endif { Tcl_Interp *tcl_ip; @@ -213,8 +231,8 @@ ruby_tcl_create_ip_and_stubs_init(st) Tcl_Interp *(*p_Tcl_DeleteInterp)(); if (!tcl_dll) { - /* int ret = ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */ - int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0); + /* int ret = ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */ + int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0); if (ret != TCLTK_STUBS_OK) { if (st) *st = ret; @@ -272,8 +290,12 @@ ruby_tcl_stubs_init() } int +#ifdef RUBY_VM +ruby_tk_stubs_init(Tcl_Interp *tcl_ip) +#else ruby_tk_stubs_init(tcl_ip) Tcl_Interp *tcl_ip; +#endif { Tcl_ResetResult(tcl_ip); @@ -308,8 +330,12 @@ ruby_tk_stubs_init(tcl_ip) } int +#ifdef RUBY_VM +ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip) +#else ruby_tk_stubs_safeinit(tcl_ip) Tcl_Interp *tcl_ip; +#endif { Tcl_ResetResult(tcl_ip); @@ -348,8 +374,8 @@ ruby_tcltk_stubs() int st; Tcl_Interp *tcl_ip; - /* st = ruby_open_tcltk_dll(RSTRING(rb_argv0)->ptr); */ - st = ruby_open_tcltk_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0); + /* st = ruby_open_tcltk_dll(RSTRING_PTR(rb_argv0)); */ + st = ruby_open_tcltk_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0); switch(st) { case NO_FindExecutable: return -7; @@ -395,8 +421,12 @@ static int open_tcl_dll = 0; static int call_tk_stubs_init = 0; int +#ifdef RUBY_VM +ruby_open_tcl_dll(char *appname) +#else ruby_open_tcl_dll(appname) char *appname; +#endif { if (appname) { Tcl_FindExecutable(appname); @@ -408,18 +438,24 @@ ruby_open_tcl_dll(appname) return TCLTK_STUBS_OK; } -int ruby_open_tk_dll() +int +ruby_open_tk_dll() { if (!open_tcl_dll) { - /* ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */ - ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0); + /* ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */ + ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0); } return TCLTK_STUBS_OK; } -int ruby_open_tcltk_dll(appname) +int +#ifdef RUBY_VM +ruby_open_tcltk_dll(char *appname) +#else +ruby_open_tcltk_dll(appname) char *appname; +#endif { return( ruby_open_tcl_dll(appname) || ruby_open_tk_dll() ); } @@ -437,14 +473,18 @@ tk_stubs_init_p() } Tcl_Interp * +#ifdef RUBY_VM +ruby_tcl_create_ip_and_stubs_init(int *st) +#else ruby_tcl_create_ip_and_stubs_init(st) int *st; +#endif { Tcl_Interp *tcl_ip; if (!open_tcl_dll) { - /* ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */ - ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0); + /* ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */ + ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0); } if (st) *st = 0; @@ -466,8 +506,12 @@ ruby_tcl_stubs_init() } int +#ifdef RUBY_VM +ruby_tk_stubs_init(Tcl_Interp *tcl_ip) +#else ruby_tk_stubs_init(tcl_ip) Tcl_Interp *tcl_ip; +#endif { if (Tk_Init(tcl_ip) == TCL_ERROR) return FAIL_Tk_Init; @@ -483,8 +527,12 @@ ruby_tk_stubs_init(tcl_ip) } int +#ifdef RUBY_VM +ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip) +#else ruby_tk_stubs_safeinit(tcl_ip) Tcl_Interp *tcl_ip; +#endif { #if TCL_MAJOR_VERSION >= 8 if (Tk_SafeInit(tcl_ip) == TCL_ERROR) @@ -508,8 +556,8 @@ ruby_tk_stubs_safeinit(tcl_ip) int ruby_tcltk_stubs() { - /* Tcl_FindExecutable(RSTRING(rb_argv0)->ptr); */ - Tcl_FindExecutable(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0); + /* Tcl_FindExecutable(RSTRING_PTR(rb_argv0)); */ + Tcl_FindExecutable(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0); return 0; } |