reflexion 0.1.23 → 0.1.26

data/src/event.h

@@ -12,6 +12,16 @@ namespace Reflex
 {
 
 
+	void DrawEvent_set_view    (DrawEvent* pthis, View* view);
+
+	void DrawEvent_set_painter (DrawEvent* pthis, Painter* painter);
+
+	void DrawEvent_set_bounds  (DrawEvent* pthis, const Bounds& bounds);
+
+
+	void KeyEvent_set_captured (KeyEvent* pthis, bool captured);
+
+
 	void PointerEvent_add_pointer    (PointerEvent* pthis, const Pointer& pointer);
 
 	void PointerEvent_erase_pointer  (PointerEvent* pthis, Pointer::ID id);
@@ -21,11 +31,16 @@ namespace Reflex
 	void PointerEvent_each_pointer (
 		const PointerEvent* pthis, std::function<void(const Pointer&)> fun);
 
+	void PointerEvent_set_captured (PointerEvent* pthis, bool captured);
+
 	void PointerEvent_update_for_child_view (PointerEvent* pthis, const View* view);
 
 	void PointerEvent_update_for_capturing_view (PointerEvent* pthis, const View* view);
 
 
+	void WheelEvent_set_position (WheelEvent* pthis, const Point& position);
+
+
 }// Reflex
 
 

data/src/image_view.cpp

@@ -53,8 +53,8 @@ namespace Reflex
 	{
 		if (!self->image) return;
 
-		assert(e && e->painter);
-		Painter* p = e->painter;
+		assert(e && e->painter());
+		Painter* p = e->painter();
 
 		Color f = p->fill(), s = p->stroke();
 		p->set_fill(1);

data/src/ios/app_delegate.h

@@ -1,12 +1,6 @@
 // -*- objc -*-
 #import <UIKit/UIApplication.h>
-#include "application.h"
 
 
 @interface ReflexAppDelegate : UIResponder <UIApplicationDelegate>
-
-	- (void) bind: (Reflex::Application*) application;
-
-	- (BOOL) callOnStart;
-
 @end// ReflexAppDelegate

data/src/ios/app_delegate.mm

@@ -6,6 +6,7 @@
 #import  <CoreMotion/CoreMotion.h>
 #include "reflex/event.h"
 #include "reflex/exception.h"
+#include "application.h"
 
 
 @implementation ReflexAppDelegate

data/src/ios/application.mm

@@ -13,6 +13,12 @@ extern "C" {
 }
 
 
+@interface ReflexAppDelegate (Bind)
+	- (void) bind: (Reflex::Application*) application;
+	- (BOOL) callOnStart;
+@end
+
+
 namespace Reflex
 {
 

data/src/ios/view_controller.mm

@@ -16,7 +16,7 @@
 static ReflexViewController*
 create_reflex_view_controller ()
 {
-	return [[ReflexViewController alloc] init];
+	return [[[ReflexViewController alloc] init] autorelease];
 }
 
 static UIViewController*
@@ -102,7 +102,7 @@ ReflexViewController_get_show_fun ()
 
 @interface ReflexView ()
 
-	@property(nonatomic, strong) ReflexViewController* reflexViewController;
+	@property(nonatomic, unsafe_unretained) ReflexViewController* reflexViewController;
 
 @end
 
@@ -112,7 +112,9 @@ ReflexViewController_get_show_fun ()
 	- (void) layoutSubviews
 	{
 		[super layoutSubviews];
-		[self.reflexViewController viewDidResize];
+
+		if (self.reflexViewController)
+			[self.reflexViewController viewDidResize];
 	}
 
 @end
@@ -153,6 +155,9 @@ ReflexViewController_get_show_fun ()
 
 	- (void) dealloc
 	{
+		Reflex::Window* win = self.window;
+		if (win) win->close(true);
+
 		[self cleanup];
 		[super dealloc];
 	}
@@ -227,6 +232,11 @@ ReflexViewController_get_show_fun ()
 		[self setupReflexView];
 	}
 
+	- (ReflexView*) createReflexView
+	{
+		return [[[ReflexView alloc] initWithFrame: self.view.bounds] autorelease];
+	}
+
 	- (void) setupReflexView
 	{
 		ReflexView* view = [self createReflexView];
@@ -256,11 +266,6 @@ ReflexViewController_get_show_fun ()
 		self.reflexView = view;
 	}
 
-	- (ReflexView*) createReflexView
-	{
-		return [[[ReflexView alloc] initWithFrame: self.view.bounds] autorelease];
-	}
-
 	- (void) cleanupReflexView
 	{
 		ReflexView* view = self.reflexView;
@@ -270,6 +275,7 @@ ReflexViewController_get_show_fun ()
 		if (context && context == [EAGLContext currentContext])
 			[EAGLContext setCurrentContext: (EAGLContext*) Rays::get_offscreen_context()];
 
+		view.reflexViewController = nil;
 		[view removeFromSuperview];
 
 		self.reflexView = nil;
@@ -376,7 +382,7 @@ ReflexViewController_get_show_fun ()
 
 		if (dpos != 0 || dsize != 0)
 		{
-			Reflex::FrameEvent e(b, dpos.x, dpos.y, dsize.x, dsize.y);
+			Reflex::FrameEvent e(b, dpos.x, dpos.y, dsize.x, dsize.y, 0, 0);
 			if (dpos  != 0) win->on_move(&e);
 			if (dsize != 0)
 			{

data/src/ios/window.mm

@@ -51,8 +51,7 @@ namespace Reflex
 	void
 	Window_initialize (Window* window)
 	{
-		ReflexViewController* vc =
-			[ReflexViewController_get_create_fun()() autorelease];
+		ReflexViewController* vc = ReflexViewController_get_create_fun()();
 		if (!vc)
 			reflex_error(__FILE__, __LINE__);
 
@@ -95,7 +94,6 @@ namespace Reflex
 	void
 	Window_close (Window* window)
 	{
-		not_implemented_error(__FILE__, __LINE__);
 	}
 
 	void
@@ -104,7 +102,7 @@ namespace Reflex
 		if (!title)
 			argument_error(__FILE__, __LINE__);
 
-		get_vc(window).title = [[NSString alloc] initWithUTF8String: title];
+		get_vc(window).title = [NSString stringWithUTF8String: title];
 	}
 
 	const char*

data/src/osx/event.h

@@ -15,7 +15,7 @@ namespace Reflex
 	struct NativeKeyEvent : public KeyEvent
 	{
 
-		NativeKeyEvent (NSEvent* event, Type type);
+		NativeKeyEvent (NSEvent* event, Action action);
 
 	};// NativeKeyEvent
 

data/src/osx/event.mm

@@ -169,11 +169,11 @@ namespace Reflex
 		return 0;
 	}
 
-	static KeyEvent::Type
-	get_flag_key_event_type(const NSEvent* e)
+	static KeyEvent::Action
+	get_flag_key_event_action (const NSEvent* e)
 	{
 		uint mask = get_modifier_flag_mask(e);
-		if (mask == 0) return Reflex::KeyEvent::NONE;
+		if (mask == 0) return Reflex::KeyEvent::ACTION_NONE;
 
 		return [e modifierFlags] & mask
 			?	Reflex::KeyEvent::DOWN
@@ -251,18 +251,18 @@ namespace Reflex
 	}
 
 
-	NativeKeyEvent::NativeKeyEvent (NSEvent* e, Type type)
+	NativeKeyEvent::NativeKeyEvent (NSEvent* e, Action action)
 	:	KeyEvent(
-			type, get_chars(e), get_code([e keyCode]), get_modifiers(e),
-			[e isARepeat] ? 1 : 0)
+			action, get_chars(e), get_code([e keyCode]),
+			get_modifiers(e), [e isARepeat] ? 1 : 0)
 	{
 	}
 
 
 	NativeFlagKeyEvent::NativeFlagKeyEvent (NSEvent* e)
 	:	KeyEvent(
-			get_flag_key_event_type(e), "", get_code([e keyCode]), get_modifiers(e),
-			0)
+			get_flag_key_event_action(e), "", get_code([e keyCode]),
+			get_modifiers(e), 0)
 	{
 	}
 
@@ -295,7 +295,7 @@ namespace Reflex
 	NativeWheelEvent::NativeWheelEvent (NSEvent* e, NSView* view)
 	:	WheelEvent(0, 0, 0, [e deltaX], [e deltaY], [e deltaZ], get_modifiers(e))
 	{
-		position_ = get_pointer_position(e, view);
+		WheelEvent_set_position(this, get_pointer_position(e, view));
 	}
 
 

data/src/osx/native_window.mm

@@ -34,6 +34,20 @@ count_mouse_buttons (const Reflex::PointerEvent& e)
 	return nbuttons;
 }
 
+static void
+update_pixel_density (Reflex::Window* window)
+{
+	assert(window);
+
+	Rays::Painter* painter = window->painter();
+	if (!painter) return;
+
+	float pd = Window_get_pixel_density(*window);
+	if (painter->pixel_density() != pd)
+		painter->canvas(window->frame().dup().move_to(0, 0), pd);
+}
+
+
 @implementation NativeWindow
 
 	{
@@ -43,7 +57,7 @@ count_mouse_buttons (const Reflex::PointerEvent& e)
 		int update_count;
 		int clicking_count;
 		Reflex::Pointer::ID pointer_id;
-		Reflex::Pointer prevPointer;
+		Reflex::Pointer prev_pointer;
 	}
 
 	- (id) init
@@ -196,6 +210,8 @@ count_mouse_buttons (const Reflex::PointerEvent& e)
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
+		update_pixel_density(win);
+
 		if (update_count == 0)
 			[self update];
 
@@ -269,7 +285,7 @@ count_mouse_buttons (const Reflex::PointerEvent& e)
 
 		if (dpos != 0 || dsize != 0)
 		{
-			Reflex::FrameEvent e(b, dpos.x, dpos.y, dsize.x, dsize.y);
+			Reflex::FrameEvent e(b, dpos.x, dpos.y, dsize.x, dsize.y, 0, 0);
 			if (dpos  != 0) win->on_move(&e);
 			if (dsize != 0)
 			{
@@ -381,9 +397,11 @@ count_mouse_buttons (const Reflex::PointerEvent& e)
 		assert(e->size() == 1);
 
 		Reflex::Pointer& pointer = Reflex::PointerEvent_pointer_at(e, 0);
-		if (prevPointer)
-			Reflex::Pointer_set_prev(&pointer, &prevPointer);
-		prevPointer = pointer;
+		if (prev_pointer)
+			Reflex::Pointer_set_prev(&pointer, &prev_pointer);
+
+		prev_pointer = pointer;
+		Reflex::Pointer_set_prev(&prev_pointer, NULL);
 	}
 
 	- (void) scrollWheel: (NSEvent*) event

data/src/shape.cpp

@@ -432,25 +432,23 @@ namespace Reflex
 	}
 
 	void
-	Shape_call_contact_event (Shape* shape, const ContactEvent& event)
+	Shape_call_contact_event (Shape* shape, ContactEvent* event)
 	{
-		if (!shape)
+		if (!shape || !event)
 			argument_error(__FILE__, __LINE__);
 
-		ContactEvent e = event;
-		shape->on_contact(&e);
+		shape->on_contact(event);
 
-		switch (e.type)
+		switch (event->action())
 		{
-			case ContactEvent::BEGIN: shape->on_contact_begin(&e); break;
-			case ContactEvent::END:   shape->on_contact_end(&e);   break;
-			case ContactEvent::NONE: break;
+			case ContactEvent::BEGIN: shape->on_contact_begin(event); break;
+			case ContactEvent::END:   shape->on_contact_end(event);   break;
+			default: break;
 		}
 
-		if (e.is_blocked())
-			return;
+		if (event->is_blocked()) return;
 
-		View_call_contact_event(shape->owner(), e);
+		View_call_contact_event(shape->owner(), event);
 	}
 
 
@@ -587,9 +585,9 @@ namespace Reflex
 	void
 	Shape::on_draw (DrawEvent* e)
 	{
-		assert(e && e->painter);
+		assert(e && e->painter());
 
-		e->painter->polygon(self->polygon);
+		e->painter()->polygon(self->polygon);
 	}
 
 	void

data/src/shape.h

@@ -52,7 +52,7 @@ namespace Reflex
 
 	void Shape_update (Shape* shape, bool force = false);
 
-	void Shape_call_contact_event (Shape* shape, const ContactEvent& event);
+	void Shape_call_contact_event (Shape* shape, ContactEvent* event);
 
 
 }// Reflex