glimmer-dsl-swt 4.18.1.0 → 4.18.2.3

data/lib/glimmer/swt/custom/code_text.rb

@@ -61,11 +61,12 @@ module Glimmer
         
         before_body {
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
+          @font_name = display.get_font_list(nil, true).map(&:name).include?('Consolas') ? 'Consolas' : 'Courier'
         }
         
         body {
           styled_text(swt_style) {
-            font name: 'Consolas', height: 15
+            font name: @font_name, height: 15
             foreground rgb(75, 75, 75)
             left_margin 5
             top_margin 5

data/lib/glimmer/swt/custom/shape.rb

@@ -20,6 +20,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/properties'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+require 'glimmer/swt/font_proxy'
 
 module Glimmer
   module SWT
@@ -28,8 +32,9 @@ module Glimmer
       # swt_widget returns the parent (e.g. a `canvas` WidgetProxy), equivalent to `parent.swt_widget`
       # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
       class Shape
+        include Packages
         include Properties
-        # TODO support textExtent as an option
+        # TODO support textExtent sized shapes nested within text/string
         # TODO support a Pattern DSL for methods that take Pattern arguments
         
         class << self
@@ -48,14 +53,17 @@ module Glimmer
           end
           
           def method_name(keyword, args)
-            gc_instance_method_name_prefix = arg_options(args)[:fill] ? 'fill_' : 'draw_'
-            "#{gc_instance_method_name_prefix}#{keyword}"
+            keyword = keyword.to_s
+            gradient = 'gradient_' if arg_options(args)[:gradient]
+            round = 'round_' if arg_options(args)[:round]
+            gc_instance_method_name_prefix = !['polyline', 'point', 'image', 'focus'].include?(keyword) && (arg_options(args)[:fill] || arg_options(args)[:gradient]) ? 'fill_' : 'draw_'
+            "#{gc_instance_method_name_prefix}#{gradient}#{round}#{keyword}"
           end
         end
         
         attr_reader :parent, :name, :args, :options, :swt_widget, :paint_listener_proxy
         
-        def initialize(parent, keyword, *args)
+        def initialize(parent, keyword, *args, &property_block)
           @parent = parent
           @name = keyword
           @method_name = self.class.method_name(keyword, args)
@@ -64,23 +72,37 @@ module Glimmer
           @swt_widget = parent.respond_to?(:swt_display) ? parent.swt_display : parent.swt_widget
           @properties = {}
           @parent.shapes << self
+          post_add_content if property_block.nil?
+        end
+        
+        def draw?
+          !fill?
         end
         
         def fill?
-          !draw?
+          @options[:fill]
         end
         
-        def draw?
-          !@options[:fill]
+        def gradient?
+          @options[:gradient]
+        end
+        
+        def round?
+          @options[:round]
         end
         
         def post_add_content
           event_handler = lambda do |event|
+            @properties['background'] = [@parent.background] if fill? && !@properties.keys.map(&:to_s).include?('background')
+            @properties['foreground'] = [@parent.foreground] if draw? && !@properties.keys.map(&:to_s).include?('foreground')
             @properties.each do |property, args|
               method_name = attribute_setter(property)
-              handle_conversions(method_name, args)
+              apply_property_arg_conversions(method_name, args)
               event.gc.send(method_name, *args)
             end
+            apply_shape_arg_conversions(@method_name, @args)
+            apply_shape_arg_defaults(@method_name, @args)
+            tolerate_shape_extra_args(@method_name, @args)
             event.gc.send(@method_name, *@args)
           end
           if parent.respond_to?(:swt_display)
@@ -90,35 +112,78 @@ module Glimmer
           end
         end
         
-        def handle_conversions(method_name, args)
+        def apply_property_arg_conversions(method_name, args)
           the_java_method = org.eclipse.swt.graphics.GC.java_class.declared_instance_methods.detect {|m| m.name == method_name}
-          if args.first.is_a?(Symbol) || args.first.is_a?(String)
+          if (args.first.is_a?(Symbol) || args.first.is_a?(String))
             if the_java_method.parameter_types.first == Color.java_class
               args[0] = ColorProxy.new(args[0])
             end
+            if the_java_method.parameter_types.first == Java::int.java_class
+              args[0] = SWTProxy.constant(args[0])
+            end
           end
           if args.first.is_a?(ColorProxy)
             args[0] = args[0].swt_color
           end
-          if args.first.is_a?(Hash)
-            if the_java_method.parameter_types.first == Font.java_class
-              args[0] = FontProxy.new(args[0])
-            end
+          if args.first.is_a?(Hash) && the_java_method.parameter_types.first == Font.java_class
+            args[0] = FontProxy.new(args[0])
           end
           if args.first.is_a?(FontProxy)
             args[0] = args[0].swt_font
           end
-          
-          # TODO convert SWT style symbol to integer if method takes integer
+          if ['setBackgroundPattern', 'setForegroundPattern'].include?(method_name.to_s)
+            args.each_with_index do |arg, i|
+              if arg.is_a?(Symbol) || arg.is_a?(String)
+                args[i] = ColorProxy.new(arg).swt_color
+              elsif arg.is_a?(ColorProxy)
+                args[i] = arg.swt_color
+              end
+            end
+            new_args = [DisplayProxy.instance.swt_display] + args
+            args[0] = org.eclipse.swt.graphics.Pattern.new(*new_args)
+            args[1..-1] = []
+          end
         end
         
+        def apply_shape_arg_conversions(method_name, args)
+          if args.size > 1 && (method_name.include?('polygon') || method_name.include?('polyline'))
+            args[0] = args.dup
+            args[1..-1] = []
+          end
+        end
+        
+        def apply_shape_arg_defaults(method_name, args)
+          if method_name.include?('round_rectangle') && args.size.between?(4, 5)
+            (6 - args.size).times {args << 60}
+          elsif method_name.include?('rectangle') && gradient? && args.size == 4
+            args << true
+          elsif (method_name.include?('text') || method_name.include?('string')) && !@properties.keys.map(&:to_s).include?('background') && args.size == 3
+            args << true
+          end
+          if method_name.include?('image') && args.first.is_a?(String)
+            args[0] = ImageProxy.new(args[0])
+          end
+          if method_name.include?('image') && args.first.is_a?(ImageProxy)
+            args[0] = args[0].swt_image
+          end
+        end
+                
+        # Tolerates shape extra args added by user by mistake
+        # (e.g. happens when switching from round rectangle to a standard one without removing all extra args)
+        def tolerate_shape_extra_args(method_name, args)
+          the_java_method_arg_count = org.eclipse.swt.graphics.GC.java_class.declared_instance_methods.select do |m|
+            m.name == method_name.camelcase(:lower)
+          end.map(&:parameter_types).map(&:size).max
+          if args.size > the_java_method_arg_count
+            args[the_java_method_arg_count..-1] = []
+          end
+        end
+                
         def has_attribute?(attribute_name, *args)
-          # TODO test that attribute getter responds too
           self.class.gc_instance_methods.include?(attribute_setter(attribute_name))
         end
   
         def set_attribute(attribute_name, *args)
-          # TODO special treatment for color symbols
           @properties[attribute_name] = args
         end
   

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
@@ -56,6 +56,7 @@ module Glimmer
       attr_reader :swt_display
 
       def initialize(*args)
+        Display.app_name ||= 'Glimmer'
         @swt_display = Display.new(*args)
         @swt_display.set_data('proxy', self)
       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

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)

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'
 
@@ -150,7 +171,7 @@ class MetaSampleApplication
   end
   
   def launch
-    Display.setAppName('Glimmer Meta-Sample')
+    Display.app_name = 'Glimmer Meta-Sample'
     shell {
       minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'

data/samples/elaborate/tetris.rb

@@ -0,0 +1,102 @@
+# 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'
+
+class Tetris
+  include Glimmer::UI::CustomShell
+  
+  BLOCK_SIZE = 25
+  PLAYFIELD_WIDTH = 10
+  PLAYFIELD_HEIGHT = 20
+  
+  before_body {
+    Model::Game.configure_beeper do
+      display.beep
+    end
+    
+    Model::Game.start
+    
+    display {
+      on_swt_keydown { |key_event|
+        unless Model::Game.current_tetromino.stopped?
+          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
+        end
+      }
+    }
+  }
+  
+  after_body {
+    Thread.new {
+      loop {
+        sleep(0.9)
+        sync_exec {
+          unless @game_over
+            Model::Game.current_tetromino.down
+            if Model::Game.current_tetromino.stopped? && Model::Game.current_tetromino.row <= 0
+              @game_over = true
+              display.beep
+              message_box(:icon_error) {
+                text 'Tetris'
+                message 'Game Over!'
+              }.open
+              Model::Game.restart
+              @game_over = false
+            end
+            Model::Game.consider_adding_tetromino
+          end
+        }
+      }
+    }
+  }
+  
+  body {
+    shell(:no_resize) {
+      text 'Glimmer Tetris'
+      background :gray
+      
+      playfield(playfield_width: PLAYFIELD_WIDTH, playfield_height: PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+    }
+  }
+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
+      
+      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,116 @@
+# 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
+      class << self
+        def consider_adding_tetromino
+          if tetrominoes.empty? || Game.current_tetromino.stopped?
+            tetrominoes << Tetromino.new
+          end
+        end
+        
+        def current_tetromino
+          tetrominoes.last
+        end
+      
+        def tetrominoes
+          @tetrominoes ||= reset_tetrominoes
+        end
+        
+        # Returns blocks in the playfield
+        def playfield
+          @playfield ||= PLAYFIELD_HEIGHT.times.map {
+            PLAYFIELD_WIDTH.times.map {
+              Block.new
+            }
+          }
+        end
+        
+        def consider_eliminating_lines
+          cleared_line = false
+          playfield.each_with_index do |row, playfield_row|
+            if row.all? {|block| !block.clear?}
+              cleared_line = true
+              shift_blocks_down_above_row(playfield_row)
+            end
+          end
+          beep if cleared_line
+        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 restart
+          reset_playfield
+          reset_tetrominoes
+        end
+        alias start restart
+        
+        def reset_tetrominoes
+          @tetrominoes = [Tetromino.new]
+        end
+        
+        def reset_playfield
+          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? ||
+                tetromino.bottom_block_for_column(playfield_column).nil? ||
+                (playfield_row > tetromino.row + tetromino.bottom_block_for_column(playfield_column)[:row])
+              )
+            end || [nil, PLAYFIELD_HEIGHT])[1]
+          end.to_a
+        end
+      end
+    end
+  end
+end
+