shoes-swt 4.0.0.pre2 → 4.0.0.pre3

data/lib/shoes/swt/download.rb

@@ -1,7 +1,6 @@
 class Shoes
   module Swt
     class Download
-      
       attr_accessor :busy
       def initialize(_dsl)
         @busy = false

data/lib/shoes/swt/font.rb

@@ -1,5 +1,4 @@
 class Shoes
-
   module Swt
     module Font
       class << self
@@ -10,11 +9,12 @@ class Shoes
         end
 
         def initial_fonts
-          load_shoes_fonts #system fonts are loaded automatically by SWT
+          load_shoes_fonts # system fonts are loaded automatically by SWT
           ::Swt.display.get_font_list(nil, true).map(&:name)
         end
 
         private
+
         def load_font(path)
           ::Swt.display.load_font path
         end
@@ -28,5 +28,5 @@ class Shoes
     end
   end
 
-  ::Shoes::Font.initial_fonts.each {|font| Shoes::FONTS << font}
-end
+  ::Shoes::Font.initial_fonts.each { |font| Shoes::FONTS << font }
+end

data/lib/shoes/swt/generate-backend.rb

@@ -0,0 +1,9 @@
+require 'rbconfig'
+
+def generate_backend(path)
+  if RbConfig::CONFIG["host_os"] =~ /darwin/
+    options = "-J-XstartOnFirstThread"
+  end
+
+  "jruby --1.9 #{options} #{path}/shoes-swt"
+end

data/lib/shoes/swt/gradient.rb

@@ -40,7 +40,8 @@ class Shoes
       end
 
       private
-      def create_pattern left, top, width, height, angle
+
+      def create_pattern(left, top, width, height, angle)
         width  = width * 0.5
         height = height * 0.5
         angle  = normalize_angle(angle)
@@ -52,20 +53,20 @@ class Shoes
       end
 
       def normalize_angle(angle)
-        angle = Math::PI * (angle/180.0)
-        angle % (Math::PI*2.0)
+        angle = Math::PI * (angle / 180.0)
+        angle % (Math::PI * 2.0)
       end
 
       def determine_args_based_on_angle(angle, left, top, width, height)
         x, y = calculate_x_and_y(angle, height, width)
-        if 0 <= angle and angle < Math::PI*0.5
-          args = [left+width+x, top+height-y, left+width-x, top+height+y]
-        elsif Math::PI*0.5 <= angle and angle < Math::PI
-          args = [left+width+y, top+height+x, left+width-y, top+height-x]
-        elsif Math::PI <= angle and angle < Math::PI*1.5
-          args = [left+width-x, top+height+y, left+width+x, top+height-y]
-        elsif Math::PI*1.5 <= angle and angle < Math::PI*2.0
-          args = [left+width-y, top+height-x, left+width+y, top+height+x]
+        if 0 <= angle && angle < Math::PI * 0.5
+          args = [left + width + x, top + height - y, left + width - x, top + height + y]
+        elsif Math::PI * 0.5 <= angle && angle < Math::PI
+          args = [left + width + y, top + height + x, left + width - y, top + height - x]
+        elsif Math::PI <= angle && angle < Math::PI * 1.5
+          args = [left + width - x, top + height + y, left + width + x, top + height - y]
+        elsif Math::PI * 1.5 <= angle && angle < Math::PI * 2.0
+          args = [left + width - y, top + height - x, left + width + y, top + height + x]
         end
         args
       end
@@ -80,12 +81,12 @@ class Shoes
         end
         my_angle = angle % (Math::PI * 0.5)
         length = Math.sqrt(my_width**2 + my_height**2)
-        b      = (my_height==0 and my_width==0) ? 0 : Math.atan(my_height/my_width)
-        c      = Math::PI*0.5 - my_angle - b
+        b      = (my_height == 0 && my_width == 0) ? 0 : Math.atan(my_height / my_width)
+        c      = Math::PI * 0.5 - my_angle - b
         r      = length * Math.cos(c.abs)
-        x      = r * Math.cos(b+c)
-        y      = r * Math.sin(b+c)
-        return x, y
+        x      = r * Math.cos(b + c)
+        y      = r * Math.sin(b + c)
+        [x, y]
       end
     end
   end

data/lib/shoes/swt/image.rb

@@ -11,8 +11,6 @@ class Shoes
       include Common::Remove
       include ::Shoes::BackendDimensionsDelegations
 
-      BINARY_ENCODING = Encoding.find('binary')
-
       attr_reader :parent, :real, :dsl, :painter
 
       def initialize(dsl, parent)
@@ -29,6 +27,7 @@ class Shoes
       end
 
       private
+
       def load_image(name_or_data)
         if url?(name_or_data)
           save_width_and_height
@@ -40,7 +39,7 @@ class Shoes
       end
 
       def url?(name_or_data)
-        name_or_data =~ /^(http|https):\/\//
+        @dsl.url?(name_or_data)
       end
 
       def save_width_and_height
@@ -102,7 +101,7 @@ class Shoes
       end
 
       def raw_image_data?(name_or_data)
-        name_or_data.encoding == BINARY_ENCODING
+        @dsl.raw_image_data?(name_or_data)
       end
 
       def load_raw_image_data(name_or_data)
@@ -122,7 +121,6 @@ class Shoes
         end
         app.add_paint_listener(@painter)
       end
-
     end
   end
 end

data/lib/shoes/swt/image_pattern.rb

@@ -19,11 +19,11 @@ class Shoes
         @pattern ||= ::Swt::Pattern.new(Shoes.display, @image)
       end
 
-      def apply_as_fill(gc, left, top, width, height, angle = 0)
+      def apply_as_fill(gc, _left, _top, _width, _height, _angle = 0)
         gc.set_background_pattern pattern
       end
 
-      def apply_as_stroke(gc, left, top, width, height, angle = 0)
+      def apply_as_stroke(gc, _left, _top, _width, _height, _angle = 0)
         gc.set_foreground_pattern pattern
       end
     end

data/lib/shoes/swt/input_box.rb

@@ -45,11 +45,12 @@ class Shoes
       end
 
       private
+
       def nothing_changed?(event)
         source = event.source
         event.instance_of?(Java::OrgEclipseSwtEvents::ModifyEvent) &&
-        source.instance_of?(Java::OrgEclipseSwtWidgets::Text) &&
-        source.text == @last_text
+          source.instance_of?(Java::OrgEclipseSwtWidgets::Text) &&
+          source.text == @last_text
       end
     end
 
@@ -68,6 +69,5 @@ class Shoes
         super(dsl, parent, DEFAULT_STYLES)
       end
     end
-
   end
 end

data/lib/shoes/swt/key_listener.rb

@@ -9,11 +9,11 @@ class Shoes
 
       SPECIAL_KEY_NAMES = {}
 
-      %w[TAB PAGE_UP PAGE_DOWN HOME END F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12
-         F13 F14 F15].each do|key|
+      %w(TAB PAGE_UP PAGE_DOWN HOME END F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12
+         F13 F14 F15).each do|key|
         SPECIAL_KEY_NAMES[get_swt_constant key] = key.downcase
       end
-      %w[UP DOWN LEFT RIGHT].each do |key|
+      %w(UP DOWN LEFT RIGHT).each do |key|
         SPECIAL_KEY_NAMES[get_swt_constant "ARROW_#{key}"] = key.downcase
       end
 
@@ -22,11 +22,11 @@ class Shoes
       SPECIAL_KEY_NAMES[::Swt::SWT::ESC] = "escape"
       SPECIAL_KEY_NAMES[::Swt::SWT::CR]  = "\n"
 
-      MODIFIER_KEYS = %w[CTRL SHIFT ALT CAPS_LOCK COMMAND].map do |key|
+      MODIFIER_KEYS = %w(CTRL SHIFT ALT CAPS_LOCK COMMAND).map do |key|
         get_swt_constant key
       end
 
-      def initialize(dsl, app, &blk)
+      def initialize(_dsl, app, &blk)
         @block = blk
         @app = app
         @app.add_key_listener(self)
@@ -45,7 +45,7 @@ class Shoes
       end
 
       BUTTON_EXCLUDES = ["\n", " "]
-      COMBO_EXCLUDES  = %w[up down] + BUTTON_EXCLUDES
+      COMBO_EXCLUDES  = %w(up down) + BUTTON_EXCLUDES
 
       # For a variety of SWT controls, certain characters should not be passed
       # to Shoes key listeners, since they're already handled by the controls.

data/lib/shoes/swt/line.rb

@@ -9,50 +9,30 @@ class Shoes
       include ::Shoes::BackendDimensionsDelegations
 
       attr_reader :dsl, :app
-      attr_reader :translated_point_a, :translated_point_b
       attr_reader :transform
 
-      # @param [Shoes::Line] dsl The {Shoes::Line} implemented by this object
-      # @param [Shoes::Swt::App] app The {Swt::App} this object belongs to
-      # @param [Shoes::Point] point_a One endpoint of the line
-      # @param [Shoes::Point] point_b The other endpoint of the line
       def initialize(dsl, app)
         @dsl, @app = dsl, app
-        translate_according_to_enclosing_box
         @painter = Painter.new(self)
         @app.add_paint_listener(@painter)
-      end
 
-      def dispose
-        @transform.dispose unless @transform.disposed?
+        @transform = nil # Not necessary for this shape
       end
 
       def angle
         @dsl.angle
       end
 
-      def update_position
-        translate_according_to_enclosing_box
-      end
-
       private
-      def translate_according_to_enclosing_box
-        @translated_point_a = @dsl.point_a.to(-left, -top)
-        @translated_point_b = @dsl.point_b.to(-left, -top)
-        @transform          = ::Swt::Transform.new(::Swt.display)
-        @transform_elements = Java::float[6].new
-        @transform.get_elements @transform_elements
-        @transform.set_elements @transform_elements[0], @transform_elements[1], @transform_elements[2], @transform_elements[3], dsl.element_left, dsl.element_top
-      end
 
       class Painter < Common::Painter
         def draw(gc)
-          point_a, point_b = @obj.translated_point_a, @obj.translated_point_b
-          gc.draw_line(point_a.x, point_a.y, point_b.x, point_b.y)
+          gc.draw_line(@obj.element_left, @obj.element_top,
+                       @obj.element_right + 1, @obj.element_bottom + 1)
         end
 
         # Don't do fill setup
-        def fill_setup(gc)
+        def fill_setup(_gc)
         end
       end
     end

data/lib/shoes/swt/link.rb

@@ -13,7 +13,7 @@ class Shoes
 
       def remove
         @link_segments.clear
-        remove_listener_for self, ::Swt::SWT::MouseDown
+        app.click_listener.remove_listeners_for(self)
       end
 
       def create_links_in(text_segment_ranges)
@@ -24,7 +24,7 @@ class Shoes
       end
 
       def in_bounds?(x, y)
-        @link_segments.any? {|segment| segment.in_bounds?(x, y)}
+        @link_segments.any? { |segment| segment.in_bounds?(x, y) }
       end
     end
   end

data/lib/shoes/swt/link_segment.rb

@@ -32,7 +32,7 @@ class Shoes
       end
 
       def line_bounds
-        (0..layout.line_count-1).map do |index|
+        (0..layout.line_count - 1).map do |index|
           layout.line_bounds(index)
         end
       end
@@ -71,7 +71,7 @@ class Shoes
       end
 
       def in_bounds?(x, y)
-        @regions.any? {|region| region.in_bounds?(x, y)}
+        @regions.any? { |region| region.in_bounds?(x, y) }
       end
 
       def start_position
@@ -103,7 +103,7 @@ class Shoes
         end
 
         def in_bounds?(x, y)
-          (@start_x..@end_x).include?(x) and (@start_y..@end_y).include?(y)
+          (@start_x..@end_x).include?(x) && (@start_y..@end_y).include?(y)
         end
       end
     end

data/lib/shoes/swt/list_box.rb

@@ -21,14 +21,14 @@ class Shoes
           ::Swt::SWT::DROP_DOWN | ::Swt::SWT::READ_ONLY
         )
         @real.set_size dsl.element_width, dsl.element_height
-        @real.add_selection_listener do |event|
+        @real.add_selection_listener do |_event|
           @dsl.call_change_listeners
         end
-        update_items @dsl.items
+        update_items
       end
 
-      def update_items(values)
-        @real.items = values.map(&:to_s)
+      def update_items
+        @real.items = @dsl.items.map(&:to_s)
       end
 
       def text

data/lib/shoes/swt/mouse_move_listener.rb

@@ -3,19 +3,20 @@ class Shoes
     class MouseMoveListener
       include ::Swt::Events::MouseMoveListener
 
-      def initialize app
+      def initialize(app)
         @app = app
       end
 
       def mouse_move(mouse_event)
         @app.dsl.mouse_pos = [mouse_event.x, mouse_event.y]
-        @app.dsl.mouse_motion.each{|blk| eval_move_block blk, mouse_event}
+        @app.dsl.mouse_motion.each { |blk| eval_move_block blk, mouse_event }
         mouse_shape_control mouse_event
         mouse_leave_control mouse_event
         mouse_hover_control mouse_event
       end
 
       private
+
       def eval_move_block(blk, event)
         blk.call event.x, event.y
       end
@@ -26,12 +27,12 @@ class Shoes
                  else
                    ::Swt::SWT::CURSOR_ARROW
                  end
-        @app.shell.setCursor  Shoes.display.getSystemCursor(cursor)
+        @app.shell.setCursor Shoes.display.getSystemCursor(cursor)
       end
 
       def mouse_leave_control(mouse_event)
         @app.dsl.mouse_hover_controls.each do |element|
-          if !mouse_on?(element, mouse_event) and element.hovered?
+          if !mouse_on?(element, mouse_event) && element.hovered?
             element.mouse_left
           end
         end
@@ -39,7 +40,7 @@ class Shoes
 
       def mouse_hover_control(mouse_event)
         @app.dsl.mouse_hover_controls.each do |element|
-          if mouse_on?(element, mouse_event) and !element.hovered?
+          if mouse_on?(element, mouse_event) && !element.hovered?
             element.mouse_hovered
           end
         end

data/lib/shoes/swt/oval.rb

@@ -11,7 +11,6 @@ class Shoes
 
       attr_reader :dsl, :app, :transform, :painter, :container
 
-
       # @param [Shoes::Oval] dsl the dsl object to provide gui for
       # @param [Shoes::Swt::App] app the app
       # @param [Hash] opts options
@@ -43,8 +42,8 @@ class Shoes
 
         def draw(graphics_context)
           sw = graphics_context.get_line_width
-          graphics_context.draw_oval(@obj.element_left+sw/2, @obj.element_top+sw/2,
-                                     @obj.element_width-sw, @obj.element_height-sw)
+          graphics_context.draw_oval(@obj.element_left + sw / 2, @obj.element_top + sw / 2,
+                                     @obj.element_width - sw, @obj.element_height - sw)
         end
       end
     end

data/lib/shoes/swt/packager.rb

@@ -0,0 +1,82 @@
+class Shoes
+  module Swt
+    class Packager
+      def initialize(dsl)
+        @dsl = dsl
+      end
+
+      def create_package(program_name, package)
+        unless package =~ /^(swt):(app|jar)$/
+          abort("#{program_name}: Can't package as '#{package}'. See '#{program_name} --help'")
+        end
+        package.split(':')
+      end
+
+      def run(path)
+        begin
+          require 'shoes/package/configuration'
+          require 'shoes/package/jar'
+          require 'shoes/package/jar_app'
+          master_config = ::Shoes::Package::Configuration.load(path)
+        rescue Errno::ENOENT => e
+          abort "shoes: #{e.message}"
+        end
+
+        @dsl.packages.each do |backend, wrapper|
+          puts "Packaging #{backend}:#{wrapper}..."
+          config = create_config(master_config, backend)
+          packager = create_packager(config, wrapper)
+          packager.package
+        end
+      end
+
+      def help(program_name)
+        <<-EOS
+
+    Package types:
+#{package_types}
+    Examples:
+#{examples(program_name)}
+        EOS
+      end
+
+      def package_types()
+        <<-EOS
+    swt:app     A standalone OS X executable with the Swt backend
+    swt:jar     An executable JAR with the Swt backend
+        EOS
+      end
+
+      def examples(program_name)
+        <<-EOS
+    To run a Shoes app:
+      #{program_name} path/to/shoes-app.rb
+
+    Two ways to package a Shoes app as an APP and a JAR, using the Swt backend:
+      #{program_name} -p swt:app -p swt:jar path/to/app.yaml
+      #{program_name} -p swt:app -p swt:jar path/to/shoes-app.rb
+          EOS
+      end
+
+      private
+      # Copy the master config (including singleton class), since we may be
+      # packaging for more than one backend
+      def create_config(master_config, backend)
+        config = master_config.clone
+        config.gems << "shoes-#{backend}"
+        config
+      end
+
+      def create_packager(config, wrapper)
+        case wrapper
+        when 'jar'
+          ::Furoshiki::Jar.new(config)
+        when 'app'
+          ::Furoshiki::JarApp.new(config)
+        else
+          abort "shoes: Don't know how to make #{backend}:#{wrapper} packages"
+        end
+      end
+    end
+  end
+end