glimmer-dsl-libui 0.4.5 → 0.4.9

data/examples/color_button2.rb

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

data/examples/date_time_picker.rb

@@ -2,19 +2,24 @@
 
 require 'glimmer-dsl-libui'
 
-include Glimmer
-
-window('Date Time Pickers', 300, 200) {
-  vertical_box {
-    date_time_picker { |dtp|
-      on_changed do
-        time = dtp.time
-        p time
-      end
-    }
-  }
+class DateTimePicker
+  include Glimmer
+  
+  attr_accessor :picked_time
   
-  on_closing do
-    puts 'Bye Bye'
+  def launch
+    window('Date Time Pickers', 300, 200) {
+      vertical_box {
+        date_time_picker {
+          time <=> [self, :picked_time, after_write: ->(time) { p time }]
+        }
+      }
+      
+      on_closing do
+        puts 'Bye Bye'
+      end
+    }.show
   end
-}.show
+end
+
+DateTimePicker.new.launch

data/examples/date_time_picker2.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Date Time Pickers', 300, 200) {
+  vertical_box {
+    date_time_picker { |dtp|
+      on_changed do
+        time = dtp.time
+        p time
+      end
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/examples/font_button.rb

@@ -2,17 +2,22 @@
 
 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
-  }
+class FontButton
+  include Glimmer
+  
+  attr_accessor :font_descriptor
   
-  on_closing do
-    puts 'Bye Bye'
+  def launch
+    window('hello world', 300, 200) {
+      font_button {
+        font <=> [self, :font_descriptor, after_write: -> { p font_descriptor }]
+      }
+      
+      on_closing do
+        puts 'Bye Bye'
+      end
+    }.show
   end
-}.show
+end
+
+FontButton.new.launch

data/examples/font_button2.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/histogram.rb

@@ -71,12 +71,7 @@ class Histogram
           
           color_button { |cb|
             stretchy false
-            color COLOR_BLUE
-            
-            on_changed do
-              @histogram_color = cb.color
-              @area.queue_redraw_all
-            end
+            color <=> [self, :histogram_color, after_write: -> { @area.queue_redraw_all }]
           }
         }
         

data/examples/meta_example.rb

@@ -24,18 +24,28 @@ class MetaExample
     @examples
   end
   
+  def basic_examples
+    examples.select {|example| example.start_with?('Basic') || ADDITIONAL_BASIC_EXAMPLES.include?(example) }
+  end
+  
+  def advanced_examples
+    examples - basic_examples
+  end
+  
   def examples_with_versions
-    examples.map do |example|
-      version_count_for(example) > 1 ? "#{example} (#{version_count_for(example)} versions)" : example
-    end
+    append_versions(examples)
   end
   
   def basic_examples_with_versions
-    examples_with_versions.select {|example| example.start_with?('Basic') || ADDITIONAL_BASIC_EXAMPLES.include?(example) }
+    append_versions(basic_examples)
   end
   
   def advanced_examples_with_versions
-    examples_with_versions - basic_examples_with_versions
+    append_versions(advanced_examples)
+  end
+  
+  def append_versions(examples)
+    examples.map { |example| version_count_for(example) > 1 ? "#{example} (#{version_count_for(example)} versions)" : example }
   end
   
   def file_path_for(example)
@@ -72,7 +82,7 @@ class MetaExample
   end
   
   def launch
-    window('Meta-Example', 700, 500) {
+    window('Meta-Example', 1000, 500) {
       margined true
       
       horizontal_box {
@@ -107,6 +117,7 @@ class MetaExample
                 @advanced_example_radio_buttons = radio_buttons {
                   stretchy false
                   items advanced_examples_with_versions
+                  selected -1
                   
                   on_selected do
                     @selected_example_index = examples_with_versions.index(advanced_examples_with_versions[@advanced_example_radio_buttons.selected])

data/examples/midi_player.rb

@@ -6,6 +6,8 @@ class TinyMidiPlayer
   include Glimmer
   
   VERSION = '0.0.1'
+  
+  attr_accessor :selected_file
 
   def initialize
     @pid = nil
@@ -68,13 +70,10 @@ class TinyMidiPlayer
           }
         }
 
-        combobox { |c|
+        combobox {
           items @midi_files.map { |path| File.basename(path) }
-          
-          on_selected do
-            @selected_file = @midi_files[c.selected]
-            play_midi if @th&.alive?
-          end
+          # data-bind selected item (String) to self.selected_file with on-read/on-write converters and after_write operation
+          selected_item <=> [self, :selected_file, on_read: ->(f) {File.basename(f.to_s)}, on_write: ->(f) {File.join(@music_directory, f)}, after_write: -> { play_midi if @th&.alive? }]
         }
       }
     }.show

data/examples/midi_player2.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+class TinyMidiPlayer
+  include Glimmer
+  
+  VERSION = '0.0.1'
+  
+  attr_accessor :selected_file
+
+  def initialize
+    @pid = nil
+    @music_directory = File.expand_path('../sounds', __dir__)
+    @midi_files      = Dir.glob(File.join(@music_directory, '**/*.mid'))
+                          .sort_by { |path| File.basename(path) }
+    at_exit { stop_midi }
+    create_gui
+  end
+
+  def stop_midi
+    if @pid
+      Process.kill(:SIGKILL, @pid) if @th.alive?
+      @pid = nil
+    end
+  end
+
+  def play_midi
+    stop_midi
+    if @pid.nil? && @selected_file
+      begin
+        @pid = spawn "timidity #{@selected_file}"
+        @th = Process.detach @pid
+      rescue Errno::ENOENT
+        warn 'Timidty++ not found. Please install Timidity++.'
+        warn 'https://sourceforge.net/projects/timidity/'
+      end
+    end
+  end
+
+  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') {
+      menu_item('Version') {
+        on_clicked do
+          show_version
+        end
+      }
+    }
+    window('Tiny Midi Player', 200, 50) {
+      horizontal_box {
+        vertical_box {
+          stretchy false
+          
+          button('▶') {
+            on_clicked do
+              play_midi
+            end
+          }
+          button('■') {
+            on_clicked do
+              stop_midi
+            end
+          }
+        }
+
+        combobox { |c|
+          items @midi_files.map { |path| File.basename(path) }
+          # data-bind selected index (Integer) to self.selected_file with on-read/on-write converters and after_write operation
+          selected <=> [self, :selected_file, on_read: ->(f) {@midi_files.index(f)}, on_write: ->(i) {@midi_files[i]}, after_write: -> { play_midi if @th&.alive? }]
+        }
+      }
+    }.show
+  end
+end
+
+TinyMidiPlayer.new

data/examples/midi_player3.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+class TinyMidiPlayer
+  include Glimmer
+  
+  VERSION = '0.0.1'
+
+  def initialize
+    @pid = nil
+    @music_directory = File.expand_path('../sounds', __dir__)
+    @midi_files      = Dir.glob(File.join(@music_directory, '**/*.mid'))
+                          .sort_by { |path| File.basename(path) }
+    at_exit { stop_midi }
+    create_gui
+  end
+
+  def stop_midi
+    if @pid
+      Process.kill(:SIGKILL, @pid) if @th.alive?
+      @pid = nil
+    end
+  end
+
+  def play_midi
+    stop_midi
+    if @pid.nil? && @selected_file
+      begin
+        @pid = spawn "timidity #{@selected_file}"
+        @th = Process.detach @pid
+      rescue Errno::ENOENT
+        warn 'Timidty++ not found. Please install Timidity++.'
+        warn 'https://sourceforge.net/projects/timidity/'
+      end
+    end
+  end
+
+  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') {
+      menu_item('Version') {
+        on_clicked do
+          show_version
+        end
+      }
+    }
+    window('Tiny Midi Player', 200, 50) {
+      horizontal_box {
+        vertical_box {
+          stretchy false
+          
+          button('▶') {
+            on_clicked do
+              play_midi
+            end
+          }
+          button('■') {
+            on_clicked do
+              stop_midi
+            end
+          }
+        }
+
+        combobox { |c|
+          items @midi_files.map { |path| File.basename(path) }
+          
+          on_selected do
+            @selected_file = @midi_files[c.selected]
+            play_midi if @th&.alive?
+          end
+        }
+      }
+    }.show
+  end
+end
+
+TinyMidiPlayer.new

data/examples/snake.rb

@@ -12,6 +12,7 @@ class Snake
     @game = Model::Game.new
     @grid = Presenter::Grid.new(@game)
     @game.start
+    @keypress_queue = []
     create_gui
     register_observers
   end
@@ -31,7 +32,23 @@ class Snake
     end
     
     Glimmer::LibUI.timer(SNAKE_MOVE_DELAY) do
-      @game.snake.move unless @game.over?
+      unless @game.over?
+        process_queued_keypress
+        @game.snake.move
+      end
+    end
+  end
+  
+  def process_queued_keypress
+    # key press queue ensures one turn per snake move to avoid a double-turn resulting in instant death (due to snake illogically going back against itself)
+    key = @keypress_queue.shift
+    case [@game.snake.head.orientation, key]
+    in [:north, :right] | [:east, :down] | [:south, :left] | [:west, :up]
+      @game.snake.turn_right
+    in [:north, :left] | [:west, :down] | [:south, :right] | [:east, :up]
+      @game.snake.turn_left
+    else
+      # No Op
     end
   end
   
@@ -56,15 +73,7 @@ class Snake
                 }
                 
                 on_key_up do |area_key_event|
-                  orientation_and_key = [@game.snake.head.orientation, area_key_event[:ext_key]]
-                  case orientation_and_key
-                  in [:north, :right] | [:east, :down] | [:south, :left] | [:west, :up]
-                    @game.snake.turn_right
-                  in [:north, :left] | [:west, :down] | [:south, :right] | [:east, :up]
-                    @game.snake.turn_left
-                  else
-                    # No Op
-                  end
+                  @keypress_queue << area_key_event[:ext_key]
                 end
               }
             end

data/examples/tetris.rb

@@ -109,22 +109,23 @@ class Tetris
     menu('Game') {
       @pause_menu_item = check_menu_item('Pause') {
         enabled false
-        
-        on_clicked do
-          @game.paused = @pause_menu_item.checked?
-        end
+        checked <=> [@game, :paused]
       }
+      
       menu_item('Restart') {
         on_clicked do
           @game.restart!
         end
       }
+      
       separator_menu_item
+      
       menu_item('Exit') {
         on_clicked do
           exit(0)
         end
       }
+      
       quit_menu_item if OS.mac?
     }
     
@@ -134,6 +135,7 @@ class Tetris
           show_high_scores
         end
       }
+      
       menu_item('Clear High Scores') {
         on_clicked {
           @game.clear_high_scores!
@@ -142,22 +144,16 @@ class Tetris
     }
 
     menu('Options') {
-      radio_menu_item('Instant Down on Up Arrow') {
-        on_clicked do
-          @game.instant_down_on_up = true
-        end
+      radio_menu_item('Instant Down on Up Arrow') { |r|
+        checked <=> [@game, :instant_down_on_up]
       }
-      radio_menu_item('Rotate Right on Up Arrow') {
-        on_clicked do
-          @game.rotate_right_on_up = true
-        end
+      
+      radio_menu_item('Rotate Right on Up Arrow') { |r|
+        checked <=> [@game, :rotate_right_on_up]
       }
-      radio_menu_item('Rotate Left on Up Arrow') {
-        checked true
-
-        on_clicked do
-          @game.rotate_left_on_up = true
-        end
+      
+      radio_menu_item('Rotate Left on Up Arrow') { |r|
+        checked <=> [@game, :rotate_left_on_up]
       }
     }
 
@@ -169,6 +165,7 @@ class Tetris
           end
         }
       end
+      
       menu_item('About') {
         on_clicked do
           show_about_dialog

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

@@ -29,6 +29,10 @@ module Glimmer
       # Follows the Proxy Design Pattern
       class CheckboxProxy < ControlProxy
         DEFAULT_TEXT = ''
+      
+        def data_bind_write(property, model_binding)
+          handle_listener('on_toggled') { model_binding.call(checked) } if property == 'checked'
+        end
         
         private
         

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

@@ -113,6 +113,10 @@ module Glimmer
           Fiddle.free @alpha unless @alpha.nil?
           super
         end
+        
+        def data_bind_write(property, model_binding)
+          handle_listener('on_changed') { model_binding.call(color) } if property == 'color'
+        end
       end
     end
   end

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

@@ -54,8 +54,23 @@ module Glimmer
         alias set_items items
         alias items= items
         
-        def selected_item
-          items[selected]
+        def selected_item(value = nil)
+          if value.nil?
+            items[selected]
+          else
+            self.selected = items.index(value)
+          end
+        end
+        alias set_selected_item selected_item
+        alias selected_item= selected_item
+        
+        def data_bind_write(property, model_binding)
+          case property
+          when 'selected'
+            handle_listener('on_selected') { model_binding.call(selected) }
+          when 'selected_item'
+            handle_listener('on_selected') { model_binding.call(selected_item) }
+          end
         end
       end
     end

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

@@ -64,6 +64,10 @@ module Glimmer
           Fiddle.free @time unless @time.nil?
           super
         end
+        
+        def data_bind_write(property, model_binding)
+          handle_listener('on_changed') { model_binding.call(time) } if property == 'time'
+        end
       end
     end
   end

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

@@ -39,6 +39,10 @@ module Glimmer
         end
         alias set_items items
         alias items= items
+        
+        def data_bind_write(property, model_binding)
+          handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
+        end
       end
     end
   end

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

@@ -28,8 +28,7 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class EntryProxy < ControlProxy
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
         end
         

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

@@ -64,6 +64,14 @@ module Glimmer
           ::LibUI.free_font_button_font(@font_descriptor) unless @font_descriptor.nil?
           super
         end
+        
+        def data_bind_read(property, model_binding)
+          # No Op
+        end
+        
+        def data_bind_write(property, model_binding)
+          handle_listener('on_changed') { model_binding.call(font) } if property == 'font'
+        end
       end
     end
   end

data/lib/glimmer/libui/control_proxy/menu_item_proxy/check_menu_item_proxy.rb

@@ -29,6 +29,10 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckMenuItemProxy < MenuItemProxy
+          def data_bind_write(property, model_binding)
+            handle_listener('on_clicked') { model_binding.call(checked) } if property == 'checked'
+          end
+        
           private
           
           def build_control

data/lib/glimmer/libui/control_proxy/menu_item_proxy/radio_menu_item_proxy.rb

@@ -29,15 +29,23 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class RadioMenuItemProxy < MenuItemProxy
+          def initialize(keyword, parent, args, &block)
+            @last_checked = nil
+            super
+          end
+        
           def checked(value = nil)
-            if !value.nil?
-              if Glimmer::LibUI.integer_to_boolean(value) != checked?
-                super
+            if value.nil?
+              super()
+            else
+              super
+              if Glimmer::LibUI.integer_to_boolean(value, allow_nil: false) != Glimmer::LibUI.integer_to_boolean(@last_checked, allow_nil: false)
                 if Glimmer::LibUI.integer_to_boolean(value)
                   (@parent_proxy.children - [self]).select {|c| c.is_a?(MenuItemProxy)}.each do |menu_item|
                     menu_item.checked = false
                   end
                 end
+                @last_checked = checked
               end
             end
           end
@@ -48,7 +56,7 @@ module Glimmer
           def handle_listener(listener_name, &listener)
             if listener_name.to_s == 'on_clicked'
               radio_listener = Proc.new do
-                self.checked = true if !checked?
+                self.checked = true
                 listener.call(self)
               end
               super(listener_name, &radio_listener)
@@ -57,6 +65,10 @@ module Glimmer
             end
           end
         
+          def data_bind_write(property, model_binding)
+            handle_listener('on_clicked') { model_binding.call(checked) } if property == 'checked'
+          end
+        
           private
           
           def build_control

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

@@ -28,8 +28,7 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class MultilineEntryProxy < ControlProxy
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
         end