white_gold 0.0.3 → 0.0.4

data/lib/white_gold/dsl/tab_container.rb

@@ -75,7 +75,7 @@ module Tgui
       objects.insert index, object
       tab_panel = TabPanel.new self, index, panel_pointer
       tab_panel.page = page
-      tab_panel.send! **na, &b
+      scope! tab_panel, **na, &b
     end
     
     def [](object)
@@ -93,7 +93,7 @@ module Tgui
     def! :tabs do |**na, &b|
       tabs = Tabs.new self, _abi_get_tabs
       tabs.page = page
-      tabs.send! **na, &b
+      scope! tabs, **na, &b
     end
 
     def remove object

data/lib/white_gold/dsl/tabs.rb

@@ -61,7 +61,7 @@ module Tgui
       end
       objects.insert index, object
       tab = Tab.new self, index
-      tab.send! **na, &b
+      scope! tab, **na, &b
     end
 
     def remove object
@@ -101,7 +101,7 @@ module Tgui
 
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [0]) do
-          @widget.send! do
+          @widget.host! do
             b.(@widget.selected, @widget)
           end
         end

data/lib/white_gold/dsl/theme.rb

@@ -70,7 +70,7 @@ module Tgui
       self.next_renderer_id = renderer_id = next_renderer_id.next
       attribute = type.new(seed, renderer_id)
       attributes[attribute.name] = attribute
-      attribute.send! **na, &b
+      attribute.host! **na, &b
       self_commit
       renderer_id
     end
@@ -97,7 +97,7 @@ module Tgui
         _abi_load @source if @source
       end
       custom_rendered&.each do |widget, renderer|
-        widget.self_renderer = renderer
+        widget.self_set_renderer renderer
       end
     end
   end

data/lib/white_gold/dsl/toggle_button.rb

@@ -3,6 +3,9 @@ require_relative 'button_base'
 module Tgui
   class ToggleButton < ButtonBase
 
+    class Theme < ButtonBase::Theme
+    end
+
     abi_attr :down?
     abi_signal :on_toggle
 

data/lib/white_gold/dsl/tree_view.rb

@@ -34,7 +34,7 @@ module Tgui
           end
           SignalItemHierarchy.fetch_path vector, loader
           object_path = @widget.self_tree.path_str_to_object *path
-          @widget.send! do
+          @widget.host! do
             b.(object_path.last, object_path, @widget)
           end
         end
@@ -176,7 +176,7 @@ module Tgui
         self_tree[*new_path, grow: true].text = _3
       end
       item = Item.new self, new_path
-      item.send! **na, &b
+      scope! item, **na, &b
     end
 
     def self_change_item path, text, **na, &b

data/lib/white_gold/dsl/widget.rb

@@ -29,6 +29,10 @@ module Tgui
 
     attr_accessor :page
 
+    def window
+      page.window
+    end
+
     abi_attr :text_size, Integer
     abi_attr :enabled?
 
@@ -36,34 +40,40 @@ module Tgui
       self.enabled = !disabled
     end
 
-    def! :renderer do |seed = VOID, **na, &b|
+    def! :theme do |seed = VOID, **na, &b|
       seed = page.custom_renderers[self] if seed == VOID
       if !na.empty? || b
-        seed = page.theme.custom! self.class::Theme, seed, **na, &b
-        page.custom_renderers[self] = seed
-      elsif !seed
-        page.custom_renderers.delete self
-      else
+        if seed.is_a?(String) && seed =~ /_\d+/
+          page.theme.attributes[seed].host! **na, &b
+          page.theme.self_commit
+        else
+          seed = page.theme.custom! self.class::Theme, seed, **na, &b
+          page.custom_renderers[self] = seed
+        end
+      elsif seed
         page.custom_renderers[self] = seed
       end
-      self.self_renderer = seed
+      self_set_renderer seed
     end
 
-    def renderer=(renderer)
-      case renderer
+    def theme=(theme)
+      case theme
       when Hash
-        api_bang_renderer **renderer
+        api_bang_theme **theme
       when Proc
-        api_bang_renderer &renderer
+        api_bang_theme &theme
       else
-        page.custom_renderers[self] = renderer
-        self.self_renderer = renderer
+        page.custom_renderers[self] = theme
+        self_set_renderer theme
       end
     end
 
-    abi_def :self_renderer=, :set_renderer, proc.self_renderer => nil
+    abi_def :self_set_renderer, :set_renderer, proc.self_theme_name => nil
     
     abi_attr :focused?
+    def! :focus do |focus = VOID|
+      self.focused = focus
+    end
     abi_attr :focusable?
     abi_signal :on_position_change, Tgui::SignalVector2f
     abi_signal :on_size_change, Tgui::SignalVector2f
@@ -99,7 +109,7 @@ module Tgui
       if block_given?
         tooltip = ToolTip.new
         tooltip.page = page
-        tooltip.send! **na, &b
+        scope! tooltip, **na, &b
         _abi_set_tool_tip tooltip.widget if tooltip.widget
       else
         widget = _abi_get_tool_tip
@@ -198,14 +208,14 @@ module Tgui
     end
 
     def! :navigation do |**na, &b|
-      navigation.send! **na, &b
+      scope! navigation, **na, &b
     end
 
     def navigation
       Navigation.new self, nil
     end
 
-    abi_enum "KeyCode", nil, :a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k, 
+    abi_enum "KeyCode", :a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k, 
       :l, :m, :n, :o, :p, :q, :r, :s, :t, :u, :v, :w, :x, :y, :z,
       :num0, :num1, :num2, :num3, :num4, :num5, :num6, :num7, :num8, :num9,
       :escape, :left_control, :left_shift, :left_alt, :left_system,
@@ -258,10 +268,30 @@ module Tgui
 
     def! :robot do |**na, &b|
       robot = Robot.new self
-      robot.send! **na, &b if block_given?
+      scope! robot, **na, &b if block_given?
       robot
     end
 
+    def! :messagebox do |*a, **na, &b|
+      page.api_bang_messagebox *a, **na, &b
+    end
+
+    def! :msg do |text, **buttons|
+      buttons["OK"] = nil if buttons.empty?
+      buttons = buttons.map do |k, v| 
+        procedure = proc do |o, b, w|
+          v&.call
+          w.close true
+        end
+        [k, procedure]
+      end
+      page.api_bang_messagebox text:, position: :center, label_alignment: :center, buttons: buttons
+    end
+
+    def! :page do |*a, **na, &b|
+      page.host! *a, **na, &b
+    end
+
     def self.api_attr name, &init
       define_method "#{name}=" do |value|
         @@data_storage[Widget.get_unshared(@pointer).to_i][name] = value
@@ -302,14 +332,14 @@ module Tgui
     class << self
       include ApiChild
 
-      def self_renderer widget, renderer = nil
-        case renderer
+      def self_theme_name widget, theme = nil
+        case theme
         when Module
-          renderer.name.split("::").last
+          theme.name.split("::").last
         when nil, false, VOID
-          self_renderer widget, widget.class
+          self_theme_name widget, widget.class
         else
-          renderer.to_s
+          theme.to_s
         end
       end
 

data/lib/white_gold/dsl/window.rb

@@ -11,6 +11,13 @@ module Tgui
     end
     abi_def :open?
     abi_def :title=, String => nil
+    abi_attr :size, Vector2u
+    abi_attr :position, Vector2u
+    abi_def :has_focus?, nil => Boolean
+    abi_def :request_focus
+    def! :request_focus do
+      request_focus
+    end
 
   end
 end

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

@@ -36,10 +36,16 @@ module Tgui
     extern 'int ABI_SignalTypedIntBoolPtr_connect(SignalTypedIntBoolPtr* self, void(*f)(int, bool*))'
     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()'
+    extern 'void* ABI_Window_new(int width, int height, int style)'
     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)'
+    extern 'void ABI_Window_setSize(sf::WindowBase* self, int width, int height)'
+    extern 'void* ABI_Window_getSize(sf::WindowBase* self)'
+    extern 'void ABI_Window_setPosition(sf::WindowBase* self, int x, int y)'
+    extern 'void* ABI_Window_getPosition(sf::WindowBase* self)'
+    extern 'void ABI_Window_requestFocus(sf::WindowBase* self)'
+    extern 'int ABI_Window_hasFocus(sf::WindowBase* self)'
     extern 'void ABI_BackendGui_setTextSize(BackendGui* self, int textSize)'
     extern 'int ABI_BackendGui_getTextSize(BackendGui* self)'
     extern 'void ABI_BackendGui_setAbsoluteView(BackendGui* self, int x, int y, int w, int h)'
@@ -76,6 +82,7 @@ module Tgui
     extern 'void ABI_Gui_setClearColor(Gui* self, Color* color)'
     extern 'void ABI_Gui_setClipboard(Gui* self, char* text)'
     extern 'void* ABI_Gui_getClipboard(Gui* self)'
+    extern 'void* ABI_Gui_getScreenSize(Gui* self)'
     extern 'void ABI_STATIC_Theme_setDefault(char* theme)'
     extern 'void* ABI_STATIC_Theme_getDefault()'
     extern 'void ABI_STATIC_Theme_finalizer(std::shared_ptr<Theme>* pointer)'
@@ -825,16 +832,20 @@ module Tgui
     extern 'void* ABI_Shape_getOrigin(sf::Shape* self)'
     extern 'int ABI_CircleShape_getPointCount(sf::CircleShape* self)'
     extern 'void* ABI_CircleShape_new()'
+    extern 'void ABI_STATIC_CircleShape_delete(sf::CircleShape* self)'
     extern 'void ABI_CircleShape_setRadius(sf::CircleShape* self, float radius)'
     extern 'float ABI_CircleShape_getRadius(sf::CircleShape* self)'
     extern 'void ABI_CircleShape_setPointCount(sf::CircleShape* self, int pointCount)'
     extern 'void* ABI_RectangleShape_new()'
+    extern 'void ABI_STATIC_RectangleShape_delete(sf::RectangleShape* self)'
     extern 'void ABI_RectangleShape_setSize(sf::RectangleShape* self, float width, float height)'
     extern 'void* ABI_RectangleShape_getSize(sf::RectangleShape* self)'
     extern 'void* ABI_ConvexShape_new()'
+    extern 'void ABI_STATIC_ConvexShape_delete(sf::ConvexShape* self)'
     extern 'void ABI_ConvexShape_setPoint(sf::ConvexShape* self, int index, float x, float y)'
     extern 'void ABI_ConvexShape_setPointCount(sf::ConvexShape* self, int pointCount)'
     extern 'void* ABI_Text_new()'
+    extern 'void ABI_STATIC_Text_delete(sf::Text* self)'
     extern 'void ABI_Text_setString(sf::Text* self, char* string)'
     extern 'void* ABI_Text_getString(sf::Text* self)'
     extern 'void ABI_Text_setFont(sf::Text* self, Font* font)'
@@ -861,6 +872,31 @@ module Tgui
     extern 'void ABI_Text_setOrigin(sf::Text* self, float x, float y)'
     extern 'void* ABI_Text_getOrigin(sf::Text* self)'
     extern 'void* ABI_Text_findCharacterPos(sf::Text* self, int index)'
+    extern 'void* ABI_CustomWidget_new()'
+    extern 'void ABI_CustomWidget_implPositionChanged(CustomWidgetForBindings::Ptr* self, void(*f)(float x, float y))'
+    extern 'void ABI_CustomWidget_implSizeChanged(CustomWidgetForBindings::Ptr* self, void(*f)(float width, float height))'
+    extern 'void ABI_CustomWidget_implVisibleChanged(CustomWidgetForBindings::Ptr* self, void(*f)(int visible))'
+    extern 'void ABI_CustomWidget_implEnableChanged(CustomWidgetForBindings::Ptr* self, void(*f)(int enable))'
+    extern 'void ABI_CustomWidget_implFocusChanged(CustomWidgetForBindings::Ptr* self, void(*f)(int focus))'
+    extern 'void ABI_CustomWidget_implCanGainFocus(CustomWidgetForBindings::Ptr* self, int(*f)(void))'
+    extern 'void ABI_CustomWidget_implGetFullSize(CustomWidgetForBindings::Ptr* self, float(*f)(void))'
+    extern 'void ABI_CustomWidget_implGetWidgetOffset(CustomWidgetForBindings::Ptr* self, float(*f)(void))'
+    extern 'void ABI_CustomWidget_implUpdateTimeFunction(CustomWidgetForBindings::Ptr* self, int(*f)(int time))'
+    extern 'void ABI_CustomWidget_implMouseOnWidget(CustomWidgetForBindings::Ptr* self, int(*f)(float x, float y))'
+    extern 'void ABI_CustomWidget_implLeftMousePressed(CustomWidgetForBindings::Ptr* self, int(*f)(float x, float y))'
+    extern 'void ABI_CustomWidget_implLeftMouseReleased(CustomWidgetForBindings::Ptr* self, void(*f)(float x, float y))'
+    extern 'void ABI_CustomWidget_implRightMousePressed(CustomWidgetForBindings::Ptr* self, void(*f)(float x, float y))'
+    extern 'void ABI_CustomWidget_implRightMouseReleased(CustomWidgetForBindings::Ptr* self, void(*f)(float x, float y))'
+    extern 'void ABI_CustomWidget_implMouseMoved(CustomWidgetForBindings::Ptr* self, void(*f)(float x, float y))'
+    extern 'void ABI_CustomWidget_implKeyPressed(CustomWidgetForBindings::Ptr* self, void(*f)(int key, int alt, int control, int shift, int system))'
+    extern 'void ABI_CustomWidget_implTextEntered(CustomWidgetForBindings::Ptr* self, void(*f)(int character))'
+    extern 'void ABI_CustomWidget_implScrolled(CustomWidgetForBindings::Ptr* self, int(*f)(float delta, float x, float y, int touch))'
+    extern 'void ABI_CustomWidget_implMouseNoLongerOnWidget(CustomWidgetForBindings::Ptr* self, void(*f)(void))'
+    extern 'void ABI_CustomWidget_implLeftMouseButtonNoLongerDown(CustomWidgetForBindings::Ptr* self, void(*f)(void))'
+    extern 'void ABI_CustomWidget_implMouseEnteredWidget(CustomWidgetForBindings::Ptr* self, void(*f)(void))'
+    extern 'void ABI_CustomWidget_implMouseLeftWidget(CustomWidgetForBindings::Ptr* self, void(*f)(void))'
+    extern 'void ABI_CustomWidget_implRendererChanged(CustomWidgetForBindings::Ptr* self, int(*f)(const char32_t* property))'
+    extern 'void ABI_CustomWidget_implDrawFunction(CustomWidgetForBindings::Ptr* self, void(*f)(BackendRenderTarget* target, RenderStates* states))'
   end
 
   class Util
@@ -961,6 +997,12 @@ module Tgui
     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
+    def _abi_set_size(*a);    Abi.call_arg_map! a; Abi.ABI_Window_setSize(@pointer, *a); end
+    def _abi_get_size(*a);    Abi.call_arg_map! a; Abi.ABI_Window_getSize(@pointer, *a); end
+    def _abi_set_position(*a);    Abi.call_arg_map! a; Abi.ABI_Window_setPosition(@pointer, *a); end
+    def _abi_get_position(*a);    Abi.call_arg_map! a; Abi.ABI_Window_getPosition(@pointer, *a); end
+    def _abi_request_focus(*a);    Abi.call_arg_map! a; Abi.ABI_Window_requestFocus(@pointer, *a); end
+    def _abi_has_focus(*a);    Abi.call_arg_map! a; Abi.ABI_Window_hasFocus(@pointer, *a); end
   end
 
   class BackendGui
@@ -1006,6 +1048,7 @@ module Tgui
     def _abi_set_clear_color(*a);    Abi.call_arg_map! a; Abi.ABI_Gui_setClearColor(@pointer, *a); end
     def _abi_set_clipboard(*a);    Abi.call_arg_map! a; Abi.ABI_Gui_setClipboard(@pointer, *a); end
     def _abi_get_clipboard(*a);    Abi.call_arg_map! a; Abi.ABI_Gui_getClipboard(@pointer, *a); end
+    def _abi_get_screen_size(*a);    Abi.call_arg_map! a; Abi.ABI_Gui_getScreenSize(@pointer, *a); end
   end
 
   class Theme
@@ -1914,6 +1957,7 @@ module Tgui
   class CircleShape
     def _abi_get_point_count(*a);    Abi.call_arg_map! a; Abi.ABI_CircleShape_getPointCount(@pointer, *a); end
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_CircleShape_new(*a)); end
+    def self._abi_delete(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_CircleShape_delete(*a); end
     def _abi_set_radius(*a);    Abi.call_arg_map! a; Abi.ABI_CircleShape_setRadius(@pointer, *a); end
     def _abi_get_radius(*a);    Abi.call_arg_map! a; Abi.ABI_CircleShape_getRadius(@pointer, *a); end
     def _abi_set_point_count(*a);    Abi.call_arg_map! a; Abi.ABI_CircleShape_setPointCount(@pointer, *a); end
@@ -1921,18 +1965,21 @@ module Tgui
 
   class RectangleShape
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_RectangleShape_new(*a)); end
+    def self._abi_delete(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_RectangleShape_delete(*a); end
     def _abi_set_size(*a);    Abi.call_arg_map! a; Abi.ABI_RectangleShape_setSize(@pointer, *a); end
     def _abi_get_size(*a);    Abi.call_arg_map! a; Abi.ABI_RectangleShape_getSize(@pointer, *a); end
   end
 
   class ConvexShape
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_ConvexShape_new(*a)); end
+    def self._abi_delete(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_ConvexShape_delete(*a); end
     def _abi_set_point(*a);    Abi.call_arg_map! a; Abi.ABI_ConvexShape_setPoint(@pointer, *a); end
     def _abi_set_point_count(*a);    Abi.call_arg_map! a; Abi.ABI_ConvexShape_setPointCount(@pointer, *a); end
   end
 
   class Text
     def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_Text_new(*a)); end
+    def self._abi_delete(*a);    Abi.call_arg_map! a; Abi.ABI_STATIC_Text_delete(*a); end
     def _abi_set_string(*a);    Abi.call_arg_map! a; Abi.ABI_Text_setString(@pointer, *a); end
     def _abi_get_string(*a);    Abi.call_arg_map! a; Abi.ABI_Text_getString(@pointer, *a); end
     def _abi_set_font(*a);    Abi.call_arg_map! a; Abi.ABI_Text_setFont(@pointer, *a); end
@@ -1960,4 +2007,32 @@ module Tgui
     def _abi_get_origin(*a);    Abi.call_arg_map! a; Abi.ABI_Text_getOrigin(@pointer, *a); end
     def _abi_find_character_pos(*a);    Abi.call_arg_map! a; Abi.ABI_Text_findCharacterPos(@pointer, *a); end
   end
+
+  class CustomWidget
+    def initialize(*a, pointer: nil);    Abi.call_arg_map! a; super(pointer: pointer || Abi.ABI_CustomWidget_new(*a)); end
+    def _abi_impl_position_changed(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implPositionChanged(@pointer, *a); end
+    def _abi_impl_size_changed(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implSizeChanged(@pointer, *a); end
+    def _abi_impl_visible_changed(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implVisibleChanged(@pointer, *a); end
+    def _abi_impl_enable_changed(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implEnableChanged(@pointer, *a); end
+    def _abi_impl_focus_changed(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implFocusChanged(@pointer, *a); end
+    def _abi_impl_can_gain_focus(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implCanGainFocus(@pointer, *a); end
+    def _abi_impl_get_full_size(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implGetFullSize(@pointer, *a); end
+    def _abi_impl_get_widget_offset(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implGetWidgetOffset(@pointer, *a); end
+    def _abi_impl_update_time_function(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implUpdateTimeFunction(@pointer, *a); end
+    def _abi_impl_mouse_on_widget(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implMouseOnWidget(@pointer, *a); end
+    def _abi_impl_left_mouse_pressed(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implLeftMousePressed(@pointer, *a); end
+    def _abi_impl_left_mouse_released(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implLeftMouseReleased(@pointer, *a); end
+    def _abi_impl_right_mouse_pressed(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implRightMousePressed(@pointer, *a); end
+    def _abi_impl_right_mouse_released(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implRightMouseReleased(@pointer, *a); end
+    def _abi_impl_mouse_moved(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implMouseMoved(@pointer, *a); end
+    def _abi_impl_key_pressed(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implKeyPressed(@pointer, *a); end
+    def _abi_impl_text_entered(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implTextEntered(@pointer, *a); end
+    def _abi_impl_scrolled(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implScrolled(@pointer, *a); end
+    def _abi_impl_mouse_no_longer_on_widget(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implMouseNoLongerOnWidget(@pointer, *a); end
+    def _abi_impl_left_mouse_button_no_longer_down(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implLeftMouseButtonNoLongerDown(@pointer, *a); end
+    def _abi_impl_mouse_entered_widget(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implMouseEnteredWidget(@pointer, *a); end
+    def _abi_impl_mouse_left_widget(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implMouseLeftWidget(@pointer, *a); end
+    def _abi_impl_renderer_changed(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implRendererChanged(@pointer, *a); end
+    def _abi_impl_draw_function(*a);    Abi.call_arg_map! a; Abi.ABI_CustomWidget_implDrawFunction(@pointer, *a); end
+  end
 end

data/lib/white_gold/library/theme/light.rb

@@ -41,7 +41,7 @@ editbox! do
   selected_text_background_color! 157, 185, 240
 end
 
-text_area! do
+textarea! do
   background_color! 220
   default_text_color! 100
   caret_width! 2
@@ -59,6 +59,9 @@ combobox! do
   arrow_background_color_hover! 200
 end
 
+label! do
+end
+
 listbox! do
   background_color! 240
   background_color_hover! 220
@@ -76,6 +79,10 @@ menu! do
   separator_side_padding! 2
 end
 
+panel! do
+  background_color! 235
+end
+
 progressbar! do
   borders! 1
 end

data/lib/white_gold/master.rb

@@ -17,8 +17,14 @@ class WhiteGold
     @frame_delay = 1.0 / fps
   end
 
-  def init fps: nil, theme: nil
-    @window = Window.new
+  def init fps: nil, theme: nil, window_size: nil, window_style: nil
+    eo = ExternObject.new pointer: nil, autofree: false # object for packing
+    if window_size == :fullscreen
+      window_style = :fullscreen
+      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))
     @gui = Gui.new window
     @preserved_pages = {}
     Theme.default = theme if theme
@@ -28,8 +34,8 @@ class WhiteGold
     @initialized = true
   end
 
-  def run page = nil, fps: nil, theme: nil
-    self.init fps: fps, theme: theme if !@initialized
+  def run page = nil, fps: nil, theme: nil, window_size: nil, window_style: nil
+    self.init fps: fps, theme: theme, window_size: window_size, window_style: window_style if !@initialized
     load_page page if page
 
     next_frame_time = Time.now
@@ -39,6 +45,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
           @gui.self_remove page
           page.disconnect
           @preserved_pages.delete(@current_page_id)
@@ -62,22 +70,23 @@ class WhiteGold
     when Class
       page = @preserved_pages[page_id] = page_id.new self
       init_page page
-      page.send! do
-        page.build
-      end
+      page.build
     when Proc
       page = @preserved_pages[page_id] = Page.new self
       init_page page
-      page_id.call
+      page.instance_eval &page_id
     end
   end
 
   def init_page page
     @gui.self_add page, "main_container"
+    @gui.page = page
     @current_page = page
     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
   end
 
   attr_accessor :next_page_id
@@ -99,6 +108,7 @@ class WhiteGold
       @repeat = repeat
       @job = b
       @result = NO_RESULT
+      @counter = 0
       self.run if run
     end
 
@@ -112,6 +122,7 @@ class WhiteGold
     def on_done &b
       @on_done = b
       b.(@result) if @thread && !@thread.alive?
+      self
     end
 
     def audit
@@ -121,6 +132,7 @@ class WhiteGold
         else
           @on_done.(@result) if @on_done
           if @repeat
+            @counter += 1
             run
             return true
           else
@@ -128,14 +140,22 @@ class WhiteGold
           end
         end
       else 
-        return true
+        return !!@job
       end
     end
 
     def finish result = NO_RESULT
-      @repeat = false
+      @thread.kill
       @result = result if result != NO_RESULT
     end
+
+    attr :counter
+    attr_accessor :repeat
+
+    def cancel
+      @thread.kill
+      @thread = @job = nil
+    end
   end
 
   def job delay: nil, repeat: false, &b

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

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