glimmer-dsl-swt 4.18.4.11 → 4.18.5.0

data/lib/glimmer/dsl/swt/pixel_expression.rb

@@ -30,7 +30,7 @@ module Glimmer
       class PixelExpression < StaticExpression
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::Custom::Shape.new(parent, 'point', *args, &block)
+          Glimmer::SWT::Custom::Shape.new(parent, 'pixel', *args, &block)
         end
       end
     end

data/lib/glimmer/dsl/swt/radio_group_selection_data_binding_expression.rb

@@ -22,6 +22,7 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/data_binding/model_binding'
 require 'glimmer/data_binding/widget_binding'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module DSL
@@ -42,18 +43,20 @@ module Glimmer
   
           #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
           # TODO consider delegating some of this work
-          widget_binding = DataBinding::WidgetBinding.new(parent, 'items')
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'items', sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           widget_binding.call(model_binding.evaluate_options_property)
           model = model_binding.base_model
           widget_binding.observe(model, model_binding.options_property_name)
   
-          widget_binding = DataBinding::WidgetBinding.new(parent, 'selection')
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'selection', sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           widget_binding.call(model_binding.evaluate_property)
-          widget_binding.observe(model, model_binding.property_name_expression)
+          widget_binding.observe(model_binding)
   
           raise(Glimmer::Error, "No radios found! Make sure radio selection is data-bound to a property having property_options as non-empty array!") if parent.items.empty?
-          parent.on_widget_selected do
-            model_binding.call(widget_binding.evaluate_property)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec(override_sync_exec: model_binding.binding_options[:sync_exec], override_async_exec: model_binding.binding_options[:async_exec]) do
+            parent.on_widget_selected do
+              model_binding.call(widget_binding.evaluate_property)
+            end
           end
         end
       end

data/lib/glimmer/dsl/swt/shape_expression.rb

@@ -37,7 +37,7 @@ module Glimmer
         end
         
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::Custom::Shape.new(parent, keyword, *args, &block)
+          Glimmer::SWT::Custom::Shape.create(parent, keyword, *args, &block)
         end
         
         def add_content(parent, &block)

data/lib/glimmer/dsl/swt/widget_expression.rb

@@ -33,10 +33,11 @@ module Glimmer
         EXCLUDED_KEYWORDS = %w[shell display tab_item] + Glimmer::SWT::Custom::Shape.keywords - ['text']
 
         def can_interpret?(parent, keyword, *args, &block)
-          result = !EXCLUDED_KEYWORDS.include?(keyword) &&
-            parent.respond_to?(:swt_widget) && #TODO change to composite?(parent)
+          !EXCLUDED_KEYWORDS.include?(keyword) and
+            parent.respond_to?(:swt_widget) and
+            !parent.is_a?(Glimmer::SWT::Custom::Shape) and
+            !((keyword.to_s == 'text') and (args.first.is_a?(String) or parent.swt_widget.class == org.eclipse.swt.widgets.Canvas)) and
             Glimmer::SWT::WidgetProxy.widget_exists?(keyword)
-          (keyword.to_s == 'text' && args.first.is_a?(String)) ? false : result
         end
 
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/launcher.rb

@@ -27,9 +27,12 @@ require 'fileutils'
 require 'os'
 
 module Glimmer
+  # Launcher of glimmer applications and main entry point for the `glimmer` command.
   class Launcher
     OPERATING_SYSTEMS_SUPPORTED = ["mac", "windows", "linux"]
     
+    # TODO convert to a bash script to achieve faster startup time
+    
     TEXT_USAGE = <<~MULTI_LINE_STRING
       Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}
       Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]

data/lib/glimmer/rake_task/scaffold.rb

@@ -94,6 +94,9 @@ module Glimmer
           # Mac
           .DS_Store
           
+          # Warbler
+          Jars.lock
+          
           # Gladiator (Glimmer Editor)
           .gladiator
           

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

@@ -136,13 +136,13 @@ module Glimmer
                 editable false
                 caret nil
                 on_focus_gained {
-                  @styled_text_proxy&.swt_widget.setFocus
+                  @styled_text_proxy&.setFocus
                 }
                 on_key_pressed {
-                  @styled_text_proxy&.swt_widget.setFocus
+                  @styled_text_proxy&.setFocus
                 }
                 on_mouse_up {
-                  @styled_text_proxy&.swt_widget.setFocus
+                  @styled_text_proxy&.setFocus
                 }
               }
 
@@ -172,7 +172,7 @@ module Glimmer
                 character = event.keyCode.chr rescue nil
                 case [event.stateMask, character]
                 when [(OS.mac? ? swt(:command) : swt(:ctrl)), 'a']
-                  @styled_text_proxy.swt_widget.selectAll
+                  @styled_text_proxy.selectAll
                 when [(swt(:ctrl) if OS.mac?), 'a']
                   jump_to_beginning_of_line
                 when [(swt(:ctrl) if OS.mac?), 'e']
@@ -263,17 +263,17 @@ module Glimmer
         end
         
         def jump_to_beginning_of_line
-          current_line_index = @styled_text_proxy.swt_widget.getLineAtOffset(@styled_text_proxy.swt_widget.getCaretOffset)
-          beginning_of_current_line_offset = @styled_text_proxy.swt_widget.getOffsetAtLine(current_line_index)
-          @styled_text_proxy.swt_widget.setSelection(beginning_of_current_line_offset, beginning_of_current_line_offset)
+          current_line_index = @styled_text_proxy.getLineAtOffset(@styled_text_proxy.getCaretOffset)
+          beginning_of_current_line_offset = @styled_text_proxy.getOffsetAtLine(current_line_index)
+          @styled_text_proxy.setSelection(beginning_of_current_line_offset, beginning_of_current_line_offset)
         end
         
         def jump_to_end_of_line
-          current_line_index = @styled_text_proxy.swt_widget.getLineAtOffset(@styled_text_proxy.swt_widget.getCaretOffset)
-          current_line = @styled_text_proxy.swt_widget.getLine(current_line_index)
-          beginning_of_current_line_offset = @styled_text_proxy.swt_widget.getOffsetAtLine(current_line_index)
+          current_line_index = @styled_text_proxy.getLineAtOffset(@styled_text_proxy.getCaretOffset)
+          current_line = @styled_text_proxy.getLine(current_line_index)
+          beginning_of_current_line_offset = @styled_text_proxy.getOffsetAtLine(current_line_index)
           new_offset = beginning_of_current_line_offset + current_line.size
-          @styled_text_proxy.swt_widget.setSelection(new_offset, new_offset)
+          @styled_text_proxy.setSelection(new_offset, new_offset)
         end
       end
     end

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

@@ -38,6 +38,10 @@ module Glimmer
           @image_buffered_shapes ||= []
         end
         
+        def shape_at_location(x, y)
+          shapes.reverse.detect {|shape| shape.include?(x, y)}
+        end
+        
         def add_shape(shape)
           if !@image_double_buffered || shape.args.first == @image_proxy_buffer
             shapes << shape

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

@@ -38,6 +38,15 @@ module Glimmer
         # TODO support a Pattern DSL for methods that take Pattern arguments
         
         class << self
+          def create(parent, keyword, *args, &property_block)
+            potential_shape_class_name = keyword.to_s.camelcase(:upper).to_sym
+            if constants.include?(potential_shape_class_name)
+              const_get(potential_shape_class_name).new(parent, keyword, *args, &property_block)
+            else
+              new(parent, keyword, *args, &property_block)
+            end
+          end
+        
           def valid?(parent, keyword, *args, &block)
             gc_instance_methods.include?(method_name(keyword, arg_options(args)))
           end
@@ -79,15 +88,15 @@ module Glimmer
           end
           
           def pattern(*args)
-            found_pattern = flyweigh_patterns[args]
+            found_pattern = flyweight_patterns[args]
             if found_pattern.nil? || found_pattern.is_disposed
-              found_pattern = flyweigh_patterns[args] = org.eclipse.swt.graphics.Pattern.new(*args)
+              found_pattern = flyweight_patterns[args] = org.eclipse.swt.graphics.Pattern.new(*args)
             end
             found_pattern
           end
           
-          def flyweigh_patterns
-            @flyweigh_patterns ||= {}
+          def flyweight_patterns
+            @flyweight_patterns ||= {}
           end
         end
         
@@ -123,6 +132,29 @@ module Glimmer
           @options[:round]
         end
         
+        # subclasses (like polygon) may override to indicate if a point x,y coordinates fall inside the shape
+        # has a default implementation for rectangle and oval
+        def include?(x, y)
+          case @name
+          when 'rectangle', 'oval', 'arc'
+            self_x = self.x
+            self_y = self.y
+            width = self.width
+            height = self.height
+            x.between?(self_x, self_x + width) && y.between?(self_y, self_y + height)
+          else
+            false
+          end
+        end
+        
+        def move_by(x_delta, y_delta)
+          case @name
+          when 'rectangle', 'oval', 'arc'
+            self.x += x_delta
+            self.y += y_delta
+          end
+        end
+        
         def has_some_background?
           @properties.keys.map(&:to_s).include?('background') || @properties.keys.map(&:to_s).include?('background_pattern')
         end
@@ -174,8 +206,15 @@ module Glimmer
                 args[i] = arg.swt_color
               end
             end
-            new_args = [DisplayProxy.instance.swt_display] + args
-            args[0] = pattern(*new_args, type: method_name.to_s.match(/set(.+)Pattern/)[1])
+            @pattern_args ||= {}
+            pattern_type = method_name.to_s.match(/set(.+)Pattern/)[1]
+            if args.first.is_a?(Pattern)
+              new_args = @pattern_args[pattern_type]
+            else
+              new_args = [DisplayProxy.instance.swt_display] + args
+              @pattern_args[pattern_type] = new_args
+            end
+            args[0] = pattern(*new_args, type: pattern_type)
             args[1..-1] = []
           end
           args
@@ -186,6 +225,28 @@ module Glimmer
             @args[0] = @args.dup
             @args[1..-1] = []
           end
+          if @name == 'image'
+            if @args.first.is_a?(String)
+              @args[0] = ImageProxy.new(@args[0])
+            end
+            if @args.first.is_a?(ImageProxy)
+              @image = @args[0] = @args[0].swt_image
+            end
+            if @args.first.nil?
+              @image = nil
+            end
+          end
+          if @name == 'text'
+            if @args[3].is_a?(Symbol) || @args[3].is_a?(String)
+              @args[3] = [@args[3]]
+            end
+            if @args[3].is_a?(Array)
+              if @args[3].size == 1 && @args[3].first.is_a?(Array)
+                @args[3] = @args[3].first
+              end
+              @args[3] = SWTProxy[*@args[3]]
+            end
+          end
         end
         
         def apply_shape_arg_defaults!
@@ -202,12 +263,6 @@ module Glimmer
               @args[1] = 0
               @args[2] = 0
             end
-            if @args.first.is_a?(String)
-              @args[0] = ImageProxy.new(@args[0])
-            end
-            if @args.first.is_a?(ImageProxy)
-              @image = @args[0] = @args[0].swt_image
-            end
           end
         end
                 
@@ -217,14 +272,14 @@ module Glimmer
           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
+          if the_java_method_arg_count && @args.to_a.size > the_java_method_arg_count
             @args[the_java_method_arg_count..-1] = []
           end
         end
         
         def amend_method_name_options_based_on_properties!
           return if @name == 'point'
-          if has_some_background? && !has_some_foreground?
+          if @name != 'text' && has_some_background? && !has_some_foreground?
             @options[:fill] = true
           elsif !has_some_background? && has_some_foreground?
             @options[:fill] = false
@@ -237,13 +292,39 @@ module Glimmer
           end
           @method_name = self.class.method_name(@name, @options)
         end
-                
+        
+        # parameter names for arguments to pass to SWT GC.xyz method for rendering shape (e.g. draw_image(image, x, y) yields :image, :x, :y parameter names)
+        def parameter_names
+          []
+        end
+        
+        def possible_parameter_names
+          parameter_names
+        end
+        
+        def parameter_name?(attribute_name)
+          possible_parameter_names.map(&:to_s).include?(ruby_attribute_getter(attribute_name))
+        end
+        
+        def parameter_index(attribute_name)
+          parameter_names.map(&:to_s).index(attribute_name.to_s)
+        end
+        
+        def set_parameter_attribute(attribute_name, *args)
+          @args[parameter_index(ruby_attribute_getter(attribute_name))] = args.size == 1 ? args.first : args
+        end
+        
         def has_attribute?(attribute_name, *args)
-          self.class.gc_instance_methods.include?(attribute_setter(attribute_name))
+          self.class.gc_instance_methods.include?(attribute_setter(attribute_name)) or
+            parameter_name?(attribute_name)
         end
   
         def set_attribute(attribute_name, *args)
-          @properties[attribute_name] = args
+          if parameter_name?(attribute_name)
+            set_parameter_attribute(attribute_name, *args)
+          else
+            @properties[attribute_name] = args
+          end
           if @content_added && !@parent.is_disposed
             @calculated_paint_args = false
             @parent.redraw
@@ -251,13 +332,35 @@ module Glimmer
         end
         
         def get_attribute(attribute_name)
-          @properties.symbolize_keys[attribute_name.to_s.to_sym]
+          if parameter_name?(attribute_name)
+            @args[parameter_index(attribute_name)]
+          else
+            @properties.symbolize_keys[attribute_name.to_s.to_sym]
+          end
+        end
+        
+        def method_missing(method_name, *args, &block)
+          if method_name.to_s.end_with?('=')
+            set_attribute(method_name, *args)
+          elsif has_attribute?(method_name)
+            get_attribute(method_name)
+          else
+            super
+          end
+        end
+        
+        def respond_to?(method_name, *args, &block)
+          if has_attribute?(method_name)
+            true
+          else
+            super
+          end
         end
         
         def pattern(*args, type: nil)
           instance_variable_name = "@#{type}_pattern"
           the_pattern = instance_variable_get(instance_variable_name)
-          if the_pattern.nil?
+          if the_pattern.nil? || the_pattern.is_disposed
             the_pattern = self.class.pattern(*args)
           end
           the_pattern
@@ -288,11 +391,15 @@ module Glimmer
             end
           end
           paint_event.gc.send(@method_name, *@args)
+        rescue => e
+          Glimmer::Config.logger.error {"Error encountered in painting shape: #{self.inspect}"}
+          Glimmer::Config.logger.error {e.full_message}
         end
         
         def calculate_paint_args!
           unless @calculated_paint_args
-            if @name == 'point'
+            if @name == 'pixel'
+              @name = 'point'
               # optimized performance calculation for pixel points
               if !@properties[:foreground].is_a?(Color)
                 if @properties[:foreground].is_a?(Array)
@@ -334,3 +441,5 @@ module Glimmer
   end
   
 end
+
+Dir[File.expand_path(File.join(__dir__, 'shape', '**', '*.rb'))].each {|shape_file| require(shape_file)}

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

@@ -0,0 +1,43 @@
+# 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 'glimmer/swt/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+require 'glimmer/swt/font_proxy'
+require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      # Represents a shape (graphics) to be drawn on a control/widget/canvas/display
+      # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
+      class Shape
+        class Arc < Shape
+          def parameter_names
+            [:x, :y, :width, :height, :start_angle, :arc_angle]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# 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 'glimmer/swt/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+require 'glimmer/swt/font_proxy'
+require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      # Represents a shape (graphics) to be drawn on a control/widget/canvas/display
+      # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
+      class Shape
+        class Focus < Shape
+          def parameter_names
+            [:x, :y, :width, :height]
+          end
+        end
+      end
+    end
+  end
+end