white_gold 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a41be86fed471b6d1a5df24594b8e4eea51175c94227abedc23254fe604242af
-  data.tar.gz: 1c28e36a0ec7a9b71beecc5003dcac4004656d41bec972c458ad637f85b39d68
+  metadata.gz: 2ef8367abb4fbdbbcab9b6fb824a8660bbe43e60ff818dfb4838205a1ff4c97c
+  data.tar.gz: ffda1d2acecfd09228b7650cf08142d7c5bdb8efc5113e33dd66b2a111be887a
 SHA512:
-  metadata.gz: 2d03d3ea86908238aab6fd22217530162f7f120bce1a3020be5255aa1f5dcb3d1a9cd635e327c71a8f5876b28261296e93c2a75fcb44a3cb4ba2e13e1feae9c3
-  data.tar.gz: ef710195d005845169be0a51dedba2ea1fd390a8b2eb23a08c3f458c377b75088d47d2f8a0792e3b62b1dc795a9423bef57ad7ecf7cff6e982df8a4d7f885dea
+  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/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/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/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_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

@@ -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 host! *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,81 @@
 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
+  API_BANG_PREFIX = "api_bang_".freeze
 
-  def bang_method_missing name, *a, **na, &b
-    return @bang_target.send(name, *a, **na, &b) if @bang_target && @bang_target.respond_to?(name)
+  @@bang_stack = []
+  @@bang_roots = []
 
-    api_name = "api_bang_#{name[...-1]}".to_sym
-    return send(api_name, *a, **na, &b) if respond_to? api_name
+  class << self
+    def stack
+      @@bang_stack
+    end
 
-    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)
+    def roots
+      @@bang_roots
     end
 
-    no_method_error = NoMethodError.new("undefined bang nested method `#{name}` for #{bang_object_stack.map(&:class).join("/")}")
-    raise no_method_error
+    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_target&.respond_to?(:self!) ? @bang_target.self! : self
+    BangNestedCaller.current self
   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 = BangNestedCaller.current self
+    top.respond_to?("#{name}=") || top.respond_to?("#{API_BANG_PREFIX}#{name}")
   end
 
-
-  def upon! item, **na, &b
-    na.each do |k, v|
-      item.send("#{k}=", v)
-    end
-    if b
-      @bang_target, original_bang_target = item, @bang_target
-      b.call item
-      @bang_target = original_bang_target
+  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
+      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
-    item
+    no_method_error = NoMethodError.new("bang method missing `#{name}!` for #{top.class}")
+    raise no_method_error
+  end
+
+  def send! method, *a, **na, &b
+    send "api_bang_#{method}", *a, **na, &b
+  end
+
+  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

@@ -2,88 +2,68 @@ require_relative '../convention/api_child'
 
 module Tgui
 
-  WIDGETS_COLLECTION = {
+  ORDINARY_WIDGETS = {
     bitmap_button: Tgui::BitmapButton,
     button: Tgui::Button,
-    chatbox: Tgui::ChatBox,
-    checkbox: Tgui::CheckBox,
+    canvas: Tgui::Canvas,
+    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,
-    picture: false,
-    progressbar: Tgui::ProgressBar,
-    radio: false,
-    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 = {
+    messagebox: Tgui::Messagebox,
+    picture: Tgui::Picture,
+    keyboard_control: Tgui::KeyboardControl
+  }
+
+  def self.widget_set
+    {}.merge ORDINARY_WIDGETS, UNORDINARY_WIDGETS
+  end
+
   module WidgetOwner
     extend BangDef
 
-    def 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
-  
-      upon! widget, **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_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,11 +71,11 @@ module Tgui
       widget
     end
 
-    WIDGETS_COLLECTION.each do |m, c|
-      if c
-        def! m do |*a, **na, &b|
-          common_widget_post_initialize equip_child_widget(c.new), *a, **na, &b
-        end
+    ORDINARY_WIDGETS.each do |m, c|
+      def! m do |*a, **na, &b|
+        widget = c.new
+        add! widget
+        scope! widget, *a, **na, &b
       end
     end
 
@@ -110,35 +90,23 @@ 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
+      add! pic
+      scope! 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
-      radio.object = object
-      na[:text] ||= object.to_s
-      common_widget_post_initialize 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
@@ -146,22 +114,19 @@ module Tgui
 
     @@auto_widget_id = "@/"
 
-    def common_widget_post_initialize widget, *keys, **na, &b
+    def! :add do |widget|
+      self_equip_widget widget
       @@auto_widget_id = id = @@auto_widget_id.next
-      add widget, id
-      common_widget_nest widget, *keys, id:, **na, &b
+      self_add widget, id
     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 self_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 +134,9 @@ module Tgui
 
     attr :widget
 
-    def common_widget_post_initialize widget, *keys, **na, &b
+    def! :add do |widget, *keys, **na, &b|
       @widget = widget
-      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()
@@ -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
-        load Tgui::Theme.loadpath(seed)
+      scope! theme do
+        eval File.read(Tgui::Theme.loadpath(seed))
       end
     end
-    upon! theme, **na, &b
+    scope! theme, **na, &b
     theme.self_commit @custom_renderers
   end
 
@@ -93,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