reflexion 0.1.23 → 0.1.26

data/include/reflex/event.h

@@ -28,78 +28,129 @@ namespace Reflex
 
 			Event ();
 
+			~Event ();
+
 			void block ();
 
 			bool is_blocked () const;
 
 			double time () const;
 
-		private:
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
 
-			bool blocked;
+		protected:
 
-			double time_;
+			Event (const Event* src);
 
 	};// Event
 
 
-	struct UpdateEvent : public Event
+	class UpdateEvent : public Event
 	{
 
-		double now;
+		public:
+
+			UpdateEvent ();
+
+			UpdateEvent (double now, float dt);
 
-		float dt;
+			UpdateEvent dup () const;
+
+			double now () const;
+
+			float dt () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+		private:
 
-		UpdateEvent (double now = 0, float dt = 0);
+			UpdateEvent (const UpdateEvent* src);
 
 	};// UpdateEvent
 
 
-	struct DrawEvent : public Event
+	class DrawEvent : public Event
 	{
 
-		View* view;
+		public:
+
+			DrawEvent ();
+
+			DrawEvent (float dt, float fps);
+
+			DrawEvent dup () const;
 
-		Painter* painter;
+			      Painter* painter ();
 
-		Bounds bounds;
+			const Painter* painter () const;
 
-		float dt, fps;
+			const Bounds& bounds () const;
 
-		DrawEvent (float dt = 0, float fps = 0);
+			float dt () const;
+
+			float fps () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+		private:
+
+			DrawEvent (const DrawEvent* src);
 
 	};// DrawEvent
 
 
-	struct FrameEvent : public Event
+	class FrameEvent : public Event
 	{
 
-		Bounds frame;
+		public:
+
+			FrameEvent ();
 
-		coord dx, dy;
+			FrameEvent (
+				const Bounds& frame,
+				coord dx,     coord dy,
+				coord dwidth, coord dheight,
+				float angle,  float dangle);
 
-		union
-		{
-			struct {coord dwidth, dheight;};
+			FrameEvent (
+				const Bounds& frame, const Bounds& prev_frame,
+				float angle, float prev_angle);
 
-			struct {coord dw,     dh;};
-		};
+			FrameEvent dup () const;
 
-		float angle, dangle;
+			const Bounds& frame () const;
 
-		FrameEvent (
-			const Bounds& frame = 0, coord dx = 0, coord dy = 0, coord dwidth = 0, coord dheight = 0,
-			float angle = 0, float dangle = 0);
+			coord dx () const;
 
-		FrameEvent (
-			const Bounds& frame, const Bounds& prev_frame,
-			float angle = 0, float prev_angle = 0);
+			coord dy () const;
 
-		bool is_move () const;
+			coord dwidth () const;
 
-		bool is_resize () const;
+			coord dheight () const;
 
-		bool is_rotate () const;
+			float angle () const;
+
+			float dangle () const;
+
+			bool is_move () const;
+
+			bool is_resize () const;
+
+			bool is_rotate () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+		private:
+
+			FrameEvent (const FrameEvent* src);
 
 	};// FrameEvent
 
@@ -107,31 +158,29 @@ namespace Reflex
 	struct ScrollEvent : public Event
 	{
 
-		union
-		{
-			struct {coord x, y, z;};
+		public:
+
+			ScrollEvent ();
+
+			ScrollEvent (coord x, coord y, coord z, coord dx, coord dy, coord dz);
 
-			Coord3 scroll_;
-		};
+			ScrollEvent dup () const;
 
-		union
-		{
-			struct {coord dx, dy, dz;};
+			      Point& scroll ();
 
-			Coord3 delta_;
-		};
+			const Point& scroll () const;
 
-		ScrollEvent ();
+			      Point& dscroll ();
 
-		ScrollEvent (coord x, coord y, coord z, coord dx, coord dy, coord dz);
+			const Point& dscroll () const;
 
-		      Point& scroll ();
+			struct Data;
 
-		const Point& scroll () const;
+			Xot::PSharedImpl<Data> self;
 
-		      Point& delta ();
+		private:
 
-		const Point& delta () const;
+			ScrollEvent (const ScrollEvent* src);
 
 	};// ScrollEvent
 
@@ -139,15 +188,29 @@ namespace Reflex
 	struct FocusEvent : public Event
 	{
 
-		enum Type {NONE = 0, FOCUS, BLUR};
+		public:
+
+			enum Action {ACTION_NONE = 0, FOCUS, BLUR};
 
-		Type type;
+			FocusEvent ();
 
-		View *current, *last;
+			FocusEvent (Action action, View* current, View* last);
 
-		FocusEvent ();
+			FocusEvent dup () const;
 
-		FocusEvent (Type type, View* current, View* last);
+			Action action () const;
+
+			View* current () const;
+
+			View* last () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+		private:
+
+			FocusEvent (const FocusEvent* src);
 
 	};// FocusEvent
 
@@ -155,51 +218,51 @@ namespace Reflex
 	struct KeyEvent : public Event
 	{
 
-		enum Type {NONE = 0, DOWN, UP};
+		public:
 
-		Type type;
+			enum Action {ACTION_NONE = 0, DOWN, UP};
 
-		String chars;
+			KeyEvent ();
 
-		int code;
+			KeyEvent (
+				Action action, const char* chars, int code,
+				uint modifiers = 0, int repeat = 0);
 
-		uint modifiers;
+			KeyEvent dup () const;
 
-		int repeat;
+			Action action () const;
 
-		bool captured;
+			const char* chars () const;
 
-		KeyEvent ();
+			int code () const;
 
-		KeyEvent (
-			Type type, const char* chars, int code,
-			uint modifiers = 0, int repeat = 0);
+			uint modifiers () const;
 
-	};// KeyEvent
+			int repeat () const;
 
+			bool is_captured () const;
 
-	class PointerEvent : public Event
-	{
+			struct Data;
 
-		typedef PointerEvent This;
+			Xot::PSharedImpl<Data> self;
 
-		public:
+		private:
 
-			PointerEvent (bool captured = false);
+			KeyEvent (const KeyEvent* src);
 
-			PointerEvent (
-				const Pointer& pointer,
-				bool captured = false);
+	};// KeyEvent
+
+
+	class PointerEvent : public Event
+	{
 
-			PointerEvent (
-				const Pointer* pointers, size_t size,
-				bool captured = false);
+		public:
 
-			PointerEvent (const This& obj);
+			PointerEvent ();
 
-			PointerEvent& operator = (const This& obj);
+			PointerEvent (const Pointer* pointers, size_t size);
 
-			~PointerEvent ();
+			PointerEvent dup () const;
 
 			size_t size () const;
 
@@ -211,7 +274,11 @@ namespace Reflex
 
 			struct Data;
 
-			Xot::PImpl<Data> self;
+			Xot::PSharedImpl<Data> self;
+
+		private:
+
+			PointerEvent (const PointerEvent* src);
 
 	};// PointerEvent
 
@@ -219,35 +286,33 @@ namespace Reflex
 	struct WheelEvent : public Event
 	{
 
-		union
-		{
-			struct {coord dx, dy, dz;};
+		public:
 
-			Coord3 delta_;
-		};
+			WheelEvent ();
 
-		union
-		{
-			struct {coord x, y, z;};
+			WheelEvent (
+				coord x, coord y, coord z, coord dx, coord dy, coord dz,
+				uint modifiers = 0);
 
-			Coord3 position_;
-		};
+			WheelEvent dup () const;
 
-		uint modifiers;
+			      Point& position ();
 
-		WheelEvent ();
+			const Point& position () const;
 
-		WheelEvent (
-			coord dx, coord dy, coord dz, coord x = 0, coord y = 0, coord z = 0,
-			uint modifiers = 0);
+			      Point& dposition ();
 
-		      Point& position ();
+			const Point& dposition () const;
 
-		const Point& position () const;
+			uint modifiers () const;
 
-		      Point& delta ();
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
 
-		const Point& delta () const;
+		private:
+
+			WheelEvent (const WheelEvent* src);
 
 	};// WheelEvent
 
@@ -255,11 +320,25 @@ namespace Reflex
 	struct CaptureEvent : public Event
 	{
 
-		uint begin, end;
+		public:
+
+			CaptureEvent ();
+
+			CaptureEvent (uint begin, uint end);
+
+			CaptureEvent dup () const;
+
+			uint begin () const;
 
-		CaptureEvent ();
+			uint end () const;
 
-		CaptureEvent (uint begin, uint end);
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+		private:
+
+			CaptureEvent (const CaptureEvent* src);
 
 	};// CaptureEvent
 
@@ -267,21 +346,35 @@ namespace Reflex
 	struct TimerEvent : public Event
 	{
 
-		Timer::Ref timer;
+		public:
+
+			TimerEvent ();
+
+			TimerEvent (Timer* timer);
+
+			TimerEvent dup () const;
+
+			      Timer* timer ();
+
+			const Timer* timer () const;
+
+			View* owner () const;
+
+			int id () const;
 
-		TimerEvent (Timer* timer = NULL);
+			float interval () const;
 
-		View* owner () const;
+			int count () const;
 
-		int id () const;
+			bool is_finished () const;
 
-		float interval () const;
+			struct Data;
 
-		void set_count (int count);
+			Xot::PSharedImpl<Data> self;
 
-		int      count () const;
+		private:
 
-		bool is_finished () const;
+			TimerEvent (const TimerEvent* src);
 
 	};// TimerEvent
 
@@ -289,17 +382,33 @@ namespace Reflex
 	struct ContactEvent : public Event
 	{
 
-		enum Type {NONE = 0, BEGIN, END};
+		public:
+
+			enum Action {ACTION_NONE = 0, BEGIN, END};
+
+			ContactEvent ();
+
+			ContactEvent (Action action, Shape* shape);
+
+			ContactEvent dup () const;
 
-		Type type;
+			Action action () const;
 
-		Shape* shape;
+			      Shape* shape ();
 
-		View* view;
+			const Shape* shape () const;
 
-		ContactEvent ();
+			      View* view ();
+
+			const View* view () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+		private:
 
-		ContactEvent (Type type, Shape* shape);
+			ContactEvent (const ContactEvent* src);
 
 	};// ContactEvent
 

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/window.h

@@ -35,7 +35,7 @@ namespace Reflex
 
 			virtual void hide ();
 
-			virtual void close ();
+			virtual void close (bool force = false);
 
 			virtual void redraw ();
 

data/lib/reflex/contact_event.rb

@@ -10,20 +10,20 @@ 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
+      get_action == ContactEvent::BEGIN
     end
 
     def end?()
-      get_type == TYPE_END
+      get_action == ContactEvent::END
     end
 
     def inspect()

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
+      get_action == FOCUS
     end
 
     def blur?()
-      get_type == TYPE_BLUR
+      get_action == BLUR
     end
 
     def inspect()
-      "#<Reflex::FocusEvent type:#{type} current:#{current} last:#{last}>"
+      "#<Reflex::FocusEvent action:#{action} current:#{current} last:#{last}>"
     end
 
   end# FocusEvent

data/lib/reflex/key_event.rb

@@ -10,20 +10,20 @@ 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
+      get_action == DOWN
     end
 
     def up?()
-      get_type == TYPE_UP
+      get_action == UP
     end
 
     def repeat?()
@@ -31,7 +31,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::KeyEvent type:#{type} chars:'#{chars}' code:#{code} mod:#{modifiers} repeat:#{repeat} captured?:#{captured?}>"
+      "#<Reflex::KeyEvent action:#{action} chars:'#{chars}' code:#{code} mod:#{modifiers} repeat:#{repeat} captured?:#{captured?}>"
     end
 
   end# KeyEvent

data/lib/reflex/pointer.rb

@@ -13,10 +13,10 @@ module Reflex
 
     include Comparable
 
-    alias type   get_type
+    alias types  get_type
     alias action get_action
 
-    bit_flag_reader :type, **{
+    bit_flag_reader :types, **{
       none:         TYPE_NONE,
       mouse:        MOUSE,
       mouse_left:   MOUSE_LEFT,
@@ -98,7 +98,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::Pointer id:#{id} #{type} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
+      "#<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

data/lib/reflex/pointer_event.rb

@@ -14,7 +14,7 @@ module Reflex
 
     def_delegators :first,
       :id,
-      :type, :mouse?, :touch?, :pen?,
+      :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?,
@@ -25,7 +25,7 @@ module Reflex
     end
 
     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}>"
+      "#<Reflex::PointerEvent id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
     end
 
     private

data/lib/reflex/timer_event.rb

@@ -15,7 +15,8 @@ module Reflex
     def_delegators :timer,
       :name=, :name,
       :add_tag, :remove_tag, :each_tag,
-      :selector=, :selector
+      :selector=, :selector,
+      :count=
 
     alias view owner
 

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}>"
+      "#<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,