reflexion 0.1.38 → 0.1.39

data/src/window.cpp

@@ -17,7 +17,15 @@ namespace Reflex
 
 	using ExtractedPointerIDSet = std::set<Pointer::ID>;
 
-	using CaptureTargetIDList   = Window::Data::CaptureTargetIDList;
+	using PointerData           = Window::Data::PointerData;
+
+	using TargetPointerMap      = Window::Data::TargetPointerMap;
+
+
+	Window::Data::PointerData::PointerData (uint view_index)
+	:	view_index(view_index)
+	{
+	}
 
 
 	void
@@ -68,10 +76,9 @@ namespace Reflex
 	}
 
 	void
-	Window_register_capture (Window* window, View* view, Pointer::ID target)
+	Window_register_capture (
+		Window* window, View* view, Pointer::ID target, uint view_index)
 	{
-		assert(window);
-
 		if (!view)
 			argument_error(__FILE__, __LINE__);
 
@@ -81,19 +88,15 @@ namespace Reflex
 		if (target < 0) return;
 
 		auto& targets = window->self->captures[view];
-		if (std::find(targets.begin(), targets.end(), target) != targets.end())
+		if (targets.find(target) != targets.end())
 			return;
 
-		targets.insert(
-			target == CAPTURE_ALL ? targets.begin() : targets.end(),
-			target);
+		targets.insert(std::make_pair(target, PointerData(view_index)));
 	}
 
 	void
 	Window_unregister_capture (Window* window, View* view, Pointer::ID target)
 	{
-		assert(window);
-
 		if (!view)
 			argument_error(__FILE__, __LINE__);
 
@@ -101,7 +104,7 @@ namespace Reflex
 		if (captures_it == window->self->captures.end()) return;
 
 		auto& targets   = captures_it->second;
-		auto targets_it = std::find(targets.begin(), targets.end(), target);
+		auto targets_it = targets.find(target);
 		if (targets_it == targets.end()) return;
 
 		targets.erase(targets_it);
@@ -149,11 +152,11 @@ namespace Reflex
 
 	static bool
 	is_capturing (
-		const View* view, const CaptureTargetIDList& targets, View::Capture type)
+		const View* view, const TargetPointerMap& targets, View::Capture type)
 	{
 		return
 			!targets.empty() &&
-			targets[0] == CAPTURE_ALL &&
+			targets.find(CAPTURE_ALL) != targets.end() &&
 			(view->capture() & type) == type;
 	}
 
@@ -224,26 +227,28 @@ namespace Reflex
 	static void
 	extract_pointer (
 		PointerEvent* event, ExtractedPointerIDSet* extracteds,
-		const Pointer& pointer)
+		const Pointer& pointer, uint view_index = 0)
 	{
-		assert(event && extracteds);
+		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 CaptureTargetIDList& targets, const PointerMap& pointers)
+		const TargetPointerMap& targets, const PointerMap& pointers)
 	{
-		assert(event && event->empty() && extracteds);
+		assert(event->empty());
 
-		for (auto pointer_id : targets)
+		for (auto& [pointer_id, data] : targets)
 		{
 			auto it = pointers.find(pointer_id);
 			if (it != pointers.end())
-				extract_pointer(event, extracteds, it->second);
+				extract_pointer(event, extracteds, it->second, data.view_index);
 		}
 	}
 
@@ -252,8 +257,6 @@ namespace Reflex
 		ExtractedPointerIDSet* extracteds,
 		Window* window, const PointerMap& pointers)
 	{
-		assert(extracteds && window);
-
 		for (auto& [view, targets] : window->self->captures)
 		{
 			if (!view->window() || targets.empty()) continue;

data/src/window.h

@@ -9,8 +9,8 @@
 #include <xot/time.h>
 #include <rays/point.h>
 #include <rays/painter.h>
-#include <reflex/window.h>
-#include <reflex/view.h>
+#include "reflex/window.h"
+#include "reflex/view.h"
 #include "pointer.h"
 
 
@@ -24,9 +24,18 @@ namespace Reflex
 	struct Window::Data
 	{
 
-		typedef std::vector<Pointer::ID>                 CaptureTargetIDList;
+		struct PointerData
+		{
+
+			uint view_index;
+
+			PointerData (uint view_index);
+
+		};// PointerData
+
+		typedef std::map<Pointer::ID, PointerData>    TargetPointerMap;
 
-		typedef std::map<View::Ref, CaptureTargetIDList> CaptureMap;
+		typedef std::map<View::Ref, TargetPointerMap> CaptureMap;
 
 		int hide_count = 1;
 
@@ -92,10 +101,10 @@ namespace Reflex
 	void Window_set_focus (Window* window, View* view);
 
 	void Window_register_capture (
-		Window* window, View* view, Pointer::ID target = CAPTURE_ALL);
+		Window* window, View* view, Pointer::ID target, uint view_index = 0);
 
 	void Window_unregister_capture (
-		Window* window, View* view, Pointer::ID target = CAPTURE_ALL);
+		Window* window, View* view, Pointer::ID target);
 
 	void Window_call_draw_event    (Window* window, DrawEvent*    event);
 

data/src/world.h

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

data/test/test_event.rb

@@ -18,24 +18,27 @@ class TestEvent < Test::Unit::TestCase
   end
 
   def test_block()
-    e = event
-    assert_false e.blocked?
-    e.block
-    assert_true  e.blocked?
-  end
+    events = -> {
+      e1 = event
+      e2 = e1.dup
+      e3 = e2.dup
+      return e1, e2, e3
+    }
 
-  def _test_block_propagation()
-    e1 = event
-    e2 = e1.dup
-    e3 = e2.dup
-    assert_false e1.blocked?
-    assert_false e2.blocked?
-    assert_false e3.blocked?
+    e1, e2, e3 = events.call
+    assert_equal [false, false, false], [e1.blocked?, e2.blocked?, e3.blocked?]
 
+    e1, e2, e3 = events.call
     e2.block
-    assert_true  e1.blocked?
-    assert_true  e2.blocked?
-    assert_false e3.blocked?
+    assert_equal [true,  true,  false], [e1.blocked?, e2.blocked?, e3.blocked?]
+
+    e1, e2, e3 = events.call
+    e2.block false
+    assert_equal [false, true,  false], [e1.blocked?, e2.blocked?, e3.blocked?]
+
+    e1, e2, e3 = events.call
+    e2.block true
+    assert_equal [true,  true,  false], [e1.blocked?, e2.blocked?, e3.blocked?]
   end
 
   def test_time()

data/test/test_frame_event.rb

@@ -12,30 +12,34 @@ class TestFrameEvent < Test::Unit::TestCase
   end
 
   def test_initialize()
-    e = event bounds(1, 2, 3, 4, 5, 6), 7, 8, 9, 10, 11, 12, 13, 14
+    e = event bounds(1, 2, 3, 4, 5, 6), 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
     assert_equal bounds(1, 2, 3, 4, 5, 6), e.frame
     assert_equal 7,  e.dx
     assert_equal 8,  e.dy
-    assert_equal 9,  e.dw
-    assert_equal 10, e.dh
-    assert_equal 11, e.zoom
-    assert_equal 12, e.dzoom
-    assert_equal 13, e.angle
-    assert_equal 14, e.dangle
+    assert_equal 9,  e.dz
+    assert_equal 10, e.dw
+    assert_equal 11, e.dh
+    assert_equal 12, e.dd
+    assert_equal 13, e. zoom
+    assert_equal 14, e.dzoom
+    assert_equal 15, e. angle
+    assert_equal 16, e.dangle
   end
 
   def test_dup()
-    e1 = event bounds(1, 2, 3, 4, 5, 6), 7, 8, 9, 10, 11, 12, 13, 14
+    e1 = event bounds(1, 2, 3, 4, 5, 6), 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
     e2 = e1.dup
     assert_equal bounds(1, 2, 3, 4, 5, 6), e2.frame
     assert_equal 7,  e2.dx
     assert_equal 8,  e2.dy
-    assert_equal 9,  e2.dw
-    assert_equal 10, e2.dh
-    assert_equal 11, e2.zoom
-    assert_equal 12, e2.dzoom
-    assert_equal 13, e2.angle
-    assert_equal 14, e2.dangle
+    assert_equal 9,  e2.dz
+    assert_equal 10, e2.dw
+    assert_equal 11, e2.dh
+    assert_equal 12, e2.dd
+    assert_equal 13, e2. zoom
+    assert_equal 14, e2.dzoom
+    assert_equal 15, e2. angle
+    assert_equal 16, e2.dangle
 
     e1.block
     e3 = e1.dup
@@ -46,8 +50,8 @@ class TestFrameEvent < Test::Unit::TestCase
 
   def test_inspect()
     assert_equal(
-      "#<Reflex::FrameEvent x:1(7) y:2(8) w:4(9) h:5(10) zoom:11(12) angle:13(14)>",
-      event(bounds(1, 2, 3, 4, 5, 6), 7, 8, 9, 10, 11, 12, 13, 14).inspect)
+      "#<Reflex::FrameEvent x:1(7) y:2(8) z:3(9) w:4(10) h:5(11) d:6(12) zoom:13(14) angle:15(16)>",
+      event(bounds(1, 2, 3, 4, 5, 6), 7, 8, 9, 10, 11, 12, 13, 14, 15, 16).inspect)
   end
 
 end# TestFrameEvent

data/test/test_pointer.rb

@@ -23,11 +23,11 @@ class TestPointer < Test::Unit::TestCase
 
   def pointer(
     id: 0, type: TYPE_NONE, action: ACTION_NONE,
-    position: 0, modifiers: 0, click_count: 0, drag: false,
+    position: 0, modifiers: 0, drag: false, click_count: 0, view_index: 0,
     time: 0)
 
     Reflex::Pointer.new(
-      id, type, action, position, modifiers, click_count, drag, time)
+      id, type, action, position, modifiers, drag, click_count, view_index, time)
   end
 
   def test_initialize()
@@ -35,18 +35,21 @@ class TestPointer < Test::Unit::TestCase
 
     p = pointer(
       id: 1, type: TOUCH, action: DOWN,
-      position: [2, 3], modifiers: 4, click_count: 5, drag: true,
-      time: 6)
-
-    assert_equal    1,             p.id
-    assert_equal    [:touch],      p.types
-    assert_equal    :down,         p.action
-    assert_equal    [2, 3],        p.position.to_a
-    assert_equal    4,             p.modifiers
-    assert_equal    5,             p.click_count
-    assert_equal    true,          p.drag?
-    assert_equal    6,             p.time
-    assert_nil                     p.prev
+      position: [2, 3], modifiers: 4, drag: true, click_count: 5, view_index: 6,
+      time: 7)
+
+    assert_equal 1,        p.id
+    assert_equal [:touch], p.types
+    assert_equal :down,    p.action
+    assert_equal [2, 3],   p.position.to_a
+    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_nil             p.prev
   end
 
   def test_types()
@@ -138,9 +141,10 @@ 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(click_count: 4)
     assert_not_equal pointer, pointer(drag:        true)
-    assert_not_equal pointer, pointer(time:        5)
+    assert_not_equal pointer, pointer(click_count: 4)
+    assert_not_equal pointer, pointer(view_index:  5)
+    assert_not_equal pointer, pointer(time:        6)
   end
 
 end# TestPointer

data/test/test_pointer_event.rb

@@ -11,17 +11,17 @@ class TestPointerEvent < Test::Unit::TestCase
   DOWN        = Reflex::Pointer::DOWN
   UP          = Reflex::Pointer::UP
 
-  def event(*args)
-    Reflex::PointerEvent.new(*args)
+  def event(*args, **kwargs)
+    Reflex::PointerEvent.new(*args, **kwargs)
   end
 
   def pointer(
     id: 0, type: TYPE_NONE, action: ACTION_NONE,
-    position: 0, modifiers: 0, click_count: 0, drag: false,
+    position: 0, modifiers: 0, drag: false, click_count: 0, view_index: 0,
     time: 0)
 
     Reflex::Pointer.new(
-      id, type, action, position, modifiers, click_count, drag, time)
+      id, type, action, position, modifiers, drag, click_count, view_index, time)
   end
 
   def test_initialize()
@@ -31,30 +31,30 @@ class TestPointerEvent < Test::Unit::TestCase
 
     p1 = pointer(
       id: 1,  type: TOUCH, action: DOWN,
-      position: [2,  3],  modifiers: 4,  click_count: 5,  drag: true,
-      time: 6)
+      position: [2,  3],  modifiers: 4,  drag: true,  click_count: 5,  view_index: 6,
+      time: 7)
     p2 = pointer(
       id: 10, type: PEN,   action: UP,
-      position: [20, 30], modifiers: 40, click_count: 50, drag: false,
-      time: 60)
+      position: [20, 30], modifiers: 40, drag: false, click_count: 50, view_index: 60,
+      time: 70)
     e = event p1, p2
 
     assert_equal [p1, p2], e.pointers.to_a
     assert_equal 2,        e.size
     assert_equal false,    e.empty?
     assert_equal false,    e.captured?
-
-    assert_equal 1,        p1.id
-    assert_equal [:touch], p1.types
-    assert_equal :down,    p1.action
-    assert_equal [2, 3],   p1.position.to_a
-    assert_equal [2, 3],   p1.pos     .to_a
-    assert_equal 2,        p1.x
-    assert_equal 3,        p1.y
-    assert_equal 4,        p1.modifiers
-    assert_equal 5,        p1.click_count
-    assert_equal true,     p1.drag?
-    assert_equal 6,        p1.time
+    assert_equal 1,        e.id
+    assert_equal [:touch], e.types
+    assert_equal :down,    e.action
+    assert_equal [2, 3],   e.position.to_a
+    assert_equal [2, 3],   e.pos     .to_a
+    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
   end
 
   def test_dup()
@@ -68,7 +68,7 @@ class TestPointerEvent < Test::Unit::TestCase
   end
 
   def test_size()
-    assert_equal 1, event(pointer         ).size
+    assert_equal 1, event(pointer)         .size
     assert_equal 2, event(pointer, pointer).size
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.36
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.36
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.36
+        version: 0.1.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.36
+        version: 0.1.37
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.36
+        version: 0.1.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.36
+        version: 0.1.37
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement