glimmer-dsl-swt 4.21.2.4 → 4.22.1.1

data/lib/glimmer/swt/widget_proxy.rb

@@ -175,8 +175,10 @@ module Glimmer
           @keyword = underscored_widget_name.to_s
           if respond_to?(:on_widget_disposed)
             on_widget_disposed {
-              clear_shapes
-              deregister_shape_painting
+              unless shell_proxy.last_shell_closing?
+                clear_shapes
+                deregister_shape_painting
+              end
             }
           end
         end
@@ -199,7 +201,11 @@ module Glimmer
       end
       
       def shell_proxy
-        @swt_widget.shell.get_data('proxy')
+        if @swt_widget.respond_to?(:shell)
+          @swt_widget.shell.get_data('proxy')
+        else
+          @parent_proxy&.shell_proxy
+        end
       end
       
       def extract_args(underscored_widget_name, args)
@@ -572,11 +578,9 @@ module Glimmer
             flyweight_swt_widget_classes[underscored_widget_name] = swt_widget_class
           rescue SyntaxError, NameError => e
             Glimmer::Config.logger.debug {e.full_message}
-            # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
             nil
           rescue => e
             Glimmer::Config.logger.debug {e.full_message}
-            # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
             nil
           end
         end
@@ -772,20 +776,20 @@ module Glimmer
         end
       end
 
-      def method_missing(method, *args, &block)
+      def method_missing(method_name, *args, &block)
         # TODO push most of this logic down to Properties (and perhaps create Listeners module as well)
-        if can_handle_observation_request?(method)
-          handle_observation_request(method, &block)
+        if block && can_handle_observation_request?(method_name)
+          handle_observation_request(method_name, &block)
         else
           super
         end
       end
       
-      def respond_to?(method, *args, &block)
+      def respond_to?(method_name, *args, &block)
         result = super
         return true if result
         auto_exec do
-          can_handle_observation_request?(method)
+          can_handle_observation_request?(method_name)
         end
       end
       

data/lib/glimmer/ui/custom_shape.rb

@@ -158,17 +158,12 @@ module Glimmer
         def after_body(&block)
           @after_body_block = block
         end
-
-        # Current custom shapes being rendered. Useful to yoke all observers evaluated during rendering of their custom shapes for automatical disposal on_shape_disposed
-        def current_custom_shapes
-          @current_custom_shapes ||= []
-        end
       end
 
       attr_reader :body_root, :args, :parent, :parent_proxy, :options
 
       def initialize(parent, *args, options, &content)
-        Glimmer::UI::CustomShape.current_custom_shapes << self
+        SWT::DisplayProxy.current_custom_widgets_and_shapes << self
         @parent_proxy = @parent = parent
         @parent_proxy = @parent&.get_data('proxy') if @parent.respond_to?(:get_data) && @parent.get_data('proxy')
         @args = args
@@ -183,13 +178,26 @@ module Glimmer
         auto_exec do # TODO is this necessary given shape is a lightweight construct (not SWT widget) ?
           @body_root.set_data('custom_shape', self)
         end
+        auto_exec do
+          @dispose_listener_registration = @body_root.on_shape_disposed do
+            unless @body_root.shell_proxy.last_shell_closing?
+              observer_registrations.compact.each(&:deregister)
+              observer_registrations.clear
+            end
+          end
+        end
         execute_hook('after_body')
+        post_add_content if content.nil?
       end
       
       # Subclasses may override to perform post initialization work on an added child
       def post_initialize_child(child)
         # No Op by default
       end
+      
+      def post_add_content
+        SWT::DisplayProxy.current_custom_widgets_and_shapes.delete(self)
+      end
 
       def observer_registrations
         @observer_registrations ||= []
@@ -276,17 +284,33 @@ module Glimmer
       end
       alias getData get_data # for compatibility with SWT APIs
       alias data get_data # for compatibility with SWT APIs
+      
+      def dispose(dispose_images: true, dispose_patterns: true, redraw: true)
+        body_root.dispose(dispose_images: dispose_images, dispose_patterns: dispose_patterns, redraw: redraw)
+#         @dispose_listener_registration.deregister # TODO enable once returning a true listener object or observer proc registration
+      end
+      
+      def disposed
+        body_root.disposed
+      end
+      alias disposed? disposed
+      alias is_disposed disposed
     
-      def method_missing(method, *args, &block)
+      def method_missing(method_name, *args, &block)
         # TODO Consider supporting a glimmer error silencing option for methods defined here
         # but fail the glimmer DSL for the right reason to avoid seeing noise in the log output
-        body_root.send(method, *args, &block)
+        if block && can_handle_observation_request?(method_name)
+          handle_observation_request(method_name, &block)
+        else
+          body_root.send(method_name, *args, &block)
+        end
       end
 
       alias local_respond_to? respond_to?
-      def respond_to?(method, *args, &block)
+      def respond_to?(method_name, *args, &block)
         super or
-          body_root.respond_to?(method, *args, &block)
+          can_handle_observation_request?(method_name) or
+          body_root.respond_to?(method_name, *args, &block)
       end
       
       private

data/lib/glimmer/ui/custom_widget.rb

@@ -159,17 +159,12 @@ module Glimmer
         def after_body(&block)
           @after_body_block = block
         end
-
-        # Current custom widgets being rendered. Useful to yoke all observers evaluated during rendering of their custom widgets for automatical disposal on_widget_disposed
-        def current_custom_widgets
-          @current_custom_widgets ||= []
-        end
       end
 
       attr_reader :body_root, :swt_widget, :parent, :parent_proxy, :swt_style, :options
 
       def initialize(parent, *swt_constants, options, &content)
-        Glimmer::UI::CustomWidget.current_custom_widgets << self
+        SWT::DisplayProxy.current_custom_widgets_and_shapes << self
         @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]
@@ -188,8 +183,10 @@ module Glimmer
         auto_exec { execute_hook('after_body') }
         auto_exec do
           @dispose_listener_registration = @body_root.on_widget_disposed do
-            observer_registrations.compact.each(&:deregister)
-            observer_registrations.clear
+            unless @body_root.shell_proxy.last_shell_closing?
+              observer_registrations.compact.each(&:deregister)
+              observer_registrations.clear
+            end
           end
         end
         post_add_content if content.nil?
@@ -201,7 +198,7 @@ module Glimmer
       end
 
       def post_add_content
-        Glimmer::UI::CustomWidget.current_custom_widgets.delete(self)
+        SWT::DisplayProxy.current_custom_widgets_and_shapes.delete(self)
       end
       
       def observer_registrations
@@ -310,7 +307,7 @@ module Glimmer
       def method_missing(method, *args, &block)
         # TODO Consider supporting a glimmer error silencing option for methods defined here
         # but fail the glimmer DSL for the right reason to avoid seeing noise in the log output
-        if can_handle_observation_request?(method)
+        if block && can_handle_observation_request?(method)
           handle_observation_request(method, &block)
         else
           body_root.send(method, *args, &block)

data/lib/glimmer-dsl-swt.rb

@@ -30,9 +30,13 @@ if !['', 'false'].include?(ENV['GLIMMER_BUNDLER_SETUP'].to_s.strip.downcase)
 end
 require 'java'
 require 'puts_debuggerer' if ("#{ENV['pd']}#{ENV['PD']}").to_s.downcase.include?('true')
-require 'concurrent-ruby' # ensures glimmer relies on Concurrent data-structure classes (e.g. Concurrent::Array)
+
+# concurrent-ruby gem ensures glimmer relies on Concurrent data-structure classes
+require 'concurrent/array'
+require 'concurrent/hash'
+require 'concurrent/set'
 require 'glimmer'
-require 'logging'
+
 require 'nested_inherited_jruby_include_package'
 require 'super_module'
 require 'date'

data/samples/elaborate/battleship/view/cell.rb

@@ -54,10 +54,18 @@ class Battleship
           
           rectangle(0, 0, [:max, -1], [:max, -1])
           oval(:default, :default, 10, 10) {
-            foreground <= [model, :hit, on_read: ->(h) {h == nil ? COLOR_EMPTY : (h ? COLOR_HIT : COLOR_NO_HIT)}]
+            if model.nil?
+              foreground COLOR_EMPTY
+            else
+              foreground <= [model, :hit, on_read: ->(h) {h == nil ? COLOR_EMPTY : (h ? COLOR_HIT : COLOR_NO_HIT)}]
+            end
           }
           oval(:default, :default, 5, 5) {
-            background <= [model, :hit, on_read: ->(h) {h == nil ? COLOR_EMPTY : (h ? COLOR_HIT : COLOR_NO_HIT)}]
+            if model.nil?
+              background COLOR_EMPTY
+            else
+              background <= [model, :hit, on_read: ->(h) {h == nil ? COLOR_EMPTY : (h ? COLOR_HIT : COLOR_NO_HIT)}]
+            end
           }
           
           on_mouse_move do |event|

data/samples/elaborate/klondike_solitaire/model/column_pile.rb

@@ -13,7 +13,6 @@ class KlondikeSolitaire
       def reset!
         playing_cards.clear
         populate!(count.times.map { @game.deck.pop })
-        notify_observers(:playing_cards)
       end
     
       # this method does not validate

data/samples/elaborate/klondike_solitaire/view/column_pile.rb

@@ -7,16 +7,6 @@ class KlondikeSolitaire
     class ColumnPile
       include Glimmer::UI::CustomShape
   
-      IMAGE_EMPTY = image(50, 80) {
-        rectangle(0, 0, 50, 80) {
-          background :dark_green
-          
-          rectangle(0, 0, 49, 79, 15, 15) {
-            foreground :gray
-          }
-        }
-      }
-      
       options :pile_x, :pile_y, :model
       
       after_body {
@@ -36,13 +26,10 @@ class KlondikeSolitaire
               card_parent_pile = card_shape.parent_pile
               card_source_model = card_parent_pile.model
               cards = card_source_model.remove!(card)
-              if cards.is_a?(Array) # if it is a column pile
-                cards[1..-1].each do |card|
-                  model.add!(card)
-                end
-              end
+              cards[1..-1].each { |card| model.add!(card) } if cards.is_a?(Array) # if it is a column pile
               drop_event.dragged_shape.dispose
             rescue => e
+              Glimmer::Config.logger.debug { "Error encountered on drop of a card to a column pile: #{e.full_message}" }
               drop_event.doit = false
             end
           end
@@ -50,7 +37,7 @@ class KlondikeSolitaire
       }
   
       def build_column_pile(playing_cards)
-        body_root.shapes.to_a.each(&:dispose)
+        body_root.shapes.to_a.dup.each { |shape| shape.dispose(redraw: false) }
         current_parent = body_root
         playing_cards.each_with_index do |card, i|
           current_parent.content {

data/samples/elaborate/klondike_solitaire/view/dealing_pile.rb

@@ -12,7 +12,7 @@ class KlondikeSolitaire
       
       after_body {
         observe(model, 'playing_cards.empty?') do |empty_value|
-          body_root.shapes.to_a.each(&:dispose)
+          body_root.shapes.to_a.each { |shape| shape.dispose(redraw: false) }
           if empty_value
             body_root.content {
               empty_playing_card

data/samples/elaborate/klondike_solitaire/view/dealt_pile.rb

@@ -13,16 +13,23 @@ class KlondikeSolitaire
       after_body do
         observe(model, 'playing_cards.empty?') do |empty_value|
           if empty_value
-            body_root.shapes.to_a.dup.each(&:dispose)
+            body_root.shapes.to_a.dup.each { |shape| shape.dispose(redraw: false) }
             body_root.content {
               empty_playing_card
             }
           else
-            body_root.content {
-              playing_card(model: model.playing_cards.last, parent_pile: self) {
-                drag_source true
+            body_root.shapes.each { |shape| shape.drag_source = false }
+            before_last_shape = body_root.shapes[-2] && body_root.shapes[-2].get_data('custom_shape').respond_to?(:model) && body_root.shapes[-2].get_data('custom_shape').model
+            if model.playing_cards.last == before_last_shape # happens when dragging card out
+              body_root.shapes.last.dispose
+              body_root.shapes.last.drag_source = true
+            else
+              body_root.content {
+                playing_card(model: model.playing_cards.last, parent_pile: self) {
+                  drag_source true
+                }
               }
-            }
+            end
           end
         end
       end

data/samples/elaborate/klondike_solitaire/view/empty_playing_card.rb

@@ -13,12 +13,13 @@ class KlondikeSolitaire
       end
       
       body {
-        rectangle(card_x, card_y, 49, 79, 15, 15) {
+        rectangle(card_x, card_y, PLAYING_CARD_WIDTH - 1, PLAYING_CARD_HEIGHT - 1, 15, 15) {
           foreground :gray
           
           if suit
             text {
               string Model::PlayingCard.suit_text(suit)
+              font height: 20
               x :default
               y :default
               is_transparent true

data/samples/elaborate/klondike_solitaire/view/foundation_pile.rb

@@ -8,10 +8,9 @@ class KlondikeSolitaire
       
       options :pile_x, :pile_y, :game, :suit
       
-      attr_accessor :current_image, :model
+      attr_accessor :model
       
       before_body do
-        self.current_image = image(50, 80) {empty_playing_card(suit: suit)}
         self.model = game.foundation_piles[Model::PlayingCard::SUITS.index(suit)]
       end
   
@@ -45,6 +44,7 @@ class KlondikeSolitaire
               card_source_model.remove!(card)
               drop_event.dragged_shape.dispose
             rescue => e
+              Glimmer::Config.logger.debug { "Error encountered on drop of a card to a foundation pile: #{e.full_message}" }
               drop_event.doit = false
             end
           end

data/samples/elaborate/klondike_solitaire/view/hidden_playing_card.rb

@@ -11,11 +11,11 @@ class KlondikeSolitaire
       end
       
       body {
-        rectangle(card_x, card_y, 49, 79, 15, 15) {
+        rectangle(card_x, card_y, PLAYING_CARD_WIDTH - 1, PLAYING_CARD_HEIGHT - 1, 15, 15) {
           background :red
           
           # border
-          rectangle(0, 0, 49, 79, 15, 15) {
+          rectangle(0, 0, PLAYING_CARD_WIDTH - 1, PLAYING_CARD_HEIGHT - 1, 15, 15) {
             foreground :black
           }
         }

data/samples/elaborate/klondike_solitaire/view/klondike_solitaire_menu_bar.rb

@@ -0,0 +1,60 @@
+class KlondikeSolitaire
+  module View
+    class KlondikeSolitaireMenuBar
+      include Glimmer::UI::CustomWidget
+      
+      option :game
+      
+      before_body do
+        @display = display {
+          on_about {
+            display_about_dialog
+          }
+          on_preferences {
+            display_about_dialog
+          }
+        }
+      end
+  
+      body {
+        menu_bar {
+          menu {
+            text '&Game'
+            menu_item {
+              text '&Restart'
+              accelerator (OS.mac? ? :command : :ctrl), :r
+              
+              on_widget_selected {
+                game.restart!
+              }
+            }
+            menu_item {
+              text 'E&xit'
+              accelerator :alt, :f4
+              
+              on_widget_selected {
+                exit(0)
+              }
+            }
+          }
+          menu {
+            text '&Help'
+            menu_item {
+              text '&About...'
+              on_widget_selected {
+                display_about_dialog
+              }
+            }
+          }
+        }
+      }
+      
+      def display_about_dialog
+        message_box(body_root) {
+          text 'About'
+          message "Glimmer Klondike Solitaire\nGlimmer DSL for SWT Elaborate Sample"
+        }.open
+      end
+    end
+  end
+end

data/samples/elaborate/klondike_solitaire/view/playing_card.rb

@@ -11,17 +11,18 @@ class KlondikeSolitaire
       end
   
       body {
-        rectangle(card_x, card_y, 49, 79, 15, 15) {
+        rectangle(card_x, card_y, PLAYING_CARD_WIDTH - 1, PLAYING_CARD_HEIGHT - 1, 15, 15) {
           background model.hidden ? :red : :white
           
           # border
-          rectangle(0, 0, 49, 79, 15, 15) {
+          rectangle(0, 0, PLAYING_CARD_WIDTH - 1, PLAYING_CARD_HEIGHT - 1, 15, 15) {
             foreground :black
           }
           
           unless model.hidden?
             text {
               string model ? "#{model.rank_text}#{model.suit_text}" : ""
+              font height: PLAYING_CARD_FONT_HEIGHT
               x 5
               y 5
               foreground model ? model.color : :transparent

data/samples/elaborate/klondike_solitaire.rb

@@ -4,35 +4,26 @@ require_relative 'klondike_solitaire/model/game'
 
 require_relative 'klondike_solitaire/view/action_panel'
 require_relative 'klondike_solitaire/view/tableau'
+require_relative 'klondike_solitaire/view/klondike_solitaire_menu_bar'
 
 class KlondikeSolitaire
   include Glimmer::UI::CustomShell
   
   PLAYING_CARD_WIDTH = 50
-  PLAYING_CARD_HEIGHT = 80
+  PLAYING_CARD_HEIGHT = 76
   PLAYING_CARD_SPACING = 5
+  PLAYING_CARD_FONT_HEIGHT = 16
   MARGIN = 15
   TABLEAU_WIDTH = 2*MARGIN + 7*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING)
-  TABLEAU_HEIGHT = 400
+  TABLEAU_HEIGHT = 420
 
   before_body do
     @game = Model::Game.new
-    Display.app_name = 'Glimmer Klondike Solitaire'
-    @display = display {
-      on_about {
-        display_about_dialog
-      }
-      on_preferences {
-        display_about_dialog
-      }
-    }
   end
 
   body {
     shell {
-      row_layout(:vertical) {
-        fill true
-        center true
+      grid_layout {
         margin_width 0
         margin_height 0
         margin_top 15
@@ -41,53 +32,20 @@ class KlondikeSolitaire
       text "Glimmer Klondike Solitaire"
       background :dark_green
     
-      action_panel(game: @game)
-      tableau(game: @game) {
-        layout_data {
-          width TABLEAU_WIDTH
-          height TABLEAU_HEIGHT
-        }
+      klondike_solitaire_menu_bar(game: @game)
+    
+      action_panel(game: @game) {
+        layout_data(:fill, :center, true, false)
       }
       
-      menu_bar {
-        menu {
-          text '&Game'
-          menu_item {
-            text '&Restart'
-            accelerator (OS.mac? ? :command : :ctrl), :r
-            
-            on_widget_selected {
-              @game.restart!
-            }
-          }
-          menu_item {
-            text 'E&xit'
-            accelerator :alt, :f4
-            
-            on_widget_selected {
-              body_root.close
-            }
-          }
-        }
-        menu {
-          text '&Help'
-          menu_item {
-            text '&About...'
-            on_widget_selected {
-              display_about_dialog
-            }
-          }
+      tableau(game: @game) {
+        layout_data(:fill, :fill, true, true) {
+          width_hint TABLEAU_WIDTH
+          height_hint TABLEAU_HEIGHT
         }
       }
     }
   }
-
-  def display_about_dialog
-    message_box(body_root) {
-      text 'About'
-      message "Glimmer Klondike Solitaire\nGlimmer DSL for SWT Elaborate Sample"
-    }.open
-  end
 end
 
 KlondikeSolitaire.launch

data/samples/elaborate/mandelbrot_fractal.rb

@@ -21,7 +21,9 @@
 
 require 'glimmer-dsl-swt'
 require 'complex'
-require 'concurrent-ruby'
+require 'concurrent/executor/fixed_thread_pool'
+require 'concurrent/utility/processor_counter'
+require 'concurrent/array'
 
 # Mandelbrot multi-threaded implementation leveraging all processor cores.
 class Mandelbrot