white_gold 0.0.4 → 0.1.0

data/lib/white_gold/generated/tgui-abi-loader.gf.rb

@@ -3,14 +3,18 @@
 
 module Tgui
   module Abi
-    extern 'void ABI_STATIC_Util_free(void* pointer)'
+    extern 'void ABI_STATIC_Util_deleteVector2f(Vector2f* vector)'
+    extern 'void ABI_STATIC_Util_deleteVector2i(Vector2i* vector)'
+    extern 'void ABI_STATIC_Util_deleteUIntRect(UIntRect* rect)'
     extern 'void* ABI_Color_new(int r, int g, int b, int a)'
+    extern 'void ABI_STATIC_Color_delete(Color* color)'
     extern 'int ABI_Color_get_red(Color* self)'
     extern 'int ABI_Color_get_green(Color* self)'
     extern 'int ABI_Color_get_blue(Color* self)'
     extern 'int ABI_Color_get_alpha(Color* self)'
     extern 'void* ABI_Color_applyOpacity(Color* self, float fade)'
     extern 'void* ABI_Outline_new(char* left, char* right, char* top, char* bottom)'
+    extern 'void ABI_STATIC_Outline_delete(Outline* outline)'
     extern 'float ABI_Outline_getLeft(Outline* self)'
     extern 'float ABI_Outline_getRight(Outline* self)'
     extern 'float ABI_Outline_getTop(Outline* self)'
@@ -37,6 +41,7 @@ module Tgui
     extern 'int ABI_SignalTypedSizeT_connect(SignalTypedSizeT* self, void(*f)(int))'
     extern 'int ABI_SignalPanelListBoxItem_connect(SignalPanelListBoxItem* self, void(*f)(const char32_t*))'
     extern 'void* ABI_Window_new(int width, int height, int style)'
+    extern 'void ABI_STATIC_Window_delete(sf::RenderWindow* self)'
     extern 'void ABI_Window_close(sf::WindowBase* self)'
     extern 'int ABI_Window_isOpen(sf::WindowBase* self)'
     extern 'void ABI_Window_setTitle(sf::WindowBase* self, char* title)'
@@ -68,9 +73,13 @@ module Tgui
     extern 'void ABI_BackendGui_setKeyboardNavigationEnabled(BackendGui* self, int enabled)'
     extern 'int ABI_BackendGui_isKeyboardNavigationEnabled(BackendGui* self)'
     extern 'void* ABI_BackendGui_onViewChange(BackendGui* self)'
+    extern 'void* ABI_BackendGui_onWindowFocus(BackendGui* self)'
+    extern 'void* ABI_BackendGui_onWindowUnfocus(BackendGui* self)'
     extern 'void* ABI_Font_new(char * id)'
+    extern 'void ABI_STATIC_Font_delete(Font* font)'
     extern 'void* ABI_STATIC_Font_getGlobalFont()'
     extern 'void* ABI_Gui_new(sf::RenderWindow* window)'
+    extern 'void ABI_STATIC_Gui_delete(Gui* self)'
     extern 'int ABI_Gui_isActive(Gui* self)'
     extern 'void ABI_Gui_pollEvents(Gui* self)'
     extern 'void ABI_Gui_draw(Gui* self)'
@@ -89,6 +98,7 @@ module Tgui
     extern 'void ABI_Theme_load(std::shared_ptr<Theme>* self, char* primary)'
     extern 'void* ABI_STATIC_Theme_getUnshared(std::shared_ptr<Theme>* pointer)'
     extern 'void* ABI_Texture_new(char* id, int partRectX, int partRectY, int partRectW, int partRectH, int middlePartX, int middlePartY, int middlePartW, int middlePartH, int smooth)'
+    extern 'void ABI_STATIC_Texture_delete(Texture* texture)'
     extern 'void* ABI_Texture_getId(Texture* self)'
     extern 'void* ABI_Texture_getImageSize(Texture* self)'
     extern 'void* ABI_Texture_getPartRect(Texture* self)'
@@ -150,6 +160,8 @@ module Tgui
     extern 'void ABI_Widget_setAutoLayout(Widget::Ptr* self, int autoLayout)'
     extern 'int ABI_Widget_getAutoLayout(Widget::Ptr* self)'
     extern 'void* ABI_Widget_getWidgetName(Widget::Ptr* self)'
+    extern 'void ABI_Widget_setIgnoreMouseEvents(Widget::Ptr* self, int ignore)'
+    extern 'int ABI_Widget_getIgnoreMouseEvents(Widget::Ptr* self)'
     extern 'void* ABI_Widget_onPositionChange(Widget::Ptr* self)'
     extern 'void* ABI_Widget_onSizeChange(Widget::Ptr* self)'
     extern 'void ABI_Widget_setColorRendererProperty(Widget::Ptr* self, char* property, Color* value)'
@@ -203,7 +215,7 @@ module Tgui
     extern 'unsigned int ABI_EditBox_getMaximumCharacters(EditBox::Ptr* self)'
     extern 'void ABI_EditBox_setAlignment(EditBox::Ptr* self, int alignment)'
     extern 'int ABI_EditBox_getAlignment(EditBox::Ptr* self)'
-    extern 'void ABI_EditBox_limitTextWidth(EditBox::Ptr* self, int limit)'
+    extern 'void ABI_EditBox_setTextWidthLimited(EditBox::Ptr* self, int limit)'
     extern 'int ABI_EditBox_isTextWidthLimited(EditBox::Ptr* self)'
     extern 'void ABI_EditBox_setReadOnly(EditBox::Ptr* self, int read_only)'
     extern 'int ABI_EditBox_isReadOnly(EditBox::Ptr* self)'
@@ -230,8 +242,6 @@ module Tgui
     extern 'int ABI_Label_getAutoSize(Label::Ptr* self)'
     extern 'void ABI_Label_setMaximumTextWidth(Label::Ptr* self, float maximumWidth)'
     extern 'float ABI_Label_getMaximumTextWidth(Label::Ptr* self)'
-    extern 'void ABI_Label_ignoreMouseEvents(Label::Ptr* self, int ignore)'
-    extern 'int ABI_Label_ignoringMouseEvents(Label::Ptr* self)'
     extern 'void* ABI_RadioButton_new()'
     extern 'void ABI_RadioButton_setText(RadioButton::Ptr* self, char* text)'
     extern 'void* ABI_RadioButton_getText(RadioButton::Ptr* self)'
@@ -317,7 +327,7 @@ module Tgui
     extern 'void ABI_ChildWindow_setPositionLocked(ChildWindow::Ptr* self, int positionLocked)'
     extern 'int ABI_ChildWindow_isPositionLocked(ChildWindow::Ptr* self)'
     extern 'void ABI_ChildWindow_setKeepInParent(ChildWindow::Ptr* self, int enabled)'
-    extern 'int ABI_ChildWindow_isKeptInParent(ChildWindow::Ptr* self)'
+    extern 'int ABI_ChildWindow_getKeepInParent(ChildWindow::Ptr* self)'
     extern 'void* ABI_ChildWindow_onMousePress(ChildWindow::Ptr* self)'
     extern 'void* ABI_ChildWindow_onClose(ChildWindow::Ptr* self)'
     extern 'void* ABI_ChildWindow_onMinimize(ChildWindow::Ptr* self)'
@@ -557,8 +567,6 @@ module Tgui
     extern 'int ABI_MessageBox_getButtonAlignment(MessageBox::Ptr* self)'
     extern 'void* ABI_MessageBox_onButtonPress(MessageBox::Ptr* self)'
     extern 'void* ABI_Picture_new(Texture* texture, int transparent)'
-    extern 'void ABI_Picture_ignoreMouseEvents(Picture::Ptr* self, int ignore)'
-    extern 'int ABI_Picture_isIgnoringMouseEvents(Picture::Ptr* self)'
     extern 'void* ABI_Picture_onDoubleClick(Picture::Ptr* self)'
     extern 'void* ABI_MenuBar_new()'
     extern 'void ABI_MenuBar_addMenu(MenuBar::Ptr* self, char* text)'
@@ -900,11 +908,14 @@ module Tgui
   end
 
   class Util
-    def self._abi_free(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Util_free(*a); end
+    def self._abi_delete_vector2f(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Util_deleteVector2f(*a); end
+    def self._abi_delete_vector2i(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Util_deleteVector2i(*a); end
+    def self._abi_delete_u_int_rect(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Util_deleteUIntRect(*a); end
   end
 
   class Color
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_Color_new(*a)); end
+    def self._abi_delete(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Color_delete(*a); end
     def _abi_get_red(*a);    Abi.call_arg_map! a; Abi.ABI_Color_get_red(@pointer, *a); end
     def _abi_get_green(*a);    Abi.call_arg_map! a; Abi.ABI_Color_get_green(@pointer, *a); end
     def _abi_get_blue(*a);    Abi.call_arg_map! a; Abi.ABI_Color_get_blue(@pointer, *a); end
@@ -914,6 +925,7 @@ module Tgui
 
   class Outline
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_Outline_new(*a)); end
+    def self._abi_delete(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Outline_delete(*a); end
     def _abi_get_left(*a);    Abi.call_arg_map! a; Abi.ABI_Outline_getLeft(@pointer, *a); end
     def _abi_get_right(*a);    Abi.call_arg_map! a; Abi.ABI_Outline_getRight(@pointer, *a); end
     def _abi_get_top(*a);    Abi.call_arg_map! a; Abi.ABI_Outline_getTop(@pointer, *a); end
@@ -994,6 +1006,7 @@ module Tgui
 
   class Window
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_Window_new(*a)); end
+    def self._abi_delete(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Window_delete(*a); end
     def _abi_close(*a);    Abi.call_arg_map! a; Abi.ABI_Window_close(@pointer, *a); end
     def _abi_is_open(*a);    Abi.call_arg_map! a; Abi.ABI_Window_isOpen(@pointer, *a); end
     def _abi_set_title(*a);    Abi.call_arg_map! a; Abi.ABI_Window_setTitle(@pointer, *a); end
@@ -1028,15 +1041,19 @@ module Tgui
     def _abi_set_keyboard_navigation_enabled(*a);    Abi.call_arg_map! a; Abi.ABI_BackendGui_setKeyboardNavigationEnabled(@pointer, *a); end
     def _abi_is_keyboard_navigation_enabled(*a);    Abi.call_arg_map! a; Abi.ABI_BackendGui_isKeyboardNavigationEnabled(@pointer, *a); end
     def _abi_on_view_change(*a);    Abi.call_arg_map! a; Abi.ABI_BackendGui_onViewChange(@pointer, *a); end
+    def _abi_on_window_focus(*a);    Abi.call_arg_map! a; Abi.ABI_BackendGui_onWindowFocus(@pointer, *a); end
+    def _abi_on_window_unfocus(*a);    Abi.call_arg_map! a; Abi.ABI_BackendGui_onWindowUnfocus(@pointer, *a); end
   end
 
   class Font
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_Font_new(*a)); end
+    def self._abi_delete(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Font_delete(*a); end
     def self._abi_get_global_font(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Font_getGlobalFont(*a); end
   end
 
   class Gui
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_Gui_new(*a)); end
+    def self._abi_delete(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Gui_delete(*a); end
     def _abi_is_active(*a);    Abi.call_arg_map! a; Abi.ABI_Gui_isActive(@pointer, *a); end
     def _abi_poll_events(*a);    Abi.call_arg_map! a; Abi.ABI_Gui_pollEvents(@pointer, *a); end
     def _abi_draw(*a);    Abi.call_arg_map! a; Abi.ABI_Gui_draw(@pointer, *a); end
@@ -1061,6 +1078,7 @@ module Tgui
 
   class Texture
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_Texture_new(*a)); end
+    def self._abi_delete(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Texture_delete(*a); end
     def _abi_get_id(*a);    Abi.call_arg_map! a; Abi.ABI_Texture_getId(@pointer, *a); end
     def _abi_get_image_size(*a);    Abi.call_arg_map! a; Abi.ABI_Texture_getImageSize(@pointer, *a); end
     def _abi_get_part_rect(*a);    Abi.call_arg_map! a; Abi.ABI_Texture_getPartRect(@pointer, *a); end
@@ -1125,6 +1143,8 @@ module Tgui
     def _abi_set_auto_layout(*a);    Abi.call_arg_map! a; Abi.ABI_Widget_setAutoLayout(@pointer, *a); end
     def _abi_get_auto_layout(*a);    Abi.call_arg_map! a; Abi.ABI_Widget_getAutoLayout(@pointer, *a); end
     def _abi_get_widget_name(*a);    Abi.call_arg_map! a; Abi.ABI_Widget_getWidgetName(@pointer, *a); end
+    def _abi_set_ignore_mouse_events(*a);    Abi.call_arg_map! a; Abi.ABI_Widget_setIgnoreMouseEvents(@pointer, *a); end
+    def _abi_get_ignore_mouse_events(*a);    Abi.call_arg_map! a; Abi.ABI_Widget_getIgnoreMouseEvents(@pointer, *a); end
     def _abi_on_position_change(*a);    Abi.call_arg_map! a; Abi.ABI_Widget_onPositionChange(@pointer, *a); end
     def _abi_on_size_change(*a);    Abi.call_arg_map! a; Abi.ABI_Widget_onSizeChange(@pointer, *a); end
     def _abi_set_color_renderer_property(*a);    Abi.call_arg_map! a; Abi.ABI_Widget_setColorRendererProperty(@pointer, *a); end
@@ -1193,7 +1213,7 @@ module Tgui
     def _abi_get_maximum_characters(*a);    Abi.call_arg_map! a; Abi.ABI_EditBox_getMaximumCharacters(@pointer, *a); end
     def _abi_set_alignment(*a);    Abi.call_arg_map! a; Abi.ABI_EditBox_setAlignment(@pointer, *a); end
     def _abi_get_alignment(*a);    Abi.call_arg_map! a; Abi.ABI_EditBox_getAlignment(@pointer, *a); end
-    def _abi_limit_text_width(*a);    Abi.call_arg_map! a; Abi.ABI_EditBox_limitTextWidth(@pointer, *a); end
+    def _abi_set_text_width_limited(*a);    Abi.call_arg_map! a; Abi.ABI_EditBox_setTextWidthLimited(@pointer, *a); end
     def _abi_is_text_width_limited(*a);    Abi.call_arg_map! a; Abi.ABI_EditBox_isTextWidthLimited(@pointer, *a); end
     def _abi_set_read_only(*a);    Abi.call_arg_map! a; Abi.ABI_EditBox_setReadOnly(@pointer, *a); end
     def _abi_is_read_only(*a);    Abi.call_arg_map! a; Abi.ABI_EditBox_isReadOnly(@pointer, *a); end
@@ -1223,8 +1243,6 @@ module Tgui
     def _abi_get_auto_size(*a);    Abi.call_arg_map! a; Abi.ABI_Label_getAutoSize(@pointer, *a); end
     def _abi_set_maximum_text_width(*a);    Abi.call_arg_map! a; Abi.ABI_Label_setMaximumTextWidth(@pointer, *a); end
     def _abi_get_maximum_text_width(*a);    Abi.call_arg_map! a; Abi.ABI_Label_getMaximumTextWidth(@pointer, *a); end
-    def _abi_ignore_mouse_events(*a);    Abi.call_arg_map! a; Abi.ABI_Label_ignoreMouseEvents(@pointer, *a); end
-    def _abi_ignoring_mouse_events(*a);    Abi.call_arg_map! a; Abi.ABI_Label_ignoringMouseEvents(@pointer, *a); end
   end
 
   class RadioButton
@@ -1328,7 +1346,7 @@ module Tgui
     def _abi_set_position_locked(*a);    Abi.call_arg_map! a; Abi.ABI_ChildWindow_setPositionLocked(@pointer, *a); end
     def _abi_is_position_locked(*a);    Abi.call_arg_map! a; Abi.ABI_ChildWindow_isPositionLocked(@pointer, *a); end
     def _abi_set_keep_in_parent(*a);    Abi.call_arg_map! a; Abi.ABI_ChildWindow_setKeepInParent(@pointer, *a); end
-    def _abi_is_kept_in_parent(*a);    Abi.call_arg_map! a; Abi.ABI_ChildWindow_isKeptInParent(@pointer, *a); end
+    def _abi_get_keep_in_parent(*a);    Abi.call_arg_map! a; Abi.ABI_ChildWindow_getKeepInParent(@pointer, *a); end
     def _abi_on_mouse_press(*a);    Abi.call_arg_map! a; Abi.ABI_ChildWindow_onMousePress(@pointer, *a); end
     def _abi_on_close(*a);    Abi.call_arg_map! a; Abi.ABI_ChildWindow_onClose(@pointer, *a); end
     def _abi_on_minimize(*a);    Abi.call_arg_map! a; Abi.ABI_ChildWindow_onMinimize(@pointer, *a); end
@@ -1619,8 +1637,6 @@ module Tgui
 
   class Picture
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_Picture_new(*a)); end
-    def _abi_ignore_mouse_events(*a);    Abi.call_arg_map! a; Abi.ABI_Picture_ignoreMouseEvents(@pointer, *a); end
-    def _abi_is_ignoring_mouse_events(*a);    Abi.call_arg_map! a; Abi.ABI_Picture_isIgnoringMouseEvents(@pointer, *a); end
     def _abi_on_double_click(*a);    Abi.call_arg_map! a; Abi.ABI_Picture_onDoubleClick(@pointer, *a); end
   end
 

data/lib/white_gold/master.rb

@@ -1,3 +1,5 @@
+require 'extree'
+require 'procify'
 require_relative 'convention/boolean'
 require_relative 'path/kernel.path'
 require_relative 'path/numeric.path'
@@ -9,10 +11,6 @@ require_relative 'convention/page'
 class WhiteGold
   include Tgui
 
-  def [](method_name)
-    method(method_name)
-  end
-
   def fps=(fps)
     @frame_delay = 1.0 / fps
   end
@@ -24,7 +22,7 @@ class WhiteGold
       window_size = nil
     end
     window_size ||= [800, 600]
-    @window = Window.new *eo.abi_pack(Vector2u, *window_size), *eo.abi_pack(ExternObject::WindowStyle, *(window_style || :default))
+    @window = Window.new *eo.abi_pack(Vector2i, *window_size), *eo.abi_pack(ExternObject::WindowStyle, *(window_style || :default))
     @gui = Gui.new window
     @preserved_pages = {}
     Theme.default = theme if theme
@@ -45,8 +43,8 @@ class WhiteGold
       if @current_page_id != @next_page_id
         if @current_page_id
           page = @preserved_pages[@current_page_id]
-          BangNestedCaller.pop
-          BangNestedCaller.close_scope page
+          Extree::Seed.pop
+          Extree::Seed.close_scope page
           @gui.self_remove page
           page.disconnect
           @preserved_pages.delete(@current_page_id)
@@ -85,8 +83,8 @@ class WhiteGold
     ExternObject.callback_storage = page.widget_callbacks
     ExternObject.global_callback_storage = page.global_callbacks
     ExternObject.data_storage = page.custom_data
-    BangNestedCaller.open_scope page
-    BangNestedCaller.push page
+    Extree::Seed.open_scope page
+    Extree::Seed.push page
   end
 
   attr_accessor :next_page_id
@@ -101,71 +99,86 @@ class WhiteGold
   end
 
   class Job
-    NO_RESULT = Object.new
 
-    def initialize delay:, repeat:, run: true, &b
-      @delay = delay
+    def initialize repeat:, run: true, &b
+      @queue = Thread::Queue.new
+      @mutex = Thread::Mutex.new
       @repeat = repeat
       @job = b
-      @result = NO_RESULT
-      @counter = 0
       self.run if run
     end
 
     def run
-      @thread = Thread.new do
-        sleep(@delay / 1000.0) if @delay
-        @result = @job.(self)
+      if !@thread || !@thread.alive?
+        @thread = Thread.new do
+          loop do
+            last_spin = false
+            @mutex.synchronize do
+              last_spin = !@repeat
+            end
+            @job.call self
+            break if last_spin
+          end
+        end
       end
     end
 
-    def on_done &b
-      @on_done = b
-      b.(@result) if @thread && !@thread.alive?
+    def tip &b
+      @tip = b
+      b.(self) if @thread && !@thread.alive?
       self
     end
 
     def audit
-      if @thread
-        if @thread.alive?
-          return true
-        else
-          @on_done.(@result) if @on_done
-          if @repeat
-            @counter += 1
-            run
-            return true
-          else
-            return false
-          end
-        end
-      else 
-        return !!@job
-      end
+      @tip&.call @queue.pop, self if !@queue.empty?
+      @thread ? @thread.alive? : !!@job
     end
 
-    def finish result = NO_RESULT
-      @thread.kill
-      @result = result if result != NO_RESULT
+    attr_accessor :queue
+    attr :repeat
+
+    def <<(value)
+      @queue << value
+      self
     end
 
-    attr :counter
-    attr_accessor :repeat
+    def repeat=(repeat)
+      @mutex.synchronize do
+        @repeat = repeat
+      end
+    end
 
     def cancel
-      @thread.kill
+      @thread&.kill
       @thread = @job = nil
     end
   end
 
-  def job delay: nil, repeat: false, &b
-    job = Job.new delay:, repeat:, &b
+  def job repeat: false, run: true, &b
+    job = Job.new repeat:, run:, &b
     @jobs << job
     job
   end
 
-  def timer delay_ = nil, delay: nil, repeat: false, &b
-    job delay: delay || delay_, repeat: do
-    end.on_done &b
+  def after delay = nil, run: true, &b
+    if delay
+      job run: do |j|
+        sleep(delay / 1000.0)
+        j.queue << nil
+      end.tip &b
+    else
+      job(run: false).tip(&b).tap{ _1.queue << nil }
+    end
+  end
+
+  def timer target_pulse_time, run: true, &b
+    nms = nil
+    target_pulse_time /= 1000.0 # ms => s
+    job repeat: true, run: do |j|
+      ms = Time.now
+      nms = (nms || ms) + target_pulse_time
+      j.queue << ms if j.queue.empty?
+      sleep(nms - ms) if nms > ms
+    end.tip &b
   end
 end

data/lib/white_gold/path/array.path.rb

@@ -6,11 +6,4 @@ class Array
   def y
     self[1]
   end
-
-  alias_method :_insert, :[]=
-  
-  def []=(*a)
-    a.size != 1 ? _insert(*a) : append(a[0])
-    return a.last
-  end
 end

data/lib/white_gold/path/object.path.rb

@@ -1,11 +1,5 @@
-require_relative '../convention/proc_method_factory'
-
 class Object
   def behalf client, &todo
     client.instance_exec self, client, &todo
   end
-
-  def proc &block
-    block_given? ? Kernel.proc(&block) : ProcMethodFactory.new(self)
-  end
 end

data/lib/white_gold/tgui-abi.rb

@@ -29,7 +29,7 @@ module Tgui
       'float y'
     ]
 
-    Vector2u = struct [
+    Vector2i = struct [
       'int x',
       'int y'
     ]
@@ -43,7 +43,7 @@ module Tgui
   end
 
   Vector2f = Abi::Vector2f
-  Vector2u = Abi::Vector2u
+  Vector2i = Abi::Vector2i
   UIntRect = Abi::UIntRect
 end
 
@@ -85,11 +85,6 @@ require_relative 'convention/container_widgets'
 require_relative 'convention/theme_attributes'
 
 class ExternObject
-  class << self
-    def finalizer pointer
-      Tgui::Util.free(pointer)
-    end
-  end
 
   abi_packer Object do |o|
     o = o.first if o.is_a? Array
@@ -178,7 +173,7 @@ class ExternObject
     [abi_pack_float(x), abi_pack_float(y)]
   end
 
-  abi_packer Tgui::Abi::Vector2u do |*arg|
+  abi_packer Tgui::Abi::Vector2i do |*arg|
     case arg.size
     when 1
       a = arg.first
@@ -234,7 +229,7 @@ class ExternObject
   vector2f_unpacker = proc do |o|
     v = Tgui::Vector2f.new o
     r = [v.x, v.y]
-    Tgui::Util.free(o)
+    Tgui::Util.delete_vector2f(o)
     r
   end
 
@@ -244,17 +239,17 @@ class ExternObject
 
   abi_unpacker Tgui::Vector2f, &vector2f_unpacker
 
-  abi_unpacker Tgui::Vector2u do |o|
-    v = Tgui::Vector2u.new o
+  abi_unpacker Tgui::Vector2i do |o|
+    v = Tgui::Vector2i.new o
     r = [v.x, v.y]
-    Tgui::Util.free(o)
+    Tgui::Util.delete_vector2i(o)
     r
   end
 
   abi_unpacker Tgui::UIntRect do |o|
     v = Tgui::UIntRect.new o
     r = [v.left, v.top, v.width, v.height]
-    Tgui::Util.free(o)
+    Tgui::Util.delete_u_int_rect(o)
     r
   end
 

data/lib/white_gold/version.rb

@@ -1,3 +1,3 @@
 class WhiteGold
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/white_gold.rb

@@ -5,8 +5,7 @@ include Tgui
 @white_gold_instance = WhiteGold.new
 
 class << self 
-  include BangNestedCaller
-  include BangDef
+  include Extree
 
   def go page
     @white_gold_instance.go page.is_a?(Symbol) ? proc{ send(page) } : page
@@ -18,19 +17,20 @@ class << self
 
   def respond_to? name
     super || 
-    (name.end_with?("!") && bang_respond_to?(name[...-1])) ||
+    (name.end_with?("!") && extree_respond_to?(name[...-1])) ||
     @white_gold_instance.page.respond_to?(name)
   end
 
   def method_missing name, *a, **na, &b
     if name.end_with? "!"
-      bang_method_missing name[...-1], *a, **na, &b
+      extree_method_missing name[...-1], *a, **na, &b
     elsif @white_gold_instance.page.respond_to? name
       @white_gold_instance.page.send name, *a, **na, &b
     else super
     end
   end
 end
+extend Extree::Branch
 
 def! :run do |page = nil|
   go page if page
@@ -46,5 +46,5 @@ if $0 != 'irb'
   end
 end
 
-BangNestedCaller.open_scope self
-BangNestedCaller.push self
+Extree::Seed.open_scope self
+Extree::Seed.push self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: white_gold
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Łukasz Pomietło
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -24,10 +24,38 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: extree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: procify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: |2
       Ruby gem for building pure ruby graphical user interface.
       Uses TGUI & SFML as a backend.
-      Dedicated to creating single-file applications and learning programming.
+      Dedicated to creating simple applications and learning programming.
 email: oficjalnyadreslukasza@gmail.com
 executables: []
 extensions: []
@@ -57,15 +85,11 @@ files:
 - lib/white_gold/abi/packer.rb
 - lib/white_gold/abi/unpacker.rb
 - lib/white_gold/convention/api_child.rb
-- lib/white_gold/convention/bang_def.rb
-- lib/white_gold/convention/bang_nest.rb
-- lib/white_gold/convention/bang_nested_caller.rb
 - lib/white_gold/convention/bool_property.rb
 - lib/white_gold/convention/boolean.rb
 - lib/white_gold/convention/club.rb
 - lib/white_gold/convention/container_widgets.rb
 - lib/white_gold/convention/page.rb
-- lib/white_gold/convention/proc_method_factory.rb
 - lib/white_gold/convention/theme/boolean_attribute.rb
 - lib/white_gold/convention/theme/color_attribute.rb
 - lib/white_gold/convention/theme/float_attribute.rb
@@ -177,6 +201,7 @@ licenses:
 - Zlib
 metadata:
   documentation_uri: https://github.com/lpogic/white_gold/blob/master/doc/wiki/README.md
+  homepage_uri: https://github.com/lpogic/white_gold
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -192,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: TGUI based Ruby gem for quick native application developing

data/lib/white_gold/convention/bang_def.rb

@@ -1,19 +0,0 @@
-require_relative 'bang_nested_caller'
-
-module BangDef
-  def def! name, &b
-    define_method "api_bang_#{name}", &b
-  end
-
-  @@redef_index = 0
-
-  def redef! name, &b
-    @@redef_index = index = @@redef_index.next
-    old = "api_bang_#{index}_#{name}"
-    news = "api_bang_#{name}"
-    alias_method old, news
-    define_method news do |*a, **na, &bl|
-      b.call old, *a, **na, &bl
-    end
-  end
-end

data/lib/white_gold/convention/bang_nest.rb

@@ -1,26 +0,0 @@
-require_relative 'bang_nested_caller'
-
-module BangNest
-  include BangNestedCaller
-
-  def respond_to? name
-    super || (name.end_with?("!") && bang_respond_to?(name[...-1]))
-  end
-
-  def method_missing name, *a, **na, &b
-    if name.end_with? "!"
-      bang_method_missing name[...-1], *a, **na, &b
-    else super
-    end
-  end
-
-  def host! *a, **na, &b
-    a.each do |k|
-      send("#{k}=", true)
-    end
-    na.each do |k, v|
-      send("#{k}=", v)
-    end
-    super(&b)
-  end
-end