reflexion 0.5.3 → 0.7.0

data/src/sdl/application.cpp

@@ -5,6 +5,11 @@
 #ifdef WASM
 	#include <emscripten.h>
 #endif
+#ifdef LINUX
+	#include <limits.h>
+	#include <string.h>
+	#include <unistd.h>
+#endif
 #include <xot/time.h>
 #include "reflex/exception.h"
 #include "reflex/debug.h"
@@ -41,6 +46,43 @@ namespace Reflex
 		return new ApplicationData();
 	}
 
+	String
+	Application_get_default_name ()
+	{
+#ifdef LINUX
+		char path[PATH_MAX];
+		ssize_t len = readlink("/proc/self/exe", path, sizeof(path) - 1);
+		if (len > 0)
+		{
+			path[len]   = '\0';
+			char* slash = strrchr(path, '/');
+			return slash ? slash + 1 : path;
+		}
+#endif
+		return "";
+	}
+
+	void
+	Application_stop (Application* app)
+	{
+		get_data(app)->quit = true;
+	}
+
+	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)
+	{
+	}
+
 
 	static bool
 	dispatch_window_event (const SDL_Event& event)
@@ -60,11 +102,18 @@ namespace Reflex
 		SDL_Event event;
 		while (SDL_PollEvent(&event))
 		{
-			if (dispatch_window_event(event))
-				continue;
+			bool dispatched = dispatch_window_event(event);
+
+#if SDL_VERSION_ATLEAST(2, 0, 22)
+			// the text of an extended composition event is handed over to
+			// whoever takes the event, so it is freed here rather than in the
+			// window that may or may not have been found for it
+			if (event.type == SDL_TEXTEDITING_EXT)
+				SDL_free(event.editExt.text);
+#endif
 
-			if (event.type == SDL_QUIT)
-				app->quit();
+			if (!dispatched && event.type == SDL_QUIT)
+				Application_call_quit(app);
 		}
 	}
 
@@ -110,7 +159,10 @@ namespace Reflex
 		dispatch_events(app);
 
 		if (get_data(app)->quit)
+		{
 			emscripten_cancel_main_loop();
+			Application_cleanup(app);
+		}
 		else
 			update_all_windows(app);
 	}
@@ -119,13 +171,26 @@ namespace Reflex
 	void
 	Application::start ()
 	{
+		get_data(this)->quit = false;
+		self->started        = false;
+		self->quitting       = false;
+		self->running        = true;
+
 		Event e;
-		Application_call_start(this, &e);
+		Application_call_start_event(this, &e);
 
 #ifdef WASM
 		emscripten_set_main_loop_arg(emscripten_main_loop, this, 0, true);
 #else
-		main_loop(this);
+		// guarded here too, since rays can throw while drawing
+		Application_guard([&]()
+		{
+			main_loop(this);
+		});
+		self->running = false;
+
+		Application_cleanup(this);
+		Application_throw_exception(this);
 #endif
 	}
 
@@ -133,10 +198,10 @@ namespace Reflex
 	Application::quit ()
 	{
 		Event e;
-		Application_call_quit(this, &e);
+		Application_call_quit_event(this, &e);
 		if (e.is_blocked()) return;
 
-		get_data(this)->quit = true;
+		Application_stop(this);
 	}
 
 	void

data/src/sdl/clipboard.cpp

@@ -0,0 +1,39 @@
+#include "reflex/clipboard.h"
+
+
+#include <SDL.h>
+#include "reflex/exception.h"
+
+
+namespace Reflex
+{
+
+
+	void
+	set_clipboard (const Clipboard& clipboard)
+	{
+		const char* text = clipboard.text();
+		if (SDL_SetClipboardText(text ? text : "") != 0)
+			reflex_error(__FILE__, __LINE__, SDL_GetError());
+	}
+
+	Clipboard
+	get_clipboard ()
+	{
+		Clipboard clipboard;
+
+		if (SDL_HasClipboardText() == SDL_TRUE)
+		{
+			char* text = SDL_GetClipboardText();
+			if (text)
+			{
+				clipboard.set_text(text);
+				SDL_free(text);
+			}
+		}
+
+		return clipboard;
+	}
+
+
+}// Reflex

data/src/sdl/color_picker.cpp

@@ -0,0 +1,18 @@
+#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/sdl/event.cpp

@@ -70,6 +70,21 @@ namespace Reflex
 	}
 
 
+	NativeTextEvent::NativeTextEvent (
+		const char* text, int selection_offset, int selection_size)
+	:	TextEvent(
+			PREEDIT, text, selection_offset,
+			// a size below zero is how sdl says nothing is selected
+			selection_size < 0 ? 0 : selection_size)
+	{
+	}
+
+	NativeTextEvent::NativeTextEvent (const SDL_TextInputEvent& e)
+	:	TextEvent(COMMIT, e.text)
+	{
+	}
+
+
 	static uint
 	get_pointer_type (Uint8 button)
 	{
@@ -94,7 +109,7 @@ namespace Reflex
 	}
 
 	NativePointerEvent::NativePointerEvent (
-		const SDL_MouseButtonEvent& e, SDL_Window* window, Pointer::Action action)
+		SDL_Window* window, const SDL_MouseButtonEvent& e, Pointer::Action action)
 	{
 		PointerEvent_add_pointer(this, Pointer(
 			0,
@@ -108,7 +123,7 @@ namespace Reflex
 	}
 
 	NativePointerEvent::NativePointerEvent (
-		const SDL_MouseMotionEvent& e, SDL_Window* window)
+		SDL_Window* window, const SDL_MouseMotionEvent& e)
 	{
 		PointerEvent_add_pointer(this, Pointer(
 			0,
@@ -122,7 +137,7 @@ namespace Reflex
 	}
 
 	NativePointerEvent::NativePointerEvent (
-		const SDL_TouchFingerEvent& e, SDL_Window* window, Pointer::Action action)
+		SDL_Window* window, const SDL_TouchFingerEvent& e, Pointer::Action action)
 	{
 		uint mods = get_modifiers(SDL_GetModState());
 		double t  = time();
@@ -157,14 +172,37 @@ namespace Reflex
 		}
 	}
 
+	NativePointerEvent::NativePointerEvent (
+		SDL_Window* window, Pointer::Action action)
+	{
+		int x = 0, y = 0;
+		Uint32 state = SDL_GetMouseState(&x, &y);
+
+		PointerEvent_add_pointer(this, Pointer(
+			0,
+			get_current_pointer_type(state),
+			action,
+			Point(x, y),
+			get_modifiers(SDL_GetModState()),
+			0,
+			false,
+			time()));
+	}
+
+
+	static coord
+	to_wheel_pixels (const SDL_MouseWheelEvent& e, float delta)
+	{
+		float scale = WHEEL_PIXELS_PER_NOTCH;
+		if (e.direction == SDL_MOUSEWHEEL_FLIPPED) scale = -scale;
+		return delta * scale;
+	}
 
 	NativeWheelEvent::NativeWheelEvent (
 		const SDL_MouseWheelEvent& e, SDL_Window* window)
 	:	WheelEvent(
 			0, 0, 0,
-			e.direction == SDL_MOUSEWHEEL_FLIPPED ? -e.preciseX : e.preciseX,
-			e.direction == SDL_MOUSEWHEEL_FLIPPED ? -e.preciseY : e.preciseY,
-			0,
+			to_wheel_pixels(e, e.preciseX), to_wheel_pixels(e, -e.preciseY), 0,
 			get_modifiers(SDL_GetModState()))
 	{
 		int mx, my;

data/src/sdl/event.h

@@ -22,22 +22,37 @@ namespace Reflex
 	};// NativeKeyEvent
 
 
+	class NativeTextEvent : public TextEvent
+	{
+
+		public:
+
+			NativeTextEvent (const char* text, int selection_offset, int selection_size);
+
+			NativeTextEvent (const SDL_TextInputEvent& event);
+
+	};// NativeTextEvent
+
+
 	class NativePointerEvent : public PointerEvent
 	{
 
 		public:
 
 			NativePointerEvent (
-				const SDL_MouseButtonEvent& event, SDL_Window* window,
+				SDL_Window* window, const SDL_MouseButtonEvent& event,
 				Pointer::Action action);
 
 			NativePointerEvent (
-				const SDL_MouseMotionEvent& event, SDL_Window* window);
+				SDL_Window* window, const SDL_MouseMotionEvent& event);
 
 			NativePointerEvent (
-				const SDL_TouchFingerEvent& event, SDL_Window* window,
+				SDL_Window* window, const SDL_TouchFingerEvent& event,
 				Pointer::Action action);
 
+			NativePointerEvent (
+				SDL_Window* window, Pointer::Action action);
+
 	};// NativePointerEvent
 
 

data/src/sdl/file_dialog.cpp

@@ -0,0 +1,20 @@
+#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/sdl/gamepad.cpp

@@ -9,17 +9,13 @@ namespace Reflex
 
 
 	void
-	Gamepad_init (Application* app)
+	Gamepad_init_native (Application* app)
 	{
+		not_implemented_error(__FILE__, __LINE__);
 	}
 
 	void
-	Gamepad_fin (Application* app)
-	{
-	}
-
-	void
-	Gamepad_poll ()
+	Gamepad_fin_native (Application* app)
 	{
 	}
 

data/src/sdl/menu.cpp

@@ -0,0 +1,40 @@
+#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/sdl/reflex.cpp

@@ -3,6 +3,7 @@
 
 #include <SDL.h>
 #include "reflex/exception.h"
+#include "../vk.h"
 
 
 namespace Reflex
@@ -23,6 +24,13 @@ namespace Reflex
 		if (global::initialized)
 			reflex_error(__FILE__, __LINE__, "already initialized.");
 
+#if SDL_VERSION_ATLEAST(2, 0, 22)
+		// without this, sdl cuts a composition longer than 32 bytes into
+		// pieces and reuses the offset field to say where each piece goes,
+		// which leaves no way to tell a composition from its selection
+		SDL_SetHint(SDL_HINT_IME_SUPPORT_EXTENDED_TEXT, "1");
+#endif
+
 		global::initialized = true;
 	}
 
@@ -35,5 +43,17 @@ namespace Reflex
 		global::initialized = false;
 	}
 
+	void
+	alert (const char* message, const char* title)
+	{
+		if (!message)
+			argument_error(__FILE__, __LINE__);
+
+		int ret = SDL_ShowSimpleMessageBox(
+			SDL_MESSAGEBOX_INFORMATION, title ? title : "", message, NULL);
+		if (ret < 0)
+			reflex_error(__FILE__, __LINE__, SDL_GetError());
+	}
+
 
 }// Reflex

data/src/sdl/screen.cpp

@@ -35,6 +35,16 @@ namespace Reflex
 	{
 	}
 
+	String
+	Screen::name () const
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		const char* name = SDL_GetDisplayName(self->display_index);
+		return name ? name : "";
+	}
+
 	Bounds
 	Screen::frame () const
 	{
@@ -48,6 +58,15 @@ namespace Reflex
 		return Bounds(rect.x, rect.y, rect.w, rect.h);
 	}
 
+	float
+	Screen::pixel_density () const
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		return 1;
+	}
+
 	Screen::operator bool () const
 	{
 		return self->display_index >= 0;
@@ -59,5 +78,22 @@ namespace Reflex
 		return !operator bool();
 	}
 
+	Screen::List
+	Screen::all ()
+	{
+		int count = SDL_GetNumVideoDisplays();
+		if (count < 0)
+			reflex_error(__FILE__, __LINE__, SDL_GetError());
+
+		List list;
+		for (int i = 0; i < count; ++i)
+		{
+			Screen s;
+			Screen_initialize(&s, i);
+			list.emplace_back(s);
+		}
+		return list;
+	}
+
 
 }// Reflex