libui 0.2.0-x86_64-linux → 0.2.2-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a4a93bc8fdec0c9c4e2587bb2aa99c0ac11d54e34ae9956e64a9a841a39cac5
-  data.tar.gz: 9b4caca40127dea74380e48afa011f0162e2169cdba6a4037d52ad1e38247924
+  metadata.gz: 19f94055bcaf8d77d1a3400b92cc9c2ea871e2683d1f67bca77e5df92369f7d4
+  data.tar.gz: d9868e00988881499b935aea1d5bb2b06534395c1742d2751a7878a75214221b
 SHA512:
-  metadata.gz: 9b39de93bfeeb054f86237741ea0b072aead99d1835156fb3f4e18e73f17bbb6e2c8a2592cce0adc31f00c4c1c28d85d31c7d1564a36f074c7bd64664ce39298
-  data.tar.gz: 333a266fcec1f2108cf7443cbcc56b9f0f86d2620886bdbed5e4bd874e6b18c22a4f493c375da1f9afc38c0595baf1ee32bcc3638f6b1d6780d5e71f868ee15f
+  metadata.gz: 9d4601a5b785c8caf0feac08b427b23e5570e0f4f14a426b6fba82e2c919e03afb77ec22c09468e25dbf7bf0049b111bf2ec556674cbe85392f783d7cd46707a
+  data.tar.gz: 4b95ac42fd8ec00d13ad5a0943d3b563c52feb7eb46296ce7a1d67eb3d383b04e8d11c6e3cbb19f4e84568c0126cd637275df3013cc7273af96efac8755ea6df

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-2025 kojix2
+Copyright (c) 2020-present kojix2
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,7 +1,7 @@
 # LibUI
 
 [![test](https://github.com/kojix2/LibUI/actions/workflows/test.yml/badge.svg)](https://github.com/kojix2/LibUI/actions/workflows/test.yml)
-[![Gem Version](https://badge.fury.io/rb/libui.svg)](https://badge.fury.io/rb/libui)
+[![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)
 <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)
@@ -16,20 +16,12 @@ LibUI is a Ruby wrapper for libui family.
 
 ## Installation
 
-It is recommended to use libui-ng, via the --pre commandline flag:
-
 ```sh
-gem install libui --pre # libui-ng; this will fetch libui-0.1.3.pre-x86_64-linux.gem
-```
-
-If for some reason you would like to install the slightly older libui-0.1.2.gem release, issue:
-
-```sh
-gem install libui
+gem install libui # --pre
 ```
 
 - The gem package includes the libui-ng shared library for Windows, Mac, and Linux.
-  - Namely `libui.dll`, `libui.dylib`, or `libui.so`.
+  - Namely `libui.x64.dll`/`libui.x86.dll`, `libui.x86_64.dylib`/`libui.arm64.dylib`, or `libui.x86_64.so`/`libui.aarch64.so`.
 - No dependencies required.
   - The libui gem uses the standard Ruby library [Fiddle](https://github.com/ruby/fiddle) to call C functions.
 
@@ -85,7 +77,7 @@ Compared to the original libui library written in C:
   - The block will be converted to a Proc object and added as the last argument.
   - The last argument can still be omitted when nil.
 
-You can use [the documentation for libui's Go bindings](https://pkg.go.dev/github.com/andlabs/ui) as a reference.
+You can use [the libui-ng API documentation](https://libui-ng.github.io/libui-ng/) as a reference.
 
 ### DSLs for LibUI
 
@@ -94,7 +86,6 @@ LibUI is not object-oriented because it is a thin Ruby wrapper (binding) for the
 To build actual applications, it is recommended to use a DSL for LibUI, as they enable writing object-oriented code the Ruby way (instead of procedural code the C way):
 
 - [Glimmer DSL for LibUI](https://github.com/AndyObtiva/glimmer-dsl-libui)
-- [libui_paradise](https://rubygems.org/gems/libui_paradise)
 
 ### Working with fiddle pointers
 
@@ -104,12 +95,26 @@ UI = LibUI
 UI.init
 ```
 
-To convert a pointer to a string:
+Text getter methods such as `label_text`, `entry_text`, and `window_title`
+return `Fiddle::Pointer` objects for strings allocated by libui. Convert the
+pointer to a Ruby string, then release it with `free_text`.
 
 ```ruby
 label = UI.new_label("Ruby")
-p pointer = UI.label_text(label) # #<Fiddle::Pointer>
-p pointer.to_s # Ruby
+pointer = UI.label_text(label) # #<Fiddle::Pointer>
+text = pointer.to_s
+UI.free_text(pointer)
+p text # Ruby
+```
+
+Use `ensure` if the code between conversion and cleanup can raise:
+
+```ruby
+def ui_text(text_pointer)
+  text_pointer.to_s
+ensure
+  UI.free_text(text_pointer) if text_pointer && !text_pointer.null?
+end
 ```
 
 If you need to use C structs, you can do the following:
@@ -124,11 +129,15 @@ font_descriptor.to_ptr.free = Fiddle::RUBY_FREE
 
 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
+  begin
+    p family:  font_descriptor.Family.to_s,
+      size:    font_descriptor.Size,
+      weight:  font_descriptor.Weight,
+      italic:  font_descriptor.Italic,
+      stretch: font_descriptor.Stretch
+  ensure
+    UI.free_font_button_font(font_descriptor)
+  end
 end
 ```
 
@@ -206,8 +215,8 @@ If you build libui-ng yourself, set `LIBUIDIR` to the directory containing the c
 Push a version tag to automatically publish platform-specific gems:
 
 ```sh
-git tag v0.1.3
-git push origin v0.1.3
+git tag v0.2.0
+git push origin v0.2.0
 ```
 
 Requires `RUBYGEMS_API_KEY` repository secret with scoped API key.
@@ -225,9 +234,19 @@ find pkg -name *.gem -exec sh -c "echo; echo \# {}; tar -O -f {} -x data.tar.gz
 rake release_platform # publish gems
 ```
 
+Windows Ruby (x64-mingw32 or x64-mingw-ucrt)
+
+```sh
+gem install rake rubyzip
+GEM_PLATFORM=x64-mingw32 rake vendor:clean
+GEM_PLATFORM=x64-mingw32 rake vendor:auto
+GEM_PLATFORM=x64-mingw32 gem build libui.gemspec
+gem push libui-0.2.0-x64-mingw32.gem
+```
+
 ### libui or libui-ng
 
-- From version 0.1.X, we plan to support only libui-ng/libui-ng.
+- From version 0.1.X, LibUI supports only libui-ng.
 - Version 0.0.X only supports andlabs/libui.
 
 ## Contributing

data/lib/libui/ffi.rb

@@ -3,7 +3,6 @@ require_relative 'fiddle_patch'
 require_relative 'error'
 
 module LibUI
-
   module FFI
     extend Fiddle::Importer
     extend FiddlePatch

data/lib/libui/fiddle_patch.rb

@@ -11,9 +11,9 @@ module LibUI
     def parse_signature(signature, tymap = nil)
       tymap ||= {}
       ctype, func, args = case compact(signature)
-                          when /^(?:[\w\*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
+                          when /^(?:[\w*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
                             [TYPE_VOIDP, Regexp.last_match(1), Regexp.last_match(2)]
-                          when /^([\w\*\s]+[*\s])(\w+)\((.*?)\);?$/
+                          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 parse the function prototype: #{signature}")
@@ -22,12 +22,12 @@ module LibUI
       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
+        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
+          func_arg = arg.sub('(*', ' ').sub(')', '') # Added
           # Use Fiddle's parse_signature method again.
-          callback_argument_types[idx] = parse_signature(func_arg)              # Added
+          callback_argument_types[idx] = parse_signature(func_arg) # Added
         end
         parse_ctype(arg, tymap)
       end
@@ -41,8 +41,8 @@ module LibUI
       func = import_function(symname, ctype, argtype, opt[:call_type])
 
       # callback_argument_types
-      func.instance_variable_set(:@callback_argument_types, 
-                                   callback_argument_types) # Added
+      func.instance_variable_set(:@callback_argument_types,
+                                 callback_argument_types) # Added
       # attr_reader
       def func.callback_argument_types
         @callback_argument_types
@@ -68,9 +68,9 @@ module LibUI
       @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
+        location = caller_locations(1, 1).first
+        file = location.path
+        line = location.lineno
       rescue StandardError
         file, line = __FILE__, __LINE__ + 3
       end

data/lib/libui/version.rb

@@ -1,3 +1,3 @@
 module LibUI
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

data/lib/libui.rb

@@ -59,6 +59,106 @@ module LibUI
       nil
     end
 
+    def new_button(text = '')
+      super(text)
+    end
+
+    def new_checkbox(text = '')
+      super(text)
+    end
+
+    def window_set_title(window, title = '')
+      super(window, title)
+    end
+
+    def button_set_text(button, text = '')
+      super(button, text)
+    end
+
+    def checkbox_set_text(checkbox, text = '')
+      super(checkbox, text)
+    end
+
+    def entry_set_text(entry, text = '')
+      super(entry, text)
+    end
+
+    def label_set_text(label, text = '')
+      super(label, text)
+    end
+
+    def new_label(text = '')
+      super(text)
+    end
+
+    def group_set_title(group, title = '')
+      super(group, title)
+    end
+
+    def new_group(title = '')
+      super(title)
+    end
+
+    def combobox_append(combobox, text = '')
+      super(combobox, text)
+    end
+
+    def combobox_insert_at(combobox, index, text = '')
+      super(combobox, index, text)
+    end
+
+    def editable_combobox_append(combobox, text = '')
+      super(combobox, text)
+    end
+
+    def editable_combobox_set_text(combobox, text = '')
+      super(combobox, text)
+    end
+
+    def radio_buttons_append(radio_buttons, text = '')
+      super(radio_buttons, text)
+    end
+
+    def multiline_entry_set_text(entry, text = '')
+      super(entry, text)
+    end
+
+    def multiline_entry_append(entry, text = '')
+      super(entry, text)
+    end
+
+    def menu_append_item(menu, name = '')
+      super(menu, name)
+    end
+
+    def menu_append_check_item(menu, name = '')
+      super(menu, name)
+    end
+
+    def new_menu(name = '')
+      super(name)
+    end
+
+    def msg_box(parent, title, description = '')
+      super(parent, title, description)
+    end
+
+    def msg_box_error(parent, title, description = '')
+      super(parent, title, description)
+    end
+
+    def new_attributed_string(initial_string = '')
+      super(initial_string)
+    end
+
+    def attributed_string_append_unattributed(attributed_string, str = '')
+      super(attributed_string, str)
+    end
+
+    def new_table_value_string(str = '')
+      super(str)
+    end
+
     # Gets the window position.
     # Coordinates are measured from the top left corner of the screen.
     # @param w [Fiddle::Pointer] Pointer of uiWindow instance.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libui
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: x86_64-linux
 authors:
 - kojix2