reflexion 0.1.6 → 0.1.7

data/src/{cocoa/cocoaapplication.mm → osx/app_delegate.mm}

@@ -1,24 +1,24 @@
 // -*- objc -*-
-#import "cocoaapplication.h"
+#import "app_delegate.h"
 
 
 #include <assert.h>
 #import <Cocoa/Cocoa.h>
-#include <reflex/reflex.h>
-#include "applicationdata.h"
+#include "reflex/event.h"
+#include "reflex/exception.h"
+#include "application_data.h"
 
 
-@implementation CocoaApplication
+#define REF (*pref)
+
+
+@implementation AppDelegate
 
 	- (id) init
 	{
 		self = [super init];
 		if (!self) return nil;
 
-		[self setDelegate: self];
-		[self setActivationPolicy: NSApplicationActivationPolicyRegular];
-		[self activateIgnoringOtherApps: YES];
-
 		pref = new Reflex::Application::Ref;
 
 		return self;
@@ -26,87 +26,129 @@
 
 	- (void) dealloc
 	{
-		[self unbind];
+		assert(pref && !REF);
+
 		delete pref;
 
 		[super dealloc];
 	}
 
-	- (BOOL) bind: (Reflex::Application*) instance
+	- (void) bind: (Reflex::Application*) instance
 	{
-		if (instance && instance->self->cocoa)
-			return NO;
+		assert(pref);
 
-		[self unbind];
+		if (instance && instance->self->delegate)
+			Reflex::argument_error(__FILE__, __LINE__);
 
-		assert(pref);
-		Reflex::Application::Ref& ref = *pref;
+		if (REF)
+			Reflex::invalid_state_error(__FILE__, __LINE__);
 
-		ref = instance;
-		if (ref) ref->self->cocoa = [self retain];
-		return YES;
+		REF = instance;
+		if (REF) REF->self->delegate = [self retain];
 	}
 
-	- (void) unbind
+	- (void) unbind: (Reflex::Application*) instance
 	{
 		assert(pref);
-		Reflex::Application::Ref& ref = *pref;
-		if (!ref) return;
 
-		if (ref->self->cocoa) [ref->self->cocoa release];
-		ref->self->cocoa = nil;
-		ref.reset();
+		if (!REF) return;
+
+		if (instance && instance != REF.get())
+			Reflex::invalid_state_error(__FILE__, __LINE__);
+
+		if (REF->self->delegate) [REF->self->delegate release];
+		REF->self->delegate = nil;
+		REF.reset();
 	}
 
 	- (void) quit
 	{
 		assert(pref);
 
-		if (*pref)
-			(*pref)->quit();
+		if (REF)
+			REF->quit();
 		else
-			Reflex::quit();
+			[NSApp terminate: nil];
 	}
 
-	- (void) about
+	- (void) showPreference
 	{
 		assert(pref);
 
-		if (*pref)
-			(*pref)->about();
-		else
-			[self orderFrontStandardAboutPanel: nil];
+		if (REF)
+		{
+			Reflex::Event e;
+			REF->on_preference(&e);
+		}
 	}
 
-	- (BOOL) applicationShouldTerminateAfterLastWindowClosed: (NSApplication*) app
+	- (void) showAbout
 	{
-		return YES;
+		assert(pref);
+
+		if (REF)
+		{
+			Reflex::Event e;
+			REF->on_about(&e);
+		}
+		else
+			[NSApp orderFrontStandardAboutPanel: nil];
 	}
 
 	- (void) applicationDidFinishLaunching: (NSNotification*) notification
 	{
+		[NSApp setActivationPolicy: NSApplicationActivationPolicyRegular];
+		[NSApp activateIgnoringOtherApps: YES];
+
+		if (REF)
+		{
+			Reflex::Event e;
+			REF->on_start(&e);
+			if (e.is_blocked())
+			{
+				[self quit];
+				return;
+			}
+		}
+
 		[self setupMenu];
 	}
 
+	- (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication*) application
+	{
+		if (REF)
+		{
+			Reflex::Event e;
+			REF->on_quit(&e);
+			if (e.is_blocked()) return NSTerminateCancel;
+		}
+
+		return NSTerminateNow;
+	}
+
+	- (BOOL) applicationShouldTerminateAfterLastWindowClosed: (NSApplication*) application
+	{
+		return YES;
+	}
+
 	- (void) applicationWillTerminate: (NSNotification*) notification
 	{
-		[self unbind];
+		[self unbind: NULL];
 	}
 
 	- (BOOL) setupApplicationMenu: (NSMenu*) parent
 	{
 		assert(pref);
-
-		if (!parent) return NO;
+		if (!REF || !parent) return NO;
 
 		NSMenu* menu = [[[NSMenu alloc]
 			initWithTitle: @"Application"]
 			autorelease];
-		if ([self respondsToSelector: @selector(setAppleMenu:)])
-			[self performSelector: @selector(setAppleMenu:) withObject: menu];
+		if ([NSApp respondsToSelector: @selector(setAppleMenu:)])
+			[NSApp performSelector: @selector(setAppleMenu:) withObject: menu];
 
-		NSString* name = !(*pref)->self->name.empty() ?
-			[NSString stringWithUTF8String: (*pref)->self->name.c_str()] : @"";
+		NSString* name = !REF->self->name.empty() ?
+			[NSString stringWithUTF8String: REF->self->name.c_str()] : @"";
 		if ([name length] > 0)
 			name = [@" " stringByAppendingString: name];
 
@@ -115,14 +157,14 @@
 
 		[menu
 			addItemWithTitle: [@"About" stringByAppendingString: name]
-			action: @selector(about)
+			action: @selector(showAbout)
 			keyEquivalent: @""];
 
 		[menu addItem: [NSMenuItem separatorItem]];
 
 		[menu
 			addItemWithTitle: @"Preferences"
-			action: @selector(preference:)
+			action: @selector(showPreference)
 			keyEquivalent: @","];
 
 		[menu addItem: [NSMenuItem separatorItem]];
@@ -133,7 +175,7 @@
 			keyEquivalent: @""];
 		submenu = [[[NSMenu alloc] initWithTitle: @"Services"] autorelease];
 		[item setSubmenu: submenu];
-		[self setServicesMenu: submenu];
+		[NSApp setServicesMenu: submenu];
 
 		[menu addItem: [NSMenuItem separatorItem]];
 
@@ -196,14 +238,14 @@
 			[parent addItemWithTitle: @"Window" action: nil keyEquivalent: @""];
 		[parent setSubmenu: menu forItem: item];
 
-		[self setWindowsMenu: menu];
+		[NSApp setWindowsMenu: menu];
 
 		return YES;
 	}
 
 	- (BOOL) setupMenu
 	{
-		if ([self mainMenu]) return NO;
+		if ([NSApp mainMenu]) return NO;
 
 		NSMenu* menu = [[[NSMenu alloc] initWithTitle: @"MainMenu"] autorelease];
 
@@ -214,9 +256,9 @@
 			return NO;
 		}
 
-		[self setMainMenu: menu];
+		[NSApp setMainMenu: menu];
 
 		return YES;
 	}
 
-@end// CocoaApplication
+@end// AppDelegate

data/src/osx/application.mm

@@ -0,0 +1,132 @@
+// -*- objc -*-
+#include "reflex/application.h"
+
+
+#include <assert.h>
+#import <AppKit/NSApplication.h>
+#include "reflex/exception.h"
+#include "application_data.h"
+#import "app_delegate.h"
+
+
+namespace Reflex
+{
+
+
+	bool initialized ();
+
+
+	static Application* instance = NULL;
+
+
+	Application*
+	app ()
+	{
+		return instance;
+	}
+
+
+	Application::Application ()
+	{
+		if (!initialized() || !NSApp)
+			reflex_error(__FILE__, __LINE__, "not initialized.");
+
+		if (instance)
+			reflex_error(__FILE__, __LINE__, "multiple application instances.");
+
+		AppDelegate* delegate = (AppDelegate*) [NSApp delegate];
+		if (!delegate)
+			invalid_state_error(__FILE__, __LINE__);
+
+		[delegate bind: this];
+
+		instance = this;
+	}
+
+	Application::~Application ()
+	{
+		instance = NULL;
+	}
+
+	void
+	Application::start ()
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		[NSApp run];
+	}
+
+	void
+	Application::quit ()
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		[NSApp terminate: nil];
+	}
+
+	void
+	Application::set_name (const char* name)
+	{
+		if (!name)
+			argument_error(__FILE__, __LINE__);
+
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		self->name = name;
+	}
+
+	const char*
+	Application::name () const
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		return self->name.c_str();
+	}
+
+	void
+	Application::on_start (Event* e)
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+	}
+
+	void
+	Application::on_quit (Event* e)
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+	}
+
+	void
+	Application::on_preference (Event* e)
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+	}
+
+	void
+	Application::on_about (Event* e)
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		[NSApp orderFrontStandardAboutPanel: nil];
+	}
+
+	Application::operator bool () const
+	{
+		return self && *self;
+	}
+
+	bool
+	Application::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Reflex

data/src/osx/application_data.h

@@ -0,0 +1,45 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_OSX_APPLICATION_DATA_H__
+#define __REFLEX_OSX_APPLICATION_DATA_H__
+
+
+#include <reflex/application.h>
+
+
+@class AppDelegate;
+
+
+namespace Reflex
+{
+
+
+	struct Application::Data
+	{
+
+		AppDelegate* delegate;
+
+		String name;
+
+		Data ()
+		:	delegate(nil)
+		{
+		}
+
+		operator bool () const
+		{
+			return delegate;
+		}
+
+		bool operator ! () const
+		{
+			return !operator bool();
+		}
+
+	};// Application::Data
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/osx/event.h

@@ -0,0 +1,42 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_OSX_EVENT_H__
+#define __REFLEX_OSX_EVENT_H__
+
+
+#import <AppKit/NSEvent.h>
+#include <reflex/event.h>
+
+
+namespace Reflex
+{
+
+
+	struct NativeKeyEvent : public KeyEvent
+	{
+
+		NativeKeyEvent (NSEvent* event, Type type);
+
+	};// NativeKeyEvent
+
+
+	struct NativePointerEvent : public PointerEvent
+	{
+
+		NativePointerEvent (NSEvent* event, NSView* view, Type type);
+
+	};// NativePointerEvent
+
+
+	struct NativeWheelEvent : public WheelEvent
+	{
+
+		NativeWheelEvent (NSEvent* event, NSView* view);
+
+	};// NativeWheelEvent
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/osx/event.mm

@@ -0,0 +1,112 @@
+// -*- c++ -*-
+#include "event.h"
+
+
+#include <assert.h>
+#import <Cocoa/Cocoa.h>
+
+
+namespace Reflex
+{
+
+
+	static const char*
+	get_chars (NSEvent* e)
+	{
+		NSString* chars = [e characters];//charactersIgnoringModifiers];
+		return [chars UTF8String];
+	}
+
+	static uint
+	get_current_pointer_type ()
+	{
+		NSUInteger buttons = [NSEvent pressedMouseButtons];
+		uint ret = 0;
+		if (buttons &  (1 << 0)) ret |= POINTER_MOUSE_LEFT;
+		if (buttons &  (1 << 1)) ret |= POINTER_MOUSE_RIGHT;
+		if (buttons >= (1 << 2)) ret |= POINTER_MOUSE_MIDDLE;
+		return ret;
+	}
+
+	static uint
+	get_pointer_type (NSEvent* e)
+	{
+		switch ([e type])
+		{
+			case NSLeftMouseDown:
+			case NSLeftMouseUp:
+			case NSLeftMouseDragged:
+				return POINTER_MOUSE_LEFT;
+
+			case NSRightMouseDown:
+			case NSRightMouseUp:
+			case NSRightMouseDragged:
+				return POINTER_MOUSE_RIGHT;
+
+			case NSOtherMouseDown:
+			case NSOtherMouseUp:
+			case NSOtherMouseDragged:
+				return POINTER_MOUSE_MIDDLE;
+
+			case NSMouseMoved:
+				return get_current_pointer_type();
+		}
+		return 0;
+	}
+
+	static uint
+	get_modifiers (const NSEvent* e)
+	{
+		NSUInteger flags = [e modifierFlags];
+		return
+			(flags & NSAlphaShiftKeyMask) ? MOD_CAPS     : 0 |
+			(flags & NSShiftKeyMask)      ? MOD_SHIFT    : 0 |
+			(flags & NSControlKeyMask)    ? MOD_CONTROL  : 0 |
+			(flags & NSAlternateKeyMask)  ? MOD_ALT      : 0 |
+			(flags & NSCommandKeyMask)    ? MOD_COMMAND  : 0 |
+			(flags & NSNumericPadKeyMask) ? MOD_NUMPAD   : 0 |
+			(flags & NSHelpKeyMask)       ? MOD_HELP     : 0 |
+			(flags & NSFunctionKeyMask)   ? MOD_FUNCTION : 0;
+	}
+
+	static NSPoint
+	correct_point (NSView* view, const NSPoint& point)
+	{
+		assert(view);
+		NSPoint p = [view convertPoint: point fromView: nil];
+		p.y = [view bounds].size.height - p.y;
+		return p;
+	}
+
+
+	NativeKeyEvent::NativeKeyEvent (NSEvent* e, Type type)
+	:	KeyEvent(
+			type, get_chars(e), [e keyCode], get_modifiers(e), [e isARepeat] ? 1 : 0)
+	{
+	}
+
+
+	NativePointerEvent::NativePointerEvent (NSEvent* e, NSView* view, Type type)
+	:	PointerEvent(
+			type, get_pointer_type(e), (coord) 0, (coord) 0,
+			get_modifiers(e), (uint) [e clickCount],
+			[e type] == NSLeftMouseDragged || [e type] == NSRightMouseDragged || [e type] == NSOtherMouseDragged)
+	{
+		NSPoint p = correct_point(view, [e locationInWindow]);
+		x = p.x;
+		y = p.y;
+	}
+
+
+	NativeWheelEvent::NativeWheelEvent (NSEvent* e, NSView* view)
+	:	WheelEvent([e deltaX], [e deltaY], [e deltaZ])
+	{
+		NSPoint p = correct_point(view, [e locationInWindow]);
+		x         = p.x;
+		y         = p.y;
+		z         = 0;
+		modifiers = get_modifiers(e);
+	}
+
+
+};// Reflex

data/src/osx/native_window.h

@@ -0,0 +1,26 @@
+// -*- objc -*-
+#import <AppKit/NSWindow.h>
+#include <reflex/window.h>
+
+
+@class OpenGLView;
+
+
+@interface NativeWindow : NSWindow <NSWindowDelegate>
+
+	{
+		@private
+			Reflex::Window::Ref* pref;
+			OpenGLView* view;
+			NSTimer* timer;
+	}
+
+	- (void) bind:   (Reflex::Window*) instance;
+
+	- (void) unbind: (Reflex::Window*) instance;
+
+	- (void) draw;
+
+	+ (NSRect) frameRectForContentRect: (NSRect) contentRect;
+
+@end// NativeWindow