libui 0.2.1-aarch64-linux → 0.2.3-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46dd8a324e8f00193d0a24d23bcece4de9fc6526392e3506b3ec81543ff96bd5
-  data.tar.gz: ac3ab3100f882d00d4e67f052ac1047495ae4e448eb4c63fdfd1069bf0ebda93
+  metadata.gz: b4a00e59b8214cf875852734d5b74c5716c38a1c4ba8354d8036a6ca6ec40599
+  data.tar.gz: b4d535e83d07883fe6561ab5fa8ff3620225dc29274f3c5ecdb6fa78ad27d115
 SHA512:
-  metadata.gz: 89ca6535da0b6cc404ceb8cc840bdb938ea6e688f4e68f2d63c33279af5ce9cf42e8f6d53dbfaed5463731dbc59e52d76a3e5e9faa8043de8c2874d2e2731004
-  data.tar.gz: c8df2b43a9563013247315255faaf11a0c2b5ff6b4cbaf3fcc1b7fca416783cae781371eb7a8ef2751113ee2c51e38d8fe707749c2a1e768386150296de75007
+  metadata.gz: b93bb829808ac504a2bbf4bed51f742ca266d4e7cf10aa9840677b089f309f4fc7d05c3c204491c239b775a5c023252770ac9125c44e0b56dcc9e55c842be4a3
+  data.tar.gz: b5cdf29edc3f92aae2a42431ce426d5d69ae7709905535e9d188749a990ef2c23ef81869cdeb7b2d407ae109c77cbe00886442358c2488216d997b22e8f7258d

data/README.md

@@ -1,18 +1,13 @@
 # LibUI
 
 [![test](https://github.com/kojix2/LibUI/actions/workflows/test.yml/badge.svg)](https://github.com/kojix2/LibUI/actions/workflows/test.yml)
-[![Gem Version](https://badge.fury.io/rb/libui.svg)](https://badge.fury.io/rb/libui)
-<a href="https://github.com/AndyObtiva/glimmer-dsl-libui"><img alt="glimmer-dsl-libui" src="https://github.com/AndyObtiva/glimmer/blob/master/images/glimmer-logo-hi-res.svg" width="50" height="50" align="right"></a>
-[![Pre-build](https://github.com/kojix2/libui-ng/actions/workflows/pre-build.yml/badge.svg?branch=pre-build)](https://github.com/kojix2/libui-ng/actions/workflows/pre-build.yml)
+[![Gem Version](https://img.shields.io/badge/dynamic/json?label=gem%20version&query=%24%5B0%5D.number&url=https%3A%2F%2Frubygems.org%2Fapi%2Fv1%2Fversions%2Flibui.json&color=brightgreen)](https://rubygems.org/gems/libui/versions)
 [![Lines of Code](https://img.shields.io/endpoint?url=https%3A%2F%2Ftokei.kojix2.net%2Fbadge%2Fgithub%2Fkojix2%2FLibUI%2Flines)](https://tokei.kojix2.net/github/kojix2/LibUI)
+<a href="https://github.com/AndyObtiva/glimmer-dsl-libui"><img alt="glimmer-dsl-libui" src="https://github.com/AndyObtiva/glimmer/blob/master/images/glimmer-logo-hi-res.svg" width="50" height="50" align="right"></a>
 
 LibUI is a Ruby wrapper for libui family.
 
-:rocket: [libui-ng](https://github.com/libui-ng/libui-ng) - A cross-platform portable GUI library
-
-:wrench: [libui-dev](https://github.com/petabyt/libui-dev) - Native UI library for C - with some extras
-
-:radio_button: [libui](https://github.com/andlabs/libui) - Original version by andlabs.
+:rocket: [libui-ng](https://github.com/kojix2/libui-ng) - A cross-platform portable GUI library
 
 ## Installation
 
@@ -86,7 +81,6 @@ LibUI is not object-oriented because it is a thin Ruby wrapper (binding) for the
 To build actual applications, it is recommended to use a DSL for LibUI, as they enable writing object-oriented code the Ruby way (instead of procedural code the C way):
 
 - [Glimmer DSL for LibUI](https://github.com/AndyObtiva/glimmer-dsl-libui)
-- [libui_paradise](https://rubygems.org/gems/libui_paradise)
 
 ### Working with fiddle pointers
 
@@ -191,6 +185,18 @@ bundle exec rake vendor:auto
 bundle exec rake test
 ```
 
+JRuby on macOS needs Java and AppKit must start on the first thread:
+
+```sh
+export JAVA_HOME=/path/to/openjdk
+export JRUBY_OPTS=-J-XstartOnFirstThread
+jruby -Ilib examples/basic_button.rb
+jruby -S rake test
+```
+
+Take note that, as the above code shows, LibUI works via jruby as well, so you have an additional
+GUI library (aside from jruby-swing by default) to test simple User Interfaces too.
+
 ### Pre-built shared libraries for libui-ng
 
 Download pre-built libui-ng shared libraries (per your current platform):

data/lib/libui/ffi.rb

@@ -3,7 +3,6 @@ require_relative 'fiddle_patch'
 require_relative 'error'
 
 module LibUI
-
   module FFI
     extend Fiddle::Importer
     extend FiddlePatch

data/lib/libui/fiddle_patch.rb

@@ -11,9 +11,9 @@ module LibUI
     def parse_signature(signature, tymap = nil)
       tymap ||= {}
       ctype, func, args = case compact(signature)
-                          when /^(?:[\w\*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
+                          when /^(?:[\w*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
                             [TYPE_VOIDP, Regexp.last_match(1), Regexp.last_match(2)]
-                          when /^([\w\*\s]+[*\s])(\w+)\((.*?)\);?$/
+                          when /^([\w*\s]+[*\s])(\w+)\((.*?)\);?$/
                             [parse_ctype(Regexp.last_match(1).strip, tymap), Regexp.last_match(2), Regexp.last_match(3)]
                           else
                             raise("can't parse the function prototype: #{signature}")
@@ -22,12 +22,12 @@ module LibUI
       callback_argument_types = {}                                              # Added
       argtype = split_arguments(args).collect.with_index do |arg, idx|          # Added with_index
         # Check if it is a function pointer or not
-        if arg =~ /\(\*.*\)\(.*\)/                                              # Added
+        if arg =~ /\(\*.*\)\(.*\)/ # Added
           # From the arguments, create a notation that looks like a function declaration
           # int(*f)(int *, void *) -> int f(int *, void *)
-          func_arg = arg.sub('(*', ' ').sub(')', '')                            # Added
+          func_arg = arg.sub('(*', ' ').sub(')', '') # Added
           # Use Fiddle's parse_signature method again.
-          callback_argument_types[idx] = parse_signature(func_arg)              # Added
+          callback_argument_types[idx] = parse_signature(func_arg) # Added
         end
         parse_ctype(arg, tymap)
       end
@@ -41,8 +41,8 @@ module LibUI
       func = import_function(symname, ctype, argtype, opt[:call_type])
 
       # callback_argument_types
-      func.instance_variable_set(:@callback_argument_types, 
-                                   callback_argument_types) # Added
+      func.instance_variable_set(:@callback_argument_types,
+                                 callback_argument_types) # Added
       # attr_reader
       def func.callback_argument_types
         @callback_argument_types
@@ -68,9 +68,9 @@ module LibUI
       @func_map[name] = func
       # define_method(name){|*args,&block| f.call(*args,&block)}
       begin
-        /^(.+?):(\d+)/ =~ caller.first
-        file = Regexp.last_match(1)
-        line = Regexp.last_match(2).to_i
+        location = caller_locations(1, 1).first
+        file = location.path
+        line = location.lineno
       rescue StandardError
         file, line = __FILE__, __LINE__ + 3
       end

data/lib/libui/platform.rb

@@ -0,0 +1,164 @@
+require 'rbconfig'
+
+module LibUI
+  module Platform
+    CONFIG = {
+      'arm64-darwin' => {
+        vendor: 'vendor/libui.arm64.dylib',
+        lib_names: ['libui.arm64.dylib', 'libui.dylib'],
+        release_zip: 'macOS-arm64-shared-release.zip',
+        release_src: 'builddir/meson-out/libui.dylib'
+      },
+      'x86_64-darwin' => {
+        vendor: 'vendor/libui.x86_64.dylib',
+        lib_names: ['libui.x86_64.dylib', 'libui.dylib'],
+        release_zip: 'macOS-x64-shared-release.zip',
+        release_src: 'builddir/meson-out/libui.dylib'
+      },
+      'x86_64-linux' => {
+        vendor: 'vendor/libui.x86_64.so',
+        lib_names: ['libui.x86_64.so', 'libui.so'],
+        release_zip: 'Ubuntu-x64-shared-release.zip',
+        release_src: 'builddir/meson-out/libui.so'
+      },
+      'aarch64-linux' => {
+        vendor: 'vendor/libui.aarch64.so',
+        lib_names: ['libui.aarch64.so', 'libui.so'],
+        release_zip: 'Ubuntu-arm64-shared-release.zip',
+        release_src: 'builddir/meson-out/libui.so'
+      },
+      'x64-mingw32' => {
+        vendor: 'vendor/libui.x64.dll',
+        lib_names: ['libui.x64.dll', 'libui.dll'],
+        release_zip: 'Windows-x64-msvc-shared-release.zip',
+        release_src: 'builddir/meson-out/libui.dll'
+      },
+      'x86-mingw32' => {
+        vendor: 'vendor/libui.x86.dll',
+        lib_names: ['libui.x86.dll', 'libui.dll'],
+        release_zip: 'Windows-x86-msvc-shared-release.zip',
+        release_src: 'builddir/meson-out/libui.dll'
+      }
+    }.freeze
+
+    class << self
+      def config_keys
+        CONFIG.keys
+      end
+
+      def config_for(platform_key)
+        CONFIG[normalize_platform_key(platform_key)]
+      end
+
+      def current_config
+        config_for(detect_platform_key)
+      end
+
+      def detect_platform_key
+        native_platform_key || rubygems_platform_key
+      end
+
+      def native_platform_key
+        platform_key = case host_os
+                       when /darwin/
+                         "#{normalized_cpu}-darwin"
+                       when /linux/
+                         # libc variants (glibc vs musl) are not supported as
+                         # separate prebuilt targets yet; the shipped Linux
+                         # binaries are built on Ubuntu. Supporting musl would
+                         # require adding explicit *-linux-musl entries.
+                         "#{normalized_cpu}-linux"
+                       when /mingw|mswin/
+                         windows_platform_key
+                       end
+
+        CONFIG.key?(platform_key) ? platform_key : nil
+      end
+
+      def rubygems_platform_key
+        current_platform = Gem::Platform.local
+        platform_key = normalize_platform_key(current_platform.to_s)
+        return platform_key if CONFIG.key?(platform_key)
+
+        CONFIG.keys.find do |config_key|
+          config_platform = Gem::Platform.new(config_key)
+
+          # NOTE: match_platforms? is a private RubyGems API. It is used to
+          # reuse RubyGems' own platform matching (including the libc wildcard
+          # behaviour), but it may change or disappear across RubyGems versions.
+          if Gem::Platform.send(:match_platforms?, current_platform, [config_platform])
+            true
+          elsif config_key == 'x64-mingw32' &&
+                current_platform.os.start_with?('mingw') &&
+                %w[x64 x86_64 amd64].include?(current_platform.cpu)
+            true
+          elsif config_key == 'x86-mingw32' &&
+                current_platform.os.start_with?('mingw') &&
+                %w[x86 i386 i686].include?(current_platform.cpu)
+            true
+          else
+            false
+          end
+        end
+      end
+
+      # Canonicalizes alternate platform spellings to the keys used in CONFIG.
+      # Linux libc suffixes (-gnu / -musl) are intentionally not stripped here;
+      # adding libc-specific artifacts should be an explicit CONFIG change.
+      def normalize_platform_key(platform_key)
+        platform_key.to_s
+                    .sub(/\Aarm64-linux\z/, 'aarch64-linux')
+                    .sub(/\Ax64-linux\z/, 'x86_64-linux')
+                    .sub(/-mingw-ucrt\z/, '-mingw32')
+      end
+
+      def vendor_file_for(platform_key)
+        config = config_for(platform_key)
+        config && config[:vendor]
+      end
+
+      def current_lib_names
+        # host_lib_name and the bare "libui.<soext>" are fallbacks for locally
+        # built or manually placed libraries (e.g. via LIBUIDIR or a source
+        # checkout) whose file names may not match the CONFIG lib_names.
+        host_lib_name = "libui.#{host_cpu}.#{RbConfig::CONFIG['SOEXT']}"
+        names = current_config ? current_config[:lib_names] : []
+        ([host_lib_name] + names + ["libui.#{RbConfig::CONFIG['SOEXT']}"]).uniq
+      end
+
+      private
+
+      def host_cpu
+        RbConfig::CONFIG['host_cpu']
+      end
+
+      def host_os
+        RbConfig::CONFIG['host_os']
+      end
+
+      def normalized_cpu
+        case host_cpu
+        when /i\d86/
+          'x86'
+        when 'amd64', 'x64'
+          'x86_64'
+        when 'aarch64'
+          host_os =~ /darwin/ ? 'arm64' : host_cpu
+        when 'arm64'
+          host_os =~ /linux/ ? 'aarch64' : host_cpu
+        else
+          host_cpu
+        end
+      end
+
+      def windows_platform_key
+        case normalized_cpu
+        when 'x86_64'
+          'x64-mingw32'
+        when 'x86'
+          'x86-mingw32'
+        end
+      end
+    end
+  end
+end

data/lib/libui/version.rb

@@ -1,3 +1,3 @@
 module LibUI
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 end

data/lib/libui.rb

@@ -1,36 +1,20 @@
 require_relative 'libui/version'
 require_relative 'libui/utils'
 require_relative 'libui/error'
-require 'rbconfig'
+require_relative 'libui/platform'
 
 module LibUI
   class << self
     attr_accessor :ffi_lib
   end
 
-  host_cpu = case RbConfig::CONFIG['host_cpu']
-             when /i\d86/
-               'x86'
-             else
-               RbConfig::CONFIG['host_cpu']
-             end
-
-  lib_name = [
-    # For libui-ng shared libraries compiled with (rake vendor:build)
-    "libui.#{RbConfig::CONFIG['host_cpu']}.#{RbConfig::CONFIG['SOEXT']}",
-    # For libui-ng shared library downloaded from RubyGems.org
-    "libui.#{host_cpu}.#{RbConfig::CONFIG['SOEXT']}",
-    # For backward compatibility or manual compilation of libui-ng
-    "libui.#{RbConfig::CONFIG['SOEXT']}"
-  ]
-
   self.ffi_lib = \
     if ENV['LIBUIDIR'] && !ENV['LIBUIDIR'].empty?
-      lib_name.lazy
+      Platform.current_lib_names.lazy
               .map { |name| File.expand_path(name, ENV['LIBUIDIR']) }
               .find { |path| File.exist?(path) }
     else
-      lib_name.lazy
+      Platform.current_lib_names.lazy
               .map { |name| File.expand_path("../vendor/#{name}", __dir__) }
               .find { |path| File.exist?(path) }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libui
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: aarch64-linux
 authors:
 - kojix2
@@ -36,6 +36,7 @@ files:
 - lib/libui/ffi.rb
 - lib/libui/fiddle_patch.rb
 - lib/libui/libui_base.rb
+- lib/libui/platform.rb
 - lib/libui/utils.rb
 - lib/libui/version.rb
 - vendor/LICENSE.md