libui 0.0.3.alpha → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6483e7a5d01aa51e2013350a38da4926d813416cf8f3f039f9203471bbb59968
-  data.tar.gz: e37424f71ec7991076a3fdb9cfc007aa2bf8fcd027210513d842b82d1056de21
+  metadata.gz: 02ee9e67a91414cbea40a50448a58bbb320f8962f34a35fa9c26d7ed0019878d
+  data.tar.gz: cfde88b2432abbf23f9dd0d195db0258c143bfd1ff339f51b3112ccaf4742af2
 SHA512:
-  metadata.gz: f3e515578dcfa6d4357c0f0154c9b59db64f75ab94e37e6518916621a11aefd19842f1545c04984d719d8d61b74602e6d976504bf3312df3e6df29e421f20701
-  data.tar.gz: cdd83d3ec0e75e4730c158aae01cd5e29f24b6d5893a26e95759f7e9e6b92bb23b6008fb9292e53af2d925a1f08c3335be8843ecd895fbd24858b8c0c8836b4c
+  metadata.gz: cb131ab13e11e6573058c0ec611c7467557756904b49d4121541f4075518958d3fdf2adc74e21d52f0f433c537faeffd6a77ab4162f7d42321fdec75437d1be0
+  data.tar.gz: 0dc6139433b79bec3e0a096f376db6af7eedc6b989ccab25bf4d3a1123afc75d053d43625d5302122952b2a527a8a17665ec9bc1472c1574f5ae4262bef80197

data/README.md

@@ -1,19 +1,131 @@
-# libui
+# 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
 
+```sh
+gem install libui
 ```
-gem install libui --pre
-```
+
+* The gem package contains the [official release](https://github.com/andlabs/libui/releases/tag/alpha4.1) of the libui shared library versions 4.1 for Windows, Mac, and Linux. 
+  * Namely `libui.dll`, `libui.dylib`, and `libui.so` (only 1.4MB in total).
+* No dependency
+  * The libui gem uses the standard Ruby library [Fiddle](https://github.com/ruby/fiddle) to call C functions. 
+
+| Windows | Mac | Linux |
+|---------|-----|-------|
+|<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">|
 
 ## Usage
 
+```ruby
+require 'libui'
+UI = LibUI
+
+UI.init
+
+main_window = UI.new_window('hello world', 300, 200, 1)
+UI.window_on_closing(main_window) do
+  puts 'Bye Bye'
+  UI.control_destroy(main_window)
+  UI.quit
+  0
+end
+
+button = UI.new_button('Button')
+UI.button_on_clicked(button) do
+  UI.msg_box(main_window, 'Information', 'You clicked the button')
+  0
+end
+
+UI.window_set_child(main_window, button)
+UI.control_show(main_window)
+
+UI.main
+UI.quit
+```
+
+See [examples](https://github.com/kojix2/libui/tree/main/examples) directory.
+
+### General Rules
+
+Compared to original libui written in C,
+
+* The method names are snake_case.
+* If the last argument is nil, it can be omitted.
+* You can pass a block as a callback. 
+  * Please return 0 explicitly in the block.
+  * 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.
+  
+### Not object oriented?
+
+* At the moment, it is not object-oriented.
+  * Instead of providing a half-baked object-oriented approach, leave it as is.
+
+### How to use fiddle pointers?
+
+```ruby
+require 'libui'
+UI = LibUI
+UI.init
+```
+
+Convert a pointer to a string.
+
+```ruby
+label = UI.new_label("Ruby")
+p pointer = UI.label_text(label) # #<Fiddle::Pointer>
+p pointer.to_s # Ruby
+```
+
+If you need to use C structs, you can do the following.
+
+```ruby
+font_button = UI.new_font_button
+
+# Allocate memory 
+font_descriptor = UI::FFI::FontDescriptor.malloc
+
+UI.font_button_on_changed(font_button) do
+  UI.font_button_font(font_button, font_descriptor)
+  p family:  font_descriptor.Family.to_s,
+    size:    font_descriptor.Size,
+    weight:  font_descriptor.Weight,
+    italic:  font_descriptor.Italic,
+    stretch: font_descriptor.Stretch
+end
+```
+
+### How to create an executable (.exe) on Windows 
+
+OCRA (One-Click Ruby Application) builds Windows executables from Ruby source code. 
+* https://github.com/larsch/ocra/
+
 ## Development
 
-* Keep it simple
+```sh
+git clone https://github.com/kojix2/libui
+cd libui
+bundle install
+bundle exec rake vendor:all
+bundle exec rake test
+```
+
+Use the following rake tasks to download the libui binary files and save them in the vendor directory.
+
+`rake -T`
+
+```
+rake vendor:all       # Download libui.so, libui.dylib, and libui.dll to ve...
+rake vendor:linux     # Download libui.so for Linux to vendor directory
+rake vendor:mac       # Download libui.dylib for Mac to vendor directory
+rake vendor:windows   # Download libui.dll for Windows to vendor directory
+```
 
 ## Contributing
 
@@ -21,10 +133,11 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/kojix2
 
 ## Acknowledgement
 
-libui-ruby ispired this project.
+This project is inspired by libui-ruby.
+
 * https://github.com/jamescook/libui-ruby
 
-While libui-ruby uses FFI, this gem uses Fiddle.
+While libui-ruby uses [Ruby-FFI](https://github.com/ffi/ffi), this gem uses [Fiddle](https://github.com/ruby/fiddle).
 
 ## License
 

data/lib/libui.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'libui/version'
+require_relative 'libui/utils'
 
 module LibUI
   class Error < StandardError; end
@@ -9,31 +10,70 @@ 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|
-      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|
+    FFI.func_map.each_key do |original_method_name|
+      name = Utils.convert_to_ruby_method(original_method_name)
+      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.
+            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]
+            callbacks = receiver.instance_variable_get(:@callbacks) || []
+            callbacks << callback
+            receiver.instance_variable_set(:@callbacks, callback)
+            callback
+          else
+            arg
+          end
+        end
+
+        # Make it possible to omit the last nil. This may be an over-optimization.
+        siz = func.argument_types.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,74 @@
 
 require 'fiddle/import'
 
+module Fiddle
+  # Change the Function to hold a little more information.
+  class Function
+    # Note:
+    # Ruby 2.7 Fiddle::Function dose not have @argument_types
+    # Ruby 3.0 Fiddle::Function has @argument_types
+    attr_accessor :callback_argument_types, :argument_types
+  end
+
+  module Importer
+    def parse_signature(signature, tymap = nil)
+      tymap ||= {}
+      ctype, func, args = case compact(signature)
+                          when /^(?:[\w\*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
+                            [TYPE_VOIDP, Regexp.last_match(1), Regexp.last_match(2)]
+                          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 parserake the function prototype: #{signature}")
+                          end
+      symname = func
+      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
+          # 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.
+          callback_argument_types[idx] = parse_signature(func_arg)              # Added
+        end
+        parse_ctype(arg, tymap)
+      end
+      # Added callback_argument_types. Original method return only 3 values.
+      [symname, ctype, argtype, callback_argument_types]
+    end
+
+    def extern(signature, *opts)
+      symname, ctype, argtype, callback_argument_types = parse_signature(signature, type_alias)
+      opt = parse_bind_options(opts)
+      func = import_function(symname, ctype, argtype, opt[:call_type])
+
+      func.callback_argument_types = callback_argument_types                    # Added
+      # Ruby 2.7 Fiddle::Function dose not have @argument_types
+      # Ruby 3.0 Fiddle::Function has @argument_types
+      func.argument_types = argtype
+
+      name = symname.gsub(/@.+/, '')
+      @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
+      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)
+      func
+    end
+  end
+end
+
 module LibUI
   module FFI
     extend Fiddle::Importer
@@ -13,26 +81,24 @@ 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
+
+      def ffi_methods
+        @ffi_methods ||= func_map.each_key.to_a
       end
     end
 
     typealias('uint32_t', 'unsigned int')
 
-    InitOptions = struct(['size_t size'])
+    InitOptions = struct [
+      'size_t Size'
+    ]
 
     try_extern 'const char *uiInit(uiInitOptions *options)'
     try_extern 'void uiUninit(void)'
@@ -47,20 +113,22 @@ module LibUI
     try_extern 'void uiOnShouldQuit(int (*f)(void *data), void *data)'
     try_extern 'void uiFreeText(char *text)'
 
-    struct ['uint32_t Signature',
-            'uint32_t OSSignature',
-            'uint32_t TypeSignature',
-            'void (*Destroy)(uiControl *)',
-            'uintptr_t (*Handle)(uiControl *)',
-            'uiControl *(*Parent)(uiControl *)',
-            'void (*SetParent)(uiControl *, uiControl *)',
-            'int (*Toplevel)(uiControl *)',
-            'int (*Visible)(uiControl *)',
-            'void (*Show)(uiControl *)',
-            'void (*Hide)(uiControl *)',
-            'int (*Enabled)(uiControl *)',
-            'void (*Enable)(uiControl *)',
-            'void (*Disable)(uiControl *)']
+    Control = struct [
+      'uint32_t Signature',
+      'uint32_t OSSignature',
+      'uint32_t TypeSignature',
+      'void (*Destroy)(uiControl *)',
+      'uintptr_t (*Handle)(uiControl *)',
+      'uiControl *(*Parent)(uiControl *)',
+      'void (*SetParent)(uiControl *, uiControl *)',
+      'int (*Toplevel)(uiControl *)',
+      'int (*Visible)(uiControl *)',
+      'void (*Show)(uiControl *)',
+      'void (*Hide)(uiControl *)',
+      'int (*Enabled)(uiControl *)',
+      'void (*Enable)(uiControl *)',
+      'void (*Disable)(uiControl *)'
+    ]
 
     try_extern 'void uiControlDestroy(uiControl *)'
     try_extern 'uintptr_t uiControlHandle(uiControl *)'
@@ -83,6 +151,7 @@ module LibUI
     try_extern 'void uiUserBugCannotSetParentOnToplevel(const char *type)'
 
     # uiWindow
+
     try_extern 'char *uiWindowTitle(uiWindow *w)'
     try_extern 'void uiWindowSetTitle(uiWindow *w, const char *title)'
     try_extern 'void uiWindowContentSize(uiWindow *w, int *width, int *height)'
@@ -99,12 +168,14 @@ module LibUI
     try_extern 'uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)'
 
     # uiButton
+
     try_extern 'char *uiButtonText(uiButton *b)'
     try_extern 'void uiButtonSetText(uiButton *b, const char *text)'
     try_extern 'void uiButtonOnClicked(uiButton *b, void (*f)(uiButton *b, void *data), void *data)'
     try_extern 'uiButton *uiNewButton(const char *text)'
 
     # uiBox
+
     try_extern 'void uiBoxAppend(uiBox *b, uiControl *child, int stretchy)'
     try_extern 'void uiBoxDelete(uiBox *b, int index)'
     try_extern 'int uiBoxPadded(uiBox *b)'
@@ -113,6 +184,7 @@ module LibUI
     try_extern 'uiBox *uiNewVerticalBox(void)'
 
     # uiCheckbox
+
     try_extern 'char *uiCheckboxText(uiCheckbox *c)'
     try_extern 'void uiCheckboxSetText(uiCheckbox *c, const char *text)'
     try_extern 'void uiCheckboxOnToggled(uiCheckbox *c, void (*f)(uiCheckbox *c, void *data), void *data)'
@@ -121,6 +193,7 @@ module LibUI
     try_extern 'uiCheckbox *uiNewCheckbox(const char *text)'
 
     # uiEntry
+
     try_extern 'char *uiEntryText(uiEntry *e)'
     try_extern 'void uiEntrySetText(uiEntry *e, const char *text)'
     try_extern 'void uiEntryOnChanged(uiEntry *e, void (*f)(uiEntry *e, void *data), void *data)'
@@ -131,11 +204,13 @@ module LibUI
     try_extern 'uiEntry *uiNewSearchEntry(void)'
 
     # uiLabel
+
     try_extern 'char *uiLabelText(uiLabel *l)'
     try_extern 'void uiLabelSetText(uiLabel *l, const char *text)'
     try_extern 'uiLabel *uiNewLabel(const char *text)'
 
     # uiTab
+
     try_extern 'void uiTabAppend(uiTab *t, const char *name, uiControl *c)'
     try_extern 'void uiTabInsertAt(uiTab *t, const char *name, int before, uiControl *c)'
     try_extern 'void uiTabDelete(uiTab *t, int index)'
@@ -145,6 +220,7 @@ module LibUI
     try_extern 'uiTab *uiNewTab(void)'
 
     # uiGroup
+
     try_extern 'char *uiGroupTitle(uiGroup *g)'
     try_extern 'void uiGroupSetTitle(uiGroup *g, const char *title)'
     try_extern 'void uiGroupSetChild(uiGroup *g, uiControl *c)'
@@ -153,27 +229,32 @@ module LibUI
     try_extern 'uiGroup *uiNewGroup(const char *title)'
 
     # uiSpinbox
+
     try_extern 'int uiSpinboxValue(uiSpinbox *s)'
     try_extern 'void uiSpinboxSetValue(uiSpinbox *s, int value)'
     try_extern 'void uiSpinboxOnChanged(uiSpinbox *s, void (*f)(uiSpinbox *s, void *data), void *data)'
     try_extern 'uiSpinbox *uiNewSpinbox(int min, int max)'
 
     # uiSlider
+
     try_extern 'int uiSliderValue(uiSlider *s)'
     try_extern 'void uiSliderSetValue(uiSlider *s, int value)'
     try_extern 'void uiSliderOnChanged(uiSlider *s, void (*f)(uiSlider *s, void *data), void *data)'
     try_extern 'uiSlider *uiNewSlider(int min, int max)'
 
     # uiProgressBar
+
     try_extern 'int uiProgressBarValue(uiProgressBar *p)'
     try_extern 'void uiProgressBarSetValue(uiProgressBar *p, int n)'
     try_extern 'uiProgressBar *uiNewProgressBar(void)'
 
     # uiSeparator
+
     try_extern 'uiSeparator *uiNewHorizontalSeparator(void)'
     try_extern 'uiSeparator *uiNewVerticalSeparator(void)'
 
     # uiCombobox
+
     try_extern 'void uiComboboxAppend(uiCombobox *c, const char *text)'
     try_extern 'int uiComboboxSelected(uiCombobox *c)'
     try_extern 'void uiComboboxSetSelected(uiCombobox *c, int n)'
@@ -181,6 +262,7 @@ module LibUI
     try_extern 'uiCombobox *uiNewCombobox(void)'
 
     # uiEditableCombobox
+
     try_extern 'void uiEditableComboboxAppend(uiEditableCombobox *c, const char *text)'
     try_extern 'char *uiEditableComboboxText(uiEditableCombobox *c)'
     try_extern 'void uiEditableComboboxSetText(uiEditableCombobox *c, const char *text)'
@@ -188,13 +270,28 @@ module LibUI
     try_extern 'uiEditableCombobox *uiNewEditableCombobox(void)'
 
     # uiRadioButtons
+
     try_extern 'void uiRadioButtonsAppend(uiRadioButtons *r, const char *text)'
     try_extern 'int uiRadioButtonsSelected(uiRadioButtons *r)'
     try_extern 'void uiRadioButtonsSetSelected(uiRadioButtons *r, int n)'
     try_extern 'void uiRadioButtonsOnSelected(uiRadioButtons *r, void (*f)(uiRadioButtons *, void *), void *data)'
     try_extern 'uiRadioButtons *uiNewRadioButtons(void)'
 
-    # uiDataTimePicker
+    # 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'
+    ]
+
     try_extern 'void uiDateTimePickerTime(uiDateTimePicker *d, struct tm *time)'
     try_extern 'void uiDateTimePickerSetTime(uiDateTimePicker *d, const struct tm *time)'
     try_extern 'void uiDateTimePickerOnChanged(uiDateTimePicker *d, void (*f)(uiDateTimePicker *, void *), void *data)'
@@ -203,6 +300,7 @@ module LibUI
     try_extern 'uiDateTimePicker *uiNewTimePicker(void)'
 
     # uiMultilineEntry
+
     try_extern 'char *uiMultilineEntryText(uiMultilineEntry *e)'
     try_extern 'void uiMultilineEntrySetText(uiMultilineEntry *e, const char *text)'
     try_extern 'void uiMultilineEntryAppend(uiMultilineEntry *e, const char *text)'
@@ -213,6 +311,7 @@ module LibUI
     try_extern 'uiMultilineEntry *uiNewNonWrappingMultilineEntry(void)'
 
     # uiMenuItem
+
     try_extern 'void uiMenuItemEnable(uiMenuItem *m)'
     try_extern 'void uiMenuItemDisable(uiMenuItem *m)'
     try_extern 'void uiMenuItemOnClicked(uiMenuItem *m, void (*f)(uiMenuItem *sender, uiWindow *window, void *data), void *data)'
@@ -220,6 +319,7 @@ module LibUI
     try_extern 'void uiMenuItemSetChecked(uiMenuItem *m, int checked)'
 
     # uiMenu
+
     try_extern 'uiMenuItem *uiMenuAppendItem(uiMenu *m, const char *name)'
     try_extern 'uiMenuItem *uiMenuAppendCheckItem(uiMenu *m, const char *name)'
     try_extern 'uiMenuItem *uiMenuAppendQuitItem(uiMenu *m)'
@@ -234,25 +334,315 @@ module LibUI
     try_extern 'void uiMsgBoxError(uiWindow *parent, const char *title, const char *description)'
 
     # uiArea
+
+    AreaHandler = struct [
+      'void (*Draw)(uiAreaHandler *, uiArea *, uiAreaDrawParams *)',
+      'void (*MouseEvent)(uiAreaHandler *, uiArea *, uiAreaMouseEvent *)',
+      'void (*MouseCrossed)(uiAreaHandler *, uiArea *, int left)',
+      'void (*DragBroken)(uiAreaHandler *, uiArea *)',
+      'int (*KeyEvent)(uiAreaHandler *, uiArea *, uiAreaKeyEvent *)'
+    ]
+
+    typealias 'uiWindowResizeEdge', 'int'
+
     try_extern 'void uiAreaSetSize(uiArea *a, int width, int height)'
     try_extern 'void uiAreaQueueRedrawAll(uiArea *a)'
     try_extern 'void uiAreaScrollTo(uiArea *a, double x, double y, double width, double height)'
     try_extern 'void uiAreaBeginUserWindowMove(uiArea *a)'
-    typealias 'uiWindowResizeEdge', 'char' # FIXME: uint8
     try_extern 'void uiAreaBeginUserWindowResize(uiArea *a, uiWindowResizeEdge edge)'
     try_extern 'uiArea *uiNewArea(uiAreaHandler *ah)'
     try_extern 'uiArea *uiNewScrollingArea(uiAreaHandler *ah, int width, int height)'
 
+    AreaDrawParams = struct [
+      'uiDrawContext *Context',
+      'double AreaWidth',
+      'double AreaHeight',
+      'double ClipX',
+      'double ClipY',
+      'double ClipWidth',
+      'double ClipHeight'
+    ]
+    typealias 'uiDrawBrushType', 'int'
+    typealias 'uiDrawLineCap', 'int'
+    typealias 'uiDrawLineJoin', 'int'
+    typealias 'uiDrawFillMode', 'int'
+
+    DrawMatrix = struct [
+      'double M11',
+      'double M12',
+      'double M21',
+      'double M22',
+      'double M31',
+      'double M32'
+    ]
+
+    DrawBrush = struct [
+      'uiDrawBrushType Type',
+      'double R',
+      'double G',
+      'double B',
+      'double A',
+      'double X0',
+      'double Y0',
+      'double X1',
+      'double Y1',
+      'double OuterRadius',
+      'uiDrawBrushGradientStop *Stops',
+      'size_t NumStops'
+    ]
+
+    DrawBrushGradientStop = struct [
+      'double Pos',
+      'double R',
+      'double G',
+      'double B',
+      'double A'
+    ]
+
+    DrawStrokeParams = struct [
+      'uiDrawLineCap Cap',
+      'uiDrawLineJoin Join',
+      'double Thickness',
+      'double MiterLimit',
+      'double *Dashes',
+      'size_t NumDashes',
+      'double DashPhase'
+    ]
+
+    # uiDrawPath
+    try_extern 'uiDrawPath *uiDrawNewPath(uiDrawFillMode fillMode)'
+    try_extern 'void uiDrawFreePath(uiDrawPath *p)'
+    try_extern 'void uiDrawPathNewFigure(uiDrawPath *p, double x, double y)'
+    try_extern 'void uiDrawPathNewFigureWithArc(uiDrawPath *p, double xCenter, double yCenter, double radius, double startAngle, double sweep, int negative)'
+    try_extern 'void uiDrawPathLineTo(uiDrawPath *p, double x, double y)'
+    try_extern 'void uiDrawPathArcTo(uiDrawPath *p, double xCenter, double yCenter, double radius, double startAngle, double sweep, int negative)'
+    try_extern 'void uiDrawPathBezierTo(uiDrawPath *p, double c1x, double c1y, double c2x, double c2y, double endX, double endY)'
+    try_extern 'void uiDrawPathCloseFigure(uiDrawPath *p)'
+    try_extern 'void uiDrawPathAddRectangle(uiDrawPath *p, double x, double y, double width, double height)'
+    try_extern 'void uiDrawPathEnd(uiDrawPath *p)'
+    try_extern 'void uiDrawStroke(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b, uiDrawStrokeParams *p)'
+    try_extern 'void uiDrawFill(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b)'
+
+    # uiDrawMatrix
+    try_extern 'void uiDrawMatrixSetIdentity(uiDrawMatrix *m)'
+    try_extern 'void uiDrawMatrixTranslate(uiDrawMatrix *m, double x, double y)'
+    try_extern 'void uiDrawMatrixScale(uiDrawMatrix *m, double xCenter, double yCenter, double x, double y)'
+    try_extern 'void uiDrawMatrixRotate(uiDrawMatrix *m, double x, double y, double amount)'
+    try_extern 'void uiDrawMatrixSkew(uiDrawMatrix *m, double x, double y, double xamount, double yamount)'
+    try_extern 'void uiDrawMatrixMultiply(uiDrawMatrix *dest, uiDrawMatrix *src)'
+    try_extern 'int uiDrawMatrixInvertible(uiDrawMatrix *m)'
+    try_extern 'int uiDrawMatrixInvert(uiDrawMatrix *m)'
+    try_extern 'void uiDrawMatrixTransformPoint(uiDrawMatrix *m, double *x, double *y)'
+    try_extern 'void uiDrawMatrixTransformSize(uiDrawMatrix *m, double *x, double *y)'
+
+    try_extern 'void uiDrawTransform(uiDrawContext *c, uiDrawMatrix *m)'
+    try_extern 'void uiDrawClip(uiDrawContext *c, uiDrawPath *path)'
+    try_extern 'void uiDrawSave(uiDrawContext *c)'
+    try_extern 'void uiDrawRestore(uiDrawContext *c)'
+
+    # uiAttribute
+    try_extern 'void uiFreeAttribute(uiAttribute *a)'
+
+    typealias 'uiAttributeType', 'int'
+
+    try_extern 'uiAttributeType uiAttributeGetType(const uiAttribute *a)'
+    try_extern 'uiAttribute *uiNewFamilyAttribute(const char *family)'
+    try_extern 'const char *uiAttributeFamily(const uiAttribute *a)'
+    try_extern 'uiAttribute *uiNewSizeAttribute(double size)'
+    try_extern 'double uiAttributeSize(const uiAttribute *a)'
+
+    typealias 'uiTextWeight', 'int'
+
+    try_extern 'uiAttribute *uiNewWeightAttribute(uiTextWeight weight)'
+    try_extern 'uiTextWeight uiAttributeWeight(const uiAttribute *a)'
+
+    typealias 'uiTextItalic', 'int'
+
+    try_extern 'uiAttribute *uiNewItalicAttribute(uiTextItalic italic)'
+    try_extern 'uiTextItalic uiAttributeItalic(const uiAttribute *a)'
+
+    typealias 'uiTextStretch', 'int'
+
+    try_extern 'uiAttribute *uiNewStretchAttribute(uiTextStretch stretch)'
+    try_extern 'uiTextStretch uiAttributeStretch(const uiAttribute *a)'
+    try_extern 'uiAttribute *uiNewColorAttribute(double r, double g, double b, double a)'
+    try_extern 'void uiAttributeColor(const uiAttribute *a, double *r, double *g, double *b, double *alpha)'
+    try_extern 'uiAttribute *uiNewBackgroundAttribute(double r, double g, double b, double a)'
+
+    typealias 'uiUnderline', 'int'
+
+    try_extern 'uiAttribute *uiNewUnderlineAttribute(uiUnderline u)'
+    try_extern 'uiUnderline uiAttributeUnderline(const uiAttribute *a)'
+
+    typealias 'uiUnderlineColor', 'int'
+
+    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)'
+    try_extern 'void uiOpenTypeFeaturesAdd(uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t value)'
+    try_extern 'void uiOpenTypeFeaturesRemove(uiOpenTypeFeatures *otf, char a, char b, char c, char d)'
+    try_extern 'int uiOpenTypeFeaturesGet(const uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t *value)'
+    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)'
+    try_extern 'size_t uiAttributedStringLen(const uiAttributedString *s)'
+    try_extern 'void uiAttributedStringAppendUnattributed(uiAttributedString *s, const char *str)'
+    try_extern 'void uiAttributedStringInsertAtUnattributed(uiAttributedString *s, const char *str, size_t at)'
+    try_extern 'void uiAttributedStringDelete(uiAttributedString *s, size_t start, size_t end)'
+    try_extern 'void uiAttributedStringSetAttribute(uiAttributedString *s, uiAttribute *a, size_t start, size_t end)'
+    try_extern 'void uiAttributedStringForEachAttribute(const uiAttributedString *s, uiAttributedStringForEachAttributeFunc f, void *data)'
+    try_extern 'size_t uiAttributedStringNumGraphemes(uiAttributedString *s)'
+    try_extern 'size_t uiAttributedStringByteIndexToGrapheme(uiAttributedString *s, size_t pos)'
+    try_extern 'size_t uiAttributedStringGraphemeToByteIndex(uiAttributedString *s, size_t pos)'
+
+    # uiFont
+
+    FontDescriptor = struct [
+      'char *Family',
+      'double Size',
+      'uiTextWeight Weight',
+      'uiTextItalic Italic',
+      'uiTextStretch Stretch'
+    ]
+
+    typealias 'uiDrawTextAlign', 'int'
+
+    DrawTextLayoutParams = struct [
+      'uiAttributedString *String',
+      'uiFontDescriptor *DefaultFont',
+      'double Width',
+      'uiDrawTextAlign Align'
+    ]
+
+    try_extern 'uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *params)'
+    try_extern 'void uiDrawFreeTextLayout(uiDrawTextLayout *tl)'
+    try_extern 'void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y)'
+    try_extern 'void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height)'
+
     # uiFontButton
+
     try_extern 'void uiFontButtonFont(uiFontButton *b, uiFontDescriptor *desc)'
     try_extern 'void uiFontButtonOnChanged(uiFontButton *b, void (*f)(uiFontButton *, void *), void *data)'
     try_extern 'uiFontButton *uiNewFontButton(void)'
     try_extern 'void uiFreeFontButtonFont(uiFontDescriptor *desc)'
 
+    typealias 'uiModifiers', 'int'
+
+    AreaMouseEvent = struct [
+      'double X',
+      'double Y',
+      'double AreaWidth',
+      'double AreaHeight',
+      'int Down',
+      'int Up',
+      'int Count',
+      'uiModifiers Modifiers',
+      'uint64_t Held1To64'
+    ]
+
+    typealias 'uiExtKey', 'int'
+
+    AreaKeyEvent = struct [
+      'char Key',
+      'uiExtKey ExtKey',
+      'uiModifiers Modifier',
+      'uiModifiers Modifiers',
+      'int Up'
+    ]
+
     # uiColorButton
+
     try_extern 'void uiColorButtonColor(uiColorButton *b, double *r, double *g, double *bl, double *a)'
     try_extern 'void uiColorButtonSetColor(uiColorButton *b, double r, double g, double bl, double a)'
     try_extern 'void uiColorButtonOnChanged(uiColorButton *b, void (*f)(uiColorButton *, void *), void *data)'
     try_extern 'uiColorButton *uiNewColorButton(void)'
+
+    # uiForm
+
+    try_extern 'void uiFormAppend(uiForm *f, const char *label, uiControl *c, int stretchy)'
+    try_extern 'void uiFormDelete(uiForm *f, int index)'
+    try_extern 'int uiFormPadded(uiForm *f)'
+    try_extern 'void uiFormSetPadded(uiForm *f, int padded)'
+    try_extern 'uiForm *uiNewForm(void)'
+
+    typealias 'uiAlign', 'int'
+
+    typealias 'uiAt', 'int'
+
+    # uiGrid
+
+    try_extern 'void uiGridAppend(uiGrid *g, uiControl *c, int left, int top, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign)'
+    try_extern 'void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign)'
+    try_extern 'int uiGridPadded(uiGrid *g)'
+    try_extern 'void uiGridSetPadded(uiGrid *g, int padded)'
+    try_extern 'uiGrid *uiNewGrid(void)'
+
+    # uiImage
+
+    try_extern 'uiImage *uiNewImage(double width, double height)'
+    try_extern 'void uiFreeImage(uiImage *i)'
+    try_extern 'void uiImageAppend(uiImage *i, void *pixels, int pixelWidth, int pixelHeight, int byteStride)'
+
+    # uiTable
+    try_extern 'void uiFreeTableValue(uiTableValue *v)'
+
+    typealias 'uiTableValueType', 'int'
+
+    try_extern 'uiTableValueType uiTableValueGetType(const uiTableValue *v)'
+    try_extern 'uiTableValue *uiNewTableValueString(const char *str)'
+    try_extern 'const char *uiTableValueString(const uiTableValue *v)'
+    try_extern 'uiTableValue *uiNewTableValueImage(uiImage *img)'
+    try_extern 'uiImage *uiTableValueImage(const uiTableValue *v)'
+    try_extern 'uiTableValue *uiNewTableValueInt(int i)'
+    try_extern 'int uiTableValueInt(const uiTableValue *v)'
+    try_extern 'uiTableValue *uiNewTableValueColor(double r, double g, double b, double a)'
+    try_extern 'void uiTableValueColor(const uiTableValue *v, double *r, double *g, double *b, double *a)'
+
+    TableModelHandler = struct [
+      'int (*NumColumns)(uiTableModelHandler *, uiTableModel *)',
+      'uiTableValueType (*ColumnType)(uiTableModelHandler *, uiTableModel *, int)',
+      'int (*NumRows)(uiTableModelHandler *, uiTableModel *)',
+      'uiTableValue *(*CellValue)(uiTableModelHandler *mh, uiTableModel *m, int row, int column)',
+      'void (*SetCellValue)(uiTableModelHandler *, uiTableModel *, int, int, const uiTableValue *)'
+    ]
+
+    try_extern 'uiTableModel *uiNewTableModel(uiTableModelHandler *mh)'
+    try_extern 'void uiFreeTableModel(uiTableModel *m)'
+    try_extern 'void uiTableModelRowInserted(uiTableModel *m, int newIndex)'
+    try_extern 'void uiTableModelRowChanged(uiTableModel *m, int index)'
+    try_extern 'void uiTableModelRowDeleted(uiTableModel *m, int oldIndex)'
+
+    TableTextColumnOptionalParams = struct [
+      'int ColorModelColumn'
+    ]
+
+    TableParams = struct [
+      'uiTableModel *Model',
+      'int RowBackgroundColorModelColumn'
+    ]
+
+    try_extern 'void uiTableAppendTextColumn(uiTable *t, const char *name, int textModelColumn, int textEditableModelColumn, uiTableTextColumnOptionalParams *textParams)'
+    try_extern 'void uiTableAppendImageColumn(uiTable *t, const char *name, int imageModelColumn)'
+    try_extern 'void uiTableAppendImageTextColumn(uiTable *t, const char *name, int imageModelColumn, int textModelColumn, int textEditableModelColumn, uiTableTextColumnOptionalParams *textParams)'
+    try_extern 'void uiTableAppendCheckboxColumn(uiTable *t, const char *name, int checkboxModelColumn, int checkboxEditableModelColumn)'
+    try_extern 'void uiTableAppendCheckboxTextColumn(uiTable *t, const char *name, int checkboxModelColumn, int checkboxEditableModelColumn, int textModelColumn, int textEditableModelColumn, uiTableTextColumnOptionalParams *textParams)'
+    try_extern 'void uiTableAppendProgressBarColumn(uiTable *t, const char *name, int progressModelColumn)'
+    try_extern 'void uiTableAppendButtonColumn(uiTable *t, const char *name, int buttonModelColumn, int buttonClickableModelColumn)'
+    try_extern 'uiTable *uiNewTable(uiTableParams *params)'
   end
 end

data/lib/libui/utils.rb

@@ -0,0 +1,19 @@
+module LibUI
+  module Utils
+    class << self
+      def convert_to_ruby_method(original_method_name)
+        underscore(original_method_name.delete_prefix('ui'))
+      end
+
+      # Converting camel case to underscore case in ruby
+      # https://stackoverflow.com/questions/1509915/converting-camel-case-to-underscore-case-in-ruby#1509939
+      def underscore(str)
+        str.gsub(/::/, '/')
+           .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+           .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+           .tr('-', '_')
+           .downcase
+      end
+    end
+  end
+end

data/lib/libui/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libui
 version: !ruby/object:Gem::Version
-  version: 0.0.3.alpha
+  version: 0.0.8
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - README.md
 - lib/libui.rb
 - lib/libui/ffi.rb
+- lib/libui/utils.rb
 - lib/libui/version.rb
 - vendor/LICENSE
 - vendor/README.md
@@ -112,9 +113,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: