glimmer-dsl-swt 4.18.3.1 → 4.18.4.0

data/lib/glimmer/swt/widget_proxy.rb

@@ -77,7 +77,7 @@ module Glimmer
           composite.layout = GridLayout.new if composite.get_layout.nil?
         end,
         canvas: lambda do |canvas|
-          canvas.layout = nil unless canvas.get_layout.nil?
+          canvas.layout = nil if canvas.respond_to?('layout=') && !canvas.get_layout.nil?
         end,
         scrolled_composite: lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true
@@ -165,6 +165,11 @@ module Glimmer
           DEFAULT_INITIALIZERS[underscored_widget_name.to_s.to_sym]&.call(@swt_widget)
           @parent_proxy.post_initialize_child(self)
         end
+        if respond_to?(:on_widget_disposed)
+          on_widget_disposed {
+            clear_shapes
+          }
+        end
       end
       
       # Subclasses may override to perform post initialization work on an added child
@@ -547,6 +552,10 @@ module Glimmer
         @swt_widget.dispose
       end
 
+      def disposed?
+        @swt_widget.isDisposed
+      end
+
       # TODO Consider renaming these methods as they are mainly used for data-binding
 
       def can_add_observer?(property_name)
@@ -663,7 +672,7 @@ module Glimmer
           can_handle_observation_request?(method) ||
           swt_widget.respond_to?(method, *args, &block)
       end
-
+      
       private
 
       def style(underscored_widget_name, styles)

data/lib/glimmer/ui/custom_shell.rb

@@ -32,6 +32,7 @@ module Glimmer
         
         def launch(*args, &content)
           @launched_custom_shell = send(keyword, *args, &content) if @launched_custom_shell.nil? || @launched_custom_shell.disposed?
+          @launched_custom_shell.swt_widget.set_data('launched', true)
           @launched_custom_shell.open
         end
       end

data/lib/glimmer/ui/custom_widget.rb

@@ -163,6 +163,8 @@ module Glimmer
       attr_reader :body_root, :swt_widget, :parent, :parent_proxy, :swt_style, :options
 
       def initialize(parent, *swt_constants, options, &content)
+        @parent_proxy = @parent = parent
+        @parent_proxy = @parent&.get_data('proxy') if @parent.respond_to?(:get_data) && @parent.get_data('proxy')
         @swt_style = SWT::SWTProxy[*swt_constants]
         options ||= {}
         @options = self.class.options.merge(options)
@@ -174,9 +176,6 @@ module Glimmer
         raise Glimmer::Error, 'Invalid custom widget for having an empty body! Please fill body block!' if @body_root.nil?
         @swt_widget = @body_root.swt_widget
         @swt_widget.set_data('custom_widget', self)
-        @parent = parent
-        @parent ||= @swt_widget.parent
-        @parent_proxy ||= @parent&.get_data('proxy')
         execute_hook('after_body')
       end
       
@@ -250,10 +249,18 @@ module Glimmer
       def attribute_setter(attribute_name)
         "#{attribute_name}="
       end
+      
+      def disposed?
+        swt_widget.isDisposed
+      end
 
       def has_style?(style)
         (swt_style & SWT::SWTProxy[style]) == SWT::SWTProxy[style]
       end
+      
+      def pack(*args)
+        body_root.pack(*args)
+      end
 
       # TODO see if it is worth it to eliminate duplication of async_exec/sync_exec
       # delegation to DisplayProxy, via a module

data/samples/elaborate/meta_sample.rb

@@ -204,7 +204,7 @@ class MetaSampleApplication
     shell(:fill_screen) {
       minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'
-      image File.expand_path('../../icons/scaffold_app.png', __dir__)
+      image File.expand_path('meta_sample/meta_sample_logo.png', __dir__)
       
       sash_form {
         composite {

data/samples/elaborate/tetris.rb

@@ -25,13 +25,17 @@ 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/high_score_dialog'
 require_relative 'tetris/view/tetris_menu_bar'
 
 class Tetris
   include Glimmer::UI::CustomShell
   
   BLOCK_SIZE = 25
+  FONT_NAME = 'Menlo'
+  FONT_TITLE_HEIGHT = 32
+  FONT_TITLE_STYLE = :bold
+  BEVEL_CONSTANT = 20
   
   option :playfield_width, default: Model::Game::PLAYFIELD_WIDTH
   option :playfield_height, default: Model::Game::PLAYFIELD_HEIGHT
@@ -50,36 +54,58 @@ class Tetris
     display {
       @keyboard_listener = on_swt_keydown { |key_event|
         case key_event.keyCode
-        when swt(:arrow_down)
+        when swt(:arrow_down), 's'.bytes.first
           game.down!
-        when swt(:arrow_left)
+        when swt(:arrow_up)
+          case game.up_arrow_action
+          when :instant_down
+            game.down!(instant: true)
+          when :rotate_right
+            game.rotate!(:right)
+          when :rotate_left
+            game.rotate!(:left)
+          end
+        when swt(:arrow_left), 'a'.bytes.first
           game.left!
-        when swt(:arrow_right)
+        when swt(:arrow_right), 'd'.bytes.first
           game.right!
-        when swt(:shift)
+        when swt(:shift), swt(:alt)
           if key_event.keyLocation == swt(:right) # right shift key
             game.rotate!(:right)
           elsif key_event.keyLocation == swt(:left) # left shift key
             game.rotate!(:left)
           end
-        when 'd'.bytes.first, swt(:arrow_up)
-          game.rotate!(:right)
-        when 'a'.bytes.first
+        when swt(:ctrl)
           game.rotate!(:left)
         end
       }
+      
+      # if running in app mode, set the Mac app about dialog (ignored in platforms)
+      @about_observer = on_about {
+        show_about_dialog
+      }
+      
+      @quit_observer = on_quit {
+        exit(0)
+      }
     }
   }
   
   after_body {
     @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
+        show_high_score_dialog
       else
         start_moving_tetrominos_down
       end
     end
+    @show_high_scores_observer = observe(@game, :show_high_scores) do |show_high_scores|
+      if show_high_scores
+        show_high_score_dialog
+      else
+        @high_score_dialog.close unless @high_score_dialog.nil? || @high_score_dialog.disposed? || !@high_score_dialog.visible?
+      end
+    end
     @game.start!
   }
   
@@ -95,22 +121,55 @@ class Tetris
       
       text 'Glimmer Tetris'
       minimum_size 475, 500
-      background :gray
-      
+      image tetris_icon
+
       tetris_menu_bar(game: game)
-            
+
       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)
       }
-      
+
       on_widget_disposed {
         deregister_observers
       }
     }
   }
   
+  def tetris_icon
+    icon_block_size = 64
+    icon_bevel_size = icon_block_size.to_f / 25.to_f
+    icon_bevel_pixel_size = 0.16*icon_block_size.to_f
+    icon_size = 8
+    icon_pixel_size = icon_block_size * icon_size
+    image(icon_pixel_size, icon_pixel_size) {
+      icon_size.times { |row|
+        icon_size.times { |column|
+          colored = row >= 1 && column.between?(1, 6)
+          color = colored ? color(([:white] + Model::Tetromino::LETTER_COLORS.values).sample) : color(:white)
+          x = column * icon_block_size
+          y = row * icon_block_size
+          rectangle(x, y, icon_block_size, icon_block_size, fill: true) {
+            background color
+          }
+          polygon(x, y, x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size, fill: true) {
+            background rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
+          }
+          polygon(x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size, y + icon_block_size, fill: true) {
+            background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
+          }
+          polygon(x + icon_block_size, y + icon_block_size, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, fill: true) {
+            background rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
+          }
+          polygon(x, y, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size, fill: true) {
+            background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
+          }
+        }
+      }
+    }
+  end
+  
   def start_moving_tetrominos_down
     Thread.new do
       @mutex.synchronize do
@@ -126,11 +185,25 @@ class Tetris
     end
   end
   
+  def show_high_score_dialog
+    return if @high_score_dialog&.visible?
+    @high_score_dialog = high_score_dialog(parent_shell: body_root, game: @game) if @high_score_dialog.nil? || @high_score_dialog.disposed?
+    @high_score_dialog.show
+  end
+  
+  def show_about_dialog
+    message_box {
+      text 'Glimmer Tetris'
+      message "Glimmer Tetris\n\nGlimmer DSL for SWT Sample\n\nCopyright (c) 2007-2021 Andy Maleh"
+    }.open
+  end
+  
   def deregister_observers
+    @show_high_scores_observer&.deregister
     @game_over_observer&.deregister
-    @game_over_observer = nil
     @keyboard_listener&.deregister
-    @keyboard_listener = nil
+    @about_observer&.deregister
+    @quit_observer&.deregister
   end
 end
 

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

@@ -19,8 +19,15 @@
 # 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 'fileutils'
+require 'etc'
+require 'json'
+require 'glimmer/data_binding/observer'
+require 'glimmer/config'
+
 require_relative 'block'
 require_relative 'tetromino'
+require_relative 'past_game'
 
 class Tetris
   module Model
@@ -32,15 +39,22 @@ class Tetris
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
       
       attr_reader :playfield_width, :playfield_height
-      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level
+      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :beeping, :added_high_score, :show_high_scores, :up_arrow_action
       alias game_over? game_over
       alias paused? paused
+      alias beeping? beeping
+      alias added_high_score? added_high_score
       
       def initialize(playfield_width = PLAYFIELD_WIDTH, playfield_height = PLAYFIELD_HEIGHT)
         @playfield_width = playfield_width
         @playfield_height = playfield_height
+        @high_scores = []
+        @show_high_scores = false
+        @beeping = true
+        @up_arrow_action = :rotate_left
+        load_high_scores!
       end
-    
+      
       def configure_beeper(&beeper)
         @beeper = beeper
       end
@@ -50,6 +64,7 @@ class Tetris
       end
       
       def start!
+        self.show_high_scores = false
         self.paused = false
         self.level = 1
         self.score = 0
@@ -63,10 +78,51 @@ class Tetris
       end
       alias restart! start!
       
-      def down!
+      def game_over!
+        add_high_score!
+        beep
+        self.game_over = true
+      end
+      
+      def clear_high_scores!
+        high_scores.clear
+      end
+      
+      def add_high_score!
+        self.added_high_score = true
+        high_scores.prepend(PastGame.new("Player #{high_scores.count + 1}", score, lines, level))
+      end
+      
+      def save_high_scores!
+        high_score_file_content = @high_scores.map {|past_game| past_game.to_a.join("\t") }.join("\n")
+        FileUtils.mkdir_p(tetris_dir)
+        File.write(tetris_high_score_file, high_score_file_content)
+      rescue => e
+        # Fail safely by keeping high scores in memory if unable to access disk
+        Glimmer::Config.logger.error {"Failed to save high scores in: #{tetris_high_score_file}\n#{e.full_message}"}
+      end
+      
+      def load_high_scores!
+        if File.exist?(tetris_high_score_file)
+          self.high_scores = File.read(tetris_high_score_file).split("\n").map {|line| PastGame.new(*line.split("\t")) }
+        end
+      rescue => e
+        # Fail safely by keeping high scores in memory if unable to access disk
+        Glimmer::Config.logger.error {"Failed to load high scores from: #{tetris_high_score_file}\n#{e.full_message}"}
+      end
+      
+      def tetris_dir
+        @tetris_dir ||= File.join(Etc.getpwuid.dir, '.glimmer-tetris')
+      end
+      
+      def tetris_high_score_file
+        File.join(tetris_dir, "high_scores.txt")
+      end
+      
+      def down!(instant: false)
         return unless game_in_progress?
-        current_tetromino.down!
-        self.game_over = true if current_tetromino.row <= 0 && current_tetromino.stopped?
+        current_tetromino.down!(instant: instant)
+        game_over! if current_tetromino.row <= 0 && current_tetromino.stopped?
       end
       
       def right!
@@ -147,7 +203,31 @@ class Tetris
       end
       
       def beep
-        @beeper&.call
+        @beeper&.call if beeping
+      end
+      
+      def instant_down_on_up=(value)
+        self.up_arrow_action = :instant_down if value
+      end
+      
+      def instant_down_on_up
+        self.up_arrow_action == :instant_down
+      end
+      
+      def rotate_right_on_up=(value)
+        self.up_arrow_action = :rotate_right if value
+      end
+      
+      def rotate_right_on_up
+        self.up_arrow_action == :rotate_right
+      end
+      
+      def rotate_left_on_up=(value)
+        self.up_arrow_action = :rotate_left if value
+      end
+      
+      def rotate_left_on_up
+        self.up_arrow_action == :rotate_left
       end
       
       def reset_tetrominoes
@@ -195,12 +275,13 @@ class Tetris
             
       def playfield_remaining_heights(tetromino = nil)
         @playfield_width.times.map do |playfield_column|
+          bottom_most_block = tetromino.bottom_most_block_for_column(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])
+              bottom_most_block.nil? ||
+              (playfield_row > tetromino.row + bottom_most_block[:row_index])
             )
           end || [nil, @playfield_height])[1]
         end.to_a

data/samples/elaborate/tetris/{view/game_over_dialog.rb → model/past_game.rb}

@@ -19,50 +19,21 @@
 # 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_relative 'tetris_menu_bar'
-
 class Tetris
-  module View
-    class GameOverDialog
-      include Glimmer::UI::CustomShell
-  
-      options :parent_shell, :game
+  module Model
+    class PastGame
+      attr_accessor :name, :score, :lines, :level
       
-      after_body {
-        observe(game, :game_over) do |game_over|
-          hide if !game_over
-        end
-      }
+      def initialize(name, score, lines, level)
+        @name = name
+        @score = score.to_i
+        @lines = lines.to_i
+        @level = level.to_i
+      end
       
-      body {
-        dialog(parent_shell) {
-          row_layout {
-            type :vertical
-            center true
-          }
-          text 'Tetris'
-          
-          tetris_menu_bar(game: game)
-          
-          label(:center) {
-            text 'Game Over!'
-            font name: 'Menlo', height: 30, style: :bold
-          }
-          label # filler
-          button {
-            text 'Play Again?'
-            
-            on_widget_selected {
-              hide
-              game.restart!
-            }
-          }
-          
-          on_shell_activated {
-            display.beep
-          }
-        }
-      }
+      def to_a
+        [@name, @score, @lines, @level]
+      end
     end
   end
 end