libui 0.2.3-aarch64-linux → 0.3.0.pre-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4a00e59b8214cf875852734d5b74c5716c38a1c4ba8354d8036a6ca6ec40599
-  data.tar.gz: b4d535e83d07883fe6561ab5fa8ff3620225dc29274f3c5ecdb6fa78ad27d115
+  metadata.gz: c574d66c9aed94a75cc4f6be9736d5dd7690a6cf2f782c0a4ef5f0da7e3665e7
+  data.tar.gz: fe67f24b496f5b5db00202e54a1414496a6f2997d9bbad250b686cb15a000b0b
 SHA512:
-  metadata.gz: b93bb829808ac504a2bbf4bed51f742ca266d4e7cf10aa9840677b089f309f4fc7d05c3c204491c239b775a5c023252770ac9125c44e0b56dcc9e55c842be4a3
-  data.tar.gz: b5cdf29edc3f92aae2a42431ce426d5d69ae7709905535e9d188749a990ef2c23ef81869cdeb7b2d407ae109c77cbe00886442358c2488216d997b22e8f7258d
+  metadata.gz: 4440a926c29fc84608e413e9a4bc1ce12cd399c948f0b514af7f201e2b94586c83b4155a088dd4cba4307522a1969b28c98eec5a68700a630c1f70bf0a274cf0
+  data.tar.gz: 6781e13639949e951110884515fb88f0f3124e8a1744b8e737c38c9bf2d6bf5fde2daec0ceaf87456ef8014669882bb8f729d5185fca8a274aa1c89db6a90a45

data/README.md

@@ -2,8 +2,9 @@
 
 [![test](https://github.com/kojix2/LibUI/actions/workflows/test.yml/badge.svg)](https://github.com/kojix2/LibUI/actions/workflows/test.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>
+[![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)
+[![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)
 
 LibUI is a Ruby wrapper for libui family.
 
@@ -185,18 +186,6 @@ 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

@@ -418,6 +418,7 @@ module LibUI
     try_extern 'void uiDrawClip(uiDrawContext *c, uiDrawPath *path)'
     try_extern 'void uiDrawSave(uiDrawContext *c)'
     try_extern 'void uiDrawRestore(uiDrawContext *c)'
+    try_extern 'void uiDrawImage(uiDrawContext *c, uiImage *img, double x, double y, double width, double height)'
 
     # uiAttribute
     try_extern 'void uiFreeAttribute(uiAttribute *a)'
@@ -581,6 +582,14 @@ module LibUI
     try_extern 'void uiFreeImage(uiImage *i)'
     try_extern 'void uiImageAppend(uiImage *i, void *pixels, int pixelWidth, int pixelHeight, int byteStride)'
 
+    # uiImageView
+    try_extern 'uiImageView *uiNewImageView(void)'
+    try_extern 'void uiImageViewSetImage(uiImageView *iv, const uiImage *image)'
+
+    typealias 'uiImageViewContentMode', 'int'
+
+    try_extern 'void uiImageViewSetContentMode(uiImageView *iv, uiImageViewContentMode mode)'
+
     # uiTable
     try_extern 'void uiFreeTableValue(uiTableValue *v)'
 

data/lib/libui/version.rb

@@ -1,3 +1,3 @@
 module LibUI
-  VERSION = '0.2.3'
+  VERSION = '0.3.0.pre'
 end

data/lib/libui.rb

@@ -1,20 +1,36 @@
 require_relative 'libui/version'
 require_relative 'libui/utils'
 require_relative 'libui/error'
-require_relative 'libui/platform'
+require 'rbconfig'
 
 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?
-      Platform.current_lib_names.lazy
+      lib_name.lazy
               .map { |name| File.expand_path(name, ENV['LIBUIDIR']) }
               .find { |path| File.exist?(path) }
     else
-      Platform.current_lib_names.lazy
+      lib_name.lazy
               .map { |name| File.expand_path("../vendor/#{name}", __dir__) }
               .find { |path| File.exist?(path) }
     end
@@ -335,6 +351,10 @@ module LibUI
   AtTrailing = 2
   AtBottom   = 3
 
+  # ImageViewContentMode
+  ImageViewContentCenter = 0
+  ImageViewContentFit    = 1
+
   # TableValueType
   TableValueTypeString = 0
   TableValueTypeImage  = 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libui
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0.pre
 platform: aarch64-linux
 authors:
 - kojix2
@@ -36,7 +36,6 @@ 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

data/lib/libui/platform.rb

@@ -1,164 +0,0 @@
-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