shoes-core 4.0.0.pre3 → 4.0.0.pre4

data/lib/shoes/internal_app.rb

@@ -83,13 +83,12 @@ class Shoes
       true
     end
 
-    def fullscreen=(state)
-      gui.fullscreen = state
-    end
+    delegated_to_gui = %w(
+      fullscreen= fullscreen quit scroll_top= scroll_top
+      clipboard clipboard= gutter
+    )
 
-    def fullscreen
-      gui.fullscreen
-    end
+    def_delegators :gui, *delegated_to_gui
 
     alias_method :start_as_fullscreen?, :start_as_fullscreen
 
@@ -99,35 +98,14 @@ class Shoes
     end
 
     def add_mouse_hover_control(element)
-      unless mouse_hover_controls.include? element
-        mouse_hover_controls << element
-      end
+      return if mouse_hover_controls.include?(element)
+      mouse_hover_controls << element
     end
 
     def open_gui
       gui.open
     end
 
-    def quit
-      @gui.quit
-    end
-
-    def scroll_top
-      gui.scroll_top
-    end
-
-    def scroll_top=(n)
-      gui.scroll_top = n
-    end
-
-    def clipboard
-      gui.clipboard
-    end
-
-    def clipboard=(str)
-      gui.clipboard = str
-    end
-
     def download(url, opts, &block)
       app.download url, opts, &block
     end
@@ -140,16 +118,12 @@ class Shoes
       app.instance_eval(&blk)
     end
 
-    def gutter
-      gui.gutter
-    end
-
     def add_resize_callback(blk)
       @resize_callbacks << blk
     end
 
-    def inspect
-      super.insert(-2, " \"#{@app_title}\" #{@dimensions.inspect})")
+    def inspect_details
+      "\"#{@app_title}\" #{@dimensions.inspect}"
     end
 
     def self.global_keypresses
@@ -217,7 +191,7 @@ class Shoes
     def setup_global_keypresses
       @app.keypress do |key|
         blk = self.class.global_keypresses[key]
-        @app.instance_eval(&blk) unless blk.nil?
+        execute_block(blk) if blk
       end
     end
 
@@ -226,5 +200,11 @@ class Shoes
         Logger.setup
       end
     end
+
+    def update_fill
+    end
+
+    def update_stroke
+    end
   end
 end

data/lib/shoes/line.rb

@@ -1,26 +1,45 @@
+require 'matrix'
+
 class Shoes
   class Line
     include Common::UIElement
+    include Common::Stroke
     include Common::Style
     include Common::Clickable
 
-    attr_reader :app, :parent, :dimensions, :gui, :point_a, :point_b
+    attr_reader :point_a, :point_b
 
     style_with :angle, :art_styles, :dimensions, :x2, :y2
-    STYLES = { angle: 0 }
+    STYLES = { angle: 0, fill: Shoes::COLORS[:black] }
 
-    def initialize(app, parent, point_a, point_b, styles = {}, blk = nil)
-      @app     = app
-      @parent  = parent
+    def create_dimensions(point_a, point_b)
       @point_a = point_a
       @point_b = point_b
 
-      style_init styles, x2: point_b.x, y2: point_b.y
       enclosing_box_of_line
 
-      @parent.add_child self
-      @gui = Shoes.backend_for self
-      register_click blk
+      style[:x2] = point_b.x
+      style[:y2] = point_b.y
+    end
+
+    # Check out http://math.stackexchange.com/questions/60070/checking-whether-a-point-lies-on-a-wide-line-segment
+    # for explanations how the algorithm works
+    def in_bounds?(x, y)
+      # c is (x, y)
+      left_most, right_most = point_a.x < point_b.x ? [point_a, point_b] : [point_b, point_a]
+      left_c = Vector.elements((left_most - [x, y]).to_a, false)
+      left_right = Vector.elements((left_most - right_most).to_a, false)
+
+      boldness = style[:strokewidth].to_i / 2
+      left_c_dot_left_right = left_c.inner_product(left_right)
+      left_right_dot_left_right = left_right.inner_product(left_right)
+
+      if left_c_dot_left_right.between?(0, left_right_dot_left_right)
+        left_c_dot_left_c = left_c.inner_product(left_c)
+        left_right_dot_left_right * left_c_dot_left_c <= boldness ** 2 * left_right_dot_left_right + left_c_dot_left_right ** 2
+      else
+        false
+      end
     end
 
     def update_style(new_styles)
@@ -47,7 +66,7 @@ class Shoes
     alias_method :x2=, :right=
     alias_method :y2=, :bottom=
 
-    def move(x, y, x2=nil, y2=nil)
+    def move(x, y, x2 = nil, y2 = nil)
       @point_a.x = x
       @point_a.y = y
       @point_b.x = x2 if x2

data/lib/shoes/link.rb

@@ -47,11 +47,22 @@ class Shoes
     end
 
     def hidden?
-      @text_block.hidden?
+      text_block_guard && @text_block.hidden?
     end
 
     def visible?
-      @text_block.visible?
+      text_block_guard && @text_block.visible?
+    end
+
+    private
+
+    def text_block_guard
+      if @text_block
+        true
+      else
+        @app.warn 'Stray link without TextBlock detected! Links have to be part of a text block like a para or title'
+        false
+      end
     end
   end
 end

data/lib/shoes/list_box.rb

@@ -1,27 +1,49 @@
 class Shoes
+  class ProxyArray < SimpleDelegator
+    attr_accessor :gui
+
+    def initialize(array, gui)
+      @gui = gui
+      super(array)
+    end
+
+    def method_missing(method, *args, &block)
+      res = super(method, *args, &block)
+      gui.update_items
+
+      case res
+      when ProxyArray, Array
+        self
+      else
+        res
+      end
+    end
+
+    def to_a
+      __getobj__
+    end
+  end
+
   class ListBox
     include Common::UIElement
     include Common::Style
     include Common::Changeable
 
-    attr_reader :app, :parent, :dimensions, :gui
     style_with :change, :choose, :common_styles, :dimensions, :items, :state, :text
     STYLES = { width: 200, height: 20, items: [""] }
 
-    def initialize(app, parent, styles = {}, blk = nil)
-      @app = app
-      @parent = parent
-      style_init styles
-      @dimensions = Dimensions.new parent, @style
-      @parent.add_child self
-      @gui = Shoes.configuration.backend_for self, @parent.gui
+    def handle_block(blk)
       change(&blk) if blk
+    end
 
-      choose @style[:choose]
+    def after_initialize
+      proxy_array = Shoes::ProxyArray.new(items, @gui)
+      @style[:items] = proxy_array
     end
 
-    def items=(values)
-      style(items: values)
+    def items=(vanilla_array)
+      proxy_array = Shoes::ProxyArray.new(vanilla_array, @gui)
+      style(items: proxy_array)
       @gui.update_items
     end
 

data/lib/shoes/logger.rb

@@ -18,19 +18,18 @@ class Shoes
     def self.setup
       Shoes.app do
         def update
-          if @hash != Shoes::LOG.hash
-            @hash = Shoes::LOG.hash
-            @log.clear do
-              Shoes::LOG.each_with_index do |(typ, msg), index|
-                stack do
-                  background "#f1f5e1" if index % 2 == 0
-                  background rgb(220, 220, 220) if index % 2 != 0
-                  para typ, stroke: blue
-                  flow do
-                    stack margin: 4 do
-                      s = msg.to_s
-                      para s, margin: 4, margin_top: 0
-                    end
+          return unless @hash == Shoes::LOG.hash
+          @hash = Shoes::LOG.hash
+          @log.clear do
+            Shoes::LOG.each_with_index do |(typ, msg), index|
+              stack do
+                background "#f1f5e1" if index.even?
+                background rgb(220, 220, 220) if index.odd?
+                para typ, stroke: blue
+                flow do
+                  stack margin: 4 do
+                    s = msg.to_s
+                    para s, margin: 4, margin_top: 0
                   end
                 end
               end

data/lib/shoes/mock/arc.rb

@@ -1,7 +1,9 @@
 class Shoes
   module Mock
     class Arc
+      include Shoes::Mock::CommonMethods
       include Shoes::Mock::Clickable
+
       def initialize(_dsl, _app, _opts = {})
       end
     end

data/lib/shoes/mock/common_methods.rb

@@ -7,6 +7,15 @@ class Shoes
 
       def update_position
       end
+
+      def update_visibility
+      end
+
+      def update_fill
+      end
+
+      def update_stroke
+      end
     end
   end
 end

data/lib/shoes/mock/shape.rb

@@ -13,7 +13,7 @@ class Shoes
       def curve_to(*_args)
       end
 
-      def arc(*_args)
+      def arc_to(*_args)
       end
     end
   end

data/lib/shoes/mock/slot.rb

@@ -1,6 +1,7 @@
 class Shoes
   module Mock
     class Slot
+      include Shoes::Mock::CommonMethods
       include Shoes::Mock::Clickable
 
       def initialize(dsl, parent)

data/lib/shoes/oval.rb

@@ -1,20 +1,25 @@
 class Shoes
   class Oval
     include Common::UIElement
+    include Common::Fill
+    include Common::Stroke
     include Common::Style
     include Common::Clickable
 
-    attr_reader :app, :parent, :dimensions, :gui
     style_with :art_styles, :center, :common_styles, :dimensions, :radius
+    STYLES = { fill: Shoes::COLORS[:black] }
+
+    def create_dimensions(left, top, width, height)
+      left   ||= @style[:left]
+      top    ||= @style[:top]
+      width  ||= @style[:diameter] || @style[:width] || (@style[:radius] || 0) * 2
+      height ||= @style[:height] || width
 
-    def initialize(app, parent, left, top, width, height, styles = {}, blk = nil)
-      @app = app
-      @parent = parent
-      style_init styles
       @dimensions = AbsoluteDimensions.new left, top, width, height, @style
-      @parent.add_child self
-      @gui = Shoes.backend_for self
-      register_click blk
+    end
+
+    def needs_rotate?
+      rotate != 0
     end
   end
 end

data/lib/shoes/packager.rb

@@ -3,7 +3,11 @@ class Shoes
     attr_reader :packages, :backend
 
     def initialize
-      @backend = Shoes.configuration.backend_for(self)
+      begin
+        @backend = Shoes.configuration.backend_for(self)
+      rescue ArgumentError
+        # Packaging unsupported by this backend
+      end
       @packages = []
     end
 
@@ -16,10 +20,12 @@ class Shoes
     end
 
     def run(path)
+      raise "Packaging unsupported by this backend" if @backend.nil?
       @backend.run(path)
     end
 
     def help(program_name)
+      return "" if @backend.nil?
       @backend.help(program_name)
     end
   end

data/lib/shoes/point.rb

@@ -4,6 +4,7 @@ class Shoes
 
     def initialize(x, y)
       @x, @y = x, y
+      @dimensions = 2
     end
 
     attr_accessor :x, :y
@@ -30,6 +31,18 @@ class Shoes
       Shoes::Point.new(@x + x, @y + y)
     end
 
+    def +(other)
+      other = other.to_a
+      assert_dimensions_match(other.length)
+      Shoes::Point.new(x + other[0], y + other[1])
+    end
+
+    def -(other)
+      other = other.to_a
+      assert_dimensions_match(other.length)
+      Shoes::Point.new(x - other[0], y - other[1])
+    end
+
     def width(other = self)
       (@x - other.x).abs
     end
@@ -39,7 +52,7 @@ class Shoes
     end
 
     def ==(other)
-      other.respond_to?(:x) && @x == other.x && other.respond_to?(:y) && @y == other.y
+      other.respond_to?(:x, :y) && [x, y] == [other.x, other.y]
     end
 
     def to_s
@@ -47,8 +60,18 @@ class Shoes
       "(#{@x || nothing},#{@y || nothing})"
     end
 
-    def inspect
-      super.insert(-2, " #{self}")
+    def to_a
+      [x, y]
+    end
+
+    private
+
+    def inspect_details
+      " #{self}"
+    end
+
+    def assert_dimensions_match(other_dimension)
+      raise ArgumentError, "Dimensions mismatch: expected #{@dimensions}D point, given #{other_dimension}D point" if @dimensions != other_dimension
     end
   end
 end

data/lib/shoes/progress.rb

@@ -3,18 +3,16 @@ class Shoes
     include Common::UIElement
     include Common::Style
 
-    attr_reader :app, :parent, :dimensions, :gui
     style_with :common_styles, :dimensions, :fraction
     STYLES = { fraction: 0.0 }
 
-    def initialize(app, parent, styles = {}, _blk = nil)
-      @app = app
-      @parent = parent
-      style_init styles
-      @dimensions = Dimensions.new parent, @style
-      @parent.add_child self
-      @gui = Shoes.configuration.backend_for self, @parent.gui
+    def after_initialize(*_)
       @gui.fraction = @style[:fraction]
+      update_visibility
+    end
+
+    def handle_block(*_)
+      # No-op since we're not clickable
     end
 
     def fraction=(value)

data/lib/shoes/rect.rb

@@ -1,21 +1,25 @@
 class Shoes
   class Rect
     include Common::UIElement
-    include Common::Style
+    include Common::Fill
+    include Common::Stroke
     include Common::Clickable
+    include Common::Style
 
-    attr_reader :app, :parent, :dimensions, :gui
     style_with :angle, :art_styles, :curve, :common_styles, :dimensions
-    STYLES = { angle: 0 }
+    STYLES = { angle: 0, curve: 0, fill: Shoes::COLORS[:black] }
+
+    def create_dimensions(left, top, width, height)
+      left   ||= @style[:left] || 0
+      top    ||= @style[:top] || 0
+      width  ||= @style[:width] || 0
+      height ||= @style[:height] || width
 
-    def initialize(app, parent, left, top, width, height, styles = {}, blk = nil)
-      @app = app
-      @parent = parent
-      style_init styles
       @dimensions = AbsoluteDimensions.new left, top, width, height, @style
-      @parent.add_child self
-      @gui = Shoes.backend_for self
-      register_click blk
+    end
+
+    def needs_rotate?
+      rotate != 0
     end
   end
 end

data/lib/shoes/shape.rb

@@ -1,28 +1,34 @@
 class Shoes
   class Shape
     include Common::UIElement
+    include Common::Fill
+    include Common::Stroke
     include Common::Style
     include Common::Clickable
 
-    attr_reader :app, :parent, :dimensions, :gui, :blk, :x, :y
-    attr_reader :left_bound, :top_bound, :right_bound, :bottom_bound
+    attr_reader :blk, :x, :y, :left_bound, :top_bound, :right_bound, :bottom_bound
+
     style_with :art_styles, :center, :common_styles, :dimensions
 
-    # Creates a new Shoes::Shape
-    #
-    def initialize(app, parent, styles = {}, blk = nil)
-      @app = app
-      @parent = parent
-      style_init styles
+    STYLES = { fill: Shoes::COLORS[:black] }
+
+    def create_dimensions()
       @dimensions = AbsoluteDimensions.new @style
-      @parent.add_child self
-      @gui = Shoes.backend_for self
+    end
+
+    def handle_block(blk)
+      # Will register click from styles if present, but blk is for drawing!
       register_click
 
       @blk = blk
-      # True until we've asked the pen to draw
+    end
+
+    def after_initialize(*_)
       @before_drawing = true
-      @app.eval_with_additional_context self, &blk
+      @app.eval_with_additional_context self, &@blk
+
+      # If we haven't drawn enough to get our bounds, default them out
+      update_bounds([0], [0]) if @left_bound.nil?
     end
 
     def width
@@ -93,13 +99,21 @@ class Shoes
     # @param [Integer] start_angle The start angle
     # @param [Integer] arc_angle The angular extent of the arc, relative to the start angle
     # @return [Shoes::Shape] This shape
-    def arc(x, y, width, height, start_angle, arc_angle)
+    def arc_to(x, y, width, height, start_angle, arc_angle)
       update_bounds_rect(x - width / 2, y - height / 2, x + width / 2, y + height / 2)
       @x, @y = x, y
-      @gui.arc(x, y, width, height, start_angle, arc_angle)
+      @gui.arc_to(x, y, width, height, start_angle, arc_angle)
       self
     end
 
+    # Determines if a given point is in the boundary of the shape. Given the
+    # many possibilities of what a shape could contain, this just checks the
+    # outer bounding box of the shape, nothing more sophisticated.
+    def in_bounds?(x, y)
+      (@left_bound..@right_bound).include?(x) &&
+        (@top_bound..@bottom_bound).include?(y)
+    end
+
     private
 
     # Updates the bounds of this shape to include the rectangle described by

data/lib/shoes/slot.rb

@@ -10,30 +10,32 @@ class Shoes
     NEXT_ELEMENT_OFFSET = 1
 
     attr_reader :parent, :dimensions, :gui, :contents, :blk, :hover_proc, :leave_proc
+
     style_with :art_styles, :attach, :common_styles, :dimensions, :scroll
-    STYLES = { scroll: false }
+    STYLES = { scroll: false, fill: Shoes::COLORS[:black] }
 
-    def initialize(app, parent, styles = {}, blk = nil)
-      init_attributes(app, parent, styles, blk)
-      @parent.add_child self
-      @gui = Shoes.configuration.backend_for self, @parent.gui
-      eval_block blk
-      contents_alignment
-    end
+    def create_dimensions(*args)
+      super(*args)
 
-    def init_attributes(app, parent, styles, blk)
-      @app            = app
-      @parent         = parent
-      @contents       = SlotContents.new
-      @blk            = blk
-      style_init styles
-      @dimensions     = Dimensions.new parent, @style
-      @fixed_height   = height || false
-      @scroll_top     = 0
+      @fixed_height = height || false
+      @scroll_top   = 0
       set_default_dimension_values
       @pass_coordinates = true
     end
 
+    def before_initialize(*_)
+      @contents = SlotContents.new
+    end
+
+    def handle_block(blk)
+      @blk = blk
+      eval_block blk
+    end
+
+    def after_initialize(*_)
+      contents_alignment
+    end
+
     def set_default_dimension_values
       self.width          ||= 1.0
       self.height         ||= 0
@@ -54,7 +56,7 @@ class Shoes
     end
 
     def create_bound_block(blk)
-      Proc.new do |*args|
+      proc do |*args|
         eval_block(blk, *args)
       end
     end
@@ -150,6 +152,13 @@ class Shoes
       else
         current_position
       end
+    rescue => e
+      puts "SWALLOWED POSITIONING EXCEPTION ON #{element} - go take care of it: " + e.to_s
+      puts e.backtrace.join("\n\t")
+      puts 'Unfortunately we have to swallow it or risk SWT hanging.'
+      puts "It doesn't like exceptions during layout. :O"
+
+      current_position
     end
 
     def position_element(_element, _current_position)
@@ -203,9 +212,9 @@ class Shoes
 
     def absolute_x_position(element)
       if element.absolute_left_position?
-        self.element_left + element.left
+        element_left + element.left
       elsif element.absolute_right_position?
-        self.element_right - (element.right + element.width)
+        element_right - (element.right + element.width)
       end
     end
 
@@ -219,11 +228,11 @@ class Shoes
 
     def absolute_y_position(element)
       if element.absolute_top_position?
-        self.element_top + element.top
+        element_top + element.top
       elsif element.absolute_bottom_position?
         # TODO: slots grow... to really position it relative to the bottom
         # we probably need to position it after everything has been positioned
-        self.element_bottom - (element.bottom + element.height)
+        element_bottom - (element.bottom + element.height)
       end
     end
 
@@ -235,7 +244,7 @@ class Shoes
 
     def determine_slot_height
       content_height = compute_content_height
-      self.height = content_height if has_variable_height?
+      self.height = content_height if variable_height?
       content_height
     end
 
@@ -253,7 +262,7 @@ class Shoes
       end
     end
 
-    def has_variable_height?
+    def variable_height?
       !@fixed_height
     end
   end