tk 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de793924acb0bcb31d9cf7810b29ee8b955498771677127d14a8f84a0be28447
-  data.tar.gz: 624bf1e5f517b16c2147b43b840189f711f91c585edda293ba55585dde6d2901
+  metadata.gz: 27203ca65a4961a7c3594cd5ec6c50d9f1440aec4640b48d3dc3a2749f599724
+  data.tar.gz: ec99535ddf2b33049fde77d89eee84b1665ca7252ea4ed0b6d5c2d37af87da33
 SHA512:
-  metadata.gz: 496b71be86f3fad9951713a33c51cc2df0362914717adc915977d93b6197c5770938c82013cb84e97a1893e4489c549159ddbd96e2f1d42362d881ec50c6970e
-  data.tar.gz: 39d4d96c72e0484684f0048f01fd7df53ce8ad20158c9a14d82de0d93c1732f9eab52e83003d4d4084743bde9898c91044b909e82eebf0b098329a666cc1a111
+  metadata.gz: 4d46c0686e090c00f1654ac716f19fe900d007e333fee2e88b01386093024315d30db0439765a7db95093f52f75346f3c7d9e241fa969109cfdb5d88de4b7576
+  data.tar.gz: bcb71a0b498617dc4fdf7a5a260923d99ecd2a8b966cc4c6de9d537b79a8153f1143c171769f06d6f05fdf452c2e059f863df430b1564a95c84e70c7e98e6d32

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.2, 3.1, '3.0', 2.7, 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/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/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;
@@ -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

@@ -266,7 +266,7 @@ class MultiTkIp
 
         begin
           @interp._eval_without_enc(@interp._merge_tklist('bgerror', msg))
-        rescue Exception => e
+        rescue Exception
           warn("Warning (#{self}): " + msg)
         end
       end
@@ -659,7 +659,7 @@ class MultiTkIp
       loop do
         Thread.pass
         begin
-          thread, cmd, *args = @cmd_queue.deq(true) # non-block
+          thread, _, *_ = @cmd_queue.deq(true) # non-block
         rescue ThreadError
           # queue is empty
           retry_count -= 1
@@ -928,7 +928,6 @@ class MultiTkIp
 
     @init_ip_env_queue = Queue.new
     Thread.new{
-      current = Thread.current
       loop {
         mtx, cond, ret, table, script = @init_ip_env_queue.deq
         begin
@@ -1917,7 +1916,7 @@ if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) ||
             top.respond_to?(:pseudo_toplevel_evaluable?) &&
             top.pseudo_toplevel_evaluable? &&
             top.respond_to?(id)
-        rescue Exception => e
+        rescue Exception
           has_top = false
         end
 
@@ -2316,7 +2315,7 @@ class << MultiTkIp
     __getip.allow_ruby_exit?
   end
 
-  def allow_ruby_exit= (mode)
+  def allow_ruby_exit=(mode)
     __getip.allow_ruby_exit = mode
   end
 
@@ -2642,7 +2641,7 @@ class MultiTkIp
     @interp.allow_ruby_exit?
   end
 
-  def allow_ruby_exit= (mode)
+  def allow_ruby_exit=(mode)
     raise SecurityError, "no permission to manipulate" unless self.manipulable?
     @interp.allow_ruby_exit = mode
   end

data/lib/remote-tk.rb

@@ -270,7 +270,7 @@ class RemoteTkIp
     false
   end
 
-  def allow_ruby_exit= (mode)
+  def allow_ruby_exit=(mode)
     fail RuntimeError, 'cannot change mode of the remote interpreter'
   end
 

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'

data/lib/tk/autoload.rb

@@ -452,7 +452,7 @@ class << Tk
 
     reg = /^#{Regexp.quote(auto)}(\.rb|\.so|)$/
     @TOPLEVEL_ALIAS_TABLE.each_key{|set|
-      if @TOPLEVEL_ALIAS_TABLE[set][sym] =~ reg
+      if reg =~ @TOPLEVEL_ALIAS_TABLE[set][sym].to_s
         @TOPLEVEL_ALIAS_TABLE[set][sym] = obj
         if @TOPLEVEL_ALIAS_OWNER[sym].nil? || @TOPLEVEL_ALIAS_OWNER[sym] == set
           replace_topalias(sym, obj)
@@ -460,10 +460,10 @@ class << Tk
         end
       end
     }
-    if (f = Object.autoload?(sym)) && f =~ reg
+    if (f = Object.autoload?(sym)) && reg =~ f.to_s
       replace_topobj(sym, obj)
     end
-    if (f = Tk::TOPLEVEL_ALIASES.autoload?(sym)) && f =~ reg
+    if (f = Tk::TOPLEVEL_ALIASES.autoload?(sym)) && reg =~ f.to_s
       replace_topalias(sym, obj)
     end
   end

data/lib/tk/canvastag.rb

@@ -187,7 +187,7 @@ module TkcTagAccess
   #      ltag = tag1 | tag2; ltag.path => "(t1)||(t2)"
   #      ltag = tag1 ^ tag2; ltag.path => "(t1)^(t2)"
   #      ltag = - tag1;      ltag.path => "!(t1)"
-  def & (tag)
+  def &(tag)
     if tag.kind_of? TkObject
       TkcTagString.new(@c, '(' + @id + ')&&(' + tag.path + ')')
     else
@@ -195,7 +195,7 @@ module TkcTagAccess
     end
   end
 
-  def | (tag)
+  def |(tag)
     if tag.kind_of? TkObject
       TkcTagString.new(@c, '(' + @id + ')||(' + tag.path + ')')
     else
@@ -203,7 +203,7 @@ module TkcTagAccess
     end
   end
 
-  def ^ (tag)
+  def ^(tag)
     if tag.kind_of? TkObject
       TkcTagString.new(@c, '(' + @id + ')^(' + tag.path + ')')
     else

data/lib/tk/entry.rb

@@ -96,7 +96,7 @@ class Tk::Entry<Tk::Label
   def value
     _fromUTF8(tk_send_without_enc('get'))
   end
-  def value= (val)
+  def value=(val)
     tk_send_without_enc('delete', 0, 'end')
     tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
     val

data/lib/tk/grid.rb

@@ -66,15 +66,15 @@ module TkGrid
     params = []
     args.flatten(1).each{|win|
       case win
-      when '-', ?-              # RELATIVE PLACEMENT (increase columnspan)
+      when '-', ?-.ord              # RELATIVE PLACEMENT (increase columnspan)
         params.push('-')
       when /^-+$/             # RELATIVE PLACEMENT (increase columnspan)
         params.concat(win.to_s.split(//))
-      when '^', ?^              # RELATIVE PLACEMENT (increase rowspan)
+      when '^', ?^.ord              # RELATIVE PLACEMENT (increase rowspan)
         params.push('^')
       when /^\^+$/             # RELATIVE PLACEMENT (increase rowspan)
         params.concat(win.to_s.split(//))
-      when 'x', :x, ?x, nil, '' # RELATIVE PLACEMENT (empty column)
+      when 'x', :x, ?x.ord, nil, '' # RELATIVE PLACEMENT (empty column)
         params.push('x')
       when /^x+$/             # RELATIVE PLACEMENT (empty column)
         params.concat(win.to_s.split(//))

data/lib/tk/itemconfig.rb

@@ -177,7 +177,7 @@ module TkItemConfigMethod
       fail ArgumentError, "Invalid option `#{orig_opt.inspect}'"
     end
 
-    alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == option}
+    _, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == option}
     if real_name
       option = real_name.to_s
     end
@@ -324,7 +324,7 @@ module TkItemConfigMethod
         fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
       end
 
-      alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+      _, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
       if real_name
         slot = real_name.to_s
       end
@@ -429,7 +429,7 @@ module TkItemConfigMethod
         if slot
           slot = slot.to_s
 
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+          _, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
           if real_name
             slot = real_name.to_s
           end
@@ -806,7 +806,7 @@ module TkItemConfigMethod
         if slot
           slot = slot.to_s
 
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+          _, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
           if real_name
             slot = real_name.to_s
           end

data/lib/tk/itemfont.rb

@@ -101,7 +101,7 @@ module TkTreatItemFont
               else
                 begin
                   tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
-                rescue => e
+                rescue
                   # ignore
                 end
               end
@@ -163,7 +163,7 @@ module TkTreatItemFont
         else
           begin
             tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
-          rescue => e
+          rescue
             # ignore
           end
         end
@@ -223,7 +223,7 @@ module TkTreatItemFont
         else
           begin
             tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
-          rescue => e
+          rescue
             # ignore
           end
         end

data/lib/tk/listbox.rb

@@ -88,7 +88,7 @@ class Tk::Listbox<TkTextWin
     get('0', 'end')
   end
 
-  def value= (vals)
+  def value=(vals)
     unless vals.kind_of?(Array)
       fail ArgumentError, 'an Array is expected'
     end

data/lib/tk/menuspec.rb

@@ -210,7 +210,6 @@ module TkMenuSpec
   private :_create_menu
 
   def _use_menubar?(parent)
-    use_menubar = false
     if parent.kind_of?(Tk::Root) || parent.kind_of?(Tk::Toplevel)
       true
     elsif parent.current_configinfo.has_key?('menu')

data/lib/tk/namespace.rb

@@ -257,7 +257,7 @@ class TkNamespace < TkObject
         if name =~ /^::/
           @fullname = parent + name
         else
-          @fullname = parent +'::'+ name
+          @fullname = parent + '::' + name
         end
       else
         ancestor = __tk_call('namespace', 'current')
@@ -265,7 +265,7 @@ class TkNamespace < TkObject
         if name =~ /^::/
           @fullname = ancestor + '::' + parent + name
         else
-          @fullname = ancestor + '::'+ parent +'::'+ name
+          @fullname = ancestor + '::' + parent + '::' + name
         end
       end
     else # parent == nil

data/lib/tk/optiondb.rb

@@ -210,7 +210,6 @@ module TkOptionDB
     unless func.kind_of?(Array)
       fail ArgumentError, "method-list must be Array"
     end
-    func_str = func.join(' ')
 
     if parent.kind_of?(Class) && parent <= @@resource_proc_class
       cmd_klass = Class.new(parent)

data/lib/tk/optionobj.rb

@@ -36,7 +36,7 @@ module Tk
 
     def _remove_win(win)
       if win.kind_of?(Array)
-        widget, method = win
+        widget, _ = win
         @observ.delete_if{|x|
           if x.kind_of?(Array)
             x[0] == widget

data/lib/tk/scale.rb

@@ -102,7 +102,7 @@ class Tk::Scale<TkWindow
     get
   end
 
-  def value= (val)
+  def value=(val)
     set(val)
     val
   end

data/lib/tk/text.rb

@@ -326,7 +326,7 @@ class Tk::Text<TkTextWin
     _fromUTF8(tk_send_without_enc('get', "1.0", "end - 1 char"))
   end
 
-  def value= (val)
+  def value=(val)
     tk_send_without_enc('delete', "1.0", 'end')
     tk_send_without_enc('insert', "1.0", _get_eval_enc_str(val))
     val

data/lib/tk/validation.rb

@@ -303,7 +303,7 @@ class TkValidateCommand
       args = args.join(' ')
       keys = klass._get_subst_key(args)
       if cmd.kind_of?(String)
-        id = cmd
+        @id = cmd
       elsif cmd.kind_of?(TkCallbackEntry)
         @id = install_cmd(cmd)
       else
@@ -318,7 +318,7 @@ class TkValidateCommand
     else
       keys, args = klass._get_all_subst_keys
       if cmd.kind_of?(String)
-        id = cmd
+        @id = cmd
       elsif cmd.kind_of?(TkCallbackEntry)
         @id = install_cmd(cmd)
       else

data/lib/tk/variable.rb

@@ -27,7 +27,7 @@ class TkVariable
     TkVar_ID_TBL.mutex.synchronize{ TkVar_ID_TBL.clear }
   }
 
-  major, minor, type, patchlevel = TclTkLib.get_version
+  major, minor, _, _ = TclTkLib.get_version
   USE_OLD_TRACE_OPTION_STYLE = (major < 8) || (major == 8 && minor < 4)
 
   #TkCore::INTERP.add_tk_procs('rb_var', 'args',
@@ -1772,11 +1772,11 @@ module Tk
   begin
     INTERP._invoke_without_enc('global', 'auto_path')
     auto_path = INTERP._invoke('set', 'auto_path')
-  rescue => e
+  rescue
     begin
       INTERP._invoke_without_enc('global', 'env')
       auto_path = INTERP._invoke('set', 'env(TCLLIBPATH)')
-    rescue => e
+    rescue
       auto_path = Tk::LIBRARY
     end
   end

data/lib/tk/winfo.rb

@@ -239,7 +239,7 @@ module TkWinfo
     TkWinfo.screendepth self
   end
 
-  def TkWinfo.screenheight (win)
+  def TkWinfo.screenheight(win)
     number(tk_call_without_enc('winfo', 'screenheight', win))
   end
   def winfo_screenheight

data/lib/tk.rb

@@ -818,7 +818,7 @@ end
 
   def _curr_cmd_id
     #id = format("c%.4d", Tk_IDs[0])
-    id = "c" + TkCore::INTERP._ip_id_ + TkComm::Tk_IDs[0]
+    "c" + TkCore::INTERP._ip_id_ + TkComm::Tk_IDs[0]
   end
   def _next_cmd_id
     TkComm::Tk_IDs.mutex.synchronize{
@@ -1158,63 +1158,15 @@ module TkCore
       opts = ''
     end
 
-    # RUN_EVENTLOOP_ON_MAIN_THREAD = true
+    if defined? ::TK_MAINLOOP_ON_MAIN_THREAD_ONLY
+      RUN_EVENTLOOP_ON_MAIN_THREAD = ::TK_MAINLOOP_ON_MAIN_THREAD_ONLY
+    end
 
     unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
-      if WITH_RUBY_VM ### check Ruby 1.9 !!!!!!!
-        # *** NEED TO FIX ***
-        case RUBY_PLATFORM
-        when /cygwin/
-          RUN_EVENTLOOP_ON_MAIN_THREAD = true
-        when /darwin/ # MacOS X
-=begin
-          ip = TclTkIp.new(name, opts)
-          if ip._invoke_without_enc('tk', 'windowingsystem') == 'aqua' &&
-             (TclTkLib.get_version<=>[8,4,TclTkLib::RELEASE_TYPE::FINAL,6]) > 0
-=end
-          if TclTkLib::WINDOWING_SYSTEM == 'aqua' &&
-             (TclTkLib.get_version<=>[8,4,TclTkLib::RELEASE_TYPE::FINAL,6]) > 0
-            # *** KNOWN BUG ***
-            #  Main event loop thread of TkAqua (> Tk8.4.9) must be the main
-            #  application thread. So, ruby1.9 users must call Tk.mainloop on
-            #  the main application thread.
-            #
-            # *** ADD (2009/05/10) ***
-            #  In some cases (I don't know the description of conditions),
-            #  TkAqua 8.4.7 has a same kind of hang-up trouble.
-            #  So, if 8.4.7 or later, set RUN_EVENTLOOP_ON_MAIN_THREAD to true.
-            #  When you want to control this mode, please call the following
-            #  (set true/false as you want) before "require 'tk'".
-            #  ----------------------------------------------------------
-            #  module TkCore; RUN_EVENTLOOP_ON_MAIN_THREAD = true; end
-            #  ----------------------------------------------------------
-            #
-            # *** ADD (2010/07/05) ***
-            #  The value of TclTkLib::WINDOWING_SYSTEM is defined at compiling.
-            #  If it is inconsistent with linked DLL, please call the following
-            #  before "require 'tk'".
-            #  ----------------------------------------------------------
-            #  require 'tcltklib'
-            #  module TclTkLib
-            #    remove_const :WINDOWING_SYSTEM
-            #    WINDOWING_SYSTEM = 'x11' # or 'aqua'
-            #  end
-            #  ----------------------------------------------------------
-            #
-            RUN_EVENTLOOP_ON_MAIN_THREAD = true
-          else
-            RUN_EVENTLOOP_ON_MAIN_THREAD = false
-=begin
-            ip.delete
-            ip = nil
-=end
-          end
-        else
-          RUN_EVENTLOOP_ON_MAIN_THREAD = false
-        end
-
-      else # Ruby 1.8.x
+      if defined? ::IRB
         RUN_EVENTLOOP_ON_MAIN_THREAD = false
+      else
+        RUN_EVENTLOOP_ON_MAIN_THREAD = WITH_RUBY_VM
       end
     end
 
@@ -1935,9 +1887,6 @@ EOS
   def getSaveFile(keys = nil)
     tk_call('tk_getSaveFile', *hash_kv(keys))
   end
-  def getMultipleSaveFile(keys = nil)
-    simplelist(tk_call('tk_getSaveFile', '-multiple', '1', *hash_kv(keys)))
-  end
 
   def chooseColor(keys = nil)
     tk_call('tk_chooseColor', *hash_kv(keys))
@@ -3487,7 +3436,7 @@ module TkTreatFont
         else
           begin
             tk_call(*(__config_cmd << "-#{optkey}" << ltn))
-          rescue => e
+          rescue
             # ignore
           end
         end
@@ -3547,7 +3496,7 @@ module TkTreatFont
         else
           begin
             tk_call(*(__config_cmd << "-#{optkey}" << knj))
-          rescue => e
+          rescue
             # ignore
           end
         end
@@ -3804,7 +3753,7 @@ module TkConfigMethod
       fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
     end
 
-    alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
+    _, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
     if real_name
       slot = real_name.to_s
     end
@@ -3948,7 +3897,7 @@ module TkConfigMethod
         fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
       end
 
-      alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
+      _, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
       if real_name
         slot = real_name.to_s
       end
@@ -4051,7 +4000,7 @@ module TkConfigMethod
         if slot
           slot = slot.to_s
 
-          alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
+          _, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
           if real_name
             slot = real_name.to_s
           end
@@ -4431,7 +4380,7 @@ module TkConfigMethod
         if slot
           slot = slot.to_s
 
-          alias_name, real_name = __optkey_aliases.find{|k,var| k.to_s == slot}
+          _, real_name = __optkey_aliases.find{|k,var| k.to_s == slot}
           if real_name
             slot = real_name.to_s
           end

data/lib/tkextlib/blt/component.rb

@@ -84,13 +84,13 @@ module Tk::BLT
     private :__item_pathname
 
     def axis_cget_tkstring(id, option)
-      ret = itemcget_tkstring(['axis', tagid(id)], option)
+      itemcget_tkstring(['axis', tagid(id)], option)
     end
     def axis_cget(id, option)
-      ret = itemcget(['axis', tagid(id)], option)
+      itemcget(['axis', tagid(id)], option)
     end
     def axis_cget_strict(id, option)
-      ret = itemcget_strict(['axis', tagid(id)], option)
+      itemcget_strict(['axis', tagid(id)], option)
     end
     def axis_configure(*args)
       slot = args.pop

data/lib/tkextlib/bwidget/progressdlg.rb

@@ -37,7 +37,7 @@ class Tk::BWidget::ProgressDlg
     @keys['textvariable'].value
   end
 
-  def text= (txt)
+  def text=(txt)
     @keys['textvariable'].value = txt
   end
 
@@ -49,7 +49,7 @@ class Tk::BWidget::ProgressDlg
     @keys['variable'].value
   end
 
-  def value= (val)
+  def value=(val)
     @keys['variable'].value = val
   end
 

data/lib/tkextlib/iwidgets/entryfield.rb

@@ -91,7 +91,7 @@ class Tk::Iwidgets::Entryfield
   def value
     _fromUTF8(tk_send_without_enc('get'))
   end
-  def value= (val)
+  def value=(val)
     tk_send_without_enc('delete', 0, 'end')
     tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
     val

data/lib/tkextlib/iwidgets/promptdialog.rb

@@ -59,7 +59,7 @@ class Tk::Iwidgets::Promptdialog
   def value
     _fromUTF8(tk_send_without_enc('get'))
   end
-  def value= (val)
+  def value=(val)
     tk_send_without_enc('delete', 0, 'end')
     tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
     val

data/lib/tkextlib/iwidgets/spinner.rb

@@ -96,7 +96,7 @@ class Tk::Iwidgets::Spinner
   def value
     _fromUTF8(tk_send_without_enc('get'))
   end
-  def value= (val)
+  def value=(val)
     tk_send_without_enc('delete', 0, 'end')
     tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
     val

data/lib/tkextlib/tcllib/tablelist_core.rb

@@ -212,7 +212,7 @@ class Tk::Tcllib::Tablelist
                        nil
                      else # cmd
                        tk_tcl2ruby(cmd)
-                       end
+                     end
                    })
   end
   private :__val2ruby_optkeys

data/lib/tkextlib/tile/treeview.rb

@@ -32,7 +32,7 @@ module Tk::Tile::TreeviewConfig
         if slot
           slot = slot.to_s
 
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+          _, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
           if real_name
             slot = real_name.to_s
           end
@@ -203,7 +203,7 @@ module Tk::Tile::TreeviewConfig
         if slot
           slot = slot.to_s
 
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+          _, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
           if real_name
             slot = real_name.to_s
           end

data/lib/tkextlib/tile.rb

@@ -144,7 +144,6 @@ module Tk
       # Tcl/Tk interpreter working under Ruby/Tk.
       # Please give attention to use this method. It may conflict with
       # some definitions on Tcl/Tk scripts.
-      klass_name = self.name
       proc_name = 'LoadImages'
       if Tk::Tile::USE_TTK_NAMESPACE
         ns_list = ['::tile']

data/lib/tkextlib/tktable/tktable.rb

@@ -155,7 +155,7 @@ class Tk::TkTable::CellTag
 
   def initialize(parent, keys=nil)
     @parent = @t = parent
-    @tpath - parent.path
+    @tpath = parent.path
     CellTag_ID.mutex.synchronize{
       @path = @id = CellTag_ID.join(TkCore::INTERP._ip_id_)
       CellTag_ID[1].succ!

data/lib/tkextlib/treectrl/tktreectrl.rb

@@ -1294,7 +1294,7 @@ class Tk::TreeCtrl
 
   def item_state_get(item, *args)
     if args.empty?
-      list(tk_send('item', 'state', 'get', item *args))
+      list(tk_send('item', 'state', 'get', item * args))
     else
       bool(tk_send('item', 'state', 'get', item))
     end

data/sample/demos-en/knightstour.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby -r thread_tk
 # frozen_string_literal: false
 # Based on the widget demo of Tcl/Tk8.5.2
 # The following is the original copyright text.

data/sample/demos-jp/knightstour.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby -r thread_tk
 # -*- coding: utf-8 -*-
 # frozen_string_literal: false
 #

data/sample/demos-jp/widget

@@ -4,9 +4,9 @@
 # 漢字コード設定 ( tk.rb のロード時の encoding 推定/設定に使われる )
 #if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
 unless defined?(::Encoding.default_external)
-  $KCODE = 'euc'
+  $KCODE = 'utf-8'
 else
-  DEFAULT_TK_ENCODING = 'EUC-JP'
+  DEFAULT_TK_ENCODING = 'utf-8'
 end
 
 # tk 関係ライブラリの読み込み
@@ -888,7 +888,7 @@ def showCode1(demo)
   $code_window.iconname(file)
   code = open([$demo_dir, file].join(File::Separator), 'r'){|fid| fid.read }
   $code_text.delete('1.0', 'end')
-  code.force_encoding('EUC-JP') if defined?(::Encoding.default_external)
+  code.force_encoding('utf-8') if defined?(::Encoding.default_external)
   $code_text.insert('1.0', code)
   TkTextMarkInsert.new($code_text,'1.0')
   $set_linenum.call($code_text)
@@ -974,7 +974,7 @@ def showCode2(demo)
   $code_window.iconname(file)
   code = open([$demo_dir, file].join(File::Separator), 'r'){|fid| fid.read }
   $code_text.delete('1.0', 'end')
-  code.force_encoding('EUC-JP') if defined?(::Encoding.default_external)
+  code.force_encoding('utf-8') if defined?(::Encoding.default_external)
   $code_text.insert('1.0', code)
   TkTextMarkInsert.new($code_text,'1.0')
   $set_linenum.call($code_text)

data/sample/irbtk.rb

@@ -9,6 +9,8 @@
 #   'remote-tk.rb' includes 'multi-tk.rb'.
 #   ( There is no trouble even if you give both options. )
 #
+require "thread_tk"
+
 require 'remote-tk' if ARGV.delete('--remote-tk')
 require 'multi-tk'  if ARGV.delete('--multi-tk')
 

data/sample/irbtkw.rbw

@@ -6,6 +6,7 @@
 #
 release = '2008/03/08'
 
+require 'thread_tk'
 require 'tk'
 begin
   require 'tktextio'
@@ -13,8 +14,6 @@ rescue LoadError
   require File.join(File.dirname(File.expand_path(__FILE__)), 'tktextio.rb')
 end
 
-require 'irb'
-
 if TkCore::WITH_ENCODING
 else
   # $KCODE setup
@@ -110,8 +109,15 @@ def STDIN.tty?
 end
 
 # IRB setup
+require 'irb'
+
 IRB.init_config(nil)
 IRB.conf[:USE_READLINE] = false
+IRB.conf[:USE_MULTILINE] = false
+IRB.conf[:USE_SINGLELINE] = false
+IRB.conf[:USE_COLORIZE] = false
+IRB.conf[:PROMPT_MODE] = :DEFAULT
+IRB.conf[:VERBOSE] = false
 IRB.init_error
 irb = IRB::Irb.new
 IRB.conf[:MAIN_CONTEXT] = irb.context
@@ -152,5 +158,8 @@ console.bind('Control-c'){
 irb_thread.join
 
 # exit
-ev_loop.kill
-Tk.exit
+begin
+  ev_loop.kill
+  Tk.exit
+rescue
+end

data/sample/tktextio.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -r thread_tk
 # frozen_string_literal: false
 #
 #  TkTextIO class :: handling I/O stream on a TkText widget
@@ -395,6 +395,10 @@ class TkTextIO < TkText
 
   ####################################
 
+  def set_encoding(extern, intern = nil)
+    # not suppot -> do nothing
+  end
+
   def <<(obj)
     _write(obj)
     self

data/tk.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "tk"
-  spec.version       = "0.3.0"
+  spec.version       = "0.5.0"
   spec.authors       = ["SHIBATA Hiroshi", "Nobuyoshi Nakada", "Jeremy Evans"]
   spec.email         = ["hsbt@ruby-lang.org", "nobu@ruby-lang.org", "code@jeremyevans.net"]
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: tk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 - Nobuyoshi Nakada
 - Jeremy Evans
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2023-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,8 +65,9 @@ extensions:
 - ext/tk/tkutil/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - BSDL
 - Gemfile
 - LICENSE.txt
@@ -93,6 +94,7 @@ files:
 - lib/multi-tk.rb
 - lib/remote-tk.rb
 - lib/tcltk.rb
+- lib/thread_tk.rb
 - lib/tk.rb
 - lib/tk/after.rb
 - lib/tk/autoload.rb
@@ -1120,7 +1122,7 @@ licenses:
 - BSD-2-Clause
 metadata:
   msys2_mingw_dependencies: tk
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1135,8 +1137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Tk interface module using tcltklib.
 test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - ruby-head
-before_install:
-  - sudo apt-get install tk tk-dev
-  - gem install bundler --no-document