reflexion 0.1.34 → 0.1.36

data/src/event.cpp

@@ -26,10 +26,10 @@ namespace Reflex
 		{
 		}
 
-		void block ()
+		void block (bool parent)
 		{
 			blocked = true;
-			if (parent) parent->block();
+			if (parent && this->parent) this->parent->block(true);
 		}
 
 	};// Event::Data
@@ -50,9 +50,9 @@ namespace Reflex
 	}
 
 	void
-	Event::block ()
+	Event::block (bool parent)
 	{
-		self->block();
+		self->block(parent);
 	}
 
 	bool
@@ -221,13 +221,17 @@ namespace Reflex
 
 		coord dx, dy, dw, dh;
 
+		float zoom, dzoom;
+
 		float angle, dangle;
 
 		Data (
 			const Bounds& frame = 0,
 			coord dx = 0, coord dy = 0, coord dw = 0, coord dh = 0,
+			float zoom  = 0, float dzoom  = 0,
 			float angle = 0, float dangle = 0)
-		:	frame(frame), dx(dx), dy(dy), dw(dw), dh(dh), angle(angle), dangle(dangle)
+		:	frame(frame), dx(dx), dy(dy), dw(dw), dh(dh),
+			zoom(zoom), dzoom(dzoom), angle(angle), dangle(dangle)
 		{
 		}
 
@@ -240,18 +244,19 @@ namespace Reflex
 
 	FrameEvent::FrameEvent (
 		const Bounds& frame, coord dx, coord dy, coord dwidth, coord dheight,
-		float angle, float dangle)
-	:	self(new Data(frame, dx, dy, dwidth, dheight, angle, dangle))
+		float zoom, float dzoom, float angle, float dangle)
+	:	self(new Data(frame, dx, dy, dwidth, dheight, zoom, dzoom, angle, dangle))
 	{
 	}
 
 	FrameEvent::FrameEvent (
 		const Bounds& frame, const Bounds& prev_frame,
-		float angle, float prev_angle)
+		float zoom, float prev_zoom, float angle, float prev_angle)
 	:	self(new Data(
 			frame,
 			frame.x - prev_frame.x, frame.y - prev_frame.y,
 			frame.w - prev_frame.w, frame.h - prev_frame.h,
+			zoom,  zoom  - prev_zoom,
 			angle, angle - prev_angle))
 	{
 	}
@@ -297,6 +302,18 @@ namespace Reflex
 		return self->dh;
 	}
 
+	float
+	FrameEvent::zoom () const
+	{
+		return self->zoom;
+	}
+
+	float
+	FrameEvent::dzoom () const
+	{
+		return self->dzoom;
+	}
+
 	float
 	FrameEvent::angle () const
 	{
@@ -321,6 +338,12 @@ namespace Reflex
 		return self->dw != 0 || self->dh != 0;
 	}
 
+	bool
+	FrameEvent::is_zoom () const
+	{
+		return self->dzoom != 0;
+	}
+
 	bool
 	FrameEvent::is_rotate () const
 	{
@@ -611,29 +634,6 @@ namespace Reflex
 		pthis->self->captured = captured;
 	}
 
-	static void
-	filter_and_offset_pointer_positions (PointerEvent* event, const Bounds& frame)
-	{
-		assert(event);
-
-		const Point& offset = frame.position();
-
-		std::vector<Pointer> pointers;
-		for (const auto& pointer : event->self->pointers)
-		{
-			if (!frame.is_include(pointer.position()))
-				continue;
-
-			pointers.emplace_back(pointer);
-			Pointer_update_positions(&pointers.back(), [&](Point* pos)
-			{
-				*pos -= offset;
-			});
-		}
-
-		event->self->pointers = pointers;
-	}
-
 	static void
 	scroll_and_zoom_pointer_positions (
 		PointerEvent* event, const Point& scroll, float zoom)
@@ -662,7 +662,26 @@ namespace Reflex
 		if (!pthis || !view)
 			argument_error(__FILE__, __LINE__);
 
-		filter_and_offset_pointer_positions(pthis, view->frame());
+		const Bounds& frame = view->frame();
+		const Point& offset = frame.position();
+		Bounds bounds       = frame.dup().move_to(0, 0);
+		float angle         = view->angle();
+
+		std::vector<Pointer> pointers;
+		for (const auto& pointer : pthis->self->pointers)
+		{
+			pointers.emplace_back(pointer);
+			Pointer_update_positions(&pointers.back(), [&](Point* pos)
+			{
+				*pos -= offset;
+				pos->rotate(-angle);
+			});
+
+			if (!bounds.is_include(pointers.back().position()))
+				pointers.pop_back();
+		}
+		pthis->self->pointers = pointers;
+
 		scroll_and_zoom_pointer_positions(pthis, view->scroll(), view->zoom());
 	}
 
@@ -672,11 +691,14 @@ namespace Reflex
 		if (!pthis || !view)
 			argument_error(__FILE__, __LINE__);
 
+		float angle = view->angle();
+
 		for (auto& pointer : pthis->self->pointers)
 		{
 			Pointer_update_positions(&pointer, [=](Point* pos)
 			{
 				*pos = view->from_window(*pos);
+				pos->rotate(-angle);
 			});
 		}
 

data/src/osx/native_window.mm

@@ -288,7 +288,7 @@ update_pixel_density (Reflex::Window* window)
 
 		if (dpos != 0 || dsize != 0)
 		{
-			Reflex::FrameEvent e(b, dpos.x, dpos.y, dsize.x, dsize.y, 0, 0);
+			Reflex::FrameEvent e(b, dpos.x, dpos.y, dsize.x, dsize.y);
 			if (dpos  != 0) win->on_move(&e);
 			if (dsize != 0)
 			{

data/src/view.cpp

@@ -4,6 +4,7 @@
 #include <assert.h>
 #include <memory>
 #include <algorithm>
+#include <rays/matrix.h>
 #include "reflex/timer.h"
 #include "reflex/filter.h"
 #include "reflex/exception.h"
@@ -25,6 +26,8 @@ namespace Reflex
 
 	static const char* WALL_NAME = "__WALL__";
 
+	static const Point ZERO      = 0;
+
 
 	struct View::Data
 	{
@@ -52,19 +55,23 @@ namespace Reflex
 
 		};// Flag
 
-		Window* window;
+		Window* window   = NULL;
 
-		View* parent;
+		View* parent     = NULL;
 
 		Bounds frame;
 
-		float zoom, angle;
+		float zoom       = 1;
+
+		float angle      = 0;
+
+		ushort capture   = CAPTURE_NONE;
 
-		ushort capture;
+		short hide_count = 0;
 
-		short hide_count;
+		uint flags = FLAG_CLIP | FLAG_RESIZE_TO_FIT | REDRAW | UPDATE_LAYOUT | UPDATE_STYLE;
 
-		uint flags;
+		std::unique_ptr<Point>       ppivot;
 
 		std::unique_ptr<Point>       pscroll;
 
@@ -92,15 +99,10 @@ namespace Reflex
 
 		std::unique_ptr<ChildList>   pchildren;
 
-		Data ()
-		:	window(NULL), parent(NULL),
-			zoom(1), angle(0), capture(CAPTURE_NONE), hide_count(0),
-			flags(FLAG_CLIP | FLAG_RESIZE_TO_FIT | REDRAW | UPDATE_LAYOUT | UPDATE_STYLE)
-		{
-		}
-
-		~Data ()
+		Point& pivot ()
 		{
+			if (!ppivot) ppivot.reset(new Point);
+			return *ppivot;
 		}
 
 		Point& scroll ()
@@ -204,7 +206,40 @@ namespace Reflex
 		{
 			if (!pbody) return;
 
-			pbody->set_transform(frame.x, frame.y, angle);
+			auto* pivot = ppivot.get();
+			if (pivot && (pivot->x != 0 || pivot->y != 0) && angle != 0)
+			{
+				Matrix m;
+				get_view2body_matrix(&m);
+				pbody->set_transform(m * Point(0), angle);
+			}
+			else
+				pbody->set_transform(frame.x, frame.y, angle);
+		}
+
+		void
+		get_view2body_matrix (Matrix* m)
+		{
+			assert(m && *m == 1 && ppivot && *ppivot != 0);
+
+			Point pivot = *ppivot * frame.size();
+			m->translate(frame.position() + pivot)
+				.rotate(angle)
+				.translate(-pivot);
+		}
+
+		void
+		get_body2view_matrix (Matrix* m)
+		{
+			assert(m && *m == 1 && ppivot && *ppivot != 0 && pbody);
+
+			Point pivot = *ppivot * frame.size();
+			float angle = pbody->angle();
+			m->translate(pbody->position())
+				.rotate(angle)
+				.translate( pivot)
+				.rotate(-angle)
+				.translate(-pivot);
 		}
 
 		void update_body_and_shapes ()
@@ -654,37 +689,41 @@ namespace Reflex
 
 	static void
 	update_view_frame (
-		View* view, const Bounds& frame, float angle, bool update_body)
+		View* view, const Bounds& frame, float zoom, float angle,
+		bool update_body = true)
 	{
 		assert(view);
 		View::Data* self = view->self.get();
 
-		if (frame == self->frame && angle == self->angle)
+		if (frame == self->frame && zoom == self->zoom && angle == self->angle)
 			return;
 
-		FrameEvent event(frame, self->frame, angle, self->angle);
+		FrameEvent event(frame, self->frame, zoom, self->zoom, angle, self->angle);
 		self->frame = frame;
+		self->zoom  = zoom;
 		self->angle = angle;
 
-		bool move   = event.is_move();
-		bool resize = event.is_resize();
-		bool rotate = event.is_rotate();
+		bool moved   = event.is_move();
+		bool resized = event.is_resize();
+		bool zoomed  = event.is_zoom();
+		bool rotated = event.is_rotate();
 
-		if (move)   view->on_move(&event);
-		if (resize) view->on_resize(&event);
-		if (rotate) view->on_rotate(&event);
+		if (moved)   view->on_move(&event);
+		if (resized) view->on_resize(&event);
+		if (zoomed)  view->on_zoom(&event);
+		if (rotated) view->on_rotate(&event);
 
-		if (resize)
+		if (resized)
 		{
 			view->self->resize_shapes(&event);
 			apply_style_to_children_have_variable_lengths(view);
 			update_view_layout(view, true);
 		}
 
-		if (update_body && (move || rotate) && self->pbody)
+		if (update_body && (moved || rotated) && self->pbody)
 			self->update_body_frame();
 
-		if ((move || resize) && self->parent)
+		if ((moved || resized) && self->parent)
 			self->parent->self->add_flag(View::Data::FIT_TO_CONTENT);
 
 		view->redraw();
@@ -696,7 +735,7 @@ namespace Reflex
 		if (!view)
 			argument_error(__FILE__, __LINE__);
 
-		update_view_frame(view, frame, view->self->angle, true);
+		update_view_frame(view, frame, view->zoom(), view->angle());
 	}
 
 	const Style&
@@ -802,13 +841,24 @@ namespace Reflex
 	update_view_body (View* view)
 	{
 		assert(view);
+		View::Data* self = view->self.get();
 
-		Body* body = view->self->pbody.get();
+		Body* body = self->pbody.get();
 		if (!body) return;
 
 		Bounds frame = view->frame();
-		frame.move_to(body->position());
-		update_view_frame(view, frame, body->angle(), false);
+
+		auto* pivot = self->ppivot.get();
+		if (pivot && (pivot->x != 0 || pivot->y != 0) && self->angle != 0)
+		{
+			Matrix m;
+			self->get_body2view_matrix(&m);
+			frame.set_position(m * Point(0));
+		}
+		else
+			frame.set_position(body->position());
+
+		update_view_frame(view, frame, view->zoom(), body->angle(), false);
 	}
 
 	static void
@@ -1088,7 +1138,7 @@ namespace Reflex
 
 		if (event->is_blocked()) return;
 
-		View::ChildList* pchildren = view->self->pchildren.get();
+		View::ChildList* pchildren = self->pchildren.get();
 		if (pchildren)
 		{
 			for (auto& pchild : *pchildren)
@@ -1098,7 +1148,7 @@ namespace Reflex
 			}
 		}
 
-		World* child_world = view->self->pchild_world.get();
+		World* child_world = self->pchild_world.get();
 		if (child_world)
 		{
 			p->push_state();
@@ -1182,7 +1232,7 @@ namespace Reflex
 		Point pos     = bounds.position();
 		Bounds clip2  = bounds.dup().move_by(offset) & clip;
 
-		bounds.move_to(0, 0, bounds.z);
+		bounds.set_position(0, 0, bounds.z);
 		if (self->pscroll)
 		{
 			bounds.move_by(-*self->pscroll);
@@ -1193,9 +1243,13 @@ namespace Reflex
 		p->push_matrix();
 		p->translate(pos);
 
-		float angle = self->angle;
-		if (angle != 0)
-			p->rotate(angle);
+		if (self->angle != 0)
+		{
+			const Point* pivot = self->ppivot.get();
+			if (pivot) p->translate( pivot->x * bounds.width,  pivot->y * bounds.height);
+			p->rotate(self->angle);
+			if (pivot) p->translate(-pivot->x * bounds.width, -pivot->y * bounds.height);
+		}
 
 		float zoom = self->zoom;
 		if (zoom != 1 && zoom > 0)
@@ -1290,6 +1344,9 @@ namespace Reflex
 	{
 		assert(view && event);
 
+		if (view->self->pbody)
+			view->self->pbody->awake();
+
 		view->on_pointer(event);
 
 		switch ((*event)[0].action())
@@ -2045,10 +2102,28 @@ namespace Reflex
 		self->add_flag(View::Data::FIT_TO_CONTENT);
 	}
 
+	void
+	View::set_zoom (float zoom)
+	{
+		if (zoom == self->zoom) return;
+
+		if (zoom == 0)
+			argument_error(__FILE__, __LINE__);
+
+		update_view_frame(this, self->frame, zoom, self->angle);
+		redraw();
+	}
+
+	float
+	View::zoom () const
+	{
+		return self->zoom;
+	}
+
 	void
 	View::set_angle (float degree)
 	{
-		update_view_frame(this, self->frame, degree, true);
+		update_view_frame(this, self->frame, self->zoom, degree);
 	}
 
 	float
@@ -2057,7 +2132,23 @@ namespace Reflex
 		return self->angle;
 	}
 
-	static const Point ZERO_SCROLL;
+	void
+	View::set_pivot (float x, float y, float z)
+	{
+		self->pivot().reset(x, y, z);
+	}
+
+	void
+	View::set_pivot (const Point& pivot)
+	{
+		set_pivot(pivot.x, pivot.y, pivot.z);
+	}
+
+	const Point&
+	View::pivot () const
+	{
+		return self->ppivot ? self->pivot() : ZERO;
+	}
 
 	void
 	View::scroll_to (coord x, coord y, coord z)
@@ -2097,28 +2188,7 @@ namespace Reflex
 	const Point&
 	View::scroll () const
 	{
-		if (self->pscroll)
-			return self->scroll();
-		else
-			return ZERO_SCROLL;
-	}
-
-	void
-	View::set_zoom (float zoom)
-	{
-		if (zoom == self->zoom) return;
-
-		if (zoom == 0)
-			argument_error(__FILE__, __LINE__);
-
-		self->zoom = zoom;
-		redraw();
-	}
-
-	float
-	View::zoom () const
-	{
-		return self->zoom;
+		return self->pscroll ? self->scroll() : ZERO;
 	}
 
 	void
@@ -2508,6 +2578,11 @@ namespace Reflex
 	{
 	}
 
+	void
+	View::on_zoom (FrameEvent* e)
+	{
+	}
+
 	void
 	View::on_rotate (FrameEvent* e)
 	{

data/src/window.cpp

@@ -176,7 +176,7 @@ namespace Reflex
 
 		for (auto& [view, targets] : window->self->captures)
 		{
-			if (!is_capturing(view.get(), targets, View::CAPTURE_KEY))
+			if (!view->window() || !is_capturing(view.get(), targets, View::CAPTURE_KEY))
 				continue;
 
 			KeyEvent e = event->dup();
@@ -256,7 +256,7 @@ namespace Reflex
 
 		for (auto& [view, targets] : window->self->captures)
 		{
-			if (targets.empty()) continue;
+			if (!view->window() || targets.empty()) continue;
 
 			PointerEvent event;
 			PointerEvent_set_captured(&event, true);
@@ -300,6 +300,8 @@ namespace Reflex
 
 		for (auto& view : views_capturing_all)
 		{
+			if (!view->window()) continue;
+
 			PointerEvent e = event.dup();
 			PointerEvent_update_for_capturing_view(&e, view);
 			View_call_pointer_event(const_cast<View*>(view.get()), &e);

data/test/helper.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[../xot ../rucy ../rays .]
   .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/test/test_application.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 
@@ -14,4 +11,8 @@ class TestApplication < Test::Unit::TestCase
     assert_equal 'AppName', @@app.name
   end
 
+  def test_inspect()
+    assert_match %r|#<Reflex::Application:0x\w{16}>|, @@app.inspect
+  end
+
 end# TestApplication

data/test/test_capture_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_contact_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_draw_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 
@@ -27,7 +24,7 @@ class TestEvent < Test::Unit::TestCase
     assert_true  e.blocked?
   end
 
-  def test_block_propagation()
+  def _test_block_propagation()
     e1 = event
     e2 = e1.dup
     e3 = e2.dup

data/test/test_focus_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_frame_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 
@@ -15,19 +12,31 @@ class TestFrameEvent < Test::Unit::TestCase
   end
 
   def test_initialize()
-    e = event bounds(1, 2, 3, 4, 5, 6), 7, 8, 9, 10, 11, 12
+    e = event bounds(1, 2, 3, 4, 5, 6), 7, 8, 9, 10, 11, 12, 13, 14
     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.angle
-    assert_equal 12, e.dangle
+    assert_equal 11, e.zoom
+    assert_equal 12, e.dzoom
+    assert_equal 13, e.angle
+    assert_equal 14, e.dangle
   end
 
   def test_dup()
-    e1 = event bounds(1, 2, 3, 4, 5, 6), 7, 8, 9, 10, 11, 12
+    e1 = event bounds(1, 2, 3, 4, 5, 6), 7, 8, 9, 10, 11, 12, 13, 14
     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
+
     e1.block
     e3 = e1.dup
     assert_true  e1.blocked?
@@ -35,4 +44,10 @@ class TestFrameEvent < Test::Unit::TestCase
     assert_true  e3.blocked?
   end
 
+  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)
+  end
+
 end# TestFrameEvent

data/test/test_has_frame.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_key_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_model.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_model_owner.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'