white_gold 0.0.3 → 0.1.0

data/lib/white_gold/dsl/backend_gui.rb

@@ -1,11 +1,11 @@
 require_relative '../abi/extern_object'
-require_relative '../convention/bang_nest'
+require_relative 'signal/signal_bool'
 require_relative 'signal/global_signal'
 require_relative 'font'
 
 module Tgui
   class BackendGui < ExternObject
-    include BangNest
+    include Extree
 
     class ViewSignal < GlobalSignal
       def block_caller &b
@@ -21,8 +21,7 @@ module Tgui
     abi_def :viewport=, :set_absolute_, [Integer] * 4 => nil
     abi_def :viewport, :get_, nil => [Float] * 4
     abi_def :relative_viewport=, [Float] * 4 => nil
-    abi_def :tab_focus_pass?, :is_tab_key_usage_enabled, nil => Boolean
-    abi_def :tab_focus_pass=, :tab_key_usage_enabled, Boolean => nil
+    abi_attr :tab_focus_enabled?, Boolean, :tab_key_usage_enabled
     abi_attr :font, Font
     abi_def :unfocus, :unfocus_all_widgets
     abi_attr :opacity, Float
@@ -33,6 +32,8 @@ module Tgui
     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
+    abi_signal :on_focus, Signal, :on_window_focus
+    abi_signal :on_unfocus, Signal, :on_window_unfocus
     
   end
 end

data/lib/white_gold/dsl/canvas.rb

@@ -10,29 +10,29 @@ module Tgui
       end
 
       def! :rectangle do |**na, &b|
-        shape = RectangleShape.new.send! **na, &b
+        shape = scope! RectangleShape.new, **na, &b
         host._abi_draw shape
       end
 
       def! :circle do |**na, &b|
-        shape = CircleShape.new.send! **na, &b
+        shape = scope! CircleShape.new, **na, &b
         host._abi_draw shape
       end
 
       def! :convex do |**na, &b|
-        shape = ConvexShape.new.send! **na, &b
+        shape = scope! ConvexShape.new, **na, &b
         host._abi_draw shape
       end
 
       def! :text do |**na, &b|
-        text = Text.new.send! **na, &b
+        text = scope! Text.new, **na, &b
         host._abi_draw text
       end
 
     end
 
     def! :draw do |&b|
-      Draw.new(self, nil).send! &b
+      scope! Draw.new(self, nil), &b
       _abi_display
     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
-      line.send! **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.send! do
+          @widget.host! do
             b.(ptr, @widget)
           end
         end
@@ -47,7 +47,7 @@ module Tgui
     abi_attr :title_buttons, TitleButtons
     abi_attr :resizable?
     abi_attr :position_locked?
-    abi_attr :keep_in_parent?
+    abi_attr :keep_in_parent?, Boolean, :get_
 
     def close destroy = false
       if destroy

data/lib/white_gold/dsl/color.rb

@@ -8,40 +8,50 @@ 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
-      case arg.size
-      when 1
-        arg = arg.first
-        case arg
-        when Color
-          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
-          r = g = b = arg
+    class << self
+      def finalizer pointer
+        _abi_delete pointer
+      end
+
+      def from *arg
+        case arg.size
+        when 1
+          arg = arg.first
+          case arg
+          when Color
+            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
+            r = g = b = arg
+            a = 255
+          else raise "Unsupported argument #{arg} #{arg.class}"
+          end
+        when 2
+          r = g = b = arg[0]
+          a = arg[1]
+        when 3
+          r, g, b = *arg
           a = 255
-        else raise "Unsupported argument #{arg} #{arg.class}"
+        when 4
+          r, g, b, a = *arg
+        else raise "Unsupported argument #{arg}"
         end
-      when 2
-        r = g = b = arg[0]
-        a = arg[1]
-      when 3
-        r, g, b = *arg
-        a = 255
-      when 4
-        r, g, b, a = *arg
-      else raise "Unsupported argument #{arg}"
+        Color.new r, g, b, a
       end
-      Color.new r, g, b, a
+
+      alias_method :[], :from
     end
 
     abi_def :red, :get_, nil => Integer

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.send! 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
-      item.send! **na, &b
+      scope! item, **na, &b
     end
 
     def selected

data/lib/white_gold/dsl/container.rb

@@ -12,7 +12,7 @@ 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

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

@@ -51,8 +51,7 @@ module Tgui
     abi_def :selected_text, :get_, nil => String
     abi_attr :password_character, String
     abi_attr :characters_limit, Integer, :maximum_characters
-    abi_def :limited_text_width=, :limit_text_width, Boolean => nil
-    abi_def :limited_text_width?, :is_text_width_limited, nil => Boolean
+    abi_attr :text_width_limited?, Boolean, :get_
     abi_attr :read_only?
     abi_attr :caret_position, Integer
     abi_attr :suffix, String

data/lib/white_gold/dsl/font.rb

@@ -3,6 +3,10 @@ require_relative '../abi/extern_object'
 module Tgui
   class Font < ExternObject
 
+    def self.finalizer pointer
+      _abi_delete pointer
+    end
+
     def self.from *arg
       case arg.size
       when 1

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,7 +106,7 @@ 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

data/lib/white_gold/dsl/gui.rb

@@ -4,13 +4,26 @@ require_relative 'signal/signal'
 module Tgui
   class Gui < BackendGui
 
+    def self.finalizer(pointer)
+      _abi_delete pointer
+    end
+
     abi_def :self_add, :add, [Object, String] => nil
     abi_def :self_remove, :remove, [Object] => nil
     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 => Vector2i
+
+    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

@@ -22,10 +22,11 @@ module Tgui
     abi_attr :scrollbar_value, Integer
     abi_attr :auto_size?, Boolean, :get_
     abi_attr :max_width, Integer, :maximum_text_width
-    abi_def :ignore_mouse_events, Boolean => nil
-    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.send! do
+          @widget.host! do
             b.(@widget.self_get_object_by_id(id), @widget)
           end
         end
@@ -80,7 +80,7 @@ module Tgui
       _abi_add_item abi_pack_string(text), abi_pack_string(id)
       item = Item.new self, id
       na[:object] ||= object
-      item.send! **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.send! 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.send! 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
-      column.send! **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
-      item.send! **na, &b
+      scope! item, **na, &b
     end
     
     def items=(items)
@@ -173,17 +173,17 @@ module Tgui
     
     def! :grid_lines do | **na, &b|
       lines = GridLines.new self
-      lines.send! **na, &b
+      scope! lines, **na, &b
     end
 
     def grid_lines=(grid_lines)
       case grid_lines
       when Numeric
-        api_bang_grid_lines width: grid_lines
+        send! :grid_lines, width: grid_lines
       when false
-        api_bang_grid_lines horizontal: false, vertical: false
+        send! :grid_lines, horizontal: false, vertical: false
       when Hash
-        api_bang_grid_lines **grid_lines
+        send! :grid_lines, **grid_lines
       end
     end
 
@@ -199,17 +199,17 @@ module Tgui
 
     def! :header do |**na, &b|
       header = Header.new self
-      header.send! **na, &b
+      scope! header, **na, &b
     end
 
     def header=(header)
       case header
       when true, false
-        api_bang_header visible: header
+        send! :header, visible: header
       when Hash
-        api_bang_header **header
+        send! :header, **header
       when Proc
-        api_bang_header &header
+        send! :header, &header
       end
     end
 

data/lib/white_gold/dsl/menu_bar.rb

@@ -30,7 +30,7 @@ module Tgui
 
       def connect &b
         on_press = Fiddle::Closure::BlockCaller.new(0, [0]) do
-          @menu_bar.send! do
+          @menu_bar.host! do
             b.(@path.last, @path, @menu_bar)
           end
         end
@@ -57,7 +57,7 @@ module Tgui
           end
           SignalItemHierarchy.fetch_path vector, loader
           object_path = @widget.self_object_path path
-          @widget.send! do
+          @widget.host! do
             b.(object_path.last, object_path, @widget)
           end
         end
@@ -79,7 +79,7 @@ module Tgui
           host._abi_add_menu_item _1, _2
         end
         item = Item.new host, item_path
-        item.send! **na, &b
+        scope! item, **na, &b
       end
 
       def! :separator do
@@ -165,7 +165,7 @@ module Tgui
       self_tree[object, grow: true].text = text
       _abi_add_menu abi_pack_string(text)
       item = Menu.new self, object
-      item.send! **na, &b
+      scope! item, **na, &b
     end
 
     def items=(items)

data/lib/white_gold/dsl/message_box.rb

@@ -37,7 +37,7 @@ module Tgui
       end
 
       def press_signal_execute
-        host.send! do
+        host.host! do
           @on_press_callbacks.each do |c|
             c.(id, self, host)
           end
@@ -52,7 +52,7 @@ module Tgui
       _abi_add_button abi_pack_string(text)
       button = Button.new self, object
       self_buttons[text] = button
-      button.send! **na, &b
+      scope! button, **na, &b
     end
 
     def [](object)
@@ -73,7 +73,7 @@ module Tgui
         self_buttons[text] = button
         text
       end
-      self_change_buttons names
+      self_change_buttons *names
     end
 
     def buttons

data/lib/white_gold/dsl/outline.rb

@@ -3,6 +3,10 @@ require_relative '../abi/extern_object'
 module Tgui
   class Outline < ExternObject
 
+    def self.finalizer pointer
+      _abi_delete pointer
+    end
+
     def self.from *arg
       case arg.size
       when 1

data/lib/white_gold/dsl/panel.rb

@@ -4,6 +4,14 @@ require_relative 'signal/signal_vector2f'
 module Tgui
   class Panel < Group
 
+    class Theme < Group::Theme
+      theme_attr :borders, :outline
+      theme_attr :border_color, :color
+      theme_attr :background_color, :color
+      theme_attr :texture_background, :texture
+      theme_attr :rounded_border_radius, :float
+    end
+
     abi_signal :on_mouse_press, SignalVector2f
     abi_signal :on_mouse_release, SignalVector2f
     abi_signal :on_click, SignalVector2f

data/lib/white_gold/dsl/panel_list_box.rb

@@ -5,10 +5,19 @@ require_relative 'signal/signal_panel_list_box_item'
 module Tgui
   class PanelListBox < ScrollablePanel
 
+    class Theme < ScrollablePanel::Theme
+
+      theme_attr :items_background_color, :color
+      theme_attr :items_background_color_hover, :color
+      theme_attr :selected_items_background_color, :color
+      theme_attr :selected_items_background_color_hover, :color
+
+    end
+
     class SignalPanelListBoxItem < Tgui::SignalPanelListBoxItem
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |id|
-          @widget.send! do
+          @widget.host! do
             b.(@widget.self_objects.key(@widget.abi_unpack_string(id)), @widget)
           end
         end
@@ -22,7 +31,7 @@ module Tgui
       panel = Panel.new pointer: _abi_add_item(id, abi_pack_integer(index))
       panel.page = page
       self_objects[object] = id
-      panel.send! **na, &b
+      scope! panel, **na, &b
     end
 
     def [](object)
@@ -71,7 +80,7 @@ module Tgui
     def! :template do |**na, &b|
       panel = Panel.new(pointer: _abi_get_panel_template)
       panel.page = page
-      panel.send! **na, &b
+      scope! panel, **na, &b
     end
 
     # internal

data/lib/white_gold/dsl/picture.rb

@@ -4,8 +4,6 @@ require_relative 'signal/signal_vector2f'
 module Tgui
   class Picture < ClickableWidget
 
-    abi_def :ignore_mouse, :ignore_mouse_events, Boolean => nil
-    abi_def :ignore_mouse?, :is_ignoring_mouse_events, nil => Boolean
     abi_signal :on_double_click, SignalVector2f
     
   end

data/lib/white_gold/dsl/radio_button.rb

@@ -28,16 +28,29 @@ module Tgui
       theme_attr :text_style, :text_styles
       theme_attr :text_style_checked, :text_styles
     end
+
+    api_attr :format do
+      :to_s
+    end
     
     abi_attr :checked?
     abi_attr :text, String
     abi_attr :text_clickable?
     abi_signal :on_check, Signal
     abi_signal :on_uncheck, Signal
-    abi_signal :on_change, SignalBoolean
-    api_attr :object do
+    abi_signal :on_change, SignalBool
+
+    def object
+      self_object
+    end
+
+    def object=(object)
+      self.self_object = object
+      self.text = object.then(&format)
+    end
+
+    api_attr :self_object do
       nil
     end
-    
   end
 end

data/lib/white_gold/dsl/scrollable_panel.rb

@@ -5,6 +5,13 @@ require_relative 'scrollbar'
 module Tgui
   class ScrollablePanel < Panel
 
+    class Theme < Panel::Theme
+
+      theme_comp :scrollbar, Tgui::Scrollbar::Theme
+      theme_attr :scrollbar_width, :float
+      
+    end
+
     abi_attr :content_size, Vector2f
     abi_def :content_offset, :get_, nil => Vector2f
     abi_def :scrollbar_width, :get_, nil => Float

data/lib/white_gold/dsl/sfml/circle_shape.rb

@@ -3,5 +3,9 @@ require_relative 'shape'
 module Tgui
   class CircleShape < Shape
     abi_attr :radius, Float
+
+    def self.finalizer pointer
+      _abi_delete pointer
+    end
   end
 end

data/lib/white_gold/dsl/sfml/convex_shape.rb

@@ -11,5 +11,9 @@ module Tgui
       _abi_set_point @point_count, *abi_pack(Vector2f, x, y)
       @point_count += 1
     end
+
+    def self.finalizer pointer
+      _abi_delete pointer
+    end
   end
 end