glimmer-dsl-libui 0.2.3 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.7

data/examples/basic_draw_text.rb

@@ -6,14 +6,14 @@ require 'glimmer-dsl-libui'
 class BasicDrawText
   include Glimmer
   
-  def alternating_color_string(&block)
-    @index ||= 0
+  def alternating_color_string(initial: false, &block)
+    @index = 0 if initial
     @index += 1
     string {
       if @index.odd?
-        color r: 0.5, g: 0, b: 0.25, a: 0.7
+        color r: 128, g: 0, b: 64, a: 0.7
       else
-        color r: 0, g: 0.5, b: 0, a: 0.7
+        color r: 0, g: 128, b: 0, a: 0.7
       end
       
       block.call + "\n\n"
@@ -25,40 +25,38 @@ class BasicDrawText
       margined true
       
       area {
-        on_draw do |area_draw_params|
-          text(0, 0, area_draw_params[:area_width]) {
-            align 0
-            default_font family: 'Georgia', size: 13, weight: 500, italic: 0, stretch: 4
-              
-            alternating_color_string {
-              '  At last Ygramul sensed that something was coming toward ' \
-              'her. With the speed of lightning, she turned about, confronting ' \
-              'Atreyu with an enormous steel-blue face. Her single eye had a ' \
-              'vertical pupil, which stared at Atreyu with inconceivable malignancy. '
-            }
-            alternating_color_string {
-              '  A cry of fear escaped Bastian. '
-            }
-            alternating_color_string {
-              '  A cry of terror passed through the ravine and echoed from ' \
-              'side to side. Ygramul turned her eye to left and right, to see if ' \
-              'someone else had arrived, for that sound could not have been ' \
-              'made by the boy who stood there as though paralyzed with ' \
-              'horror. '
-            }
-            alternating_color_string {
-              '  Could she have heard my cry? Bastion wondered in alarm. ' \
-              "But that's not possible. "
-            }
-            alternating_color_string {
-              '  And then Atreyu heard Ygramuls voice. It was very high ' \
-              'and slightly hoarse, not at all the right kind of voice for that ' \
-              'enormous face. Her lips did not move as she spoke. It was the ' \
-              'buzzing of a great swarm of hornets that shaped itself into ' \
-              'words. '
-            }
+        text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+          # align :left # default alignment
+          default_font family: 'Georgia', size: 13, weight: :medium, italic: :normal, stretch: :normal
+            
+          alternating_color_string(initial: true) {
+            '  At last Ygramul sensed that something was coming toward ' \
+            'her. With the speed of lightning, she turned about, confronting ' \
+            'Atreyu with an enormous steel-blue face. Her single eye had a ' \
+            'vertical pupil, which stared at Atreyu with inconceivable malignancy. '
           }
-        end
+          alternating_color_string {
+            '  A cry of fear escaped Bastian. '
+          }
+          alternating_color_string {
+            '  A cry of terror passed through the ravine and echoed from ' \
+            'side to side. Ygramul turned her eye to left and right, to see if ' \
+            'someone else had arrived, for that sound could not have been ' \
+            'made by the boy who stood there as though paralyzed with ' \
+            'horror. '
+          }
+          alternating_color_string {
+            '  Could she have heard my cry? Bastion wondered in alarm. ' \
+            "But that's not possible. "
+          }
+          alternating_color_string {
+            '  And then Atreyu heard Ygramuls voice. It was very high ' \
+            'and slightly hoarse, not at all the right kind of voice for that ' \
+            'enormous face. Her lips did not move as she spoke. It was the ' \
+            'buzzing of a great swarm of hornets that shaped itself into ' \
+            'words. '
+          }
+        }
       }
     }.show
   end

data/examples/basic_draw_text2.rb

@@ -0,0 +1,68 @@
+
+require 'glimmer-dsl-libui'
+
+# Michael Ende (1929-1995)
+# The Neverending Story is a fantasy novel by German writer Michael Ende,
+# The English version, translated by Ralph Manheim, was published in 1983.
+class BasicDrawText
+  include Glimmer
+  
+  def alternating_color_string(initial: false, &block)
+    @index = 0 if initial
+    @index += 1
+    string {
+      if @index.odd?
+        color r: 128, g: 0, b: 64, a: 0.7
+      else
+        color r: 0, g: 128, b: 0, a: 0.7
+      end
+      
+      block.call + "\n\n"
+    }
+  end
+  
+  def launch
+    window('Michael Ende (1929-1995) The Neverending Story', 600, 400) {
+      margined true
+      
+      area {
+        on_draw do |area_draw_params|
+          text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+            # align :left # default alignment
+            default_font family: 'Georgia', size: 13, weight: :medium, italic: :normal, stretch: :normal
+              
+            alternating_color_string(initial: true) {
+              '  At last Ygramul sensed that something was coming toward ' \
+              'her. With the speed of lightning, she turned about, confronting ' \
+              'Atreyu with an enormous steel-blue face. Her single eye had a ' \
+              'vertical pupil, which stared at Atreyu with inconceivable malignancy. '
+            }
+            alternating_color_string {
+              '  A cry of fear escaped Bastian. '
+            }
+            alternating_color_string {
+              '  A cry of terror passed through the ravine and echoed from ' \
+              'side to side. Ygramul turned her eye to left and right, to see if ' \
+              'someone else had arrived, for that sound could not have been ' \
+              'made by the boy who stood there as though paralyzed with ' \
+              'horror. '
+            }
+            alternating_color_string {
+              '  Could she have heard my cry? Bastion wondered in alarm. ' \
+              "But that's not possible. "
+            }
+            alternating_color_string {
+              '  And then Atreyu heard Ygramuls voice. It was very high ' \
+              'and slightly hoarse, not at all the right kind of voice for that ' \
+              'enormous face. Her lips did not move as she spoke. It was the ' \
+              'buzzing of a great swarm of hornets that shaped itself into ' \
+              'words. '
+            }
+          }
+        end
+      }
+    }.show
+  end
+end
+
+BasicDrawText.new.launch

data/examples/basic_table_color.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/custom_draw_text.rb

@@ -0,0 +1,106 @@
+require 'glimmer-dsl-libui'
+
+# Michael Ende (1929-1995)
+# The Neverending Story is a fantasy novel by German writer Michael Ende,
+# The English version, translated by Ralph Manheim, was published in 1983.
+class CustomDrawText
+  include Glimmer
+  
+  def launch
+    window('Michael Ende (1929-1995) The Neverending Story', 600, 500) {
+      margined true
+      
+      vertical_box {
+        form {
+          stretchy false
+          
+          font_button { |fb|
+            label 'Font'
+            
+            on_changed do
+              @string.font = fb.font
+            end
+          }
+          color_button { |cb|
+            label 'Color'
+            
+            on_changed do
+              @string.color = cb.color
+            end
+          }
+          color_button { |cb|
+            label 'Background'
+            
+            on_changed do
+              @string.background = cb.color
+            end
+          }
+          combobox { |c|
+            label 'Underline'
+            items Glimmer::LibUI.enum_symbols(:underline).map(&:to_s).map {|word| word.split('_').map(&:capitalize).join(' ')}
+            selected 'None'
+            
+            on_selected do
+              @string.underline = c.selected_item.underscore
+            end
+          }
+          combobox { |c|
+            label 'Underline Built-In Color'
+            items Glimmer::LibUI.enum_symbols(:underline_color).map(&:to_s).map(&:capitalize)
+            selected 'Custom'
+            
+            on_selected do
+              @underline_custom_color_button.enabled = c.selected_item == 'Custom'
+              if c.selected_item == 'Custom'
+                @string.underline_color = @underline_custom_color_button.color
+              else
+                @string.underline_color = c.selected_item.underscore
+                @underline_custom_color_button.color = :black
+              end
+            end
+          }
+          @underline_custom_color_button = color_button {
+            label 'Underline Custom Color'
+            
+            on_changed do
+              @string.underline_color = @underline_custom_color_button.color
+            end
+          }
+        }
+        
+        area {
+          text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+            # align :left # default alignment
+            
+            @string = string {
+              '  At last Ygramul sensed that something was coming toward ' \
+              'her. With the speed of lightning, she turned about, confronting ' \
+              'Atreyu with an enormous steel-blue face. Her single eye had a ' \
+              'vertical pupil, which stared at Atreyu with inconceivable malignancy. ' \
+              "\n\n" \
+              '  A cry of fear escaped Bastian. ' \
+              "\n\n" \
+              '  A cry of terror passed through the ravine and echoed from ' \
+              'side to side. Ygramul turned her eye to left and right, to see if ' \
+              'someone else had arrived, for that sound could not have been ' \
+              'made by the boy who stood there as though paralyzed with ' \
+              'horror. ' \
+              "\n\n" \
+              '  Could she have heard my cry? Bastion wondered in alarm. ' \
+              "But that's not possible. " \
+              "\n\n" \
+              '  And then Atreyu heard Ygramuls voice. It was very high ' \
+              'and slightly hoarse, not at all the right kind of voice for that ' \
+              'enormous face. Her lips did not move as she spoke. It was the ' \
+              'buzzing of a great swarm of hornets that shaped itself into ' \
+              'words. ' \
+              "\n\n"
+            }
+          }
+        }
+      }
+    }.show
+  end
+end
+
+CustomDrawText.new.launch

data/examples/custom_draw_text2.rb

@@ -0,0 +1,120 @@
+require 'glimmer-dsl-libui'
+
+# Michael Ende (1929-1995)
+# The Neverending Story is a fantasy novel by German writer Michael Ende,
+# The English version, translated by Ralph Manheim, was published in 1983.
+class CustomDrawText
+  include Glimmer
+  
+  def launch
+    window('Michael Ende (1929-1995) The Neverending Story', 600, 500) {
+      margined true
+      
+      vertical_box {
+        form {
+          stretchy false
+          
+          font_button { |fb|
+            label 'Font'
+            
+            on_changed do
+              @font = fb.font
+              @area.queue_redraw_all
+            end
+          }
+          color_button { |cb|
+            label 'Color'
+            
+            on_changed do
+              @color = cb.color
+              @area.queue_redraw_all
+            end
+          }
+          color_button { |cb|
+            label 'Background'
+            
+            on_changed do
+              @background = cb.color
+              @area.queue_redraw_all
+            end
+          }
+          combobox { |c|
+            label 'Underline'
+            items Glimmer::LibUI.enum_symbols(:underline).map(&:to_s).map {|word| word.split('_').map(&:capitalize).join(' ')}
+            selected 'None'
+            
+            on_selected do
+              @underline = c.selected_item.underscore
+              @area.queue_redraw_all
+            end
+          }
+          combobox { |c|
+            label 'Underline Built-In Color'
+            items Glimmer::LibUI.enum_symbols(:underline_color).map(&:to_s).map(&:capitalize)
+            selected 'Custom'
+            
+            on_selected do
+              @underline_custom_color_button.enabled = c.selected_item == 'Custom'
+              if c.selected_item == 'Custom'
+                @underline_color = @underline_custom_color_button.color
+              else
+                @underline_color = c.selected_item.underscore
+                @underline_custom_color_button.color = :black
+              end
+              @area.queue_redraw_all
+            end
+          }
+          @underline_custom_color_button = color_button {
+            label 'Underline Custom Color'
+            
+            on_changed do
+              @underline_color = @underline_custom_color_button.color
+              @area.queue_redraw_all
+            end
+          }
+        }
+        
+        @area = area {
+          on_draw do |area_draw_params|
+            text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+              # align :left # default alignment
+                
+              string {
+                font @font
+                color @color
+                background @background
+                underline @underline
+                underline_color @underline_color
+                
+                '  At last Ygramul sensed that something was coming toward ' \
+                'her. With the speed of lightning, she turned about, confronting ' \
+                'Atreyu with an enormous steel-blue face. Her single eye had a ' \
+                'vertical pupil, which stared at Atreyu with inconceivable malignancy. ' \
+                "\n\n" \
+                '  A cry of fear escaped Bastian. ' \
+                "\n\n" \
+                '  A cry of terror passed through the ravine and echoed from ' \
+                'side to side. Ygramul turned her eye to left and right, to see if ' \
+                'someone else had arrived, for that sound could not have been ' \
+                'made by the boy who stood there as though paralyzed with ' \
+                'horror. ' \
+                "\n\n" \
+                '  Could she have heard my cry? Bastion wondered in alarm. ' \
+                "But that's not possible. " \
+                "\n\n" \
+                '  And then Atreyu heard Ygramuls voice. It was very high ' \
+                'and slightly hoarse, not at all the right kind of voice for that ' \
+                'enormous face. Her lips did not move as she spoke. It was the ' \
+                'buzzing of a great swarm of hornets that shaped itself into ' \
+                'words. ' \
+                "\n\n"
+              }
+            }
+          end
+        }
+      }
+    }.show
+  end
+end
+
+CustomDrawText.new.launch

data/lib/glimmer/libui/attributed_string.rb

@@ -40,24 +40,70 @@ module Glimmer
       end
       
       def font(value = nil)
-#         UI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, start, start + @string.size)
+        if value.nil?
+          @font
+        else
+          @font = value
+          redraw
+        end
       end
+      alias font= font
+      alias set_font font
       
       def color(value = nil)
         if value.nil?
           @color
         else
           @color = Glimmer::LibUI.interpret_color(value)
+          redraw
         end
       end
+      alias color= color
+      alias set_color color
       
       def background(value = nil)
-#         UI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, start, start + @string.size)
+        if value.nil?
+          @background
+        else
+          @background = Glimmer::LibUI.interpret_color(value)
+          redraw
+        end
       end
+      alias background= background
+      alias set_background background
       
       def underline(value = nil)
-#         UI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, start, start + @string.size)
+        if value.nil?
+          @underline
+        else
+          @underline = value
+          redraw
+        end
+      end
+      alias underline= underline
+      alias set_underline underline
+      
+      def underline_color(value = nil)
+        if value.nil?
+          @underline_color
+        else
+          @underline_color = value
+          redraw
+        end
       end
+      alias underline_color= underline_color
+      alias set_underline_color underline_color
+      
+      def open_type_features(value = nil)
+        if value.nil?
+          @open_type_features
+        else
+          @open_type_features = value
+          redraw
+        end
+      end
+      alias open_type_features= open_type_features
+      alias set_open_type_features open_type_features
       
       def post_add_content
         block_result = block&.call
@@ -65,16 +111,56 @@ module Glimmer
         @parent_proxy&.post_initialize_child(self)
       end
       
+      def post_initialize_child(child)
+        self.open_type_features = child if child.is_a?(Glimmer::LibUI::ControlProxy::OpenTypeFeaturesProxy)
+      end
+      
       def draw(area_draw_params)
         @start = ::LibUI.attributed_string_len(@parent_proxy.attributed_string)
         ::LibUI.attributed_string_append_unattributed(@parent_proxy.attributed_string, @string)
         unless color.nil?
-          color_attribute = ::LibUI.new_color_attribute(@color[:r], @color[:g], @color[:b], @color[:a] || 1.0)
+          color_attribute = ::LibUI.new_color_attribute(@color[:r].to_f / 255.0, @color[:g].to_f / 255.0, @color[:b].to_f / 255.0, @color[:a] || 1.0)
           ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, @start, @start + @string.size)
         end
+        unless background.nil?
+          background_attribute = ::LibUI.new_background_attribute(@background[:r].to_f / 255.0, @background[:g].to_f / 255.0, @background[:b].to_f / 255.0, @background[:a] || 1.0)
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, background_attribute, @start, @start + @string.size)
+        end
+        unless underline.nil?
+          underline_attribute = ::LibUI.new_underline_attribute(Glimmer::LibUI.enum_symbol_to_value(:underline, @underline))
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, underline_attribute, @start, @start + @string.size)
+        end
+        unless underline_color.nil?
+          if Glimmer::LibUI.enum_symbols(:underline_color).include?(underline_color.to_s.to_sym) && underline_color.to_s.to_sym != :custom
+            underline_color_attribute = ::LibUI.new_underline_color_attribute(Glimmer::LibUI.enum_symbol_to_value(:underline_color, @underline_color), 0, 0, 0, 0)
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, underline_color_attribute, @start, @start + @string.size)
+          else
+            the_color = Glimmer::LibUI.interpret_color(@underline_color)
+            underline_color_attribute = ::LibUI.new_underline_color_attribute(0, the_color[:r].to_f / 255.0, the_color[:g].to_f / 255.0, the_color[:b].to_f / 255.0, the_color[:a] || 1.0)
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, underline_color_attribute, @start, @start + @string.size)
+          end
+        end
+        unless font.nil?
+          family_attribute = ::LibUI.new_family_attribute(font[:family])
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, family_attribute, @start, @start + @string.size)
+          size_attribute = ::LibUI.new_size_attribute(font[:size])
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, size_attribute, @start, @start + @string.size)
+          weight_attribute = ::LibUI.new_weight_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_weight, font[:weight]))
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, weight_attribute, @start, @start + @string.size)
+          italic_attribute = ::LibUI.new_italic_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_italic, font[:italic]))
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, italic_attribute, @start, @start + @string.size)
+          stretch_attribute = ::LibUI.new_stretch_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_stretch, font[:stretch]))
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, stretch_attribute, @start, @start + @string.size)
+        end
+        unless open_type_features.nil?
+          open_type_features_attribute = ::LibUI.new_features_attribute(open_type_features.libui)
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, open_type_features_attribute, @start, @start + @string.size)
+        end
+        destroy if area_proxy.nil?
       end
       
       def destroy
+        open_type_features.destroy unless open_type_features.nil?
         @parent_proxy&.children&.delete(self)
       end
       

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

@@ -29,7 +29,6 @@ module Glimmer
       # Follows the Proxy Design Pattern
       class ColorButtonProxy < ControlProxy
         def color(value = nil)
-          # TODO support hex color value
           if value.nil?
             @red ||= Fiddle::Pointer.malloc(8) # double
             @green ||= Fiddle::Pointer.malloc(8) # double
@@ -52,6 +51,8 @@ module Glimmer
             ::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
+        alias color= color
+        alias set_color color
         
         def red(value = nil)
           if value.nil?

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

@@ -0,0 +1,38 @@
+# 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/column'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      module Column
+        # Proxy for LibUI background color column objects
+        #
+        # Follows the Proxy Design Pattern
+        class BackgroundColorColumnProxy < ControlProxy
+          include Column
+        end
+      end
+    end
+  end
+end