white_gold 0.0.2 → 0.0.4

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

@@ -1,13 +1,20 @@
-class TextStylesAttribute
-  def initialize name, value
-    @name = name
-    @value = value
-  end
+require_relative '../../abi/extern_object'
+
+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.to_s};"
+    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
-        upon! attribute, **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/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/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

@@ -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 = scope! RectangleShape.new, **na, &b
+        host._abi_draw shape
+      end
+
+      def! :circle do |**na, &b|
+        shape = scope! CircleShape.new, **na, &b
+        host._abi_draw shape
+      end
+
+      def! :convex do |**na, &b|
+        shape = scope! ConvexShape.new, **na, &b
+        host._abi_draw shape
+      end
+
+      def! :text do |**na, &b|
+        text = scope! Text.new, **na, &b
+        host._abi_draw text
+      end
+
+    end
+
+    def! :draw do |&b|
+      scope! Draw.new(self, nil), &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
+      scope! line, **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.host! do
             b.(ptr, @widget)
           end
         end

data/lib/white_gold/dsl/color.rb

@@ -8,8 +8,10 @@ module Tgui
       green: [0, 200, 0, 255],
       blue: [0, 0, 200, 255],
       yellow: [200, 200, 0, 255],
-      white: [200, 200, 200, 255],
-      black: [0, 0, 0, 255]
+      white: [255, 255, 255, 255],
+      black: [0, 0, 0, 255],
+      gray: [100, 100, 100, 255],
+      transparent: [255, 255, 255, 0]
     }
 
     def self.from *arg
@@ -21,6 +23,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 +66,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.host! 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
+      scope! item, **na, &b
     end
 
     def selected

data/lib/white_gold/dsl/container.rb

@@ -12,14 +12,14 @@ module Tgui
       return widgets
     end
     
-    abi_def :add, [Object, String] => nil
+    abi_def :self_add, :add, [Object, String] => nil
     abi_def :remove_all
     abi_def :inner_size, :get_, nil => Vector2f
     abi_def :child_offset, :get_, nil => Vector2f
     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/custom_widget.rb

@@ -0,0 +1,28 @@
+require_relative 'widget'
+
+module Tgui
+  class CustomWidget < Widget
+
+    api_attr :callbacks do
+      {}
+    end
+
+    def self_key_press=(value)
+      block_caller = Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT], &value)
+      _abi_impl_key_pressed block_caller
+      self.callbacks[:self_key_press] = block_caller
+    end
+
+    def self_can_gain_focus=(value)
+      block_caller = Fiddle::Closure::BlockCaller.new(Fiddle::TYPE_INT, [0], &value)
+      _abi_impl_can_gain_focus block_caller
+      self.callbacks[:self_can_gain_focus] = block_caller
+    end
+
+    def self_focus_changed=(value)
+      block_caller = Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT], &value)
+      _abi_impl_focus_changed block_caller
+      self.callbacks[:self_focus_changed] = block_caller
+    end
+  end
+end

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

@@ -27,23 +27,47 @@ module Tgui
       abi_unpack(Outline, _abi_get_widget_padding(w))
     end
 
-    abi_enum "Alignment", :center, :upper_left, :up, :upper_right, :right, :bottom_right, :bottom, :bottom_left, :left,
-      top_left: :upper_left, left_top: :upper_left,
-      top_right: :upper_right, right_top: :upper_right,
-      right_bottom: :bottom_right, left_bottom: :bottom_left
+    abi_enum "Alignment", :center, :top_left, :top, :top_right, :right, :bottom_right, :bottom, :bottom_left, :left,
+      left_top: :top_left, right_top: :upper_right, right_bottom: :bottom_right, left_bottom: :bottom_left
+
+    abi_packer Alignment do |*arg|
+      case arg.size
+      when 1
+        o = arg.first
+      when 2
+        a = case arg[0]
+        when :begin then :left
+        when :end then :right
+        else arg[0]
+        end
+        b = case arg[1]
+        when :begin then :top
+        when :end then :bottom
+        else arg[1]
+        end
+        o = if a == :center && b == :center
+          :center
+        elsif a == :center
+          b
+        elsif b == :center
+          a
+        else
+          "#{a}_#{b}".to_sym
+        end
+      else raise "Unsupported argument #{arg}"
+      end
+      Alignment.sym_to_i o
+    end
 
     api_child :alignment= do |w, alignment|
-      _abi_set_widget_alignment w, abi_pack(Alignment, alignment)
+      p abi_pack(Alignment, *alignment)
+      _abi_set_widget_alignment w, abi_pack(Alignment, *alignment)
     end
 
     api_child :alignment do |w|
       abi_unpack(Alignment, _abi_get_widget_alignment(w))
     end
 
-    api_child :alignment do |w|
-      Alignment[_abi_get_widget_alignment]
-    end
-
     api_child :cell= do |w, cell|
       _abi_set_widget_cell w, abi_pack_integer(cell[0]), abi_pack_integer(cell[1])
     end
@@ -82,11 +106,11 @@ module Tgui
       return widgets
     end
 
-    def add widget, id
+    def self_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

data/lib/white_gold/dsl/gui.rb

@@ -9,8 +9,17 @@ module Tgui
     abi_def :self_active?, :is_active, nil => Boolean
     abi_def :self_poll_events, :poll_events
     abi_def :self_draw, :draw
-    abi_def :clear_color=, Color => nil
+    abi_def :background_color=, :set_clear_color, Color => nil
     abi_attr :clipboard, String
+    abi_def :screen_size, :get_, nil => Vector2u
+
+    attr_accessor :page
+
+    def! :messagebox do |*a, **na, &b|
+      messagebox = MessageBox.new
+      @page.send! :add, messagebox
+      @page.scope! messagebox, *a, **na, &b
+    end
         
   end
 end

data/lib/white_gold/dsl/label.rb

@@ -26,6 +26,9 @@ module Tgui
     abi_def :ignore_mouse_events?, :ignoring_mouse_events, nil => Boolean
     abi_enum "HorizontalAlignment", :left, :center, :right
     abi_attr :horizontal_alignment, HorizontalAlignment
+    def alignment=(a)
+      self.horizontal_alignment = a
+    end
     abi_enum "VerticalAlignment", :top, :center, :bottom
     abi_attr :vertical_alignment, VerticalAlignment
     abi_enum Scrollbar::Policy

data/lib/white_gold/dsl/list_box.rb

@@ -29,7 +29,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.host! do
             b.(@widget.self_get_object_by_id(id), @widget)
           end
         end
@@ -55,26 +55,22 @@ module Tgui
     abi_signal :on_scroll, SignalUInt
     abi_attr :text_alignment, TextAlignment
 
-    class Item
-      def initialize list_box, id
-        @list_box = list_box
-        @id = id
-      end
+    class Item < WidgetLike
 
       def object=(object)
-        @list_box.self_objects[@id] = object
+        host.self_objects[id] = object
       end
 
       def object
-        return @list_box.self_objects[@id]
+        return host.self_objects[id]
       end
 
       def text=(text)
-        @list_box._abi_change_item_by_id @id, abi_pack_string(text)
+        host._abi_change_item_by_id id, abi_pack_string(text)
       end
 
       def remove
-        @list_box._abi_remove_item_by_id @id
+        host._abi_remove_item_by_id id
       end
     end
 
@@ -84,7 +80,7 @@ module Tgui
       _abi_add_item abi_pack_string(text), abi_pack_string(id)
       item = Item.new self, id
       na[:object] ||= object
-      upon! item, **na, &b
+      scope! item, **na, &b
     end
 
     def remove_all

data/lib/white_gold/dsl/list_view.rb

@@ -31,7 +31,7 @@ module Tgui
     class ListViewItemSignal < Tgui::SignalInt
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT]) do |index|
-          @widget.page.upon! @widget do
+          @widget.host! do
             b.(@widget.self_objects[index], @widget)
           end
         end
@@ -41,7 +41,7 @@ module Tgui
     class ListViewColumnSignal < Tgui::SignalInt
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT]) do |index|
-          @widget.page.upon! @widget do
+          @widget.host! do
             b.(@widget.columns[index], @widget)
           end
         end
@@ -93,14 +93,14 @@ module Tgui
       index = _abi_add_column
       column = Column.new self, index
       columns << column
-      upon! column, **na, &b
+      scope! column, **na, &b
     end
 
     def! :item do |object, **na, &b|
       self_add_object object, na[:index]
       item = Item.new self, object
       na.delete :index
-      upon! item, **na, &b
+      scope! item, **na, &b
     end
     
     def items=(items)
@@ -173,7 +173,7 @@ module Tgui
     
     def! :grid_lines do | **na, &b|
       lines = GridLines.new self
-      upon! lines, **na, &b
+      scope! lines, **na, &b
     end
 
     def grid_lines=(grid_lines)
@@ -199,7 +199,7 @@ module Tgui
 
     def! :header do |**na, &b|
       header = Header.new self
-      upon! header, **na, &b
+      scope! header, **na, &b
     end
 
     def header=(header)