glimmer-dsl-libui 0.2.0 → 0.2.4

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

@@ -0,0 +1,172 @@
+# 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'
+require 'glimmer/libui/parent'
+require 'glimmer/libui/control_proxy/transformable'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI text objects
+      #
+      # Follows the Proxy Design Pattern
+      class TextProxy < ControlProxy
+        include Parent
+        prepend Transformable
+      
+        def initialize(keyword, parent, args, &block)
+          @keyword = keyword
+          @parent_proxy = parent
+          @args = args
+          @block = block
+          post_add_content if @block.nil?
+        end
+      
+        def post_add_content
+          super
+          if @parent_proxy.nil? && AreaProxy.current_area_draw_params
+            draw(AreaProxy.current_area_draw_params)
+            destroy
+          end
+        end
+        
+        def draw(area_draw_params)
+          reset_attributed_string
+          children.dup.each {|child| child.draw(area_draw_params)}
+          build_control
+          ::LibUI.draw_text(area_draw_params[:context], @libui, x, y)
+          ::LibUI.draw_free_text_layout(@libui)
+        end
+        
+        def destroy
+          @parent_proxy&.children&.delete(self)
+          ControlProxy.control_proxies.delete(self)
+        end
+        
+        def redraw
+          @parent_proxy&.queue_redraw_all
+        end
+        
+        def x(value = nil)
+          if value.nil?
+            @x ||= args[0] || 0
+          else
+            @x = value
+          end
+        end
+        alias x= x
+        alias set_x x
+        
+        def y(value = nil)
+          if value.nil?
+            @y ||= args[1] || 0
+          else
+            @y = value
+          end
+        end
+        alias y= y
+        alias set_y y
+        
+        def width(value = nil)
+          if value.nil?
+            @width ||= args[2] || (AreaProxy.current_area_draw_params && AreaProxy.current_area_draw_params[:area_width])
+          else
+            @width = value
+            redraw
+          end
+        end
+        alias width= width
+        alias set_width width
+        
+        def attributed_string
+          @attributed_string ||= reset_attributed_string
+        end
+        
+        def reset_attributed_string
+          @attributed_string = ::LibUI.new_attributed_string('')
+        end
+        
+        def default_font(value = nil)
+          if value.nil?
+            @default_font ||= {
+              family: 'Helvetica',
+              size: 12.0,
+              weight: :normal,
+              italic: :normal,
+              stretch: :normal,
+            }
+          else
+            @default_font = value
+            redraw
+          end
+        end
+        alias default_font= default_font
+        alias set_default_font default_font
+        
+        def default_font_descriptor
+          @default_font_descriptor ||= ::LibUI::FFI::FontDescriptor.malloc
+          @default_font_descriptor.Family = default_font[:family] || 'Helvetica'
+          @default_font_descriptor.Size = default_font[:size] || 12.0
+          @default_font_descriptor.Weight = Glimmer::LibUI.enum_symbol_to_value(:text_weight, default_font[:weight], default_symbol: :normal)
+          @default_font_descriptor.Italic = Glimmer::LibUI.enum_symbol_to_value(:text_italic, default_font[:italic], default_symbol: :normal)
+          @default_font_descriptor.Stretch = Glimmer::LibUI.enum_symbol_to_value(:text_stretch, default_font[:stretch], default_symbol: :normal)
+          @default_font_descriptor
+        end
+        
+        def align(value = nil)
+          if value.nil?
+            @align
+          else
+            @align = value
+            redraw
+          end
+        end
+        alias align= align
+        alias set_align align
+        
+        def draw_text_layout_params
+          @draw_text_layout_params ||= ::LibUI::FFI::DrawTextLayoutParams.malloc
+          @draw_text_layout_params.String = attributed_string
+          @draw_text_layout_params.DefaultFont = default_font_descriptor
+          @draw_text_layout_params.Width = width
+          @draw_text_layout_params.Align = Glimmer::LibUI.enum_symbol_to_value(:draw_text_align, align, default_symbol: :left)
+          @draw_text_layout_params
+        end
+        
+        private
+        
+        def build_control
+          @libui = ::LibUI.draw_new_text_layout(draw_text_layout_params)
+        end
+        
+        def init_draw_brush(draw_brush, draw_brush_args)
+          draw_brush.Type = Glimmer::LibUI.enum_symbol_to_value(:draw_brush_type, draw_brush_args[:type])
+          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
+          draw_brush.A = (draw_brush_args[:a] || draw_brush_args[:alpha])
+        end
+      end
+    end
+  end
+end

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

@@ -35,12 +35,6 @@ module Glimmer
         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
         

data/lib/glimmer/libui/control_proxy.rb

@@ -223,7 +223,13 @@ module Glimmer
         elsif ::LibUI.respond_to?("#{libui_api_keyword}_set_#{method_name.to_s.sub(/=$/, '')}") && !args.empty?
           property = method_name.to_s.sub(/=$/, '')
           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)
+          if property.to_s == 'checked'
+            current_value = Glimmer::LibUI.integer_to_boolean(::LibUI.send("#{libui_api_keyword}_checked", @libui))
+            new_value = Glimmer::LibUI.integer_to_boolean(args[0])
+            ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args) if new_value != current_value
+          else
+            ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args)
+          end
         elsif ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name}") && !args.empty?
           ::LibUI.send("#{libui_api_keyword}_#{method_name}", @libui, *args)
         elsif ::LibUI.respond_to?("control_#{method_name.to_s.sub(/\?$/, '')}") && args.empty?

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

@@ -29,11 +29,14 @@ module Glimmer
         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)
+          arc_args = @args.dup
+          arc_args[3] = Glimmer::LibUI.degrees_to_radians(arc_args[3])
+          arc_args[4] = Glimmer::LibUI.degrees_to_radians(arc_args[4])
+          arc_args[5] = Glimmer::LibUI.boolean_to_integer(arc_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)
+            ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *arc_args)
           else
-            ::LibUI.draw_path_arc_to(path_proxy.libui, *@args)
+            ::LibUI.draw_path_arc_to(path_proxy.libui, *arc_args)
           end
           super
         end

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

@@ -0,0 +1,50 @@
+# 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 Circle < Shape
+        parameters :x_center, :y_center, :radius
+        parameter_defaults 0, 0, 0
+                
+        def draw(area_draw_params)
+          arc_args = @args.dup
+          arc_args[3] = 0
+          arc_args[4] = Math::PI * 2.0
+          arc_args[5] = 0
+          if parent.is_a?(Figure) && parent.x.nil? && parent.y.nil?
+            ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *arc_args)
+          else
+            ::LibUI.draw_path_arc_to(path_proxy.libui, *arc_args)
+          end
+          super
+        end
+        
+        def include?(x, y)
+          (x - x_center)**2 + (y - y_center)**2 < radius**2
+        end
+      end
+    end
+  end
+end

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

@@ -32,6 +32,10 @@ module Glimmer
           ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args)
           super
         end
+        
+        def include?(x, y)
+          x.between?(self.x, self.x + width) && y.between?(self.y, self.y + height)
+        end
       end
     end
   end

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

@@ -32,6 +32,10 @@ module Glimmer
           ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args, length)
           super
         end
+        
+        def include?(x, y)
+          x.between?(self.x, self.x + length) && y.between?(self.y, self.y + length)
+        end
       end
     end
   end

data/lib/glimmer/libui.rb

@@ -19,15 +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/fiddle_consumer'
+
 module Glimmer
   module LibUI
     class << self
+      include Glimmer::FiddleConsumer
+      
       def integer_to_boolean(int, allow_nil: true)
-        int.nil? ? (allow_nil ? nil : false) : int == 1
+        int.nil? ? (allow_nil ? nil : false) : ((int.is_a?(TrueClass) || int.is_a?(FalseClass)) ? int : int == 1)
       end
       
       def boolean_to_integer(bool, allow_nil: true)
-        bool.nil? ? (allow_nil ? nil : 0) : (bool ? 1 : 0)
+        bool.nil? ? (allow_nil ? nil : 0) : (bool.is_a?(Integer) ? bool : (bool == true ? 1 : 0))
+      end
+      
+      def degrees_to_radians(degrees)
+        ((Math::PI * 2.0) / 360.00) * degrees.to_f
       end
       
       def interpret_color(value)
@@ -88,22 +96,81 @@ module Glimmer
         value
       end
       
-      # Returns ruby underscored symbols for enum values starting with enum name (camelcase, e.g. 'ext_key')
       def enum_symbols(enum_name)
+        enum_symbol_values(enum_name).keys
+      end
+      
+      # Returns ruby underscored symbols for enum values starting with enum name (camelcase, e.g. 'ext_key')
+      def enum_symbol_values(enum_name)
         enum_name = enum_name.to_s.underscore.to_sym
         @enum_symbols ||= {}
-        @enum_symbols[enum_name] ||= ::LibUI.constants.select { |c| c.to_s.start_with?(enum_name.to_s.camelcase(:upper)) }.map { |c| c.to_s.underscore.sub("#{enum_name}_", '').to_sym }
+        @enum_symbols[enum_name] ||= ::LibUI.constants.select { |c| c.to_s.start_with?(enum_name.to_s.camelcase(:upper)) }.map { |c| [c.to_s.underscore.sub("#{enum_name}_", '').to_sym, ::LibUI.const_get(c)] }.to_h
+      end
+      
+      def enum_value_to_symbol(enum_name, enum_value)
+        enum_symbol_values(enum_name).invert[enum_value]
       end
       
-      def enum_symbol_to_value(enum_name, enum_symbol, default_index: 0)
+      def enum_symbol_to_value(enum_name, enum_symbol, default_symbol: nil, default_index: 0)
         if enum_symbol.is_a?(Integer)
           enum_symbol
         elsif enum_symbols(enum_name).include?(enum_symbol.to_s.to_sym)
-          ::LibUI.const_get("#{enum_name}_#{enum_symbol}".camelcase(:upper))
+          enum_symbol_values(enum_name)[enum_symbol.to_s.to_sym]
+        elsif default_symbol
+          enum_symbol_to_value(enum_name, default_symbol)
         else
           enum_symbol_to_value(enum_name, enum_symbols(enum_name)[default_index])
         end
       end
+      
+      def x11_colors
+        Color::RGB.constants.reject {|c| c.to_s.upcase == c.to_s}.map(&:to_s).map(&:underscore).map(&:to_sym)
+      end
+      
+      # Queues block to execute at the nearest opportunity possible on the main GUI event loop
+      def queue_main(&block)
+        closure = fiddle_closure_block_caller(4, [0]) do
+          result = boolean_to_integer(block.call)
+          result = 1 if result.nil?
+          result
+        end
+        ::LibUI.queue_main(closure)
+        closure
+      end
+      
+      # Calls block on the main GUI event loop after time_in_seconds delay, repeating indefinitely by default
+      # If `repeat:` keyword arg is passed with an Integer value, it repeats for that number of times
+      # If `repeat:` keyword arg is passed with false or 0, then the block is only called once
+      # If block returns false at any point, the timer is stopped from further repetitions regardless of `repeat:` keyword arg value
+      # If block returns true at any point, the timer continues for another repetition regardless of `repeat:` keyword arg value
+      def timer(time_in_seconds = 0.1, repeat: true, &block)
+        closure = fiddle_closure_block_caller(4, [0]) do
+          result = boolean_to_integer(block.call)
+          repeat -= 1 if repeat.is_a?(Integer)
+          if result.nil?
+            if (repeat == true || (repeat.is_a?(Integer) && repeat > 0))
+              result = 1
+            else
+              result = 0
+            end
+          end
+          result
+        end
+        ::LibUI.timer(time_in_seconds * 1000.0, closure)
+        closure
+      end
+      
+      def respond_to?(method_name, *args)
+        super || ::LibUI.respond_to?(method_name, *args)
+      end
+      
+      def method_missing(method_name, *args, &block)
+        if ::LibUI.respond_to?(method_name, true)
+          ::LibUI.send(method_name, *args, &block)
+        else
+          super
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -215,6 +215,8 @@ files:
 - examples/basic_area.rb
 - examples/basic_area2.rb
 - examples/basic_button.rb
+- examples/basic_draw_text.rb
+- examples/basic_draw_text2.rb
 - examples/basic_entry.rb
 - examples/basic_table.rb
 - examples/basic_table_button.rb
@@ -227,7 +229,10 @@ files:
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
+- examples/color_the_circles.rb
 - examples/control_gallery.rb
+- examples/custom_draw_text.rb
+- examples/custom_draw_text2.rb
 - examples/date_time_picker.rb
 - examples/dynamic_area.rb
 - examples/dynamic_area2.rb
@@ -242,6 +247,7 @@ files:
 - examples/meta_example.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
+- examples/timer.rb
 - glimmer-dsl-libui.gemspec
 - lib/glimmer-dsl-libui.rb
 - lib/glimmer/dsl/libui/control_expression.rb
@@ -252,9 +258,11 @@ files:
 - lib/glimmer/dsl/libui/property_expression.rb
 - lib/glimmer/dsl/libui/save_file_expression.rb
 - lib/glimmer/dsl/libui/shape_expression.rb
+- lib/glimmer/dsl/libui/string_expression.rb
 - lib/glimmer/dsl/libui/tab_item_expression.rb
 - lib/glimmer/fiddle_consumer.rb
 - lib/glimmer/libui.rb
+- lib/glimmer/libui/attributed_string.rb
 - lib/glimmer/libui/control_proxy.rb
 - lib/glimmer/libui/control_proxy/area_proxy.rb
 - lib/glimmer/libui/control_proxy/area_proxy/scrolling_area_proxy.rb
@@ -296,6 +304,7 @@ files:
 - lib/glimmer/libui/control_proxy/menu_item_proxy/check_menu_item_proxy.rb
 - lib/glimmer/libui/control_proxy/menu_item_proxy/preferences_menu_item_proxy.rb
 - lib/glimmer/libui/control_proxy/menu_item_proxy/quit_menu_item_proxy.rb
+- lib/glimmer/libui/control_proxy/menu_item_proxy/radio_menu_item_proxy.rb
 - lib/glimmer/libui/control_proxy/menu_item_proxy/separator_menu_item_proxy.rb
 - lib/glimmer/libui/control_proxy/menu_proxy.rb
 - lib/glimmer/libui/control_proxy/message_box.rb
@@ -307,12 +316,14 @@ files:
 - lib/glimmer/libui/control_proxy/radio_buttons_proxy.rb
 - lib/glimmer/libui/control_proxy/tab_item_proxy.rb
 - lib/glimmer/libui/control_proxy/table_proxy.rb
+- lib/glimmer/libui/control_proxy/text_proxy.rb
 - lib/glimmer/libui/control_proxy/transformable.rb
 - lib/glimmer/libui/control_proxy/window_proxy.rb
 - lib/glimmer/libui/parent.rb
 - lib/glimmer/libui/shape.rb
 - lib/glimmer/libui/shape/arc.rb
 - lib/glimmer/libui/shape/bezier.rb
+- lib/glimmer/libui/shape/circle.rb
 - lib/glimmer/libui/shape/figure.rb
 - lib/glimmer/libui/shape/line.rb
 - lib/glimmer/libui/shape/rectangle.rb