glimmer-dsl-libui 0.1.5 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.9

data/examples/area_gallery.rb

@@ -38,13 +38,61 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc(200, 200, 90, 0, 360, false)
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/area_gallery2.rb

@@ -92,7 +92,7 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc {
@@ -105,7 +105,55 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/area_gallery3.rb

@@ -39,14 +39,62 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc(200, 200, 90, 0, 360, false)
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/area_gallery4.rb

@@ -93,7 +93,7 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc {
@@ -106,8 +106,56 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/basic_button.rb

@@ -4,10 +4,10 @@ require 'glimmer-dsl-libui'
 
 include Glimmer
 
-window('hello world', 300, 200) { |w|
+window('hello world', 300, 200) {
   button('Button') {
     on_clicked do
-      msg_box(w, 'Information', 'You clicked the button')
+      msg_box('Information', 'You clicked the button')
     end
   }
   

data/examples/basic_entry.rb

@@ -4,7 +4,7 @@ require 'glimmer-dsl-libui'
 
 include Glimmer
 
-window('Basic Entry', 300, 50) { |w|
+window('Basic Entry', 300, 50) {
   horizontal_box {
     e = entry {
       # stretchy true # Smart default option for appending to horizontal_box
@@ -20,7 +20,7 @@ window('Basic Entry', 300, 50) { |w|
       
       on_clicked do
         text = e.text
-        msg_box(w, 'You entered', text)
+        msg_box('You entered', text)
       end
     }
   }

data/examples/basic_transform.rb

@@ -14,7 +14,7 @@ window('Basic Transform', 350, 350) {
         square(0, 0, 100)
         
         fill r: [255 - n*5, 0].max, g: [n*5, 255].min, b: 0, a: 0.5
-        stroke color: 0, thickness: 2
+        stroke :black, thickness: 2
         transform {
           skew 0.15, 0.15
           translate 50, 50

data/examples/control_gallery.rb

@@ -7,14 +7,14 @@ include Glimmer
 menu('File') {
   menu_item('Open') {
     on_clicked do
-      file = open_file(MAIN_WINDOW)
+      file = open_file
       puts file unless file.nil?
     end
   }
 
   menu_item('Save') {
     on_clicked do
-      file = save_file(MAIN_WINDOW)
+      file = save_file
       puts file unless file.nil?
     end
   }
@@ -57,7 +57,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
             stretchy false
 
             on_clicked do
-              msg_box(MAIN_WINDOW, 'Information', 'You clicked the button')
+              msg_box('Information', 'You clicked the button')
             end
           }
 

data/examples/form.rb

@@ -4,7 +4,7 @@ require 'glimmer-dsl-libui'
 
 include Glimmer
 
-window('Form') { |w|
+window('Form') {
   margined true
   
   vertical_box {
@@ -20,7 +20,7 @@ window('Form') { |w|
     
     button('Display Name') {
       on_clicked do
-        msg_box(w, 'Name', "#{@first_name_entry.text} #{@last_name_entry.text}")
+        msg_box('Name', "#{@first_name_entry.text} #{@last_name_entry.text}")
       end
     }
   }

data/examples/histogram.rb

@@ -9,31 +9,29 @@ Y_OFF_TOP    = 20
 X_OFF_RIGHT  = 20
 Y_OFF_BOTTOM = 20
 POINT_RADIUS = 5
-
 COLOR_BLUE   = 0x1E90FF
 
+@datapoints   = 10.times.map {Random.new.rand(90)}
+
 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)
+def point_locations(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
+  @datapoints.each_with_index.map do |value, i|
+    val = 100 - value
+    [xincr * i, yincr * val]
   end
-
-  data
 end
 
-def graph_path(datapoints, width, height, should_extend, &block)
-  locations = point_locations(datapoints, width, height)
+# method-based custom control representing a graph path
+def graph_path(width, height, should_extend, &block)
+  locations = point_locations(width, height)
   path {
     first_location = locations[0] # x and y
     figure(first_location[0], first_location[1]) {
@@ -48,7 +46,7 @@ def graph_path(datapoints, width, height, should_extend, &block)
       end
     }
     
-    # now transform the coordinate space so (0, 0) is the top-left corner of the graph
+    # apply a transform to the coordinate space for this path so (0, 0) is the top-left corner of the graph
     transform {
       translate X_OFF_LEFT, Y_OFF_TOP
     }
@@ -64,12 +62,13 @@ window('histogram example', 640, 480) {
     vertical_box {
       stretchy false
       
-      @datapoints = 10.times.map do
-        spinbox(0, 100) { |datapoint|
+      10.times do |i|
+        spinbox(0, 100) { |sb|
           stretchy false
-          value Random.new.rand(90)
+          value @datapoints[i]
           
           on_changed do
+            @datapoints[i] = sb.value
             @area.queue_redraw_all
           end
         }
@@ -90,7 +89,7 @@ window('histogram example', 640, 480) {
         path {
           rectangle(0, 0, area_draw_params[:area_width], area_draw_params[:area_height])
           
-          fill color: 0xFFFFFF
+          fill 0xFFFFFF
         }
         
         graph_width, graph_height = *graph_size(area_draw_params[:area_width], area_draw_params[:area_height])
@@ -101,16 +100,16 @@ window('histogram example', 640, 480) {
             line(X_OFF_LEFT + graph_width, Y_OFF_TOP + graph_height)
           }
           
-          stroke color: 0x000000, thickness: 2, miter_limit: 10
+          stroke 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) {
+        graph_path(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) {
+        graph_path(graph_width, graph_height, false) {
           stroke @color_button.color.merge(thickness: 2, miter_limit: 10)
         }
       end

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

@@ -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/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/shape_expression.rb

@@ -31,7 +31,7 @@ module Glimmer
         def can_interpret?(parent, keyword, *args, &block)
           Glimmer::LibUI::Shape.exists?(keyword) and
             (
-              parent.is_a?(Glimmer::LibUI::PathProxy) or
+              parent.is_a?(Glimmer::LibUI::ControlProxy::PathProxy) or
                 parent.is_a?(Glimmer::LibUI::Shape)
             )
         end
@@ -50,7 +50,5 @@ module Glimmer
   end
 end
 
-# TODO Consider moving all shapes underneath Shape namespace
-require 'glimmer/libui/path_proxy'
+require 'glimmer/libui/control_proxy/path_proxy'
 require 'glimmer/libui/shape'
-Dir[File.expand_path('../../libui/*.rb', __dir__)].each {|f| require f}