reflexion 0.1.21 → 0.1.25

data/lib/reflex/module.rb

@@ -8,23 +8,23 @@ module Reflex
 
     module_function
 
-    def name ()
+    def name()
       super.split('::')[-2]
     end
 
-    def version ()
+    def version()
       open(root_dir 'VERSION') {|f| f.readline.chomp}
     end
 
-    def root_dir (path = '')
+    def root_dir(path = '')
       File.expand_path "../../#{path}", __dir__
     end
 
-    def inc_dir ()
+    def inc_dir()
       root_dir 'include'
     end
 
-    def lib_dir ()
+    def lib_dir()
       root_dir 'lib'
     end
 

data/lib/reflex/pointer.rb

@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/bit_flag_accessor'
+require 'xot/const_symbol_accessor'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class Pointer
+
+    include Comparable
+
+    alias types  get_type
+    alias action get_action
+
+    bit_flag_reader :types, **{
+      none:         TYPE_NONE,
+      mouse:        MOUSE,
+      mouse_left:   MOUSE_LEFT,
+      mouse_right:  MOUSE_RIGHT,
+      mouse_middle: MOUSE_MIDDLE,
+      touch:        TOUCH,
+      pen:          PEN
+    }
+
+    const_symbol_reader :action, **{
+      none:   ACTION_NONE,
+      down:   DOWN,
+      up:     UP,
+      move:   MOVE,
+      cancel: CANCEL,
+      stay:   STAY
+    }
+
+    def mouse?()
+      (get_type & MOUSE) != 0
+    end
+
+    def mouse_left?()
+      (get_type & MOUSE_LEFT) != 0
+    end
+
+    def mouse_right?()
+      (get_type & MOUSE_RIGHT) != 0
+    end
+
+    def mouse_middle?()
+      (get_type & MOUSE_MIDDLE) != 0
+    end
+
+    alias left?   mouse_left?
+    alias right?  mouse_right?
+    alias middle? mouse_middle?
+
+    def touch?()
+      (get_type & TOUCH) != 0
+    end
+
+    def pen?()
+      (get_type & PEN) != 0
+    end
+
+    def down?()
+      get_action == DOWN
+    end
+
+    def up?()
+      get_action == UP
+    end
+
+    def move?()
+      get_action == MOVE
+    end
+
+    def cancel?()
+      get_action == CANCEL
+    end
+
+    def stay?()
+      get_action == STAY
+    end
+
+    alias pos position
+
+    def x()
+      position.x
+    end
+
+    def y()
+      position.y
+    end
+
+    def <=>(o)
+      inspect <=> o.inspect
+    end
+
+    def inspect()
+      "#<Reflex::Pointer id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
+    end
+
+  end# Pointer
+
+
+end# Reflex

data/lib/reflex/pointer_event.rb

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-require 'xot/bit_flag_accessor'
-require 'xot/const_symbol_accessor'
+require 'forwardable'
 require 'reflex/ext'
 
 
@@ -11,65 +10,28 @@ module Reflex
 
   class PointerEvent < Event
 
-    alias pos position
+    extend Forwardable
 
-    alias get_type         type
-    alias get_pointer_type pointer_type
+    def_delegators :first,
+      :id,
+      :types, :mouse?, :touch?, :pen?,
+      :mouse_left?, :left?, :mouse_right?, :right?, :mouse_middle?, :middle?,
+      :action, :down?, :up?, :move?, :cancel?, :stay?,
+      :position, :pos, :x, :y, :modifiers, :click_count, :drag?,
+      :time, :prev
 
-    const_symbol_reader :type, {
-      none: TYPE_NONE,
-      down: TYPE_DOWN,
-      up:   TYPE_UP,
-      move: TYPE_MOVE
-    }
-
-    bit_flag_reader :pointer_type, {
-      none:         POINTER_NONE,
-      mouse_left:   POINTER_MOUSE_LEFT,
-      mouse_right:  POINTER_MOUSE_RIGHT,
-      mouse_middle: POINTER_MOUSE_MIDDLE,
-      touch:        POINTER_TOUCH,
-      pen:          POINTER_PEN
-    }
-
-    def down? ()
-      get_type == TYPE_DOWN
-    end
-
-    def up? ()
-      get_type == TYPE_UP
-    end
-
-    def move? ()
-      get_type == TYPE_MOVE
-    end
-
-    def left? ()
-      (get_pointer_type & POINTER_MOUSE_LEFT) != 0
+    def pointers()
+      to_enum :each
     end
 
-    def right? ()
-      (get_pointer_type & POINTER_MOUSE_RIGHT) != 0
+    def inspect()
+      "#<Reflex::PointerEvent id:#{id} #{type} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
     end
 
-    def middle? ()
-      (get_pointer_type & POINTER_MOUSE_MIDDLE) != 0
-    end
-
-    def touch? ()
-      (get_pointer_type & POINTER_TOUCH) != 0
-    end
-
-    def pen? ()
-      (get_pointer_type & POINTER_PEN) != 0
-    end
-
-    def positions ()
-      size.times.map {|i| position i}
-    end
+    private
 
-    def inspect ()
-      "#<Reflex::PointerEvent type:#{type}/#{pointer_type} x:#{x} y:#{y} size:#{size} mod:#{modifiers} count:#{count} drag:#{drag?}>"
+    def first()
+      self[0]
     end
 
   end# PointerEvent

data/lib/reflex/polygon_shape.rb

@@ -12,8 +12,8 @@ module Reflex
 
     universal_accessor :polygon
 
-    def initialize (polygon, *args, &block)
-      super *args, &block
+    def initialize(polygon, *args, &block)
+      super(*args, &block)
       self.polygon = polygon
     end
 

data/lib/reflex/reflex.rb

@@ -10,15 +10,15 @@ module Reflex
 
   extend module ClassMethods
 
-    def start (*args, &block)
+    def start(*args, &block)
       Application.new(*args, &block).start
     end
 
-    def quit ()
+    def quit()
       Application.instance.quit
     end
 
-    def window (*args, &block)
+    def window(*args, &block)
       Window.new(*args, &block).tap {|w| w.show}
     end
 

data/lib/reflex/scroll_event.rb

@@ -9,7 +9,7 @@ module Reflex
 
   class ScrollEvent < Event
 
-    def inspect ()
+    def inspect()
       "#<Reflex::ScrollEvent x:#{x} y:#{y} z:#{z} dx:#{dx} dy:#{dy} dz:#{dz}>"
     end
 

data/lib/reflex/selector.rb

@@ -15,22 +15,22 @@ module Reflex
     include Xot::Setter
     include HasTags
 
-    def self.selector (*args)
+    def self.selector(*args)
       arg0 = args.first
       arg0.kind_of?(Selector) ? arg0 : self.new(*args)
     end
 
-    def initialize (options = nil, &block)
+    def initialize(options = nil, &block)
       super()
       set options if options
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
-    def to_s ()
+    def to_s()
       "{name:#{name}, tags:[#{tags.to_a.join ', '}]}"
     end
 
-    def inspect ()
+    def inspect()
       "#<#{self.class} #{to_s}>"
     end
 

data/lib/reflex/shape.rb

@@ -24,36 +24,36 @@ module Reflex
       :density, :friction, :restitution, :sensor,
       :category_bits, :collision_mask
 
-    def initialize (options = nil, &block)
+    def initialize(options = nil, &block)
       super()
       set options if options
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
-    def on_contact (e)
+    def on_contact(e)
     end
 
-    def on_contact_begin (e)
+    def on_contact_begin(e)
     end
 
-    def on_contact_end (e)
+    def on_contact_end(e)
     end
 
     private
 
-      def on_contact! (*args)
-        call_contact! *args
-        owner&.delay {on_contact *args}# delay to avoid physics world lock
+      def on_contact!(*args)
+        call_contact!(*args)
+        owner&.delay {on_contact(*args)}# delay to avoid physics world lock
       end
 
-      def on_contact_begin! (*args)
-        call_contact_begin! *args
-        owner&.delay {on_contact_begin *args}
+      def on_contact_begin!(*args)
+        call_contact_begin!(*args)
+        owner&.delay {on_contact_begin(*args)}
       end
 
-      def on_contact_end! (*args)
-        call_contact_end! *args
-        owner&.delay {on_contact_end *args}
+      def on_contact_end!(*args)
+        call_contact_end!(*args)
+        owner&.delay {on_contact_end(*args)}
       end
 
   end# Shape

data/lib/reflex/style.rb

@@ -16,35 +16,35 @@ module Reflex
     include Xot::Setter
     include HasTags
 
-    def initialize (options = nil, &block)
+    def initialize(options = nil, &block)
       super()
       set options if options
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
-    def flow= (*syms)
-      set_flow *syms.flatten.map {|sym| sym2flow sym}
+    def flow=(*syms)
+      set_flow(*syms.flatten.map {|sym| sym2flow sym})
     end
 
-    def flow ()
+    def flow()
       get_flow.map {|n| flow2sym n}
     end
 
-    def foreground= (fill, stroke = nil)
+    def foreground=(fill, stroke = nil)
       self.foreground_fill   = fill
       self.foreground_stroke = stroke
     end
 
-    def foreground ()
+    def foreground()
       return foreground_fill, foreground_stroke
     end
 
-    def background= (fill, stroke = nil)
+    def background=(fill, stroke = nil)
       self.background_fill   = fill
       self.background_stroke = stroke
     end
 
-    def background ()
+    def background()
       return background_fill, background_stroke
     end
 
@@ -95,7 +95,7 @@ module Reflex
     alias stroke_width= foreground_stroke_width=
     alias stroke_width  foreground_stroke_width
 
-    def inspect ()
+    def inspect()
       attrs = {
         selector:   selector,
         flow:       flow,
@@ -123,11 +123,11 @@ module Reflex
 
       FLOW2SYM = SYM2FLOW.inject({}) {|h, (k, v)| h[v] = k; h}
 
-      def sym2flow (sym)
+      def sym2flow(sym)
         SYM2FLOW[sym] || FLOW_NONE
       end
 
-      def flow2sym (flow)
+      def flow2sym(flow)
         FLOW2SYM[flow] || :none
       end
 

data/lib/reflex/style_length.rb

@@ -9,7 +9,7 @@ module Reflex
 
   class StyleLength
 
-    def inspect ()
+    def inspect()
       "#<#{self.class.name} #{to_s}>"
     end
 

data/lib/reflex/text_view.rb

@@ -18,14 +18,14 @@ module Reflex
     alias text= data=
     alias text  data
 
-    def content_bounds ()
+    def content_bounds()
       s = string
       return 0, 0 unless s && window
       font = @font || window.painter.font
       [font.width(s), font.height].map &:ceil
     end
 
-    def on_draw (e)
+    def on_draw(e)
       s = string
       e.painter.push font: @font do
         text s

data/lib/reflex/timer.rb

@@ -14,13 +14,13 @@ module Reflex
 
     alias view owner
 
-    def inspect ()
+    def inspect()
       "#<Reflex::Timer owner:#{owner} id:#{id} interval:#{interval} count:#{count}>"
     end
 
     private
 
-      def call_timer_block ()
+      def call_timer_block()
         @block.call self if @block
       end
 

data/lib/reflex/timer_event.rb

@@ -15,11 +15,12 @@ module Reflex
     def_delegators :timer,
       :name=, :name,
       :add_tag, :remove_tag, :each_tag,
-      :selector=, :selector
+      :selector=, :selector,
+      :count=
 
     alias view owner
 
-    def inspect ()
+    def inspect()
       "#<Reflex::TimerEvent owner:#{owner} id:#{id} interval:#{interval} count:#{count}>"
     end
 

data/lib/reflex/update_event.rb

@@ -9,7 +9,7 @@ module Reflex
 
   class UpdateEvent < Event
 
-    def inspect ()
+    def inspect()
       "#<Reflex::UpdateEvent dt:#{dt}>"
     end
 

data/lib/reflex/view.rb

@@ -54,84 +54,84 @@ module Reflex
       flag :all,     CAPTURE_ALL
     end
 
-    def initialize (options = nil, &block)
+    def initialize(options = nil, &block)
       super()
       set options if options
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
-    def timeout (seconds = 0, count: 1, &block)
+    def timeout(seconds = 0, count: 1, &block)
       timer = start_timer seconds, count
       timer.block = block if block
       timer
     end
 
-    def interval (seconds = 0, &block)
+    def interval(seconds = 0, &block)
       timeout seconds, count: -1, &block
     end
 
-    def delay (seconds = 0, &block)
+    def delay(seconds = 0, &block)
       timeout seconds, &block
     end
 
-    def remove_self ()
+    def remove_self()
       parent.remove self if parent
     end
 
-    def find_child (*args)
+    def find_child(*args)
       find_children(*args).first
     end
 
-    def children ()
+    def children()
       to_enum :each_child
     end
 
-    def styles ()
+    def styles()
       to_enum :each_style
     end
 
-    def style (*args, &block)
+    def style(*args, &block)
       s = get_style args.empty? ? nil : Selector.selector(*args)
       Xot::BlockUtil.instance_eval_or_block_call s, &block if block
       s
     end
 
-    def shapes ()
+    def shapes()
       to_enum :each_shape
     end
 
-    def categories ()
+    def categories()
       @categories ||= Xot::BitFlag.new(auto: true, all: 1)
     end
 
-    def category= (*symbols)
-      set_category_bits parent_categories.symbols2bits *symbols
+    def category=(*symbols)
+      set_category_bits parent_categories.symbols2bits(*symbols)
     end
 
-    def category ()
+    def category()
       parent_categories.bits2symbols get_category_bits
     end
 
-    def collision= (*categories)
-      set_collision_mask parent_categories.symbols2bits *categories
+    def collision=(*categories)
+      set_collision_mask parent_categories.symbols2bits(*categories)
     end
 
-    def collision ()
+    def collision()
       parent_categories.bits2symbols get_collision_mask
     end
 
-    def capturing? (*args)
+    def capturing?(*args)
       cap = capture
       args.all? {|type| cap.include? type}
     end
 
-    def on_contact (e)
+    def on_contact(e)
     end
 
-    def on_contact_begin (e)
+    def on_contact_begin(e)
     end
 
-    def on_contact_end (e)
+    def on_contact_end(e)
     end
 
     universal_accessor :shape, :name, :selector, :frame, :angle, :zoom, :capture,
@@ -157,32 +157,32 @@ module Reflex
 
     alias meter  meter2pixel
 
-    def self.has_model ()
+    def self.has_model()
       include ModelView
     end
 
     protected
 
-      def parent_categories ()
+      def parent_categories()
         raise InvalidStateError unless parent
         parent.categories
       end
 
     private
 
-      def on_contact! (*args)
-        call_contact! *args
-        delay {on_contact *args}# delay to avoid physics world lock
+      def on_contact!(*args)
+        call_contact!(*args)
+        delay {on_contact(*args)}# delay to avoid physics world lock
       end
 
-      def on_contact_begin! (*args)
-        call_contact_begin! *args
-        delay {on_contact_begin *args}
+      def on_contact_begin!(*args)
+        call_contact_begin!(*args)
+        delay {on_contact_begin(*args)}
       end
 
-      def on_contact_end! (*args)
-        call_contact_end! *args
-        delay {on_contact_end *args}
+      def on_contact_end!(*args)
+        call_contact_end!(*args)
+        delay {on_contact_end(*args)}
       end
 
   end# View

data/lib/reflex/wheel_event.rb

@@ -9,16 +9,8 @@ module Reflex
 
   class WheelEvent < Event
 
-    def position ()
-      Point.new x, y, z
-    end
-
-    def delta ()
-      Point.new dx, dy, dz
-    end
-
-    def inspect ()
-      "#<Reflex::WheelEvent dx:#{dx} dy:#{dy} dz:#{dz} x:#{x} y:#{y} z:#{z} mod:#{modifiers}>"
+    def inspect()
+      "#<Reflex::WheelEvent x:#{x} y:#{y} z:#{z} dx:#{dx} dy:#{dy} dz:#{dz} mod:#{modifiers}>"
     end
 
   end# WheelEvent

data/lib/reflex/window.rb

@@ -24,7 +24,7 @@ module Reflex
       :timeout, :delay, :interval,
       :add_child,     :add,
       :remove_child,  :remove,
-      :find_child,    :find, :find_children,
+      :children, :find_child, :find, :find_children,
       :style, :styles, :scroll_to, :scroll_by, :scroll,
       :meter2pixel, :meter, :wall,
       :zoom=,              :zoom,
@@ -51,23 +51,23 @@ module Reflex
     universal_accessor :title, :frame,
       resizable: {reader: :resizable?}
 
-    def initialize (options = nil, &block)
+    def initialize(options = nil, &block)
       super()
       set options if options
       @show_block = block
     end
 
-    def paint (&block)
-      painter.begin &block
+    def paint(&block)
+      painter.begin(&block)
     end
 
-    def self.show (*args, &block)
+    def self.show(*args, &block)
       new(*args, &block).show
     end
 
     private
 
-      def call_show_block ()
+      def call_show_block()
         return unless @show_block
         Xot::BlockUtil.instance_eval_or_block_call self, &@show_block
         @show_block = nil