libui 0.0.12 → 0.0.15.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f74d579c937d71a61c613abe93ca07ae1bafa8c78933d7cd4f979fc92b327883
-  data.tar.gz: f091c583e9fd5c53673232b4babc90f87c626a8185c4fcfb576ce9d89d36affa
+  metadata.gz: 5e282cdaee29c0b7cd5b7bd11dc0bcb8c546ef927127c7564b79d890ec35e35f
+  data.tar.gz: 321d554f02a4f618590d2fc3652463e928136d1008b8836f15814a1f45c95072
 SHA512:
-  metadata.gz: 8897e6b92a054070600be68a2f646e7b79468ace0ed6b6c0de4713a2b3cf8e7a72ef35e6934d72f1d31112778a6f948c49ca74130d805e189a72c448144fd35f
-  data.tar.gz: ad4f816e611238801cfefdbff60891f86703c92554fbca79691e4bcff1fd9a4dff45ebeabd78acd57aedaf56ff3f120b9cd16ca95788a469bb0cb58060194dcc
+  metadata.gz: 05af08c9952f4107fd21a3db10aca8c6c37e1396076b8eebefe11efbe1b7d3b94e985eae313867b1a92b668cd916811711b60da4e83aaeea646f8809bcf0457b
+  data.tar.gz: 0e3e330daefd9483f0e885dbd1aeea1dbf9a4fa9843f83e30b529cdcb7fad99887916a3a9bb44d95e39a75537eb5297f7e55e75e0d2df1cc7542373eeeeabef6

data/README.md

@@ -2,8 +2,9 @@
 
 ![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)
+<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>
 
-:radio_button: [libui](https://github.com/andlabs/libui) - a portable GUI library - for Ruby
+:radio_button: [libui](https://github.com/libui-ng/libui-ng) - a portable GUI library - for Ruby
 
 ## Installation
 
@@ -20,7 +21,10 @@ gem install libui
 |---------|-----|-------|
 |<img src="https://user-images.githubusercontent.com/5798442/103118046-900ea780-46b0-11eb-81fc-32626762e4df.png">|<img src="https://user-images.githubusercontent.com/5798442/103118059-99980f80-46b0-11eb-9d12-324ec4d297c9.png">|<img src="https://user-images.githubusercontent.com/5798442/103118068-a0bf1d80-46b0-11eb-8c5c-3bdcc3dcfb26.png">|
 
-Note: If you are using the 32-bit (x86) version of Ruby, you need to download the 32-bit (x86) native dll. See [Development](#development).
+Note:
+* If you are using the 32-bit (x86) version of Ruby, you need to download the 32-bit (x86) native dll. See [Development](#development).
+* ARM64/AARCH64 Support is limited. See ([#47](https://github.com/kojix2/LibUI/issues/47))
+* On Windows, libui may not work due to missing DLLs. In that case, you need to install [Visual C++ Redistributable](https://docs.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist). See ([#48](https://github.com/kojix2/LibUI/issues/48))
 
 ## Usage
 
@@ -69,12 +73,13 @@ You can use [the documentation for libui's Go bindings](https://pkg.go.dev/githu
 
 ### Not object oriented?
 
-* At the moment, it is not object-oriented.
-  * Instead of providing a half-baked object-oriented approach, leave it as is.
+LibUI is not object-oriented, but provides high portability with minimal implementation.
+If you want to write in an object-oriented way, please use the following DSLs built on top of LibUI.
 
 ### DSLs for LibUI
-  * [Glimmer DSL for LibUI](https://github.com/AndyObtiva/glimmer-dsl-libui)
-  * [libui_paradise](https://rubygems.org/gems/libui_paradise)
+
+* [Glimmer DSL for LibUI](https://github.com/AndyObtiva/glimmer-dsl-libui)
+* [libui_paradise](https://rubygems.org/gems/libui_paradise)
 
 ### How to use fiddle pointers?
 
@@ -100,6 +105,7 @@ font_button = UI.new_font_button
 # Allocate memory 
 font_descriptor = UI::FFI::FontDescriptor.malloc
 font_descriptor.to_ptr.free = Fiddle::RUBY_FREE
+# font_descriptor = UI::FFI::FontDescriptor.malloc(Fiddle::RUBY_FREE) # fiddle 1.0.1 or higher
 
 UI.font_button_on_changed(font_button) do
   UI.font_button_font(font_button, font_descriptor)
@@ -185,6 +191,12 @@ Would you like to add your commits to libui?
   * Small corrections, such as typofixes, are appreciated.
 * Did you find any bugs?　Write it in the [issues](https://github.com/kojix2/LibUI/issue) section!
 
+```
+Do you need commit rights to my repository?
+Do you want to get admin rights and take over the project?
+If so, please feel free to contact me @kojix2.
+```
+
 ## Acknowledgement
 
 This project is inspired by libui-ruby.

data/lib/libui/ffi.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'fiddle/import'
 require_relative 'fiddle_patch'
 
@@ -36,7 +34,7 @@ module LibUI
 
     # https://github.com/andlabs/libui/blob/master/ui.h
     # keep same order
-    
+
     try_extern 'const char *uiInit(uiInitOptions *options)'
     try_extern 'void uiUninit(void)'
     try_extern 'void uiFreeInitError(const char *err)'

data/lib/libui/libui_base.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module LibUI
   module LibUIBase
     FFI.func_map.each_key do |original_method_name|
@@ -12,24 +10,33 @@ module LibUI
 
         # 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.
-            callback = Fiddle::Closure::BlockCaller.new(
-              *func.callback_argument_types[idx][1..2], &arg
-            )
-            # Protect from GC
-            # See https://github.com/kojix2/LibUI/issues/8
-            receiver = args[0]
-            if receiver.instance_variable_defined?(:@callbacks)
-              receiver.instance_variable_get(:@callbacks) << callback
-            else
-              receiver.instance_variable_set(:@callbacks, [callback])
-            end
-            callback
+          next arg unless arg.is_a?(Proc)
+
+          # now arg must be Proc
+
+          # The types of the function arguments are stored in advance.
+          # See the monkey patch in ffi.rb.
+          _f, ret_type, arg_types = func.callback_argument_types[idx]
+          # TODO: raise some nice error if _f is nil.
+
+          callback = Fiddle::Closure::BlockCaller.new(
+            ret_type, arg_types, &arg
+          )
+          # Protect from GC
+          # by giving the owner object a reference to the callback.
+          # See https://github.com/kojix2/LibUI/issues/8
+          owner = if idx == 0 or   # UI.queue_main{}
+                     owner.frozen? # UI.timer(100) {}
+                    LibUIBase # or UI is better?
+                  else
+                    args[0] # receiver
+                  end
+          if owner.instance_variable_defined?(:@callbacks)
+            owner.instance_variable_get(:@callbacks) << callback
           else
-            arg
+            owner.instance_variable_set(:@callbacks, [callback])
           end
+          callback
         end
 
         # Make it possible to omit the last nil. This may be an over-optimization.

data/lib/libui/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module LibUI
-  VERSION = '0.0.12'
+  VERSION = '0.0.15.pre'
 end

data/lib/libui.rb

@@ -1,7 +1,6 @@
-# frozen_string_literal: true
-
 require_relative 'libui/version'
 require_relative 'libui/utils'
+require 'rbconfig'
 
 module LibUI
   class Error < StandardError; end
@@ -35,6 +34,21 @@ module LibUI
       warn 'error'
       warn UI.free_init_error(init)
     end
+
+    def open_type_features_add(otf, a, b, c, d, value)
+      a, b, c, d = [a, b, c, d].map { |s| s.is_a?(String) ? s.ord : s }
+      super(otf, a, b, c, d, value)
+    end
+
+    def open_type_features_remove(otf, a, b, c, d)
+      a, b, c, d = [a, b, c, d].map { |s| s.is_a?(String) ? s.ord : s }
+      super(otf, a, b, c, d)
+    end
+
+    def open_type_features_get(otf, a, b, c, d, value)
+      a, b, c, d = [a, b, c, d].map { |s| s.is_a?(String) ? s.ord : s }
+      super(otf, a, b, c, d, value)
+    end
   end
 
   # UI_ENUM

metadata

@@ -1,85 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: libui
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.15.pre
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2022-03-06 00:00:00.000000000 Z
+dependencies: []
 description: 
 email:
 - 2xijok@gmail.com
@@ -115,11 +45,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to libui