white_gold 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2602400f722a11d0ea3f31366f29c3b31471fa0b001061e3c614518c0ae4f52e
-  data.tar.gz: d1c55ab3f33f03c59d389fe2739bd6ddcc10d13d9ecab594b826a365a9d41ec3
+  metadata.gz: 6727469d73967f049141a5c7b128bfb88b5c18cb128ce7b00417e7f889648138
+  data.tar.gz: f30fed9fdbfc915eb0fb70fded0aabe9593991037af91253427d59b22f053913
 SHA512:
-  metadata.gz: fe6e0e9ce7881149ed8d5912fda0dc7dcbcb3e4ae4ca8dcc242765a35f8066499eb89fed57d05a47906ab66e910e92a48ff6e60522473cff7604974498b1bdb3
-  data.tar.gz: 3ec8c60dcd97eacd677ddcd158c71db4e7947036f1f6313ec3805f9e7b18c4e1160fbfb996524143dc9bf3b4d30770e679f7666a4a5ddfeb234fe90a7ed2eb41
+  metadata.gz: c9373c37d6ccbbb45b973b55c92dd924ec9bc9511ee4a5b1e244859f956f9133d767b30874255535b3fd715d396fb5b96787076014fcfdd5354005973631ac7e
+  data.tar.gz: 240acb40c4ef8d00788e704c40eff66c93535b20d57c3973c9a04e50c18e7dae3c3fc808a1f63308700eb11efe4458dcc970033b385f922e38d72ea53e9c88f0

data/lib/white_gold/abi/enum.rb

@@ -32,12 +32,4 @@ class Enum
   def symbols
     @symbol_to_int
   end
-
-  def to_abi o
-    self[o]
-  end
-
-  def to_api o
-    self[o]
-  end
 end

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,52 +2,59 @@ require_relative '../convention/api_child'
 
 module Tgui
 
-  WIDGETS_COLLECTION = {
-    label: Tgui::Label,
+  ORDINARY_WIDGETS = {
+    bitmap_button: Tgui::BitmapButton,
     button: Tgui::Button,
-    radio: false,
-    radio_button: Tgui::RadioButton,
+    canvas: Tgui::Canvas,
+    chatbox: Tgui::ChatBox,
     checkbox: Tgui::CheckBox,
     child_window: Tgui::ChildWindow,
-    editbox: Tgui::EditBox,
-    combobox: Tgui::ComboBox,
     color_picker: Tgui::ColorPicker,
+    combobox: Tgui::ComboBox,
+    editbox: Tgui::EditBox,
+    file_dialog: Tgui::FileDialog,
+    grid: Tgui::Grid,
+    group: Tgui::Group,
     hola: Tgui::HorizontalLayout,
-    vela: Tgui::VerticalLayout,
     howr: Tgui::HorizontalWrap,
-    group: Tgui::Group,
-    radio_button_group: Tgui::RadioButtonGroup,
-    grid: Tgui::Grid,
-    list_view: Tgui::ListView,
-    picture: false,
-    bitmap_button: Tgui::BitmapButton,
     knob: Tgui::Knob,
-    message_box: Tgui::MessageBox,
-    file_dialog: Tgui::FileDialog,
+    label: Tgui::Label,
     listbox: Tgui::ListBox,
+    listview: Tgui::ListView,
     menu: Tgui::MenuBar,
-    panel_list_box: Tgui::PanelListBox,
-    progress_bar: Tgui::ProgressBar,
+    messagebox: Tgui::MessageBox,
+    panel: Tgui::Panel,
+    panel_listbox: Tgui::PanelListBox,
+    panel_tabs: Tgui::TabContainer,
+    progressbar: Tgui::ProgressBar,
+    radio_button: Tgui::RadioButton,
+    radio_button_group: Tgui::RadioButtonGroup,
     range_slider: Tgui::RangeSlider,
-    rich_text_label: Tgui::RichTextLabel,
-    separator_line: Tgui::SeparatorLine,
+    fancy_label: Tgui::RichTextLabel,
+    scrollbar: Tgui::Scrollbar,
+    separator: Tgui::SeparatorLine,
     slider: Tgui::Slider,
     spin_button: Tgui::SpinButton,
     spin_control: Tgui::SpinControl,
     tabs: Tgui::Tabs,
-    tab_container: Tgui::TabContainer,
-    text_area: Tgui::TextArea,
+    textarea: Tgui::TextArea,
     toggle_button: Tgui::ToggleButton,
-    tree_view: Tgui::TreeView,
-    scrollbar: Tgui::Scrollbar,
-    panel: Tgui::Panel,
-    chat_box: Tgui::ChatBox
+    treeview: Tgui::TreeView,
+    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|
@@ -133,13 +140,10 @@ module Tgui
       end)
     end
 
-    @@auto_button_name = "Button1"
+    @@auto_button_name = "Button0"
 
     def! :btn do |text = nil, **na, &on_press|
-      if !text
-        text = @@auto_button_name
-        @@auto_button_name = @@auto_button_name.next
-      end
+      text = @@auto_button_name = @@auto_button_name.next if !text
       api_bang_button text:, on_press:, **na
     end
   end
@@ -149,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
@@ -172,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
@@ -72,18 +90,18 @@ class Page < Tgui::Group
   end
 
   def theme
-    Theme.default
+    Tgui::Theme.default
   end
 
   def! :theme do |seed = nil, **na, &b|
     theme = self.theme
     if seed
       theme.reset_attributes
-      upon! theme do
-        load Theme.loadpath(seed)
+      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/{dsl → convention}/theme/color_attribute.rb

@@ -1,3 +1,5 @@
+require_relative '../../dsl/color'
+
 class ColorAttribute
   def initialize name, value
     @name = name

data/lib/white_gold/{dsl → convention}/theme/outline_attribute.rb

@@ -1,3 +1,5 @@
+require_relative '../../dsl/outline'
+
 class OutlineAttribute
   def initialize name, value
     @name = name

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

@@ -0,0 +1,18 @@
+require_relative '../../abi/extern_object'
+
+class TextStylesAttribute
+  def initialize name, value
+    @name = name
+    @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};"
+  end
+end

data/lib/white_gold/{dsl → convention}/theme/texture_attribute.rb

@@ -1,3 +1,5 @@
+require_relative '../../dsl/texture'
+
 class TextureAttribute
   def initialize name, value
     @name = name

data/lib/white_gold/{dsl → convention}/theme/theme_attributed.rb

@@ -1,6 +1,3 @@
-require_relative '../color'
-require_relative '../outline'
-require_relative '../texture'
 require_relative 'boolean_attribute'
 require_relative 'color_attribute'
 require_relative 'float_attribute'
@@ -29,22 +26,11 @@ module Tgui
       end
     end
 
-    def theme_comp name, type, tgui_attr_name = nil
-      attr_name = tgui_attr_name || name.to_s.pascalcase
+    def theme_comp name, type
       def! name do |custom_name = nil, base_name = nil, **na, &b|
-        if base_name
-          attribute = attributes[custom_name]
-          if !attribute || attribute.name != base_name
-            attribute = attributes[custom_name] = type.new base_name, custom_name
-          end
-        else
-          a_name = custom_name || attr_name
-          attribute = attributes[a_name]
-          if !attribute || attribute.name != attr_name
-            attribute = attributes[a_name] = type.new attr_name, custom_name
-          end
-        end
-        upon! attribute, **na, &b
+        attribute = type.new(base_name, custom_name)
+        attribute = attributes[attribute.name] ||= attribute
+        attribute.send! **na, &b
       end
     end
   end

data/lib/white_gold/{dsl → convention}/theme/theme_component.rb

@@ -1,5 +1,4 @@
 require_relative 'theme_attributed'
-require_relative 'common_renderer'
 
 module Tgui
   class ThemeComponent
@@ -14,9 +13,21 @@ module Tgui
 
     attr :name, :attributes
 
+    def default_name
+      self.class.name.split("::")[-2]
+    end
+
+    def base_name
+      @name || default_name
+    end
+
+    def name
+      @custom_name || base_name
+    end
+
     def to_theme
-      return "" if @attributes.empty?
-      header = @custom_name ? "#{@custom_name} : #{@name}" : @name
+      return "" if @attributes.empty? && !@custom_name
+      header = @custom_name ? "#{@custom_name} : #{base_name}" : name
       "#{header} {\n#{@attributes.values.map(&:to_theme).join("\n")}\n}"
     end
   end

data/lib/white_gold/convention/theme_attributes.rb

@@ -0,0 +1,49 @@
+module Tgui
+  class Theme
+    theme_attr :text_color, :color
+    theme_attr :text_color_hover, :color
+    theme_attr :text_color_disabled, :color
+    theme_attr :background_color, :color
+    theme_attr :background_color_hover, :color
+    theme_attr :background_color_disabled, :color
+    theme_attr :selected_text_color, :color
+    theme_attr :selected_text_color_hover, :color
+    theme_attr :selected_background_color, :color
+    theme_attr :selected_background_color_hover, :color
+    theme_attr :border_color, :color
+    theme_attr :borders, :outline
+    theme_attr :scrollbar_width, :float
+    theme_attr :arrow_background_color, :color
+    theme_attr :arrow_background_color_hover, :color
+    theme_attr :arrow_background_color_disabled, :color
+    theme_attr :arrow_color, :color
+    theme_attr :arrow_color_hover, :color
+    theme_attr :arrow_color_disabled, :color
+
+    theme_comp :button, ButtonBase::Theme
+    theme_comp :chatbox, ChatBox::Theme
+    theme_comp :child_window, ChildWindow::Theme
+    theme_comp :color_picker, ColorPicker::Theme
+    theme_comp :combobox, ComboBox::Theme
+    theme_comp :editbox, EditBox::Theme
+    theme_comp :file_dialog, FileDialog::Theme
+    theme_comp :group, Group::Theme
+    theme_comp :knob, Knob::Theme
+    theme_comp :label, Label::Theme
+    theme_comp :listbox, ListBox::Theme
+    theme_comp :listview, ListView::Theme
+    theme_comp :menu, MenuBar::Theme
+    theme_comp :messagebox, MessageBox::Theme
+    theme_comp :progressbar, ProgressBar::Theme
+    theme_comp :radio_button, RadioButton::Theme
+    theme_comp :range_slider, RangeSlider::Theme
+    theme_comp :scrollbar, Scrollbar::Theme
+    theme_comp :separator, SeparatorLine::Theme
+    theme_comp :slider, Slider::Theme
+    theme_comp :spin_button, SpinButton::Theme
+    theme_comp :tabs, Tabs::Theme
+    theme_comp :text_area, TextArea::Theme
+    theme_comp :tree_view, TreeView::Theme
+    theme_comp :widget, Widget::Theme
+  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/button_base.rb

@@ -3,8 +3,23 @@ require_relative 'clickable_widget'
 module Tgui
   class ButtonBase < ClickableWidget
 
-    def theme_comp
-      :button
+    class Theme < Widget::Theme
+
+      def default_name
+        "Button"
+      end
+
+      theme_attr :borders, :outline
+      [ '', :_down, :_hover, :_down_hover, :_disabled, :_down_disabled, :_focused, :_down_focused ].each do |v|
+        theme_attr "text_color#{v}".to_sym, :color
+        theme_attr "background_color#{v}".to_sym, :color
+        theme_attr "border_color#{v}".to_sym, :color
+        theme_attr "texture#{v}".to_sym, :texture
+        theme_attr "text_style#{v}".to_sym, :text_styles
+      end
+      theme_attr :text_outline_color, :color
+      theme_attr :text_outline_thickness, :float
+      theme_attr :rounded_border_radius, :float
     end
 
     def abi_pack_text_position_vector o