reflexion 0.1.3 → 0.1.4

data/src/cocoa/application.mm

@@ -2,6 +2,7 @@
 #include "reflex/application.h"
 
 
+#include <assert.h>
 #import <Cocoa/Cocoa.h>
 #include <reflex/exception.h>
 #include "applicationdata.h"
@@ -24,25 +25,14 @@ namespace Reflex
 
 	Application::Application ()
 	{
-		if (instance) error("multiple application instance.");
-
+		if (instance) reflex_error("multiple application instance.");
 		instance = this;
 
-		self->this_ = this;
-		self->self_ = NSApp ? [NSApp retain] : nil;
-		if (self->self_)
-			[self->self_ setApplicationData: self];
+		if (NSApp) [NSApp bind: this];
 	}
 
 	Application::~Application ()
 	{
-		if (self->self_)
-		{
-			[self->self_ release];
-			self->self_ = nil;
-		}
-		self->this_ = NULL;
-
 		instance = NULL;
 	}
 
@@ -50,7 +40,8 @@ namespace Reflex
 	Application::run ()
 	{
 		if (!*this) return false;
-		[self->self_ run];
+
+		[self->cocoa run];
 		return true;
 	}
 
@@ -58,7 +49,8 @@ namespace Reflex
 	Application::quit ()
 	{
 		if (!*this) return false;
-		[self->self_ terminate: nil];
+
+		[self->cocoa terminate: nil];
 		return true;
 	}
 
@@ -72,15 +64,8 @@ namespace Reflex
 	Application::about ()
 	{
 		if (!*this) return false;
-		[self->self_ orderFrontStandardAboutPanel: nil];
-		return true;
-	}
 
-	bool
-	Application::get_name (String* name) const
-	{
-		if (!*this || !name) return false;
-		*name = self->name;
+		[self->cocoa orderFrontStandardAboutPanel: nil];
 		return true;
 	}
 
@@ -88,10 +73,19 @@ namespace Reflex
 	Application::set_name (const char* name)
 	{
 		if (!*this || !name) return false;
+
 		self->name = name;
 		return true;
 	}
 
+	const char*
+	Application::name () const
+	{
+		if (!*this) return NULL;
+
+		return self->name.c_str();
+	}
+
 	Application::operator bool () const
 	{
 		return self && *self;

data/src/cocoa/applicationdata.h

@@ -4,7 +4,6 @@
 #define __REFLEX_COCOA_APPLICATIONDATA_H__
 
 
-#include <boost/shared_ptr.hpp>
 #include <reflex/application.h>
 
 
@@ -18,20 +17,18 @@ namespace Reflex
 	struct Application::Data
 	{
 
-		Application* this_;
-
-		CocoaApplication* self_;
+		CocoaApplication* cocoa;
 
 		String name;
 
 		Data ()
-		:	this_(NULL), self_(nil)
+		:	cocoa(nil)
 		{
 		}
 
 		operator bool () const
 		{
-			return this_ && self_;
+			return cocoa;
 		}
 
 		bool operator ! () const
@@ -42,9 +39,6 @@ namespace Reflex
 	};// Application::Data
 
 
-	typedef boost::shared_ptr<Reflex::Application::Data> ApplicationData;
-
-
 }// Reflex
 
 

data/src/cocoa/cocoaapplication.h

@@ -1,19 +1,21 @@
 // -*- objc -*-
 #import <AppKit/NSApplication.h>
-#include "applicationdata.h"
+#include "reflex/application.h"
 
 
 @interface CocoaApplication : NSApplication <NSApplicationDelegate>
 
 	{
 		@private
-			Reflex::ApplicationData data;
+			Reflex::Application::Ref* pref;
 	}
 
+	- (BOOL) bind: (Reflex::Application*) instance;
+
+	- (void) unbind;
+
 	- (void) about;
 
 	- (void) quit;
 
-	- (BOOL) setApplicationData: (Reflex::ApplicationData) data;
-
 @end// CocoaApplication

data/src/cocoa/cocoaapplication.mm

@@ -2,8 +2,10 @@
 #import "cocoaapplication.h"
 
 
+#include <assert.h>
 #import <Cocoa/Cocoa.h>
 #include <reflex/reflex.h>
+#include "applicationdata.h"
 
 
 @implementation CocoaApplication
@@ -17,34 +19,84 @@
 		[self setActivationPolicy: NSApplicationActivationPolicyRegular];
 		[self activateIgnoringOtherApps: YES];
 
+		pref = new Reflex::Application::Ref;
+
 		return self;
 	}
 
-	- (BOOL) setApplicationData: (Reflex::ApplicationData) data_
+	- (void) dealloc
+	{
+		[self unbind];
+		delete pref;
+
+		[super dealloc];
+	}
+
+	- (BOOL) bind: (Reflex::Application*) instance
 	{
-		if (data || !data_) return NO;
-		data = data_;
+		if (instance && instance->self->cocoa)
+			return NO;
+
+		[self unbind];
+
+		assert(pref);
+		Reflex::Application::Ref& ref = *pref;
+
+		ref = instance;
+		if (ref) ref->self->cocoa = [self retain];
 		return YES;
 	}
 
+	- (void) unbind
+	{
+		assert(pref);
+		Reflex::Application::Ref& ref = *pref;
+		if (!ref) return;
+
+		if (ref->self->cocoa) [ref->self->cocoa release];
+		ref->self->cocoa = nil;
+		ref.reset();
+	}
+
 	- (void) quit
 	{
-		if (data && *data)
-			data->this_->quit();
+		assert(pref);
+
+		if (*pref)
+			(*pref)->quit();
 		else
 			Reflex::quit();
 	}
 
 	- (void) about
 	{
-		if (data && *data)
-			data->this_->about();
+		assert(pref);
+
+		if (*pref)
+			(*pref)->about();
 		else
 			[self orderFrontStandardAboutPanel: nil];
 	}
 
+	- (BOOL) applicationShouldTerminateAfterLastWindowClosed: (NSApplication*) app
+	{
+		return YES;
+	}
+
+	- (void) applicationDidFinishLaunching: (NSNotification*) notification
+	{
+		[self setupMenu];
+	}
+
+	- (void) applicationWillTerminate: (NSNotification*) notification
+	{
+		[self unbind];
+	}
+
 	- (BOOL) setupApplicationMenu: (NSMenu*) parent
 	{
+		assert(pref);
+
 		if (!parent) return NO;
 
 		NSMenu* menu = [[[NSMenu alloc]
@@ -53,8 +105,8 @@
 		if ([self respondsToSelector: @selector(setAppleMenu:)])
 			[self performSelector: @selector(setAppleMenu:) withObject: menu];
 
-		NSString* name = !data->name.empty() ?
-			[NSString stringWithUTF8String: data->name.c_str()] : @"";
+		NSString* name = !(*pref)->self->name.empty() ?
+			[NSString stringWithUTF8String: (*pref)->self->name.c_str()] : @"";
 		if ([name length] > 0)
 			name = [@" " stringByAppendingString: name];
 
@@ -167,14 +219,4 @@
 		return YES;
 	}
 
-	- (BOOL) applicationShouldTerminateAfterLastWindowClosed: (NSApplication*) app
-	{
-		return YES;
-	}
-
-	- (void) applicationDidFinishLaunching: (NSNotification*) notification
-	{
-		[self setupMenu];
-	}
-
 @end// CocoaApplication

data/src/cocoa/cocoawindow.h

@@ -1,6 +1,6 @@
 // -*- objc -*-
 #import <AppKit/NSWindow.h>
-#include "windowdata.h"
+#include "reflex/window.h"
 
 
 @class OpenGLView;
@@ -10,12 +10,14 @@
 
 	{
 		@private
-			Reflex::WindowData data;
+			Reflex::Window::Ref* pref;
 			OpenGLView* view;
 			NSTimer* timer;
 	}
 
-	- (id) initWithWindowData: (Reflex::WindowData) data;
+	- (BOOL) bind: (Reflex::Window*) instance;
+
+	- (void) unbind;
 
 	- (void) setupContentView;
 
@@ -27,8 +29,6 @@
 
 	- (void) draw;
 
-	- (void) redraw;
-
 	- (void) keyDown: (NSEvent*) event;
 
 	- (void) keyUp: (NSEvent*) event;
@@ -41,4 +41,6 @@
 
 	- (void) mouseDragged: (NSEvent*) event;
 
+	+ (NSRect) frameRectForContentRect: (NSRect) contentRect;
+
 @end// CocoaWindow

data/src/cocoa/cocoawindow.mm

@@ -2,32 +2,35 @@
 #import "cocoawindow.h"
 
 
+#include <assert.h>
 #import <Cocoa/Cocoa.h>
-#import "openglview.h"
-
+#include <rays/bounds.h>
 #include <reflex/window.h>
 #include "defs.h"
+#include "windowdata.h"
+#import "openglview.h"
+
+
+static const NSUInteger WINDOW_STYLE_MASK =
+	NSTitledWindowMask |
+	NSClosableWindowMask |
+	NSMiniaturizableWindowMask |
+	NSResizableWindowMask |
+	0;//NSTexturedBackgroundWindowMask
 
 
 @implementation CocoaWindow
 
-	- (id) initWithWindowData: (Reflex::WindowData) data_
+	- (id) init
 	{
-		NSRect frame = NSMakeRect(0, 0, 0, 0);
-
 		self = [super
 			initWithContentRect: NSMakeRect(0, 0, 0, 0)
-			styleMask:
-				NSTitledWindowMask |
-				NSClosableWindowMask |
-				NSMiniaturizableWindowMask |
-				NSResizableWindowMask |
-				0//NSTexturedBackgroundWindowMask
+			styleMask: WINDOW_STYLE_MASK
 			backing: NSBackingStoreBuffered
 			defer: NO];
 		if (!self) return nil;
 
-		data  = data_;
+		pref  = new Reflex::Window::Ref;
 		view  = nil;
 		timer = nil;
 
@@ -43,11 +46,41 @@
 	- (void) dealloc
 	{
 		[self stopTimer];
-		[view release];
+
+		if (view) [view release];
+
+		[self unbind];
+		delete pref;
 
 		[super dealloc];
 	}
 
+	- (BOOL) bind: (Reflex::Window*) instance
+	{
+		if (instance && instance->self->cocoa)
+			return NO;
+
+		[self unbind];
+
+		assert(pref);
+		Reflex::Window::Ref& ref = *pref;
+
+		ref = instance;
+		if (ref) ref->self->cocoa = [self retain];
+		return YES;
+	}
+
+	- (void) unbind
+	{
+		assert(pref);
+		Reflex::Window::Ref& ref = *pref;
+		if (!ref) return;
+
+		if (ref->self->cocoa) [ref->self->cocoa release];
+		ref->self->cocoa = nil;
+		ref.reset();
+	}
+
 	- (void) setupContentView
 	{
 		NSRect rect = [self contentRectForFrameRect: [self frame]];
@@ -78,94 +111,120 @@
 
 	- (void) stopTimer
 	{
-		if (timer)
-		{
-			if ([timer isValid]) [timer invalidate];
-			[timer release];
-			timer = nil;
-		}
+		if (!timer) return;
+
+		[timer invalidate];
+		timer = nil;
 	}
 
 	- (void) update: (NSTimer*) t
 	{
-		if (!data || !*data) return;
-		data->this_->update();
+		assert(pref);
+		if (!*pref) return;
+
+		(*pref)->update(1);
+
+		if ((*pref)->self->redraw)
+		{
+			[self display];
+			(*pref)->self->redraw = false;
+		}
 	}
 
 	- (void) draw
 	{
-		if (!data || !*data) return;
-		data->this_->draw();
-	}
+		assert(pref);
+		if (!*pref) return;
 
-	- (void) redraw
-	{
-		[self display];
+		(*pref)->draw();
 	}
 
 	- (BOOL) windowShouldClose: (id) sender
 	{
-		if (!data || !*data) return YES;
-		data->this_->close();
+		assert(pref);
+		if (!*pref) return YES;
+
+		(*pref)->close();
 		return NO;
 	}
 
 	- (void) windowWillClose: (NSNotification*) notification
 	{
 		[self stopTimer];
-		data.reset();
+		[self unbind];
 	}
 
 	- (void) windowDidMove: (NSNotification*) notification
 	{
-		if (!data || !*data) return;
-		Reflex::coord x = 0, y = 0;
-		data->this_->get_bounds(&x, &y);
-		data->this_->moved(x, y);
+		assert(pref);
+		if (!*pref) return;
+
+		const Reflex::Bounds& b = (*pref)->bounds();
+		(*pref)->moved(b.x, b.y);
 	}
 
 	- (void) windowDidResize: (NSNotification*) notification
 	{
-		if (!data || !*data) return;
-		Reflex::coord w = 0, h = 0;
-		data->this_->get_bounds(NULL, NULL, &w, &h);
-		data->this_->resized(w, h);
+		assert(pref);
+		if (!*pref) return;
+
+		const Reflex::Bounds& b = (*pref)->bounds();
+		(*pref)->resized(b.width, b.height);
 	}
 
 	- (void) keyDown: (NSEvent*) event
 	{
-		if (!data || !*data) return;
-		data->this_->key_down(Reflex::CocoaKey(event));
+		assert(pref);
+		if (!*pref) return;
+
+		(*pref)->key_down(Reflex::CocoaKey(event));
 	}
 
 	- (void) keyUp: (NSEvent*) event
 	{
-		if (!data || !*data) return;
-		data->this_->key_up(Reflex::CocoaKey(event));
+		assert(pref);
+		if (!*pref) return;
+
+		(*pref)->key_up(Reflex::CocoaKey(event));
 	}
 
 	- (void) mouseDown: (NSEvent*) event
 	{
-		if (!data || !*data) return;
-		data->this_->points_down(Reflex::CocoaPoints(event, view));
+		assert(pref);
+		if (!*pref) return;
+
+		(*pref)->points_down(Reflex::CocoaPoints(event, view));
 	}
 
 	- (void) mouseUp: (NSEvent*) event
 	{
-		if (!data || !*data) return;
-		data->this_->points_up(Reflex::CocoaPoints(event, view));
+		assert(pref);
+		if (!*pref) return;
+
+		(*pref)->points_up(Reflex::CocoaPoints(event, view));
 	}
 
 	- (void) mouseMoved: (NSEvent*) event
 	{
-		if (!data || !*data) return;
-		data->this_->points_moved(Reflex::CocoaPoints(event, view));
+		assert(pref);
+		if (!*pref) return;
+
+		(*pref)->points_moved(Reflex::CocoaPoints(event, view));
 	}
 
 	- (void) mouseDragged: (NSEvent*) event
 	{
-		if (!data || !*data) return;
-		data->this_->points_moved(Reflex::CocoaPoints(event, view));
+		assert(pref);
+		if (!*pref) return;
+
+		(*pref)->points_moved(Reflex::CocoaPoints(event, view));
+	}
+
+	+ (NSRect) frameRectForContentRect: (NSRect) contentRect
+	{
+		return [NSWindow
+			frameRectForContentRect: contentRect
+			styleMask: WINDOW_STYLE_MASK];
 	}
 
 @end// CocoaWindow

data/src/cocoa/defs.mm

@@ -1,3 +1,4 @@
+// -*- c++ -*-
 #include "defs.h"
 
 
@@ -71,13 +72,15 @@ namespace Reflex
 
 	CocoaPoints::CocoaPoints (NSEvent* e, NSView* view)
 	:	Points(
-			get_point_type(e), (coord) 0, (coord) 0, get_modifiers(e), [e clickCount],
+			get_point_type(e), (coord) 0, (coord) 0,
+			get_modifiers(e), (uint) [e clickCount],
 			[e type] == NSLeftMouseDragged || [e type] == NSRightMouseDragged)
 	{
 		NSPoint p = [e locationInWindow];
+		NSRect b = [view bounds];
 		if (view) p = [view convertPoint: p fromView: nil];
 		x = p.x;
-		y = p.y;
+		y = b.size.height - p.y;
 	}