glimmer-dsl-libui 0.0.7 → 0.0.11

data/examples/basic_entry.rb

@@ -4,10 +4,10 @@ require 'glimmer-dsl-libui'
 
 include Glimmer
 
-window('Basic Entry', 300, 50, 1) { |w|
+window('Basic Entry', 300, 50) { |w|
   horizontal_box {
     e = entry {
-      # stretchy 1 # Smart default option for appending to horizontal_box
+      # stretchy true # Smart default option for appending to horizontal_box
     
       on_changed do
         puts e.text
@@ -16,7 +16,7 @@ window('Basic Entry', 300, 50, 1) { |w|
     }
     
     button('Button') {
-      stretchy 0
+      stretchy false
       
       on_clicked do
         text = e.text

data/examples/basic_window.rb

@@ -4,7 +4,7 @@ require 'glimmer-dsl-libui'
 
 include Glimmer
 
-window('hello world', 300, 200, 1) {
+window('hello world', 300, 200, true) {
   on_closing do
     puts 'Bye Bye'
   end

data/examples/basic_window2.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window { # first 3 args can be set via properties with 4th arg has_menubar=true by default
+  title 'hello world'
+  content_size 300, 200
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/examples/color_button.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('color button', 230) {
+  color_button { |cb|
+    on_changed do
+      rgba = cb.color
+      p rgba
+    end
+  }
+}.show

data/examples/control_gallery.rb

@@ -32,7 +32,7 @@ menu('Edit') {
   check_menu_item('Checkable Item_')
   separator_menu_item
   menu_item('Disabled Item_') {
-    enabled 0
+    enabled false
   }
 }
 
@@ -42,8 +42,8 @@ menu('Help') {
   about_menu_item # Can optionally contain an on_clicked listener
 }
 
-MAIN_WINDOW = window('Control Gallery', 600, 500, 1) {
-  margined 1
+MAIN_WINDOW = window('Control Gallery', 600, 500) {
+  margined true
   
   on_closing do
     puts 'Bye Bye'
@@ -54,7 +54,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500, 1) {
       group('Basic Controls') {
         vertical_box {
           button('Button') {
-            stretchy 0
+            stretchy false
 
             on_clicked do
               msg_box(MAIN_WINDOW, 'Information', 'You clicked the button')
@@ -62,38 +62,38 @@ MAIN_WINDOW = window('Control Gallery', 600, 500, 1) {
           }
 
           checkbox('Checkbox') {
-            stretchy 0
+            stretchy false
 
             on_toggled do |c|
-              checked = c.checked == 1
+              checked = c.checked?
               MAIN_WINDOW.title = "Checkbox is #{checked}"
               c.text = "I am the checkbox (#{checked})"
             end
           }
 
-          label('Label') { stretchy 0 }
+          label('Label') { stretchy false }
 
-          horizontal_separator { stretchy 0 }
+          horizontal_separator { stretchy false }
 
-          date_picker { stretchy 0 }
+          date_picker { stretchy false }
 
-          time_picker { stretchy 0 }
+          time_picker { stretchy false }
 
-          date_time_picker { stretchy 0 }
+          date_time_picker { stretchy false }
 
-          font_button { stretchy 0 }
+          font_button { stretchy false }
 
-          color_button { stretchy 0 }
+          color_button { stretchy false }
         }
       }
 
       vertical_box {
         group('Numbers') {
-          stretchy 0
+          stretchy false
 
           vertical_box {
             spinbox(0, 100) {
-              stretchy 0
+              stretchy false
               value 42
 
               on_changed do |s|
@@ -102,7 +102,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500, 1) {
             }
 
             slider(0, 100) {
-              stretchy 0
+              stretchy false
 
               on_changed do |s|
                 v = s.value
@@ -111,16 +111,16 @@ MAIN_WINDOW = window('Control Gallery', 600, 500, 1) {
               end
             }
 
-            @progress_bar = progress_bar { stretchy 0 }
+            @progress_bar = progress_bar { stretchy false }
           }
         }
 
         group('Lists') {
-          stretchy 0
+          stretchy false
 
           vertical_box {
             combobox {
-              stretchy 0
+              stretchy false
               items 'combobox Item 1', 'combobox Item 2', 'combobox Item 3' # also accepts a single array argument
 
               on_selected do |c|
@@ -129,7 +129,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500, 1) {
             }
 
             editable_combobox {
-              stretchy 0
+              stretchy false
               items 'Editable Item 1', 'Editable Item 2', 'Editable Item 3' # also accepts a single array argument
             }
 

data/examples/font_button.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('hello world', 300, 200) {
+  font_button { |fb|
+    on_changed do
+      font_descriptor = fb.font
+      p font_descriptor
+    end
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/examples/meta_example.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require 'facets'
+
+class MetaExample
+  include Glimmer
+  
+  def examples
+    if @examples.nil?
+      example_files = Dir.glob(File.join(File.expand_path('.', __dir__), '**', '*.rb'))
+      example_file_names = example_files.map { |f| File.basename(f, '.rb') }
+      example_file_names = example_file_names.reject { |f| f == 'meta_example' }
+      @examples = example_file_names.map { |f| f.underscore.titlecase }
+    end
+    @examples
+  end
+  
+  def file_path_for(example)
+    File.join(File.expand_path('.', __dir__), "#{example.underscore}.rb")
+  end
+  
+  def launch
+    window('Meta-Example', 700, 500) { |w|
+      margined true
+      
+      horizontal_box {
+        vertical_box {
+          @rbs = radio_buttons {
+            stretchy false
+            items examples
+            selected 0
+            
+            on_selected do
+              @nwme.text = File.read(file_path_for(@examples[@rbs.selected]))
+            end
+          }
+          button('Launch') {
+            stretchy false
+            
+            on_clicked do
+              system "ruby -r puts_debuggerer -r #{File.expand_path('../lib/glimmer-dsl-libui', __dir__)} #{file_path_for(@examples[@rbs.selected])}"
+            end
+          }
+        }
+        vertical_box {
+          @nwme = non_wrapping_multiline_entry {
+            read_only true
+            text File.read(file_path_for(@examples[@rbs.selected]))
+          }
+        }
+      }
+    }.show
+  end
+end
+
+MetaExample.new.launch

data/examples/midi_player.rb

@@ -56,10 +56,10 @@ class TinyMidiPlayer
         end
       }
     }
-    @main_window = window('Tiny Midi Player', 200, 50, 1) {
+    @main_window = window('Tiny Midi Player', 200, 50) {
       horizontal_box {
         vertical_box {
-          stretchy 0
+          stretchy false
           
           button('▶') {
             on_clicked do

data/examples/simple_notepad.rb

@@ -4,7 +4,7 @@ require 'glimmer-dsl-libui'
 
 include Glimmer
 
-window('Notepad', 500, 300, 1) {
+window('Notepad', 500, 300) {
   on_closing do
     puts 'Bye Bye'
   end

data/lib/glimmer/libui/box.rb

@@ -19,25 +19,37 @@
 # 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
     module Box
       APPEND_PROPERTIES = %w[stretchy]
       
       def post_initialize_child(child)
-        child.stretchy = 1 if child.stretchy.nil?
-        ::LibUI.box_append(@libui, child.libui, child.stretchy)
+        child.stretchy = true if child.stretchy.nil?
+        ::LibUI.box_append(@libui, child.libui, ControlProxy.boolean_to_integer(child.stretchy))
+        children << child
       end
       
       def libui_api_keyword
         'box'
       end
       
+      def children
+        @children ||= []
+      end
+      
+      def destroy_child(child)
+        ::LibUI.send("box_delete", @libui, children.index(child))
+        ControlProxy.all_control_proxies.delete(child)
+      end
+      
       private
       
       def build_control
         super.tap do
-          self.padded = 1
+          self.padded = true
         end
       end
     end

data/lib/glimmer/libui/color_button_proxy.rb

@@ -0,0 +1,64 @@
+# 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 color button objects
+    #
+    # 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')]
+      end
+      
+      def red
+        color[0]
+      end
+      
+      def green
+        color[1]
+      end
+      
+      def blue
+        color[2]
+      end
+      
+      def alpha
+        color[3]
+      end
+      
+      def destroy
+        Fiddle.free @red unless @red.nil?
+        Fiddle.free @green unless @green.nil?
+        Fiddle.free @blue unless @blue.nil?
+        Fiddle.free @alpha unless @alpha.nil?
+        super
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy.rb

@@ -52,10 +52,37 @@ module Glimmer
         end
         
         def main_window_proxy
-          all_control_proxies.find {|c| c.is_a?(WindowProxy)}
+          all_control_proxies.find {|c| c.is_a?(Glimmer::LibUI::WindowProxy)}
+        end
+        
+        def integer_to_boolean(int)
+          int.nil? ? nil : int == 1
+        end
+        
+        def boolean_to_integer(bool)
+          bool.nil? ? nil : (bool ? 1 : 0)
+        end
+        
+        def menu_proxies
+          all_control_proxies.select {|c| c.keyword == 'menu' }
         end
       end
       
+      BOOLEAN_PROPERTIES = %w[
+        padded
+        checked
+        enabled toplevel visible
+        read_only
+        margined
+        borderless fullscreen
+        stretchy
+      ]
+      
+      STRING_PROPERTIES = %w[
+        text
+        title
+      ]
+      
       # libui returns the contained LibUI object
       attr_reader :parent_proxy, :libui, :args, :keyword
       
@@ -64,11 +91,8 @@ module Glimmer
         @parent_proxy = parent
         @args = args
         @block = block
-        @enabled = 1
+        @enabled = true
         build_control
-        if @parent_proxy.class.constants.include?(:APPEND_PROPERTIES)
-          @parent_proxy.class::APPEND_PROPERTIES
-        end
         post_add_content if @block.nil?
       end
       
@@ -106,21 +130,28 @@ module Glimmer
       
       def respond_to?(method_name, *args, &block)
         respond_to_libui?(method_name, *args, &block) ||
-          (append_properties.include?(method_name.to_s) || append_properties.include?(method_name.to_s.sub(/=$/, ''))) ||
+          (
+            append_properties.include?(method_name.to_s) ||
+            (append_properties.include?(method_name.to_s.sub(/\?$/, '')) && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, ''))) ||
+            append_properties.include?(method_name.to_s.sub(/=$/, ''))
+          ) ||
           super(method_name, true)
       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}_set_#{method_name}") ||
+          (::LibUI.respond_to?("#{libui_api_keyword}_#{method_name.to_s.sub(/\?$/, '')}") && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, '')) ) ||
           ::LibUI.respond_to?("#{libui_api_keyword}_set_#{method_name.to_s.sub(/=$/, '')}")
       end
       
       def method_missing(method_name, *args, &block)
         if respond_to_libui?(method_name, *args, &block)
           send_to_libui(method_name, *args, &block)
-        elsif (append_properties.include?(method_name.to_s) || append_properties.include?(method_name.to_s.sub(/=$/, '')))
+        elsif append_properties.include?(method_name.to_s) ||
+            append_properties.include?(method_name.to_s.sub(/(=|\?)$/, ''))
           append_property(method_name, *args)
         else
           super
@@ -128,17 +159,25 @@ module Glimmer
       end
       
       def send_to_libui(method_name, *args, &block)
-        if ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name}") && args.empty?
-          ::LibUI.send("#{libui_api_keyword}_#{method_name}", @libui, *args)
-        elsif ::LibUI.respond_to?("#{libui_api_keyword}_set_#{method_name}") && !args.empty?
-          ::LibUI.send("#{libui_api_keyword}_set_#{method_name}", @libui, *args)
+        if ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name.to_s.sub(/\?$/, '')}") && args.empty?
+          property = method_name.to_s.sub(/\?$/, '')
+          value = ::LibUI.send("#{libui_api_keyword}_#{property}", @libui, *args)
+          handle_string_property(property, handle_boolean_property(property, value))
         elsif ::LibUI.respond_to?("#{libui_api_keyword}_set_#{method_name.to_s.sub(/=$/, '')}") && !args.empty?
-          ::LibUI.send("#{libui_api_keyword}_set_#{method_name.to_s.sub(/=$/, '')}", @libui, *args)
-        elsif ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name}") && method_name.start_with?('set_') && !args.empty?
-          ::LibUI.send("#{libui_api_keyword}_#{method_name}", @libui, *args)
+          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))
+          ::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)
-        elsif ::LibUI.respond_to?("control_#{method_name}")
+        elsif ::LibUI.respond_to?("control_#{method_name.to_s.sub(/\?$/, '')}") && args.empty?
+          property = method_name.to_s.sub(/\?$/, '')
+          value = ::LibUI.send("control_#{property}", @libui, *args)
+          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))
+          ::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)
         end
       end
@@ -148,11 +187,13 @@ module Glimmer
       end
       
       def append_property(property, value = nil)
-        property = property.to_s.sub(/=$/, '')
+        property = property.to_s.sub(/(=|\?)$/, '')
         @append_property_hash ||= {}
         if value.nil?
-          @append_property_hash[property]
+          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))
           @append_property_hash[property] = value
         end
       end
@@ -161,11 +202,28 @@ module Glimmer
         @keyword
       end
       
+      def destroy
+        if parent_proxy.nil?
+          default_destroy
+        else
+          parent_proxy.destroy_child(self)
+        end
+      end
+      
+      def destroy_child(child)
+        child.default_destroy
+      end
+      
+      def default_destroy
+        send_to_libui('destroy')
+        ControlProxy.all_control_proxies.delete(self)
+      end
+            
       def enabled(value = nil)
         if value.nil?
           @enabled
         elsif value != @enabled
-          if value == 1
+          if value == 1 || value
             send_to_libui('enable')
           else
             send_to_libui('disable')
@@ -181,7 +239,7 @@ module Glimmer
         if value.nil?
           current_value
         elsif value != current_value
-          if value == 1
+          if value == 1 || value
             send_to_libui('show')
           else
             send_to_libui('hide')
@@ -192,11 +250,6 @@ module Glimmer
       alias set_visible visible
       alias visible= visible
       
-      def destroy
-        send_to_libui('destroy')
-        self.class.all_control_proxies.delete(self)
-      end
-      
       private
       
       def build_control
@@ -207,6 +260,14 @@ module Glimmer
           ::LibUI.send(@keyword, *@args)
         end
       end
+      
+      def handle_boolean_property(property, value)
+        BOOLEAN_PROPERTIES.include?(property) ? ControlProxy.integer_to_boolean(value) : value
+      end
+      
+      def handle_string_property(property, value)
+        STRING_PROPERTIES.include?(property) ? value.to_s : value
+      end
     end
   end
 end

data/lib/glimmer/libui/date_picker_proxy.rb

@@ -0,0 +1,32 @@
+# 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/date_time_picker_proxy'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI date picker objects
+    #
+    # Follows the Proxy Design Pattern
+    class DatePickerProxy < DateTimePickerProxy
+    end
+  end
+end

data/lib/glimmer/libui/date_time_picker_proxy.rb

@@ -0,0 +1,35 @@
+# 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 date time picker objects
+    #
+    # Follows the Proxy Design Pattern
+    class DateTimePickerProxy < ControlProxy
+      def libui_api_keyword
+        'date_time_picker'
+      end
+    end
+  end
+end