glimmer-dsl-swt 4.18.3.0 → 4.18.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1323fa9209cf80b8c8333bcefb49a4ea682494a63aab2a594d7c7325e5f07833
-  data.tar.gz: 8d190e9c23540f238d23ffee220da4abd751499a7c8f230a86deb93e11f742d1
+  metadata.gz: 0d88ee3cdf02d4610332fd450379b43ab5231e0a2e5e9941c746ea7b65bcad00
+  data.tar.gz: db869412b61dd6c45002cd11ebf7cdb046d02b4de9b74769ec8cd90122eafbd9
 SHA512:
-  metadata.gz: d7f842d5fc21e75a1edbf6b07f470ee4b85aa6c462c60f0611143db7fa7ba0c5d2606d70fffd96d5abed5d3cef993b190d9e87bbb731278b7ad466d44c606abb
-  data.tar.gz: e02f1e221a4473975fcbd5afc57e5fb7ab99fe45905f88d6be6547f8f8434959ba7ab0d44518ef90873182170a5c5867f9fe075bef8bebbc94fa528b7aef939e
+  metadata.gz: 520388927363b967965f3afbbafdd753daf3c399547b87e5c60535620b12ffc694b05e14b5176b600fd1dcf7eecb4ee9c00ca41f4cbdda79ad138d2e593c836a
+  data.tar.gz: 5d52780657cac19b47ccec883b163b56fd1823f1701abef6e01e8b9b3109479648999506eb3dea2cb831826ab88eb562faf1c1a961f8d9c85620cfc956da7432

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+### 4.18.3.1
+
+- Provide an auto_sync_exec all data-binding config option to automatically sync_exec GUI calls from other threads instead of requiring users to use sync_exec on model attribute-change logic. Default value to false.
+- Have CustomShell::launch method take options to pass to custom shell keyword invocation
+- Update Glimmer Meta-Sample to load entire gem into user directory (since some new samples rely on images)
+- Update Glimmer Meta-Sample to display errors in a `dialog` instead of a `message_box` to allow scrolling
+- Removed newly added CustomShell::shutdown as unnecessary (could just do CustomShell::launchd_custom_shell.close)
+- Supporting deregistering Display listeners just like standard listeners via deregister
+- Enhance performance of excluded keyword check
+- Remove CustomWidget support for multiple before_body/after_body blocks instead of one each since it is not needed.
+- Tetris Menu Bar with Game Menu -> Start, Pause, Restart, and Exit
+- Tetris refactor mutation methods to end with bangs
+- Add new :fill_screen style for `shell` to start app filling the screen size (not full screen mode though)
+- Tetris Stop game if user does not play again in the end (instead of closing it)
+- End Tetris Thread loop gracefully if game over is encountered
+- Tetris use more observers instead of callbacks to Game
+- Turn Tetris::Model::Game class from a singleton class to a standard class supporting instances
+- Fix issue of `tetris` keyword not found when run from meta-sample app
+
 ### 4.18.3.0
 
 - Canvas Transform DSL (DSL declared Transform objects are auto-disposed after getting used by their parent shape)

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.18.3.0
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.18.3.1
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -460,7 +460,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.3.0
+jgem install glimmer-dsl-swt -v 4.18.3.1
 
 
 ```
@@ -480,7 +480,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.18.3.0
+gem 'glimmer-dsl-swt', '~> 4.18.3.1
 '
 ```
 
@@ -539,7 +539,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.3.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.3.1
 
 
       
@@ -1020,7 +1020,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
   Opal   glimmer-dsl-opal   0.10.2     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.18.3.0
+  Swt    glimmer-dsl-swt    4.18.3.1
 
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
@@ -2500,6 +2500,8 @@ When using a transform at the top-level (outside of shell), you get a fluent int
 Example:
 
 ```ruby
+include Glimmer # make sure it is included in your class/module before using the fluent interface
+
 transform(1, 1, 4, 2, 2, 4).
   multiply(1, 2, 3, 4,3,4).
   scale(1, 2, 3, 4, 5, 6).
@@ -3774,6 +3776,41 @@ shell(:no_resize) {
 
 Also, you may invoke `Display.app_version = '1.0.0'` if needed for OS app version identification reasons during development, replacing `'1.0.0'` with your application version.
 
+#### Performance Profiling
+
+JRuby comes with built-in support for performance profiling via the `--profile` option (with some code shown below), which can be accepted by the `glimmer` command too:
+
+`glimmer --profile path_to_glimmer_app.rb`
+
+Additionally, add this code to monitor Glimmer app performance around its launch method:
+
+```ruby
+require 'jruby/profiler'
+profile_data = JRuby::Profiler.profile do
+  SomeGlimmerApp.launch
+end
+
+profile_printer = JRuby::Profiler::HtmlProfilePrinter.new(profile_data)
+ps = java.io.PrintStream.new(STDOUT.to_outputstream)
+```
+
+When monitoring app startup time performance, make sure to add a hook to the top-level `shell` `on_swt_show` event that exits the app as soon as the shell shows up to end performance profiling and get the results.
+
+Example:
+
+```ruby
+shell {
+  # some code
+  on_swt_show {
+    exit(0)
+  }
+}
+```
+
+You may run `glimmer` with the `--profile.graph` instead for a more detailed output.
+
+Learn more at the [JRuby Performance Profile WIKI page](https://github.com/jruby/jruby/wiki/Profiling-JRuby).
+
 #### Checkbox Group Widget
 
 `checkbox_group` (or alias `check_group`) is a Glimmer built-in custom widget that displays a list of `checkbox` buttons (`button(:check)`) based on its `items` property.
@@ -4187,6 +4224,12 @@ This brings up the [Glimmer Meta-Sample (The Sample of Samples)](samples/elabora
 
 You may edit the code of any sample before launching it by clicking on the "Launch" button. This helps you learn by experimenting with Glimmer GUI DSL syntax. To go back to original code, simply hit the "Reset" button.
 
+Note that if you fail to run any sample through the Glimmer Meta-Sample for whatever reason, you could always run directly by cloning the project, running `bundle`, and then this command (drop the "bin" if you install the glimmer-dsl-swt gem instead):
+
+```ruby
+bin/glimmer samples/hello/hello_canvas_transform.rb   
+```
+
 ### Hello Samples
 
 For hello-type simple samples, check the following.

data/VERSION

@@ -1 +1 @@
-4.18.3.0
+4.18.3.1

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.3.0 ruby lib
+# stub: glimmer-dsl-swt 4.18.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.3.0"
+  s.version = "4.18.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-01-26"
+  s.date = "2021-01-27"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -143,6 +143,7 @@ Gem::Specification.new do |s|
     "samples/elaborate/tetris/view/game_over_dialog.rb",
     "samples/elaborate/tetris/view/playfield.rb",
     "samples/elaborate/tetris/view/score_lane.rb",
+    "samples/elaborate/tetris/view/tetris_menu_bar.rb",
     "samples/elaborate/tic_tac_toe.rb",
     "samples/elaborate/tic_tac_toe/board.rb",
     "samples/elaborate/tic_tac_toe/cell.rb",
@@ -194,7 +195,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.9"])
+      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.11"])
       s.add_runtime_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
       s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -213,7 +214,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
       s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     else
-      s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.9"])
+      s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.11"])
       s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
       s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -233,7 +234,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     end
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.9"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.11"])
     s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
     s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])

data/lib/ext/glimmer/config.rb

@@ -32,6 +32,8 @@ module Glimmer
       'org.eclipse.swt.custom',
       'org.eclipse.swt.dnd',
     ]
+    DEFAULT_AUTO_SYNC_EXEC = false
+    GUI_THREAD = Thread.current
     
     class << self
       # Tells Glimmer to import SWT packages into including class (default: true)
@@ -45,6 +47,22 @@ module Glimmer
         @@import_swt_packages
       end
       
+      # Tells Glimmer to avoid automatic use of sync_exec when invoking GUI calls from another thread (default: true)
+      def auto_sync_exec=(value)
+        @@auto_sync_exec = value
+      end
+  
+      # Returns whether Glimmer will import SWT packages into including class
+      def auto_sync_exec
+        @@auto_sync_exec = DEFAULT_AUTO_SYNC_EXEC if !defined?(@@auto_sync_exec)
+        @@auto_sync_exec
+      end
+      alias auto_sync_exec? auto_sync_exec
+      
+      def require_sync_exec?
+        Thread.current != GUI_THREAD
+      end
+      
       # Returns Logging Devices. Default is [:stdout, :syslog]
       def logging_devices
         unless defined? @@logging_devices
@@ -140,11 +158,10 @@ end
 
 Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   method = method_symbol.to_s
-  result = false
-  result ||= method == 'dispose' && is_a?(Glimmer::UI::CustomWidget) && respond_to?(method)
-  result ||= ['drag_source_proxy', 'drop_target_proxy'].include?(method) && is_a?(Glimmer::UI::CustomWidget)
-  result ||= method == 'post_initialize_child'
-  result ||= method == 'handle'
-  result ||= method.end_with?('=')
-  result ||= ['finish_edit!', 'search', 'all_tree_items', 'depth_first_search'].include?(method) && is_a?(Glimmer::UI::CustomWidget) && body_root.respond_to?(method)
+  return true if method == 'post_initialize_child'
+  return true if method == 'handle'
+  return true if method.end_with?('=')
+  return true if ['drag_source_proxy', 'drop_target_proxy'].include?(method) && is_a?(Glimmer::UI::CustomWidget)
+  return true if method == 'dispose' && is_a?(Glimmer::UI::CustomWidget) && respond_to?(method)
+  return true if ['finish_edit!', 'search', 'all_tree_items', 'depth_first_search'].include?(method) && is_a?(Glimmer::UI::CustomWidget) && body_root.respond_to?(method)
 end

data/lib/glimmer/data_binding/widget_binding.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
@@ -22,6 +22,8 @@
 require 'glimmer/data_binding/observable'
 require 'glimmer/data_binding/observer'
 
+require 'glimmer/swt/display_proxy'
+
 module Glimmer
   module DataBinding
     class WidgetBinding
@@ -44,7 +46,15 @@ module Glimmer
       
       def call(value)
         converted_value = translated_value = @translator.call(value)
-        @widget.set_attribute(@property, converted_value) unless evaluate_property == converted_value
+      
+        update_operation = lambda do
+          @widget.set_attribute(@property, converted_value) unless evaluate_property == converted_value
+        end
+        if Config.auto_sync_exec? && Config.require_sync_exec?
+          SWT::DisplayProxy.instance.sync_exec(&update_operation)
+        else
+          update_operation.call
+        end
       end
       
       def evaluate_property

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

@@ -193,7 +193,7 @@ module Glimmer
   
         def set_attribute(attribute_name, *args)
           @properties[attribute_name] = args
-          if @content_added
+          if @content_added && !@parent.is_disposed
             @parent.resetup_shape_paint_listeners
             @parent.redraw
           end
@@ -204,9 +204,10 @@ module Glimmer
         end
         
         def setup_paint_listener
+          return if @parent.is_disposed
           if parent.respond_to?(:swt_display)
             @paint_listener_proxy = @parent.on_swt_paint(&method(:paint))
-          else
+          elsif parent.respond_to?(:swt_widget)
             @paint_listener_proxy = @parent.on_paint_control(&method(:paint))
           end
         end

data/lib/glimmer/swt/directory_dialog_proxy.rb

@@ -47,13 +47,13 @@ module Glimmer
             style_arg_last_index = args.index(style_args.last)
             args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
           end
+          if args.first.respond_to?(:swt_widget) && args.first.swt_widget.is_a?(Shell)
+            args[0] = args[0].swt_widget
+          end
           if !args.first.is_a?(Shell)
             current_shell = DisplayProxy.instance.swt_display.shells.first
             args.unshift(current_shell.nil? ? ShellProxy.new : current_shell)
           end
-          if args.first.is_a?(ShellProxy)
-            args[0] = args[0].swt_widget
-          end
           parent = args[0]
           @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
           @swt_widget = DirectoryDialog.new(*args)

data/lib/glimmer/swt/display_proxy.rb

@@ -39,8 +39,20 @@ module Glimmer
       include_package 'org.eclipse.swt.widgets'
       
       include Custom::Drawable
-
+      
       OBSERVED_MENU_ITEMS = ['about', 'preferences']
+      
+      class FilterListener
+        include org.eclipse.swt.widgets.Listener
+        
+        def initialize(&listener_block)
+          @listener_block = listener_block
+        end
+        
+        def handleEvent(event)
+          @listener_block.call(event)
+        end
+      end
 
       class << self
         # Returns singleton instance
@@ -111,7 +123,7 @@ module Glimmer
         observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
-          add_swt_event_listener(constant_name, &block)
+          add_swt_event_filter(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
           if OBSERVED_MENU_ITEMS.include?(event_name)
@@ -124,10 +136,19 @@ module Glimmer
         end
       end
 
-      def add_swt_event_listener(swt_constant, &block)
+      def add_swt_event_filter(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
-        @swt_display.addFilter(event_type, &block)
+        @swt_display.addFilter(event_type, FilterListener.new(&block))
         #WidgetListenerProxy.new(@swt_display.getListeners(event_type).last)
+        WidgetListenerProxy.new(
+          swt_display: @swt_display,
+          event_type: event_type,
+          filter: true,
+          swt_listener: block,
+          widget_add_listener_method: 'addFilter',
+          swt_listener_class:  FilterListener,
+          swt_listener_method: 'handleEvent'
+        )
       end
     end
   end

data/lib/glimmer/swt/file_dialog_proxy.rb

@@ -48,13 +48,13 @@ module Glimmer
             style_arg_last_index = args.index(style_args.last)
             args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
           end
+          if args.first.respond_to?(:swt_widget) && args.first.swt_widget.is_a?(Shell)
+            args[0] = args[0].swt_widget
+          end
           if !args.first.is_a?(Shell)
             current_shell = DisplayProxy.instance.swt_display.shells.first
             args.unshift(current_shell.nil? ? ShellProxy.new : current_shell)
           end
-          if args.first.is_a?(ShellProxy)
-            args[0] = args[0].swt_widget
-          end
           parent = args[0]
           @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
           @swt_widget = FileDialog.new(*args)

data/lib/glimmer/swt/shell_proxy.rb

@@ -45,11 +45,17 @@ module Glimmer
         if swt_widget
           @swt_widget = swt_widget
         else
-          if args.first.is_a?(ShellProxy)
+          if args.first.respond_to?(:swt_widget) && args.first.swt_widget.is_a?(Shell)
             @parent_proxy = args[0]
             args[0] = args[0].swt_widget
           end
-          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}.map(&:to_sym)
+          fill_screen = nil
+          if style_args.include?(:fill_screen)
+            args.delete(:fill_screen)
+            style_args.delete(:fill_screen)
+            fill_screen = true
+          end
           if style_args.any?
             style_arg_start_index = args.index(style_args.first)
             style_arg_last_index = args.index(style_args.last)
@@ -67,6 +73,7 @@ module Glimmer
           # TODO make this an option not the default
           shell_swt_display = Glimmer::SWT::DisplayProxy.instance.swt_display
           on_swt_show do
+            @swt_widget.set_size(@display.bounds.width, @display.bounds.height) if fill_screen
             Thread.new do
               sleep(0.25)
               shell_swt_display.async_exec do
@@ -110,6 +117,10 @@ module Glimmer
       def nested?
         !swt_widget&.parent.nil?
       end
+      
+      def disposed?
+        swt_widget.isDisposed
+      end
 
       def hide
         @swt_widget.setVisible(false)

data/lib/glimmer/swt/widget_listener_proxy.rb

@@ -26,10 +26,12 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetListenerProxy
 
-      attr_reader :swt_widget, :swt_listener, :widget_add_listener_method, :swt_listener_class, :swt_listener_method, :event_type, :swt_constant
+      attr_reader :swt_widget, :swt_display, :swt_listener, :widget_add_listener_method, :swt_listener_class, :swt_listener_method, :event_type, :swt_constant
 
-      def initialize(swt_widget:, swt_listener:, widget_add_listener_method: nil, swt_listener_class: nil, swt_listener_method: nil, event_type: nil, swt_constant: nil)
+      def initialize(swt_widget:nil, swt_display:nil, swt_listener:, widget_add_listener_method: nil, swt_listener_class: nil, swt_listener_method: nil, event_type: nil, swt_constant: nil, filter: false)
         @swt_widget = swt_widget
+        @swt_display = swt_display
+        @filter = filter
         @swt_listener = swt_listener
         @widget_add_listener_method = widget_add_listener_method
         @swt_listener_class = swt_listener_class
@@ -42,14 +44,21 @@ module Glimmer
         @widget_add_listener_method.sub('add', 'remove')
       end
       
-      def unregister
-        # TODO consider renaming to deregister (and in Observer too)
-        if @event_type
+      def deregister
+        return if @swt_widget&.is_disposed || @swt_display&.is_disposed
+        if @swt_display
+          if @filter
+            @swt_display.removeFilter(@event_type, @swt_listener)
+          else
+            @swt_display.removeListener(@event_type, @swt_listener)
+          end
+        elsif @event_type
           @swt_widget.removeListener(@event_type, @swt_listener)
         else
           @swt_widget.send(widget_remove_listener_method, @swt_listener)
         end
       end
+      alias unregister deregister # TODO consider dropping unregister (and in Observer too)
     end
   end
 end