fxruby 1.6.50 → 1.6.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f5dfd3fc0e923e7a233119fcfad086caab6dc09dd8f6abb5fb29b7bd275152
-  data.tar.gz: a85827224c5717b7214e20f9cc62a846f57a92f5b5a065f4aa9e42af9d6f4b39
+  metadata.gz: b78df00327beab3240be587e4d02ba6ad450ccb6155a7b251bbf661cbbaa4ae1
+  data.tar.gz: 73625a8a66f288a42c142e1a4e20d33acd10f22086e2232b9e284a269996b4f8
 SHA512:
-  metadata.gz: acb3b10556bfc07b2d7258a2afe2453cb9b653e6b41dabf8ccf1283fcd393dd174b150cf2aa6c2c7e07dcc81a71f4b13eec2645dca51cd264d032744711da856
-  data.tar.gz: 53596e21c809737675ae5fc692c8309b952fe480c3c954cf3a8525efb2263a919b030a1a80f4db8589752ee5d50e496f4ff83b3840c5affc89d09ecce36dfb6b
+  metadata.gz: 38ee07ab04312c494b269b5687756ea19bfd79eed59688bc2b931e89be59061e35f746ec8abfa2de41f4fe9bd72e2ba807b210492b3ec4ddc5e5efd420a9a294
+  data.tar.gz: f487234efc9da4704985004d9480a9a7fa357dee1683f0f688f07566aabf4bce49eb0a1ba1e80cfe748f7a68188983a311f29a54c86e8a63e187fccf6c58d084

data/.github/workflows/binary.yml

@@ -25,6 +25,23 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: "4.0"
+
+      - name: install latest swig
+        run: |
+          wget http://prdownloads.sourceforge.net/swig/swig-4.5.0.tar.gz
+          tar xf swig-4.5.0.tar.gz
+          cd swig-4.5.0
+          ./configure -without-alllang --with-ruby
+          make -j`nproc`
+          sudo make install
+
+      - name: Print tool versions
+        run: |
+          ruby -v
+          gcc -v
+          swig -version
+          gem env
+
       - run: bundle install
 
       - name: Build binary gem

data/.github/workflows/ci.yml

@@ -35,10 +35,20 @@ jobs:
       - uses: ruby/setup-ruby-pkgs@v1
         with:
           ruby-version: ${{ matrix.ruby }}      # passed to ruby/setup-ruby
-          apt-get: "xpra xserver-xorg-video-dummy libxrandr-dev libfox-1.6-dev swig" # Ubuntu
-          brew: "fox swig xquartz"     # macOS
+          apt-get: "xserver-xorg-video-dummy libxrandr-dev libfox-1.6-dev" # Ubuntu
+          brew: "fox xquartz"     # macOS
           mingw: "fox swig"   # Windows mingw / mswin /ucrt
 
+      - name: install latest swig
+        if: matrix.os != 'windows'
+        run: |
+          wget http://prdownloads.sourceforge.net/swig/swig-4.5.0.tar.gz
+          tar xf swig-4.5.0.tar.gz
+          cd swig-4.5.0
+          ./configure -without-alllang --with-ruby
+          make -j`nproc`
+          sudo make install
+
       - name: Print tool versions
         run: |
           ruby -v
@@ -68,6 +78,7 @@ jobs:
       - name: Linux Start xpra to enable GLX
         if: matrix.os == 'ubuntu'
         run: |
+          curl https://xpra.org/get-xpra.sh | bash
           xpra --xvfb="Xorg +extension GLX -config `pwd`/test/dummy.xorg.conf -logfile ${HOME}/.xpra/xorg.log"  start :9
           echo "DISPLAY=:9"  >> $GITHUB_ENV
 

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+plugin "rubygems-requirements-system"
+
 # No fxruby gemspec, since "bundle package" fails on bundler-2.7+, if the extension isn't built
 # gemspec
 
@@ -9,10 +11,13 @@ gem 'mini_portile2'
 
 group :development do
   gem 'rake-compiler', '~> 1.0'
-  gem 'rake-compiler-dock', '~> 1.11.0'
-  gem 'yard', '~> 0.8'
+  gem 'rake-compiler-dock', '~> 1.12.0'
+  gem 'yard', '~> 0.8', '>= 0.9.36'
   gem "bundler", ">= 1.12", "< 5.a"
   gem "rake", "~> 13.0"
+  gem 'rdoc'
+  gem 'webrick' # for "yard server"
+  gem 'redcarpet', '~> 3.0'
 end
 
 group :test do

data/History.md

@@ -1,3 +1,17 @@
+## 1.6.51 / 2026-11-12
+
+* Update to swig-4.5 which makes use of TypedData structs which is required for ruby-4.1.
+* Replace `DATA_PTR` and `Data_Get_Struct` by `SWIG_ConvertPtr`.
+* Add possibility to enable FXTRACE output by the environment variable "fxTraceLevel" when running "rake test".
+* Add `FXMat[34][fd]#to_a` , `#==` and `#inspect`.
+  They have been available for years in `FXVec` classes already.
+* Fix `Fox::Canvas::Shape` when running without global `include Fox`
+* Fix segfault because of missing object deregister for FXDCWindow.
+* Fix deprecation warnung about `fptr->tied_io_for_writing`
+* Fix type conversions of `Array<FXPoint>`, `Array<FXRectangle>`, `Array<FXSegment>` and `Array<FXArc>` to raise an error on type mismatch.
+  This wasn't checked before and could lead to invalid memory access.
+* Update to libz-1.4, libpng-1.6.59, libjpeg-turbo-3.2.1, libtiff-4.7.2 for Windows binary gems.
+
 ## 1.6.50 / 2026-01-02
 
 * Add binary gem support for ruby-4.0.

data/Rakefile

@@ -184,6 +184,8 @@ namespace :gem do
     task plat => ['gem', 'prepare'] do
       debug = "FXRUBY_MINGW_DEBUG=#{ENV['FXRUBY_MINGW_DEBUG'].inspect}" if ENV['FXRUBY_MINGW_DEBUG']
       RakeCompilerDock.sh <<-EOT, platform: plat
+        sudo mkdir -p /__w/mingw-w64-gcc-xpack/mingw-w64-gcc-xpack/build/linux-arm64/application/x86_64-w64-mingw32/lib/../lib/ &&
+        (sudo ln /xpack-mingw/x86_64-w64-mingw32/lib/libstdc++.la /__w/mingw-w64-gcc-xpack/mingw-w64-gcc-xpack/build/linux-arm64/application/x86_64-w64-mingw32/lib/../lib/libstdc++.la || true) &&
         sudo apt-get update &&
         sudo apt-get install -y yasm libtool m4 automake &&
         bundle config set without test &&
@@ -194,56 +196,28 @@ namespace :gem do
   end
 end
 
-namespace :swig do
-  def patch_swigruby(line)
-    # Ruby-2.7+ finally changed callback function signatures from (*)(ANYARGS) to a proper signature, on which the compiler is able to check parameter types.
-    # Unfortunately this requires a bunch of patches to swig's generated code.
-
-    line.gsub! '#include <ruby.h>', <<-EOT
-      #include <ruby.h>
-
-      #if defined(RB_METHOD_DEFINITION_DECL)
-      # define RUBY_VALUE_METHOD_FUNC(func) (func)
-      # define RUBY_INT_METHOD_FUNC(func) (func)
-      # define RUBY_VOID_METHOD_FUNC(func) (func)
-      # define RUBY_VOIDP_METHOD_FUNC(func) (func)
-      #else
-      # define RUBY_VALUE_METHOD_FUNC(func) ((VALUE (*)(ANYARGS))(func))
-      # define RUBY_INT_METHOD_FUNC(func) ((int (*)(ANYARGS))(func))
-      # define RUBY_VOID_METHOD_FUNC(func) ((void (*)(ANYARGS))(func))
-      # define RUBY_VOIDP_METHOD_FUNC(func) ((void *(*)(ANYARGS))(func))
-      #endif
-    EOT
-    line.gsub! /rb_define_virtual_variable\((.*?), (\w+), NULL\)/, <<-EOT
-      rb_define_virtual_variable(\\1, RUBY_VALUE_METHOD_FUNC(\\2), RUBY_VOID_METHOD_FUNC((rb_gvar_setter_t*)NULL))
-    EOT
-
-    line.gsub!('static VALUE swig_ruby_trackings_count(ANYARGS)', 'static VALUE swig_ruby_trackings_count(ID id, VALUE *var)')
-    line.gsub!('SWIG_ruby_failed(void)', 'SWIG_ruby_failed(VALUE, VALUE)')
-
-    line.gsub!(/SWIGINTERN VALUE SWIG_AUX_(\w+)\(VALUE \*args\)\s\{/m, 'SWIGINTERN VALUE SWIG_AUX_\\1(VALUE pargs){VALUE *args=(VALUE *)pargs;')
-
-    line.gsub! /static int swig_ruby_internal_iterate_callback\(void\* ptr, VALUE obj, void\(\*meth\)\(void\* ptr, VALUE obj\)\)\s*{\s*\(\*meth\)\(ptr, obj\);/m, <<-EOT
-      static int swig_ruby_internal_iterate_callback(st_data_t ptr, st_data_t obj, st_data_t meth) {
-        ((void(*)(void*, VALUE))meth)((void*)ptr, (VALUE)obj);
-    EOT
+$matched_gsubs = Hash.new { |h,e| h[e] = [] }
+def checked_gsub!(str, from, to)
+  old = str.dup
+  n = str.gsub!(from, to)
 
-    line.gsub!('(int (*)(ANYARGS))&swig_ruby_internal_iterate_callback', 'RUBY_INT_METHOD_FUNC(swig_ruby_internal_iterate_callback)')
+  $matched_gsubs[[from, to]] << (old != str)
 
-    line.gsub! /rb_ensure\(VALUEFUNC\((.*)\), self, VALUEFUNC\((.*)\), self\);/, 'rb_ensure(RUBY_VALUE_METHOD_FUNC(\\1), self, RUBY_VALUE_METHOD_FUNC(\\2), self);'
-    line.gsub! /rb_rescue\(RUBY_METHOD_FUNC\((.*)\), \(VALUE\)a, RUBY_METHOD_FUNC\((.*)\), 0\)/, 'rb_rescue(RUBY_VALUE_METHOD_FUNC(\\1), (VALUE)a, RUBY_VALUE_METHOD_FUNC(\\2), 0)'
+  n
+end
 
-    line.gsub!('VALUE cl = rb_define_class("swig_runtime_data", rb_cObject);', 'VALUE cl = rb_define_class("SWIG_RUNTIME_DATA", rb_cObject);rb_undef_alloc_func(cl);')
+namespace :swig do
+  def patch_swigruby(line)
 
     # Allow Truffleruby-22.1.0 to compile the sources without fxscintilla.
     # Unfortunately Truffleruby still fails with various runtime errors.
     if RUBY_ENGINE == "truffleruby"
-      line.gsub! '#include <ruby.h>', <<-EOT
+      checked_gsub! line,  '#include <ruby.h>', <<-EOT
         #include <ruby.h>
         #define rb_define_virtual_variable(x,y,z)
       EOT
 
-      line.gsub! 'rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer);', <<-EOT
+      checked_gsub! line, 'rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer);', <<-EOT
         if (rb_gv_get("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME) == RUBY_Qnil) {
           rb_gv_set("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, swig_runtime_data_type_pointer);
         }
@@ -257,13 +231,13 @@ namespace :swig do
     puts "Update #{wrapper_src_file_name}"
 
     line = File.read(wrapper_src_file_name)
-    line.gsub!(/static VALUE mCore;/, "VALUE mCore;")
-    line.gsub!(/mCore = rb_define_module\("Core"\)/, "mFox = rb_define_module(\"Fox\")")
-    line.gsub!(/mCore/, "mFox")
-    line.gsub!(/static VALUE m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui);/, '')
-    line.gsub!(/m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui) = rb_define_module.*/, '')
-    line.gsub!(/rb_require.*/, '')
-    line.gsub!(/m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui),/, "mFox,")
+    checked_gsub!(line, /static VALUE mCore;/, "VALUE mCore;")
+    checked_gsub!(line, /mCore = rb_define_module\("Core"\)/, "mFox = rb_define_module(\"Fox\")")
+    checked_gsub!(line, /mCore/, "mFox")
+    # checked_gsub!(line, /static VALUE m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui);/, '')
+    checked_gsub!(line, /m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui) = rb_define_module.*/, '')
+    checked_gsub!(line, /rb_require.*/, '')
+    checked_gsub!(line, /m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui),/, "mFox,")
 
     line = patch_swigruby(line)
 
@@ -396,3 +370,11 @@ namespace :docs do
     sh 'git', 'add', 'docs'
   end
 end
+
+task :compile do
+  never_matched = $matched_gsubs.select { |_key, matches| matches.all?(false) }
+
+  never_matched.each do |(from, to), |
+    warn "gsub didn't match on\n  from: #{from}\n  to: #{to}"
+  end
+end

data/doap.rdf

@@ -77,8 +77,8 @@
     <doap:release>
       <doap:Version>
         <doap:branch>fox16</doap:branch>
-        <doap:created>2025-04-07</doap:created>
-        <doap:revision>1.6.48</doap:revision>
+        <doap:created>2026-03-27</doap:created>
+        <doap:revision>1.6.50</doap:revision>
       </doap:Version>
     </doap:release>
 

data/docs/Fox/Canvas/CanvasError.html

@@ -114,9 +114,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:57 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/CircleShape.html

@@ -467,9 +467,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/ImageShape.html

@@ -467,9 +467,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/LineShape.html

@@ -995,9 +995,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/PolygonShape.html

@@ -135,9 +135,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/RectangleShape.html

@@ -429,9 +429,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/SelectionPolicy.html

@@ -342,9 +342,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/Shape.html

@@ -816,7 +816,7 @@
   <span class='ivar'>@draggable</span> <span class='op'>=</span> <span class='kw'>false</span>
   <span class='ivar'>@x</span> <span class='op'>=</span> <span class='id identifier rubyid_x'>x</span>
   <span class='ivar'>@y</span> <span class='op'>=</span> <span class='id identifier rubyid_y'>y</span>
-  <span class='ivar'>@foreground</span> <span class='op'>=</span> <span class='const'>FXRGB</span><span class='lparen'>(</span><span class='int'>0</span><span class='comma'>,</span> <span class='int'>0</span><span class='comma'>,</span> <span class='int'>0</span><span class='rparen'>)</span>
+  <span class='ivar'>@foreground</span> <span class='op'>=</span> <span class='const'><span class='object_link'><a href="../../Fox.html" title="Fox (module)">Fox</a></span></span><span class='period'>.</span><span class='const'>FXRGB</span><span class='lparen'>(</span><span class='int'>0</span><span class='comma'>,</span> <span class='int'>0</span><span class='comma'>,</span> <span class='int'>0</span><span class='rparen'>)</span>
   <span class='ivar'>@target</span> <span class='op'>=</span> <span class='kw'>nil</span>
   <span class='ivar'>@selector</span> <span class='op'>=</span> <span class='int'>0</span>
 <span class='kw'>end</span></pre>
@@ -1945,9 +1945,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/ShapeCanvas.html

@@ -2021,9 +2021,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:32 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/ShapeGroup.html

@@ -517,9 +517,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/SingleSelectionPolicy.html

@@ -281,9 +281,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas/TextShape.html

@@ -120,8 +120,6 @@
   
   
     
-      <span class="note title readonly">readonly</span>
-    
     
   
   
@@ -358,11 +356,11 @@
     <h2>Instance Attribute Details</h2>
     
       
-      <span id=""></span>
+      <span id="font=-instance_method"></span>
       <div class="method_details first">
   <h3 class="signature first" id="font-instance_method">
   
-    #<strong>font</strong>  &#x21d2; <tt>Object</tt>  <span class="extras">(readonly)</span>
+    #<strong>font</strong>  &#x21d2; <tt>Object</tt> 
   
 
   
@@ -385,12 +383,12 @@
       <pre class="lines">
 
 
-246
 247
-248</pre>
+248
+249</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/fox16/canvas.rb', line 246</span>
+      <pre class="code"><span class="info file"># File 'lib/fox16/canvas.rb', line 247</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_font'>font</span>
   <span class='ivar'>@font</span>
@@ -599,9 +597,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:58 2025 by
+  Generated on Thu Mar 26 09:49:31 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/Canvas.html

@@ -90,7 +90,7 @@
 
 <p>Links</p>
 
-<h5 id="label-"></h5>
+<h5 id=""></h5>
 
 <p>Tk’s Canvas Widget</p>
 
@@ -131,9 +131,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:30 2025 by
+  Generated on Thu Mar 26 09:48:23 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/docs/Fox/FTNonModal.html

@@ -540,9 +540,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:30 2025 by
+  Generated on Thu Mar 26 09:48:23 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>