glimmer-dsl-swt 4.18.3.0 → 4.18.3.1

data/lib/glimmer/swt/widget_proxy.rb

@@ -696,7 +696,7 @@ module Glimmer
         safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }
         listener = listener_class.new(listener_method => safe_block)
         @swt_widget.send(widget_add_listener_method, listener)
-        widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
+        WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
       end
 
       # Looks through SWT class add***Listener methods till it finds one for which

data/lib/glimmer/ui/custom_shell.rb

@@ -28,15 +28,11 @@ module Glimmer
       include Glimmer::UI::CustomWidget
       
       class << self
-        attr_reader :custom_shell
+        attr_reader :launched_custom_shell
         
-        def launch
-          @custom_shell = send(self.name.underscore.gsub('::', '__'))
-          @custom_shell.open
-        end
-        
-        def shutdown
-          @custom_shell.close
+        def launch(*args, &content)
+          @launched_custom_shell = send(keyword, *args, &content) if @launched_custom_shell.nil? || @launched_custom_shell.disposed?
+          @launched_custom_shell.open
         end
       end
       
@@ -45,7 +41,7 @@ module Glimmer
         @swt_widget.set_data('custom_shell', self)
         raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.swt_widget.is_a?(org.eclipse.swt.widgets.Shell)
       end
-
+      
       # Classes may override
       def open
         body_root.open
@@ -56,6 +52,7 @@ module Glimmer
         open
       end
 
+      # TODO consider using Forwardable instead
       def close
         body_root.close
       end
@@ -68,6 +65,10 @@ module Glimmer
         body_root.visible?
       end
 
+      def disposed?
+        swt_widget.is_disposed
+      end
+
       def center_within_display
         body_root.center_within_display
       end

data/lib/glimmer/ui/custom_widget.rb

@@ -77,7 +77,17 @@ module Glimmer
         def flyweight_custom_widget_classes
           @flyweight_custom_widget_classes ||= {}
         end
- 
+        
+        # Returns keyword to use for this custom widget
+        def keyword
+          self.name.underscore.gsub('::', '__')
+        end
+        
+        # Returns shortcut keyword to use for this custom widget (keyword minus namespace)
+        def shortcut_keyword
+          self.name.underscore.gsub('::', '__').split('__').last
+        end
+        
         def add_custom_widget_namespaces_for(klass)
           Glimmer::UI::CustomWidget.namespaces_for_class(klass).drop(1).each do |namespace|
             Glimmer::UI::CustomWidget.custom_widget_namespaces << namespace
@@ -138,8 +148,7 @@ module Glimmer
         end
 
         def before_body(&block)
-          @before_body_blocks ||= []
-          @before_body_blocks << block
+          @before_body_block = block
         end
 
         def body(&block)
@@ -147,8 +156,7 @@ module Glimmer
         end
 
         def after_body(&block)
-          @after_body_blocks ||= []
-          @after_body_blocks << block
+          @after_body_block = block
         end
       end
 
@@ -159,7 +167,7 @@ module Glimmer
         options ||= {}
         @options = self.class.options.merge(options)
         @content = Util::ProcTracker.new(content) if content
-        execute_hooks('before_body')
+        execute_hook('before_body')
         body_block = self.class.instance_variable_get("@body_block")
         raise Glimmer::Error, 'Invalid custom widget for having no body! Please define body block!' if body_block.nil?
         @body_root = instance_exec(&body_block)
@@ -169,7 +177,7 @@ module Glimmer
         @parent = parent
         @parent ||= @swt_widget.parent
         @parent_proxy ||= @parent&.get_data('proxy')
-        execute_hooks('after_body')
+        execute_hook('after_body')
       end
       
       # Subclasses may override to perform post initialization work on an added child
@@ -287,13 +295,13 @@ module Glimmer
       
       private
 
-      def execute_hooks(hook_name)
-        self.class.instance_variable_get("@#{hook_name}_blocks")&.each do |hook_block|
-          temp_method_name = "#{hook_name}_block_#{hook_block.hash.abs}_#{(Time.now.to_f * 1_000_000).to_i}"
-          singleton_class.define_method(temp_method_name, &hook_block)
-          send(temp_method_name)
-          singleton_class.send(:remove_method, temp_method_name)
-        end
+      def execute_hook(hook_name)
+        hook_block = self.class.instance_variable_get("@#{hook_name}_block")
+        return if hook_block.nil?
+        temp_method_name = "#{hook_name}_block_#{hook_block.hash.abs}_#{(Time.now.to_f * 1_000_000).to_i}"
+        singleton_class.define_method(temp_method_name, &hook_block)
+        send(temp_method_name)
+        singleton_class.send(:remove_method, temp_method_name)
       end
     end
   end

data/samples/elaborate/meta_sample.rb

@@ -25,6 +25,24 @@ require 'etc'
 class Sample
   include Glimmer::DataBinding::ObservableModel
   
+  class << self
+    def glimmer_directory
+      File.expand_path('../../..', __FILE__)
+    end
+  
+    def user_glimmer_directory
+      File.join(Etc.getpwuid.dir, '.glimmer-dsl-swt')
+    end
+    
+    def ensure_user_glimmer_directory
+      unless @ensured_glimmer_directory
+        FileUtils.rm_rf(user_glimmer_directory)
+        FileUtils.cp_r(glimmer_directory, user_glimmer_directory)
+        @ensured_glimmer_directory = true
+      end
+    end
+  end
+
   attr_accessor :sample_directory, :file, :selected
   
   def initialize(file, sample_directory: )
@@ -59,25 +77,35 @@ class Sample
     File.basename(file) != 'meta_sample.rb'
   end
   alias launchable editable
+    
+  def file_relative_path
+    file.sub(self.class.glimmer_directory, '')
+  end
+  
+  def user_file
+    File.join(self.class.user_glimmer_directory, file_relative_path)
+  end
+    
+  def user_file_parent_directory
+    File.dirname(user_file)
+  end
   
+  def directory
+    file.sub(/\.rb/, '')
+  end
+    
   def launch(modified_code)
-    parent_directory = File.basename(File.dirname(file))
-    modified_file_parent_directory = File.join(Etc.getpwuid.dir, '.glimmer', 'samples', parent_directory)
-    launch_file = modified_file = File.join(modified_file_parent_directory, File.basename(file))
+    launch_file = user_file
     begin
-      FileUtils.mkdir_p(modified_file_parent_directory)
-      FileUtils.cp_r(file, modified_file_parent_directory)
-      FileUtils.cp_r(file.sub(/\.rb/, ''), modified_file_parent_directory) if File.exist?(file.sub(/\.rb/, ''))
-      File.write(modified_file, modified_code)
+      FileUtils.cp_r(file, user_file_parent_directory)
+      FileUtils.cp_r(directory, user_file_parent_directory) if File.exist?(directory)
+      File.write(user_file, modified_code)
     rescue => e
       puts 'Error writing sample modifications. Launching original sample.'
       puts e.full_message
       launch_file = file # load original file if failed to write changes
     end
     load(launch_file)
-  ensure
-    FileUtils.rm_rf(modified_file)
-    FileUtils.rm_rf(modified_file.sub(/\.rb/, ''))
   end
 end
 
@@ -162,17 +190,18 @@ class SampleDirectory
 end
 
 class MetaSampleApplication
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def initialize
+  before_body {
+    Sample.ensure_user_glimmer_directory
     selected_sample_directory = SampleDirectory.sample_directories.first
     selected_sample = selected_sample_directory.samples.first
     selected_sample_directory.selected_sample_name = selected_sample.name
-  end
-  
-  def launch
     Display.app_name = 'Glimmer Meta-Sample'
-    shell {
+  }
+  
+  body {
+    shell(:fill_screen) {
       minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'
       image File.expand_path('../../icons/scaffold_app.png', __dir__)
@@ -218,11 +247,8 @@ class MetaSampleApplication
               on_widget_selected {
                 begin
                   SampleDirectory.selected_sample.launch(@code_text.text)
-                rescue StandardError, SyntaxError => launch_error
-                  message_box {
-                    text 'Error Launching'
-                    message launch_error.full_message
-                  }.open
+                rescue LoadError, StandardError, SyntaxError => launch_error
+                  error_dialog(message: launch_error.full_message).open
                 end
               }
             }
@@ -243,10 +269,41 @@ class MetaSampleApplication
           editable bind(SampleDirectory, 'selected_sample.editable')
         }
         
-        weights 4, 9
+        weights 4, 11
+      }
+    }
+  }
+  
+  # Method-based error_dialog custom widget
+  def error_dialog(message:)
+    return if message.nil?
+    dialog(body_root) { |dialog_proxy|
+      row_layout(:vertical) {
+        center true
+      }
+      
+      text 'Error Launching'
+        
+      styled_text(:border, :h_scroll, :v_scroll) {
+        layout_data {
+          width body_root.bounds.width*0.75
+          height body_root.bounds.height*0.75
+        }
+        
+        text message
+        editable false
+        caret nil
+      }
+      
+      button {
+        text 'Close'
+        
+        on_widget_selected {
+          dialog_proxy.close
+        }
       }
-    }.open
+    }
   end
 end
 
-MetaSampleApplication.new.launch
+MetaSampleApplication.launch

data/samples/elaborate/tetris.rb

@@ -26,59 +26,61 @@ require_relative 'tetris/model/game'
 require_relative 'tetris/view/playfield'
 require_relative 'tetris/view/score_lane'
 require_relative 'tetris/view/game_over_dialog'
+require_relative 'tetris/view/tetris_menu_bar'
 
 class Tetris
   include Glimmer::UI::CustomShell
   
   BLOCK_SIZE = 25
-  PLAYFIELD_WIDTH = 10
-  PLAYFIELD_HEIGHT = 20
-  PREVIEW_PLAYFIELD_WIDTH = 4
-  PREVIEW_PLAYFIELD_HEIGHT = 2
+  
+  option :playfield_width, default: Model::Game::PLAYFIELD_WIDTH
+  option :playfield_height, default: Model::Game::PLAYFIELD_HEIGHT
+  
+  attr_reader :game
   
   before_body {
+    @mutex = Mutex.new
+    @game = Model::Game.new(playfield_width, playfield_height)
+        
+    @game.configure_beeper do
+      display.beep
+    end
+    
+    Display.app_name = 'Glimmer Tetris'
     display {
-      on_swt_keydown { |key_event|
+      @keyboard_listener = on_swt_keydown { |key_event|
         case key_event.keyCode
         when swt(:arrow_down)
-          Model::Game.current_tetromino.down
+          game.down!
         when swt(:arrow_left)
-          Model::Game.current_tetromino.left
+          game.left!
         when swt(:arrow_right)
-          Model::Game.current_tetromino.right
+          game.right!
         when swt(:shift)
           if key_event.keyLocation == swt(:right) # right shift key
-            Model::Game.current_tetromino.rotate(:right)
+            game.rotate!(:right)
           elsif key_event.keyLocation == swt(:left) # left shift key
-            Model::Game.current_tetromino.rotate(:left)
+            game.rotate!(:left)
           end
         when 'd'.bytes.first, swt(:arrow_up)
-          Model::Game.current_tetromino.rotate(:right)
+          game.rotate!(:right)
         when 'a'.bytes.first
-          Model::Game.current_tetromino.rotate(:left)
+          game.rotate!(:left)
         end
       }
     }
-    
-    Model::Game.configure_beeper do
-      display.beep
-    end
   }
   
   after_body {
-    Model::Game.start
-    
-    Thread.new {
-      loop {
-        sleep(Model::Game.delay)
-        sync_exec {
-          unless Model::Game.game_over?
-            Model::Game.current_tetromino.down
-            game_over_dialog(parent_shell: body_root).open if Model::Game.current_tetromino.row <= 0 && Model::Game.current_tetromino.stopped?
-          end
-        }
-      }
-    }
+    @game_over_observer = observe(@game, :game_over) do |game_over|
+      if game_over
+        @game_over_dialog = game_over_dialog(parent_shell: body_root, game: @game) if @game_over_dialog.nil? || @game_over_dialog.disposed?
+        @game_over_dialog.show
+      else
+        start_moving_tetrominos_down
+      end
+    end
+    @game.start!
   }
   
   body {
@@ -92,15 +94,44 @@ class Tetris
       }
       
       text 'Glimmer Tetris'
+      minimum_size 475, 500
       background :gray
+      
+      tetris_menu_bar(game: game)
             
-      playfield(game_playfield: Model::Game.playfield, playfield_width: PLAYFIELD_WIDTH, playfield_height: PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+      playfield(game_playfield: game.playfield, playfield_width: playfield_width, playfield_height: playfield_height, block_size: BLOCK_SIZE)
+      
+      score_lane(game: game, block_size: BLOCK_SIZE) {
+        layout_data(:fill, :fill, true, true)
+      }
       
-      score_lane(block_size: BLOCK_SIZE) {
-        layout_data(:fill, :fill, false, true)
+      on_widget_disposed {
+        deregister_observers
       }
     }
   }
+  
+  def start_moving_tetrominos_down
+    Thread.new do
+      @mutex.synchronize do
+        loop do
+          time = Time.now
+          sleep @game.delay
+          break if @game.game_over? || body_root.disposed?
+          sync_exec {
+            @game.down! unless @game.paused?
+          }
+        end
+      end
+    end
+  end
+  
+  def deregister_observers
+    @game_over_observer&.deregister
+    @game_over_observer = nil
+    @keyboard_listener&.deregister
+    @keyboard_listener = nil
+  end
 end
 
 Tetris.launch

data/samples/elaborate/tetris/model/game.rb

@@ -25,161 +25,202 @@ require_relative 'tetromino'
 class Tetris
   module Model
     class Game
+      PLAYFIELD_WIDTH = 10
+      PLAYFIELD_HEIGHT = 20
+      PREVIEW_PLAYFIELD_WIDTH = 4
+      PREVIEW_PLAYFIELD_HEIGHT = 2
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
       
-      class << self
-        attr_accessor :game_over, :preview_tetromino, :lines, :score, :level
-        alias game_over? game_over
-        
-        def consider_adding_tetromino
-          if tetrominoes.empty? || Game.current_tetromino.stopped?
-            preview_tetromino.launch!
-            preview_next_tetromino!
-          end
-        end
-        
-        def current_tetromino
-          tetrominoes.last
-        end
+      attr_reader :playfield_width, :playfield_height
+      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level
+      alias game_over? game_over
+      alias paused? paused
       
-        def tetrominoes
-          @tetrominoes ||= reset_tetrominoes
-        end
-        
-        # Returns blocks in the playfield
-        def playfield
-          @playfield ||= @original_playfield = PLAYFIELD_HEIGHT.times.map {
-            PLAYFIELD_WIDTH.times.map {
-              Block.new
-            }
+      def initialize(playfield_width = PLAYFIELD_WIDTH, playfield_height = PLAYFIELD_HEIGHT)
+        @playfield_width = playfield_width
+        @playfield_height = playfield_height
+      end
+    
+      def configure_beeper(&beeper)
+        @beeper = beeper
+      end
+      
+      def game_in_progress?
+        !game_over? && !paused?
+      end
+      
+      def start!
+        self.paused = false
+        self.level = 1
+        self.score = 0
+        self.lines = 0
+        reset_playfield
+        reset_preview_playfield
+        reset_tetrominoes
+        preview_next_tetromino!
+        consider_adding_tetromino
+        self.game_over = false
+      end
+      alias restart! start!
+      
+      def down!
+        return unless game_in_progress?
+        current_tetromino.down!
+        self.game_over = true if current_tetromino.row <= 0 && current_tetromino.stopped?
+      end
+      
+      def right!
+        return unless game_in_progress?
+        current_tetromino.right!
+      end
+      
+      def left!
+        return unless game_in_progress?
+        current_tetromino.left!
+      end
+      
+      def rotate!(direction)
+        return unless game_in_progress?
+        current_tetromino.rotate!(direction)
+      end
+      
+      def current_tetromino
+        tetrominoes.last
+      end
+    
+      def tetrominoes
+        @tetrominoes ||= reset_tetrominoes
+      end
+      
+      # Returns blocks in the playfield
+      def playfield
+        @playfield ||= @original_playfield = @playfield_height.times.map {
+          @playfield_width.times.map {
+            Block.new
           }
-        end
-        
-        def hypothetical(&block)
-          @playfield = hypothetical_playfield
-          block.call
-          @playfield = @original_playfield
-        end
-        
-        def hypothetical?
-          @playfield != @original_playfield
-        end
-        
-        def hypothetical_playfield
-          PLAYFIELD_HEIGHT.times.map { |row|
-            PLAYFIELD_WIDTH.times.map { |column|
-              playfield[row][column].clone
-            }
+        }
+      end
+      
+      # Executes a hypothetical scenario without truly changing playfield permanently
+      def hypothetical(&block)
+        @playfield = hypothetical_playfield
+        block.call
+        @playfield = @original_playfield
+      end
+      
+      # Returns whether currently executing a hypothetical scenario
+      def hypothetical?
+        @playfield != @original_playfield
+      end
+      
+      def hypothetical_playfield
+        @playfield_height.times.map { |row|
+          @playfield_width.times.map { |column|
+            playfield[row][column].clone
           }
-        end
-        
-        def preview_playfield
-          @preview_playfield ||= PREVIEW_PLAYFIELD_HEIGHT.times.map {|row|
-            PREVIEW_PLAYFIELD_WIDTH.times.map {|column|
-              Block.new
-            }
+        }
+      end
+      
+      def preview_playfield
+        @preview_playfield ||= PREVIEW_PLAYFIELD_HEIGHT.times.map {|row|
+          PREVIEW_PLAYFIELD_WIDTH.times.map {|column|
+            Block.new
           }
-        end
-        
-        def preview_next_tetromino!
-          self.preview_tetromino = Tetromino.new
-        end
-        
-        def calculate_score!(eliminated_lines)
-          new_score = SCORE_MULTIPLIER[eliminated_lines] * (level + 1)
-          self.score += new_score
-        end
-        
-        def level_up!
-          self.level += 1 if lines >= self.level*10
-        end
-        
-        def delay
-          [1.1 - (level.to_i * 0.1), 0.001].max
-        end
-        
-        def consider_eliminating_lines
-          eliminated_lines = 0
-          playfield.each_with_index do |row, playfield_row|
-            if row.all? {|block| !block.clear?}
-              eliminated_lines += 1
-              shift_blocks_down_above_row(playfield_row)
-            end
-          end
-          if eliminated_lines > 0
-            beep
-            self.lines += eliminated_lines
-            level_up!
-            calculate_score!(eliminated_lines)
+        }
+      end
+      
+      def preview_next_tetromino!
+        self.preview_tetromino = Tetromino.new(self)
+      end
+      
+      def calculate_score!(eliminated_lines)
+        new_score = SCORE_MULTIPLIER[eliminated_lines] * (level + 1)
+        self.score += new_score
+      end
+      
+      def level_up!
+        self.level += 1 if lines >= self.level*10
+      end
+      
+      def delay
+        [1.1 - (level.to_i * 0.1), 0.001].max
+      end
+      
+      def beep
+        @beeper&.call
+      end
+      
+      def reset_tetrominoes
+        @tetrominoes = []
+      end
+      
+      def reset_playfield
+        playfield.each do |row|
+          row.each do |block|
+            block.clear
           end
         end
-        
-        def beep
-          @beeper&.call
-        end
-        
-        def configure_beeper(&beeper)
-          @beeper = beeper
-        end
-        
-        def shift_blocks_down_above_row(row)
-          row.downto(0) do |playfield_row|
-             playfield[playfield_row].each_with_index do |block, playfield_column|
-               previous_row = playfield[playfield_row - 1]
-               previous_block = previous_row[playfield_column]
-               block.color = previous_block.color unless block.color == previous_block.color
-             end
+      end
+      
+      def reset_preview_playfield
+        preview_playfield.each do |row|
+          row.each do |block|
+            block.clear
           end
-          playfield[0].each(&:clear)
         end
-        
-        def start
-          self.level = 1
-          self.score = 0
-          self.lines = @previoius_lines = 0
-          reset_playfield
-          reset_preview_playfield
-          reset_tetrominoes
+      end
+      
+      def consider_adding_tetromino
+        if tetrominoes.empty? || current_tetromino.stopped?
+          preview_tetromino.launch!
           preview_next_tetromino!
-          consider_adding_tetromino
-          self.game_over = false
-        end
-        alias restart start
-        
-        def reset_tetrominoes
-          @tetrominoes = []
-        end
-        
-        def reset_playfield
-          playfield.each do |row|
-            row.each do |block|
-              block.clear
-            end
-          end
         end
-        
-        def reset_preview_playfield
-          preview_playfield.each do |row|
-            row.each do |block|
-              block.clear
-            end
+      end
+      
+      def consider_eliminating_lines
+        eliminated_lines = 0
+        playfield.each_with_index do |row, playfield_row|
+          if row.all? {|block| !block.clear?}
+            eliminated_lines += 1
+            shift_blocks_down_above_row(playfield_row)
           end
         end
-        
-        def playfield_remaining_heights(tetromino = nil)
-          PLAYFIELD_WIDTH.times.map do |playfield_column|
-            (playfield.each_with_index.detect do |row, playfield_row|
-              !row[playfield_column].clear? &&
-              (
-                tetromino.nil? ||
-                (bottom_most_block = tetromino.bottom_most_block_for_column(playfield_column)).nil? ||
-                (playfield_row > tetromino.row + bottom_most_block[:row])
-              )
-            end || [nil, PLAYFIELD_HEIGHT])[1]
-          end.to_a
+        if eliminated_lines > 0
+          beep
+          self.lines += eliminated_lines
+          level_up!
+          calculate_score!(eliminated_lines)
         end
       end
+            
+      def playfield_remaining_heights(tetromino = nil)
+        @playfield_width.times.map do |playfield_column|
+          (playfield.each_with_index.detect do |row, playfield_row|
+            !row[playfield_column].clear? &&
+            (
+              tetromino.nil? ||
+              (bottom_most_block = tetromino.bottom_most_block_for_column(playfield_column)).nil? ||
+              (playfield_row > tetromino.row + bottom_most_block[:row])
+            )
+          end || [nil, @playfield_height])[1]
+        end.to_a
+      end
+      
+      private
+      
+      def shift_blocks_down_above_row(row)
+        row.downto(0) do |playfield_row|
+           playfield[playfield_row].each_with_index do |block, playfield_column|
+             previous_row = playfield[playfield_row - 1]
+             previous_block = previous_row[playfield_column]
+             block.color = previous_block.color unless block.color == previous_block.color
+           end
+        end
+        playfield[0].each(&:clear)
+      end
+      
     end
+  
   end
+
 end
-