glimmer-dsl-libui 0.1.2 → 0.1.6

data/examples/meta_example.rb

@@ -6,59 +6,110 @@ require 'facets'
 class MetaExample
   include Glimmer
   
+  def initialize
+    @selected_example_index = 0
+  end
+  
   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' }
+      example_file_names = example_file_names.reject { |f| f == 'meta_example' || f.match(/\d$/) }
       @examples = example_file_names.map { |f| f.underscore.titlecase }
     end
     @examples
   end
   
+  def examples_with_versions
+    examples.map do |example|
+      version_count_for(example) > 1 ? "#{example} (#{version_count_for(example)} versions)" : example
+    end
+  end
+  
   def file_path_for(example)
     File.join(File.expand_path('.', __dir__), "#{example.underscore}.rb")
   end
   
+  def version_count_for(example)
+    Dir.glob(File.join(File.expand_path('.', __dir__), "#{example.underscore}*.rb")).select {|file| file.match(/\d\.rb$/)}.count + 1
+  end
+  
   def glimmer_dsl_libui_file
     File.expand_path('../lib/glimmer-dsl-libui', __dir__)
   end
   
+  def selected_example
+    examples[@selected_example_index]
+  end
+  
   def launch
-    window('Meta-Example', 700, 500) { |w|
+    window('Meta-Example', 700, 500) {
       margined true
       
       horizontal_box {
         vertical_box {
+          stretchy false
+          
           @rbs = radio_buttons {
             stretchy false
-            items examples
-            selected 0
+            items examples_with_versions
+            selected @selected_example_index
             
             on_selected do
-              @nwme.text = File.read(file_path_for(@examples[@rbs.selected]))
+              @selected_example_index = @rbs.selected
+              example = selected_example
+              @nwme.text = File.read(file_path_for(example))
+              @sb.value = 1
             end
           }
-          button('Launch') {
+          
+          horizontal_box {
+            label('Version') {
+              stretchy false
+            }
+            
+            @sb = spinbox(1, 100) {
+              value 1
+              
+              on_changed do
+                example = selected_example
+                if @sb.value > version_count_for(example)
+                  @sb.value -= 1
+                else
+                  version_number = @sb.value == 1 ? '' : @sb.value
+                  example = "#{selected_example}#{version_number}"
+                  @nwme.text = File.read(file_path_for(example))
+                end
+              end
+            }
+          }
+          
+          horizontal_box {
             stretchy false
             
-            on_clicked do
-              begin
-                meta_example_file = File.join(Dir.home, '.meta_example.rb')
-                File.write(meta_example_file, @nwme.text)
-                result = `ruby -r #{glimmer_dsl_libui_file} #{meta_example_file} 2>&1`
-                msg_box(w, 'Error Running Example', result) if result.include?('error')
-              rescue => e
-                puts 'Unable to write code changes! Running original example...'
-                system "ruby -r #{glimmer_dsl_libui_file} #{file_path_for(@examples[@rbs.selected])}"
+            button('Launch') {
+              on_clicked do
+                begin
+                  meta_example_file = File.join(Dir.home, '.meta_example.rb')
+                  File.write(meta_example_file, @nwme.text)
+                  result = `ruby -r #{glimmer_dsl_libui_file} #{meta_example_file} 2>&1`
+                  msg_box('Error Running Example', result) if result.include?('error')
+                rescue => e
+                  puts 'Unable to write code changes! Running original example...'
+                  system "ruby -r #{glimmer_dsl_libui_file} #{file_path_for(selected_example)}"
+                end
               end
-            end
+            }
+            button('Reset') {
+              on_clicked do
+                @nwme.text = File.read(file_path_for(selected_example))
+              end
+            }
           }
         }
-        vertical_box {
-          @nwme = non_wrapping_multiline_entry {
-            text File.read(file_path_for(@examples[@rbs.selected]))
-          }
+        
+        @nwme = non_wrapping_multiline_entry {
+          text File.read(file_path_for(selected_example))
         }
       }
     }.show

data/examples/midi_player.rb

@@ -40,23 +40,22 @@ class TinyMidiPlayer
     end
   end
 
-  def show_version(main_window)
-    msg_box(main_window,
-               'Tiny Midi Player',
-               "Written in Ruby\n" \
-               "https://github.com/kojix2/libui\n" \
-               "Version #{VERSION}")
+  def show_version
+    msg_box('Tiny Midi Player',
+              "Written in Ruby\n" \
+                "https://github.com/kojix2/libui\n" \
+                "Version #{VERSION}")
   end
 
   def create_gui
     menu('Help') { |m|
       menu_item('Version') {
         on_clicked do
-          show_version(@main_window)
+          show_version
         end
       }
     }
-    @main_window = window('Tiny Midi Player', 200, 50) {
+    window('Tiny Midi Player', 200, 50) {
       horizontal_box {
         vertical_box {
           stretchy false
@@ -82,8 +81,7 @@ class TinyMidiPlayer
           end
         }
       }
-    }
-    @main_window.show
+    }.show
   end
 end
 

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

@@ -29,7 +29,7 @@ module Glimmer
         include ParentExpression
   
         def can_interpret?(parent, keyword, *args, &block)
-          Glimmer::LibUI::ControlProxy.control_exists?(keyword)
+          Glimmer::LibUI::ControlProxy.exists?(keyword)
         end
   
         def interpret(parent, keyword, *args, &block)
@@ -46,6 +46,4 @@ module Glimmer
   end
 end
 
-# TODO Consider moving all controls underneath Control namespace
 require 'glimmer/libui/control_proxy'
-Dir[File.expand_path('../../libui/*.rb', __dir__)].each {|f| require f}

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

@@ -39,6 +39,7 @@ module Glimmer
           listener
           property
           control
+          shape
         ]
       )
     end

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

@@ -19,12 +19,16 @@
 # 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 DSL
     module Libui
       module FileExpression
         def interpret(parent, keyword, *args, &block)
-          file_pointer = ::LibUI.send(self.class.name.underscore.split('::').last.sub(/_expression$/, ''), args.first.libui)
+          window = args.empty? ? Glimmer::LibUI::ControlProxy.main_window_proxy : args.first
+          window = window.libui if window.respond_to?(:libui)
+          file_pointer = ::LibUI.send(self.class.name.underscore.split('::').last.sub(/_expression$/, ''), window)
           file_pointer.to_s unless file_pointer.null?
         end
       end

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

@@ -21,13 +21,17 @@
 
 require 'glimmer/dsl/expression'
 require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/shape'
 
 module Glimmer
   module DSL
     module Libui
       class PropertyExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
-          parent.is_a?(Glimmer::LibUI::ControlProxy) and
+          (
+            parent.is_a?(Glimmer::LibUI::ControlProxy) or
+              parent.is_a?(Glimmer::LibUI::Shape)
+          ) and
             block.nil? and
             parent.respond_to?(keyword, *args)
         end

data/lib/glimmer/{libui/box.rb → dsl/libui/shape_expression.rb}

@@ -19,39 +19,36 @@
 # 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/dsl/expression'
+require 'glimmer/dsl/parent_expression'
 
 module Glimmer
-  module LibUI
-    module Box
-      APPEND_PROPERTIES = %w[stretchy]
-      
-      def post_initialize_child(child)
-        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.control_proxies.delete(child)
-      end
-      
-      private
-      
-      def build_control
-        super.tap do
-          self.padded = true
+  module DSL
+    module Libui
+      class ShapeExpression < Expression
+        include ParentExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          Glimmer::LibUI::Shape.exists?(keyword) and
+            (
+              parent.is_a?(Glimmer::LibUI::ControlProxy::PathProxy) or
+                parent.is_a?(Glimmer::LibUI::Shape)
+            )
         end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::LibUI::Shape.create(keyword, parent, args, &block)
+        end
+        
+        def add_content(parent, keyword, *args, &block)
+          super
+          parent.post_add_content
+        end
+        
       end
     end
   end
 end
+
+require 'glimmer/libui/control_proxy/path_proxy'
+require 'glimmer/libui/shape'

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

@@ -20,14 +20,14 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/static_expression'
-require 'glimmer/libui/tab_item_proxy'
+require 'glimmer/libui/control_proxy/tab_item_proxy'
 
 module Glimmer
   module DSL
     module Libui
       class TabItemExpression < StaticExpression
         def interpret(parent, keyword, *args, &block)
-          Glimmer::LibUI::TabItemProxy.create(keyword, parent, args, &block)
+          Glimmer::LibUI::ControlProxy::TabItemProxy.create(keyword, parent, args, &block)
         end
       end
     end

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

@@ -0,0 +1,117 @@
+# 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/fiddle_consumer'
+require 'glimmer/libui/parent'
+require 'glimmer/libui/control_proxy/transformable'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI area objects
+      #
+      # 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_add_content
+          super
+          install_listeners
+        end
+        
+        def on_draw(&block)
+          @on_draw_procs ||= []
+          if block.nil?
+            @on_draw_procs
+          else
+            @on_draw_procs << block
+            block
+          end
+        end
+        
+        def can_handle_listener?(listener_name)
+          listener_name == 'on_draw' || super
+        end
+        
+        def handle_listener(listener_name, &listener)
+          case listener_name
+          when 'on_draw'
+            on_draw(&listener)
+          else
+            super
+          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
+          @area_handler = ::LibUI::FFI::AreaHandler.malloc
+          @libui    = ::LibUI.new_area(@area_handler)
+        end
+        
+        def install_listeners
+          @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)
+            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]) {}
+          @area_handler.DragBroken   = fiddle_closure_block_caller(0, [0]) {}
+          @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [0]) {}
+        end
+        
+        def area_draw_params_hash(area_draw_params)
+          {
+            context: area_draw_params.Context,
+            area_width: area_draw_params.AreaWidth,
+            area_height: area_draw_params.AreaHeight,
+            clip_x: area_draw_params.ClipX,
+            clip_y: area_draw_params.ClipY,
+            clip_width: area_draw_params.ClipWidth,
+            clip_height: area_draw_params.ClipHeight,
+          }
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/{menu_item_proxy.rb → control_proxy/box/horizontal_box_proxy.rb}

@@ -20,21 +20,18 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/control_proxy/box'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI menu item objects
-    #
-    # Follows the Proxy Design Pattern
-    class MenuItemProxy < ControlProxy
-      def libui_api_keyword
-        'menu_item'
-      end
-    
-      private
-      
-      def build_control
-        @libui = @parent_proxy.append_item(*@args)
+    class ControlProxy
+      module Box
+        # Proxy for LibUI horizontal box objects
+        #
+        # Follows the Proxy Design Pattern
+        class HorizontalBoxProxy < ControlProxy
+          include Box
+        end
       end
     end
   end

data/lib/glimmer/libui/{vertical_box_proxy.rb → control_proxy/box/vertical_box_proxy.rb}

@@ -20,15 +20,19 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
-require 'glimmer/libui/box'
+require 'glimmer/libui/control_proxy/box'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI vertical box objects
-    #
-    # Follows the Proxy Design Pattern
-    class VerticalBoxProxy < ControlProxy
-      include Box
+    class ControlProxy
+      module Box
+        # Proxy for LibUI vertical box objects
+        #
+        # Follows the Proxy Design Pattern
+        class VerticalBoxProxy < ControlProxy
+          include Box
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,61 @@
+# 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
+    class ControlProxy
+      module Box
+        APPEND_PROPERTIES = %w[stretchy]
+        
+        def post_initialize_child(child)
+          child.stretchy = true if child.stretchy.nil?
+          ::LibUI.box_append(@libui, child.libui, Glimmer::LibUI.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.control_proxies.delete(child)
+        end
+        
+        private
+        
+        def build_control
+          super.tap do
+            self.padded = true
+          end
+        end
+      end
+    end
+  end
+end
+
+Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}

data/lib/glimmer/libui/{button_proxy.rb → control_proxy/button_proxy.rb}

@@ -23,18 +23,20 @@ require 'glimmer/libui/control_proxy'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI button objects
-    #
-    # Follows the Proxy Design Pattern
-    class ButtonProxy < ControlProxy
-      DEFAULT_TEXT = ''
-      
-      private
-      
-      def build_control
-        construction_args = @args.dup
-        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
-        @libui = ControlProxy.new_control(@keyword, construction_args)
+    class ControlProxy
+      # Proxy for LibUI button objects
+      #
+      # Follows the Proxy Design Pattern
+      class ButtonProxy < ControlProxy
+        DEFAULT_TEXT = ''
+        
+        private
+        
+        def build_control
+          construction_args = @args.dup
+          construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+          @libui = ControlProxy.new_control(@keyword, construction_args)
+        end
       end
     end
   end

data/lib/glimmer/libui/{checkbox_proxy.rb → control_proxy/checkbox_proxy.rb}

@@ -23,18 +23,20 @@ require 'glimmer/libui/control_proxy'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI checkbox objects
-    #
-    # Follows the Proxy Design Pattern
-    class CheckboxProxy < ControlProxy
-      DEFAULT_TEXT = ''
-      
-      private
-      
-      def build_control
-        construction_args = @args.dup
-        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
-        @libui = ControlProxy.new_control(@keyword, construction_args)
+    class ControlProxy
+      # Proxy for LibUI checkbox objects
+      #
+      # Follows the Proxy Design Pattern
+      class CheckboxProxy < ControlProxy
+        DEFAULT_TEXT = ''
+        
+        private
+        
+        def build_control
+          construction_args = @args.dup
+          construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+          @libui = ControlProxy.new_control(@keyword, construction_args)
+        end
       end
     end
   end