reflexion 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fecd1db4ed537d71ce28cfcfd6d6556e2a7d39c108db0bfff677155bdb399fb6
-  data.tar.gz: 22ea1366244b563a0ea67db01b8b18c89a25e273f781c78f11bab186761f3b90
+  metadata.gz: 92e1368f44fafa2ab8966bfec25f93af411b68a72eaf3f127bc6b95b97ba2fed
+  data.tar.gz: 6efaa218301242d6c4fea24062f9fd9d74f405e46a347eac1b231d6fe08a16c1
 SHA512:
-  metadata.gz: 8d01aa555b6a680c53b4c88ac0a8eabca0beec42fe0db6a173e45d4d405f4baa4fa4c43e44ce57fdc24a86bb85dfedd7f103c5a5a250377e5a71992817b49060
-  data.tar.gz: 706935d574fd567b9a597643f4797e93718baf1e8f8ef1fca2ae183982e6b6e50c9936dbe2ef5d7ca274f9221fc83e4814a9fa071f00413b1cc26b545c0bd971
+  metadata.gz: 3886ea311fccd85da0e7e3868771d61d32f10fd091612bf306df041dbbe2cf30490e3e6a5fa9cdc049e6cf41f3b8e090ea7af950753dff81db95548ffcb7df99
+  data.tar.gz: 1704f273a82ebd9b8272e7358c6936b81171a969ad1a6f085ad641dc0f833dfeb5b97d4f5cf71e80be8d00d9b7bdbc5cb4bdba9d2c9e1228ebb6b995e7903444

data/ChangeLog.md

@@ -1,6 +1,15 @@
 # reflex ChangeLog
 
 
+## [v0.3.4] - 2025-03-07
+
+- Captured key and pointer events can be blocked before being sent to the window and views
+- Apply pixel<->meter scale to linear velocity and linear damping
+- Call awake() after moving the view
+
+- Fix an issue where capturing keys do not work
+
+
 ## [v0.3.3] - 2025-01-23
 
 - Remove dependence on the beeps library

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/include/reflex/view.h

@@ -59,30 +59,30 @@ namespace Reflex
 			enum Flag
 			{
 
-				FLAG_CLIP           = Xot::bit(0),
+				FLAG_CLIP          = Xot::bit(0),
 
-				FLAG_CACHE          = Xot::bit(1),
+				FLAG_CACHE         = Xot::bit(1),
 
-				FLAG_RESIZE_TO_FIT  = Xot::bit(2),
+				FLAG_RESIZE_TO_FIT = Xot::bit(2),
 
-				FLAG_SCROLL_TO_FIT  = Xot::bit(3),
+				FLAG_SCROLL_TO_FIT = Xot::bit(3),
 
-				FLAG_FIX_ANGLE      = Xot::bit(4),
+				FLAG_FIX_ANGLE     = Xot::bit(4),
 
-				FLAG_LAST           = FLAG_FIX_ANGLE
+				FLAG_LAST          = FLAG_FIX_ANGLE
 
 			};// Flag
 
 			enum Capture
 			{
 
-				CAPTURE_NONE      = 0,
+				CAPTURE_NONE    = 0,
 
-				CAPTURE_KEY       = Xot::bit(0),
+				CAPTURE_KEY     = Xot::bit(0),
 
-				CAPTURE_POINTER   = Xot::bit(1),
+				CAPTURE_POINTER = Xot::bit(1),
 
-				CAPTURE_ALL       = CAPTURE_KEY | CAPTURE_POINTER,
+				CAPTURE_ALL     = CAPTURE_KEY | CAPTURE_POINTER,
 
 			};// Capture
 

data/lib/reflex/application.rb

@@ -1,9 +1,9 @@
 require 'xot/setter'
 require 'xot/universal_accessor'
+require 'xot/hookable'
 require 'xot/block_util'
 require 'xot/inspectable'
 require 'reflex/ext'
-require 'reflex/helper'
 
 
 module Reflex
@@ -12,8 +12,8 @@ module Reflex
   class Application
 
     include Xot::Setter
+    include Xot::Hookable
     include Xot::Inspectable
-    include Hookable
 
     universal_accessor :name
 

data/lib/reflex/helper.rb

@@ -1,4 +1,3 @@
-require 'xot/hookable'
 require 'xot/universal_accessor'
 require 'reflex/point'
 require 'reflex/bounds'
@@ -7,17 +6,6 @@ require 'reflex/bounds'
 module Reflex
 
 
-  module Hookable
-
-    include Xot::Hookable
-
-    def hook(name, &block)
-      super "on_#{name}".intern, &block
-    end
-
-  end# Hookable
-
-
   module HasFrame
 
     def move_to(*args)

data/lib/reflex/shape.rb

@@ -1,5 +1,6 @@
 require 'xot/setter'
 require 'xot/universal_accessor'
+require 'xot/hookable'
 require 'xot/block_util'
 require 'reflex/ext'
 require 'reflex/helper'
@@ -11,7 +12,7 @@ module Reflex
   class Shape
 
     include Xot::Setter
-    include Hookable
+    include Xot::Hookable
     include HasFrame
     include HasTags
 

data/lib/reflex/view.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 require 'xot/setter'
 require 'xot/bit_flag_accessor'
 require 'xot/universal_accessor'
+require 'xot/hookable'
 require 'xot/block_util'
 require 'reflex/ext'
 require 'reflex/selector'
@@ -16,7 +17,7 @@ module Reflex
   class View
 
     include Xot::Setter
-    include Hookable
+    include Xot::Hookable
     include HasFrame
     include HasTags
 
@@ -98,8 +99,14 @@ module Reflex
     end
 
     def capturing?(*args)
-      cap = capture
-      args.all? {|type| cap.include? type}
+      args, cap = args.flatten, capture
+      if args.empty?
+        not cap.empty?
+      elsif args.include?(:all)
+        cap == [:key, :pointer]
+      else
+        args.all? {|type| cap.include? type}
+      end
     end
 
     def on_contact(e)

data/lib/reflex/window.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 require 'xot/setter'
 require 'xot/bit_flag_accessor'
 require 'xot/universal_accessor'
+require 'xot/hookable'
 require 'xot/block_util'
 require 'xot/inspectable'
 require 'reflex/ext'
@@ -14,8 +15,8 @@ module Reflex
   class Window
 
     include Xot::Setter
+    include Xot::Hookable
     include Xot::Inspectable
-    include Hookable
     include HasFrame
 
     extend Forwardable

data/reflex.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',   '~> 0.3.3', '>= 0.3.3'
-  s.add_dependency 'rucy',  '~> 0.3.3', '>= 0.3.3'
-  s.add_dependency 'rays',  '~> 0.3.3', '>= 0.3.3'
+  s.add_dependency 'xot',   '~> 0.3.4', '>= 0.3.4'
+  s.add_dependency 'rucy',  '~> 0.3.4', '>= 0.3.4'
+  s.add_dependency 'rays',  '~> 0.3.4', '>= 0.3.4'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/body.cpp

@@ -291,9 +291,7 @@ namespace Reflex
 		assert(b2to && b2from);
 
 		b2to->SetType(           b2from->GetType());
-		b2to->SetLinearVelocity( b2from->GetLinearVelocity());
 		b2to->SetAngularVelocity(b2from->GetAngularVelocity());
-		b2to->SetLinearDamping(  b2from->GetLinearDamping());
 		b2to->SetAngularDamping( b2from->GetAngularDamping());
 		b2to->SetGravityScale(   b2from->GetGravityScale());
 		b2to->SetBullet(         b2from->IsBullet());
@@ -301,12 +299,24 @@ namespace Reflex
 		float ppm_to   = to->self->ppm;
 		float ppm_from = from.self->ppm;
 		if (ppm_to == ppm_from)
-			b2to->SetTransform(b2from->GetPosition(), b2from->GetAngle());
+		{
+			b2to->SetTransform(     b2from->GetPosition(),
+			                        b2from->GetAngle());
+			b2to->SetLinearVelocity(b2from->GetLinearVelocity());
+			b2to->SetLinearDamping( b2from->GetLinearDamping());
+		}
 		else
 		{
-			auto pos = b2from->GetPosition();
-			pos *= ppm_from / ppm_to;
+			float scale = ppm_from / ppm_to;
+			auto pos    = b2from->GetPosition();
+			auto vel    = b2from->GetLinearVelocity();
+			auto damp   = b2from->GetLinearDamping();
+			pos  *= scale;
+			vel  *= scale;
+			damp *= scale;
 			b2to->SetTransform(pos, b2from->GetAngle());
+			b2to->SetLinearVelocity(vel);
+			b2to->SetLinearDamping(damp);
 		}
 	}
 

data/src/ios/view_controller.mm

@@ -369,13 +369,7 @@ ReflexViewController_get_show_fun ()
 
 		++update_count;
 
-		double now = Xot::time();
-		Reflex::UpdateEvent e(now, now - win->self->prev_time_update);
-		win->self->prev_time_update = now;
-
-		win->on_update(&e);
-		if (!e.is_blocked())
-			Reflex::View_update_tree(win->root(), e);
+		Window_call_update_event(win);
 
 		if (win->self->redraw)
 		{

data/src/osx/native_window.mm

@@ -201,13 +201,7 @@ move_to_main_screen_origin (NativeWindow* window)
 
 		++update_count;
 
-		double now = Xot::time();
-		Reflex::UpdateEvent e(now, now - win->self->prev_time_update);
-		win->self->prev_time_update = now;
-
-		win->on_update(&e);
-		if (!e.is_blocked())
-			Reflex::View_update_tree(win->root(), e);
+		Window_call_update_event(win);
 
 		if (win->self->redraw)
 		{

data/src/view.cpp

@@ -235,6 +235,8 @@ namespace Reflex
 			}
 			else
 				pbody->set_transform(frame.x, frame.y, angle);
+
+			pbody->awake();
 		}
 
 		void update_body_states ()
@@ -2295,9 +2297,9 @@ namespace Reflex
 		bool capture    = types != CAPTURE_NONE;
 
 		if (capture && !registered)
-			Window_register_capture(w, this, CAPTURE_ALL);
+			Window_register_capture(w, this, CAPTURE_ALL_EVENTS);
 		else if (!capture && registered)
-			Window_unregister_capture(w, this, CAPTURE_ALL);
+			Window_unregister_capture(w, this, CAPTURE_ALL_EVENTS);
 
 		CaptureEvent e(~old & types, old & ~types);
 		on_capture(&e);

data/src/win32/window.cpp

@@ -154,13 +154,7 @@ namespace Reflex
 	{
 		WindowData* self = get_data(win);
 
-		double now = Xot::time();
-		Reflex::UpdateEvent e(now, now - self->prev_time_update);
-		self->prev_time_update = now;
-
-		win->on_update(&e);
-		if (!e.is_blocked())
-			Reflex::View_update_tree(win->root(), e);
+		Window_call_update_event(win);
 
 		if (self->redraw)
 		{

data/src/window.cpp

@@ -129,7 +129,7 @@ namespace Reflex
 			return;
 
 		targets.insert(
-			target == CAPTURE_ALL ? targets.begin() : targets.end(),
+			target == CAPTURE_ALL_EVENTS ? targets.begin() : targets.end(),
 			target);
 	}
 
@@ -163,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)
 	{
@@ -203,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;
 	}
 
@@ -227,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;
 			}
@@ -248,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);
@@ -367,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);
 		}
 	}
@@ -416,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)
@@ -430,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;
 		}
 	}
 
@@ -451,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);
@@ -470,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;
 		}
 	}
 
@@ -512,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
@@ -529,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

@@ -23,7 +23,7 @@ namespace Reflex
 	typedef std::list<Pointer> PointerList;
 
 
-	enum {CAPTURE_ALL = INT_MAX};
+	enum {CAPTURE_ALL_EVENTS = INT_MAX};
 
 
 	struct Window::Data
@@ -120,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.3
+  version: 0.3.4
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,60 +16,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 description: This library helps you to develop interactive graphical user interface.
 email: xordog@gmail.com
 executables: []