reflexion 0.5.2 → 0.6.0

data/src/constraint.h

@@ -0,0 +1,64 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_CONSTRAINT_H__
+#define __REFLEX_SRC_CONSTRAINT_H__
+
+
+#include "reflex/constraint.h"
+
+
+namespace Reflex
+{
+
+
+	class View;
+	class World;
+
+
+	void Constraint_set_pins (
+		Constraint* constraint,
+		View* view0, const Point* position0,
+		View* view1, const Point* position1);
+
+	bool Constraint_activate   (Constraint* constraint);
+
+	void Constraint_deactivate (Constraint* constraint);
+
+	void Constraint_sever (Constraint* constraint);
+
+	void Constraint_on_world_destroyed (Constraint* constraint);
+
+	void Constraint_on_world_update    (Constraint* constraint);
+
+	bool Constraint_has_world_mismatch (const Constraint* constraint);
+
+
+	typedef SnapConstraint*  (*SnapConstraint_CreateFun) ();
+
+	typedef LinkConstraint*  (*LinkConstraint_CreateFun) ();
+
+	typedef WheelConstraint* (*WheelConstraint_CreateFun) ();
+
+	typedef ChaseConstraint* (*ChaseConstraint_CreateFun) ();
+
+	void SnapConstraint_set_create_fun  (SnapConstraint_CreateFun fun);
+
+	void LinkConstraint_set_create_fun  (LinkConstraint_CreateFun fun);
+
+	void WheelConstraint_set_create_fun (WheelConstraint_CreateFun fun);
+
+	void ChaseConstraint_set_create_fun (ChaseConstraint_CreateFun fun);
+
+	SnapConstraint*  SnapConstraint_create ();
+
+	LinkConstraint*  LinkConstraint_create ();
+
+	WheelConstraint* WheelConstraint_create ();
+
+	ChaseConstraint* ChaseConstraint_create ();
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/event.cpp

@@ -54,6 +54,12 @@ namespace Reflex
 	{
 	}
 
+	Event
+	Event::dup () const
+	{
+		return Event(this);
+	}
+
 	void
 	Event::block (bool parent)
 	{
@@ -724,7 +730,7 @@ namespace Reflex
 	}
 
 	void
-	PointerEvent_update_for_capturing_view (PointerEvent* pthis, const View* view)
+	PointerEvent_to_view_coord (PointerEvent* pthis, const View* view)
 	{
 		if (!pthis)
 			argument_error(__FILE__, __LINE__);

data/src/event.h

@@ -42,8 +42,7 @@ namespace Reflex
 	void PointerEvent_update_for_child_view (
 		PointerEvent* pthis, const View* view);
 
-	void PointerEvent_update_for_capturing_view (
-		PointerEvent* pthis, const View* view);
+	void PointerEvent_to_view_coord (PointerEvent* pthis, const View* view);
 
 
 	void WheelEvent_set_position (WheelEvent* pthis, const Point& position);

data/src/ios/application.mm

@@ -28,6 +28,11 @@ namespace Reflex
 		return new ApplicationData();
 	}
 
+	void
+	Application_set_menu (Application* app, Menu* menu)
+	{
+	}
+
 	ApplicationData&
 	Application_get_data (Application* app)
 	{

data/src/ios/clipboard.mm

@@ -0,0 +1,44 @@
+// -*- objc -*-
+#include "reflex/clipboard.h"
+
+
+#import <UIKit/UIKit.h>
+#include "reflex/exception.h"
+
+
+namespace Reflex
+{
+
+
+	void
+	set_clipboard (const Clipboard& clipboard)
+	{
+		const char* text = clipboard.text();
+		NSString* nstext = nil;
+		if (text)
+		{
+			nstext = [NSString stringWithUTF8String: text];
+			if (!nstext)
+				argument_error(__FILE__, __LINE__);
+		}
+
+		UIPasteboard* pasteboard = UIPasteboard.generalPasteboard;
+		pasteboard.items         = @[];
+
+		if (nstext) pasteboard.string = nstext;
+	}
+
+	Clipboard
+	get_clipboard ()
+	{
+		Clipboard clipboard;
+
+		NSString* nstext = UIPasteboard.generalPasteboard.string;
+		const char* text = nstext ? nstext.UTF8String : NULL;
+		if (text) clipboard.set_text(text);
+
+		return clipboard;
+	}
+
+
+}// Reflex

data/src/ios/event.h

@@ -28,9 +28,13 @@ namespace Reflex
 
 		public:
 
-			NativePointerEvent (NSSet* touches, UIEvent* event, UIView* view);
+			NativePointerEvent (
+				UIView* view, UIHoverGestureRecognizer* recognizer,
+				NSSet* touches, UIEvent* event);
 
-			NativePointerEvent (UIHoverGestureRecognizer* recognizer, UIView* view);
+			NativePointerEvent (
+				UIView* view, UIHoverGestureRecognizer* recognizer,
+				Pointer::Action action, bool pen);
 
 	};// NativePointerEvent
 

data/src/ios/event.mm

@@ -79,12 +79,12 @@ namespace Reflex
 	to_modifiers (NSInteger flags)
 	{
 		return
-			(flags & UIKeyModifierAlphaShift) ? MOD_CAPS    : 0 |
-			(flags & UIKeyModifierShift)      ? MOD_SHIFT   : 0 |
-			(flags & UIKeyModifierControl)    ? MOD_CONTROL : 0 |
-			(flags & UIKeyModifierAlternate)  ? MOD_ALT     : 0 |
-			(flags & UIKeyModifierCommand)    ? MOD_COMMAND : 0 |
-			(flags & UIKeyModifierNumericPad) ? MOD_NUMPAD  : 0;
+			(flags & UIKeyModifierAlphaShift ? MOD_CAPS    : 0) |
+			(flags & UIKeyModifierShift      ? MOD_SHIFT   : 0) |
+			(flags & UIKeyModifierControl    ? MOD_CONTROL : 0) |
+			(flags & UIKeyModifierAlternate  ? MOD_ALT     : 0) |
+			(flags & UIKeyModifierCommand    ? MOD_COMMAND : 0) |
+			(flags & UIKeyModifierNumericPad ? MOD_NUMPAD  : 0);
 	}
 
 	static uint
@@ -124,8 +124,11 @@ namespace Reflex
 
 
 	NativePointerEvent::NativePointerEvent (
-		NSSet* touches, UIEvent* event, UIView* view)
+		UIView* view, UIHoverGestureRecognizer* recognizer,
+		NSSet* touches, UIEvent* event)
 	{
+		assert(view && recognizer);
+
 		for (UITouch* touch in touches)
 		{
 			Pointer::Action action = get_action(touch);
@@ -141,7 +144,14 @@ namespace Reflex
 				action == Pointer::MOVE,
 				touch.timestamp);
 
-			if (!(type & Pointer::MOUSE))
+			if ((type & Pointer::PEN))
+			{
+				// keying the pencil's touch on the hover recognizer unifies it with
+				// its hover pointer, so they act as one pointer across the
+				// hover <-> touch transitions.
+				Pointer_set_system_id(&pointer, (Pointer::ID) recognizer);
+			}
+			else if (!(type & Pointer::MOUSE))
 				Pointer_set_system_id(&pointer, (Pointer::ID) touch);
 
 			if (action != Pointer::DOWN)
@@ -156,20 +166,29 @@ namespace Reflex
 	}
 
 	NativePointerEvent::NativePointerEvent (
-		UIHoverGestureRecognizer* recognizer, UIView* view)
+		UIView* view, UIHoverGestureRecognizer* recognizer,
+		Pointer::Action action, bool pen)
 	{
-		assert(recognizer && view);
+		assert(view && recognizer);
+
+		uint type = pen ? Pointer::PEN : Pointer::MOUSE;
 
 		Pointer pointer(
 			0,
-			Pointer::MOUSE,
-			Pointer::MOVE,
+			type,
+			action,
 			to_point([recognizer locationInView: view]),
 			get_modifiers(nil),
 			0,
 			false,
 			Xot::time());
 
+		if (type & Pointer::PEN)
+		{
+			Pointer_set_system_id(&pointer, (Pointer::ID) recognizer);
+			Pointer_set_floatable(&pointer, true);
+		}
+
 		if (pointer)
 			PointerEvent_add_pointer(this, pointer);
 	}

data/src/ios/menu.mm

@@ -0,0 +1,36 @@
+// -*- objc -*-
+#include "../menu.h"
+
+
+namespace Reflex
+{
+
+
+	Menu::Data*
+	Menu_create_data ()
+	{
+		return new Menu::Data();
+	}
+
+	void
+	Menu_update (Menu* menu)
+	{
+	}
+
+	void
+	Menu_popup (Menu* menu, View* view, coord x, coord y)
+	{
+	}
+
+	void
+	Menu_child_added (Menu* parent, Menu* child, int index)
+	{
+	}
+
+	void
+	Menu_child_removed (Menu* parent, Menu* child)
+	{
+	}
+
+
+}// Reflex

data/src/ios/view_controller.mm

@@ -151,6 +151,7 @@ ReflexViewController_get_show_fun ()
 		int update_count;
 		int touching_count;
 		int repeating_key_count;
+		bool pen;
 	}
 
 	- (id) init
@@ -163,6 +164,7 @@ ReflexViewController_get_show_fun ()
 		update_count        = 0;
 		touching_count      = 0;
 		repeating_key_count = 0;
+		pen                 = false;
 
 		return self;
 	}
@@ -529,10 +531,12 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(touches, event, self.reflexView);
+		Reflex::NativePointerEvent e(self.reflexView, self.hoverRecognizer, touches, event);
+
+		int count = (int) e.size();
 		Window_call_pointer_event(win, &e);
 
-		touching_count += e.size();
+		touching_count += count;
 	}
 
 	- (void) touchesEnded: (NSSet*) touches withEvent: (UIEvent*) event
@@ -540,12 +544,19 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(touches, event, self.reflexView);
+		Reflex::NativePointerEvent e(self.reflexView, self.hoverRecognizer, touches, event);
+
+		int count = (int) e.size();
 		Window_call_pointer_event(win, &e);
 
-		touching_count -= e.size();
+		touching_count -= count;
 		if (touching_count == 0)
-			win->self->prev_pointers.clear();
+		{
+			win->self->prev_pointers.remove_if([](const Reflex::Pointer& p)
+			{
+				return !Reflex::Pointer_is_floatable(p);
+			});
+		}
 		else if (touching_count < 0)
 			Reflex::invalid_state_error(__FILE__, __LINE__);
 	}
@@ -560,7 +571,7 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(touches, event, self.reflexView);
+		Reflex::NativePointerEvent e(self.reflexView, self.hoverRecognizer, touches, event);
 		Window_call_pointer_event(win, &e);
 	}
 
@@ -570,16 +581,38 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		if (touching_count > 0) return;
+		if (recognizer.state == UIGestureRecognizerStateBegan)
+			pen = false;
 
-		if (
-			recognizer.state != UIGestureRecognizerStateBegan &&
-			recognizer.state != UIGestureRecognizerStateChanged)
+		Reflex::Pointer::Action action;
+		switch (recognizer.state)
 		{
-			return;
+			case UIGestureRecognizerStateBegan:
+			case UIGestureRecognizerStateChanged:
+				// suppress hover moves while a touch is active
+				if (touching_count > 0) return;
+				action = recognizer.state == UIGestureRecognizerStateBegan
+					?	Reflex::Pointer::ENTER
+					:	Reflex::Pointer::MOVE;
+				if (@available(iOS 16.1, *))
+				{
+					// zOffset drops to 0 on the Ended state, so latch the pen-ness
+					// here and reuse it until the leave.
+					if (recognizer.zOffset > 0) pen = true;
+				}
+				break;
+
+			case UIGestureRecognizerStateEnded:
+			case UIGestureRecognizerStateCancelled:
+			case UIGestureRecognizerStateFailed:
+				action = Reflex::Pointer::LEAVE;
+				break;
+
+			default:
+				return;
 		}
 
-		Reflex::NativePointerEvent e(recognizer, self.reflexView);
+		Reflex::NativePointerEvent e(self.reflexView, recognizer, action, pen);
 		if (e.size() > 0)
 			Window_call_pointer_event(win, &e);
 	}

data/src/ios/window.mm

@@ -142,6 +142,12 @@ namespace Reflex
 		return Bounds(b.origin.x, b.origin.y, b.size.width, b.size.height);
 	}
 
+	void
+	Window_set_menu (Window* window, Menu* menu)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
 	static UIScreen*
 	get_screen (const Window& window)
 	{