reflexion 0.1.38 → 0.1.39

data/include/reflex/event.h

@@ -30,7 +30,7 @@ namespace Reflex
 
 			~Event ();
 
-			void block (bool parent = false);
+			void block (bool parent = true);
 
 			bool is_blocked () const;
 
@@ -114,8 +114,8 @@ namespace Reflex
 
 			FrameEvent (
 				const Bounds& frame,
-				coord dx,     coord dy,
-				coord dwidth, coord dheight,
+				coord dx,     coord dy,      coord dz,
+				coord dwidth, coord dheight, coord ddepth,
 				float zoom  = 1,  float dzoom  = 0,
 				float angle = 0,  float dangle = 0);
 
@@ -132,10 +132,14 @@ namespace Reflex
 
 			coord dy () const;
 
+			coord dz () const;
+
 			coord dwidth () const;
 
 			coord dheight () const;
 
+			coord ddepth () const;
+
 			float zoom () const;
 
 			float dzoom () const;
@@ -163,7 +167,7 @@ namespace Reflex
 	};// FrameEvent
 
 
-	struct ScrollEvent : public Event
+	class ScrollEvent : public Event
 	{
 
 		public:
@@ -193,7 +197,7 @@ namespace Reflex
 	};// ScrollEvent
 
 
-	struct FocusEvent : public Event
+	class FocusEvent : public Event
 	{
 
 		public:
@@ -223,7 +227,7 @@ namespace Reflex
 	};// FocusEvent
 
 
-	struct KeyEvent : public Event
+	class KeyEvent : public Event
 	{
 
 		public:
@@ -291,7 +295,7 @@ namespace Reflex
 	};// PointerEvent
 
 
-	struct WheelEvent : public Event
+	class WheelEvent : public Event
 	{
 
 		public:
@@ -325,7 +329,7 @@ namespace Reflex
 	};// WheelEvent
 
 
-	struct CaptureEvent : public Event
+	class CaptureEvent : public Event
 	{
 
 		public:
@@ -351,7 +355,7 @@ namespace Reflex
 	};// CaptureEvent
 
 
-	struct TimerEvent : public Event
+	class TimerEvent : public Event
 	{
 
 		public:
@@ -387,7 +391,7 @@ namespace Reflex
 	};// TimerEvent
 
 
-	struct ContactEvent : public Event
+	class ContactEvent : public Event
 	{
 
 		public:
@@ -421,12 +425,24 @@ namespace Reflex
 	};// ContactEvent
 
 
-	struct MotionEvent : public Event
+	class MotionEvent : public Event
 	{
 
-		Point gravity;
+		public:
+
+			MotionEvent (const Point& gravity = Point(0, 9.8));
+
+			MotionEvent dup () const;
+
+			const Point& gravity () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+		private:
 
-		MotionEvent (const Point& gravity = Point(0, 9.8));
+			MotionEvent (const MotionEvent* src);
 
 	};// MotionEvent
 

data/include/reflex/pointer.h

@@ -63,8 +63,8 @@ namespace Reflex
 
 			Pointer (
 				ID id, uint type, Action action,
-				const Point& position, uint modifiers, uint click_count, bool drag,
-				double time);
+				const Point& position, uint modifiers, bool drag,
+				uint click_count, uint view_index, double time);
 
 			Pointer (const This& obj);
 
@@ -82,9 +82,11 @@ namespace Reflex
 
 			uint modifiers () const;
 
+			bool is_drag () const;
+
 			uint click_count () const;
 
-			bool is_drag () const;
+			uint view_index () const;
 
 			double time () const;
 

data/include/reflex/shape.h

@@ -18,7 +18,7 @@ namespace Reflex
 	class Event;
 	class DrawEvent;
 	class FrameEvent;
-	struct ContactEvent;
+	class ContactEvent;
 
 	class View;
 	class Fixture;

data/lib/reflex/frame_event.rb

@@ -8,6 +8,7 @@ module Reflex
 
     alias dw   dwidth
     alias dh   dheight
+    alias dd   ddepth
     alias dpos dposition
 
     def x()
@@ -18,6 +19,10 @@ module Reflex
       frame.y
     end
 
+    def z()
+      frame.z
+    end
+
     def width()
       frame.width
     end
@@ -26,12 +31,17 @@ module Reflex
       frame.height
     end
 
+    def depth()
+      frame.depth
+    end
+
     alias w width
     alias h height
+    alias d depth
 
     def inspect()
-      "#<Reflex::FrameEvent x:%g(%g) y:%g(%g) w:%g(%g) h:%g(%g) zoom:%g(%g) angle:%g(%g)>" %
-        [x, dx, y, dy, w, dw, h, dh, zoom, dzoom, angle, dangle]
+      "#<Reflex::FrameEvent x:%g(%g) y:%g(%g) z:%g(%g) w:%g(%g) h:%g(%g) d:%g(%g) zoom:%g(%g) angle:%g(%g)>" %
+        [x, dx, y, dy, z, dz, w, dw, h, dh, d, dd, zoom, dzoom, angle, dangle]
     end
 
   end# FrameEvent

data/lib/reflex/pointer.rb

@@ -95,7 +95,7 @@ module Reflex
     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}>"
+      "#<Reflex::Pointer id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} drag:#{drag?} click:#{click_count} view:#{view_index} time:#{time.round 2}>"
     end
 
   end# Pointer

data/lib/reflex/pointer_event.rb

@@ -14,7 +14,7 @@ module Reflex
       :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?,
+      :position, :pos, :x, :y, :modifiers, :drag?, :click_count, :view_index,
       :time, :prev
 
     def pointers()
@@ -22,7 +22,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::PointerEvent id:#{id} #{types} #{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} drag:#{drag?} click:#{click_count} view:#{view_index} time:#{time.round 2}>"
     end
 
     private

data/reflex.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1.35'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.35'
-  s.add_runtime_dependency 'beeps', '~> 0.1.36'
-  s.add_runtime_dependency 'rays',  '~> 0.1.36'
+  s.add_runtime_dependency 'xot',   '~> 0.1.36'
+  s.add_runtime_dependency 'rucy',  '~> 0.1.36'
+  s.add_runtime_dependency 'beeps', '~> 0.1.37'
+  s.add_runtime_dependency 'rays',  '~> 0.1.37'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/src/body.h

@@ -7,7 +7,7 @@
 #include <xot/noncopyable.h>
 #include <xot/pimpl.h>
 #include <rays/point.h>
-#include <reflex/defs.h>
+#include "reflex/defs.h"
 
 
 class b2Body;

data/src/event.cpp

@@ -19,10 +19,10 @@ namespace Reflex
 
 		double time;
 
-		Xot::PSharedImpl<Data> parent;
+		Data* parent = NULL;
 
 		Data (bool blocked = false, double time = Xot::time())
-		:	blocked(blocked), time(time), parent(NULL)
+		:	blocked(blocked), time(time)
 		{
 		}
 
@@ -42,7 +42,7 @@ namespace Reflex
 	Event::Event (const Event* src)
 	:	self(new Data(*src->self))
 	{
-		self->parent = src->self;
+		self->parent = src->self.get();
 	}
 
 	Event::~Event ()
@@ -219,7 +219,7 @@ namespace Reflex
 
 		Bounds frame;
 
-		coord dx, dy, dw, dh;
+		coord dx, dy, dz, dw, dh, dd;
 
 		float zoom, dzoom;
 
@@ -227,10 +227,11 @@ namespace Reflex
 
 		Data (
 			const Bounds& frame = 0,
-			coord dx = 0, coord dy = 0, coord dw = 0, coord dh = 0,
+			coord dx = 0, coord dy = 0, coord dz = 0,
+			coord dw = 0, coord dh = 0, coord dd = 0,
 			float zoom  = 0, float dzoom  = 0,
 			float angle = 0, float dangle = 0)
-		:	frame(frame), dx(dx), dy(dy), dw(dw), dh(dh),
+		:	frame(frame), dx(dx), dy(dy), dz(dz), dw(dw), dh(dh), dd(dd),
 			zoom(zoom), dzoom(dzoom), angle(angle), dangle(dangle)
 		{
 		}
@@ -243,9 +244,11 @@ namespace Reflex
 	}
 
 	FrameEvent::FrameEvent (
-		const Bounds& frame, coord dx, coord dy, coord dwidth, coord dheight,
+		const Bounds& frame,
+		coord dx, coord dy, coord dz, coord dwidth, coord dheight, coord ddepth,
 		float zoom, float dzoom, float angle, float dangle)
-	:	self(new Data(frame, dx, dy, dwidth, dheight, zoom, dzoom, angle, dangle))
+	:	self(new Data(
+			frame, dx, dy, dz, dwidth, dheight, ddepth, zoom, dzoom, angle, dangle))
 	{
 	}
 
@@ -254,8 +257,8 @@ namespace Reflex
 		float zoom, float prev_zoom, float angle, float prev_angle)
 	:	self(new Data(
 			frame,
-			frame.x - prev_frame.x, frame.y - prev_frame.y,
-			frame.w - prev_frame.w, frame.h - prev_frame.h,
+			frame.x - prev_frame.x, frame.y - prev_frame.y, frame.z - prev_frame.z,
+			frame.w - prev_frame.w, frame.h - prev_frame.h, frame.d - prev_frame.d,
 			zoom,  zoom  - prev_zoom,
 			angle, angle - prev_angle))
 	{
@@ -290,6 +293,12 @@ namespace Reflex
 		return self->dy;
 	}
 
+	coord
+	FrameEvent::dz () const
+	{
+		return self->dz;
+	}
+
 	coord
 	FrameEvent::dwidth () const
 	{
@@ -302,6 +311,12 @@ namespace Reflex
 		return self->dh;
 	}
 
+	coord
+	FrameEvent::ddepth () const
+	{
+		return self->dd;
+	}
+
 	float
 	FrameEvent::zoom () const
 	{
@@ -329,13 +344,13 @@ namespace Reflex
 	bool
 	FrameEvent::is_move () const
 	{
-		return self->dx != 0 || self->dy != 0;
+		return self->dx != 0 || self->dy != 0 || self->dz != 0;
 	}
 
 	bool
 	FrameEvent::is_resize () const
 	{
-		return self->dw != 0 || self->dh != 0;
+		return self->dw != 0 || self->dh != 0 || self->dd != 0;
 	}
 
 	bool
@@ -565,21 +580,35 @@ namespace Reflex
 
 		bool captured;
 
+		Data* parent = NULL;
+
 		Data (bool captured = false)
 		:	captured(captured)
 		{
 		}
 
+		void increment_view_indices ()
+		{
+			for (auto& pointer : pointers)
+				Pointer_set_view_index(&pointer, pointer.view_index() + 1);
+
+			if (parent) parent->increment_view_indices();
+		}
+
 	};// PointerEvent::Data
 
 
 	void
-	PointerEvent_add_pointer (PointerEvent* pthis, const Pointer& pointer)
+	PointerEvent_add_pointer (
+		PointerEvent* pthis, const Pointer& pointer,
+		std::function<void(Pointer*)> fun)
 	{
 		if (!pthis)
 			argument_error(__FILE__, __LINE__);
 
 		pthis->self->pointers.emplace_back(pointer);
+
+		if (fun) fun(&pthis->self->pointers.back());
 	}
 
 	void
@@ -625,6 +654,15 @@ namespace Reflex
 			fun(pointer);
 	}
 
+	void
+	PointerEvent_increment_view_indices (PointerEvent* pthis)
+	{
+		if (!pthis)
+			argument_error(__FILE__, __LINE__);
+
+		pthis->self->increment_view_indices();
+	}
+
 	void
 	PointerEvent_set_captured (PointerEvent* pthis, bool captured)
 	{
@@ -687,6 +725,7 @@ namespace Reflex
 	PointerEvent::PointerEvent (const PointerEvent* src)
 	:	Event(src), self(new Data(*src->self))
 	{
+		self->parent = src->self.get();
 	}
 
 	PointerEvent
@@ -992,9 +1031,39 @@ namespace Reflex
 	}
 
 
+	struct MotionEvent::Data
+	{
+
+		Point gravity;
+
+		Data (const Point& gravity)
+		:	gravity(gravity)
+		{
+		}
+
+	};// MotionEvent::Data
+
+
 	MotionEvent::MotionEvent (const Point& gravity)
-	:	gravity(gravity)
+	:	self(new Data(gravity))
+	{
+	}
+
+	MotionEvent::MotionEvent (const MotionEvent* src)
+	:	Event(src), self(new Data(*src->self))
+	{
+	}
+
+	MotionEvent
+	MotionEvent::dup () const
+	{
+		return MotionEvent(this);
+	}
+
+	const Point&
+	MotionEvent::gravity () const
 	{
+		return self->gravity;
 	}
 
 

data/src/event.h

@@ -5,7 +5,7 @@
 
 
 #include <functional>
-#include <reflex/event.h>
+#include "reflex/event.h"
 
 
 namespace Reflex
@@ -22,20 +22,26 @@ namespace Reflex
 	void KeyEvent_set_captured (KeyEvent* pthis, bool captured);
 
 
-	void PointerEvent_add_pointer    (PointerEvent* pthis, const Pointer& pointer);
+	void PointerEvent_add_pointer (
+		PointerEvent* pthis, const Pointer& pointer,
+		std::function<void(Pointer*)> fun = NULL);
 
-	void PointerEvent_erase_pointer  (PointerEvent* pthis, Pointer::ID id);
+	void PointerEvent_erase_pointer (PointerEvent* pthis, Pointer::ID id);
 
 	Pointer& PointerEvent_pointer_at (PointerEvent* pthis, size_t index);
 
 	void PointerEvent_each_pointer (
 		const PointerEvent* pthis, std::function<void(const Pointer&)> fun);
 
+	void PointerEvent_increment_view_indices (PointerEvent* pthis);
+
 	void PointerEvent_set_captured (PointerEvent* pthis, bool captured);
 
-	void PointerEvent_update_for_child_view (PointerEvent* pthis, const View* view);
+	void PointerEvent_update_for_child_view (
+		PointerEvent* pthis, const View* view);
 
-	void PointerEvent_update_for_capturing_view (PointerEvent* pthis, const View* view);
+	void PointerEvent_update_for_capturing_view (
+		PointerEvent* pthis, const View* view);
 
 
 	void WheelEvent_set_position (WheelEvent* pthis, const Point& position);

data/src/fixture.h

@@ -6,7 +6,7 @@
 
 #include <memory>
 #include <xot/noncopyable.h>
-#include <reflex/defs.h>
+#include "reflex/defs.h"
 
 
 class b2Fixture;

data/src/ios/application.h

@@ -4,7 +4,7 @@
 #define __REFLEX_SRC_IOS_APPLICATION_H__
 
 
-#include <reflex/application.h>
+#include "reflex/application.h"
 
 
 @class ReflexAppDelegate;

data/src/ios/event.mm

@@ -108,8 +108,9 @@ namespace Reflex
 			action,
 			to_point([touch locationInView: view]),
 			get_modifiers(event),
-			(uint) touch.tapCount,
 			action == Pointer::MOVE,
+			(uint) touch.tapCount,
+			0,
 			time);
 
 		if (prev_pointers)

data/src/osx/application.h

@@ -4,7 +4,7 @@
 #define __REFLEX_SRC_OSX_APPLICATION_H__
 
 
-#include <reflex/application.h>
+#include "reflex/application.h"
 
 
 @class ReflexAppDelegate;

data/src/osx/event.h

@@ -12,18 +12,22 @@ namespace Reflex
 {
 
 
-	struct NativeKeyEvent : public KeyEvent
+	class NativeKeyEvent : public KeyEvent
 	{
 
-		NativeKeyEvent (NSEvent* event, Action action);
+		public:
+
+			NativeKeyEvent (NSEvent* event, Action action);
 
 	};// NativeKeyEvent
 
 
-	struct NativeFlagKeyEvent : public KeyEvent
+	class NativeFlagKeyEvent : public KeyEvent
 	{
 
-		NativeFlagKeyEvent (NSEvent* event);
+		public:
+
+			NativeFlagKeyEvent (NSEvent* event);
 
 	};// NativeFlagKeyEvent
 
@@ -39,10 +43,12 @@ namespace Reflex
 	};// NativePointerEvent
 
 
-	struct NativeWheelEvent : public WheelEvent
+	class NativeWheelEvent : public WheelEvent
 	{
 
-		NativeWheelEvent (NSEvent* event, NSView* view);
+		public:
+
+			NativeWheelEvent (NSEvent* event, NSView* view);
 
 	};// NativeWheelEvent
 

data/src/osx/event.mm

@@ -286,8 +286,9 @@ namespace Reflex
 			action,
 			get_pointer_position(event, view),
 			get_modifiers(event),
-			action == Pointer::MOVE && !dragging ? 0 : (uint) [event clickCount],
 			dragging,
+			action == Pointer::MOVE && !dragging ? 0 : (uint) [event clickCount],
+			0,
 			time()));
 	}
 

data/src/osx/native_window.mm

@@ -288,7 +288,7 @@ update_pixel_density (Reflex::Window* window)
 
 		if (dpos != 0 || dsize != 0)
 		{
-			Reflex::FrameEvent e(b, dpos.x, dpos.y, dsize.x, dsize.y);
+			Reflex::FrameEvent e(b, dpos.x, dpos.y, 0, dsize.x, dsize.y, 0);
 			if (dpos  != 0) win->on_move(&e);
 			if (dsize != 0)
 			{