white_gold 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6727469d73967f049141a5c7b128bfb88b5c18cb128ce7b00417e7f889648138
-  data.tar.gz: f30fed9fdbfc915eb0fb70fded0aabe9593991037af91253427d59b22f053913
+  metadata.gz: b6e9f03a09822b6e1c71191072bc13cc29023a6a3f961153216d30f02e70a017
+  data.tar.gz: bc946f160aa4db22056fb561b25fe3654739b2fd65ff4863471993f5d1ec4c7f
 SHA512:
-  metadata.gz: c9373c37d6ccbbb45b973b55c92dd924ec9bc9511ee4a5b1e244859f956f9133d767b30874255535b3fd715d396fb5b96787076014fcfdd5354005973631ac7e
-  data.tar.gz: 240acb40c4ef8d00788e704c40eff66c93535b20d57c3973c9a04e50c18e7dae3c3fc808a1f63308700eb11efe4458dcc970033b385f922e38d72ea53e9c88f0
+  metadata.gz: e599b9ea2a700c7c106c0109caba34de0d9dbc23777d064f00193af989e56c6fb03a7bfa0200101351d19b49e8c0cca556f19c994b34bdb0b2b26e852e149ce6
+  data.tar.gz: 3cccc9cec49e91a52e8f53cbdada968ad5319e64dd612f56814457f238b0343ca3a562da3b4e636f25821579b5514e62fa09e86aeaf06e992a0d521049a1c7d4

data/lib/white_gold/abi/enum.rb

@@ -22,7 +22,7 @@ class Enum
   end
 
   def pack *k
-    k.map{ @symbol_to_int[_1] }.reduce(0, &:|)
+    k.map{ sym_to_i _1 }.reduce(0, &:|)
   end
 
   def unpack m

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/abi/interface/interface.rb

@@ -1,5 +1,3 @@
-require_relative '../reducer'
-
 module Interface
 
   def self.abi_const_string_method_suffix str
@@ -8,17 +6,15 @@ module Interface
 
   def self.parse_packer packer
     case packer
-    when Proc, Reducer
+    when Proc
       packer
     when Array
       packers = packer.map{ parse_packer _1 }
       proc do |host, *a|
-        ai = a.each
-        packers.map do |packer|
+        packers.zip(a).map do |packer, arg|
           case packer
-          when Proc then packer.call host, *ai.next
+          when Proc then packer.call host, *arg
           when nil then ai.next
-          when Reducer then packer.call host, *(0..packer.reduction).map{ ai.next }
           else packer
           end
         end.flatten

data/lib/white_gold/convention/container_widgets.rb

@@ -6,45 +6,46 @@ module Tgui
     bitmap_button: Tgui::BitmapButton,
     button: Tgui::Button,
     canvas: Tgui::Canvas,
-    chatbox: Tgui::ChatBox,
-    checkbox: Tgui::CheckBox,
+    chatbox: Tgui::Chatbox,
+    checkbox: Tgui::Checkbox,
     child_window: Tgui::ChildWindow,
     color_picker: Tgui::ColorPicker,
-    combobox: Tgui::ComboBox,
-    editbox: Tgui::EditBox,
+    combobox: Tgui::Combobox,
+    editbox: Tgui::Editbox,
     file_dialog: Tgui::FileDialog,
     grid: Tgui::Grid,
     group: Tgui::Group,
-    hola: Tgui::HorizontalLayout,
-    howr: Tgui::HorizontalWrap,
+    hlayout: Tgui::Hlayout,
+    hwrap: Tgui::Hwrap,
     knob: Tgui::Knob,
     label: Tgui::Label,
-    listbox: Tgui::ListBox,
-    listview: Tgui::ListView,
-    menu: Tgui::MenuBar,
-    messagebox: Tgui::MessageBox,
+    listbox: Tgui::Listbox,
+    listview: Tgui::Listview,
+    menu: Tgui::Menu,
     panel: Tgui::Panel,
-    panel_listbox: Tgui::PanelListBox,
-    panel_tabs: Tgui::TabContainer,
-    progressbar: Tgui::ProgressBar,
-    radio_button: Tgui::RadioButton,
-    radio_button_group: Tgui::RadioButtonGroup,
+    panel_listbox: Tgui::PanelListbox,
+    panel_tabs: Tgui::PanelTabs,
+    progressbar: Tgui::Progressbar,
+    radio: Tgui::RadioButton,
+    radio_group: Tgui::RadioGroup,
     range_slider: Tgui::RangeSlider,
-    fancy_label: Tgui::RichTextLabel,
+    fancy_label: Tgui::FancyLabel,
     scrollbar: Tgui::Scrollbar,
-    separator: Tgui::SeparatorLine,
+    separator: Tgui::Separator,
     slider: Tgui::Slider,
-    spin_button: Tgui::SpinButton,
-    spin_control: Tgui::SpinControl,
+    spinner: Tgui::Spinner,
+    spinbox: Tgui::Spinbox,
     tabs: Tgui::Tabs,
-    textarea: Tgui::TextArea,
+    textarea: Tgui::Textarea,
     toggle_button: Tgui::ToggleButton,
-    treeview: Tgui::TreeView,
-    vela: Tgui::VerticalLayout,
+    treeview: Tgui::Treeview,
+    vlayout: Tgui::Vlayout,
   }.freeze
 
   UNORDINARY_WIDGETS = {
-    picture: Tgui::Picture
+    messagebox: Tgui::Messagebox,
+    picture: Tgui::Picture,
+    keyboard_control: Tgui::KeyboardControl
   }
 
   def self.widget_set
@@ -52,42 +53,14 @@ module Tgui
   end
 
   module WidgetOwner
-    extend BangDef
-
-    def self_common_widget_nest widget, *keys, id: nil, **na, &b
-      club_params = {}
-      Enumerator.new do |e|
-        cl = widget.class
-        while cl != Object
-          e << cl
-          cl = cl.superclass
-        end
-        e << Object
-      end.to_a.reverse!.each do |key|
-        if key == widget.class
-          club = page.club key
-          club.join id if id
-        else
-          club = page.club key, create_on_missing: false
-        end
-        club_params.merge! club.params if club
-      end
-  
-      keys.each do |key|
-        club = page.club key
-        club.join id if id
-        club_params.merge! club.params
-      end
-  
-      widget.send! **club_params, **na, &b
-    end
+    include Extree
 
     def self_child_methods
       ## TO OPTIMIZE
       methods.filter{ _1.start_with? ApiChild::API_CHILD_PREFIX }
     end
 
-    def self_equip_child_widget widget
+    def self_equip_widget widget
       widget.page = page
       parent = self
       self_child_methods.each do |method|
@@ -99,10 +72,10 @@ module Tgui
     end
 
     ORDINARY_WIDGETS.each do |m, c|
-      if c
-        def! m do |*a, **na, &b|
-          self_common_widget_equip self_equip_child_widget(c.new), *a, **na, &b
-        end
+      def! m do |*a, **na, &b|
+        widget = c.new
+        add! widget
+        scope! widget, *a, **na, &b
       end
     end
 
@@ -117,34 +90,22 @@ module Tgui
       )
       transparent = na[:transparent] || false
       pic = Tgui::Picture.new texture, transparent
-      self_equip_child_widget pic
-      self_common_widget_equip pic, *a, **na.except(:url, :part_rect, :smooth, :transparent), &b
+      add! pic
+      scope! pic, *a, **na.except(:url, :part_rect, :smooth, :transparent), &b
     end
 
-    def! :radio do |object, *a, **na, &b|
-      radio = RadioButton.new
-      self_equip_child_widget radio
-      radio.object = object
-      na[:text] ||= object.to_s
-      self_common_widget_equip radio, *a, **na, &b
-    end
+    @@auto_btn_name = "Button0"
 
-    def! :msg do |text, **buttons|
-      buttons["OK"] = nil if buttons.empty?
-      api_bang_message_box text:, position: :center, label_alignment: :center, buttons: (buttons.map do |k, v| 
-        procedure = proc do |o, b, w|
-          v&.call
-          w.close true
-        end
-        [k, procedure]
-      end)
+    def! :btn do |text = nil, **na, &on_press|
+      text = @@auto_btn_name = @@auto_btn_name.next if !text
+      send! :button, text:, on_press:, **na
     end
 
-    @@auto_button_name = "Button0"
-
-    def! :btn do |text = nil, **na, &on_press|
-      text = @@auto_button_name = @@auto_button_name.next if !text
-      api_bang_button text:, on_press:, **na
+    def! :keyboard_control do |*a, focus: true, **na, &b|
+      keyboard_control = KeyboardControl.new
+      add! keyboard_control
+      keyboard_control.focus! if focus
+      scope! keyboard_control, *a, **na, &b
     end
   end
 
@@ -153,17 +114,16 @@ module Tgui
 
     @@auto_widget_id = "@/"
 
-    def self_common_widget_equip widget, *keys, **na, &b
+    def! :add do |widget|
+      self_equip_widget widget
       @@auto_widget_id = id = @@auto_widget_id.next
-      add widget, id
-      self_common_widget_nest widget, *keys, id:, **na, &b
+      self_add widget, id
     end
-
   end
 
   class TabContainer
 
-    def add widget, name
+    def self_add widget, name
       raise NoMethodError.new("Widget can't be added to TabContainer directly. Add it to TabContainer panel instead.")
     end
     
@@ -174,9 +134,9 @@ module Tgui
 
     attr :widget
 
-    def self_common_widget_equip widget, *keys, **na, &b
+    def! :add do |widget, *keys, **na, &b|
       @widget = widget
-      self_common_widget_nest widget, *keys, **na, &b
+      scope! widget, *keys, **na, &b
     end
   end
 

data/lib/white_gold/convention/page.rb

@@ -1,6 +1,6 @@
 require_relative "club"
 
-class Page < Tgui::Group
+class Page < Tgui::Panel
 
   def initialize tgui
     super()
@@ -24,14 +24,14 @@ class Page < Tgui::Group
 
   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::Group
     @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
@@ -97,11 +101,11 @@ class Page < Tgui::Group
     theme = self.theme
     if seed
       theme.reset_attributes
-      theme.send! do
-        load Tgui::Theme.loadpath(seed)
+      scope! theme do
+        eval File.read(Tgui::Theme.loadpath(seed))
       end
     end
-    theme.send! **na, &b
+    scope! theme, **na, &b
     theme.self_commit @custom_renderers
   end
 
@@ -111,4 +115,10 @@ class Page < Tgui::Group
     theme.source = path
     theme.self_commit @custom_renderers
   end
+
+  def! :messagebox do |*a, **na, &b|
+    messagebox = MessageBox.new
+    add! messagebox
+    scope! messagebox, *a, **na, &b
+  end
 end

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

@@ -1,13 +1,15 @@
-class BooleanAttribute
-  def initialize name, value
-    @name = name
-    @value = value[0]
-  end
+module Tgui
+  class BooleanAttribute
+    def initialize name, value
+      @name = name
+      @value = value[0]
+    end
 
-  attr :name
-  attr :value
+    attr :name
+    attr :value
 
-  def to_theme
-    "#{name} = #{value};"
+    def to_theme
+      "#{name} = #{value};"
+    end
   end
 end

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

@@ -1,15 +1,17 @@
 require_relative '../../dsl/color'
 
-class ColorAttribute
-  def initialize name, value
-    @name = name
-    @value = Color.from *value
-  end
+module Tgui
+  class ColorAttribute
+    def initialize name, value
+      @name = name
+      @value = Color.from *value
+    end
 
-  attr :name
-  attr :value
+    attr :name
+    attr :value
 
-  def to_theme
-    "#{name} = #{value.to_s};"
+    def to_theme
+      "#{name} = #{value.to_s};"
+    end
   end
 end

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

@@ -1,13 +1,15 @@
-class FloatAttribute
-  def initialize name, value
-    @name = name
-    @value = value[0]
-  end
+module Tgui
+  class FloatAttribute
+    def initialize name, value
+      @name = name
+      @value = value[0]
+    end
 
-  attr :name
-  attr :value
+    attr :name
+    attr :value
 
-  def to_theme
-    "#{name} = #{value};"
+    def to_theme
+      "#{name} = #{value};"
+    end
   end
 end

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

@@ -1,15 +1,17 @@
 require_relative '../../dsl/outline'
 
-class OutlineAttribute
-  def initialize name, value
-    @name = name
-    @value = Outline.from *value
-  end
+module Tgui
+  class OutlineAttribute
+    def initialize name, value
+      @name = name
+      @value = Outline.from *value
+    end
 
-  attr :name
-  attr :value
+    attr :name
+    attr :value
 
-  def to_theme
-    "#{name} = #{value.to_s};"
+    def to_theme
+      "#{name} = #{value.to_s};"
+    end
   end
 end

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

@@ -1,18 +1,20 @@
 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
+module Tgui
+  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
+    attr :name
+    attr :value
 
-  def to_theme
-    "#{name} = #{value};"
+    def to_theme
+      "#{name} = #{value};"
+    end
   end
 end

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

@@ -1,19 +1,21 @@
 require_relative '../../dsl/texture'
 
-class TextureAttribute
-  def initialize name, value
-    @name = name
-    @value = Texture.from *value
-  end
+module Tgui
+  class TextureAttribute
+    def initialize name, value
+      @name = name
+      @value = Texture.from *value
+    end
 
-  attr :name
-  attr :value
+    attr :name
+    attr :value
 
-  def to_theme
-    "#{name} = #{value.to_theme};"
-  end
+    def to_theme
+      "#{name} = #{value.to_theme};"
+    end
 
-  def self.base_class
-    Texture
+    def self.base_class
+      Texture
+    end
   end
 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,
@@ -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
-        attribute.send! **na, &b
+        attribute.host! **na, &b
       end
     end
   end

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
@@ -26,7 +26,7 @@ module Tgui
     end
 
     def to_theme
-      return "" if @attributes.empty? && !@custom_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

data/lib/white_gold/convention/theme_attributes.rb

@@ -22,6 +22,7 @@ module Tgui
 
     theme_comp :button, ButtonBase::Theme
     theme_comp :chatbox, ChatBox::Theme
+    theme_comp :checkbox, RadioButton::Theme
     theme_comp :child_window, ChildWindow::Theme
     theme_comp :color_picker, ColorPicker::Theme
     theme_comp :combobox, ComboBox::Theme
@@ -34,6 +35,8 @@ module Tgui
     theme_comp :listview, ListView::Theme
     theme_comp :menu, MenuBar::Theme
     theme_comp :messagebox, MessageBox::Theme
+    theme_comp :panel, Panel::Theme
+    theme_comp :panel_listbox, PanelListBox::Theme
     theme_comp :progressbar, ProgressBar::Theme
     theme_comp :radio_button, RadioButton::Theme
     theme_comp :range_slider, RangeSlider::Theme
@@ -42,8 +45,9 @@ module Tgui
     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 :textarea, TextArea::Theme
+    theme_comp :toggle_button, ToggleButton::Theme
+    theme_comp :treeview, TreeView::Theme
     theme_comp :widget, Widget::Theme
   end
 end

data/lib/white_gold/convention/widget/keyboard_control.rb

@@ -0,0 +1,30 @@
+require_relative '../../dsl/custom_widget'
+
+module Tgui
+  class KeyboardControl < CustomWidget
+
+    api_attr :key_press_listeners do
+      {}
+    end
+
+    def initialized
+      self.self_can_gain_focus = proc do
+        1
+      end
+
+      self.self_key_press = proc do |key, alt, control, shift, system|
+        key_symbol = KeyCode[key]
+        self.key_press_listeners[key_symbol]&.each do |listener|
+          listener.call(key_symbol, alt, control, shift, system)
+        end
+      end
+    end
+
+    def! :on_key do |*keys, &b|
+      keys.each do |k|
+        (self.key_press_listeners[k] ||= []) << b
+      end
+    end
+
+  end
+end

data/lib/white_gold/convention/widget_class_aliases.rb

@@ -0,0 +1,24 @@
+module Tgui
+  Chatbox = ChatBox
+  Checkbox = CheckBox
+  Combobox = ComboBox
+  Editbox = EditBox
+  Hlayout = HorizontalLayout
+  Hwrap = HorizontalWrap
+  Listbox = ListBox
+  Listview = ListView
+  Menu = MenuBar
+  Messagebox = MessageBox
+  PanelListbox = PanelListBox
+  PanelTabs = TabContainer
+  Progressbar = ProgressBar
+  FancyLabel = RichTextLabel
+  Radio = RadioButton
+  RadioGroup = RadioButtonGroup
+  Separator = SeparatorLine
+  Spinner = SpinButton
+  Spinbox = SpinControl
+  Textarea = TextArea
+  Treeview = TreeView
+  Vlayout = VerticalLayout
+end

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