glimmer-dsl-swt 4.22.0.0 → 4.22.2.0

data/docs/reference/GLIMMER_SAMPLES.md

@@ -78,11 +78,13 @@
     - [Stock Ticker](#stock-ticker)
     - [Metronome](#metronome)
     - [Weather](#weather)
+    - [Quarto](#quarto)
   - [External Samples](#external-samples)
     - [Glimmer Calculator](#glimmer-calculator)
     - [Gladiator](#gladiator)
     - [Timer](#timer)
     - [Glimmer Klondike Solitaire](#glimmer-klondike-solitaire)
+    - [Glimmer Metronome](#glimmer-metronome)
 - [License](#license)
 
 ## Samples
@@ -1053,14 +1055,6 @@ Hello, Tool Bar!
 
 ![Hello Tool Bar](/images/glimmer-hello-tool-bar.png)
 
-![Hello Tool Bar Cut](/images/glimmer-hello-tool-bar-cut.png)
-
-![Hello Tool Bar Copy](/images/glimmer-hello-tool-bar-copy.png)
-
-![Hello Tool Bar Paste](/images/glimmer-hello-tool-bar-paste.png)
-
-![Hello Tool Bar Font Size](/images/glimmer-hello-tool-bar-font-size.png)
-
 #### Hello, Cool Bar!
 
 This sample demonstrates the use of `cool_bar` that can contain multiple reorganizable `tool_bar` widgets
@@ -1369,6 +1363,18 @@ Atlanta - Fahrenheit
 
 ![Atlanta F](/images/glimmer-weather-atlanta-fahrenheit.png)
 
+#### Quarto
+
+This sample is a classic game called [Quarto](https://en.gigamic.com/game/quarto-classic), which demonstrates Canvas Drag and Drop and Custom Shapes (`cylinder`, `cube`, and `message_box_panel`) in an MVC application.
+
+Code:
+
+[samples/elaborate/quarto.rb](/samples/elaborate/quarto.rb)
+
+Quarto
+
+![Quarto](/images/glimmer-quarto.png)
+
 ### External Samples
 
 #### Glimmer Calculator
@@ -1408,6 +1414,14 @@ This is a souped up version of the Klondike Solitaire elaborate sample, which is
 
 ![Glimmer Klondike Solitaire](https://raw.githubusercontent.com/AndyObtiva/glimmer_klondike_solitaire/master/images/glimmer-klondike-solitaire.png)
 
+#### Glimmer Metronome
+
+This is an external enhanced version of [Metronome](#metronome) that can be packaged as an independent native executable.
+
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> Glimmer Metronome](https://github.com/AndyObtiva/glimmer_metronome)
+
+![Metronome](https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/screenshots/glimmer-metronome.png)
+
 ## License
 
 [MIT](LICENSE.txt)

data/lib/ext/glimmer/config.rb

@@ -59,6 +59,20 @@ module Glimmer
       end
       alias auto_sync_exec? auto_sync_exec
       
+      # allowed logger types are :logger (default) and :logging (logging gem supporting async logging)
+      # updating logger type value resets logger
+      def logger_type=(logger_type_class)
+        @@logger_type = logger_type_class
+        reset_logger!
+      end
+      
+      def logger_type
+        unless defined? @@logger_type
+          @@logger_type = :logger
+        end
+        @@logger_type
+      end
+      
       # Returns Logging Devices. Default is [:stdout, :syslog]
       def logging_devices
         unless defined? @@logging_devices
@@ -112,39 +126,42 @@ module Glimmer
         reset_logger!
       end
       
+      alias reset_logger_without_glimmer_dsl_swt! reset_logger!
       def reset_logger!
-        @first_time = !defined?(@@logger)
-        old_level = logger.level unless @first_time
-        self.logger = Logging.logger['glimmer'].tap do |logger|
-          logger.level = old_level || :error
-          appenders = []
-          appenders << Logging.appenders.stdout(logging_appender_options) if logging_devices.include?(:stdout)
-          appenders << Logging.appenders.stderr(logging_appender_options) if logging_devices.include?(:stderr)
-          if logging_devices.include?(:file)
-            require 'fileutils'
-            FileUtils.mkdir_p('log')
-            appenders << Logging.appenders.rolling_file('log/glimmer.log', logging_appender_options.merge(logging_device_file_options)) if logging_devices.include?(:file)
+        if logger_type == :logger
+          reset_logger_without_glimmer_dsl_swt!
+        else
+          require 'logging'
+          @first_time = !defined?(@@logger)
+          old_level = logger.level unless @first_time
+          self.logger = Logging.logger['glimmer'].tap do |logger|
+            logger.level = old_level || :error
+            appenders = []
+            appenders << Logging.appenders.stdout(logging_appender_options) if logging_devices.include?(:stdout)
+            appenders << Logging.appenders.stderr(logging_appender_options) if logging_devices.include?(:stderr)
+            if logging_devices.include?(:file)
+              require 'fileutils'
+              FileUtils.mkdir_p('log')
+              appenders << Logging.appenders.rolling_file('log/glimmer.log', logging_appender_options.merge(logging_device_file_options)) if logging_devices.include?(:file)
+            end
+            if Object.const_defined?(:Syslog) && logging_devices.include?(:syslog)
+              Syslog.close if Syslog.opened?
+              appenders << Logging.appenders.syslog('glimmer', logging_appender_options)
+            end
+            logger.appenders = appenders
           end
-          if Object.const_defined?(:Syslog) && logging_devices.include?(:syslog)
-            Syslog.close if Syslog.opened?
-            appenders << Logging.appenders.syslog('glimmer', logging_appender_options)
-          end
-          logger.appenders = appenders
         end
-        
       end
-      
     end
-    
   end
-  
 end
 
-Glimmer::Config.reset_logger! unless ENV['GLIMMER_LOGGER_ENABLED'].to_s.downcase == 'false'
 if ENV['GLIMMER_LOGGER_LEVEL']
-  # if glimmer log level is being overridden for debugging purposes, then disable async logging making logging immediate
-  Glimmer::Config.logging_appender_options = Glimmer::Config.logging_appender_options.merge(async: false, auto_flushing: 1, immediate_at: [:unknown, :debug, :info, :error, :fatal])
-  Glimmer::Config.logging_devices = [:stdout]
+  if Glimmer::Config.logger_type == :logging
+    # if glimmer log level is being overridden for debugging purposes, then disable async logging making logging immediate
+    Glimmer::Config.logging_appender_options = Glimmer::Config.logging_appender_options.merge(async: false, auto_flushing: 1, immediate_at: [:unknown, :debug, :info, :error, :fatal])
+    Glimmer::Config.logging_devices = [:stdout]
+  end
   begin
     puts "Adjusting Glimmer logging level to #{ENV['GLIMMER_LOGGER_LEVEL']}"
     Glimmer::Config.logger.level = ENV['GLIMMER_LOGGER_LEVEL'].strip

data/lib/glimmer/data_binding/observable_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
@@ -25,9 +25,9 @@ module Glimmer
       # TODO see if it is worth it to eliminate duplication of method_missing
       # from WidgetProxy using a module
 
-      def method_missing(method, *args, &block)
-        method_name = method.to_s
-        if can_handle_observation_request?(method_name)
+      def method_missing(method_name, *args, &block)
+        method_name = method_name.to_s
+        if block && can_handle_observation_request?(method_name)
           handle_observation_request(method_name, &block)
         else
           super

data/lib/glimmer/data_binding/widget_binding.rb

@@ -38,11 +38,12 @@ module Glimmer
         @sync_exec = sync_exec
         @async_exec = async_exec
         SWT::DisplayProxy.instance.auto_exec(override_sync_exec: @sync_exec, override_async_exec: @async_exec) do
-          if @widget.respond_to?(:on_widget_disposed)
+          if @widget.is_a?(Glimmer::SWT::WidgetProxy) && @widget.respond_to?(:on_widget_disposed)
             @widget.on_widget_disposed do |dispose_event|
               deregister_all_observables unless @widget.shell_proxy.last_shell_closing?
             end
           end
+          # TODO look into hooking on_shape_disposed without slowing down shapes in samples like Tetris
         end
       end
       

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

@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/launcher'
-require ENV['SWT_JAR_FILE_PATH'] || "#{Glimmer::Launcher.swt_jar_file}#{Glimmer::Launcher.special_cpu_architecture_suffix}"
+require ENV['SWT_JAR_FILE_PATH'] || "#{Glimmer::Launcher.swt_jar_file}"
 require 'glimmer/dsl/engine'
 Dir[File.expand_path('../*_expression.rb', __FILE__)].each {|f| require f}
 

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

@@ -23,6 +23,7 @@ require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/dsl/observe_expression'
 require 'glimmer/ui/custom_widget'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module DSL
@@ -33,7 +34,7 @@ module Glimmer
 
         def interpret(parent, keyword, *args, &block)
           observer_registration = super
-          Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(observer_registration)
+          Glimmer::SWT::DisplayProxy.current_custom_widgets_and_shapes.last&.observer_registrations&.push(observer_registration)
           observer_registration
         end
       end

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

@@ -32,6 +32,7 @@ module Glimmer
         include ParentExpression
         
         def can_interpret?(parent, keyword, *args, &block)
+          # TODO support CustomShape parent as well
           (parent.is_a?(Glimmer::SWT::Custom::Drawable) or parent.is_a?(Glimmer::SWT::Custom::Shape)) and
             Glimmer::SWT::Custom::Shape.valid?(parent, keyword, *args, &block)
         end

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

@@ -19,7 +19,7 @@
 # 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/dsl/expression'
+require 'glimmer/dsl/shine_data_binding_expression'
 require 'glimmer/data_binding/model_binding'
 require 'glimmer/data_binding/widget_binding'
 require 'glimmer/swt/display_proxy'
@@ -28,22 +28,17 @@ require 'glimmer/data_binding/shine'
 module Glimmer
   module DSL
     module SWT
-      class ShineDataBindingExpression < Expression
+      class ShineDataBindingExpression < Glimmer::DSL::ShineDataBindingExpression
         include_package 'org.eclipse.swt.widgets'
         
         def can_interpret?(parent, keyword, *args, &block)
-          args.size == 0 and
-            block.nil? and
+          super and
             (
               (parent.respond_to?(:has_attribute?) and parent.has_attribute?(keyword)) or
               (parent.respond_to?(:swt_widget) and (parent.swt_widget.is_a?(Table) or parent.swt_widget.is_a?(Tree)))
             ) and
             !(parent.respond_to?(:swt_widget) && parent.swt_widget.class == org.eclipse.swt.widgets.Canvas && keyword == 'image')
         end
-  
-        def interpret(parent, keyword, *args, &block)
-          Glimmer::DataBinding::Shine.new(parent, keyword)
-        end
       end
     end
   end

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

@@ -34,7 +34,7 @@ module Glimmer
         
         def can_interpret?(parent, keyword, *args, &block)
           super and
-            (parent.nil? or parent.is_a?(Glimmer::SWT::Custom::Shape))
+            (parent.nil? or parent.is_a?(Glimmer::SWT::Custom::Shape) or parent.is_a?(Glimmer::UI::CustomShape))
         end
         
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/launcher.rb

@@ -79,7 +79,7 @@ module Glimmer
       end
 
       def swt_jar_file
-        @swt_jar_file ||= File.expand_path(File.join(__FILE__, '..', '..', '..', 'vendor', 'swt', platform_os, 'swt.jar'))
+        @swt_jar_file ||= File.expand_path(File.join(__FILE__, '..', '..', '..', 'vendor', 'swt', platform_os + special_cpu_architecture_suffix, 'swt.jar'))
       end
  
       def jruby_os_specific_options
@@ -89,8 +89,7 @@ module Glimmer
       def glimmer_lib
         unless @glimmer_lib
           @glimmer_lib = GLIMMER_LIB_GEM
-          glimmer_gem_listing = `jgem list #{GLIMMER_LIB_GEM}`.split("\n").map {|l| l.split.first}
-          if !glimmer_gem_listing.include?(GLIMMER_LIB_GEM) && File.exists?(GLIMMER_LIB_LOCAL)
+          if File.exists?(GLIMMER_LIB_LOCAL)
             @glimmer_lib = GLIMMER_LIB_LOCAL
             puts "[DEVELOPMENT MODE] (detected #{@glimmer_lib})"
           end
@@ -121,18 +120,21 @@ module Glimmer
           ENV[k] = v
         end
         the_glimmer_lib = glimmer_lib
-        if the_glimmer_lib == GLIMMER_LIB_LOCAL
-          require 'puts_debuggerer'
+        require 'puts_debuggerer' if the_glimmer_lib == GLIMMER_LIB_LOCAL
+        is_rake_task = !application.end_with?('.rb')
+        rake_tasks = []
+        if is_rake_task
+          load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile')) && caller.join("\n").include?('/bin/glimmer:')
+          require_relative 'rake_task'
+          rake_tasks = Rake.application.tasks.map(&:to_s).map {|t| t.sub('glimmer:', '')}
+           
+          # handle a bash quirk with calling package[msi] while there is a "packages" directory locally (it passes package[msi] as packages)
+          application = 'package[msi]' if application == 'packages'
+          
+          potential_rake_task_parts = application.match(REGEX_RAKE_TASK_WITH_ARGS)
+          application = potential_rake_task_parts[1]
+          rake_task_args = potential_rake_task_parts[2].split(',')
         end
-        require_relative 'rake_task'
-        rake_tasks = Rake.application.tasks.map(&:to_s).map {|t| t.sub('glimmer:', '')}
-         
-        # handle a bash quirk with calling package[msi] while there is a "packages" directory locally (it passes package[msi] as packages)
-        application = 'package[msi]' if application == 'packages'
-        
-        potential_rake_task_parts = application.match(REGEX_RAKE_TASK_WITH_ARGS)
-        application = potential_rake_task_parts[1]
-        rake_task_args = potential_rake_task_parts[2].split(',')
         if rake_tasks.include?(application)
           load_env_vars(glimmer_option_env_vars(glimmer_options))
           rake_task = "glimmer:#{application}"
@@ -171,7 +173,6 @@ module Glimmer
     private
 
     def launch_application
-      load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile')) && caller.join("\n").include?('/bin/glimmer_runner.rb:')
       self.class.launch(
         @application_path,
         jruby_options: @jruby_options,

data/lib/glimmer/rake_task/scaffold.rb

@@ -99,6 +99,7 @@ module Glimmer
           
           # Gladiator (Glimmer Editor)
           .gladiator
+          .gladiator-scratchpad
           
           # Glimmer
           /dist/
@@ -116,12 +117,12 @@ module Glimmer
         GEMFILE_APP_MIDFIX = <<~MULTI_LINE_STRING
         
           gem 'glimmer-dsl-swt', '~> #{VERSION}'
-          gem 'psych', '3.3.2' # Fixed temporarily because installing latest on JDK16 was causing issues
+          gem 'psych', '3.3.2' # Fixed temporarily because installing latest on JDK16+ was causing issues
         MULTI_LINE_STRING
         GEMFILE_GEM_MIDFIX = <<~MULTI_LINE_STRING
         
           gem 'glimmer-dsl-swt', '~> #{VERSION.split('.')[0...2].join('.')}'
-          gem 'psych', '3.3.2' # Fixed temporarily because installing latest on JDK16 was causing issues
+          gem 'psych', '3.3.2' # Fixed temporarily because installing latest on JDK16+ was causing issues
         MULTI_LINE_STRING
         GEMFILE_SUFFIX = <<~MULTI_LINE_STRING
         
@@ -429,19 +430,7 @@ module Glimmer
         end
         
         def gemfile(shell_type)
-          if shell_type == :desktopify
-            lines = APP_GEMFILE.split("\n")
-            require_glimmer_dsl_swt_index = lines.index(lines.detect {|l| l.include?("gem 'glimmer-dsl-swt'") })
-            lines[(require_glimmer_dsl_swt_index + 1)..(require_glimmer_dsl_swt_index + 1)] = [
-              "",
-              "# Enable Chromium Browser Glimmer Custom Widget gem if needed (e.g. Linux needs it to support HTML5 Video), and use `browser(:chromium)` in GUI.",
-              "# gem 'glimmer-cw-browser-chromium', '>= 0'",
-              "",
-            ]
-            lines.join("\n")
-          else
-            APP_GEMFILE
-          end
+          APP_GEMFILE
         end
     
         def app_main_file(app_name)
@@ -643,7 +632,7 @@ module Glimmer
           minimum_size #{shell_type == :desktopify ? '768, 432' : '420, 240'}
           image File.join(APP_ROOT, 'icons', 'windows', "#{human_name(shell_type == :gem ? custom_shell_name : current_dir_name)}.ico") if OS.windows?
           image File.join(APP_ROOT, 'icons', 'linux', "#{human_name(shell_type == :gem ? custom_shell_name : current_dir_name)}.png") unless OS.windows?
-          text "#{human_name(namespace)} - #{human_name(custom_shell_name)}"
+          text "#{human_name(namespace)}#{' - ' + human_name(custom_shell_name) if shell_type != :desktopify}"
         
           MULTI_LINE_STRING
             

data/lib/glimmer/swt/color_proxy.rb

@@ -83,15 +83,15 @@ module Glimmer
         @swt_color
       end
       
-      def method_missing(method, *args, &block)
-        swt_color.send(method, *args, &block)
+      def method_missing(method_name, *args, &block)
+        swt_color.send(method_name, *args, &block)
       rescue => e
-        Glimmer::Config.logger.debug {"Neither ColorProxy nor #{swt_color.class.name} can handle the method ##{method}"}
+        Glimmer::Config.logger.debug {"Neither ColorProxy nor #{swt_color.class.name} can handle the method ##{method_name}"}
         super
       end
       
-      def respond_to?(method, *args, &block)
-        super || swt_color.respond_to?(method, *args, &block)
+      def respond_to?(method_name, *args, &block)
+        super || swt_color.respond_to?(method_name, *args, &block)
       end
       
       private

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

@@ -44,6 +44,10 @@ module Glimmer
           @image_buffered_shapes ||= []
         end
         
+        def drop_shapes
+          @drop_shapes ||= []
+        end
+        
         # TODO add a method like shapes that specifies drawable_properties to be able to adjust properties like transform in between shapes
           
         def shape_at_location(x, y)

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

@@ -1,5 +1,4 @@
 # Copyright (c) 2007-2021 Andy Maleh
-# 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

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

@@ -101,10 +101,10 @@ module Glimmer
             end
           end
           
-          def dispose(redraw: true)
+          def dispose(dispose_images: true, dispose_patterns: true, redraw: true)
             Glimmer::SWT::DisplayProxy.instance.auto_exec do
               clear if self.class == Path
-              super(redraw: redraw) if (parent.is_a?(Shape) && (!parent.is_a?(PathSegment) || !parent.part_of_path?)) || parent.is_a?(Drawable)
+              super(dispose_images: dispose_images, dispose_patterns: dispose_patterns, redraw: redraw) if (parent.is_a?(Shape) && (!parent.is_a?(PathSegment) || !parent.part_of_path?)) || parent.is_a?(Drawable)
             end
           end
           

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

@@ -75,7 +75,7 @@ module Glimmer
             true
           end
           
-          def dispose(redraw: true)
+          def dispose(dispose_images: true, dispose_patterns: true, redraw: true)
             Glimmer::SWT::DisplayProxy.instance.auto_exec do
               # including classes could override to dispose of resources first
               # afterwards, parent removes from its path segments with post_dispose_content
@@ -83,7 +83,7 @@ module Glimmer
               if part_of_path?
                 drawable.redraw if redraw && !drawable.is_a?(ImageProxy)
               else
-                super(redraw: redraw)
+                super(dispose_images: dispose_images, dispose_patterns: dispose_patterns, redraw: redraw)
               end
             end
           end

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

@@ -53,7 +53,14 @@ module Glimmer
             # give it some fuzz (helps makes mouse clicking easier)
             x.to_i.between?(self.absolute_x.to_i - 2, self.absolute_x.to_i + 2) && y.to_i.between?(self.absolute_y.to_i - 2, self.absolute_y.to_i + 2)
           end
-          alias contain? include?
+          
+          def contain?(x, y)
+            include?(x, y)
+          end
+          
+          def bounds_contain?(x, y)
+            include?(x, y)
+          end
           
           def path_segment_method_name
             'addRectangle'