reflexion 0.3.2 → 0.3.4

data/src/window.cpp

@@ -22,6 +22,37 @@ namespace Reflex
 	using CaptureTargetIDList   = Window::Data::CaptureTargetIDList;
 
 
+	void
+	Window_register (Window* win)
+	{
+		auto& all = Window_all();
+
+		auto it = std::find(all.begin(), all.end(), win);
+		if (it != all.end())
+			invalid_state_error(__FILE__, __LINE__);
+
+		all.push_back(win);
+	}
+
+	void
+	Window_unregister (Window* win)
+	{
+		auto& all = Window_all();
+
+		auto it = std::find(all.begin(), all.end(), win);
+		if (it == all.end()) return;
+
+		all.erase(it);
+	}
+
+	Application::WindowList&
+	Window_all ()
+	{
+		static Application::WindowList windows;
+		return windows;
+	}
+
+
 	Window::Data::Data ()
 	:	flags(Window_default_flags())
 	{
@@ -98,7 +129,7 @@ namespace Reflex
 			return;
 
 		targets.insert(
-			target == CAPTURE_ALL ? targets.begin() : targets.end(),
+			target == CAPTURE_ALL_EVENTS ? targets.begin() : targets.end(),
 			target);
 	}
 
@@ -132,23 +163,38 @@ namespace Reflex
 	}
 
 	void
-	Window_call_activate_event (Reflex::Window* window)
+	Window_call_activate_event (Window* window)
 	{
 		if (!window) return;
 
-		Reflex::Event e;
+		Event e;
 		window->on_activate(&e);
 	}
 
 	void
-	Window_call_deactivate_event (Reflex::Window* window)
+	Window_call_deactivate_event (Window* window)
 	{
 		if (!window) return;
 
-		Reflex::Event e;
+		Event e;
 		window->on_deactivate(&e);
 	}
 
+	void
+	Window_call_update_event (Window* window)
+	{
+		Window::Data* self = window->self.get();
+
+		double now = Xot::time();
+		UpdateEvent e(now, now - self->prev_time_update);
+		self->prev_time_update = now;
+
+		window->on_update(&e);
+		if (e.is_blocked()) return;
+
+		View_update_tree(window->root(), e);
+	}
+
 	void
 	Window_call_draw_event (Window* window, DrawEvent* event)
 	{
@@ -172,19 +218,19 @@ namespace Reflex
 
 		window->on_draw(event);
 		if (!event->is_blocked())
-			Reflex::View_draw_tree(window->root(), event, 0, frame.move_to(0));
+			View_draw_tree(window->root(), event, 0, frame.move_to(0));
 
 		painter->pop_state();
 		painter->end();
 	}
 
 	static bool
-	is_capturing_all (
+	is_capturing (
 		const View* view, const CaptureTargetIDList& targets, View::Capture type)
 	{
 		return
 			!targets.empty() &&
-			targets[0] == CAPTURE_ALL &&
+			targets[0] == CAPTURE_ALL_EVENTS &&
 			(view->capture() & type) == type;
 	}
 
@@ -196,20 +242,11 @@ namespace Reflex
 		if (!event)
 			argument_error(__FILE__, __LINE__);
 
-		window->on_key(event);
-
-		switch (event->action())
-		{
-			case KeyEvent::DOWN: window->on_key_down(event); break;
-			case KeyEvent::UP:   window->on_key_up(event);   break;
-			default: break;
-		}
-
 		for (auto& [view, targets] : window->self->captures)
 		{
 			if (
 				!view->window() ||
-				!is_capturing_all(view.get(), targets, View::CAPTURE_KEY))
+				!is_capturing(view.get(), targets, View::CAPTURE_KEY))
 			{
 				continue;
 			}
@@ -217,9 +254,24 @@ namespace Reflex
 			KeyEvent e = event->dup();
 			KeyEvent_set_captured(&e, true);
 			View_call_key_event(const_cast<View*>(view.get()), &e);
+
+			if (e.is_blocked()) event->block();
 		}
 
-		if (window->self->focus)
+		if (!event->is_blocked())
+			window->on_key(event);
+
+		if (!event->is_blocked())
+		{
+			switch (event->action())
+			{
+				case KeyEvent::DOWN: window->on_key_down(event); break;
+				case KeyEvent::UP:   window->on_key_up(event);   break;
+				default: break;
+			}
+		}
+
+		if (!event->is_blocked() && window->self->focus)
 			View_call_key_event(window->self->focus.get(), event);
 
 		cleanup_captures(window);
@@ -336,7 +388,7 @@ namespace Reflex
 		result->clear();
 		for (const auto& [view, targets] : window->self->captures)
 		{
-			if (is_capturing_all(view.get(), targets, View::CAPTURE_POINTER))
+			if (is_capturing(view.get(), targets, View::CAPTURE_POINTER))
 				result->emplace_back(view);
 		}
 	}
@@ -385,7 +437,7 @@ namespace Reflex
 
 	static void
 	capture_targeted_pointers_and_call_events (
-		ExtractedPointerIDSet* extracteds,
+		ExtractedPointerIDSet* extracteds, bool* blocked,
 		Window* window, const PointerMap& pointers)
 	{
 		for (auto& [view, targets] : window->self->captures)
@@ -399,6 +451,8 @@ namespace Reflex
 
 			PointerEvent_update_for_capturing_view(&event, view);
 			View_call_pointer_event(const_cast<View*>(view.get()), &event);
+
+			if (event.is_blocked()) *blocked = true;
 		}
 	}
 
@@ -420,7 +474,7 @@ namespace Reflex
 
 	static void
 	capture_hovering_pointers_and_call_events (
-		ExtractedPointerIDSet* extracteds,
+		ExtractedPointerIDSet* extracteds, bool* blocked,
 		const ViewList& views_capturing_all, const PointerMap& pointers)
 	{
 		assert(extracteds);
@@ -439,6 +493,8 @@ namespace Reflex
 			PointerEvent e = event.dup();
 			PointerEvent_update_for_capturing_view(&e, view);
 			View_call_pointer_event(const_cast<View*>(view.get()), &e);
+
+			if (e.is_blocked()) *blocked = true;
 		}
 	}
 
@@ -481,11 +537,17 @@ namespace Reflex
 		});
 
 		ExtractedPointerIDSet extracteds;
-		capture_targeted_pointers_and_call_events(&extracteds, window, pointers);
+		bool blocked = false;
+
+		capture_targeted_pointers_and_call_events(
+			&extracteds, &blocked, window, pointers);
 		erase_extracted_pointers(&pointers, extracteds);
 
-		capture_hovering_pointers_and_call_events(&extracteds, views_capturing_all, pointers);
+		capture_hovering_pointers_and_call_events(
+			&extracteds, &blocked, views_capturing_all, pointers);
 		erase_extracted_pointers(event, extracteds);
+
+		if (blocked) event->block();
 	}
 
 	void
@@ -498,20 +560,24 @@ namespace Reflex
 
 		setup_pointer_event(window, event);
 
-		window->on_pointer(event);
+		call_captured_pointer_events(window, event);
+
+		if (!event->is_blocked() && !event->empty())
+			window->on_pointer(event);
 
-		switch ((*event)[0].action())
+		if (!event->is_blocked() && !event->empty())
 		{
-			case Pointer::DOWN:   window->on_pointer_down(event);   break;
-			case Pointer::UP:     window->on_pointer_up(event);     break;
-			case Pointer::MOVE:   window->on_pointer_move(event);   break;
-			case Pointer::CANCEL: window->on_pointer_cancel(event); break;
-			default: break;
+			switch ((*event)[0].action())
+			{
+				case Pointer::DOWN:   window->on_pointer_down(event);   break;
+				case Pointer::UP:     window->on_pointer_up(event);     break;
+				case Pointer::MOVE:   window->on_pointer_move(event);   break;
+				case Pointer::CANCEL: window->on_pointer_cancel(event); break;
+				default: break;
+			}
 		}
 
-		call_captured_pointer_events(window, event);
-
-		if (!event->empty())
+		if (!event->is_blocked() && !event->empty())
 		{
 			PointerEvent_update_for_child_view(event, window->root());
 			View_call_pointer_event(window->root(), event);

data/src/window.h

@@ -12,6 +12,7 @@
 #include <rays/painter.h>
 #include "reflex/window.h"
 #include "reflex/view.h"
+#include "application.h"
 #include "pointer.h"
 
 
@@ -22,7 +23,7 @@ namespace Reflex
 	typedef std::list<Pointer> PointerList;
 
 
-	enum {CAPTURE_ALL = INT_MAX};
+	enum {CAPTURE_ALL_EVENTS = INT_MAX};
 
 
 	struct Window::Data
@@ -75,6 +76,13 @@ namespace Reflex
 
 	Window::Data* Window_create_data ();
 
+	void Window_register   (Window* win);
+
+	void Window_unregister (Window* win);
+
+	Application::WindowList& Window_all ();
+
+
 	uint Window_default_flags ();
 
 	void Window_initialize (Window* window);
@@ -112,6 +120,8 @@ namespace Reflex
 
 	void Window_call_deactivate_event (Window* window);
 
+	void Window_call_update_event     (Window* window);
+
 	void Window_call_draw_event       (Window* window, DrawEvent*    event);
 
 	void Window_call_key_event        (Window* window, KeyEvent*     event);

data/test/test_view.rb

@@ -373,6 +373,57 @@ class TestView < Test::Unit::TestCase
     assert_raise(ArgumentError) {v.scroll_by 100}
   end
 
+  def test_capture()
+    v, w = view, window
+    w.add v
+    assert_equal [], v.capture
+
+    v.capture  = :key;             assert_equal [:key],           v.capture
+    v.capture  = :pointer;         assert_equal [:pointer],       v.capture
+    v.capture  = :all;             assert_equal [:key, :pointer], v.capture
+
+    v.capture -= [:key];           assert_equal [:pointer],       v.capture
+    v.capture += [:key];           assert_equal [:key, :pointer], v.capture
+
+    v.capture  = [];               assert_equal [],               v.capture
+    v.capture += [:key, :pointer]; assert_equal [:key, :pointer], v.capture
+    v.capture  = [];               assert_equal [],               v.capture
+    v.capture += [:all];           assert_equal [:key, :pointer], v.capture
+
+    v.capture -= [];               assert_equal [:key, :pointer], v.capture
+    v.capture  = [];               assert_equal [],               v.capture
+    v.capture += [];               assert_equal [],               v.capture
+  end
+
+  def test_capturing()
+    v, w = view, window
+    w.add v
+
+    v.capture = []
+    assert_false v.capturing?
+    assert_false v.capturing? :key
+    assert_false v.capturing? :pointer
+    assert_false v.capturing? :all
+
+    v.capture = :key
+    assert_true  v.capturing?
+    assert_true  v.capturing? :key
+    assert_false v.capturing? :pointer
+    assert_false v.capturing? :all
+
+    v.capture = :pointer
+    assert_true  v.capturing?
+    assert_false v.capturing? :key
+    assert_true  v.capturing? :pointer
+    assert_false v.capturing? :all
+
+    v.capture = :all
+    assert_true  v.capturing?
+    assert_true  v.capturing? :key
+    assert_true  v.capturing? :pointer
+    assert_true  v.capturing? :all
+  end
+
   def test_parent()
     parent, child = view, view
     parent.add_child child

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,80 +16,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
-- !ruby/object:Gem::Dependency
-  name: beeps
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
 description: This library helps you to develop interactive graphical user interface.
 email: xordog@gmail.com
 executables: []
@@ -341,6 +321,8 @@ files:
 - samples/tree.rb
 - samples/views.rb
 - samples/visuals.rb
+- src/application.cpp
+- src/application.h
 - src/body.cpp
 - src/body.h
 - src/event.cpp
@@ -402,6 +384,7 @@ files:
 - src/win32/screen.cpp
 - src/win32/screen.h
 - src/win32/window.cpp
+- src/win32/window.h
 - src/window.cpp
 - src/window.h
 - src/world.cpp