tk 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1347bf6638e8e5c8ad7de473d26b0c8b3d2f4b8a2c195696c24c19d652cb426
-  data.tar.gz: c52bc29bd1d742bc707c7d53f82c564355c32c43dd64e19a2b4df8ed63b9bbab
+  metadata.gz: 2daffd367a147178f4e0f2144ada2fa9b697d3f3a691feb35cbc0dd2897d5096
+  data.tar.gz: c77e8a1a311131c912dd1abfd877479dfe5284e1392aa74ff654d9bcad21a245
 SHA512:
-  metadata.gz: 47633e9b2b38bbde90c157d6fec882ea7747180de3ac28bbec7d0d8671ec709cf9a0cdff5335186e192b3fdf72c7f4b6de68479b8307d6ea426ba47e3de35482
-  data.tar.gz: 7fb2f1dea579e612ea57eddd8136f855c68b4845d550559c136ca5e92e8c4af1fe437544721763b71f50df5d60e0c19de7ea01f4eb602e7cf177862cc94d0381
+  metadata.gz: 769d8de0a68b1e1f3ce86a74723d62b1e969cd0e2558f32ee0042c13a57c0c63f36fa8fe0aeb1f9c2a9a6fc2fbb1fa879c3013a83e247f8145b1b0873a8fea09
+  data.tar.gz: b7a29534b49f7fcb5f53390ed98fee637f8b9cf8a347b4a0d68a1edc6d951a16214074d007dab4204a59ee2a37eae383cb9fc4180d0aba179a5751edac62a6eb

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: build (${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby: [ 3.4, 3.3, 3.2, 3.1, head ]
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        sudo apt install tk-dev
+        gem install bundler --no-document
+        bundle install
+    - name: Run test
+      run: |
+        rake compile -- --with-tcltkversion=8.6 \
+        --with-tcl-lib=/usr/lib/x86_64-linux-gnu \
+        --with-tk-lib=/usr/lib/x86_64-linux-gnu \
+        --with-tcl-include=/usr/include/tcl8.6 \
+        --with-tk-include=/usr/include/tcl8.6

data/MANUAL_tcltklib.ja

@@ -135,7 +135,7 @@ require "tcltklib" すると, 以下のモジュール, クラスが利用可能
   メソッド _return_value()
       直前の Tcl_Eval の戻り値を返します. 0(TCL_OK) で正常終了です.
     引数: 無し
-    戻り値 (Fixnum): 直前の Tcl_Eval() が返した値.
+    戻り値 (Integer): 直前の Tcl_Eval() が返した値.
 
 ==============================================================
 

data/README.macosx-aqua

@@ -31,7 +31,7 @@ Tk.ip_eval(<<'EOS')
     }
 EOS
 
-# use a traditional dialog for Tk.getSaveFile() and Tk.getMultipleSaveFile()
+# use a traditional dialog for Tk.getSaveFile()
 Tk.ip_eval(<<'EOS')
     proc ::tk_getSaveFile {args} {
         if {$::tk_strictMotif} {

data/README.md

@@ -18,6 +18,14 @@ Or install it yourself as:
 
     $ gem install tk
 
+You may need to set options when using `gem install` so that the gem can find the Tcl/Tk headers and library:
+
+    $ gem install tk -- \
+        --with-tcl-include='/path/to/tcl/header/directory' \
+        --with-tk-include='/path/to/tk/header/directory' \
+        --with-tcl-lib='/path/to/tcl/shared/library/directory' \
+        --with-tk-lib='/path/to/tk/shared/library/directory'
+
 ## Documentation
 
 ### Read this first

data/ext/tk/extconf.rb

@@ -510,9 +510,9 @@ def get_tclConfig_dirs
       '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local',
       '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr'
     ].map{|dir|
-      Dir.glob(dir + "/{tcltk,tcl,tk}[#{TkLib_Config['major_nums']}*/lib",
+      Dir.glob(dir + "/{tcltk,tcl,tk}[#{TkLib_Config['major_nums']}]*/lib",
                File::FNM_CASEFOLD)
-      Dir.glob(dir + "/{tcltk,tcl,tk}[#{TkLib_Config['major_nums']}*",
+      Dir.glob(dir + "/{tcltk,tcl,tk}[#{TkLib_Config['major_nums']}]*",
                File::FNM_CASEFOLD)
       Dir.glob(dir + '/{tcltk,tcl,tk}/lib', File::FNM_CASEFOLD)
       Dir.glob(dir + '/{tcltk,tcl,tk}', File::FNM_CASEFOLD)

data/ext/tk/tkutil/tkutil.c

@@ -327,7 +327,7 @@ tk_symbolkey2str(self, keys)
 
     if (NIL_P(keys)) return new_keys;
     keys = rb_convert_type(keys, T_HASH, "Hash", "to_hash");
-    st_foreach_check(RHASH_TBL(keys), to_strkey, new_keys, Qundef);
+    rb_hash_foreach(keys, to_strkey, new_keys);
     return new_keys;
 }
 
@@ -718,7 +718,7 @@ hash2kv(hash, ary, self)
     volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
     volatile VALUE args = rb_ary_new3(2, dst, self);
 
-    st_foreach_check(RHASH_TBL(hash), push_kv, args, Qundef);
+    rb_hash_foreach(hash, push_kv, args);
 
     if (NIL_P(ary)) {
         return dst;
@@ -762,7 +762,7 @@ hash2kv_enc(hash, ary, self)
     volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
     volatile VALUE args = rb_ary_new3(2, dst, self);
 
-    st_foreach_check(RHASH_TBL(hash), push_kv_enc, args, Qundef);
+    rb_hash_foreach(hash, push_kv_enc, args);
 
     if (NIL_P(ary)) {
         return dst;
@@ -1067,14 +1067,14 @@ static VALUE
 tkstr_to_int(value)
     VALUE value;
 {
-    return rb_cstr_to_inum(RSTRING_PTR(value), 0, 1);
+    return rb_str_to_inum(value, 0, 1);
 }
 
 static VALUE
 tkstr_to_float(value)
     VALUE value;
 {
-    return rb_float_new(rb_cstr_to_dbl(RSTRING_PTR(value), 1));
+    return rb_float_new(rb_str_to_dbl(value, 1));
 }
 
 static VALUE
@@ -1797,6 +1797,7 @@ Init_tkutil(void)
     rb_define_singleton_method(cCB_SUBST, "inspect", cbsubst_inspect, 0);
 
     cSUBST_INFO = rb_define_class_under(cCB_SUBST, "Info", rb_cObject);
+    rb_undef_alloc_func(cSUBST_INFO);
     rb_define_singleton_method(cSUBST_INFO, "inspect", substinfo_inspect, 0);
 
     ID_SUBST_INFO = rb_intern("SUBST_INFO");

data/lib/multi-tk.rb

@@ -1279,7 +1279,7 @@ class MultiTkIp
 
     name, safe, safe_opts, tk_opts = _parse_slaveopts(keys)
 
-    safe = 1 if safe && !safe.kind_of?(Fixnum)
+    safe = 1 if safe && !safe.kind_of?(Integer)
 
     @safe_base = false
 
@@ -3519,4 +3519,4 @@ end
 module TkCore
   INTERP = MultiTkIp
 end
-require 'tk'
+require 'tk' unless defined?(Tk)

data/lib/thread_tk.rb

@@ -0,0 +1,13 @@
+#
+# thread_tk.rb :
+#   The eventloop of Tk (Tk.mainloop) can run on a thread other than the
+#   main thread. That is, when "require 'thread_tk'" is executed instead
+#   of or before "require 'tk'",  "Thread.new{Tk.mainloop}" works properly.
+#
+
+if defined?(TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD) && TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD
+  raise LoadError, "thread_tk.rb must be loaded before tk.rb"
+end
+
+module TkCore; RUN_EVENTLOOP_ON_MAIN_THREAD = false; end
+require 'tk' unless defined?(Tk)

data/lib/tk/bgerror.rb

@@ -3,7 +3,7 @@
 #  tkbgerror -- bgerror ( tkerror ) module
 #                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkBgError
   extend Tk

data/lib/tk/bindtag.rb

@@ -2,7 +2,7 @@
 #
 # tk/bind.rb : control event binding
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class TkBindTag
   include TkBindCore

data/lib/tk/busy.rb

@@ -2,7 +2,7 @@
 #
 # tk/busy.rb: support 'tk busy' command (Tcl/Tk8.6 or later)
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module Tk::Busy
   include TkCore

data/lib/tk/button.rb

@@ -2,7 +2,7 @@
 #
 # tk/button.rb : treat button widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/label'
 
 class Tk::Button<Tk::Label

data/lib/tk/canvas.rb

@@ -3,7 +3,7 @@
 #               tk/canvas.rb - Tk canvas classes
 #                       by Yukihiro Matsumoto <matz@caelum.co.jp>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/canvastag'
 require 'tk/itemconfig'
 require 'tk/scrollable'

data/lib/tk/canvastag.rb

@@ -2,7 +2,7 @@
 #
 # tk/canvastag.rb - methods for treating canvas tags
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/tagfont'
 
 module TkcTagAccess

data/lib/tk/checkbutton.rb

@@ -2,7 +2,7 @@
 #
 # tk/checkbutton.rb : treat checkbutton widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/radiobutton'
 
 class Tk::CheckButton<Tk::RadioButton

data/lib/tk/clipboard.rb

@@ -2,7 +2,7 @@
 #
 # tk/clipboard.rb : methods to treat clipboard
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkClipboard
   include Tk

data/lib/tk/clock.rb

@@ -2,7 +2,7 @@
 #
 # tk/clock.rb : methods for clock command
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module Tk
   module Clock

data/lib/tk/composite.rb

@@ -2,7 +2,7 @@
 #
 # tk/composite.rb :
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkComposite
   include Tk

data/lib/tk/console.rb

@@ -2,7 +2,7 @@
 #
 #   tk/console.rb : control the console on system without a real console
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkConsole
   include Tk

data/lib/tk/dialog.rb

@@ -2,7 +2,7 @@
 #
 #   tk/dialog.rb : create dialog boxes
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/variable.rb'
 
 class TkDialogObj < TkWindow

data/lib/tk/encodedstr.rb

@@ -2,7 +2,7 @@
 #
 # tk/encodedstr.rb : Tk::EncodedString class
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 ###########################################
 #  string with Tcl's encoding

data/lib/tk/entry.rb

@@ -3,7 +3,7 @@
 #               tk/entry.rb - Tk entry classes
 #                       by Yukihiro Matsumoto <matz@caelum.co.jp>
 
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/label'
 require 'tk/scrollable'
 require 'tk/validation'

data/lib/tk/font.rb

@@ -4,7 +4,7 @@
 #
 #                               by  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class TkFont
   include Tk

data/lib/tk/fontchooser.rb

@@ -2,7 +2,7 @@
 #
 # tk/fontchooser.rb -- "tk fontchooser" support (Tcl/Tk8.6 or later)
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/font'
 
 module TkFont::Chooser

data/lib/tk/frame.rb

@@ -2,7 +2,7 @@
 #
 # tk/frame.rb : treat frame widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class Tk::Frame<TkWindow
   TkCommandNames = ['frame'.freeze].freeze

data/lib/tk/grid.rb

@@ -2,7 +2,7 @@
 #
 # tk/grid.rb : control grid geometry manager
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkGrid
   include Tk

data/lib/tk/image.rb

@@ -3,7 +3,7 @@
 # tk/image.rb : treat Tk image objects
 #
 
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class TkImage<TkObject
   include Tk

data/lib/tk/itemconfig.rb

@@ -2,7 +2,7 @@
 #
 # tk/itemconfig.rb : control item/tag configuration of widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tkutil'
 require 'tk/itemfont.rb'
 

data/lib/tk/itemfont.rb

@@ -2,7 +2,7 @@
 #
 # tk/itemfont.rb : control font of widget items
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkItemFontOptkeys
   def __item_font_optkeys(id)

data/lib/tk/kinput.rb

@@ -2,7 +2,7 @@
 #
 # tk/kinput.rb : control kinput
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkKinput
   include Tk

data/lib/tk/label.rb

@@ -2,7 +2,7 @@
 #
 # tk/label.rb : treat label widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class Tk::Label<TkWindow
   TkCommandNames = ['label'.freeze].freeze

data/lib/tk/labelframe.rb

@@ -2,7 +2,7 @@
 #
 # tk/labelframe.rb : treat labelframe widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/frame'
 
 class Tk::LabelFrame<Tk::Frame

data/lib/tk/listbox.rb

@@ -2,7 +2,7 @@
 #
 # tk/listbox.rb : treat listbox widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/itemconfig'
 require 'tk/scrollable'
 require 'tk/txtwin_abst'

data/lib/tk/macpkg.rb

@@ -7,7 +7,7 @@
 #         This is NOT TESTED. Because I have no test-environment.
 #
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module Tk
   def Tk.load_tclscript_rsrc(resource_name, file=None)

data/lib/tk/menu.rb

@@ -2,7 +2,7 @@
 #
 # tk/menu.rb : treat menu and menubutton
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/itemconfig'
 require 'tk/menuspec'
 

data/lib/tk/menubar.rb

@@ -85,7 +85,7 @@
 # To use add_menu, configuration must be done by calling configure after
 # adding all menus by add_menu, not by the constructor arguments.
 
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/frame'
 require 'tk/composite'
 require 'tk/menuspec'

data/lib/tk/message.rb

@@ -2,7 +2,7 @@
 #
 # tk/message.rb : treat message widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/label'
 
 class Tk::Message<Tk::Label

data/lib/tk/mngfocus.rb

@@ -3,7 +3,7 @@
 #   tk/mngfocus.rb : methods for Tcl/Tk standard library 'focus.tcl'
 #                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkManageFocus
   extend Tk

data/lib/tk/msgcat.rb

@@ -3,7 +3,7 @@
 #   tk/msgcat.rb : methods for Tcl message catalog
 #                     by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 #class TkMsgCatalog
 class TkMsgCatalog < TkObject

data/lib/tk/namespace.rb

@@ -3,7 +3,7 @@
 #   tk/namespace.rb : methods to manipulate Tcl/Tk namespace
 #                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class TkNamespace < TkObject
   extend Tk

data/lib/tk/optiondb.rb

@@ -2,7 +2,7 @@
 #
 # tk/optiondb.rb : treat option database
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkOptionDB
   include Tk

data/lib/tk/optionobj.rb

@@ -8,7 +8,7 @@
 #        e.g. hash_kv({'aaa'=>1, 'bbb'=>Tk::None, 'ccc'=>3})
 #                 => ["-aaa", 1, "-bbb", "-ccc", 3]
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module Tk
   class OptionObj < Hash

data/lib/tk/pack.rb

@@ -2,7 +2,7 @@
 #
 # tk/pack.rb : control pack geometry manager
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkPack
   include Tk

data/lib/tk/package.rb

@@ -2,7 +2,7 @@
 #
 # tk/package.rb : package command
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkPackage
   include TkCore

data/lib/tk/palette.rb

@@ -3,7 +3,7 @@
 #   tk/palette.rb : methods for Tcl/Tk standard library 'palette.tcl'
 #                     1998/06/21 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkPalette
   include Tk

data/lib/tk/panedwindow.rb

@@ -2,7 +2,7 @@
 #
 # tk/panedwindow.rb : treat panedwindow
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class Tk::PanedWindow<TkWindow
   TkCommandNames = ['panedwindow'.freeze].freeze

data/lib/tk/place.rb

@@ -2,7 +2,7 @@
 #
 # tk/place.rb : control place geometry manager
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkPlace
   include Tk

data/lib/tk/radiobutton.rb

@@ -2,7 +2,7 @@
 #
 # tk/radiobutton.rb : treat radiobutton widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/button'
 
 class Tk::RadioButton<Tk::Button

data/lib/tk/root.rb

@@ -2,7 +2,7 @@
 #
 # tk/root.rb : treat root widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/wm'
 require 'tk/menuspec'
 

data/lib/tk/scale.rb

@@ -2,7 +2,7 @@
 #
 # tk/scale.rb : treat scale widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class Tk::Scale<TkWindow
   TkCommandNames = ['scale'.freeze].freeze

data/lib/tk/scrollable.rb

@@ -2,7 +2,7 @@
 #
 # tk/scrollable.rb : module for scrollable widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module Tk
   module XScrollable

data/lib/tk/scrollbar.rb

@@ -2,7 +2,7 @@
 #
 # tk/scrollbar.rb : treat scrollbar widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class Tk::Scrollbar<TkWindow
   TkCommandNames = ['scrollbar'.freeze].freeze

data/lib/tk/scrollbox.rb

@@ -4,7 +4,7 @@
 #                                 as an example of Composite Widget
 #                       by Yukihiro Matsumoto <matz@netlab.co.jp>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/listbox'
 
 class TkScrollbox<Tk::Listbox

data/lib/tk/selection.rb

@@ -2,7 +2,7 @@
 #
 # tk/selection.rb : control selection
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkSelection
   include Tk