libui 0.0.10 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5856ad97384408635e170c1ea252dc3dbdfa1ba3955bfc8b8c1ac2c29585ac1
-  data.tar.gz: 67a9b78e39b61805afca932fc80365b59e068493f2da937c57b03e1500a2adf5
+  metadata.gz: ee9a02c819baa560dac3db19f6385c1c92e12ee00f0baa943728fb36381efb58
+  data.tar.gz: b168c699519a2cd32b9ae0b4549af8657137a7315214f5985f1ab602f6a56010
 SHA512:
-  metadata.gz: 5204e35c1c0f4b0c5f8acd69a4a1d76b6482a1fb298376c99ce29632a202c1340a39e017b68c563b4539a74e721b1611cd3a732b4a9983ef2a0fb3eef7a80b3c
-  data.tar.gz: 8fb83fe3d145646bacb598dc88413364d534493f275c2e0ef637e9718908fe895796a1cb95cdb56f6c6d24b216f23ed68a7812a0c0978a5c700a014ecd0d1573
+  metadata.gz: 23f37b10d06d6c2d00eca6f30d7a3eea22d8ad117a857b606d86e40306c7c723f4223e1431cdb13e339b4476425fb27b593c3a763ff8d7c0552dfce565131e8a
+  data.tar.gz: 6ff9da25e26d31fd109f6d8982475d73060a6271b9a437fa3884bf6eb3257c0b7612a8b93d9c5a17def325c545b507ba0d55c14ffbda1e52ce7d1556c8b12b5a

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
 
@@ -64,12 +68,18 @@ Compared to original libui written in C,
 * You can pass a block as a callback. 
   * The block will be converted to a Proc object and added to the last argument.
   * Even in that case, it is possible to omit the last argument nil.
-  
+
+You can use [the documentation for libui's Go bindings](https://pkg.go.dev/github.com/andlabs/ui) as a reference.
+
 ### Not object oriented?
 
-* At the moment, it is not object-oriented.
-  * Instead of providing a half-baked object-oriented approach, leave it as is.
-* [A list of DSLs for LibUI.](https://github.com/kojix2/LibUI/wiki/DSL-for-LibUI)
+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)
 
 ### How to use fiddle pointers?
 
@@ -94,6 +104,8 @@ 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)
@@ -179,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'
 
@@ -34,6 +32,9 @@ module LibUI
       'size_t Size'
     ]
 
+    # 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)'
@@ -214,17 +215,33 @@ module LibUI
     # uiDateTimePicker
 
     # time.h
-    TM = struct [
-      'int tm_sec',
-      'int tm_min',
-      'int tm_hour',
-      'int tm_mday',
-      'int tm_mon',
-      'int tm_year',
-      'int tm_wday',
-      'int tm_yday',
-      'int tm_isdst'
-    ]
+    TM = if Fiddle::WINDOWS
+           struct [
+             'int tm_sec',
+             'int tm_min',
+             'int tm_hour',
+             'int tm_mday',
+             'int tm_mon',
+             'int tm_year',
+             'int tm_wday',
+             'int tm_yday',
+             'int tm_isdst'
+           ]
+         else # The GNU C Library (glibc)
+           struct [
+             'int tm_sec',
+             'int tm_min',
+             'int tm_hour',
+             'int tm_mday',
+             'int tm_mon',
+             'int tm_year',
+             'int tm_wday',
+             'int tm_yday',
+             'int tm_isdst',
+             'long tm_gmtoff',
+             'const char *tm_zone'
+           ]
+         end
 
     try_extern 'void uiDateTimePickerTime(uiDateTimePicker *d, struct tm *time)'
     try_extern 'void uiDateTimePickerSetTime(uiDateTimePicker *d, const struct tm *time)'

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.10'
+  VERSION = '0.0.14'
 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
@@ -24,12 +23,199 @@ module LibUI
   extend LibUIBase
 
   class << self
-    def init(opt = FFI::InitOptions.malloc)
+    def init(opt = nil)
+      unless opt
+        opt = FFI::InitOptions.malloc
+        opt.to_ptr.free = Fiddle::RUBY_FREE
+      end
       i = super(opt)
       return if i.size.zero?
 
       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
+  # https://github.com/andlabs/libui/blob/master/ui.h
+
+  # ForEach
+  ForEachContinue    =    0
+  ForEachStop        =    1
+
+  # WindowResizeEdge
+  WindowResizeEdgeLeft        = 0
+  WindowResizeEdgeTop         = 1
+  WindowResizeEdgeRight       = 2
+  WindowResizeEdgeBottom      = 3
+  WindowResizeEdgeTopLeft     = 4
+  WindowResizeEdgeTopRight    = 5
+  WindowResizeEdgeBottomLeft  = 6
+  WindowResizeEdgeBottomRight = 7
+
+  # DrawBrushType
+  DrawBrushTypeSolid          = 0
+  DrawBrushTypeLinearGradient = 1
+  DrawBrushTypeRadialGradient = 2
+  DrawBrushTypeImage          = 3
+
+  # DrawLineCap
+  DrawLineCapFlat   = 0
+  DrawLineCapRound  = 1
+  DrawLineCapSquare = 2
+
+  # DrawLineJoin
+  DrawLineJoinMiter = 0
+  DrawLineJoinRound = 1
+  DrawLineJoinBevel = 2
+
+  DrawDefaultMiterLimit = 10.0
+
+  # DrawFillMode
+  DrawFillModeWinding   = 0
+  DrawFillModeAlternate = 1
+
+  # AttributeType
+  AttributeTypeFamily         = 0
+  AttributeTypeSize           = 1
+  AttributeTypeWeight         = 2
+  AttributeTypeItalic         = 3
+  AttributeTypeStretch        = 4
+  AttributeTypeColor          = 5
+  AttributeTypeBackground     = 6
+  AttributeTypeUnderline      = 7
+  AttributeTypeUnderlineColor = 8
+  AttributeTypeFeatures       = 9
+
+  # TextWeight
+  TextWeightMinimum    = 0
+  TextWeightThin       = 100
+  TextWeightUltraLight = 200
+  TextWeightLight      = 300
+  TextWeightBook       = 350
+  TextWeightNormal     = 400
+  TextWeightMedium     = 500
+  TextWeightSemiBold   = 600
+  TextWeightBold       = 700
+  TextWeightUltraBold  = 800
+  TextWeightHeavy      = 900
+  TextWeightUltraHeavy = 950
+  TextWeightMaximum    = 1000
+
+  # TextItalic
+  TextItalicNormal  = 0
+  TextItalicOblique = 1
+  TextItalicItalic  = 2
+
+  # TextStretch
+  TextStretchUltraCondensed = 0
+  TextStretchExtraCondensed = 1
+  TextStretchCondensed      = 2
+  TextStretchSemiCondensed  = 3
+  TextStretchNormal         = 4
+  TextStretchSemiExpanded   = 5
+  TextStretchExpanded       = 6
+  TextStretchExtraExpanded  = 7
+  TextStretchUltraExpanded  = 8
+
+  # Underline
+  UnderlineNone       = 0
+  UnderlineSingle     = 1
+  UnderlineDouble     = 2
+  UnderlineSuggestion = 3
+
+  # UnderlineColor
+  UnderlineColorCustom    = 0
+  UnderlineColorSpelling  = 1
+  UnderlineColorGrammar   = 2
+  UnderlineColorAuxiliary = 3
+
+  # DrawTextAlign
+  DrawTextAlignLeft   = 0
+  DrawTextAlignCenter = 1
+  DrawTextAlignRight  = 2
+
+  # Modifiers
+  ModifierCtrl  = (1 << 0)
+  ModifierAlt   = (1 << 1)
+  ModifierShift = (1 << 2)
+  ModifierSuper = (1 << 3)
+
+  # ExtKey
+  ExtKeyEscape    = 1
+  ExtKeyInsert    = 2
+  ExtKeyDelete    = 3
+  ExtKeyHome      = 4
+  ExtKeyEnd       = 5
+  ExtKeyPageUp    = 6
+  ExtKeyPageDown  = 7
+  ExtKeyUp        = 8
+  ExtKeyDown      = 9
+  ExtKeyLeft      = 10
+  ExtKeyRight     = 11
+  ExtKeyF1        = 12
+  ExtKeyF2        = 13
+  ExtKeyF3        = 14
+  ExtKeyF4        = 15
+  ExtKeyF5        = 16
+  ExtKeyF6        = 17
+  ExtKeyF7        = 18
+  ExtKeyF8        = 19
+  ExtKeyF9        = 20
+  ExtKeyF10       = 21
+  ExtKeyF11       = 22
+  ExtKeyF12       = 23
+  ExtKeyN0        = 24
+  ExtKeyN1        = 25
+  ExtKeyN2        = 26
+  ExtKeyN3        = 27
+  ExtKeyN4        = 28
+  ExtKeyN5        = 29
+  ExtKeyN6        = 30
+  ExtKeyN7        = 31
+  ExtKeyN8        = 32
+  ExtKeyN9        = 33
+  ExtKeyNDot      = 34
+  ExtKeyNEnter    = 35
+  ExtKeyNAdd      = 36
+  ExtKeyNSubtract = 37
+  ExtKeyNMultiply = 38
+  ExtKeyNDivide   = 39
+
+  # Align
+  AlignFill   = 0
+  AlignStart  = 1
+  AlignCenter = 2
+  AlignEnd    = 3
+
+  # At
+  AtLeading  = 0
+  AtTop      = 1
+  AtTrailing = 2
+  AtBottom   = 3
+
+  # TableValueType
+  TableValueTypeString = 0
+  TableValueTypeImage  = 1
+  TableValueTypeInt    = 2
+  TableValueTypeColor  = 3
+
+  # editable
+  TableModelColumnNeverEditable  = -1
+  TableModelColumnAlwaysEditable = -2
 end

metadata

@@ -1,85 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: libui
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.14
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-26 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-02-14 00:00:00.000000000 Z
+dependencies: []
 description: 
 email:
 - 2xijok@gmail.com
@@ -119,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to libui