tk 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1347bf6638e8e5c8ad7de473d26b0c8b3d2f4b8a2c195696c24c19d652cb426
-  data.tar.gz: c52bc29bd1d742bc707c7d53f82c564355c32c43dd64e19a2b4df8ed63b9bbab
+  metadata.gz: 27203ca65a4961a7c3594cd5ec6c50d9f1440aec4640b48d3dc3a2749f599724
+  data.tar.gz: ec99535ddf2b33049fde77d89eee84b1665ca7252ea4ed0b6d5c2d37af87da33
 SHA512:
-  metadata.gz: 47633e9b2b38bbde90c157d6fec882ea7747180de3ac28bbec7d0d8671ec709cf9a0cdff5335186e192b3fdf72c7f4b6de68479b8307d6ea426ba47e3de35482
-  data.tar.gz: 7fb2f1dea579e612ea57eddd8136f855c68b4845d550559c136ca5e92e8c4af1fe437544721763b71f50df5d60e0c19de7ea01f4eb602e7cf177862cc94d0381
+  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/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.rb

@@ -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 = true
-        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))

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.4.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.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 - Nobuyoshi Nakada
 - Jeremy Evans
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-26 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.2.3
-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