white_gold 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6727469d73967f049141a5c7b128bfb88b5c18cb128ce7b00417e7f889648138
-  data.tar.gz: f30fed9fdbfc915eb0fb70fded0aabe9593991037af91253427d59b22f053913
+  metadata.gz: 2ef8367abb4fbdbbcab9b6fb824a8660bbe43e60ff818dfb4838205a1ff4c97c
+  data.tar.gz: ffda1d2acecfd09228b7650cf08142d7c5bdb8efc5113e33dd66b2a111be887a
 SHA512:
-  metadata.gz: c9373c37d6ccbbb45b973b55c92dd924ec9bc9511ee4a5b1e244859f956f9133d767b30874255535b3fd715d396fb5b96787076014fcfdd5354005973631ac7e
-  data.tar.gz: 240acb40c4ef8d00788e704c40eff66c93535b20d57c3973c9a04e50c18e7dae3c3fc808a1f63308700eb11efe4458dcc970033b385f922e38d72ea53e9c88f0
+  metadata.gz: b201a718db038a62788d2e3a89e51adb692fee0667c79037ae331c97f18f4b4756a02048ae82b7fb33204ab423b02088406b7f4e62b76ee849ff5f59c0113182
+  data.tar.gz: af5a2ee75a76096a46bd4c6d0b8f28058ca45eb04d1e213c2d686822be1a109d4bded3eddcfca902d0a18d032ba0f4c3ec07c3bb111c40567dad63206e22482c

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

@@ -1,5 +1,19 @@
+require_relative 'bang_nested_caller'
+
 module BangDef
   def def! name, &b
     define_method "api_bang_#{name}", &b
   end
+
+  @@redef_index = 0
+
+  def redef! name, &b
+    @@redef_index = index = @@redef_index.next
+    old = "api_bang_#{index}_#{name}"
+    news = "api_bang_#{name}"
+    alias_method old, news
+    define_method news do |*a, **na, &bl|
+      b.call old, *a, **na, &bl
+    end
+  end
 end

data/lib/white_gold/convention/bang_nest.rb

@@ -14,7 +14,7 @@ module BangNest
     end
   end
 
-  def send! *a, **na, &b
+  def host! *a, **na, &b
     a.each do |k|
       send("#{k}=", true)
     end

data/lib/white_gold/convention/bang_nested_caller.rb

@@ -1,19 +1,51 @@
 module BangNestedCaller
+  API_BANG_PREFIX = "api_bang_".freeze
 
   @@bang_stack = []
+  @@bang_roots = []
+
+  class << self
+    def stack
+      @@bang_stack
+    end
+
+    def roots
+      @@bang_roots
+    end
+
+    def current root
+      @@bang_roots.include?(root) ? @@bang_stack.last : root
+    end
+
+    def push object
+      @@bang_stack.push object
+    end
+  
+    def pop
+      @@bang_stack.pop
+    end
+
+    def open_scope object
+      @@bang_roots << object
+    end
+
+    def close_scope object
+      @@bang_roots.delete_at @@bang_roots.index(object)
+    end
+  end
 
   def self!
-    @@bang_stack.last
+    BangNestedCaller.current self
   end
 
   def bang_respond_to? name
-    top = @@bang_stack.include?(self) ? @@bang_stack.last : self
-    top.respond_to?("#{name}=") || top.respond_to?("api_bang_#{name}")
+    top = BangNestedCaller.current self
+    top.respond_to?("#{name}=") || top.respond_to?("#{API_BANG_PREFIX}#{name}")
   end
 
-  def bang_send name, *a, **na, &b
-    top = @@bang_stack.last
-    api_bang_name = "api_bang_#{name}".to_sym
+  def bang_method_missing name, *a, **na, &b
+    top = BangNestedCaller.current self
+    api_bang_name = "#{API_BANG_PREFIX}#{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
@@ -26,23 +58,24 @@ module BangNestedCaller
     raise no_method_error
   end
 
-  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
+  def send! method, *a, **na, &b
+    send "api_bang_#{method}", *a, **na, &b
   end
 
-  def send! &b
-    if b
-      @@bang_stack.push self
-      b.call self
-      @@bang_stack.pop
-    end
-    self
+  def host! &b
+    return self if !b
+    BangNestedCaller.push self
+    result = b.call self
+    BangNestedCaller.pop
+    result
+  end
+
+  def scope! scoped = nil, *a, **na, &b
+    scoped ||= self
+    BangNestedCaller.open_scope self
+    scoped.host! *a, **na, &b
+    BangNestedCaller.close_scope self
+    scoped
   end
+  
 end

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
@@ -54,40 +55,12 @@ module Tgui
   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
-
     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,35 +90,23 @@ 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
-
-    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)
-    end
-
-    @@auto_button_name = "Button0"
+    @@auto_btn_name = "Button0"
 
     def! :btn do |text = nil, **na, &on_press|
-      text = @@auto_button_name = @@auto_button_name.next if !text
+      text = @@auto_btn_name = @@auto_btn_name.next if !text
       api_bang_button text:, on_press:, **na
     end
+
+    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
 
   class Container
@@ -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()
@@ -97,11 +97,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 +111,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

@@ -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

@@ -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