reflexion 0.1.12 → 0.1.13

data/src/ios/window.mm

@@ -1,219 +1,128 @@
 // -*- objc -*-
-#include "reflex/window.h"
+#include "window.h"
 
 
-#include "reflex/event.h"
 #include "reflex/exception.h"
-#include "window_data.h"
-#import "native_window.h"
+#import "view_controller.h"
 
 
-namespace Rays
-{
-	void set_painter_scale_factor(Painter*, float);
-};
+@interface ReflexViewController (Bind)
+	- (void) bind: (Reflex::Window*) window;
+@end
 
 
 namespace Reflex
 {
 
 
-	void set_window (View* view, Window* window);
-
-	void call_key_event (View* v, const KeyEvent& e);
-
-	void call_pointer_event (View* v, const PointerEvent& e);
-
-	void call_wheel_event (View* v, const WheelEvent& e);
-
-
-	void
-	set_focus (Window* window, View* view)
+	WindowData&
+	Window_get_data (Window* window)
 	{
-		if (!window || !view)
+		if (!window)
 			argument_error(__FILE__, __LINE__);
 
-		View* current = window->self->focus.get();
-		if (current == view) return;
-
-		window->self->focus.reset(view);
-
-		FocusEvent e(FocusEvent::BLUR, view, current);
-
-		if (current)
-		{
-			current->on_blur(&e);
-			current->redraw();
-		}
-
-		if (view)
-		{
-			e.type = FocusEvent::FOCUS;
-			view->on_focus(&e);
-			view->redraw();
-		}
+		return (WindowData&) *window->self;
 	}
 
-	void
-	register_capture (View* view)
+	const WindowData&
+	Window_get_data (const Window* window)
 	{
-		if (!view)
-			argument_error(__FILE__, __LINE__);
-
-		const Window* window = view->window();
-		if (!window)
-			invalid_state_error(__FILE__, __LINE__, "this view does not belong to any Window.");
-
-		window->self->capturing_views[view] = true;
+		return Window_get_data(const_cast<Window*>(window));
 	}
 
-	void
-	unregister_capture (View* view)
+	static ReflexViewController*
+	get_vc (const Window* window)
 	{
-		if (!view)
-			argument_error(__FILE__, __LINE__);
-
-		const Window* window = view->window();
-		if (!window) return;
-
-		CapturingViews::iterator it = window->self->capturing_views.find(view);
-		if (it == window->self->capturing_views.end()) return;
+		ReflexViewController* p =
+			Window_get_data(const_cast<Window*>(window)).view_controller;
+		if (!p)
+			invalid_state_error(__FILE__, __LINE__);
 
-		it->second = false;
+		return p;
 	}
 
-	void
-	cleanup_capturing_views (Window* window)
-	{
-		CapturingViews::iterator end = window->self->capturing_views.end();
-		for (CapturingViews::iterator it = window->self->capturing_views.begin(); it != end;)
-		{
-			CapturingViews::iterator t = it++;
-			if (!t->second) window->self->capturing_views.erase(t);
-		}
-	}
 
-
-	Window::Window ()
+	Window::Data*
+	Window_create_data ()
 	{
-		[[[NativeWindow alloc] init] bind: this];
-
-		set_window(self->root.get(), this);
-
-		Rays::set_painter_scale_factor(&self->painter, UIScreen.mainScreen.scale);
-		self->painter.canvas(0, 0, 1, 1);
+		return new WindowData();
 	}
 
-	Window::~Window ()
+	void
+	Window_initialize (Window* window)
 	{
-		//close();
+		ReflexViewController* vc =
+			[ReflexViewController_get_create_fun()() autorelease];
+		if (!vc)
+			reflex_error(__FILE__, __LINE__);
 
-		set_window(self->root.get(), NULL);
+		[vc bind: window];
 	}
 
-	void
-	Window::show ()
+	static UIWindow*
+	get_window ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		int new_count = self->hide_count - 1;
-		if (new_count == 0)
+		UIApplication* app = UIApplication.sharedApplication;
+		if (app.keyWindow)
+			return app.keyWindow;
+		else
 		{
-			Event e;
-			on_show(&e);
-			if (e.is_blocked()) return;
-
-			[self->native makeKeyAndVisible];
+			UIWindow* win =
+				[[UIWindow alloc] initWithFrame: UIScreen.mainScreen.bounds];
+			[win makeKeyAndVisible];
+			return win;
 		}
-
-		self->hide_count = new_count;
 	}
 
 	void
-	Window::hide ()
+	Window_show (Window* window)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		int new_count = self->hide_count + 1;
-		if (new_count == 1)
-		{
-			Event e;
-			on_hide(&e);
-			if (e.is_blocked()) return;
+		UIWindow* win            = get_window();
+		ReflexViewController* vc = get_vc(window);
 
-			not_implemented_error(__FILE__, __LINE__);
-		}
-
-		self->hide_count = new_count;
+		if (!win.rootViewController)
+			win.rootViewController = vc;
+		else
+			ReflexViewController_get_show_fun()(win.rootViewController, vc);
 	}
 
 	void
-	Window::close ()
+	Window_hide (Window* window)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		Event e;
-		on_close(&e);
-		if (e.is_blocked()) return;
-
 		not_implemented_error(__FILE__, __LINE__);
 	}
 
 	void
-	Window::redraw ()
+	Window_close (Window* window)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		self->redraw = true;
+		not_implemented_error(__FILE__, __LINE__);
 	}
 
 	void
-	Window::set_title (const char* title)
+	Window_set_title (Window* window, const char* title)
 	{
 		if (!title)
 			argument_error(__FILE__, __LINE__);
 
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		self->title = title;
+		get_vc(window).title = [[NSString alloc] initWithUTF8String: title];
 	}
 
 	const char*
-	Window::title () const
-	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		return self->title.c_str();
-	}
-
-	void
-	Window::set_frame (coord x, coord y, coord width, coord height)
+	Window_get_title (const Window& window)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		[self->native frameChanged];
+		return [get_vc(&window).title UTF8String];
 	}
 
 	void
-	Window::set_frame (const Bounds& bounds)
+	Window_set_frame (Window* window, coord x, coord y, coord width, coord height)
 	{
-		set_frame(bounds.x, bounds.y, bounds.width, bounds.height);
+		//not_implemented_error(__FILE__, __LINE__);
 	}
 
 	Bounds
-	Window::frame () const
+	Window_get_frame (const Window& window)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		CGRect rect = self->native.frame;
+		CGRect rect = get_vc(&window).reflexView.bounds;
 		return Bounds(
 			rect.origin.x,
 			rect.origin.y,
@@ -221,110 +130,10 @@ namespace Reflex
 			rect.size.height);
 	}
 
-	bool
-	Window::hidden () const
-	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		return self->hide_count > 0;
-	}
-
-	View*
-	Window::root ()
-	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		return self->root.get();
-	}
-
-	View*
-	Window::focus ()
-	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		return self->focus.get();
-	}
-
-	Painter*
-	Window::painter ()
-	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-
-		return &self->painter;
-	}
-
-	void
-	Window::on_key (KeyEvent* e)
-	{
-		if (!e)
-			argument_error(__FILE__, __LINE__);
-
-		switch (e->type)
-		{
-			case KeyEvent::DOWN: on_key_down(e); break;
-			case KeyEvent::UP:   on_key_up(e);   break;
-			case KeyEvent::NONE: break;
-		}
-
-		CapturingViews::iterator end = self->capturing_views.end();
-		for (CapturingViews::iterator it = self->capturing_views.begin(); it != end; ++it)
-		{
-			KeyEvent event = *e;
-			event.capture = true;
-			call_key_event(const_cast<View*>(it->first.get()), event);
-		}
-
-		if (self->focus)
-			call_key_event(self->focus.get(), *e);
-
-		cleanup_capturing_views(this);
-	}
-
-	void
-	Window::on_pointer (PointerEvent* e)
-	{
-		if (!e)
-			argument_error(__FILE__, __LINE__);
-
-		switch (e->type)
-		{
-			case PointerEvent::DOWN: on_pointer_down(e); break;
-			case PointerEvent::UP:   on_pointer_up(e);   break;
-			case PointerEvent::MOVE: on_pointer_move(e); break;
-			case PointerEvent::NONE: break;
-		}
-
-		CapturingViews::iterator end = self->capturing_views.end();
-		for (CapturingViews::iterator it = self->capturing_views.begin(); it != end; ++it)
-		{
-			PointerEvent event = *e;
-			event.capture = true;
-			for (size_t i = 0; i < event.size; ++i)
-				event[i] = it->first.get()->from_window(event[i]);
-			call_pointer_event(const_cast<View*>(it->first.get()), event);
-		}
-
-		call_pointer_event(root(), *e);
-
-		cleanup_capturing_views(this);
-	}
-
-	void
-	Window::on_wheel (WheelEvent* e)
-	{
-		if (!e)
-			argument_error(__FILE__, __LINE__);
-
-		call_wheel_event(root(), *e);
-	}
 
-	Window::operator bool () const
+	WindowData::WindowData ()
 	{
-		return self && *self;
+		view_controller = nil;
 	}
 
 

data/src/osx/app_delegate.h

@@ -1,17 +1,12 @@
 // -*- objc -*-
 #import <AppKit/NSApplication.h>
-#include <reflex/application.h>
+#include "application.h"
 
 
-@interface AppDelegate : NSObject <NSApplicationDelegate>
+@interface ReflexAppDelegate : NSObject <NSApplicationDelegate>
 
-	{
-		@private
-			Reflex::Application::Ref* pref;
-	}
+	- (void) bind: (Reflex::Application*) application;
 
-	- (void) bind:   (Reflex::Application*) instance;
+	- (BOOL) callOnStart;
 
-	- (void) unbind: (Reflex::Application*) instance;
-
-@end// AppDelegate
+@end// ReflexAppDelegate

data/src/osx/app_delegate.mm

@@ -6,90 +6,96 @@
 #import <Cocoa/Cocoa.h>
 #include "reflex/event.h"
 #include "reflex/exception.h"
-#include "application_data.h"
 
 
-#define REF (*pref)
+@implementation ReflexAppDelegate
 
-
-@implementation AppDelegate
+	{
+		Reflex::Application* application;
+		bool started;
+	}
 
 	- (id) init
 	{
 		self = [super init];
 		if (!self) return nil;
 
-		pref = new Reflex::Application::Ref;
+		application = NULL;
+		started     = false;
 
 		return self;
 	}
 
 	- (void) dealloc
 	{
-		assert(pref && !REF);
-
-		delete pref;
+		assert(!application);
 
 		[super dealloc];
 	}
 
-	- (void) bind: (Reflex::Application*) instance
+	- (void) bind: (Reflex::Application*) app
 	{
-		assert(pref);
-
-		if (instance && instance->self->delegate)
+		if (!app)
 			Reflex::argument_error(__FILE__, __LINE__);
 
-		if (REF)
+		if (app->self->delegate)
 			Reflex::invalid_state_error(__FILE__, __LINE__);
 
-		REF = instance;
-		if (REF) REF->self->delegate = [self retain];
+		app->self->delegate = [self retain];
+		app->retain();
+
+		application = app;
 	}
 
-	- (void) unbind: (Reflex::Application*) instance
+	- (void) unbind
 	{
-		assert(pref);
+		if (!application) return;
 
-		if (!REF) return;
+		if (application->self->delegate)
+		{
+			[application->self->delegate release];
+			application->self->delegate = nil;
+		}
 
-		if (instance && instance != REF.get())
-			Reflex::invalid_state_error(__FILE__, __LINE__);
+		application->release();
+		application = NULL;
+	}
 
-		if (REF->self->delegate) [REF->self->delegate release];
-		REF->self->delegate = nil;
-		REF.reset();
+	- (BOOL) callOnStart
+	{
+		if (!application || started)
+			return YES;
+
+		Reflex::Event e;
+		application->on_start(&e);
+		started = true;
+
+		if (e.is_blocked()) [self quit];
+		return !e.is_blocked();
 	}
 
 	- (void) quit
 	{
-		assert(pref);
-
-		if (REF)
-			REF->quit();
+		if (application)
+			application->quit();
 		else
 			[NSApp terminate: nil];
 	}
 
 	- (void) showPreference
 	{
-		assert(pref);
+		if (!application) return;
 
-		if (REF)
-		{
-			Reflex::Event e;
-			REF->on_preference(&e);
-		}
+		Reflex::Event e;
+		application->on_preference(&e);
 	}
 
 	- (void) showAbout
 	{
-		assert(pref);
-
-		if (REF)
+		if (application)
 		{
 			Reflex::Event e;
-			REF->on_about(&e);
+			application->on_about(&e);
 		}
 		else
 			[NSApp orderFrontStandardAboutPanel: nil];
@@ -100,26 +106,18 @@
 		[NSApp setActivationPolicy: NSApplicationActivationPolicyRegular];
 		[NSApp activateIgnoringOtherApps: YES];
 
-		if (REF)
-		{
-			Reflex::Event e;
-			REF->on_start(&e);
-			if (e.is_blocked())
-			{
-				[self quit];
-				return;
-			}
-		}
+		if (![self callOnStart])
+			return;
 
 		[self setupMenu];
 	}
 
 	- (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication*) application
 	{
-		if (REF)
+		if (self->application)
 		{
 			Reflex::Event e;
-			REF->on_quit(&e);
+			self->application->on_quit(&e);
 			if (e.is_blocked()) return NSTerminateCancel;
 		}
 
@@ -133,13 +131,12 @@
 
 	- (void) applicationWillTerminate: (NSNotification*) notification
 	{
-		[self unbind: NULL];
+		[self unbind];
 	}
 
 	- (BOOL) setupApplicationMenu: (NSMenu*) parent
 	{
-		assert(pref);
-		if (!REF || !parent) return NO;
+		if (!application || !parent) return NO;
 
 		NSMenu* menu = [[[NSMenu alloc]
 			initWithTitle: @"Application"]
@@ -147,8 +144,8 @@
 		if ([NSApp respondsToSelector: @selector(setAppleMenu:)])
 			[NSApp performSelector: @selector(setAppleMenu:) withObject: menu];
 
-		NSString* name = !REF->self->name.empty() ?
-			[NSString stringWithUTF8String: REF->self->name.c_str()] : @"";
+		NSString* name = !application->self->name.empty() ?
+			[NSString stringWithUTF8String: application->self->name.c_str()] : @"";
 		if ([name length] > 0)
 			name = [@" " stringByAppendingString: name];
 
@@ -261,4 +258,4 @@
 		return YES;
 	}
 
-@end// AppDelegate
+@end// ReflexAppDelegate

data/src/osx/application.h

@@ -0,0 +1,32 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_OSX_APPLICATION_H__
+#define __REFLEX_SRC_OSX_APPLICATION_H__
+
+
+#include <reflex/application.h>
+
+
+@class ReflexAppDelegate;
+
+
+namespace Reflex
+{
+
+
+	struct Application::Data
+	{
+
+		ReflexAppDelegate* delegate;
+
+		String name;
+
+		Data ();
+
+	};// Application::Data
+
+
+}// Reflex
+
+
+#endif//EOH