glimmer-dsl-libui 0.1.4 → 0.1.8

data/lib/glimmer/libui/{dual_column.rb → control_proxy/enableable_column.rb}

@@ -21,16 +21,24 @@
 
 module Glimmer
   module LibUI
-    # A dual column is one that represents two values (e.g. image and text or checkbox and text)
-    # It is meant to be included in a column proxy class that already includes Column
-    module DualColumn
-      def second_column_index
-        column_index + 1
-      end
-      
-      def column_index
-        @column_index ||= @parent_proxy.send(:next_column_index).tap do
-          @parent_proxy.send(:next_column_index)
+    class ControlProxy
+      module EnableableColumn
+        def enabled(value = nil)
+          if value.nil?
+            @enabled = true if @enabled.nil?
+            @enabled
+          else
+            @enabled = !!value
+          end
+        end
+        alias enabled= enabled
+        alias set_enabled enabled
+        alias enabled? enabled
+  
+        private
+        
+        def enabled_value
+          enabled? ? -2 : -1
         end
       end
     end

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

@@ -0,0 +1,70 @@
+# 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'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI font button objects
+      #
+      # Follows the Proxy Design Pattern
+      class FontButtonProxy < ControlProxy
+        def font
+          @font_descriptor ||= ::LibUI::FFI::FontDescriptor.malloc
+          ::LibUI.font_button_font(@libui, @font_descriptor)
+          {
+            family: @font_descriptor.Family.to_s,
+            size: @font_descriptor.Size,
+            weight: @font_descriptor.Weight,
+            italic: @font_descriptor.Italic,
+            stretch: @font_descriptor.Stretch
+          }
+        end
+        
+        def family
+          font[:family]
+        end
+        
+        def size
+          font[:size]
+        end
+        
+        def weight
+          font[:weight]
+        end
+        
+        def italic
+          font[:italic]
+        end
+        
+        def stretch
+          font[:stretch]
+        end
+        
+        def destroy
+          ::LibUI.free_font_button_font(@font_descriptor) unless @font_descriptor.nil?
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -23,30 +23,32 @@ require 'glimmer/libui/control_proxy'
 
 module Glimmer
   module LibUI
-    class FormProxy < ControlProxy
-      APPEND_PROPERTIES = %w[label stretchy]
-      
-      def post_initialize_child(child)
-        child.label = '' if child.label.nil?
-        child.stretchy = true if child.stretchy.nil?
-        ::LibUI.form_append(@libui, child.label, child.libui, ControlProxy.boolean_to_integer(child.stretchy))
-        children << child
-      end
-      
-      def children
-        @children ||= []
-      end
-      
-      def destroy_child(child)
-        ::LibUI.send("form_delete", @libui, children.index(child))
-        ControlProxy.control_proxies.delete(child)
-      end
-      
-      private
-      
-      def build_control
-        super.tap do
-          self.padded = true
+    class ControlProxy
+      class FormProxy < ControlProxy
+        APPEND_PROPERTIES = %w[label stretchy]
+        
+        def post_initialize_child(child)
+          child.label = '' if child.label.nil?
+          child.stretchy = true if child.stretchy.nil?
+          ::LibUI.form_append(@libui, child.label, child.libui, Glimmer::LibUI.boolean_to_integer(child.stretchy))
+          children << child
+        end
+        
+        def children
+          @children ||= []
+        end
+        
+        def destroy_child(child)
+          ::LibUI.send("form_delete", @libui, children.index(child))
+          ControlProxy.control_proxies.delete(child)
+        end
+        
+        private
+        
+        def build_control
+          super.tap do
+            self.padded = true
+          end
         end
       end
     end

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

@@ -23,33 +23,35 @@ require 'glimmer/libui/control_proxy'
 
 module Glimmer
   module LibUI
-    class GridProxy < ControlProxy
-      APPEND_PROPERTIES = %w[left top xspan yspan hexpand halign vexpand valign]
-      
-      def post_initialize_child(child)
-        child.left = 0 if child.left.nil?
-        child.top = 0 if child.top.nil?
-        child.xspan = 1 if child.xspan.nil?
-        child.yspan = 1 if child.yspan.nil?
-        child.hexpand = false if child.hexpand.nil?
-        child.halign = 0 if child.halign.nil?
-        child.vexpand = false if child.vexpand.nil?
-        child.valign = 0 if child.valign.nil?
-        ::LibUI.grid_append(@libui, child.libui, child.left, child.top, child.xspan, child.yspan, ControlProxy.boolean_to_integer(child.hexpand), child.halign, ControlProxy.boolean_to_integer(child.vexpand), child.valign)
-        children << child
-      end
-      
-      def children
-        @children ||= []
-      end
-      
-      # Note that there is no proper destroy_child(child) method for GridProxy due to libui not offering any API for it (no grid_delete)
-      
-      private
-      
-      def build_control
-        super.tap do
-          self.padded = true
+    class ControlProxy
+      class GridProxy < ControlProxy
+        APPEND_PROPERTIES = %w[left top xspan yspan hexpand halign vexpand valign]
+        
+        def post_initialize_child(child)
+          child.left = 0 if child.left.nil?
+          child.top = 0 if child.top.nil?
+          child.xspan = 1 if child.xspan.nil?
+          child.yspan = 1 if child.yspan.nil?
+          child.hexpand = false if child.hexpand.nil?
+          child.halign = 0 if child.halign.nil?
+          child.vexpand = false if child.vexpand.nil?
+          child.valign = 0 if child.valign.nil?
+          ::LibUI.grid_append(@libui, child.libui, child.left, child.top, child.xspan, child.yspan, Glimmer::LibUI.boolean_to_integer(child.hexpand), child.halign, Glimmer::LibUI.boolean_to_integer(child.vexpand), child.valign)
+          children << child
+        end
+        
+        def children
+          @children ||= []
+        end
+        
+        # Note that there is no proper destroy_child(child) method for GridProxy due to libui not offering any API for it (no grid_delete)
+        
+        private
+        
+        def build_control
+          super.tap do
+            self.padded = true
+          end
         end
       end
     end

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

@@ -23,29 +23,31 @@ require 'glimmer/libui/control_proxy'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI group objects
-    #
-    # Follows the Proxy Design Pattern
-    class GroupProxy < ControlProxy
-      DEFAULT_TITLE = ''
-      
-      def post_initialize_child(child)
-        ::LibUI.group_set_child(@libui, child.libui)
-      end
-      
-      def destroy_child(child)
-        ::LibUI.send("group_set_child", @libui, nil)
-        super
-      end
-    
-      private
+    class ControlProxy
+      # Proxy for LibUI group objects
+      #
+      # Follows the Proxy Design Pattern
+      class GroupProxy < ControlProxy
+        DEFAULT_TITLE = ''
+        
+        def post_initialize_child(child)
+          ::LibUI.group_set_child(@libui, child.libui)
+        end
+        
+        def destroy_child(child)
+          ::LibUI.send("group_set_child", @libui, nil)
+          super
+        end
       
-      def build_control
-        construction_args = @args.dup
-        construction_args[0] = DEFAULT_TITLE if construction_args.size == 0
-        @libui = ControlProxy.new_control(@keyword, construction_args)
-        @libui.tap do
-          self.margined = true
+        private
+        
+        def build_control
+          construction_args = @args.dup
+          construction_args[0] = DEFAULT_TITLE if construction_args.size == 0
+          @libui = ControlProxy.new_control(@keyword, construction_args)
+          @libui.tap do
+            self.margined = true
+          end
         end
       end
     end

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

@@ -23,24 +23,26 @@ require 'glimmer/libui/control_proxy'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI image part objects
-    #
-    # Follows the Proxy Design Pattern
-    class ImagePartProxy < ControlProxy
-      def initialize(keyword, parent, args, &block)
-        @keyword = keyword
-        @parent_proxy = parent
-        @args = args
-        @block = block
-        @enabled = true
-        @children = []
-        post_add_content if @block.nil?
-      end
-      
-      private
-      
-      def build_control
-        @libui = @parent_proxy.append(*@args)
+    class ControlProxy
+      # Proxy for LibUI image part objects
+      #
+      # Follows the Proxy Design Pattern
+      class ImagePartProxy < ControlProxy
+        def initialize(keyword, parent, args, &block)
+          @keyword = keyword
+          @parent_proxy = parent
+          @args = args
+          @block = block
+          @enabled = true
+          @children = []
+          post_add_content if @block.nil?
+        end
+        
+        private
+        
+        def build_control
+          @libui = @parent_proxy.append(*@args)
+        end
       end
     end
   end

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

@@ -26,36 +26,38 @@ using ArrayIncludeMethods
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI image objects
-    #
-    # Follows the Proxy Design Pattern
-    class ImageProxy < ControlProxy
-      def initialize(keyword, parent, args, &block)
-        @keyword = keyword
-        @parent_proxy = parent
-        @args = args
-        @block = block
-        @enabled = true
-        @children = []
-        post_add_content if @block.nil?
-      end
-      
-      def post_add_content
-        build_control
-        super
-      end
- 
-      def post_initialize_child(child)
-        @children << child
-      end
-      
-      private
-      
-      def build_control
-        @args = [@children.first.args[1], @children.first.args[2]] if @children.size == 1 && (@args[0].nil? || @args[1].nil?)
-        super
-        @libui.tap do
-          @children.each {|child| child&.send(:build_control) }
+    class ControlProxy
+      # Proxy for LibUI image objects
+      #
+      # Follows the Proxy Design Pattern
+      class ImageProxy < ControlProxy
+        def initialize(keyword, parent, args, &block)
+          @keyword = keyword
+          @parent_proxy = parent
+          @args = args
+          @block = block
+          @enabled = true
+          @children = []
+          post_add_content if @block.nil?
+        end
+        
+        def post_add_content
+          build_control
+          super
+        end
+   
+        def post_initialize_child(child)
+          @children << child
+        end
+        
+        private
+        
+        def build_control
+          @args = [@children.first.args[1], @children.first.args[2]] if @children.size == 1 && (@args[0].nil? || @args[1].nil?)
+          super
+          @libui.tap do
+            @children.each {|child| child&.send(:build_control) }
+          end
         end
       end
     end

data/lib/glimmer/libui/{combobox_proxy.rb → control_proxy/label_proxy.rb}

@@ -23,21 +23,21 @@ require 'glimmer/libui/control_proxy'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI combobox objects
-    #
-    # Follows the Proxy Design Pattern
-    class ComboboxProxy < ControlProxy
-      def items(*values)
-        values = values.first if values.first.is_a?(Array)
-        if values.empty?
-          @values
-        else
-          @values = values
-          @values.each { |value| append value }
+    class ControlProxy
+      # Proxy for LibUI label objects
+      #
+      # Follows the Proxy Design Pattern
+      class LabelProxy < ControlProxy
+        DEFAULT_TEXT = ''
+        
+        private
+        
+        def build_control
+          construction_args = @args.dup
+          construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+          @libui = ControlProxy.new_control(@keyword, construction_args)
         end
       end
-      alias set_items items
-      alias items= items
     end
   end
 end

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

@@ -0,0 +1,147 @@
+# 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'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI matrix objects
+      #
+      # Follows the Proxy Design Pattern
+      class MatrixProxy < ControlProxy
+        def libui_api_keyword
+          'draw_matrix'
+        end
+        
+        def clone
+          MatrixProxy.new('matrix', nil, [@libui.M11, @libui.M12, @libui.M21, @libui.M22, @libui.M31, @libui.M32])
+        end
+        
+        def dup
+          clone
+        end
+        
+        def m11(value = nil)
+          if value.nil?
+            @libui.M11
+          else
+            @libui.M11 = value.to_f
+          end
+        end
+        alias m11= m11
+        alias set_m11 m11
+        
+        def m12(value = nil)
+          if value.nil?
+            @libui.M12
+          else
+            @libui.M12 = value.to_f
+          end
+        end
+        alias m12= m12
+        alias set_m12 m12
+        
+        def m21(value = nil)
+          if value.nil?
+            @libui.M21
+          else
+            @libui.M21 = value.to_f
+          end
+        end
+        alias m21= m21
+        alias set_m21 m21
+        
+        def m22(value = nil)
+          if value.nil?
+            @libui.M22
+          else
+            @libui.M22 = value.to_f
+          end
+        end
+        alias m22= m22
+        alias set_m22 m22
+        
+        def m31(value = nil)
+          if value.nil?
+            @libui.M31
+          else
+            @libui.M31 = value.to_f
+          end
+        end
+        alias m31= m31
+        alias set_m31 m31
+        
+        def m32(value = nil)
+          if value.nil?
+            @libui.M32
+          else
+            @libui.M32 = value.to_f
+          end
+        end
+        alias m32= m32
+        alias set_m32 m32
+        
+        def identity
+          set_identity
+        end
+        
+        def rotate(x = 0, y = 0, degrees)
+          super(x, y, (Math::PI*2.0/360.0)*degrees)
+        end
+        
+        def scale(x_center = 0, y_center = 0, x, y)
+          super
+        end
+        
+        def skew(x = 0, y = 0, x_amount, y_amount)
+          super
+        end
+        
+        def multiply(matrix)
+          super(matrix.respond_to?(:libui) ? matrix.libui : matrix)
+        end
+        
+        def invertible
+          Glimmer::LibUI.integer_to_boolean(super, allow_nil: false)
+        end
+        alias invertible? invertible
+        
+        private
+        
+        def build_control
+          @libui = ::LibUI::FFI::DrawMatrix.malloc
+          if @args.empty?
+            set_identity
+          else
+            @libui.M11 = @args[0].to_f
+            @libui.M12 = @args[1].to_f
+            @libui.M21 = @args[2].to_f
+            @libui.M22 = @args[3].to_f
+            @libui.M31 = @args[4].to_f
+            @libui.M32 = @args[5].to_f
+          end
+        end
+      end
+      TransformProxy = MatrixProxy # alias
+    end
+  end
+end

data/lib/glimmer/libui/{editable_column.rb → control_proxy/menu_item_proxy/about_menu_item_proxy.rb}

@@ -19,26 +19,23 @@
 # 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/menu_item_proxy'
+
 module Glimmer
   module LibUI
-    module EditableColumn
-      def editable(value = nil)
-        if value.nil?
-          @editable = false if @editable.nil?
-          @editable
-        else
-          @editable = !!value
+    class ControlProxy
+      class MenuItemProxy < ControlProxy
+        # Proxy for LibUI about menu item object
+        #
+        # Follows the Proxy Design Pattern
+        class AboutMenuItemProxy < MenuItemProxy
+          private
+          
+          def build_control
+            @libui = @parent_proxy.append_about_item(*@args)
+          end
         end
       end
-      alias editable= editable
-      alias set_editable editable
-      alias editable? editable
-
-      private
-      
-      def editable_value
-        (@parent_proxy.editable? || editable?) ? -2 : -1
-      end
     end
   end
 end

data/lib/glimmer/libui/control_proxy/menu_item_proxy/check_menu_item_proxy.rb

@@ -0,0 +1,41 @@
+# 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/menu_item_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      class MenuItemProxy < ControlProxy
+        # Proxy for LibUI check menu item object
+        #
+        # Follows the Proxy Design Pattern
+        class CheckMenuItemProxy < MenuItemProxy
+          private
+          
+          def build_control
+            @libui = @parent_proxy.append_check_item(*@args)
+          end
+        end
+      end
+    end
+  end
+end