glimmer-dsl-libui 0.2.23 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.2.23
+0.3.2

data/examples/basic_image.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    # image is not a real LibUI control. It is built in Glimmer as a custom control that renders
+    # tiny pixels/lines as rectangle paths. As such, it does not have good performance, but can
+    # be used in exceptional circumstances where an image control is really needed.
+    #
+    # Furthermore, adding image directly under area is even slower due to taking up more memory for every
+    # image pixel rendered. Check basic_image2.rb for a faster alternative using on_draw manually.
+    #
+    # It is recommended to pass width/height args to shrink image and achieve faster performance.
+    image(File.expand_path('../icons/glimmer.png', __dir__), 96, 96)
+  }
+}.show

data/examples/basic_image2.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    on_draw do |area_draw_params|
+      image(File.expand_path('../icons/glimmer.png', __dir__), 96, 96)
+    end
+  }
+}.show

data/examples/basic_image3.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    # image is not a real LibUI control. It is built in Glimmer as a custom control that renders
+    # tiny pixels/lines as rectangle paths. As such, it does not have good performance, but can
+    # be used in exceptional circumstances where an image control is really needed.
+    #
+    # Furthermore, adding image directly under area is even slower due to taking up more memory for every
+    # image pixel rendered. Check basic_image4.rb for a faster alternative using on_draw manually.
+    #
+    # It is recommended to pass width/height args to shrink image and achieve faster performance.
+    image {
+      file File.expand_path('../icons/glimmer.png', __dir__)
+      width 96
+      height 96
+    }
+  }
+}.show

data/examples/basic_image4.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    on_draw do |area_draw_params|
+      image {
+        file File.expand_path('../icons/glimmer.png', __dir__)
+        width 96
+        height 96
+      }
+    end
+  }
+}.show

data/examples/basic_image5.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+# This is the manual way of rendering an image unto an area control.
+# It could come in handy in special situations.
+# Otherwise, it is recommended to simply utilize the `image` control that
+# can be nested under area or area on_draw listener to automate all this work.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+
+include Glimmer
+
+puts 'Parsing image...'; $stdout.flush
+
+f = File.open(File.expand_path('../icons/glimmer.png', __dir__))
+canvas = ChunkyPNG::Canvas.from_io(f)
+f.close
+canvas.resample_nearest_neighbor!(96, 96)
+data = canvas.to_rgba_stream
+width = canvas.width
+height = canvas.height
+puts "Image width: #{width}"
+puts "Image height: #{height}"
+
+puts 'Parsing colors...'; $stdout.flush
+
+color_maps = 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
+puts "#{color_maps.size} pixels to render..."; $stdout.flush
+
+puts 'Parsing shapes...'; $stdout.flush
+
+shape_maps = []
+original_color_maps = color_maps.dup
+indexed_original_color_maps = Hash[original_color_maps.each_with_index.to_a]
+color_maps.each do |color_map|
+  index = indexed_original_color_maps[color_map]
+  @rectangle_start_x ||= color_map[:x]
+  @rectangle_width ||= 1
+  if color_map[:x] < width - 1 && color_map[:color] == original_color_maps[index + 1][:color]
+    @rectangle_width += 1
+  else
+    if color_map[:x] > 0 && color_map[:color] == original_color_maps[index - 1][:color]
+      shape_maps << {x: @rectangle_start_x, y: color_map[:y], width: @rectangle_width, height: 1, color: color_map[:color]}
+    else
+      shape_maps << {x: color_map[:x], y: color_map[:y], width: 1, height: 1, color: color_map[:color]}
+    end
+    @rectangle_width = 1
+    @rectangle_start_x = color_map[:x] == width - 1 ? 0 : color_map[:x] + 1
+  end
+end
+puts "#{shape_maps.size} shapes to render..."; $stdout.flush
+
+puts 'Rendering image...'; $stdout.flush
+
+window('Basic Image', 96, 96) {
+  area {
+    on_draw do |area_draw_params|
+      shape_maps.each do |shape_map|
+        path {
+          rectangle(shape_map[:x], shape_map[:y], shape_map[:width], shape_map[:height])
+
+          fill shape_map[:color]
+        }
+      end
+    end
+  }
+}.show

data/examples/basic_table_color.rb

@@ -1,20 +1,10 @@
 # frozen_string_literal: true
 
 require 'glimmer-dsl-libui'
-require 'chunky_png'
 
 include Glimmer
 
-f = File.open(File.expand_path('../icons/glimmer.png', __dir__))
-canvas = ChunkyPNG::Canvas.from_io(f)
-f.close
-canvas.resample_nearest_neighbor!(24, 24)
-data = canvas.to_rgba_stream
-width = canvas.width
-height = canvas.height
-img = image {
-  image_part(data, width, height, width * 4)
-}
+img = image(File.expand_path('../icons/glimmer.png', __dir__), 24, 24)
 
 data = [
   [['cat', :red]      , ['meow', :blue]                  , [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], {r: 255, g: 120, b: 0, a: 0.5}],

data/examples/basic_table_color2.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+
+include Glimmer
+
+f = File.open(File.expand_path('../icons/glimmer.png', __dir__))
+canvas = ChunkyPNG::Canvas.from_io(f)
+f.close
+canvas.resample_nearest_neighbor!(24, 24)
+data = canvas.to_rgba_stream
+width = canvas.width
+height = canvas.height
+img = image {
+  image_part(data, width, height, width * 4)
+}
+
+data = [
+  [['cat', :red]      , ['meow', :blue]                  , [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], {r: 255, g: 120, b: 0, a: 0.5}],
+  [['dog', :yellow]   , ['woof', {r: 240, g: 32, b: 32}] , [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], :skyblue],
+  [['chicken', :beige], ['cock-a-doodle-doo', :blue]     , [false, 'mammal', :red] , [img, 'Glimmer', :beige], {r: 5, g: 120, b: 110}],
+  [['horse', :purple] , ['neigh', {r: 240, g: 32, b: 32}], [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], '13a1fb'],
+  [['cow', :gray]     , ['moo', :blue]                   , [true, 'mammal', :green], [img, 'Glimmer', :brown], 0x12ff02]
+]
+
+window('Animals', 500, 200) {
+  horizontal_box {
+    table {
+      text_color_column('Animal')
+      text_color_column('Sound')
+      checkbox_text_color_column('Description')
+      image_text_color_column('GUI')
+      background_color_column('Mammal')
+
+      cell_rows data
+    }
+  }
+}.show

data/examples/basic_table_image.rb

@@ -4,8 +4,6 @@
 # This example displays images that can be freely downloaded from the Studio Ghibli website.
 
 require 'glimmer-dsl-libui'
-require 'chunky_png'
-require 'open-uri'
 
 include Glimmer
 
@@ -13,18 +11,8 @@ IMAGE_ROWS = []
 
 50.times do |i|
   url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
-  puts "Processing Image: #{url}"
-  $stdout.flush # for Windows
-  f = URI.open(url)
-  canvas = ChunkyPNG::Canvas.from_io(f)
-  f.close
-  data = canvas.to_rgba_stream
-  width = canvas.width
-  height = canvas.height
-  img = image {
-    image_part(data, width, height, width * 4)
-  }
-  IMAGE_ROWS << [img] # array of one column cell
+  puts "Processing Image: #{url}"; $stdout.flush # for Windows
+  IMAGE_ROWS << [image(url)] # array of one column cell
 rescue StandardError => e
   warn url, e.message
 end

data/examples/basic_table_image2.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# NOTE:
+# This example displays images that can be freely downloaded from the Studio Ghibli website.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+require 'open-uri'
+
+include Glimmer
+
+IMAGE_ROWS = []
+
+50.times do |i|
+  url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
+  puts "Processing Image: #{url}"
+  $stdout.flush # for Windows
+  f = URI.open(url)
+  canvas = ChunkyPNG::Canvas.from_io(f)
+  f.close
+  data = canvas.to_rgba_stream
+  width = canvas.width
+  height = canvas.height
+  img = image {
+    image_part(data, width, height, width * 4)
+  }
+  IMAGE_ROWS << [img] # array of one column cell
+rescue StandardError => e
+  warn url, e.message
+end
+
+window('The Red Turtle', 310, 350, false) {
+  horizontal_box {
+    table {
+      image_column('www.ghibli.jp/works/red-turtle')
+      
+      cell_rows IMAGE_ROWS
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/examples/basic_table_image_text.rb

@@ -4,8 +4,6 @@
 # This example displays images that can be freely downloaded from the Studio Ghibli website.
 
 require 'glimmer-dsl-libui'
-require 'chunky_png'
-require 'open-uri'
 
 include Glimmer
 
@@ -13,18 +11,9 @@ IMAGE_ROWS = []
 
 5.times do |i|
   url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
-  puts "Processing Image: #{url}"
-  $stdout.flush # for Windows
-  f = URI.open(url)
-  canvas = ChunkyPNG::Canvas.from_io(f)
-  f.close
-  data = canvas.to_rgba_stream
-  width = canvas.width
-  height = canvas.height
-  img = image {
-    image_part(data, width, height, width * 4)
-  }
+  puts "Processing Image: #{url}"; $stdout.flush # for Windows
   text = url.sub('https://www.ghibli.jp/gallery/thumb-redturtle', '').sub('.png', '')
+  img = image(url)
   IMAGE_ROWS << [[img, text], [img, text]] # cell values are dual-element arrays
 rescue StandardError => e
   warn url, e.message

data/examples/basic_table_image_text2.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# NOTE:
+# This example displays images that can be freely downloaded from the Studio Ghibli website.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+require 'open-uri'
+
+include Glimmer
+
+IMAGE_ROWS = []
+
+5.times do |i|
+  url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
+  puts "Processing Image: #{url}"
+  $stdout.flush # for Windows
+  f = URI.open(url)
+  canvas = ChunkyPNG::Canvas.from_io(f)
+  f.close
+  data = canvas.to_rgba_stream
+  width = canvas.width
+  height = canvas.height
+  img = image {
+    image_part(data, width, height, width * 4)
+  }
+  text = url.sub('https://www.ghibli.jp/gallery/thumb-redturtle', '').sub('.png', '')
+  IMAGE_ROWS << [[img, text], [img, text]] # cell values are dual-element arrays
+rescue StandardError => e
+  warn url, e.message
+end
+
+window('The Red Turtle', 670, 350) {
+  horizontal_box {
+    table {
+      image_text_column('image/number')
+      image_text_column('image/number (editable)') {
+        editable true
+      }
+      
+      cell_rows IMAGE_ROWS
+    }
+  }
+}.show

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

@@ -40,7 +40,7 @@ module Glimmer
         
         def add_content(parent, keyword, *args, &block)
           super
-          parent.post_add_content
+          parent&.post_add_content
         end
       end
     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