reflexion 0.3.2 → 0.3.4

data/src/ios/view_controller.mm

@@ -195,6 +195,8 @@ ReflexViewController_get_show_fun ()
 
 			ptr_for_rebind->Xot::template RefCountable<>::release();
 			ptr_for_rebind = NULL;
+
+			Window_register(pwindow);
 		}
 	}
 
@@ -203,6 +205,8 @@ ReflexViewController_get_show_fun ()
 		[self rebind];
 		if (!pwindow) return;
 
+		Window_unregister(pwindow);
+
 		Window_get_data(pwindow).view_controller = nil;
 
 		pwindow->release();
@@ -365,13 +369,7 @@ ReflexViewController_get_show_fun ()
 
 		++update_count;
 
-		double now = Xot::time();
-		Reflex::UpdateEvent e(now, now - win->self->prev_time_update);
-		win->self->prev_time_update = now;
-
-		win->on_update(&e);
-		if (!e.is_blocked())
-			Reflex::View_update_tree(win->root(), e);
+		Window_call_update_event(win);
 
 		if (win->self->redraw)
 		{

data/src/osx/app_delegate.mm

@@ -38,10 +38,11 @@
 		if (!app)
 			Reflex::argument_error(__FILE__, __LINE__);
 
-		if (app->self->delegate)
+		Reflex::ApplicationData& data = Reflex::Application_get_data(app);
+		if (data.delegate)
 			Reflex::invalid_state_error(__FILE__, __LINE__);
 
-		app->self->delegate = [self retain];
+		data.delegate = [self retain];
 		app->retain();
 
 		application = app;
@@ -51,10 +52,11 @@
 	{
 		if (!application) return;
 
-		if (application->self->delegate)
+		Reflex::ApplicationData& data = Reflex::Application_get_data(application);
+		if (data.delegate)
 		{
-			[application->self->delegate release];
-			application->self->delegate = nil;
+			[data.delegate release];
+			data.delegate = nil;
 		}
 
 		application->release();

data/src/osx/application.h

@@ -4,7 +4,7 @@
 #define __REFLEX_SRC_OSX_APPLICATION_H__
 
 
-#include "reflex/application.h"
+#include "../application.h"
 
 
 @class ReflexAppDelegate;
@@ -14,16 +14,19 @@ namespace Reflex
 {
 
 
-	struct Application::Data
+	struct ApplicationData : public Application::Data
 	{
 
 		ReflexAppDelegate* delegate;
 
-		String name;
+		ApplicationData ();
 
-		Data ();
+	};// ApplicationData
 
-	};// Application::Data
+
+	      ApplicationData& Application_get_data (      Application* app);
+
+	const ApplicationData& Application_get_data (const Application* app);
 
 
 }// Reflex

data/src/osx/application.mm

@@ -12,33 +12,33 @@ namespace Reflex
 {
 
 
-	namespace global
+	Application::Data*
+	Application_create_data ()
 	{
+		return new ApplicationData();
+	}
 
-		static Application* instance = NULL;
-
-	}// global
+	ApplicationData&
+	Application_get_data (Application* app)
+	{
+		if (!app)
+			argument_error(__FILE__, __LINE__);
 
+		return (ApplicationData&) *app->self;
+	}
 
-	Application*
-	app ()
+	const ApplicationData&
+	Application_get_data (const Application* app)
 	{
-		return global::instance;
+		return Application_get_data(const_cast<Application*>(app));
 	}
 
 
-	Application::Application ()
+	ApplicationData::ApplicationData ()
+	:	delegate(nil)
 	{
-		if (global::instance)
-			reflex_error(__FILE__, __LINE__, "multiple application instances.");
-
-		global::instance = this;
 	}
 
-	Application::~Application ()
-	{
-		global::instance = NULL;
-	}
 
 	static ReflexAppDelegate*
 	setup_app_delegate (NSApplication* app)
@@ -75,21 +75,6 @@ namespace Reflex
 		[NSApp terminate: nil];
 	}
 
-	void
-	Application::set_name (const char* name)
-	{
-		if (!name)
-			argument_error(__FILE__, __LINE__);
-
-		self->name = name;
-	}
-
-	const char*
-	Application::name () const
-	{
-		return self->name.c_str();
-	}
-
 	void
 	Application::on_start (Event* e)
 	{
@@ -121,17 +106,5 @@ namespace Reflex
 		return true;
 	}
 
-	bool
-	Application::operator ! () const
-	{
-		return !operator bool();
-	}
-
-
-	Application::Data::Data ()
-	:	delegate(nil)
-	{
-	}
-
 
 }// Reflex

data/src/osx/native_window.mm

@@ -119,6 +119,8 @@ move_to_main_screen_origin (NativeWindow* window)
 
 			ptr_for_rebind->Xot::template RefCountable<>::release();
 			ptr_for_rebind = NULL;
+
+			Window_register(pwindow);
 		}
 	}
 
@@ -127,6 +129,8 @@ move_to_main_screen_origin (NativeWindow* window)
 		[self rebind];
 		if (!pwindow) return;
 
+		Window_unregister(pwindow);
+
 		Window_get_data(pwindow).native = nil;
 
 		pwindow->release();
@@ -197,13 +201,7 @@ move_to_main_screen_origin (NativeWindow* window)
 
 		++update_count;
 
-		double now = Xot::time();
-		Reflex::UpdateEvent e(now, now - win->self->prev_time_update);
-		win->self->prev_time_update = now;
-
-		win->on_update(&e);
-		if (!e.is_blocked())
-			Reflex::View_update_tree(win->root(), e);
+		Window_call_update_event(win);
 
 		if (win->self->redraw)
 		{

data/src/view.cpp

@@ -235,6 +235,8 @@ namespace Reflex
 			}
 			else
 				pbody->set_transform(frame.x, frame.y, angle);
+
+			pbody->awake();
 		}
 
 		void update_body_states ()
@@ -2295,9 +2297,9 @@ namespace Reflex
 		bool capture    = types != CAPTURE_NONE;
 
 		if (capture && !registered)
-			Window_register_capture(w, this, CAPTURE_ALL);
+			Window_register_capture(w, this, CAPTURE_ALL_EVENTS);
 		else if (!capture && registered)
-			Window_unregister_capture(w, this, CAPTURE_ALL);
+			Window_unregister_capture(w, this, CAPTURE_ALL_EVENTS);
 
 		CaptureEvent e(~old & types, old & ~types);
 		on_capture(&e);

data/src/win32/application.cpp

@@ -1,48 +1,41 @@
-#include "reflex/application.h"
+#include "../application.h"
 
 
 #include <xot/windows.h>
 #include "reflex/exception.h"
+#include "window.h"
 
 
 namespace Reflex
 {
 
 
-	namespace global
+	Application::Data*
+	Application_create_data ()
 	{
-
-		static Application* instance = NULL;
-
-	}// global
-
-
-	Application*
-	app ()
-	{
-		return global::instance;
+		return new Application::Data();
 	}
 
 
-	struct Application::Data
-	{
-
-		String name;
-
-	};// Application::Data
-
-
-	Application::Application ()
+	static double
+	get_time ()
 	{
-		if (global::instance)
-			reflex_error(__FILE__, __LINE__, "multiple application instances.");
+		static const double FREQUENCY_INV = []() {
+			LARGE_INTEGER freq;
+			QueryPerformanceFrequency(&freq);
+			return 1.0 / (double) freq.QuadPart;
+		}();
 
-		global::instance = this;
+		LARGE_INTEGER counter;
+		QueryPerformanceCounter(&counter);
+		return (double) counter.QuadPart * FREQUENCY_INV;
 	}
 
-	Application::~Application ()
+	static void
+	update_all_windows (Application* app)
 	{
-		global::instance = NULL;
+		for (auto it = app->window_begin(), end = app->window_end(); it != end; ++it)
+			Window_update(it->get());
 	}
 
 	void
@@ -51,13 +44,39 @@ namespace Reflex
 		Event e;
 		on_start(&e);
 
+		timeBeginPeriod(1);
+
+		double prev = get_time();
+
 		MSG msg;
-		while (GetMessage(&msg, NULL, 0, 0))
+		while (true)
 		{
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
+			if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+			{
+				if (msg.message == WM_QUIT) break;
+				TranslateMessage(&msg);
+				DispatchMessage(&msg);
+			}
+			else
+			{
+				static const double INTERVAL  = 1.0 / 60.0;
+				static const double SLEEPABLE = INTERVAL * 0.9;
+
+				double now = get_time();
+				double dt  = now - prev;
+				if (dt < INTERVAL)
+				{
+					if (dt < SLEEPABLE) Sleep(1);
+					continue;
+				}
+
+				update_all_windows(this);
+				prev = now;
+			}
 		}
 
+		timeEndPeriod(1);
+
 		if (msg.wParam != 0)
 			reflex_error(__FILE__, __LINE__, "WM_QUIT with wParam %d.", msg.wParam);
 	}
@@ -68,21 +87,6 @@ namespace Reflex
 		PostQuitMessage(0);
 	}
 
-	void
-	Application::set_name (const char* name)
-	{
-		if (!name)
-			argument_error(__FILE__, __LINE__);
-
-		self->name = name;
-	}
-
-	const char*
-	Application::name () const
-	{
-		return self->name.c_str();
-	}
-
 	void
 	Application::on_start (Event* e)
 	{
@@ -113,11 +117,5 @@ namespace Reflex
 		return true;
 	}
 
-	bool
-	Application::operator ! () const
-	{
-		return !operator bool();
-	}
-
 
 }// Reflex

data/src/win32/window.cpp

@@ -1,4 +1,4 @@
-#include "../window.h"
+#include "window.h"
 
 
 #include <assert.h>
@@ -8,7 +8,6 @@
 #include <xot/windows.h>
 #include <rays/rays.h>
 #include "reflex/defs.h"
-#include "reflex/application.h"
 #include "reflex/exception.h"
 #include "reflex/debug.h"
 #include "../view.h"
@@ -28,8 +27,6 @@ namespace Reflex
 
 	static const char* USERDATA_PROP = "Reflex:Window:HWND";
 
-	enum {UPDATE_TIMER_ID = 99999};
-
 
 	struct WindowData : public Window::Data
 	{
@@ -152,18 +149,12 @@ namespace Reflex
 		win->release();
 	}
 
-	static void
-	update (Window* win)
+	void
+	Window_update (Window* win)
 	{
 		WindowData* self = get_data(win);
 
-		double now = Xot::time();
-		Reflex::UpdateEvent e(now, now - self->prev_time_update);
-		self->prev_time_update = now;
-
-		win->on_update(&e);
-		if (!e.is_blocked())
-			Reflex::View_update_tree(win->root(), e);
+		Window_call_update_event(win);
 
 		if (self->redraw)
 		{
@@ -435,13 +426,6 @@ namespace Reflex
 				break;
 			}
 
-			case WM_TIMER:
-			{
-				if (wp == UPDATE_TIMER_ID)
-					update(win);
-				return 0;
-			}
-
 			case WM_SYSCOMMAND:
 			{
 #if 0
@@ -458,8 +442,6 @@ namespace Reflex
 	static LRESULT CALLBACK
 	wndproc (HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
 	{
-		static int window_total = 0;
-
 		Window* win = NULL;
 		if (msg == WM_NCCREATE)
 		{
@@ -467,7 +449,7 @@ namespace Reflex
 			win = (Window*) cs->lpCreateParams;
 			setup_window(win, hwnd);
 
-			++window_total;
+			Window_register(win);
 		}
 
 		if (!win)
@@ -477,9 +459,11 @@ namespace Reflex
 
 		if (msg == WM_NCDESTROY)
 		{
+			Window_unregister(win);
+
 			cleanup_window(win);
 
-			if (--window_total == 0)
+			if (Window_all().empty())
 				Reflex::app()->quit();
 		}
 
@@ -556,28 +540,6 @@ namespace Reflex
 		create_window(window);
 	}
 
-	static void
-	start_timer (HWND hwnd, UINT id, UINT interval)
-	{
-		if (!hwnd)
-			argument_error(__FILE__, __LINE__);
-
-		if (!SetTimer(hwnd, id, interval, NULL))
-			system_error(__FILE__, __LINE__);
-	}
-
-	static void
-	stop_timer (HWND hwnd, UINT id)
-	{
-		if (!hwnd)
-			argument_error(__FILE__, __LINE__);
-
-		if (id == 0) return;
-
-		if (!KillTimer(hwnd, id))
-			system_error(__FILE__, __LINE__);
-	}
-
 	void
 	Window_show (Window* window)
 	{
@@ -590,8 +552,6 @@ namespace Reflex
 			self->hwnd, HWND_TOP, 0, 0, 0, 0,
 			SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
 		UpdateWindow(self->hwnd);
-
-		start_timer(self->hwnd, UPDATE_TIMER_ID, 1000 / 60);
 	}
 
 	void
@@ -605,8 +565,6 @@ namespace Reflex
 		SetWindowPos(
 			self->hwnd, NULL, 0, 0, 0, 0,
 			SWP_HIDEWINDOW | SWP_NOMOVE | SWP_NOSIZE);
-
-		stop_timer(self->hwnd, UPDATE_TIMER_ID);
 	}
 
 	void

data/src/win32/window.h

@@ -0,0 +1,20 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_WIN32_WINDOW_H__
+#define __REFLEX_SRC_WIN32_WINDOW_H__
+
+
+#include "../window.h"
+
+
+namespace Reflex
+{
+
+
+	void Window_update (Window* win);
+
+
+}// Reflex
+
+
+#endif//EOH