reflexion 0.2.1 → 0.3.1

data/src/window.cpp

@@ -2,6 +2,7 @@
 
 
 #include <assert.h>
+#include <algorithm>
 #include <set>
 #include "reflex/exception.h"
 #include "view.h"
@@ -18,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 ()
@@ -34,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();
@@ -88,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__);
@@ -100,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
@@ -116,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);
@@ -156,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();
@@ -181,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;
 	}
 
@@ -209,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);
@@ -334,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);
 		}
 	}
@@ -360,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()

data/test/test_window.rb

@@ -47,27 +47,30 @@ class TestWindow < Test::Unit::TestCase
     b = w.frame.dup
     assert_equal b, w.frame
 
-    w.frame =  1;                 assert_equal [0, 0,    1, 1],     w.frame.to_a
-    w.frame = [1];                assert_equal [0, 0,    1, 1],     w.frame.to_a
-    w.frame = [1, 2];             assert_equal [0, 0,    1, 2],     w.frame.to_a
-    w.frame = [1, 2, 3];          assert_equal [0, 0,    1, 2],     w.frame.to_a
-    w.frame = [1, 2, 3];          assert_equal [0, 0, 0, 1, 2, 0],  w.frame.to_a(3)
-    w.frame = [1, 2, 3, 4];       assert_equal [1, 2,    3, 4],     w.frame.to_a
-    w.frame = [1, 2, 3, 4];       assert_equal [1, 2, 0, 3, 4, 0],  w.frame.to_a(3)
-    w.frame = [1, 2, 3, 4, 5, 6]; assert_equal [1, 2,    4, 5],     w.frame.to_a
-    w.frame = [1, 2, 3, 4, 5, 6]; assert_equal [1, 2, 0, 4, 5, 0],  w.frame.to_a(3)
-
-    w.frame =  point(1);                        assert_equal [0, 0,    1, 1],    w.frame.to_a
-    w.frame = [point(1)];                       assert_equal [0, 0,    1, 1],    w.frame.to_a
-    w.frame =  point(1, 2);                     assert_equal [0, 0,    1, 2],    w.frame.to_a
-    w.frame = [point(1, 2)];                    assert_equal [0, 0,    1, 2],    w.frame.to_a
-    w.frame = [point(1, 2),    point(3, 4)];    assert_equal [1, 2,    3, 4],    w.frame.to_a
-    w.frame = [point(1, 2),    point(3, 4)];    assert_equal [1, 2, 0, 3, 4, 0], w.frame.to_a(3)
-    w.frame = [point(1, 2, 3), point(4, 5, 6)]; assert_equal [1, 2,    4, 5],    w.frame.to_a
-    w.frame = [point(1, 2, 3), point(4, 5, 6)]; assert_equal [1, 2, 0, 4, 5, 0], w.frame.to_a(3)
-
-    w.frame =  bounds(1, 2, 3, 4, 5, 6);  assert_equal [1, 2, 0, 4, 5, 0], w.frame.to_a(3)
-    w.frame = [bounds(1, 2, 3, 4, 5, 6)]; assert_equal [1, 2, 0, 4, 5, 0], w.frame.to_a(3)
+    min_width = w.frame.width
+    minw      = -> value {[min_width, value].max}
+
+    w.frame =  1;                 assert_equal [0, 0,    minw[1], 1],     w.frame.to_a
+    w.frame = [1];                assert_equal [0, 0,    minw[1], 1],     w.frame.to_a
+    w.frame = [1, 2];             assert_equal [0, 0,    minw[1], 2],     w.frame.to_a
+    w.frame = [1, 2, 3];          assert_equal [0, 0,    minw[1], 2],     w.frame.to_a
+    w.frame = [1, 2, 3];          assert_equal [0, 0, 0, minw[1], 2, 0],  w.frame.to_a(3)
+    w.frame = [1, 2, 3, 4];       assert_equal [1, 2,    minw[3], 4],     w.frame.to_a
+    w.frame = [1, 2, 3, 4];       assert_equal [1, 2, 0, minw[3], 4, 0],  w.frame.to_a(3)
+    w.frame = [1, 2, 3, 4, 5, 6]; assert_equal [1, 2,    minw[4], 5],     w.frame.to_a
+    w.frame = [1, 2, 3, 4, 5, 6]; assert_equal [1, 2, 0, minw[4], 5, 0],  w.frame.to_a(3)
+
+    w.frame =  point(1);                        assert_equal [0, 0,    minw[1], 1],    w.frame.to_a
+    w.frame = [point(1)];                       assert_equal [0, 0,    minw[1], 1],    w.frame.to_a
+    w.frame =  point(1, 2);                     assert_equal [0, 0,    minw[1], 2],    w.frame.to_a
+    w.frame = [point(1, 2)];                    assert_equal [0, 0,    minw[1], 2],    w.frame.to_a
+    w.frame = [point(1, 2),    point(3, 4)];    assert_equal [1, 2,    minw[3], 4],    w.frame.to_a
+    w.frame = [point(1, 2),    point(3, 4)];    assert_equal [1, 2, 0, minw[3], 4, 0], w.frame.to_a(3)
+    w.frame = [point(1, 2, 3), point(4, 5, 6)]; assert_equal [1, 2,    minw[4], 5],    w.frame.to_a
+    w.frame = [point(1, 2, 3), point(4, 5, 6)]; assert_equal [1, 2, 0, minw[4], 5, 0], w.frame.to_a(3)
+
+    w.frame =  bounds(1, 2, 3, 4, 5, 6);  assert_equal [1, 2, 0, minw[4], 5, 0], w.frame.to_a(3)
+    w.frame = [bounds(1, 2, 3, 4, 5, 6)]; assert_equal [1, 2, 0, minw[4], 5, 0], w.frame.to_a(3)
   end
 
   def test_closable?()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 description: This library helps you to develop interactive graphical user interface.
 email: xordog@gmail.com
 executables: []
@@ -369,11 +369,14 @@ files:
 - src/view.cpp
 - src/view.h
 - src/win32/application.cpp
-- src/win32/defs.cpp
-- src/win32/defs.h
+- src/win32/device.cpp
+- src/win32/event.cpp
+- src/win32/event.h
 - src/win32/opengl.cpp
 - src/win32/opengl.h
 - src/win32/reflex.cpp
+- src/win32/screen.cpp
+- src/win32/screen.h
 - src/win32/window.cpp
 - src/window.cpp
 - src/window.h