white_gold 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a41be86fed471b6d1a5df24594b8e4eea51175c94227abedc23254fe604242af
-  data.tar.gz: 1c28e36a0ec7a9b71beecc5003dcac4004656d41bec972c458ad637f85b39d68
+  metadata.gz: 6727469d73967f049141a5c7b128bfb88b5c18cb128ce7b00417e7f889648138
+  data.tar.gz: f30fed9fdbfc915eb0fb70fded0aabe9593991037af91253427d59b22f053913
 SHA512:
-  metadata.gz: 2d03d3ea86908238aab6fd22217530162f7f120bce1a3020be5255aa1f5dcb3d1a9cd635e327c71a8f5876b28261296e93c2a75fcb44a3cb4ba2e13e1feae9c3
-  data.tar.gz: ef710195d005845169be0a51dedba2ea1fd390a8b2eb23a08c3f458c377b75088d47d2f8a0792e3b62b1dc795a9423bef57ad7ecf7cff6e982df8a4d7f885dea
+  metadata.gz: c9373c37d6ccbbb45b973b55c92dd924ec9bc9511ee4a5b1e244859f956f9133d767b30874255535b3fd715d396fb5b96787076014fcfdd5354005973631ac7e
+  data.tar.gz: 240acb40c4ef8d00788e704c40eff66c93535b20d57c3973c9a04e50c18e7dae3c3fc808a1f63308700eb11efe4458dcc970033b385f922e38d72ea53e9c88f0

data/lib/white_gold/abi/extern_object.rb

@@ -17,6 +17,7 @@ class ExternObject
       end
       ObjectSpace.define_finalizer(self, cl.proc.finalizer(pointer))
     end
+    initialized
   end
 
   def initialized
@@ -102,7 +103,11 @@ class ExternObject
           getter = "#{original_name}#{name}".delete_suffix("?").to_sym
           setter = "set_#{name}".delete_suffix("?").to_sym
         else
-          getter = "get_#{original_name}".to_sym
+          if name.end_with? "?"
+            getter = "is_#{original_name}".to_sym
+          else 
+            getter = "get_#{original_name}".to_sym
+          end
           setter = "set_#{original_name}".to_sym
         end
       else

data/lib/white_gold/abi/unpacker.rb

@@ -2,15 +2,17 @@ require_relative 'interface/interface'
 
 module Unpacker
   def abi_unpacker base, &body
+    method_name = abi_unpacker_method_name(base)
     if block_given?
-      define_method abi_unpacker_method_name(base), &body
+      define_method method_name, &body
     elsif base.is_a? Module
-      define_method abi_unpacker_method_name(base) do |o|
+      define_method method_name do |o|
         base.new pointer: o
       end
     else
       raise "..."
     end
+    method_name
   end
 
   def abi_unpacker_method_name base

data/lib/white_gold/convention/bang_nest.rb

@@ -4,13 +4,23 @@ module BangNest
   include BangNestedCaller
 
   def respond_to? name
-    super || bang_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, *a, **na, &b
+      bang_method_missing name[...-1], *a, **na, &b
     else super
     end
   end
+
+  def send! *a, **na, &b
+    a.each do |k|
+      send("#{k}=", true)
+    end
+    na.each do |k, v|
+      send("#{k}=", v)
+    end
+    super(&b)
+  end
 end

data/lib/white_gold/convention/bang_nested_caller.rb

@@ -1,48 +1,48 @@
 module BangNestedCaller
-  def bang_respond_to? name
-    name.end_with?("!") && (respond_to?("#{name[...-1]}=") || respond_to?("api_bang_#{name[...-1]}") || (@bang_target && @bang_target.respond_to?(name)))
-  end
-
-  def bang_method_missing name, *a, **na, &b
-    return @bang_target.send(name, *a, **na, &b) if @bang_target && @bang_target.respond_to?(name)
 
-    api_name = "api_bang_#{name[...-1]}".to_sym
-    return send(api_name, *a, **na, &b) if respond_to? api_name
-
-    setter = "#{name[...-1]}=".to_sym
-    if respond_to? setter
-      return send(setter, a) if !a.empty?
-      return send(setter, na) if !na.empty?
-      return send(setter, b) if block_given?
-      return send(setter)
-    end
-
-    no_method_error = NoMethodError.new("undefined bang nested method `#{name}` for #{bang_object_stack.map(&:class).join("/")}")
-    raise no_method_error
-  end
+  @@bang_stack = []
 
   def self!
-    @bang_target&.respond_to?(:self!) ? @bang_target.self! : self
+    @@bang_stack.last
   end
 
-  def bang_object_stack root = true
-    stack = []
-    stack << self if root
-    stack << @bang_target if @bang_target
-    stack += @bang_target.bang_object_stack(false) if @bang_target&.respond_to? :bang_object_stack
-    return stack
+  def bang_respond_to? name
+    top = @@bang_stack.include?(self) ? @@bang_stack.last : self
+    top.respond_to?("#{name}=") || top.respond_to?("api_bang_#{name}")
   end
 
+  def bang_send name, *a, **na, &b
+    top = @@bang_stack.last
+    api_bang_name = "api_bang_#{name}".to_sym
+    return top.send(api_bang_name, *a, **na, &b) if top.respond_to? api_bang_name
+    setter = "#{name}=".to_sym
+    if top.respond_to? setter
+      return top.send(setter, a) if !a.empty?
+      return top.send(setter, na) if !na.empty?
+      return top.send(setter, b) if block_given?
+      return top.send(setter)
+    end
+    no_method_error = NoMethodError.new("bang method missing `#{name}!` for #{top.class}")
+    raise no_method_error
+  end
 
-  def upon! item, **na, &b
-    na.each do |k, v|
-      item.send("#{k}=", v)
+  def bang_method_missing name, *a, **na, &b
+    if @@bang_stack.include?(self)
+      bang_send name, *a, **na, &b
+    else
+      @@bang_stack.push self
+      result = bang_send name, *a, **na, &b
+      @@bang_stack.pop
+      result
     end
+  end
+
+  def send! &b
     if b
-      @bang_target, original_bang_target = item, @bang_target
-      b.call item
-      @bang_target = original_bang_target
+      @@bang_stack.push self
+      b.call self
+      @@bang_stack.pop
     end
-    item
+    self
   end
 end

data/lib/white_gold/convention/container_widgets.rb

@@ -2,9 +2,10 @@ require_relative '../convention/api_child'
 
 module Tgui
 
-  WIDGETS_COLLECTION = {
+  ORDINARY_WIDGETS = {
     bitmap_button: Tgui::BitmapButton,
     button: Tgui::Button,
+    canvas: Tgui::Canvas,
     chatbox: Tgui::ChatBox,
     checkbox: Tgui::CheckBox,
     child_window: Tgui::ChildWindow,
@@ -25,9 +26,7 @@ module Tgui
     panel: Tgui::Panel,
     panel_listbox: Tgui::PanelListBox,
     panel_tabs: Tgui::TabContainer,
-    picture: false,
     progressbar: Tgui::ProgressBar,
-    radio: false,
     radio_button: Tgui::RadioButton,
     radio_button_group: Tgui::RadioButtonGroup,
     range_slider: Tgui::RangeSlider,
@@ -44,10 +43,18 @@ module Tgui
     vela: Tgui::VerticalLayout,
   }.freeze
 
+  UNORDINARY_WIDGETS = {
+    picture: Tgui::Picture
+  }
+
+  def self.widget_set
+    {}.merge ORDINARY_WIDGETS, UNORDINARY_WIDGETS
+  end
+
   module WidgetOwner
     extend BangDef
 
-    def common_widget_nest widget, *keys, id: nil, **na, &b
+    def self_common_widget_nest widget, *keys, id: nil, **na, &b
       club_params = {}
       Enumerator.new do |e|
         cl = widget.class
@@ -72,18 +79,18 @@ module Tgui
         club_params.merge! club.params
       end
   
-      upon! widget, **club_params, **na, &b
+      widget.send! **club_params, **na, &b
     end
 
-    def child_methods
+    def self_child_methods
       ## TO OPTIMIZE
       methods.filter{ _1.start_with? ApiChild::API_CHILD_PREFIX }
     end
 
-    def equip_child_widget widget
+    def self_equip_child_widget widget
       widget.page = page
       parent = self
-      child_methods.each do |method|
+      self_child_methods.each do |method|
         widget.define_singleton_method method[ApiChild::API_CHILD_PREFIX.length..] do |*a|
           parent.send(method, self, *a)
         end
@@ -91,10 +98,10 @@ module Tgui
       widget
     end
 
-    WIDGETS_COLLECTION.each do |m, c|
+    ORDINARY_WIDGETS.each do |m, c|
       if c
         def! m do |*a, **na, &b|
-          common_widget_post_initialize equip_child_widget(c.new), *a, **na, &b
+          self_common_widget_equip self_equip_child_widget(c.new), *a, **na, &b
         end
       end
     end
@@ -110,16 +117,16 @@ module Tgui
       )
       transparent = na[:transparent] || false
       pic = Tgui::Picture.new texture, transparent
-      equip_child_widget pic
-      common_widget_post_initialize pic, *a, **na.except(:url, :part_rect, :smooth, :transparent), &b
+      self_equip_child_widget pic
+      self_common_widget_equip pic, *a, **na.except(:url, :part_rect, :smooth, :transparent), &b
     end
 
     def! :radio do |object, *a, **na, &b|
       radio = RadioButton.new
-      equip_child_widget radio
+      self_equip_child_widget radio
       radio.object = object
       na[:text] ||= object.to_s
-      common_widget_post_initialize radio, *a, **na, &b
+      self_common_widget_equip radio, *a, **na, &b
     end
 
     def! :msg do |text, **buttons|
@@ -146,22 +153,20 @@ module Tgui
 
     @@auto_widget_id = "@/"
 
-    def common_widget_post_initialize widget, *keys, **na, &b
+    def self_common_widget_equip widget, *keys, **na, &b
       @@auto_widget_id = id = @@auto_widget_id.next
       add widget, id
-      common_widget_nest widget, *keys, id:, **na, &b
+      self_common_widget_nest widget, *keys, id:, **na, &b
     end
 
   end
 
   class TabContainer
-    WIDGETS_COLLECTION.each do |m, c|
-      if !method_defined? m
-        def! m do |name = nil, **na, &b|
-          raise NoMethodError.new("Method `#{m}` should be called on Panel from TabContainer, not TabContainer itself")
-        end
-      end
+
+    def add widget, name
+      raise NoMethodError.new("Widget can't be added to TabContainer directly. Add it to TabContainer panel instead.")
     end
+    
   end
 
   class ToolTip
@@ -169,9 +174,9 @@ module Tgui
 
     attr :widget
 
-    def common_widget_post_initialize widget, *keys, **na, &b
+    def self_common_widget_equip widget, *keys, **na, &b
       @widget = widget
-      common_widget_nest widget, *keys, **na, &b
+      self_common_widget_nest widget, *keys, **na, &b
     end
   end
 

data/lib/white_gold/convention/page.rb

@@ -22,6 +22,24 @@ class Page < Tgui::Group
   def build
   end
 
+  def respond_to? name
+    super || 
+    (name.end_with?("!") && bang_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
+    elsif @tgui.gui.respond_to? name
+      @tgui.gui.send name, *a, **na, &b
+    elsif @tgui.window.respond_to? name
+      @tgui.window.send name, *a, **na, &b
+    else super
+    end
+  end
+
   def disconnect
     @global_callbacks.each do |id, signal|
       signal.disconnect id
@@ -79,11 +97,11 @@ class Page < Tgui::Group
     theme = self.theme
     if seed
       theme.reset_attributes
-      upon! theme do
+      theme.send! do
         load Tgui::Theme.loadpath(seed)
       end
     end
-    upon! theme, **na, &b
+    theme.send! **na, &b
     theme.self_commit @custom_renderers
   end
 

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

@@ -1,13 +1,18 @@
+require_relative '../../abi/extern_object'
+
 class TextStylesAttribute
   def initialize name, value
     @name = name
-    @value = value
+    @value = Array(value).map do |style|
+      raise "Invalid style #{style}" if !ExternObject::TextStyles[style]
+      style.to_s.upcase
+    end.join("|")
   end
 
   attr :name
   attr :value
 
   def to_theme
-    "#{name} = #{value.to_s};"
+    "#{name} = #{value};"
   end
 end

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

@@ -30,7 +30,7 @@ module Tgui
       def! name do |custom_name = nil, base_name = nil, **na, &b|
         attribute = type.new(base_name, custom_name)
         attribute = attributes[attribute.name] ||= attribute
-        upon! attribute, **na, &b
+        attribute.send! **na, &b
       end
     end
   end

data/lib/white_gold/convention/tree_node.rb

@@ -0,0 +1,43 @@
+class TreeNode
+  def initialize text
+    @text = text
+    @nodes = {}
+  end
+
+  attr_accessor :text
+  attr :nodes
+
+  def [](*path, grow: false)
+    if grow
+      path.reduce(self){|node, o| node.nodes[o] ||= TreeNode.new(nil) }
+    else
+      path.reduce(self){|node, o| node&.nodes[o] }
+    end
+  end
+
+  def cut *path, last
+    self[*path].nodes.delete last
+  end
+
+  def cut_branches *path
+    self[*path].nodes = {}
+  end
+
+  def path_str_to_object *path
+    object_path = []
+    path.reduce self do |node, str|
+      o, node = *node.nodes.find{|k, v| v.text == str }
+      object_path << o
+      node
+    end
+    object_path
+  end
+
+  def path_object_to_str *path
+    str_path = []
+    path.reduce self do |node, o|
+      node[o].tap{ str_path << _1.text }
+    end
+    str_path
+  end
+end

data/lib/white_gold/convention/widget_like.rb

@@ -137,10 +137,4 @@ class WidgetLike
 
   attr :host
   attr :id
-
-  def flags=(flags)
-    flags.each do |f|
-      send("#{f}=", true)
-    end
-  end
 end

data/lib/white_gold/dsl/backend_gui.rb

@@ -31,6 +31,7 @@ module Tgui
     abi_def :pop_mouse_cursor, :restore_override_mouse_cursor
     abi_def :px_to_crd, :map_pixel_to_coords, [Integer, Integer] => [Float, Float]
     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
     
   end

data/lib/white_gold/dsl/canvas.rb

@@ -0,0 +1,40 @@
+require_relative 'clickable_widget'
+
+module Tgui
+  class Canvas < ClickableWidget
+
+    class Draw < WidgetLike
+
+      def! :fill do |*color|
+        host._abi_clear host.abi_pack(Color, *color)
+      end
+
+      def! :rectangle do |**na, &b|
+        shape = RectangleShape.new.send! **na, &b
+        host._abi_draw shape
+      end
+
+      def! :circle do |**na, &b|
+        shape = CircleShape.new.send! **na, &b
+        host._abi_draw shape
+      end
+
+      def! :convex do |**na, &b|
+        shape = ConvexShape.new.send! **na, &b
+        host._abi_draw shape
+      end
+
+      def! :text do |**na, &b|
+        text = Text.new.send! **na, &b
+        host._abi_draw text
+      end
+
+    end
+
+    def! :draw do |&b|
+      Draw.new(self, nil).send! &b
+      _abi_display
+    end
+
+  end
+end

data/lib/white_gold/dsl/chat_box.rb

@@ -44,7 +44,7 @@ module Tgui
       _abi_add_line abi_pack_string(text), abi_pack(Color, color), abi_pack(TextStyles, *style)
       line = Line.new self, objects.size
       objects << object
-      upon! line, **na, &b
+      line.send! **na, &b
     end
 
     def [](index)

data/lib/white_gold/dsl/child_window.rb

@@ -28,7 +28,7 @@ module Tgui
     class SignalClosing < Tgui::Signal
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |ptr|
-          @widget.page.upon! @widget do
+          @widget.send! do
             b.(ptr, @widget)
           end
         end

data/lib/white_gold/dsl/color.rb

@@ -21,6 +21,9 @@ module Tgui
           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
@@ -61,12 +64,12 @@ module Tgui
       Color.new *Color.hsv_to_rgb(h, s, (v - shadow).clamp(0, 255)), alpha
     end
 
-    def to_a
+    def to_arr
       [red, green, blue, alpha]
     end
 
     def to_s
-      "##{to_a.map{ _1.to_s(16).ljust(2, '0') }.join}"
+      "##{to_arr.map{ _1.to_s(16).ljust(2, '0') }.join}"
     end
 
     def inspect

data/lib/white_gold/dsl/combo_box.rb

@@ -37,7 +37,7 @@ module Tgui
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP]) do |str1, str2|
           id = @widget.abi_unpack_string(str2)
-          @widget.page.upon! @widget do
+          @widget.send! do
             b.(@widget.self_get_object_by_id(id), @widget)
           end
         end
@@ -99,7 +99,7 @@ module Tgui
       _abi_add_item abi_pack_string(text), abi_pack_string(id)
       item = Item.new self, id
       self_objects[id] = object
-      upon! item, **na, &b
+      item.send! **na, &b
     end
 
     def selected

data/lib/white_gold/dsl/container.rb

@@ -19,7 +19,7 @@ module Tgui
     abi_def :remove, Widget => nil
 
     def move_front widget, ceil = false
-      widget = abi_pack_widget widget
+      widget = abi_pack(Widget, widget)
       if ceil
         _abi_move_widget_to_front widget
       else
@@ -28,7 +28,7 @@ module Tgui
     end
 
     def move_back widget, floor = false
-      widget = abi_pack_widget widget
+      widget = abi_pack(Widget, widget)
       if floor
         _abi_move_widget_to_back widget
       else
@@ -37,13 +37,21 @@ module Tgui
     end
 
     def move_at index, widget
-      _abi_set_widget_index abi_pack_widget(widget), abi_pack_integer(index)
+      _abi_set_widget_index abi_pack(Widget, widget), abi_pack_integer(index)
     end
 
     abi_def :index, :get_widget_, Widget => Integer
     abi_def :focused_child, :get_, nil => Widget
     abi_def :focused_leaf, :get_, nil => Widget
-    abi_def :leaf_at_position, :get_widget_at_position, [Float, Float] => Widget
+
+    def leaf_at_position x, y
+      abi_unpack(Widget, _abi_get_widget_at_pos(api_pack_float(x), abi_pack_float(y), abi_pack_boolean(true)))
+    end
+
+    def child_at_position x, y
+      abi_unpack(Widget, _abi_get_widget_at_pos(api_pack_float(x), abi_pack_float(y), abi_pack_boolean(false)))
+    end
+
     abi_def :focus_next, :focus_next_widget
     abi_def :focus_previous, :focus_previous_widget
 
@@ -66,21 +74,19 @@ module Tgui
 
     # internal
 
-    def abi_pack_widget o
+
+    abi_packer Widget do |o|
+      o = o.first if o.is_a? Array
       case o
       when Symbol
         self[o]
       when Widget
         o
       else
-        raise "Unable to make Widget from #{o}"
+        raise "Unable to make Widget from #{o}(#{o.class})"
       end
     end
-
-    def abi_unpack_widget o
-      self_cast_up o
-    end
-
+    
     def self_get_widget_name a
       case a
       when Widget

data/lib/white_gold/dsl/font.rb

@@ -18,6 +18,10 @@ module Tgui
       end
       Font.new id
     end
-    
+
+    def self.default
+      Font.new pointer: _abi_get_global_font
+    end
+
   end
 end

data/lib/white_gold/dsl/grid.rb

@@ -84,9 +84,9 @@ module Tgui
 
     def add widget, id
       super
-      _abi_set_widget_cell abi_pack_widget(widget), *cell
-      _abi_set_widget_alignment abi_pack_widget(widget), abi_pack(Alignment, alignment) if alignment
-      _abi_set_widget_padding abi_pack_widget(widget), abi_pack(Outline, *padding) if padding
+      _abi_set_widget_cell abi_pack(Widget, widget), *cell
+      _abi_set_widget_alignment abi_pack(Widget, widget), abi_pack(Alignment, alignment) if alignment
+      _abi_set_widget_padding abi_pack(Widget, widget), abi_pack(Outline, *padding) if padding
       if direction == :column
         next_column false
       else