glimmer-dsl-swt 4.17.2.3 → 4.17.4.2

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

@@ -0,0 +1,95 @@
+require 'glimmer/ui/custom_widget'
+
+module Glimmer
+  module SWT
+    module Custom
+      # CodeText is a customization of StyledText with support for Ruby Syntax Highlighting
+      class CodeText
+        include Glimmer::UI::CustomWidget
+        
+        SYNTAX_COLOR_MAP = {
+           Builtin:     [215,58,73], 
+           Class:       [3,47,98], 
+           Constant:    [0,92,197], 
+           Double:      [0,92,197],
+           Escape:      [:red],
+           Function:    [:blue], 
+           Instance:    [227,98,9], 
+           Integer:     [:blue], 
+           Interpol:    [:blue],
+           Keyword:     [:blue], 
+           Name:        [111,66,193], #purple
+           Operator:    [:red], 
+           Pseudo:      [:dark_red],
+           Punctuation: [:blue], 
+           Single:      [106,115,125], # Also, Comments
+           Symbol:      [:dark_green],
+           Text:        [75, 75, 75],
+        }
+        
+        # TODO support `option :language`
+        # TODO support auto language detection
+      
+        def text=(value)
+          swt_widget&.text = value
+        end
+        
+        def text
+          swt_widget&.text
+        end
+        
+        def syntax_highlighting          
+          return [] if text.to_s.strip.empty?
+          code = text
+          return @syntax_highlighting if @last_code == code
+          @last_code = code
+          lexer = Rouge::Lexer.find_fancy('ruby', code)
+          lex = lexer.lex(code).to_a
+          code_size = 0
+          lex_hashes = lex.map do |pair|
+            {token_type: pair.first, token_text: pair.last}
+          end.each do |hash|
+            hash[:token_index] = code_size
+            code_size += hash[:token_text].size
+          end
+          code_lines = code.split("\n")
+          line_index = 0
+          @syntax_highlighting = code_lines_map = code_lines.reduce({}) do |hash, line|
+            line_hashes = []
+            line_hashes << lex_hashes.shift while lex_hashes.any? && lex_hashes.first[:token_index].between?(line_index, line_index + line.size)
+            hash.merge(line_index => line_hashes).tap do
+              line_index += line.size + 1
+            end            
+          end          
+        end
+        
+        before_body {
+          @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
+        }
+        
+        body {
+          styled_text(swt_style) {
+            font name: 'Consolas', height: 15
+            foreground rgb(75, 75, 75)
+            left_margin 5
+            top_margin 5
+            right_margin 5
+            bottom_margin 5
+                  
+            on_line_get_style { |line_style_event|
+              styles = []
+              syntax_highlighting[line_style_event.lineOffset].to_a.each do |token_hash|
+                start_index = token_hash[:token_index]
+                size = token_hash[:token_text].size
+                token_color = SYNTAX_COLOR_MAP[token_hash[:token_type].name] || [:black]
+                token_color = color(*token_color).swt_color
+                styles << StyleRange.new(start_index, size, token_color, nil)
+              end
+              line_style_event.styles = styles.to_java(StyleRange) unless styles.empty?
+            }            
+          }
+        }
+      end
+    end
+  end
+end

data/lib/glimmer/swt/image_proxy.rb

@@ -27,10 +27,20 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class ImageProxy
+      class << self
+        def create(*args)
+          if args.size == 1 && args.first.is_a?(ImageProxy)
+            args.first
+          else
+            new(*args)
+          end
+        end
+      end
+      
       include_package 'org.eclipse.swt.graphics'
       
       attr_reader :file_path, :jar_file_path, :image_data, :swt_image
-
+      
       # Initializes a proxy for an SWT Image object
       #
       # Takes the same args as the SWT Image class
@@ -38,14 +48,19 @@ module Glimmer
       # and returns an image object.
       def initialize(*args)
         @args = args
-        @file_path = @args.first if @args.first.is_a?(String) && @args.size == 1        
-        options = @args.delete_at(-1) if @args.last.is_a?(Hash)
+        options = @args.last.is_a?(Hash) ? @args.delete_at(-1) : {}
+        options[:swt_image] = @args.first if @args.size == 1 && @args.first.is_a?(Image)
+        @file_path = @args.first if @args.size == 1 && @args.first.is_a?(String)
+        @args = @args.first if @args.size == 1 && @args.first.is_a?(Array)
         if options&.keys&.include?(:swt_image)
           @swt_image = options[:swt_image]
           @image_data = @swt_image.image_data
         elsif @file_path
           @image_data = ImageData.new(input_stream || @file_path)
           @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
+          width = options[:width]
+          height = options[:height]
+          scale_to(width, height) unless width.nil? || height.nil?
         else
           @swt_image = Image.new(*@args)
           @image_data = @swt_image.image_data

data/lib/glimmer/swt/message_box_proxy.rb

@@ -26,7 +26,7 @@ require 'glimmer/swt/shell_proxy'
 
 module Glimmer
   module SWT
-    # Proxy for org.eclipse.swt.widgets.Shell
+    # Proxy for org.eclipse.swt.widgets.MessageBox
     #
     # Follows the Proxy Design Pattern
     class MessageBoxProxy

data/lib/glimmer/swt/sash_form_proxy.rb

@@ -0,0 +1,53 @@
+# Copyright (c) 2007-2020 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/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.custom.SashForm
+    #
+    # Follows the Proxy Design Pattern
+    class SashFormProxy < WidgetProxy
+      def post_add_content
+        swt_widget.setWeights(@weights) unless @weights.nil?
+      end
+      
+      def set_attribute(attribute_name, *args)
+        if attribute_name.to_s == 'weights'
+          @weights = args
+          @weights = @weights.first if @weights.first.is_a?(Array)
+        else
+          super(attribute_name, *args)
+        end
+      end
+ 
+      def get_attribute(attribute_name)
+        if attribute_name.to_s == "weights"
+          swt_widget.getWeights.to_a
+        else
+          super(attribute_name)
+        end
+      end
+      
+    end
+  end
+end

data/lib/glimmer/swt/style_constantizable.rb

@@ -128,7 +128,7 @@ module Glimmer
         def deconstruct(integer)
           constant_source_class.constants.reduce([]) do |found, c|
             constant_value = constant_source_class.const_get(c) rescue -1
-            is_found = constant_value.is_a?(Integer) && (integer & constant_value) == integer
+            is_found = constant_value.is_a?(Integer) && (integer & constant_value) == constant_value
             is_found ? found += [c] : found
           end
         end
@@ -136,6 +136,7 @@ module Glimmer
         # Reverse engineer a style integer into a symbol
         # Useful for debugging
         def reverse_lookup(integer)
+          # TODO support looking up compound style mixes
           constant_source_class.constants.reduce([]) do |found, c|
             constant_value = constant_source_class.const_get(c) rescue -1
             is_found = constant_value.is_a?(Integer) && integer == constant_value

data/lib/glimmer/swt/styled_text_proxy.rb

@@ -0,0 +1,43 @@
+# Copyright (c) 2007-2020 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/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.custom.StyledText
+    #
+    # Follows the Proxy Design Pattern
+    class StyledTextProxy < WidgetProxy
+      def set_attribute(attribute_name, *args)
+        if attribute_name.to_s == 'selection'
+          if args.first
+            async_exec { @swt_widget.setCaretOffset(args.first.x) }
+            async_exec { @swt_widget.setSelection(args.first) }
+          end
+        else
+          super(attribute_name, *args)
+        end
+      end
+      
+    end
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -44,26 +44,28 @@ module Glimmer
       include Packages
 
       DEFAULT_STYLES = {
-        "arrow"               => [:arrow],
-        "button"              => [:push],
-        "checkbox"            => [:check],
-        "check"               => [:check],
-        "drag_source"         => [:drop_copy],
-        "drop_target"         => [:drop_copy],
-        "list"                => [:border, :v_scroll],
-        "menu_item"           => [:push],
-        "radio"               => [:radio],
-        "scrolled_composite"  => [:border, :h_scroll, :v_scroll],
-        "spinner"             => [:border],
-        "styled_text"         => [:border],
-        "table"               => [:virtual, :border, :full_selection],
-        "text"                => [:border],
-        "toggle"              => [:toggle],
-        "tree"                => [:virtual, :border, :h_scroll, :v_scroll],
+        'arrow'               => [:arrow],
+        'button'              => [:push],
+        'checkbox'            => [:check],
+        'check'               => [:check],
+        'drag_source'         => [:drop_copy],
+        'drop_target'         => [:drop_copy],
+        'list'                => [:border, :v_scroll],
+        'menu_item'           => [:push],
+        'radio'               => [:radio],
+        'scrolled_composite'  => [:border, :h_scroll, :v_scroll],
+        'spinner'             => [:border],
+        'styled_text'         => [:border, :multi, :v_scroll, :h_scroll],
+        'table'               => [:virtual, :border, :full_selection],
+        'text'                => [:border],
+        'toggle'              => [:toggle],
+        'tool_bar'            => [:push],
+        'tool_item'           => [:push],
+        'tree'                => [:virtual, :border, :h_scroll, :v_scroll],
       }
 
       DEFAULT_INITIALIZERS = {
-        "composite" => lambda do |composite|
+        'composite' => lambda do |composite|
           if composite.get_layout.nil?
             layout = GridLayout.new
             layout.marginWidth = 15
@@ -71,18 +73,18 @@ module Glimmer
             composite.layout = layout
           end
         end,
-        "scrolled_composite" => lambda do |scrolled_composite|
+        'scrolled_composite' => lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true
           scrolled_composite.expand_vertical = true
         end,
-        "table" => lambda do |table|
+        'table' => lambda do |table|
           table.setHeaderVisible(true)
           table.setLinesVisible(true)
         end,
-        "table_column" => lambda do |table_column|
+        'table_column' => lambda do |table_column|
           table_column.setWidth(80)
         end,
-        "group" => lambda do |group|
+        'group' => lambda do |group|
           group.layout = GridLayout.new if group.get_layout.nil?
         end,
       }
@@ -216,7 +218,11 @@ module Glimmer
       def get_attribute(attribute_name)
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
         if widget_custom_attribute
-          @swt_widget.send(widget_custom_attribute[:getter][:name])
+          if widget_custom_attribute[:getter][:invoker]
+            widget_custom_attribute[:getter][:invoker].call(@swt_widget, [])
+          else
+            @swt_widget.send(widget_custom_attribute[:getter][:name])
+          end
         else
           @swt_widget.send(attribute_getter(attribute_name))
         end
@@ -329,6 +335,56 @@ module Glimmer
                 observer.call(@swt_widget.getText)
               }
             end,
+            :caret_position => lambda do |observer|
+              on_swt_keyup { |event|
+                observer.call(@swt_widget.getCaretOffset)
+              }
+              on_swt_mouseup { |event|
+                observer.call(@swt_widget.getCaretOffset)
+              }
+            end,
+            :caret_offset => lambda do |observer|
+              on_swt_keyup { |event|
+                observer.call(@swt_widget.getCaretOffset)
+              }
+              on_swt_mouseup { |event|
+                observer.call(@swt_widget.getCaretOffset)
+              }
+            end,
+            :selection => lambda do |observer|
+              on_swt_keyup { |event|
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
+              }
+              on_swt_mouseup { |event|
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
+              }
+            end,
+            :selection_count => lambda do |observer|
+              on_swt_keyup { |event|
+                observer.call(@swt_widget.getSelectionCount)
+              }
+              on_swt_mouseup { |event|
+                observer.call(@swt_widget.getSelectionCount)
+              }
+            end,
+            :top_index => lambda do |observer|
+              @last_top_index = @swt_widget.getTopIndex
+              on_paint_control { |event|
+                if @swt_widget.getTopIndex != @last_top_index
+                  @last_top_index = @swt_widget.getTopIndex
+                  observer.call(@last_top_index)
+                end
+              }
+            end,            
+            :top_pixel => lambda do |observer|
+              @last_top_pixel = @swt_widget.getTopPixel
+              on_paint_control { |event|
+                if @swt_widget.getTopPixel != @last_top_pixel
+                  @last_top_pixel = @swt_widget.getTopPixel
+                  observer.call(@last_top_pixel)
+                end
+              }
+            end,
           },
           Java::OrgEclipseSwtWidgets::Button => {
             :selection => lambda do |observer|
@@ -609,18 +665,22 @@ module Glimmer
       end
 
       def widget_custom_attribute_mapping
+        # TODO scope per widget class type just like other mappings
         @swt_widget_custom_attribute_mapping ||= {
           'focus' => {
             getter: {name: 'isFocusControl'},
             setter: {name: 'setFocus', invoker: lambda { |widget, args| @swt_widget.setFocus if args.first }},
           },
           'caret_position' => {
-            getter: {name: 'getCaretPosition'},
+            getter: {name: 'getCaretPosition', invoker: lambda { |widget, args| @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getCaretOffset}},
             setter: {name: 'setSelection', invoker: lambda { |widget, args| @swt_widget.setSelection(args.first) if args.first }},
           },
           'selection_count' => {
             getter: {name: 'getSelectionCount'},
-            setter: {name: 'setSelection', invoker: lambda { |widget, args| @swt_widget.setSelection(@swt_widget.getCaretPosition, @swt_widget.getCaretPosition + args.first) if args.first }},
+            setter: {name: 'setSelection', invoker: lambda { |widget, args| 
+              caret_position = @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getCaretOffset
+              @swt_widget.setSelection(caret_position, caret_position + args.first) if args.first 
+            }},
           },
         }
       end
@@ -658,11 +718,9 @@ module Glimmer
       end
 
       def apply_property_type_converters(attribute_name, args)
-        if args.count == 1
-          value = args.first
-          converter = property_type_converters[attribute_name.to_sym]
-          args[0] = converter.call(value) if converter
-        end
+        value = args
+        converter = property_type_converters[attribute_name.to_sym]
+        args[0..-1] = [converter.call(*value)] if converter
         if args.count == 1 && args.first.is_a?(ColorProxy)
           g_color = args.first
           args[0] = g_color.swt_color
@@ -683,17 +741,8 @@ module Glimmer
             SWTProxy[*value]
           },
           :background => color_converter,
-          :background_image => lambda do |value|
-            # TODO push this code to ImageProxy
-            image_proxy = if value.is_a?(String)
-              ImageProxy.new(value)
-            elsif value.is_a?(Array)
-              ImageProxy.new(*value)
-            elsif value.is_a?(Image)
-              ImageProxy.new(swt_image: value)
-            else
-              value
-            end
+          :background_image => lambda do |*value|
+            image_proxy = ImageProxy.create(*value)
             
             if image_proxy&.file_path&.end_with?('.gif')
               image = image_proxy.swt_image
@@ -751,38 +800,19 @@ module Glimmer
               value
             end
           end,
-          :image => lambda do |value|
-            image_proxy = if value.is_a?(String)
-              ImageProxy.new(value).swt_image
-            elsif value.is_a?(Array)
-              ImageProxy.new(*value).swt_image
-            elsif value.is_a?(Image)
-              ImageProxy.new(swt_image: value)
-            else
-              value
-            end
-            image_proxy.swt_image
+          :image => lambda do |*value|
+            ImageProxy.create(*value).swt_image
           end,
           :images => lambda do |array|
             array.to_a.map do |value|
-              if value.is_a?(String)
-                ImageProxy.new(value).swt_image
-              elsif value.is_a?(Array)
-                ImageProxy.new(*value).swt_image
-              else
-                value
-              end
+              ImageProxy.create(value).swt_image
             end.to_java(Image)
           end,
           :items => lambda do |value|
             value.to_java :string
           end,
           :text => lambda do |value|
-            if swt_widget.is_a?(Browser)
-              value.to_s
-            else
-              value.to_s
-            end
+            value.to_s
           end,
           :transfer => lambda do |value|
             value = value.first if value.is_a?(Array) && value.size == 1 && value.first.is_a?(Array)