white_gold 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ef8367abb4fbdbbcab9b6fb824a8660bbe43e60ff818dfb4838205a1ff4c97c
-  data.tar.gz: ffda1d2acecfd09228b7650cf08142d7c5bdb8efc5113e33dd66b2a111be887a
+  metadata.gz: b6e9f03a09822b6e1c71191072bc13cc29023a6a3f961153216d30f02e70a017
+  data.tar.gz: bc946f160aa4db22056fb561b25fe3654739b2fd65ff4863471993f5d1ec4c7f
 SHA512:
-  metadata.gz: b201a718db038a62788d2e3a89e51adb692fee0667c79037ae331c97f18f4b4756a02048ae82b7fb33204ab423b02088406b7f4e62b76ee849ff5f59c0113182
-  data.tar.gz: af5a2ee75a76096a46bd4c6d0b8f28058ca45eb04d1e213c2d686822be1a109d4bded3eddcfca902d0a18d032ba0f4c3ec07c3bb111c40567dad63206e22482c
+  metadata.gz: e599b9ea2a700c7c106c0109caba34de0d9dbc23777d064f00193af989e56c6fb03a7bfa0200101351d19b49e8c0cca556f19c994b34bdb0b2b26e852e149ce6
+  data.tar.gz: 3cccc9cec49e91a52e8f53cbdada968ad5319e64dd612f56814457f238b0343ca3a562da3b4e636f25821579b5514e62fa09e86aeaf06e992a0d521049a1c7d4

data/lib/white_gold/abi/extern_object.rb

@@ -1,11 +1,10 @@
-require_relative '../convention/bang_def'
 require_relative 'packer'
 require_relative 'unpacker'
 
 class ExternObject
   extend Packer
   extend Unpacker
-  extend BangDef
+  include Extree
 
   def initialize pointer:, autofree: true
     @pointer = pointer
@@ -14,6 +13,7 @@ class ExternObject
       cl = self.class
       while !cl.respond_to?(:finalizer)
         cl = cl.superclass
+        raise "Undefined finalizer for #{self.class}" if cl == ExternObject
       end
       ObjectSpace.define_finalizer(self, cl.proc.finalizer(pointer))
     end

data/lib/white_gold/convention/container_widgets.rb

@@ -53,7 +53,7 @@ module Tgui
   end
 
   module WidgetOwner
-    extend BangDef
+    include Extree
 
     def self_child_methods
       ## TO OPTIMIZE
@@ -98,7 +98,7 @@ module Tgui
 
     def! :btn do |text = nil, **na, &on_press|
       text = @@auto_btn_name = @@auto_btn_name.next if !text
-      api_bang_button text:, on_press:, **na
+      send! :button, text:, on_press:, **na
     end
 
     def! :keyboard_control do |*a, focus: true, **na, &b|

data/lib/white_gold/convention/page.rb

@@ -24,14 +24,14 @@ class Page < Tgui::Panel
 
   def respond_to? name
     super || 
-    (name.end_with?("!") && bang_respond_to?(name[...-1])) ||
+    (name.end_with?("!") && extree_respond_to?(name[...-1])) ||
     @tgui.gui.respond_to?(name) ||
     @tgui.window.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 @tgui.gui.respond_to? name
       @tgui.gui.send name, *a, **na, &b
     elsif @tgui.window.respond_to? name
@@ -52,14 +52,18 @@ class Page < Tgui::Panel
     @tgui.next_page_id = page
   end
 
-  def job **na, &b
-    @tgui.job **na, &b
+  def job *a, **na, &b
+    @tgui.job *a, **na, &b
   end
 
   def timer *a, **na, &b
     @tgui.timer *a, **na, &b
   end
 
+  def after *a, **na, &b
+    @tgui.after *a, **na, &b
+  end
+
   def gui
     @tgui.gui
   end

data/lib/white_gold/convention/theme/theme_attributed.rb

@@ -7,7 +7,7 @@ require_relative 'texture_attribute'
 
 module Tgui
   module ThemeAttributed
-    include BangDef
+    include Extree
 
     ATTRIBUTE_TYPES = {
       boolean: BooleanAttribute,

data/lib/white_gold/convention/theme/theme_component.rb

@@ -2,7 +2,7 @@ require_relative 'theme_attributed'
 
 module Tgui
   class ThemeComponent
-    include BangNest
+    include Extree
     extend ThemeAttributed
 
     def initialize name, custom_name

data/lib/white_gold/convention/widget_like.rb

@@ -1,9 +1,6 @@
-require_relative 'bang_def'
-require_relative 'bang_nest'
 
 class WidgetLike
-  extend BangDef
-  include BangNest
+  include Extree
 
   class << self
     def abi_def name, original_name = nil, id: false, **na

data/lib/white_gold/dsl/backend_gui.rb

@@ -1,11 +1,11 @@
 require_relative '../abi/extern_object'
-require_relative '../convention/bang_nest'
+require_relative 'signal/signal_bool'
 require_relative 'signal/global_signal'
 require_relative 'font'
 
 module Tgui
   class BackendGui < ExternObject
-    include BangNest
+    include Extree
 
     class ViewSignal < GlobalSignal
       def block_caller &b
@@ -21,8 +21,7 @@ module Tgui
     abi_def :viewport=, :set_absolute_, [Integer] * 4 => nil
     abi_def :viewport, :get_, nil => [Float] * 4
     abi_def :relative_viewport=, [Float] * 4 => nil
-    abi_def :tab_focus_pass?, :is_tab_key_usage_enabled, nil => Boolean
-    abi_def :tab_focus_pass=, :tab_key_usage_enabled, Boolean => nil
+    abi_attr :tab_focus_enabled?, Boolean, :tab_key_usage_enabled
     abi_attr :font, Font
     abi_def :unfocus, :unfocus_all_widgets
     abi_attr :opacity, Float
@@ -33,6 +32,8 @@ module Tgui
     abi_def :crd_to_px, :map_coords_to_pixel, [Float, Float] => [Float, Float]
     abi_attr :keyboard_navigation?, Boolean, :keyboard_navigation_enabled
     abi_signal :on_view_change, ViewSignal
+    abi_signal :on_focus, Signal, :on_window_focus
+    abi_signal :on_unfocus, Signal, :on_window_unfocus
     
   end
 end

data/lib/white_gold/dsl/child_window.rb

@@ -47,7 +47,7 @@ module Tgui
     abi_attr :title_buttons, TitleButtons
     abi_attr :resizable?
     abi_attr :position_locked?
-    abi_attr :keep_in_parent?
+    abi_attr :keep_in_parent?, Boolean, :get_
 
     def close destroy = false
       if destroy

data/lib/white_gold/dsl/color.rb

@@ -14,36 +14,44 @@ module Tgui
       transparent: [255, 255, 255, 0]
     }
 
-    def self.from *arg
-      case arg.size
-      when 1
-        arg = arg.first
-        case arg
-        when Color
-          return arg
-        when String
-          r, g, b, a = *tones_from_string(arg)
-        when :random
-          r, g, b = 5.times.map{ rand 255 }
-          a = 255
-        when Symbol
-          r, g, b, a = *PREDEFINED_COLORS[arg]
-        when Numeric
-          r = g = b = arg
+    class << self
+      def finalizer pointer
+        _abi_delete pointer
+      end
+
+      def from *arg
+        case arg.size
+        when 1
+          arg = arg.first
+          case arg
+          when Color
+            return arg
+          when String
+            r, g, b, a = *tones_from_string(arg)
+          when :random
+            r, g, b = 5.times.map{ rand 255 }
+            a = 255
+          when Symbol
+            r, g, b, a = *PREDEFINED_COLORS[arg]
+          when Numeric
+            r = g = b = arg
+            a = 255
+          else raise "Unsupported argument #{arg} #{arg.class}"
+          end
+        when 2
+          r = g = b = arg[0]
+          a = arg[1]
+        when 3
+          r, g, b = *arg
           a = 255
-        else raise "Unsupported argument #{arg} #{arg.class}"
+        when 4
+          r, g, b, a = *arg
+        else raise "Unsupported argument #{arg}"
         end
-      when 2
-        r = g = b = arg[0]
-        a = arg[1]
-      when 3
-        r, g, b = *arg
-        a = 255
-      when 4
-        r, g, b, a = *arg
-      else raise "Unsupported argument #{arg}"
+        Color.new r, g, b, a
       end
-      Color.new r, g, b, a
+
+      alias_method :[], :from
     end
 
     abi_def :red, :get_, nil => Integer

data/lib/white_gold/dsl/edit_box.rb

@@ -51,8 +51,7 @@ module Tgui
     abi_def :selected_text, :get_, nil => String
     abi_attr :password_character, String
     abi_attr :characters_limit, Integer, :maximum_characters
-    abi_def :limited_text_width=, :limit_text_width, Boolean => nil
-    abi_def :limited_text_width?, :is_text_width_limited, nil => Boolean
+    abi_attr :text_width_limited?, Boolean, :get_
     abi_attr :read_only?
     abi_attr :caret_position, Integer
     abi_attr :suffix, String

data/lib/white_gold/dsl/font.rb

@@ -3,6 +3,10 @@ require_relative '../abi/extern_object'
 module Tgui
   class Font < ExternObject
 
+    def self.finalizer pointer
+      _abi_delete pointer
+    end
+
     def self.from *arg
       case arg.size
       when 1

data/lib/white_gold/dsl/gui.rb

@@ -4,6 +4,10 @@ require_relative 'signal/signal'
 module Tgui
   class Gui < BackendGui
 
+    def self.finalizer(pointer)
+      _abi_delete pointer
+    end
+
     abi_def :self_add, :add, [Object, String] => nil
     abi_def :self_remove, :remove, [Object] => nil
     abi_def :self_active?, :is_active, nil => Boolean
@@ -11,7 +15,7 @@ module Tgui
     abi_def :self_draw, :draw
     abi_def :background_color=, :set_clear_color, Color => nil
     abi_attr :clipboard, String
-    abi_def :screen_size, :get_, nil => Vector2u
+    abi_def :screen_size, :get_, nil => Vector2i
 
     attr_accessor :page
 

data/lib/white_gold/dsl/label.rb

@@ -22,8 +22,6 @@ module Tgui
     abi_attr :scrollbar_value, Integer
     abi_attr :auto_size?, Boolean, :get_
     abi_attr :max_width, Integer, :maximum_text_width
-    abi_def :ignore_mouse_events, Boolean => nil
-    abi_def :ignore_mouse_events?, :ignoring_mouse_events, nil => Boolean
     abi_enum "HorizontalAlignment", :left, :center, :right
     abi_attr :horizontal_alignment, HorizontalAlignment
     def alignment=(a)

data/lib/white_gold/dsl/list_view.rb

@@ -179,11 +179,11 @@ module Tgui
     def grid_lines=(grid_lines)
       case grid_lines
       when Numeric
-        api_bang_grid_lines width: grid_lines
+        send! :grid_lines, width: grid_lines
       when false
-        api_bang_grid_lines horizontal: false, vertical: false
+        send! :grid_lines, horizontal: false, vertical: false
       when Hash
-        api_bang_grid_lines **grid_lines
+        send! :grid_lines, **grid_lines
       end
     end
 
@@ -205,11 +205,11 @@ module Tgui
     def header=(header)
       case header
       when true, false
-        api_bang_header visible: header
+        send! :header, visible: header
       when Hash
-        api_bang_header **header
+        send! :header, **header
       when Proc
-        api_bang_header &header
+        send! :header, &header
       end
     end
 

data/lib/white_gold/dsl/outline.rb

@@ -3,6 +3,10 @@ require_relative '../abi/extern_object'
 module Tgui
   class Outline < ExternObject
 
+    def self.finalizer pointer
+      _abi_delete pointer
+    end
+
     def self.from *arg
       case arg.size
       when 1

data/lib/white_gold/dsl/picture.rb

@@ -4,8 +4,6 @@ require_relative 'signal/signal_vector2f'
 module Tgui
   class Picture < ClickableWidget
 
-    abi_def :ignore_mouse, :ignore_mouse_events, Boolean => nil
-    abi_def :ignore_mouse?, :is_ignoring_mouse_events, nil => Boolean
     abi_signal :on_double_click, SignalVector2f
     
   end

data/lib/white_gold/dsl/radio_button.rb

@@ -38,7 +38,7 @@ module Tgui
     abi_attr :text_clickable?
     abi_signal :on_check, Signal
     abi_signal :on_uncheck, Signal
-    abi_signal :on_change, SignalBoolean
+    abi_signal :on_change, SignalBool
 
     def object
       self_object

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

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
+        bool = @widget.abi_unpack Boolean, int
         @widget.host! do
-          b.(b, @widget)
+          b.(bool, @widget)
         end
       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

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
     
@@ -59,9 +57,9 @@ module Tgui
     def theme=(theme)
       case theme
       when Hash
-        api_bang_theme **theme
+        send! :theme, **theme
       when Proc
-        api_bang_theme &theme
+        send! :theme, &theme
       else
         page.custom_renderers[self] = theme
         self_set_renderer theme
@@ -74,6 +72,9 @@ module Tgui
     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
@@ -123,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..]
@@ -273,7 +275,7 @@ module Tgui
     end
 
     def! :messagebox do |*a, **na, &b|
-      page.api_bang_messagebox *a, **na, &b
+      page.send! :messagebox, *a, **na, &b
     end
 
     def! :msg do |text, **buttons|
@@ -285,7 +287,7 @@ module Tgui
         end
         [k, procedure]
       end
-      page.api_bang_messagebox text:, position: :center, label_alignment: :center, buttons: buttons
+      page.send! :messagebox, text:, position: :center, label_alignment: :center, buttons: buttons
     end
 
     def! :page do |*a, **na, &b|

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,8 +14,8 @@ module Tgui
     end
     abi_def :open?
     abi_def :title=, String => nil
-    abi_attr :size, Vector2u
-    abi_attr :position, Vector2u
+    abi_attr :size, Vector2i
+    abi_attr :position, Vector2i
     abi_def :has_focus?, nil => Boolean
     abi_def :request_focus
     def! :request_focus do