libui 0.0.4.alpha → 0.0.5.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74f99e290fdd8cddcd933eea2a41dd3ca6949c385feb496f3991df6cdbc730f
-  data.tar.gz: d329a9c983c42281a4897f91c84c562a200d231b75dd8f7bee44763b3c719ad8
+  metadata.gz: 9942c95097af2b3c542472fa3e144e040cf3f9c0ef253e891d87b79b93070e77
+  data.tar.gz: a69a733f1cd1dd2274c601422a2cb3a5b91d762055d73fc3e9e9f59e6f11c919
 SHA512:
-  metadata.gz: 715cd016369cce7a28b4f4789f3b42fbe383b13d97c7bd8debda929cabefba2672487c5ecbdef8f9b621fae22228e17c39914de3c99b67da659b6a6fd0b976bf
-  data.tar.gz: 7271aad7f11b22d39f82ef693d3e0be914cf6c33e851872b6b0eef6e080890f7854192dcb104550de6f0e626b5793c916caf3d415618084b86dd4a987bc9754d
+  metadata.gz: 47d42cfbc47996ad411f0ba9e6634378fa2bd088d84bc4179698c4ad3c049a7ce8e75218c8fd93538362d01961c9ca4d278aa2c60a5074a1fea532d4b22841b8
+  data.tar.gz: 25c390450f42ff51ee05a9f5c7c9409c16860ac1ae3351e0d85aa30ad1d753f7cad2e1091ff9193bdf85cb21d77c344fbe1acdb5e429746e9d69574b59388379

data/README.md

@@ -1,7 +1,9 @@
 # libui
+
+![build](https://github.com/kojix2/libui/workflows/build/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/libui.svg)](https://badge.fury.io/rb/libui)
 
-[libui](https://github.com/andlabs/libui) - a portable GUI library -for Ruby
+:radio_button: [libui](https://github.com/andlabs/libui) - a portable GUI library -for Ruby
 
 ## Installation
 
@@ -9,6 +11,8 @@
 gem install libui --pre
 ```
 
+The libui gem package contains the official release of the libui shared library version 4.1 for Windows, Mac, and Linux.
+
 ## Usage
 
 See [examples](https://github.com/kojix2/libui/tree/main/examples) directory.

data/lib/libui.rb

@@ -9,31 +9,68 @@ module LibUI
     attr_accessor :ffi_lib
   end
 
-  self.ffi_lib = case RbConfig::CONFIG['host_os']
-                 when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-                   # File.expand_path("libui.dll", ENV['LIBUIDIR'])
-                   File.expand_path('../vendor/libui.dll', __dir__)
-                 when /darwin|mac os/
-                   # File.expand_path("libui.dylib", ENV['LIBUIDIR'])
-                   File.expand_path('../vendor/libui.dylib', __dir__)
-                 else # TODO: Mac
-                   # File.expand_path("libui.so", ENV['LIBUIDIR'])
-                   File.expand_path('../vendor/libui.so', __dir__)
+  lib_name = case RbConfig::CONFIG['host_os']
+             when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+               'libui.dll'
+             when /darwin|mac os/
+               'libui.dylib'
+             else
+               'libui.so'
+             end
+
+  self.ffi_lib = if ENV['LIBUIDIR'] && !ENV['LIBUIDIR'].empty?
+                   File.expand_path(lib_name, ENV['LIBUIDIR'])
+                 else
+                   File.expand_path("../vendor/#{lib_name}", __dir__)
                  end
 
   require_relative 'libui/ffi'
 
   class << self
-    FFI.ffi_methods.each do |original_method_name|
+    FFI.func_map.each_key do |original_method_name|
+      # Convert snake_case to CamelCase.
       name = original_method_name.delete_prefix('ui')
                                  .gsub(/::/, '/')
                                  .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
                                  .gsub(/([a-z\d])([A-Z])/, '\1_\2')
                                  .tr('-', '_')
                                  .downcase
-      define_method(name) do |*args|
+
+      func = FFI.func_map[original_method_name]
+
+      define_method(name) do |*args, &blk|
+        # Assume that block is the last argument.
+        args << blk if blk
+
+        # The proc object is converted to a Closure::BlockCaller object.
+        args.map!.with_index do |arg, idx|
+          if arg.is_a?(Proc)
+            # The types of the function arguments are recorded beforehand.
+            # See the monkey patch in ffi.rb.
+            Fiddle::Closure::BlockCaller.new(*func.inner_functions[idx][1..2], &arg)
+          else
+            arg
+          end
+        end
+
+        # Make it possible to omit the last nil. This may be an over-optimization.
+        siz = func.argtype.size - 1
+        args[siz] = nil if args.size == siz
+
         FFI.public_send(original_method_name, *args)
       end
     end
+
+    module CustomMethods
+      def init(opt = FFI::InitOptions.malloc)
+        i = super(opt)
+        unless i.size.zero?
+          warn 'error'
+          warn UI.free_init_error(init)
+        end
+      end
+    end
+
+    prepend CustomMethods
   end
 end

data/lib/libui/ffi.rb

@@ -2,6 +2,81 @@
 
 require 'fiddle/import'
 
+module Fiddle
+  # Change the Function to hold a little more information.
+  # FIXME: Give inner_function a better name.
+  class Function
+    attr_accessor :inner_functions, :argtype
+  end
+
+  module Importer
+    def parse_signature(signature, tymap = nil)
+      tymap ||= {}
+      ret, func, args = split_signature(signature)
+      symname = func
+      ctype   = parse_ctype(ret, tymap)
+      inner_funcs = []                                                    # 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
+          # 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
+          # Use Fiddle's parse_signature method again.
+          inner_funcs[idx] = parse_signature(func_arg)                    # Added
+        end                                                               # Added
+        parse_ctype(arg, tymap)
+      end
+      # Added inner_funcs. Original method return only 3 values.
+      [symname, ctype, argtype, inner_funcs]
+    end
+
+    # refactored
+    def split_signature(signature)
+      case compact(signature)
+      when /^(?:[\w*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
+        func = Regexp.last_match(1)
+        args = Regexp.last_match(2)
+        [TYPE_VOIDP, func, args]
+      when /^([\w*\s]+[*\s])(\w+)\((.*?)\);?$/
+        ret  = Regexp.last_match(1).strip
+        func = Regexp.last_match(2)
+        args = Regexp.last_match(3)
+        [ret, func, args]
+      else
+        raise("can't parse the function prototype: #{signature}")
+      end
+    end
+
+    def extern(signature, *opts)
+      symname, ctype, argtype, inner_funcs = parse_signature(signature, type_alias)
+      opt = parse_bind_options(opts)
+      f = import_function(symname, ctype, argtype, opt[:call_type])
+
+      f.inner_functions = inner_funcs # Added
+      f.argtype         = argtype     # Added
+
+      name = symname.gsub(/@.+/, '')
+      @func_map[name] = f
+      # 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
+      rescue StandardError
+        file, line = __FILE__, __LINE__ + 3
+      end
+      module_eval(<<-EOS, file, line)
+        def #{name}(*args, &block)
+          @func_map['#{name}'].call(*args,&block)
+        end
+      EOS
+      module_function(name)
+      f
+    end
+  end
+end
+
 module LibUI
   module FFI
     extend Fiddle::Importer
@@ -13,20 +88,12 @@ module LibUI
     end
 
     class << self
-      attr_reader :ffi_methods
+      attr_reader :func_map
 
-      # Improved extern method.
-      # 1. Ignore functions that cannot be attached.
-      # 2. Available function (names) are stored in @ffi_methods.
       def try_extern(signature, *opts)
-        @ffi_methods ||= []
-        begin
-          func = extern(signature, *opts)
-          @ffi_methods << func.name
-          func
-        rescue StandardError => e
-          warn "#{e.class.name}: #{e.message}"
-        end
+        extern(signature, *opts)
+      rescue StandardError => e
+        warn "#{e.class.name}: #{e.message}"
       end
     end
 
@@ -401,6 +468,11 @@ module LibUI
 
     try_extern 'uiAttribute *uiNewUnderlineColorAttribute(uiUnderlineColor u, double r, double g, double b, double a)'
     try_extern 'void uiAttributeUnderlineColor(const uiAttribute *a, uiUnderlineColor *u, double *r, double *g, double *b, double *alpha)'
+
+    # uiOpenTypeFeatures
+
+    typealias 'uiOpenTypeFeaturesForEachFunc', 'void*'
+
     try_extern 'uiOpenTypeFeatures *uiNewOpenTypeFeatures(void)'
     try_extern 'void uiFreeOpenTypeFeatures(uiOpenTypeFeatures *otf)'
     try_extern 'uiOpenTypeFeatures *uiOpenTypeFeaturesClone(const uiOpenTypeFeatures *otf)'
@@ -410,6 +482,11 @@ module LibUI
     try_extern 'void uiOpenTypeFeaturesForEach(const uiOpenTypeFeatures *otf, uiOpenTypeFeaturesForEachFunc f, void *data)'
     try_extern 'uiAttribute *uiNewFeaturesAttribute(const uiOpenTypeFeatures *otf)'
     try_extern 'const uiOpenTypeFeatures *uiAttributeFeatures(const uiAttribute *a)'
+
+    # uiAttributedString
+
+    typealias 'uiAttributedStringForEachAttributeFunc', 'void*'
+
     try_extern 'uiAttributedString *uiNewAttributedString(const char *initialString)'
     try_extern 'void uiFreeAttributedString(uiAttributedString *s)'
     try_extern 'const char *uiAttributedStringString(const uiAttributedString *s)'

data/lib/libui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LibUI
-  VERSION = '0.0.4.alpha'
+  VERSION = '0.0.5.alpha'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libui
 version: !ruby/object:Gem::Version
-  version: 0.0.4.alpha
+  version: 0.0.5.alpha
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler