reflexion 0.1.21 → 0.1.25

data/include/reflex/shape.h

@@ -16,8 +16,8 @@ namespace Reflex
 
 
 	class Event;
-	struct DrawEvent;
-	struct FrameEvent;
+	class DrawEvent;
+	class FrameEvent;
 	struct ContactEvent;
 
 	class View;

data/include/reflex/view.h

@@ -364,13 +364,15 @@ namespace Reflex
 
 			virtual void on_key_up   (KeyEvent* e);
 
-			virtual void on_pointer      (PointerEvent* e);
+			virtual void on_pointer        (PointerEvent* e);
 
-			virtual void on_pointer_down (PointerEvent* e);
+			virtual void on_pointer_down   (PointerEvent* e);
 
-			virtual void on_pointer_up   (PointerEvent* e);
+			virtual void on_pointer_up     (PointerEvent* e);
 
-			virtual void on_pointer_move (PointerEvent* e);
+			virtual void on_pointer_move   (PointerEvent* e);
+
+			virtual void on_pointer_cancel (PointerEvent* e);
 
 			virtual void on_wheel (WheelEvent* e);
 

data/include/reflex/window.h

@@ -39,6 +39,10 @@ namespace Reflex
 
 			virtual void redraw ();
 
+			virtual Point from_screen (const Point& point) const;
+
+			virtual Point   to_screen (const Point& point) const;
+
 			virtual void    set_title (const char* title);
 
 			virtual const char* title () const;
@@ -67,10 +71,6 @@ namespace Reflex
 
 			virtual const Painter* painter () const;
 
-			virtual Point from_screen (const Point& point) const;
-
-			virtual Point   to_screen (const Point& point) const;
-
 			virtual void on_show (Event* e);
 
 			virtual void on_hide (Event* e);
@@ -91,13 +91,15 @@ namespace Reflex
 
 			virtual void on_key_up   (KeyEvent* e);
 
-			virtual void on_pointer      (PointerEvent* e);
+			virtual void on_pointer        (PointerEvent* e);
+
+			virtual void on_pointer_down   (PointerEvent* e);
 
-			virtual void on_pointer_down (PointerEvent* e);
+			virtual void on_pointer_up     (PointerEvent* e);
 
-			virtual void on_pointer_up   (PointerEvent* e);
+			virtual void on_pointer_move   (PointerEvent* e);
 
-			virtual void on_pointer_move (PointerEvent* e);
+			virtual void on_pointer_cancel (PointerEvent* e);
 
 			virtual void on_wheel (WheelEvent* e);
 

data/lib/reflex/application.rb

@@ -18,19 +18,19 @@ module Reflex
 
     universal_accessor :name
 
-    def initialize (options = nil, &block)
+    def initialize(options = nil, &block)
       super()
       set options if options
       @start_block = block if block
     end
 
-    def self.start (*args, &block)
+    def self.start(*args, &block)
       new(*args, &block).start
     end
 
     private
 
-      def call_start_block ()
+      def call_start_block()
         return unless @start_block
         Xot::BlockUtil.instance_eval_or_block_call self, &@start_block
         @start_block = nil

data/lib/reflex/autoinit.rb

@@ -5,7 +5,7 @@ require 'rays/autoinit'
 require 'reflex/ext'
 
 
-unless $REFLEX_NOAUTOINIT
+unless defined?($REFLEX_NOAUTOINIT) && $REFLEX_NOAUTOINIT
   Reflex.init!
   at_exit {Reflex.fin!}
 end

data/lib/reflex/button.rb

@@ -13,21 +13,21 @@ module Reflex
 
     attr_accessor :text
 
-    def initialize (*args, &block)
+    def initialize(*args, &block)
       self.data = false
       super
       self.text = self.name unless self.text
     end
 
-    def content_bounds ()
+    def content_bounds()
       f = window.painter.font
       return f.width(@text) + 2, f.height + 2
     end
 
-    def on_press (e)
+    def on_press(e)
     end
 
-    def on_draw (e)
+    def on_draw(e)
       e.painter.push fill: (pressing? ? :white : :none), stroke: :white do |p|
         p.rect e.bounds
 
@@ -43,7 +43,7 @@ module Reflex
       end
     end
 
-    def on_pointer (e)
+    def on_pointer(e)
       case e.type
       when :down
         self.capture += [:pointer]
@@ -60,13 +60,13 @@ module Reflex
       end
     end
 
-    def on_data_update (e)
+    def on_data_update(e)
       on_press({}) if e.data
     end
 
     private
 
-      def pressing? ()
+      def pressing?()
         capturing? :pointer
       end
 

data/lib/reflex/capture_event.rb

@@ -10,25 +10,25 @@ module Reflex
 
   class CaptureEvent < Event
 
-    def begin ()
+    def begin()
       View.capture_flag.bits2symbols get_begin
     end
 
-    def begin? (*symbols)
-      bits = View.capture_flag.symbols2bits *symbols
+    def begin?(*symbols)
+      bits = View.capture_flag.symbols2bits(*symbols)
       (bits & get_begin) == bits
     end
 
-    def end ()
+    def end()
       View.capture_flag.bits2symbols get_end
     end
 
-    def end? (*symbols)
-      bits = View.capture_flag.symbols2bits *symbols
+    def end?(*symbols)
+      bits = View.capture_flag.symbols2bits(*symbols)
       (bits & get_end) == bits
     end
 
-    def inspect ()
+    def inspect()
       "#<Reflex::CaptureEvent begin:#{self.begin} end:#{self.end}}>"
     end
 

data/lib/reflex/contact_event.rb

@@ -10,23 +10,23 @@ module Reflex
 
   class ContactEvent < Event
 
-    alias get_type type
+    alias get_action action
 
-    const_symbol_reader :type, {
-      none:  TYPE_NONE,
-      begin: TYPE_BEGIN,
-      end:   TYPE_END
+    const_symbol_reader :action, **{
+      none:  ACTION_NONE,
+      begin: ContactEvent::BEGIN,
+      end:   ContactEvent::END
     }
 
-    def begin? ()
-      get_type == TYPE_BEGIN
+    def begin?()
+      get_action == ContactEvent::BEGIN
     end
 
-    def end? ()
-      get_type == TYPE_END
+    def end?()
+      get_action == ContactEvent::END
     end
 
-    def inspect ()
+    def inspect()
       "#<Reflex::ContactEvent type:#{type} shape:#{shape} view:#{view}>"
     end
 

data/lib/reflex/draw_event.rb

@@ -10,11 +10,11 @@ module Reflex
 
   class DrawEvent < Event
 
-    def paint (&block)
+    def paint(&block)
       Xot::BlockUtil.instance_eval_or_block_call painter, &block if block
     end
 
-    def inspect ()
+    def inspect()
       "#<Reflex::DrawEvent painter:#{painter} bounds:#{bounds} dt:#{dt} fps:#{fps}>"
     end
 

data/lib/reflex/ellipse_shape.rb

@@ -10,12 +10,12 @@ module Reflex
 
   class EllipseShape < Shape
 
-    def angle= (range)
+    def angle=(range)
       angle_from range.min
       angle_to   range.max
     end
 
-    def angle ()
+    def angle()
       angle_from..angle_to
     end
 

data/lib/reflex/focus_event.rb

@@ -10,24 +10,24 @@ module Reflex
 
   class FocusEvent < Event
 
-    alias get_type type
+    alias get_action action
 
-    const_symbol_reader :type, {
-      none:  TYPE_NONE,
-      focus: TYPE_FOCUS,
-      blur:  TYPE_BLUR
+    const_symbol_reader :action, **{
+      none:  ACTION_NONE,
+      focus: FOCUS,
+      blur:  BLUR
     }
 
-    def focus? ()
-      get_type == TYPE_FOCUS
+    def focus?()
+      get_action == FOCUS
     end
 
-    def blur? ()
-      get_type == TYPE_BLUR
+    def blur?()
+      get_action == BLUR
     end
 
-    def inspect ()
-      "#<Reflex::FocusEvent type:#{type} current:#{current} last:#{last}>"
+    def inspect()
+      "#<Reflex::FocusEvent action:#{action} current:#{current} last:#{last}>"
     end
 
   end# FocusEvent

data/lib/reflex/frame_event.rb

@@ -13,26 +13,26 @@ module Reflex
     alias dh   dheight
     alias dpos dposition
 
-    def x ()
+    def x()
       frame.x
     end
 
-    def y ()
+    def y()
       frame.y
     end
 
-    def width ()
+    def width()
       frame.width
     end
 
-    def height ()
+    def height()
       frame.height
     end
 
     alias w width
     alias h height
 
-    def inspect ()
+    def inspect()
       "#<Reflex::FrameEvent x:#{x} y:#{y} w:#{w} h:#{h} dx:#{dx} dy:#{dy} dw:#{dw} dh:#{dh}>"
     end
 

data/lib/reflex/helper.rb

@@ -14,7 +14,7 @@ module Reflex
 
     include Xot::Hookable
 
-    def hook (name, &block)
+    def hook(name, &block)
       super "on_#{name}".intern, &block
     end
 
@@ -23,28 +23,28 @@ module Reflex
 
   module HasFrame
 
-    def move_to (*args)
-      self.frame = frame.move_to *args
+    def move_to(*args)
+      self.frame = frame.move_to(*args)
       self
     end
 
-    def move_by (*args)
-      self.frame = frame.move_by *args
+    def move_by(*args)
+      self.frame = frame.move_by(*args)
       self
     end
 
-    def resize_to (*args)
-      self.frame = frame.resize_to *args
+    def resize_to(*args)
+      self.frame = frame.resize_to(*args)
       self
     end
 
-    def resize_by (*args)
-      self.frame = frame.resize_by *args
+    def resize_by(*args)
+      self.frame = frame.resize_by(*args)
       self
     end
 
-    def inset_by (*args)
-      self.frame = frame.inset_by *args
+    def inset_by(*args)
+      self.frame = frame.inset_by(*args)
       self
     end
 
@@ -56,10 +56,10 @@ module Reflex
       position pos size center
     ].each do |name|
       class_eval <<-END
-        def #{name} ()
+        def #{name}()
           frame.#{name}
         end
-        def #{name}= (*args)
+        def #{name}=(*args)
           self.frame = frame.tap {|b| b.send :#{name}=, *args}
           #{name}
         end
@@ -73,27 +73,27 @@ module Reflex
 
   module HasTags
 
-    def tag= (*tags)
+    def tag=(*tags)
       clear_tags
-      tag *tags.flatten
+      tag(*tags.flatten)
     end
 
     alias tags= tag=
 
-    def tag (*tags)
+    def tag(*tags)
       tags.each {|tag| add_tag tag}
     end
 
-    def untag (*tags)
+    def untag(*tags)
       tags.each {|tag| remove_tag tag}
     end
 
-    def tags ()
+    def tags()
       to_enum :each_tag
     end
 
-    def clear_tags ()
-      untag *tags.to_a
+    def clear_tags()
+      untag(*tags.to_a)
     end
 
   end# HasTags

data/lib/reflex/image_view.rb

@@ -11,11 +11,11 @@ module Reflex
 
     has_model
 
-    def image= (image)
+    def image=(image)
       self.data = image
     end
 
-    def on_data_update (e)
+    def on_data_update(e)
       set_image self.data
     end
 

data/lib/reflex/key_event.rb

@@ -10,28 +10,28 @@ module Reflex
 
   class KeyEvent < Event
 
-    alias get_type type
+    alias get_action action
 
-    const_symbol_reader :type, {
-      none: TYPE_NONE,
-      down: TYPE_DOWN,
-      up:   TYPE_UP
+    const_symbol_reader :action, **{
+      none: ACTION_NONE,
+      down: DOWN,
+      up:   UP
     }
 
-    def down? ()
-      get_type == TYPE_DOWN
+    def down?()
+      get_action == DOWN
     end
 
-    def up? ()
-      get_type == TYPE_UP
+    def up?()
+      get_action == UP
     end
 
-    def repeat? ()
+    def repeat?()
       repeat >= 1
     end
 
-    def inspect ()
-      "#<Reflex::KeyEvent type:#{type} chars:'#{chars}' code:#{code} mod:#{modifiers} repeat:#{repeat} capture?:#{capture?}>"
+    def inspect()
+      "#<Reflex::KeyEvent action:#{action} chars:'#{chars}' code:#{code} mod:#{modifiers} repeat:#{repeat} captured?:#{captured?}>"
     end
 
   end# KeyEvent

data/lib/reflex/model.rb

@@ -18,12 +18,12 @@ module Reflex
 
     attr_reader :data
 
-    def initialize (data = nil, &block)
+    def initialize(data = nil, &block)
       self.data = data if data
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
-    def data= (data)
+    def data=(data)
       skip, data = apply_filters(data).tap do |filtered|
         skip = filtered.nil? && !data.nil?
         break skip, filtered
@@ -35,79 +35,79 @@ module Reflex
       @data
     end
 
-    def add_handler (handler)
+    def add_handler(handler)
       super
       invoke :attach, {}, only: handler
     end
 
-    def remove_handler (handler)
+    def remove_handler(handler)
       invoke :detach, {}, only: handler
       super
     end
 
-    def invoke (name, attributes = {}, options = {})
+    def invoke(name, attributes = {}, options = {})
       attributes[:data] ||= @data
       super "on_data_#{name}".intern, attributes, options
     end
 
-    def add_filter (&block)
+    def add_filter(&block)
       (@filters ||= []).push block
     end
 
-    def remove_filter (&block)
+    def remove_filter(&block)
       @filters.delete block if @filters
     end
 
     alias filter add_filter
 
-    def validate (&block)
+    def validate(&block)
       filter {|data| block.call(data) ? data : nil}
     end
 
-    def min= (min)
+    def min=(min)
       filter {|data| data < min ? min : data}
     end
 
-    def max= (max)
+    def max=(max)
       filter {|data| data > max ? max : data}
     end
 
-    def minmax= (range)
+    def minmax=(range)
       min, max = range.min, range.max
       filter {|data| data < min ? min : data > max ? max : data}
     end
 
-    def int (defvar = nil)
+    def int(defvar = nil)
       call_symbols INT_SYMS
     end
 
-    def float (defvar = nil)
+    def float(defvar = nil)
       call_symbols FLOAT_SYMS
     end
 
-    def string (defvar = nil)
+    def string(defvar = nil)
       call_symbols STRING_SYMS
     end
 
-    def [] (*args)
+    def [](*args)
       call_symbols ARRAY_GET_SYMS, *args
     end
 
-    def []= (*args)
+    def []=(*args)
       ret = call_symbols ARRAY_SET_SYMS, *args
       invoke :update
       ret
     end
 
-    def size ()
+    def size()
       call_symbols(ARRAY_SIZE_SYMS) || 0
     end
 
-    def each (&block)
-      data.each &block if block && data.respond_to?(:each)
+    def each(&block)
+      data.each(&block) if block && data.respond_to?(:each)
     end
 
-    def inspect ()
+    def inspect()
       "#<Model data:#{@data.inspect}>"
     end
 
@@ -125,7 +125,7 @@ module Reflex
 
       ARRAY_SIZE_SYMS = [:size, :length]
 
-      def apply_filters (data)
+      def apply_filters(data)
         return data unless @filters
         @filters.each do |filter|
           break if data.nil?
@@ -134,7 +134,7 @@ module Reflex
         data
       end
 
-      def call_symbols (symbols, *args)
+      def call_symbols(symbols, *args)
         if dat = data
           symbols.each do |symbol|
             return dat.send symbol, *args if dat.respond_to? symbol

data/lib/reflex/model_owner.rb

@@ -11,7 +11,7 @@ module Reflex
 
     attr_reader :model
 
-    def model= (model)
+    def model=(model)
       return if model == @model
       @model.remove_handler self if @model
       @model = model
@@ -19,7 +19,7 @@ module Reflex
       model
     end
 
-    def data= (data)
+    def data=(data)
       unless data.nil?
         self.model = Model.new unless @model
         @model.data = data
@@ -29,19 +29,19 @@ module Reflex
       data
     end
 
-    def data ()
+    def data()
       @model ? @model.data : nil
     end
 
-    def invoke (*args)
-      @model.invoke *args if @model
+    def invoke(*args)
+      @model.invoke(*args) if @model
     end
 
-    def on_data_attach (e)
+    def on_data_attach(e)
       invoke :update, {}, only: self
     end
 
-    def on_data_detach (e)
+    def on_data_detach(e)
       invoke :update, {}, only: self
     end
 

data/lib/reflex/model_view.rb

@@ -11,7 +11,7 @@ module Reflex
 
     include ModelOwner
 
-    def on_data_update (e)
+    def on_data_update(e)
       resize_to_fit
       redraw
     end