reflexion 0.3 → 0.3.2

data/src/pointer.cpp

@@ -1,7 +1,6 @@
 #include "pointer.h"
 
 
-#include <limits.h>
 #include <xot/time.h>
 #include "reflex/exception.h"
 
@@ -48,9 +47,7 @@ namespace Reflex
 
 		Point position, prev_position;
 
-		uint modifiers, flags;
-
-		ushort click_count, view_index;
+		uint modifiers, click_count, flags;
 
 		double time;
 
@@ -58,16 +55,14 @@ namespace Reflex
 
 		Data (
 			ID id = -1, uint types = TYPE_NONE, Action action = ACTION_NONE,
-			const Point& position = 0, uint modifiers = 0,
+			const Point& position = 0, uint modifiers = 0, uint click_count = 0,
 			bool drag = false, bool enter = false, bool exit = false,
-			uint click_count = 0, uint view_index = 0, double time = 0)
+			double time = 0)
 		:	id(id), types(types), action(action),
-			position(position), modifiers(modifiers),
+			position(position), modifiers(modifiers), click_count(click_count),
 			flags(make_flags(drag, enter, exit)),
-			click_count(click_count), view_index(view_index), time(time)
+			time(time)
 		{
-			if (view_index >= USHRT_MAX)
-				argument_error(__FILE__, __LINE__);
 		}
 
 		uint make_flags (bool drag, bool enter, bool exit)
@@ -101,15 +96,6 @@ namespace Reflex
 		it->self->id = id;
 	}
 
-	void
-	Pointer_set_view_index (Pointer* it, uint view_index)
-	{
-		if (view_index >= USHRT_MAX)
-			argument_error(__FILE__, __LINE__);
-
-		it->self->view_index = view_index;
-	}
-
 	void
 	Pointer_add_flag (Pointer* it, uint flag)
 	{
@@ -177,12 +163,12 @@ namespace Reflex
 
 	Pointer::Pointer (
 		ID id, uint types, Action action,
-		const Point& position, uint modifiers, bool drag,
-		uint click_count, uint view_index, double time)
+		const Point& position, uint modifiers, uint click_count, bool drag,
+		double time)
 	:	self(new Data(
 			id, types, action,
-			position, modifiers, drag, false, false,
-			click_count, view_index, time))
+			position, modifiers, click_count, drag, false, false,
+			time))
 	{
 	}
 
@@ -232,22 +218,16 @@ namespace Reflex
 		return self->modifiers;
 	}
 
-	bool
-	Pointer::is_drag () const
-	{
-		return Xot::has_flag(self->flags, Data::DRAG);
-	}
-
 	uint
 	Pointer::click_count () const
 	{
 		return self->click_count;
 	}
 
-	uint
-	Pointer::view_index () const
+	bool
+	Pointer::is_drag () const
 	{
-		return self->view_index;
+		return Xot::has_flag(self->flags, Data::DRAG);
 	}
 
 	double

data/src/pointer.h

@@ -16,8 +16,6 @@ namespace Reflex
 
 	void Pointer_set_id (Pointer* it, Pointer::ID id);
 
-	void Pointer_set_view_index (Pointer* it, uint view_index);
-
 	void Pointer_add_flag (Pointer* it, uint flag);
 
 	void Pointer_remove_flag (Pointer* it, uint flag);

data/src/selector.cpp

@@ -76,7 +76,9 @@ namespace Reflex
 	void
 	Selector::add_tag (const char* tag)
 	{
-		if (!tag || *tag == '\0')
+		if (!tag)
+			argument_error(__FILE__, __LINE__);
+		if (*tag == '\0')
 			argument_error(__FILE__, __LINE__);
 
 		iterator it = self->tags.find(tag);

data/src/shape.cpp

@@ -444,7 +444,9 @@ namespace Reflex
 	void
 	Shape_call_contact_event (Shape* shape, ContactEvent* event)
 	{
-		if (!shape || !event)
+		if (!shape)
+			argument_error(__FILE__, __LINE__);
+		if (!event)
 			argument_error(__FILE__, __LINE__);
 
 		shape->on_contact(event);

data/src/style.cpp

@@ -202,7 +202,9 @@ namespace Reflex
 	void
 	StyleLength::reset (Type type, Value value)
 	{
-		if (type < NONE || TYPE_MAX <= type)
+		if (type < NONE)
+			argument_error(__FILE__, __LINE__);
+		if (type >= TYPE_MAX)
 			argument_error(__FILE__, __LINE__);
 
 		if (type == FIT && value != 1)
@@ -615,14 +617,18 @@ namespace Reflex
 	void
 	Style::set_flow (Flow main, Flow sub)
 	{
-		if (
-			main <  FLOW_NONE || FLOW_MAX <= main ||
-			sub  <  FLOW_NONE || FLOW_MAX <= sub  ||
-			(main != FLOW_NONE && (get_flow_dir(main) == get_flow_dir(sub))) ||
-			(main == FLOW_NONE && sub != FLOW_NONE))
-		{
+		if (main <  FLOW_NONE)
+			argument_error(__FILE__, __LINE__);
+		if (main >= FLOW_MAX)
+			argument_error(__FILE__, __LINE__);
+		if (sub  <  FLOW_NONE)
+			argument_error(__FILE__, __LINE__);
+		if (sub  >= FLOW_MAX)
+			argument_error(__FILE__, __LINE__);
+		if (main != FLOW_NONE && (get_flow_dir(main) == get_flow_dir(sub)))
+			argument_error(__FILE__, __LINE__);
+		if (main == FLOW_NONE && sub != FLOW_NONE)
 			argument_error(__FILE__, __LINE__);
-		}
 
 		self->set_flow(main, sub);
 

data/src/view.cpp

@@ -289,15 +289,22 @@ namespace Reflex
 
 		World* child_world (View* view, bool create = true)
 		{
-			if (!pchild_world && create)
-			{
-				pchild_world.reset(new World());
-				create_walls(view);
-			}
-
+			if (!pchild_world && create) create_world(view);
 			return pchild_world.get();
 		}
 
+		void create_world (View* view, float pixels_per_meter = 0)
+		{
+			if (pchild_world)
+				invalid_state_error(__FILE__, __LINE__);
+
+			if (pixels_per_meter == 0)
+				pixels_per_meter = World::DEFAULT_PIXELS_PER_METER;
+
+			pchild_world.reset(new World(pixels_per_meter));
+			create_walls(view);
+		}
+
 		void create_walls (View* view)
 		{
 			clear_walls(view);
@@ -1327,7 +1334,9 @@ namespace Reflex
 	void
 	View_call_key_event (View* view, KeyEvent* event)
 	{
-		if (!view || !event)
+		if (!view)
+			argument_error(__FILE__, __LINE__);
+		if (!event)
 			argument_error(__FILE__, __LINE__);
 
 		if (view->hidden()) return;
@@ -1383,9 +1392,6 @@ namespace Reflex
 			case Pointer::CANCEL: view->on_pointer_cancel(event); break;
 			default: break;
 		}
-
-		if (!event->is_captured())
-			PointerEvent_increment_view_indices(event);
 	}
 
 	static void
@@ -1398,34 +1404,36 @@ namespace Reflex
 		PointerEvent_each_pointer(&event, [&](const auto& pointer)
 		{
 			if (pointer.action() == Pointer::DOWN)
-				Window_register_capture(win, view, pointer.id(), pointer.view_index());
+				Window_register_capture(win, view, pointer.id());
 		});
 	}
 
 	static void
-	unregister_captures (View* view, const PointerEvent& event)
+	unregister_captures (Window* window, View* view, const PointerEvent& event)
 	{
-		Window* win = view->window();
-		if (!win)
-			invalid_state_error(__FILE__, __LINE__);
-
 		PointerEvent_each_pointer(&event, [&](const auto& pointer)
 		{
 			auto action = pointer.action();
 			if (action == Pointer::UP || action == Pointer::CANCEL)
-				Window_unregister_capture(win, view, pointer.id());
+				Window_unregister_capture(window, view, pointer.id());
 		});
 	}
 
 	void
 	View_call_pointer_event (View* view, PointerEvent* event)
 	{
-		if (!view || !event)
+		if (!view)
+			argument_error(__FILE__, __LINE__);
+		if (!event)
 			argument_error(__FILE__, __LINE__);
 
 		if (view->hidden() || event->empty())
 			return;
 
+		Window* win = view->window();
+		if (!win)
+			invalid_state_error(__FILE__, __LINE__);
+
 		PointerEvent e = event->dup();
 
 		if (!e.is_captured())
@@ -1437,13 +1445,15 @@ namespace Reflex
 			call_pointer_events(view, &e);
 		}
 
-		unregister_captures(view, e);
+		unregister_captures(win, view, e);
 	}
 
 	void
 	View_call_wheel_event (View* view, WheelEvent* event)
 	{
-		if (!view || !event)
+		if (!view)
+			argument_error(__FILE__, __LINE__);
+		if (!event)
 			argument_error(__FILE__, __LINE__);
 
 		if (view->hidden()) return;
@@ -1469,7 +1479,9 @@ namespace Reflex
 	void
 	View_call_contact_event (View* view, ContactEvent* event)
 	{
-		if (!view || !event)
+		if (!view)
+			argument_error(__FILE__, __LINE__);
+		if (!event)
 			argument_error(__FILE__, __LINE__);
 
 		ContactEvent e = event->dup();
@@ -1738,7 +1750,9 @@ namespace Reflex
 	void
 	View::add_child (View* child)
 	{
-		if (!child || child == this)
+		if (!child)
+			argument_error(__FILE__, __LINE__);
+		if (child == this)
 			argument_error(__FILE__, __LINE__);
 
 		bool found  = std::find(child_begin(), child_end(), child) != child_end();
@@ -1764,7 +1778,9 @@ namespace Reflex
 	void
 	View::remove_child (View* child)
 	{
-		if (!child || child == this)
+		if (!child)
+			argument_error(__FILE__, __LINE__);
+		if (child == this)
 			argument_error(__FILE__, __LINE__);
 
 		bool found  = std::find(child_begin(), child_end(), child) != child_end();
@@ -2517,7 +2533,13 @@ namespace Reflex
 	}
 
 	void
-	View::update_physics (float duration)
+	View::create_world (float pixels_per_meter)
+	{
+		self->create_world(this, pixels_per_meter);
+	}
+
+	void
+	View::update_world (float duration)
 	{
 		World* w = self->pchild_world.get();
 		if (w) w->update(duration);

data/src/win32/event.cpp

@@ -135,9 +135,8 @@ namespace Reflex
 			get_mouse_action(msg),
 			Point(GET_X_LPARAM(lp), GET_Y_LPARAM(lp)),
 			get_modifiers(),
-			is_mouse_dragging(msg, wp),
 			get_mouse_click_count(msg),
-			0,
+			is_mouse_dragging(msg, wp),
 			Xot::time()));
 	}
 
@@ -197,9 +196,8 @@ namespace Reflex
 				action,
 				get_touch_position(hwnd, touch),
 				get_modifiers(),
-				action == Pointer::MOVE,
 				action == Pointer::DOWN ? 1 : 0,
-				0,
+				action == Pointer::MOVE,
 				get_touch_time(touch));
 			Pointer_set_system_id(&pointer, touch.dwID);
 

data/src/window.cpp

@@ -19,9 +19,7 @@ namespace Reflex
 
 	using ExtractedPointerIDSet = std::set<Pointer::ID>;
 
-	using PointerData           = Window::Data::PointerData;
-
-	using TargetPointerMap      = Window::Data::TargetPointerMap;
+	using CaptureTargetIDList   = Window::Data::CaptureTargetIDList;
 
 
 	Window::Data::Data ()
@@ -35,16 +33,12 @@ namespace Reflex
 	}
 
 
-	Window::Data::PointerData::PointerData (uint view_index)
-	:	view_index(view_index)
-	{
-	}
-
-
 	void
 	Window_set_focus (Window* window, View* view)
 	{
-		if (!window || !view)
+		if (!window)
+			argument_error(__FILE__, __LINE__);
+		if (!view)
 			argument_error(__FILE__, __LINE__);
 
 		View* current = window->self->focus.get();
@@ -89,8 +83,7 @@ namespace Reflex
 	}
 
 	void
-	Window_register_capture (
-		Window* window, View* view, Pointer::ID target, uint view_index)
+	Window_register_capture (Window* window, View* view, Pointer::ID target)
 	{
 		if (!view)
 			argument_error(__FILE__, __LINE__);
@@ -101,10 +94,12 @@ namespace Reflex
 		if (target < 0) return;
 
 		auto& targets = window->self->captures[view];
-		if (targets.find(target) != targets.end())
+		if (std::find(targets.begin(), targets.end(), target) != targets.end())
 			return;
 
-		targets.insert(std::make_pair(target, PointerData(view_index)));
+		targets.insert(
+			target == CAPTURE_ALL ? targets.begin() : targets.end(),
+			target);
 	}
 
 	void
@@ -117,7 +112,7 @@ namespace Reflex
 		if (captures_it == window->self->captures.end()) return;
 
 		auto& targets   = captures_it->second;
-		auto targets_it = targets.find(target);
+		auto targets_it = std::find(targets.begin(), targets.end(), target);
 		if (targets_it == targets.end()) return;
 
 		targets.erase(targets_it);
@@ -157,7 +152,9 @@ namespace Reflex
 	void
 	Window_call_draw_event (Window* window, DrawEvent* event)
 	{
-		if (!window || !event)
+		if (!window)
+			argument_error(__FILE__, __LINE__);
+		if (!event)
 			argument_error(__FILE__, __LINE__);
 
 		Painter* painter = window->painter();
@@ -182,12 +179,12 @@ namespace Reflex
 	}
 
 	static bool
-	is_capturing (
-		const View* view, const TargetPointerMap& targets, View::Capture type)
+	is_capturing_all (
+		const View* view, const CaptureTargetIDList& targets, View::Capture type)
 	{
 		return
 			!targets.empty() &&
-			targets.find(CAPTURE_ALL) != targets.end() &&
+			targets[0] == CAPTURE_ALL &&
 			(view->capture() & type) == type;
 	}
 
@@ -210,8 +207,12 @@ namespace Reflex
 
 		for (auto& [view, targets] : window->self->captures)
 		{
-			if (!view->window() || !is_capturing(view.get(), targets, View::CAPTURE_KEY))
+			if (
+				!view->window() ||
+				!is_capturing_all(view.get(), targets, View::CAPTURE_KEY))
+			{
 				continue;
+			}
 
 			KeyEvent e = event->dup();
 			KeyEvent_set_captured(&e, true);
@@ -335,7 +336,7 @@ namespace Reflex
 		result->clear();
 		for (const auto& [view, targets] : window->self->captures)
 		{
-			if (is_capturing(view.get(), targets, View::CAPTURE_POINTER))
+			if (is_capturing_all(view.get(), targets, View::CAPTURE_POINTER))
 				result->emplace_back(view);
 		}
 	}
@@ -361,28 +362,24 @@ namespace Reflex
 	static void
 	extract_pointer (
 		PointerEvent* event, ExtractedPointerIDSet* extracteds,
-		const Pointer& pointer, uint view_index = 0)
+		const Pointer& pointer)
 	{
-		PointerEvent_add_pointer(event, pointer, [&](auto* p)
-		{
-			Pointer_set_view_index(p, view_index);
-		});
-
+		PointerEvent_add_pointer(event, pointer);
 		extracteds->insert(pointer.id());
 	}
 
 	static void
 	extract_targeted_pointers (
 		PointerEvent* event, ExtractedPointerIDSet* extracteds,
-		const TargetPointerMap& targets, const PointerMap& pointers)
+		const CaptureTargetIDList& targets, const PointerMap& pointers)
 	{
 		assert(event->empty());
 
-		for (auto& [pointer_id, data] : targets)
+		for (auto pointer_id : targets)
 		{
 			auto it = pointers.find(pointer_id);
 			if (it != pointers.end())
-				extract_pointer(event, extracteds, it->second, data.view_index);
+				extract_pointer(event, extracteds, it->second);
 		}
 	}
 

data/src/window.h

@@ -28,18 +28,9 @@ namespace Reflex
 	struct Window::Data
 	{
 
-		struct PointerData
-		{
-
-			uint view_index;
-
-			PointerData (uint view_index);
+		typedef std::vector<Pointer::ID>                 CaptureTargetIDList;
 
-		};// PointerData
-
-		typedef std::map<Pointer::ID, PointerData>    TargetPointerMap;
-
-		typedef std::map<View::Ref, TargetPointerMap> CaptureMap;
+		typedef std::map<View::Ref, CaptureTargetIDList> CaptureMap;
 
 		int hide_count = 1;
 
@@ -112,7 +103,7 @@ namespace Reflex
 	void Window_set_focus (Window* window, View* view);
 
 	void Window_register_capture (
-		Window* window, View* view, Pointer::ID target, uint view_index = 0);
+		Window* window, View* view, Pointer::ID target);
 
 	void Window_unregister_capture (
 		Window* window, View* view, Pointer::ID target);

data/test/test_pointer.rb

@@ -23,11 +23,11 @@ class TestPointer < Test::Unit::TestCase
 
   def pointer(
     id: 0, types: TYPE_NONE, action: ACTION_NONE,
-    position: 0, modifiers: 0, drag: false, click_count: 0, view_index: 0,
+    position: 0, modifiers: 0, click_count: 0, drag: false,
     time: 0)
 
     Reflex::Pointer.new(
-      id, types, action, position, modifiers, drag, click_count, view_index, time)
+      id, types, action, position, modifiers, click_count, drag, time)
   end
 
   def test_initialize()
@@ -35,8 +35,8 @@ class TestPointer < Test::Unit::TestCase
 
     p = pointer(
       id: 1, types: TOUCH, action: UP,
-      position: [2, 3], modifiers: 4, drag: true, click_count: 5, view_index: 6,
-      time: 7)
+      position: [2, 3], modifiers: 4, click_count: 5, drag: true,
+      time: 6)
 
     assert_equal 1,        p.id
     assert_equal [:touch], p.types
@@ -45,10 +45,9 @@ class TestPointer < Test::Unit::TestCase
     assert_equal 2,        p.x
     assert_equal 3,        p.y
     assert_equal 4,        p.modifiers
-    assert_equal true,     p.drag?
     assert_equal 5,        p.click_count
-    assert_equal 6,        p.view_index
-    assert_equal 7,        p.time
+    assert_equal true,     p.drag?
+    assert_equal 6,        p.time
     assert_nil             p.prev
     assert_nil             p.down
   end
@@ -147,10 +146,9 @@ class TestPointer < Test::Unit::TestCase
     assert_not_equal pointer, pointer(action:      Reflex::Pointer::UP)
     assert_not_equal pointer, pointer(position:    2)
     assert_not_equal pointer, pointer(modifiers:   3)
-    assert_not_equal pointer, pointer(drag:        true)
     assert_not_equal pointer, pointer(click_count: 4)
-    assert_not_equal pointer, pointer(view_index:  5)
-    assert_not_equal pointer, pointer(time:        6)
+    assert_not_equal pointer, pointer(drag:        true)
+    assert_not_equal pointer, pointer(time:        5)
   end
 
 end# TestPointer

data/test/test_pointer_event.rb

@@ -17,11 +17,11 @@ class TestPointerEvent < Test::Unit::TestCase
 
   def pointer(
     id: 0, type: TYPE_NONE, action: ACTION_NONE,
-    position: 0, modifiers: 0, drag: false, click_count: 0, view_index: 0,
+    position: 0, modifiers: 0, click_count: 0, drag: false,
     time: 0)
 
     Reflex::Pointer.new(
-      id, type, action, position, modifiers, drag, click_count, view_index, time)
+      id, type, action, position, modifiers, click_count, drag, time)
   end
 
   def test_initialize()
@@ -31,12 +31,12 @@ class TestPointerEvent < Test::Unit::TestCase
 
     p1 = pointer(
       id: 1,  type: TOUCH, action: DOWN,
-      position: [2,  3],  modifiers: 4,  drag: true,  click_count: 5,  view_index: 6,
-      time: 7)
+      position: [2,  3],  modifiers: 4,  drag: true,  click_count: 5,
+      time: 6)
     p2 = pointer(
       id: 10, type: PEN,   action: UP,
-      position: [20, 30], modifiers: 40, drag: false, click_count: 50, view_index: 60,
-      time: 70)
+      position: [20, 30], modifiers: 40, drag: false, click_count: 50,
+      time: 60)
     e = event p1, p2
 
     assert_equal [p1, p2], e.pointers.to_a
@@ -51,10 +51,9 @@ class TestPointerEvent < Test::Unit::TestCase
     assert_equal 2,        e.x
     assert_equal 3,        e.y
     assert_equal 4,        e.modifiers
-    assert_equal true,     e.drag?
     assert_equal 5,        e.click_count
-    assert_equal 6,        e.view_index
-    assert_equal 7,        e.time
+    assert_equal true,     e.drag?
+    assert_equal 6,        e.time
   end
 
   def test_dup()