white_gold 0.0.3 → 0.1.0

data/lib/white_gold/dsl/sfml/rectangle_shape.rb

@@ -3,5 +3,9 @@ require_relative 'shape'
 module Tgui
   class RectangleShape < Shape
     abi_attr :size, Vector2f
+
+    def self.finalizer pointer
+      _abi_delete pointer
+    end
   end
 end

data/lib/white_gold/dsl/sfml/shape.rb

@@ -1,9 +1,10 @@
 require_relative '../../abi/extern_object'
-require_relative '../../convention/bang_nest'
+require_relative '../color'
+require_relative '../texture'
 
 module Tgui
   class Shape < ExternObject
-    include BangNest
+    include Extree
 
     abi_attr :texture, Texture
     abi_attr :radius, Float

data/lib/white_gold/dsl/sfml/text.rb

@@ -1,8 +1,10 @@
 require_relative '../../abi/extern_object'
+require_relative '../font'
+require_relative '../color'
 
 module Tgui
   class Text < ExternObject
-    include BangNest
+    include Extree
 
     abi_attr :string, String
     abi_attr :font, Font
@@ -18,5 +20,9 @@ module Tgui
     abi_attr :rotation, Float
     abi_attr :scale, Vector2f
     abi_attr :origin, Vector2f
+
+    def self.finalizer pointer
+      _abi_delete pointer
+    end
   end
 end

data/lib/white_gold/dsl/signal/global_signal.rb

@@ -6,7 +6,7 @@ module Tgui
 
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [0]) do
-        @widget.send! do
+        @widget.host! do
           b.(@widget)
         end
       end

data/lib/white_gold/dsl/signal/signal.rb

@@ -10,7 +10,7 @@ module Tgui
 
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [0]) do
-        @widget.send! do
+        @widget.host! do
           b.(@widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_animation_type.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller
       block_caller = Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT]) do |animation_type|
         at = @widget.abi_unpack AnimationType, animation_type
-        @widget.send! do
+        @widget.host! do
           b.(at, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_bool.rb

@@ -1,13 +1,13 @@
 require_relative 'signal'
 
 module Tgui
-  class SignalBoolean < Signal
+  class SignalBool < Signal
 
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT]) do |int|
-        b = @widget.abi_unpack Boolean, int
-        @widget.send! do
-          b.(b, @widget)
+        bool = @widget.abi_unpack Boolean, int
+        @widget.host! do
+          b.(bool, @widget)
         end
       end
     end

data/lib/white_gold/dsl/signal/signal_color.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |ptr|
         c = @widget.abi_unpack Color, ptr
-        @widget.send! do
+        @widget.host! do
           b.(c, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_float.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_FLOAT]) do |float|
         f = @widget.abi_unpack_float float
-        @widget.send! do
+        @widget.host! do
           b.(f, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_int.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |int|
         i = @widget.abi_unpack_integer int
-        @widget.send! do
+        @widget.host! do
           b.(i, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_pointer.rb

@@ -5,7 +5,7 @@ module Tgui
 
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |pointer|
-        @widget.send! do
+        @widget.host! do
           b.(pointer, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_range.rb

@@ -5,7 +5,7 @@ module Tgui
 
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_FLOAT, Fiddle::TYPE_FLOAT]) do |min, max|
-        @widget.send! do
+        @widget.host! do
           b.(min..max, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_show_effect.rb

@@ -7,7 +7,7 @@ module Tgui
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT, Fiddle::TYPE_INT]) do |show_effect_type, shown|
         effect_type = @widget.abi_unpack ShowEffectType, show_effect_type
         shown = @widget.abi_unpack Boolean, shown
-        @widget.send! do
+        @widget.host! do
           b.(effect_type, shown, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_string.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |str|
         string = @widget.abi_unpack_string(str)
-        @widget.send! do
+        @widget.host! do
           b.(string, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_u_int.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT]) do |uint|
         int = @widget.abi_unpack Integer, uint
-        @widget.send! do
+        @widget.host! do
           b.(int, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_vector2f.rb

@@ -5,7 +5,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |ptr|
         vector = @widget.abi_unpack Vector2f, ptr
-        @widget.send! do
+        @widget.host! do
           b.(vector, @widget)
         end
       end

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/texture.rb

@@ -3,6 +3,11 @@ require_relative 'color'
 
 module Tgui
   class Texture < ExternObject
+
+    def self.finalizer pointer
+      _abi_delete pointer
+    end
+
     def self.from *arg
       case arg.size
       when 1
@@ -33,7 +38,7 @@ module Tgui
     end
 
     abi_def :id, :get_, nil => String
-    abi_def :image_size, :get_, nil => Vector2u
+    abi_def :image_size, :get_, nil => Vector2i
     abi_def :part_rect, :get_, nil => UIntRect
     abi_def :smooth?, nil => Boolean
     abi_attr :color, Color

data/lib/white_gold/dsl/theme.rb

@@ -1,11 +1,10 @@
 require 'tempfile'
 require_relative '../abi/extern_object'
-require_relative '../convention/bang_nest'
 require_relative '../convention/theme/theme_attributed'
 
 module Tgui
   class Theme < ExternObject
-    include BangNest
+    include Extree
     extend ThemeAttributed
     
     class << self
@@ -70,7 +69,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 +96,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/util.rb

@@ -3,7 +3,9 @@ require_relative '../abi/extern_object'
 module Tgui
   class Util < ExternObject
 
-    abi_static :free
+    abi_static :delete_vector2f
+    abi_static :delete_vector2i
+    abi_static :delete_u_int_rect
 
     def self.expand_path path, exist: true
       if !path.match?(/^\w:\//) # TODO UNIX

data/lib/white_gold/dsl/widget.rb

@@ -1,5 +1,4 @@
 require_relative '../abi/extern_object'
-require_relative '../convention/bang_nest'
 require_relative '../convention/unit'
 require_relative '../convention/widget_like'
 require_relative '../convention/api_child'
@@ -15,8 +14,7 @@ require_relative 'tool_tip'
 
 module Tgui
   class Widget < ExternObject
-    include BangNest
-    extend BangDef
+    include Extree
 
     class Theme < ThemeComponent
     
@@ -29,6 +27,10 @@ module Tgui
 
     attr_accessor :page
 
+    def window
+      page.window
+    end
+
     abi_attr :text_size, Integer
     abi_attr :enabled?
 
@@ -36,34 +38,43 @@ 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
+        send! :theme, **theme
       when Proc
-        api_bang_renderer &renderer
+        send! :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
+    def! :unfocus do
+      self.focused = false
+    end
     abi_attr :focusable?
     abi_signal :on_position_change, Tgui::SignalVector2f
     abi_signal :on_size_change, Tgui::SignalVector2f
@@ -99,7 +110,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
@@ -113,12 +124,13 @@ module Tgui
     abi_attr :mouse_cursor, CursorType
     abi_def :draggable?, :is_widget_, nil => Boolean
     abi_def :mouse_down?, nil => Boolean
+    abi_attr :ignore_mouse_events?, Boolean, :get_
 
     abi_enum "ShowEffectType", :fade, :scale, :slide_to_right, :slide_to_left, :slide_to_bottom,
     :slide_to_top, slide_from_left: :slide_to_right, slide_from_right: :slide_to_left,
     slide_from_top: :slide_to_bottom, slide_from_bottom: :slide_to_top
 
-    def visible=(a)
+    def visible=(a = true)
       if a.is_a? Array
         if a[0]
           show *a[1..]
@@ -198,14 +210,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 +270,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.send! :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.send! :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 +334,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

@@ -1,9 +1,12 @@
 require_relative '../abi/extern_object'
-require_relative '../convention/bang_nest'
 
 module Tgui
   class Window < ExternObject
-    include BangNest
+    include Extree
+
+    def self.finalizer(pointer)
+      _abi_delete pointer
+    end
 
     abi_def :close
     def! :close do
@@ -11,6 +14,13 @@ module Tgui
     end
     abi_def :open?
     abi_def :title=, String => nil
+    abi_attr :size, Vector2i
+    abi_attr :position, Vector2i
+    abi_def :has_focus?, nil => Boolean
+    abi_def :request_focus
+    def! :request_focus do
+      request_focus
+    end
 
   end
 end