glimmer-dsl-libui 0.2.24 → 0.3.3

data/lib/glimmer/dsl/libui/shape_expression.rb

@@ -21,6 +21,9 @@
 
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
+require 'glimmer/libui/control_proxy/path_proxy'
+require 'glimmer/libui/shape'
+require 'glimmer/libui/control_proxy/area_proxy'
 
 module Glimmer
   module DSL
@@ -32,7 +35,9 @@ module Glimmer
           Glimmer::LibUI::Shape.exists?(keyword) and
             (
               parent.is_a?(Glimmer::LibUI::ControlProxy::PathProxy) or
-                parent.is_a?(Glimmer::LibUI::Shape)
+              parent.is_a?(Glimmer::LibUI::Shape) or
+              parent.is_a?(Glimmer::LibUI::ControlProxy::AreaProxy) or
+              (parent.nil? && Glimmer::LibUI::ControlProxy::AreaProxy.current_area_draw_params)
             )
         end
   

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

@@ -218,6 +218,7 @@ module Glimmer
           {
             key: key_to_char(area_key_event.Key, modifiers),
             key_value: area_key_event.Key,
+            key_code: area_key_event.Key,
             ext_key: ext_key_to_symbol(area_key_event.ExtKey),
             ext_key_value: area_key_event.ExtKey,
             modifier: modifiers_to_symbols(area_key_event.Modifier).first,

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

@@ -43,9 +43,9 @@ module Glimmer
           @column_index ||= @parent_proxy.send(:next_column_index)
         end
         
-        # actual index within table columns (disregarding nil fillings that account for DualColumn instances)
+        # actual index within table columns (disregarding extra fillings that account for DualColumn instances)
         def index
-          @parent_proxy.columns.compact.index(self)
+          @parent_proxy.columns.select {|c| c.is_a?(Column)}.index(self)
         end
       end
     end

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

@@ -34,7 +34,6 @@ module Glimmer
           @args = args
           @block = block
           @enabled = true
-          @children = []
           post_add_content if @block.nil?
         end
         

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

@@ -20,44 +20,191 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/control_proxy/image_part_proxy'
+require 'glimmer/libui/image_path_renderer'
 require 'glimmer/data_binding/observer'
+require 'glimmer/libui/control_proxy/transformable'
 
 using ArrayIncludeMethods
 
 module Glimmer
   module LibUI
     class ControlProxy
-      # Proxy for LibUI image objects
+      # Proxy for LibUI image object and Glimmer custom control
       #
       # Follows the Proxy Design Pattern
       class ImageProxy < ControlProxy
+        include Parent
+        prepend Transformable
+        
+        attr_reader :data, :pixels, :shapes
+        
         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
+          if area_image?
+            @shapes = nil
+            super
+            if @parent_proxy.nil? && AreaProxy.current_area_draw_params
+              draw(AreaProxy.current_area_draw_params)
+              destroy
+            end
+            @content_added = true
+          else # image object not control
+            build_control
+            super
+          end
+        end
+        
+        def file(value = nil)
+          if value.nil?
+            @args[0]
+          else
+            @args[0] = value
+            if @content_added
+              post_add_content
+              request_auto_redraw
+            end
+          end
+        end
+        alias file= file
+        alias set_file file
+      
+        def width(value = nil)
+          if value.nil?
+            @args[1]
+          else
+            @args[1] = value
+            if area_image? && @content_added
+              post_add_content
+              request_auto_redraw
+            end
+          end
+        end
+        alias width= width
+        alias set_width width
+      
+        def height(value = nil)
+          if value.nil?
+            @args[2]
+          else
+            @args[2] = value
+            if area_image? && @content_added
+              post_add_content
+              request_auto_redraw
+            end
+          end
+        end
+        alias height= height
+        alias set_height height
+        
+        def redraw
+          @parent_proxy&.redraw
+        end
+        
+        def request_auto_redraw
+          @parent_proxy&.request_auto_redraw if area_image?
+        end
+      
+        def draw(area_draw_params)
+          if @shapes.nil?
+            load_image
+            parse_pixels
+            calculate_shapes
+          end
+          ImagePathRenderer.new(@parent_proxy, @shapes).render
         end
-   
-        def post_initialize_child(child)
-          @children << child
+        
+        def area_image?
+          @area_image ||= !!(@parent_proxy&.is_a?(AreaProxy) || AreaProxy.current_area_draw_params)
+        end
+        
+        def destroy
+          @parent_proxy&.children&.delete(self)
+          ControlProxy.control_proxies.delete(self)
         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) }
+          unless area_image? # image object
+            if file
+              load_image
+              ImagePartProxy.new('image_part', self, [@data, width, height, width * 4])
+            end
+            @args[1] = @children.first.args[1] if @children.size == 1 && @args[1].nil?
+            @args[2] = @children.first.args[2] if @children.size == 1 && @args[2].nil?
+            @libui = ControlProxy.new_control(@keyword, [width, height])
+            @libui.tap do
+              @children.each {|child| child&.send(:build_control) }
+            end
+          end
+        rescue => e
+          Glimmer::Config.logger.error {"Failed to load image file: #{file}"}
+          Glimmer::Config.logger.error {e.full_message}
+          raise e
+        end
+        
+        def load_image
+          require 'chunky_png'
+          canvas = nil
+          if file.start_with?('http')
+            require 'net/http'
+            require 'open-uri'
+            uri = URI(file)
+            canvas = ChunkyPNG::Canvas.from_string(Net::HTTP.get(uri))
+          else
+            f = File.open(file)
+            canvas = ChunkyPNG::Canvas.from_io(f)
+            f.close
+          end
+          canvas.resample_nearest_neighbor!(width, height) if width && height
+          @data = canvas.to_rgba_stream
+          self.width = canvas.width
+          self.height = canvas.height
+          [@data, width, height]
+        end
+        
+        def parse_pixels
+          @pixels = height.times.map do |y|
+            width.times.map do |x|
+              r = @data[(y*width + x)*4].ord
+              g = @data[(y*width + x)*4 + 1].ord
+              b = @data[(y*width + x)*4 + 2].ord
+              a = @data[(y*width + x)*4 + 3].ord
+              {x: x, y: y, color: {r: r, g: g, b: b, a: a}}
+            end
+          end.flatten
+        end
+        
+        def calculate_shapes
+          @shapes = []
+          original_pixels = @pixels.dup
+          indexed_original_pixels = Hash[original_pixels.each_with_index.to_a]
+          @pixels.each do |pixel|
+            index = indexed_original_pixels[pixel]
+            @rectangle_start_x ||= pixel[:x]
+            @rectangle_width ||= 1
+            if pixel[:x] < width - 1 && pixel[:color] == original_pixels[index + 1][:color]
+              @rectangle_width += 1
+            else
+              if pixel[:x] > 0 && pixel[:color] == original_pixels[index - 1][:color]
+                @shapes << {x: @rectangle_start_x, y: pixel[:y], width: @rectangle_width, height: 1, color: pixel[:color]}
+              else
+                @shapes << {x: pixel[:x], y: pixel[:y], width: 1, height: 1, color: pixel[:color]}
+              end
+              @rectangle_width = 1
+              @rectangle_start_x = pixel[:x] == width - 1 ? 0 : pixel[:x] + 1
+            end
           end
+          @shapes
         end
       end
     end

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

@@ -21,6 +21,7 @@
 
 require 'glimmer/libui/control_proxy'
 require 'glimmer/libui/control_proxy/dual_column'
+require 'glimmer/libui/control_proxy/triple_column'
 require 'glimmer/data_binding/observer'
 require 'glimmer/fiddle_consumer'
 
@@ -137,7 +138,7 @@ module Glimmer
         
         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.NumColumns   = fiddle_closure_block_caller(4) { @columns.map {|c| c.is_a?(DualColumn) ? 2 : (c.is_a?(TripleColumn) ? 3 : 1)}.sum }
           @model_handler.ColumnType   = fiddle_closure_block_caller(4, [1, 1, 4]) do |_, _, column|
             # TODO consider refactoring to use Glimmer::LibUI.enum_symbols(:table_value_type)
             case @columns[column]
@@ -193,15 +194,27 @@ module Glimmer
               column = @columns[column].index
               @cell_rows[row] ||= []
               @cell_rows[row][column] = ::LibUI.table_value_string(val).to_s
+            when Column::TextColorColumnProxy
+              column = @columns[column].index
+              @cell_rows[row] ||= []
+              @cell_rows[row][column] ||= []
+              @cell_rows[row][column][0] = ::LibUI.table_value_string(val).to_s
             when :text
               column = @columns[column - 1].index
+              @cell_rows[row] ||= []
+              @cell_rows[row][column] ||= []
               @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
+            when Column::CheckboxColumnProxy
               column = @columns[column].index
               @cell_rows[row] ||= []
               @cell_rows[row][column] = ::LibUI.table_value_int(val).to_i == 1
+            when Column::CheckboxTextColumnProxy
+              column = @columns[column].index
+              @cell_rows[row] ||= []
+              @cell_rows[row][column] ||= []
+              @cell_rows[row][column][0] = ::LibUI.table_value_int(val).to_i == 1
             end
             on_edited.each {|listener| listener.call(row, @cell_rows[row])}
           end

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

@@ -45,7 +45,7 @@ module Glimmer
         
         def destroy
           super
-          ControlProxy.image_proxies.each { |image_proxy| ::LibUI.free_image(image_proxy.libui) }
+          ControlProxy.image_proxies.each { |image_proxy| ::LibUI.free_image(image_proxy.libui) unless image_proxy.area_image? }
           @on_destroy_procs&.each { |on_destroy_proc| on_destroy_proc.call(self)}
         end
         

data/lib/glimmer/libui/control_proxy.rb

@@ -27,8 +27,8 @@ module Glimmer
     class ControlProxy
       class << self
         def exists?(keyword)
-          ::LibUI.respond_to?("new_#{keyword}") ||
-            ::LibUI.respond_to?(keyword) ||
+          ::LibUI.respond_to?("new_#{keyword}") or
+            ::LibUI.respond_to?(keyword) or
             descendant_keyword_constant_map.keys.include?(keyword)
         end
         
@@ -207,11 +207,11 @@ module Glimmer
       end
       
       def respond_to_libui?(method_name, *args, &block)
-        ::LibUI.respond_to?("control_#{method_name}") ||
-          (::LibUI.respond_to?("control_#{method_name.to_s.sub(/\?$/, '')}") && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, '')) ) ||
-          ::LibUI.respond_to?("control_set_#{method_name.to_s.sub(/=$/, '')}") ||
-          ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name}") ||
-          (::LibUI.respond_to?("#{libui_api_keyword}_#{method_name.to_s.sub(/\?$/, '')}") && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, '')) ) ||
+        ::LibUI.respond_to?("control_#{method_name}") or
+          (::LibUI.respond_to?("control_#{method_name.to_s.sub(/\?$/, '')}") && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, '')) ) or
+          ::LibUI.respond_to?("control_set_#{method_name.to_s.sub(/=$/, '')}") or
+          ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name}") or
+          (::LibUI.respond_to?("#{libui_api_keyword}_#{method_name.to_s.sub(/\?$/, '')}") && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, '')) ) or
           ::LibUI.respond_to?("#{libui_api_keyword}_set_#{method_name.to_s.sub(/=$/, '')}")
       end
       

data/lib/glimmer/libui/image_path_renderer.rb

@@ -0,0 +1,30 @@
+module Glimmer
+  module LibUI
+    class ImagePathRenderer
+      include Glimmer
+      
+      def initialize(area_proxy, shapes)
+        @area_proxy = area_proxy
+        @shapes = shapes
+      end
+      
+      def render
+        work = Proc.new do
+          @shapes.each do |shape|
+            path {
+              rectangle(shape[:x], shape[:y], shape[:width], shape[:height])
+    
+              fill shape[:color]
+            }
+          end
+        end
+        if @area_proxy.nil?
+          # Ensure it renders without a parent
+          Glimmer::DSL::Engine.add_content(nil, Glimmer::DSL::Libui::ControlExpression.new, 'image', &work)
+        else
+          work.call
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape.rb

@@ -73,12 +73,22 @@ module Glimmer
         @args = args
         @block = block
         set_parameter_defaults
+        build_control if implicit_path?
         post_add_content if @block.nil?
       end
       
       # Subclasses may override to perform post add_content work (normally must call super)
       def post_add_content
         @parent&.post_initialize_child(self)
+        @parent.post_add_content if implicit_path? && dynamic?
+      end
+      
+      def post_initialize_child(child, add_child: true)
+        if child.is_a?(ControlProxy::MatrixProxy)
+          path_proxy.post_initialize_child(child, add_child: add_child)
+        else
+          super(child, add_child: add_child)
+        end
       end
       
       # Subclasses must override to perform draw work and call super afterwards to ensure calling destroy when semi-declarative in an on_draw method
@@ -105,6 +115,24 @@ module Glimmer
       def path_proxy
         find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(ControlProxy::PathProxy) }
       end
+    
+      def fill(*args)
+        path_proxy.fill(*args)
+      end
+      alias fill= fill
+      alias set_fill fill
+      
+      def stroke(*args)
+        path_proxy.stroke(*args)
+      end
+      alias stroke= stroke
+      alias set_stroke stroke
+      
+      def transform(matrix = nil)
+        path_proxy.transform(matrix)
+      end
+      alias transform= transform
+      alias set_transform transform
       
       def respond_to?(method_name, *args, &block)
         self.class.parameters.include?(method_name.to_s.sub(/=$/, '').sub(/^set_/, '').to_sym) or
@@ -117,6 +145,7 @@ module Glimmer
           method_name = method_name.to_s
           parameter_index = self.class.parameters.index(method_name_parameter)
           if method_name.start_with?('set_') || method_name.end_with?('=') || !args.empty?
+            args = [args] if args.size > 1
             if args.first != @args[parameter_index]
               @args[parameter_index] = args.first
               request_auto_redraw
@@ -124,13 +153,27 @@ module Glimmer
           else
             @args[parameter_index]
           end
-        else
+        else # TODO consider if there is a need to redirect anything to path proxy or delete this TODO
           super
         end
       end
       
       private
       
+      def build_control
+        block = Proc.new {} if dynamic?
+        @parent = Glimmer::LibUI::ControlProxy::PathProxy.new('path', @parent, [], &block)
+      end
+      
+      # indicates if nested directly under area or on_draw event (having an implicit path not an explicit path parent)
+      def implicit_path?
+        @implicit_path ||= !!(@parent.is_a?(Glimmer::LibUI::ControlProxy::AreaProxy) || (@parent.nil? && Glimmer::LibUI::ControlProxy::AreaProxy.current_area_draw_params))
+      end
+      
+      def dynamic?
+        ((@parent.nil? || (@parent.is_a?(ControlProxy::PathProxy) && @parent.parent_proxy.nil?)) && Glimmer::LibUI::ControlProxy::AreaProxy.current_area_draw_params)
+      end
+      
       def set_parameter_defaults
         self.class.parameter_defaults.each_with_index do |default, i|
           @args[i] ||= default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.3.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-14 00:00:00.000000000 Z
+date: 2021-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.12
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
@@ -176,20 +190,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: chunky_png
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 description: Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI
   Library) - No need to pre-install any prerequisites. Just install the gem and have
   platform-independent native GUI that just works! Glimmer DSL for LibUI aims to provide
@@ -221,15 +221,24 @@ files:
 - examples/basic_draw_text.rb
 - examples/basic_draw_text2.rb
 - examples/basic_entry.rb
+- examples/basic_image.rb
+- examples/basic_image2.rb
+- examples/basic_image3.rb
+- examples/basic_image4.rb
+- examples/basic_image5.rb
 - examples/basic_table.rb
 - examples/basic_table_button.rb
 - examples/basic_table_checkbox.rb
 - examples/basic_table_checkbox_text.rb
 - examples/basic_table_color.rb
+- examples/basic_table_color2.rb
 - examples/basic_table_image.rb
+- examples/basic_table_image2.rb
 - examples/basic_table_image_text.rb
+- examples/basic_table_image_text2.rb
 - examples/basic_table_progress_bar.rb
 - examples/basic_transform.rb
+- examples/basic_transform2.rb
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
@@ -347,6 +356,7 @@ files:
 - lib/glimmer/libui/control_proxy/transformable.rb
 - lib/glimmer/libui/control_proxy/triple_column.rb
 - lib/glimmer/libui/control_proxy/window_proxy.rb
+- lib/glimmer/libui/image_path_renderer.rb
 - lib/glimmer/libui/parent.rb
 - lib/glimmer/libui/shape.rb
 - lib/glimmer/libui/shape/arc.rb
@@ -385,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for LibUI