glimmer-dsl-libui 0.1.4 → 0.1.5

data/examples/histogram.rb

@@ -0,0 +1,119 @@
+# https://github.com/jamescook/libui-ruby/blob/master/example/histogram.rb
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+X_OFF_LEFT   = 20
+Y_OFF_TOP    = 20
+X_OFF_RIGHT  = 20
+Y_OFF_BOTTOM = 20
+POINT_RADIUS = 5
+
+COLOR_BLUE   = 0x1E90FF
+
+def graph_size(area_width, area_height)
+  graph_width = area_width - X_OFF_LEFT - X_OFF_RIGHT
+  graph_height = area_height - Y_OFF_TOP - Y_OFF_BOTTOM
+  [graph_width, graph_height]
+end
+
+def point_locations(datapoints, width, height)
+  xincr = width / 9.0 # 10 - 1 to make the last point be at the end
+  yincr = height / 100.0
+
+  data = []
+  datapoints.each_with_index do |dp, i|
+    val = 100 - dp.value
+    data << [xincr * i, yincr * val]
+    i += 1
+  end
+
+  data
+end
+
+def graph_path(datapoints, width, height, should_extend, &block)
+  locations = point_locations(datapoints, width, height)
+  path {
+    first_location = locations[0] # x and y
+    figure(first_location[0], first_location[1]) {
+      locations.each do |loc|
+        line(loc[0], loc[1])
+      end
+      if should_extend
+        line(width, height)
+        line(0, height)
+        
+        closed true
+      end
+    }
+    
+    # now transform the coordinate space so (0, 0) is the top-left corner of the graph
+    transform {
+      translate X_OFF_LEFT, Y_OFF_TOP
+    }
+    
+    block.call
+  }
+end
+
+window('histogram example', 640, 480) {
+  margined true
+  
+  horizontal_box {
+    vertical_box {
+      stretchy false
+      
+      @datapoints = 10.times.map do
+        spinbox(0, 100) { |datapoint|
+          stretchy false
+          value Random.new.rand(90)
+          
+          on_changed do
+            @area.queue_redraw_all
+          end
+        }
+      end
+      
+      @color_button = color_button {
+        stretchy false
+        color COLOR_BLUE
+        
+        on_changed do
+          @area.queue_redraw_all
+        end
+      }
+    }
+    
+    @area = area {
+      on_draw do |area_draw_params|
+        path {
+          rectangle(0, 0, area_draw_params[:area_width], area_draw_params[:area_height])
+          
+          fill color: 0xFFFFFF
+        }
+        
+        graph_width, graph_height = *graph_size(area_draw_params[:area_width], area_draw_params[:area_height])
+      
+        path {
+          figure(X_OFF_LEFT, Y_OFF_TOP) {
+            line(X_OFF_LEFT, Y_OFF_TOP + graph_height)
+            line(X_OFF_LEFT + graph_width, Y_OFF_TOP + graph_height)
+          }
+          
+          stroke color: 0x000000, thickness: 2, miter_limit: 10
+        }
+      
+        # now create the fill for the graph below the graph line
+        graph_path(@datapoints, graph_width, graph_height, true) {
+          fill @color_button.color.merge(a: 0.5)
+        }
+        
+        # now draw the histogram line
+        graph_path(@datapoints, graph_width, graph_height, false) {
+          stroke @color_button.color.merge(thickness: 2, miter_limit: 10)
+        }
+      end
+    }
+  }
+}.show

data/lib/glimmer/libui/arc.rb

@@ -28,7 +28,7 @@ module Glimmer
       parameter_defaults 0, 0, 0, 0, 360, false
               
       def draw(area_draw_params)
-        @args[5] ||= ControlProxy.boolean_to_integer(@args[5], allow_nil: false)
+        @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

data/lib/glimmer/libui/area_proxy.rb

@@ -21,6 +21,8 @@
 
 require 'glimmer/libui/control_proxy'
 require 'glimmer/fiddle_consumer'
+require 'glimmer/libui/parent'
+require 'glimmer/libui/transformable'
 
 module Glimmer
   module LibUI
@@ -28,24 +30,22 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class AreaProxy < ControlProxy
+      class << self
+        # this attribute is only populated during on_draw call
+        attr_accessor :current_area_draw_params
+      end
+      
       include Glimmer::FiddleConsumer
+      include Parent
+      prepend Transformable
       
       attr_reader :area_handler
       
-      def post_initialize_child(child)
-        super
-        children << child
-      end
-      
       def post_add_content
         super
         install_listeners
       end
       
-      def children
-        @children ||= []
-      end
-      
       def on_draw(&block)
         @on_draw_procs ||= []
         if block.nil?
@@ -69,6 +69,15 @@ module Glimmer
         end
       end
       
+      def draw(area_draw_params)
+        children.dup.each {|child| child.draw(area_draw_params)}
+        on_draw.each {|listener| listener.call(area_draw_params)}
+      end
+      
+      def redraw
+        queue_redraw_all
+      end
+      
       private
       
       def build_control
@@ -80,8 +89,9 @@ module Glimmer
         @area_handler.Draw         = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_draw_params|
           area_draw_params = ::LibUI::FFI::AreaDrawParams.new(area_draw_params)
           area_draw_params = area_draw_params_hash(area_draw_params)
-          children.dup.each {|child| child.draw(area_draw_params)}
-          on_draw.each {|listener| listener.call(area_draw_params) }
+          AreaProxy.current_area_draw_params = area_draw_params
+          draw(area_draw_params)
+          AreaProxy.current_area_draw_params = nil
         end
         @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [0]) {}
         @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [0]) {}

data/lib/glimmer/libui/box.rb

@@ -28,7 +28,7 @@ module Glimmer
       
       def post_initialize_child(child)
         child.stretchy = true if child.stretchy.nil?
-        ::LibUI.box_append(@libui, child.libui, ControlProxy.boolean_to_integer(child.stretchy))
+        ::LibUI.box_append(@libui, child.libui, Glimmer::LibUI.boolean_to_integer(child.stretchy))
         children << child
       end
       

data/lib/glimmer/libui/color_button_proxy.rb

@@ -27,30 +27,82 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class ColorButtonProxy < ControlProxy
-      def color
-        @red ||= Fiddle::Pointer.malloc(8) # double
-        @green ||= Fiddle::Pointer.malloc(8) # double
-        @blue ||= Fiddle::Pointer.malloc(8) # double
-        @alpha ||= Fiddle::Pointer.malloc(8) # double
-        ::LibUI.color_button_color(@libui, @red, @green, @blue, @alpha)
-        [@red[0, 8].unpack1('d') * 255.0, @green[0, 8].unpack1('d') * 255.0, @blue[0, 8].unpack1('d') * 255.0, @alpha[0, 8].unpack1('d')]
+      def color(value = nil)
+        # TODO support hex color value
+        if value.nil?
+          @red ||= Fiddle::Pointer.malloc(8) # double
+          @green ||= Fiddle::Pointer.malloc(8) # double
+          @blue ||= Fiddle::Pointer.malloc(8) # double
+          @alpha ||= Fiddle::Pointer.malloc(8) # double
+          ::LibUI.color_button_color(@libui, @red, @green, @blue, @alpha)
+          {
+            r: @red[0, 8].unpack1('d') * 255.0,
+            g: @green[0, 8].unpack1('d') * 255.0,
+            b: @blue[0, 8].unpack1('d') * 255.0,
+            a: @alpha[0, 8].unpack1('d')
+          }
+        else
+          current_color = color
+          value = Glimmer::LibUI.hex_to_rgb(value)
+          value[:r] ||= current_color[:r]
+          value[:g] ||= current_color[:g]
+          value[:b] ||= current_color[:b]
+          value[:a] ||= current_color[:a]
+          ::LibUI.color_button_set_color(@libui, value[:r].to_f / 255.0, value[:g].to_f / 255.0, value[:b].to_f / 255.0, value[:a])
+        end
       end
       
-      def red
-        color[0]
+      def red(value = nil)
+        if value.nil?
+          color[:r]
+        else
+          self.color = {r: value}
+        end
       end
+      alias red= red
+      alias set_red red
+      alias r red
+      alias r= red
+      alias set_r red
       
-      def green
-        color[1]
+      def green(value = nil)
+        if value.nil?
+          color[:g]
+        else
+          self.color = {g: value}
+        end
       end
+      alias green= green
+      alias set_green green
+      alias g green
+      alias g= green
+      alias set_g green
       
-      def blue
-        color[2]
+      def blue(value = nil)
+        if value.nil?
+          color[:b]
+        else
+          self.color = {b: value}
+        end
       end
+      alias blue= blue
+      alias set_blue blue
+      alias b blue
+      alias b= blue
+      alias set_b blue
       
-      def alpha
-        color[3]
+      def alpha(value = nil)
+        if value.nil?
+          color[:a]
+        else
+          self.color = {a: value}
+        end
       end
+      alias alpha= alpha
+      alias set_alpha alpha
+      alias a alpha
+      alias a= alpha
+      alias set_a alpha
       
       def destroy
         Fiddle.free @red unless @red.nil?

data/lib/glimmer/libui/control_proxy.rb

@@ -55,14 +55,6 @@ module Glimmer
           control_proxies.find {|c| c.is_a?(Glimmer::LibUI::WindowProxy)}
         end
         
-        def integer_to_boolean(int, allow_nil: true)
-          int.nil? ? (allow_nil ? nil : false) : int == 1
-        end
-        
-        def boolean_to_integer(bool, allow_nil: true)
-          bool.nil? ? (allow_nil ? nil : 0) : (bool ? 1 : 0)
-        end
-        
         def menu_proxies
           control_proxies.select {|c| c.keyword == 'menu' }
         end
@@ -173,7 +165,7 @@ module Glimmer
           handle_string_property(property, handle_boolean_property(property, value))
         elsif ::LibUI.respond_to?("#{libui_api_keyword}_set_#{method_name.to_s.sub(/=$/, '')}") && !args.empty?
           property = method_name.to_s.sub(/=$/, '')
-          args[0] = ControlProxy.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
+          args[0] = Glimmer::LibUI.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
           ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args)
         elsif ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name}") && !args.empty?
           ::LibUI.send("#{libui_api_keyword}_#{method_name}", @libui, *args)
@@ -183,7 +175,7 @@ module Glimmer
           handle_string_property(property, handle_boolean_property(property, value))
         elsif ::LibUI.respond_to?("control_set_#{method_name.to_s.sub(/=$/, '')}")
           property = method_name.to_s.sub(/=$/, '')
-          args[0] = ControlProxy.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
+          args[0] = Glimmer::LibUI.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
           ::LibUI.send("control_set_#{method_name.to_s.sub(/=$/, '')}", @libui, *args)
         elsif ::LibUI.respond_to?("control_#{method_name}") && !args.empty?
           ::LibUI.send("control_#{method_name}", @libui, *args)
@@ -201,7 +193,7 @@ module Glimmer
           value = @append_property_hash[property]
           handle_string_property(property, handle_boolean_property(property, value))
         else
-          value = ControlProxy.boolean_to_integer(value) if BOOLEAN_PROPERTIES.include?(property) && (value.is_a?(TrueClass) || value.is_a?(FalseClass))
+          value = Glimmer::LibUI.boolean_to_integer(value) if BOOLEAN_PROPERTIES.include?(property) && (value.is_a?(TrueClass) || value.is_a?(FalseClass))
           @append_property_hash[property] = value
         end
       end
@@ -274,7 +266,7 @@ module Glimmer
       end
       
       def handle_boolean_property(property, value)
-        BOOLEAN_PROPERTIES.include?(property) ? ControlProxy.integer_to_boolean(value) : value
+        BOOLEAN_PROPERTIES.include?(property) ? Glimmer::LibUI.integer_to_boolean(value) : value
       end
       
       def handle_string_property(property, value)

data/lib/glimmer/libui/form_proxy.rb

@@ -29,7 +29,7 @@ module Glimmer
       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))
+        ::LibUI.form_append(@libui, child.label, child.libui, Glimmer::LibUI.boolean_to_integer(child.stretchy))
         children << child
       end
       

data/lib/glimmer/libui/grid_proxy.rb

@@ -35,7 +35,7 @@ module Glimmer
         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)
+        ::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
       

data/lib/glimmer/libui/matrix_proxy.rb

@@ -0,0 +1,145 @@
+# 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
+    # 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

data/lib/glimmer/libui/parent.rb

@@ -0,0 +1,36 @@
+# 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.
+
+module Glimmer
+  module LibUI
+    # Parent controls and shapes who have children and add child post_initialize_child
+    module Parent
+      # Subclasses can override and must call super (passing add_child: false to cancel adding child to children)
+      def post_initialize_child(child, add_child: true)
+        children << child if add_child
+      end
+      
+      def children
+        @children ||= []
+      end
+    end
+  end
+end

data/lib/glimmer/libui/path_proxy.rb

@@ -20,6 +20,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/area_proxy'
+require 'glimmer/libui/parent'
+require 'glimmer/libui/transformable'
 
 module Glimmer
   module LibUI
@@ -27,6 +30,9 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class PathProxy < ControlProxy
+      include Parent
+      prepend Transformable
+    
       # TODO support mode without parent proxy
       def initialize(keyword, parent, args, &block)
         @keyword = keyword
@@ -37,23 +43,14 @@ module Glimmer
         post_add_content if @block.nil?
       end
     
-      def post_initialize_child(child)
-        super
-        children << child
-      end
-      
       def post_add_content
         super
-        if @parent_proxy.nil? && area_draw_params
-          draw(area_draw_params)
+        if @parent_proxy.nil? && AreaProxy.current_area_draw_params
+          draw(AreaProxy.current_area_draw_params)
           destroy
         end
       end
       
-      def children
-        @children ||= []
-      end
-      
       def draw(area_draw_params)
         build_control
         children.dup.each {|child| child.draw(area_draw_params)}
@@ -128,16 +125,15 @@ module Glimmer
         @draw_stroke_params
       end
       
-      # returns area_draw_params if built inside on_draw listener (not needed if declared outside)
-      def area_draw_params
-        @args[0] if @parent_proxy.nil?
-      end
-    
       def destroy
-        @parent_proxy.children.delete(self) unless @parent_proxy.nil?
+        @parent_proxy&.children&.delete(self)
         ControlProxy.control_proxies.delete(self)
       end
       
+      def redraw
+        @parent_proxy&.queue_redraw_all
+      end
+      
       private
       
       def build_control
@@ -159,6 +155,7 @@ module Glimmer
         else
           draw_brush.Type = 0
         end
+        draw_brush_args = draw_brush_args.merge(Glimmer::LibUI.hex_to_rgb(draw_brush_args[:color])) if draw_brush_args[:color]
         draw_brush.R = (draw_brush_args[:r] || draw_brush_args[:red]).to_f / 255.0
         draw_brush.G = (draw_brush_args[:g] || draw_brush_args[:green]).to_f / 255.0
         draw_brush.B = (draw_brush_args[:b] || draw_brush_args[:blue]).to_f / 255.0

data/lib/glimmer/libui/shape.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/parent'
+
 module Glimmer
   module LibUI
     # Represents LibUI lightweight shape objects nested under path (e.g. line, rectangle, arc, bezier)
@@ -61,6 +63,8 @@ module Glimmer
         end
       end
       
+      include Parent
+      
       attr_reader :parent, :args, :keyword, :block
       
       def initialize(keyword, parent, args, &block)
@@ -77,20 +81,15 @@ module Glimmer
         @parent&.post_initialize_child(self)
       end
       
-      # Subclasses may override to perform post initialization work on an added child (normally must call super)
-      def post_initialize_child(child)
-        children << child
-      end
-      
-      def children
-        @children ||= []
-      end
-      
       # Subclasses must override to perform draw work and call super afterwards to ensure calling destroy when semi-declarative in an on_draw method
       def draw(area_draw_params)
         destroy if area_proxy.nil?
       end
       
+      def redraw
+        area_proxy&.queue_redraw_all
+      end
+      
       def destroy
         @parent.children.delete(self)
       end