glimmer-dsl-swt 4.18.1.1 → 4.18.2.4

data/lib/glimmer/swt/display_proxy.rb

@@ -45,7 +45,7 @@ module Glimmer
       class << self
         # Returns singleton instance
         def instance(*args)
-          if @instance.nil? || @instance.swt_display.isDisposed
+          if @instance.nil? || @instance.swt_display.nil? || @instance.swt_display.isDisposed
             @instance = new(*args)
           end
           @instance

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-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
@@ -7,10 +7,10 @@
 # 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

data/lib/glimmer/swt/shell_proxy.rb

@@ -46,6 +46,7 @@ module Glimmer
           @swt_widget = swt_widget
         else
           if args.first.is_a?(ShellProxy)
+            @parent_proxy = args[0]
             args[0] = args[0].swt_widget
           end
           style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
@@ -78,7 +79,7 @@ module Glimmer
       end
 
       # Centers shell within monitor it is in
-      def center
+      def center_within_display
         primary_monitor = @display.getPrimaryMonitor()
         monitor_bounds = primary_monitor.getBounds()
         shell_bounds = @swt_widget.getBounds()
@@ -101,7 +102,7 @@ module Glimmer
         else
           @opened_before = true
           @swt_widget.pack
-          center
+          center_within_display
           @swt_widget.open
         end
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -74,12 +74,10 @@ module Glimmer
 
       DEFAULT_INITIALIZERS = {
         composite: lambda do |composite|
-          if composite.get_layout.nil?
-            layout = GridLayout.new
-            layout.marginWidth = 15
-            layout.marginHeight = 15
-            composite.layout = layout
-          end
+          composite.layout = GridLayout.new if composite.get_layout.nil?
+        end,
+        canvas: lambda do |canvas|
+          canvas.layout = nil unless canvas.get_layout.nil?
         end,
         scrolled_composite: lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true
@@ -160,7 +158,7 @@ module Glimmer
           underscored_widget_name = self.class.underscored_widget_name(@swt_widget)
           parent_proxy_class = self.class.widget_proxy_class(self.class.underscored_widget_name(@swt_widget.parent))
           parent = swt_widget.parent
-          @parent_proxy = parent.get_data('proxy') || parent_proxy_class.new(swt_widget: parent)
+          @parent_proxy = parent&.get_data('proxy') || parent_proxy_class.new(swt_widget: parent)
         end
         if @swt_widget&.get_data('proxy').nil?
           @swt_widget.set_data('proxy', self)

data/lib/glimmer/ui/custom_shell.rb

@@ -27,6 +27,19 @@ module Glimmer
       include SuperModule
       include Glimmer::UI::CustomWidget
       
+      class << self
+        attr_reader :custom_shell
+        
+        def launch
+          @custom_shell = send(self.name.underscore.gsub('::', '__'))
+          @custom_shell.open
+        end
+        
+        def shutdown
+          @custom_shell.close
+        end
+      end
+      
       def initialize(parent, *swt_constants, options, &content)
         super
         @swt_widget.set_data('custom_shell', self)
@@ -55,8 +68,8 @@ module Glimmer
         body_root.visible?
       end
 
-      def center
-        body_root.center
+      def center_within_display
+        body_root.center_within_display
       end
 
       def start_event_loop

data/lib/glimmer/ui/custom_widget.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-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
@@ -7,10 +7,10 @@
 # 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
@@ -141,10 +141,9 @@ module Glimmer
         end
       end
 
-      attr_reader :body_root, :swt_widget, :parent, :swt_style, :options
+      attr_reader :body_root, :swt_widget, :parent, :parent_proxy, :swt_style, :options
 
       def initialize(parent, *swt_constants, options, &content)
-        @parent = parent
         @swt_style = SWT::SWTProxy[*swt_constants]
         options ||= {}
         @options = self.class.options.merge(options)
@@ -156,6 +155,9 @@ 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_hooks('after_body')
       end
       
@@ -211,10 +213,10 @@ module Glimmer
 
       # This method ensures it has an instance method not coming from Glimmer DSL
       def has_instance_method?(method_name)
-        respond_to?(method_name) and 
+        respond_to?(method_name) and
           !swt_widget&.respond_to?(method_name) and
           (method(method_name) rescue nil) and
-          !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') and 
+          !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') and
           !method(method_name)&.source_location&.first&.include?('glimmer/swt/widget_proxy.rb')
       end
 
@@ -265,13 +267,13 @@ module Glimmer
         end
       end
 
-      alias local_respond_to? respond_to?      
+      alias local_respond_to? respond_to?
       def respond_to?(method, *args, &block)
         super or
           can_handle_observation_request?(method) or
           body_root.respond_to?(method, *args, &block)
       end
-
+      
       private
 
       def execute_hooks(hook_name)

data/samples/elaborate/meta_sample.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2007-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 'fileutils'
 require 'etc'
 

data/samples/elaborate/tetris.rb

@@ -0,0 +1,108 @@
+# Copyright (c) 2007-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.
+
+# Tetris App View Custom Shell (represents `tetris` keyword)
+
+require_relative 'tetris/model/game'
+
+require_relative 'tetris/view/playfield'
+require_relative 'tetris/view/score_lane'
+require_relative 'tetris/view/game_over_dialog'
+
+class Tetris
+  include Glimmer::UI::CustomShell
+  
+  BLOCK_SIZE = 25
+  PLAYFIELD_WIDTH = 10
+  PLAYFIELD_HEIGHT = 20
+  PREVIEW_PLAYFIELD_WIDTH = 4
+  PREVIEW_PLAYFIELD_HEIGHT = 2
+  
+  before_body {
+    display {
+      on_swt_keydown { |key_event|
+        case key_event.keyCode
+        when swt(:arrow_down)
+          Model::Game.current_tetromino.down
+        when swt(:arrow_left)
+          Model::Game.current_tetromino.left
+        when swt(:arrow_right)
+          Model::Game.current_tetromino.right
+        when swt(:shift)
+          if key_event.keyLocation == swt(:right) # right shift key
+            Model::Game.current_tetromino.rotate(:right)
+          elsif key_event.keyLocation == swt(:left) # left shift key
+            Model::Game.current_tetromino.rotate(:left)
+          end
+        when 'd'.bytes.first, swt(:arrow_up)
+          Model::Game.current_tetromino.rotate(:right)
+        when 'a'.bytes.first
+          Model::Game.current_tetromino.rotate(:left)
+        end
+      }
+    }
+    
+    Model::Game.configure_beeper do
+      async_exec {
+        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
+        }
+      }
+    }
+  }
+  
+  body {
+    shell(:no_resize) {
+      grid_layout {
+        num_columns 2
+        make_columns_equal_width false
+        margin_width 0
+        margin_height 0
+        horizontal_spacing 0
+      }
+      
+      text 'Glimmer Tetris'
+      background :gray
+            
+      playfield(game_playfield: Model::Game.playfield, playfield_width: PLAYFIELD_WIDTH, playfield_height: PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+      
+      score_lane(block_size: BLOCK_SIZE) {
+        layout_data(:fill, :fill, false, true)
+      }
+    }
+  }
+end
+
+Tetris.launch

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

@@ -0,0 +1,48 @@
+# Copyright (c) 2007-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.
+
+class Tetris
+  module Model
+    class Block
+      COLOR_CLEAR = :white
+    
+      attr_accessor :color
+      
+      # Initializes with color. Default color (gray) signifies an empty block
+      def initialize(color = COLOR_CLEAR)
+        @color = color
+      end
+      
+      # Clears block color. `quietly` option indicates if it should not notify observers by setting value quietly via variable not attribute writer.
+      def clear
+        self.color = COLOR_CLEAR
+      end
+      
+      def clear?
+        self.color == COLOR_CLEAR
+      end
+      
+      def occupied?
+        !clear?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,185 @@
+# Copyright (c) 2007-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_relative 'block'
+require_relative 'tetromino'
+
+class Tetris
+  module Model
+    class Game
+      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
+      
+        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
+        
+        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
+        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
+             end
+          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
+          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
+        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
+      end
+    end
+  end
+end
+