glimmer-dsl-libui 0.1.5 → 0.1.6

data/lib/glimmer/libui/{button_column_proxy.rb → control_proxy/tab_item_proxy.rb}

@@ -20,52 +20,49 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
-require 'glimmer/libui/column'
-require 'glimmer/libui/enableable_column'
+require 'glimmer/libui/control_proxy/box/horizontal_box_proxy'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI button column objects
-    #
-    # Follows the Proxy Design Pattern
-    class ButtonColumnProxy < ControlProxy
-      include Column
-      include EnableableColumn
-      
-      def on_clicked(&block)
-        # TODO consider generalizing into custom listeners and moving to ControlProxy
-        @on_clicked_procs ||= []
-        if block.nil?
-          @on_clicked_procs
-        else
-          @on_clicked_procs << block
-          block
+    class ControlProxy
+      # Proxy for LibUI tab item objects
+      #
+      # Follows the Proxy Design Pattern
+      class TabItemProxy < ControlProxy
+        attr_reader :index
+        
+        def initialize(keyword, parent, args, &block)
+          @keyword = keyword
+          @parent_proxy = parent
+          @args = args
+          @block = block
+          @enabled = 1
+          @index = @parent_proxy.num_pages
+          @content = @block&.call
+          build_control
         end
-      end
-      
-      def can_handle_listener?(listener_name)
-        listener_name == 'on_clicked' || super
-      end
-      
-      def handle_listener(listener_name, &listener)
-        case listener_name
-        when 'on_clicked'
-          on_clicked(&listener)
-        else
-          super
+        
+        def name
+          @args.first
         end
-      end
-      
-      def notify_listeners(listener_name, *args)
-        @on_clicked_procs&.each do |on_clicked_proc|
-          on_clicked_proc.call(*args)
+        
+        def margined(value = nil)
+          if value.nil?
+            @parent_proxy.margined(@index)
+          else
+            @parent_proxy.margined(@index, value)
+          end
+        end
+        alias set_margined margined
+        alias margined= margined
+        alias margined? margined
+            
+        private
+        
+        def build_control
+          @content = Box::HorizontalBoxProxy.new('horizontal_box', @libui, []) if @content.nil?
+          @libui = @parent_proxy.append(name, @content.libui)
         end
-      end
-          
-      private
-      
-      def build_control
-        @parent_proxy.append_button_column(name, column_index, enabled_value)
       end
     end
   end

data/lib/glimmer/libui/control_proxy/table_proxy.rb

@@ -0,0 +1,182 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/control_proxy/dual_column'
+require 'glimmer/data_binding/observer'
+require 'glimmer/fiddle_consumer'
+
+using ArrayIncludeMethods
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI table objects
+      #
+      # Follows the Proxy Design Pattern
+      class TableProxy < ControlProxy
+        include Glimmer::FiddleConsumer
+        
+        attr_reader :model_handler, :model, :table_params, :columns
+      
+        def initialize(keyword, parent, args, &block)
+          @keyword = keyword
+          @parent_proxy = parent
+          @args = args
+          @block = block
+          @enabled = true
+          @columns = []
+          @cell_rows = []
+          window_proxy.on_destroy do
+            # the following unless condition is an exceptional condition stumbled upon that fails freeing the table model
+            ::LibUI.free_table_model(@model) unless @destroyed && parent_proxy.is_a?(Box)
+          end
+        end
+        
+        def post_add_content
+          build_control
+          super
+        end
+        
+        def post_initialize_child(child)
+          @columns << child
+          # add an extra complementary nil column if it is a dual column (i.e. ImageTextColumnProxy or CheckboxTextColumnProxy
+          @columns << nil if child.is_a?(DualColumn)
+        end
+        
+        def destroy
+          super
+          @destroyed = true
+        end
+        
+        def cell_rows(rows = nil)
+          if rows.nil?
+            @cell_rows
+          else
+            @cell_rows = rows
+            @cell_rows.tap do
+              @last_cell_rows = @cell_rows.clone
+              Glimmer::DataBinding::Observer.proc do
+                if @cell_rows.size < @last_cell_rows.size && @last_cell_rows.include_all?(*@cell_rows)
+                  @last_cell_rows.array_diff_indexes(@cell_rows).reverse.each do |row|
+                    ::LibUI.table_model_row_deleted(model, row)
+                  end
+                elsif @cell_rows.size > @last_cell_rows.size && @cell_rows.include_all?(*@last_cell_rows)
+                  @cell_rows.array_diff_indexes(@last_cell_rows).each do |row|
+                    ::LibUI.table_model_row_inserted(model, row)
+                  end
+                else
+                  @cell_rows.each_with_index do |new_row_data, row|
+                    ::LibUI.table_model_row_changed(model, row) if new_row_data != @last_cell_rows[row]
+                  end
+                end
+                @last_cell_rows = @cell_rows.clone
+              end.observe(self, :cell_rows)
+            end
+          end
+        end
+        alias cell_rows= cell_rows
+        alias set_cell_rows cell_rows
+        
+        def expanded_cell_rows
+          cell_rows.map do |row|
+            row.flatten(1)
+          end
+        end
+        
+        def editable(value = nil)
+          if value.nil?
+            @editable
+          else
+            @editable = !!value
+          end
+        end
+        alias editable= editable
+        alias set_editable editable
+        alias editable? editable
+        
+        private
+        
+        def build_control
+          @model_handler = ::LibUI::FFI::TableModelHandler.malloc
+          @model_handler.NumColumns   = fiddle_closure_block_caller(4) { @columns.map {|c| c.is_a?(DualColumn) ? 2 : 1}.sum }
+          @model_handler.ColumnType   = fiddle_closure_block_caller(4, [1, 1, 4]) do |_, _, column|
+            case @columns[column]
+            when Column::TextColumnProxy, Column::ButtonColumnProxy, NilClass
+              0
+            when Column::ImageColumnProxy, Column::ImageTextColumnProxy
+              1
+            when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy, Column::ProgressBarColumnProxy
+              2
+            end
+          end
+          @model_handler.NumRows      = fiddle_closure_block_caller(4) { cell_rows.count }
+          @model_handler.CellValue    = fiddle_closure_block_caller(1, [1, 1, 4, 4]) do |_, _, row, column|
+            the_cell_rows = expanded_cell_rows
+            case @columns[column]
+            when Column::TextColumnProxy, Column::ButtonColumnProxy, NilClass
+              ::LibUI.new_table_value_string((expanded_cell_rows[row] && expanded_cell_rows[row][column]).to_s)
+            when Column::ImageColumnProxy, Column::ImageTextColumnProxy
+              ::LibUI.new_table_value_image((expanded_cell_rows[row] && (expanded_cell_rows[row][column].respond_to?(:libui) ? expanded_cell_rows[row][column].libui : expanded_cell_rows[row][column])))
+            when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy
+              ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column] == 1 || expanded_cell_rows[row][column].to_s.strip.downcase == 'true' ? 1 : 0)))
+            when Column::ProgressBarColumnProxy
+              ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column].to_i)))
+            end
+          end
+          @model_handler.SetCellValue = fiddle_closure_block_caller(0, [1, 1, 4, 4, 1]) do |_, _, row, column, val|
+            case @columns[column]
+            when Column::TextColumnProxy
+              column = @columns[column].index
+              @cell_rows[row] ||= []
+              @cell_rows[row][column] = ::LibUI.table_value_string(val).to_s
+            when NilClass
+              column = @columns[column - 1].index
+              @cell_rows[row][column][1] = ::LibUI.table_value_string(val).to_s
+            when Column::ButtonColumnProxy
+              @columns[column].notify_listeners(:on_clicked, row)
+            when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy
+              column = @columns[column].index
+              @cell_rows[row] ||= []
+              @cell_rows[row][column] = ::LibUI.table_value_int(val).to_i == 1
+            end
+          end
+          
+          @model = ::LibUI.new_table_model(@model_handler)
+          
+          @table_params = ::LibUI::FFI::TableParams.malloc
+          @table_params.Model = @model
+          @table_params.RowBackgroundColorModelColumn = -1
+          
+          @libui = ControlProxy.new_control(@keyword, [@table_params])
+          @libui.tap do
+            @columns.each {|column| column&.send(:build_control) }
+          end
+        end
+        
+        def next_column_index
+          @next_column_index ||= -1
+          @next_column_index += 1
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/{transformable.rb → control_proxy/transformable.rb}

@@ -19,6 +19,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'glimmer/libui/control_proxy/matrix_proxy'
+
 module Glimmer
   module LibUI
     # This is meant to be prepended (not included) because it changes behavior of instance draw method
@@ -28,7 +30,7 @@ module Glimmer
     # Expects transformable to implement redraw method
     module Transformable
       def post_initialize_child(child, add_child: true)
-        if child.is_a?(MatrixProxy)
+        if child.is_a?(ControlProxy::MatrixProxy)
           super(child, add_child: false)
           self.transform = child if child.keyword == 'transform'
         else

data/lib/glimmer/libui/control_proxy/window_proxy.rb

@@ -0,0 +1,128 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/control_proxy/area_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI window objects
+      #
+      # Follows the Proxy Design Pattern
+      class WindowProxy < ControlProxy
+        DEFAULT_TITLE = ''
+        DEFAULT_WIDTH = 190
+        DEFAULT_HEIGHT = 150
+        DEFAULT_HAS_MENUBAR = 1
+        
+        def post_initialize_child(child)
+          if child.is_a?(AreaProxy)
+            vertical_box_parent = ControlProxy.create('vertical_box', self, [])
+            child.instance_variable_set(:@parent_proxy, vertical_box_parent)
+            vertical_box_parent.post_initialize_child(child)
+            child = vertical_box_parent
+          end
+          ::LibUI.window_set_child(@libui, child.libui)
+        end
+        
+        def destroy_child(child)
+          ::LibUI.send("window_set_child", @libui, nil)
+          super
+        end
+        
+        def destroy
+          super
+          ControlProxy.image_proxies.each { |image_proxy| ::LibUI.free_image(image_proxy.libui) }
+          @on_destroy_procs&.each { |on_destroy_proc| on_destroy_proc.call(self)}
+        end
+        
+        def on_destroy(&block)
+          # TODO look into a way to generalize this logic for multiple listeners
+          @on_destroy_procs ||= []
+          if block.nil?
+            @on_destroy_procs
+          else
+            @on_destroy_procs << block
+            block
+          end
+        end
+      
+        def show
+          super
+          unless @shown_at_least_once
+            @shown_at_least_once = true
+            ::LibUI.main
+            ::LibUI.quit
+          end
+        end
+        
+        def can_handle_listener?(listener_name)
+          listener_name == 'on_destroy' || super
+        end
+        
+        def handle_listener(listener_name, &listener)
+          case listener_name
+          when 'on_destroy'
+            on_destroy(&listener)
+          else
+            if listener_name == 'on_closing'
+              default_behavior_listener = Proc.new do
+                return_value = listener.call(self)
+                if return_value.is_a?(Numeric)
+                  return_value
+                else
+                  destroy
+                  ::LibUI.quit
+                  0
+                end
+              end
+            end
+            super(listener_name, &default_behavior_listener)
+          end
+        end
+      
+        private
+        
+        def build_control
+          if OS.mac? && ControlProxy.menu_proxies.empty?
+            menu_proxy = ControlProxy.create('menu', nil, [''])
+            quit_menu_item_proxy = ControlProxy.create('quit_menu_item', menu_proxy, [])
+          end
+          construction_args = @args.dup
+          construction_args[0] = DEFAULT_TITLE if construction_args.size == 0
+          construction_args[1] = DEFAULT_WIDTH if construction_args.size == 1
+          construction_args[2] = DEFAULT_HEIGHT if construction_args.size == 2
+          construction_args[3] = DEFAULT_HAS_MENUBAR if construction_args.size == 3
+          construction_args[3] = Glimmer::LibUI.boolean_to_integer(construction_args[3]) if construction_args.size == 4 && (construction_args[3].is_a?(TrueClass) || construction_args[3].is_a?(FalseClass))
+          @libui = ControlProxy.new_control(@keyword, construction_args)
+          @libui.tap do
+            handle_listener('on_closing') do
+              destroy
+              ::LibUI.quit
+              0
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy.rb

@@ -29,7 +29,7 @@ module Glimmer
         def exists?(keyword)
           ::LibUI.respond_to?("new_#{keyword}") ||
             ::LibUI.respond_to?(keyword) ||
-            Glimmer::LibUI.constants.include?("#{keyword.camelcase(:upper)}Proxy".to_sym)
+            descendant_keyword_constant_map.keys.include?(keyword)
         end
         
         def create(keyword, parent, args, &block)
@@ -37,12 +37,8 @@ module Glimmer
         end
         
         def widget_proxy_class(keyword)
-          begin
-            class_name = "#{keyword.camelcase(:upper)}Proxy".to_sym
-            Glimmer::LibUI.const_get(class_name)
-          rescue
-            Glimmer::LibUI::ControlProxy
-          end
+          class_name = constant_symbol(keyword)
+          descendant_keyword_constant_map[keyword] || ControlProxy
         end
         
         # autosave all controls in this array to avoid garbage collection
@@ -52,7 +48,7 @@ module Glimmer
         end
         
         def main_window_proxy
-          control_proxies.find {|c| c.is_a?(Glimmer::LibUI::WindowProxy)}
+          control_proxies.find {|c| c.is_a?(WindowProxy)}
         end
         
         def menu_proxies
@@ -66,6 +62,35 @@ module Glimmer
         def new_control(keyword, args)
           ::LibUI.send("new_#{keyword}", *args)
         end
+        
+        def constant_symbol(keyword)
+          "#{keyword.camelcase(:upper)}Proxy".to_sym
+        end
+        
+        def keyword(constant_symbol)
+          constant_symbol.to_s.underscore.sub(/_proxy$/, '')
+        end
+        
+        def descendant_keyword_constant_map
+          @descendant_keyword_constant_map ||= map_descendant_keyword_constants_for(self)
+        end
+        
+        def reset_descendant_keyword_constant_map
+          @descendant_keyword_constant_map = nil
+          descendant_keyword_constant_map
+        end
+        
+        def map_descendant_keyword_constants_for(klass, accumulator: {})
+          klass.constants.map do |constant_symbol|
+            [constant_symbol, klass.const_get(constant_symbol)]
+          end.select do |constant_symbol, constant|
+            constant.is_a?(Module) && !accumulator.values.include?(constant)
+          end.each do |constant_symbol, constant|
+            accumulator[keyword(constant_symbol)] = constant
+            map_descendant_keyword_constants_for(constant, accumulator: accumulator)
+          end
+          accumulator
+        end
       end
       
       BOOLEAN_PROPERTIES = %w[
@@ -275,3 +300,5 @@ module Glimmer
     end
   end
 end
+
+Dir[File.expand_path('./control_proxy/*.rb', __dir__)].each {|f| require f}

data/lib/glimmer/libui/{arc.rb → shape/arc.rb}

@@ -23,18 +23,20 @@ require 'glimmer/libui/shape'
 
 module Glimmer
   module LibUI
-    class Arc < Shape
-      parameters :x_center, :y_center, :radius, :start_angle, :sweep, :is_negative
-      parameter_defaults 0, 0, 0, 0, 360, false
-              
-      def draw(area_draw_params)
-        @args[5] ||= Glimmer::LibUI.boolean_to_integer(@args[5], allow_nil: false)
-        if parent.is_a?(Figure) && parent.x.nil? && parent.y.nil?
-          ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *@args)
-        else
-          ::LibUI.draw_path_arc_to(path_proxy.libui, *@args)
+    class Shape
+      class Arc < Shape
+        parameters :x_center, :y_center, :radius, :start_angle, :sweep, :is_negative
+        parameter_defaults 0, 0, 0, 0, 360, false
+                
+        def draw(area_draw_params)
+          @args[5] ||= Glimmer::LibUI.boolean_to_integer(@args[5], allow_nil: false)
+          if parent.is_a?(Figure) && parent.x.nil? && parent.y.nil?
+            ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *@args)
+          else
+            ::LibUI.draw_path_arc_to(path_proxy.libui, *@args)
+          end
+          super
         end
-        super
       end
     end
   end

data/lib/glimmer/libui/shape/bezier.rb

@@ -0,0 +1,38 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/shape'
+
+module Glimmer
+  module LibUI
+    class Shape
+      class Bezier < Shape
+        parameters :c1_x, :c1_y, :c2_x, :c2_y, :end_x, :end_y
+        parameter_defaults 0, 0, 0, 0, 0, 0
+                
+        def draw(area_draw_params)
+          ::LibUI.draw_path_bezier_to(path_proxy.libui, *@args)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/{figure.rb → shape/figure.rb}

@@ -23,30 +23,32 @@ require 'glimmer/libui/shape'
 
 module Glimmer
   module LibUI
-    # Represents a figure consisting of shapes (nested under path)
-    # Can optionally have `closed true` property (connecting last point to first point automatically)
-    class Figure < Shape
-      parameters :x, :y
-      parameter_defaults nil, nil
-    
-      def draw(area_draw_params)
-        ::LibUI.draw_path_new_figure(path_proxy.libui, *@args) unless @args.compact.empty? # TODO if args empty then wait till there is an arc child and it starts the figure
-        children.dup.each {|child| child.draw(area_draw_params)}
-        ::LibUI.draw_path_close_figure(path_proxy.libui) if closed?
-        super
-      end
+    class Shape
+      # Represents a figure consisting of shapes (nested under path)
+      # Can optionally have `closed true` property (connecting last point to first point automatically)
+      class Figure < Shape
+        parameters :x, :y
+        parameter_defaults nil, nil
       
-      def closed(value = nil)
-        if value.nil?
-          @closed
-        else
-          @closed = value
-          area_proxy&.queue_redraw_all
+        def draw(area_draw_params)
+          ::LibUI.draw_path_new_figure(path_proxy.libui, *@args) unless @args.compact.empty? # TODO if args empty then wait till there is an arc child and it starts the figure
+          children.dup.each {|child| child.draw(area_draw_params)}
+          ::LibUI.draw_path_close_figure(path_proxy.libui) if closed?
+          super
+        end
+        
+        def closed(value = nil)
+          if value.nil?
+            @closed
+          else
+            @closed = value
+            area_proxy&.queue_redraw_all
+          end
         end
+        alias closed= closed
+        alias set_closed closed
+        alias closed? closed
       end
-      alias closed= closed
-      alias set_closed closed
-      alias closed? closed
     end
   end
 end

data/lib/glimmer/libui/{line.rb → shape/line.rb}

@@ -23,13 +23,15 @@ require 'glimmer/libui/shape'
 
 module Glimmer
   module LibUI
-    class Line < Shape
-      parameters :x, :y
-      parameter_defaults 0, 0
-
-      def draw(area_draw_params)
-        ::LibUI.draw_path_line_to(path_proxy.libui, *@args)
-        super
+    class Shape
+      class Line < Shape
+        parameters :x, :y
+        parameter_defaults 0, 0
+  
+        def draw(area_draw_params)
+          ::LibUI.draw_path_line_to(path_proxy.libui, *@args)
+          super
+        end
       end
     end
   end

data/lib/glimmer/libui/{bezier.rb → shape/rectangle.rb}

@@ -23,13 +23,15 @@ require 'glimmer/libui/shape'
 
 module Glimmer
   module LibUI
-    class Bezier < Shape
-      parameters :c1_x, :c1_y, :c2_x, :c2_y, :end_x, :end_y
-      parameter_defaults 0, 0, 0, 0, 0, 0
-              
-      def draw(area_draw_params)
-        ::LibUI.draw_path_bezier_to(path_proxy.libui, *@args)
-        super
+    class Shape
+      class Rectangle < Shape
+        parameters :x, :y, :width, :height
+        parameter_defaults 0, 0, 0, 0
+      
+        def draw(area_draw_params)
+          ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args)
+          super
+        end
       end
     end
   end