reflexion 0.5.3 → 0.7.0

data/src/event.h

@@ -12,6 +12,18 @@ namespace Reflex
 {
 
 
+	enum
+	{
+
+		WHEEL_PIXELS_PER_LINE  = 16,
+
+		WHEEL_LINES_PER_NOTCH  = 3,
+
+		WHEEL_PIXELS_PER_NOTCH = WHEEL_PIXELS_PER_LINE * WHEEL_LINES_PER_NOTCH
+
+	};
+
+
 	void DrawEvent_set_view    (DrawEvent* pthis, View* view);
 
 	void DrawEvent_set_painter (DrawEvent* pthis, Painter* painter);
@@ -42,8 +54,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/file_dialog.cpp

@@ -0,0 +1,163 @@
+#include "file_dialog.h"
+
+
+#include "reflex/exception.h"
+#include "application.h"
+#include "window.h"
+
+
+namespace Reflex
+{
+
+
+	void
+	FileDialog_call_file_event (FileDialog* dialog, FileEvent* event)
+	{
+		if (!dialog)
+			argument_error(__FILE__, __LINE__);
+		if (!event)
+			argument_error(__FILE__, __LINE__);
+
+		Application_guard([&]()
+		{
+			dialog->on_file(event);
+			if (event->is_blocked()) return;
+
+			if (dialog->owner())
+				Window_call_file_event(dialog->owner(), event);
+		});
+	}
+
+	void
+	FileDialog_call_cancel_event (FileDialog* dialog, Event* event)
+	{
+		if (!dialog)
+			argument_error(__FILE__, __LINE__);
+		if (!event)
+			argument_error(__FILE__, __LINE__);
+
+		Application_guard([&]()
+		{
+			dialog->on_cancel(event);
+		});
+	}
+
+
+	FileDialog::FileDialog ()
+	{
+	}
+
+	FileDialog::~FileDialog ()
+	{
+	}
+
+	void
+	FileDialog::open_file (const char* dir)
+	{
+		FileDialog_show(this, Data::OPEN_FILE, dir, NULL);
+	}
+
+	void
+	FileDialog::open_files (const char* dir)
+	{
+		FileDialog_show(this, Data::OPEN_FILES, dir, NULL);
+	}
+
+	void
+	FileDialog::open_directory (const char* dir)
+	{
+		FileDialog_show(this, Data::OPEN_DIRECTORY, dir, NULL);
+	}
+
+	void
+	FileDialog::save_file (const char* dir, const char* name)
+	{
+		FileDialog_show(this, Data::SAVE_FILE, dir, name);
+	}
+
+	void
+	FileDialog::set_owner (Window* window)
+	{
+		self->owner = window;
+	}
+
+	Window*
+	FileDialog::owner ()
+	{
+		return self->owner;
+	}
+
+	const Window*
+	FileDialog::owner () const
+	{
+		return const_cast<FileDialog*>(this)->owner();
+	}
+
+	void
+	FileDialog::set_title (const char* title)
+	{
+		if (!title)
+			argument_error(__FILE__, __LINE__);
+
+		self->title = title;
+	}
+
+	const char*
+	FileDialog::title () const
+	{
+		return self->title;
+	}
+
+	static String
+	to_extension (const String& extension)
+	{
+		size_t start = extension.find_first_not_of('.');
+		if (start == String::npos)
+			argument_error(__FILE__, __LINE__);
+
+		String result = extension.substr(start);
+		if (result.find_first_of("*?[]/\\;") != String::npos)
+			argument_error(__FILE__, __LINE__);
+
+		return result;
+	}
+
+	void
+	FileDialog::set_extensions (const StringList& extensions)
+	{
+		StringList list;
+		for (const auto& extension : extensions)
+			list.emplace_back(to_extension(extension));
+
+		self->extensions = list;
+	}
+
+	const StringList&
+	FileDialog::extensions () const
+	{
+		return self->extensions;
+	}
+
+	void
+	FileDialog::on_file (FileEvent* e)
+	{
+	}
+
+	void
+	FileDialog::on_cancel (Event* e)
+	{
+	}
+
+	FileDialog::operator bool () const
+	{
+		return true;
+	}
+
+	bool
+	FileDialog::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Reflex

data/src/file_dialog.h

@@ -0,0 +1,52 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_FILE_DIALOG_H__
+#define __REFLEX_SRC_FILE_DIALOG_H__
+
+
+#include "reflex/file_dialog.h"
+#include "reflex/window.h"
+
+
+namespace Reflex
+{
+
+
+	struct FileDialog::Data
+	{
+
+		enum Mode
+		{
+
+			OPEN_FILE = 0,
+
+			OPEN_FILES,
+
+			OPEN_DIRECTORY,
+
+			SAVE_FILE
+
+		};// Mode
+
+		Xot::WeakRef<Window> owner;
+
+		String title;
+
+		StringList extensions;
+
+	};// FileDialog::Data
+
+
+	void FileDialog_show (
+		FileDialog* dialog, FileDialog::Data::Mode mode,
+		const char* dir, const char* name);
+
+	void FileDialog_call_file_event   (FileDialog* dialog, FileEvent* event);
+
+	void FileDialog_call_cancel_event (FileDialog* dialog, Event* event);
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/gamepad.cpp

@@ -40,6 +40,32 @@ namespace Reflex
 	}
 
 
+	static bool initialized = false;
+
+	void
+	Gamepad_init (Application* app)
+	{
+		if (!app)
+			argument_error(__FILE__, __LINE__);
+
+		if (initialized) return;
+
+		initialized = true;
+		Gamepad_init_native(app);
+	}
+
+	void
+	Gamepad_fin (Application* app)
+	{
+		if (!app)
+			argument_error(__FILE__, __LINE__);
+
+		if (!initialized) return;
+
+		Gamepad_fin_native(app);
+		initialized = false;
+	}
+
 	static Gamepad::List gamepads;
 
 	void
@@ -50,7 +76,7 @@ namespace Reflex
 
 		gamepads.emplace_back(gamepad);
 
-		Application_call_device_connect(app, gamepad);
+		Application_call_device_connect_event(app, gamepad);
 	}
 
 	void
@@ -61,16 +87,17 @@ namespace Reflex
 		auto it = std::find(gamepads.begin(), gamepads.end(), gamepad);
 		if (it == gamepads.end()) return;
 
-		Application_call_device_disconnect(app, gamepad);
-
+		Gamepad::Ref ref = *it;
 		gamepads.erase(it);
+
+		Application_call_device_disconnect_event(app, ref);
 	}
 
 	void
 	Gamepad_remove_all (Application* app)
 	{
-		for (auto& gamepad : gamepads)
-			Gamepad_remove(app, gamepad);
+		while (!gamepads.empty())
+			Gamepad_remove(app, gamepads.back());
 	}
 
 	Gamepad*
@@ -123,6 +150,16 @@ namespace Reflex
 		return gamepad_create_fun ? gamepad_create_fun() : new Gamepad();
 	}
 
+	void
+	enable_gamepad ()
+	{
+		Application* app_ = app();
+		if (!app_)
+			invalid_state_error(__FILE__, __LINE__);
+
+		Gamepad_init(app_);
+	}
+
 
 	Gamepad::Gamepad ()
 	{

data/src/gamepad.h

@@ -69,6 +69,10 @@ namespace Reflex
 
 	Gamepad* Gamepad_create ();
 
+	void Gamepad_init_native (Application* app);
+
+	void Gamepad_fin_native  (Application* app);
+
 
 }// Reflex
 

data/src/ios/app_delegate.mm

@@ -76,7 +76,7 @@
 			return YES;
 
 		Reflex::Event e;
-		Application_call_start(application, &e);
+		Application_call_start_event(application, &e);
 		started = true;
 
 		return !e.is_blocked();
@@ -109,7 +109,7 @@
 
 				Reflex::MotionEvent e(
 					Reflex::Point(motion.gravity.x, -motion.gravity.y, motion.gravity.z));
-				application->on_motion(&e);
+				Application_call_motion_event(application, &e);
 			}
 		];
 
@@ -147,12 +147,14 @@
 		if (self->application)
 		{
 			Reflex::Event e;
-			Application_call_quit(self->application, &e);
+			Application_call_quit_event(self->application, &e);
 			if (e.is_blocked())
 			{
 				Reflex::not_implemented_error(
 					__FILE__, __LINE__, "blocking to quit is not supported.");
 			}
+
+			Application_cleanup(self->application);
 		}
 
 		[self unbind];

data/src/ios/application.mm

@@ -28,6 +28,35 @@ namespace Reflex
 		return new ApplicationData();
 	}
 
+	String
+	Application_get_default_name ()
+	{
+		NSBundle* bundle = NSBundle.mainBundle;
+		NSString* name   = [bundle objectForInfoDictionaryKey: @"CFBundleDisplayName"];
+		if (!name) name  = [bundle objectForInfoDictionaryKey: @"CFBundleName"];
+		return name ? name.UTF8String : "";
+	}
+
+	void
+	Application_stop (Application* app)
+	{
+	}
+
+	void
+	Application_set_menu (Application* app, Menu* menu)
+	{
+	}
+
+	void
+	Application_set_background (Application* app, bool state)
+	{
+	}
+
+	void
+	Application_set_background_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/color_picker.mm

@@ -0,0 +1,19 @@
+// -*- objc -*-
+#include "../color_picker.h"
+
+
+#include "reflex/exception.h"
+
+
+namespace Reflex
+{
+
+
+	void
+	ColorPicker_show (ColorPicker* picker, const Color* initial)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+
+}// 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/file_dialog.mm

@@ -0,0 +1,21 @@
+// -*- objc -*-
+#include "../file_dialog.h"
+
+
+#include "reflex/exception.h"
+
+
+namespace Reflex
+{
+
+
+	void
+	FileDialog_show (
+		FileDialog* dialog, FileDialog::Data::Mode mode,
+		const char* dir, const char* name)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+
+}// Reflex

data/src/ios/gamepad.mm

@@ -258,7 +258,7 @@ namespace Reflex
 
 	static id disconnect_observer = nil;
 
-	void
+	static void
 	init_gamepad (Application* app)
 	{
 		if (connect_observer || disconnect_observer)
@@ -280,7 +280,7 @@ namespace Reflex
 			add_gamepad(app, c);
 	}
 
-	void
+	static void
 	fin_gamepad (Application* app)
 	{
 		if (!connect_observer || !disconnect_observer)
@@ -297,13 +297,13 @@ namespace Reflex
 	}
 
 	void
-	Gamepad_init (Application* app)
+	Gamepad_init_native (Application* app)
 	{
 		init_gamepad(app);
 	}
 
 	void
-	Gamepad_fin (Application* app)
+	Gamepad_fin_native (Application* app)
 	{
 		fin_gamepad(app);
 

data/src/ios/menu.mm

@@ -0,0 +1,41 @@
+// -*- objc -*-
+#include "../menu.h"
+
+
+namespace Reflex
+{
+
+
+	Menu::Data*
+	Menu_create_data ()
+	{
+		return new Menu::Data();
+	}
+
+	void
+	Menu_validate_shortcut_modifiers (uint modifiers)
+	{
+	}
+
+	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/reflex.mm

@@ -3,6 +3,7 @@
 
 
 #include "reflex/exception.h"
+#include "../vk.h"
 
 
 namespace Reflex
@@ -36,5 +37,12 @@ namespace Reflex
 		global::pool = nil;
 	}
 
+	void
+	alert (const char* message, const char* title)
+	{
+		// UIAlertController only presents asynchronously
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
 
 }// Reflex