patch files

source/Irrlicht/MacOSX/AppDelegate.h

-// Copyright (C) 2005-2006 Etienne Petitjean
-// Copyright (C) 2007-2012 Christian Stehno
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in Irrlicht.h
-
-#include "IrrCompileConfig.h"
-
-#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
-
-#import <Cocoa/Cocoa.h>
-#import "CIrrDeviceMacOSX.h"
-
-@interface AppDelegate : NSObject
-{
-	BOOL			_quit;
-	irr::CIrrDeviceMacOSX	*_device;
-}
-
-- (id)initWithDevice:(irr::CIrrDeviceMacOSX *)device;
-- (BOOL)isQuit;
-
-@end
-
-#endif // _IRR_COMPILE_WITH_OSX_DEVICE_
+// Copyright (C) 2005-2006 Etienne Petitjean
+// Copyright (C) 2007-2012 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "IrrCompileConfig.h"
+
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
+
+#import <Cocoa/Cocoa.h>
+#import "CIrrDeviceMacOSX.h"
+
+@interface AppDelegate : NSTextView <NSApplicationDelegate>
+{
+	BOOL			_quit;
+	irr::CIrrDeviceMacOSX	*_device;
+}
+
+- (id)initWithDevice:(irr::CIrrDeviceMacOSX *)device;
+- (BOOL)isQuit;
+
+@end
+
+#endif // _IRR_COMPILE_WITH_OSX_DEVICE_

source/Irrlicht/MacOSX/AppDelegate.mm

-// Copyright (C) 2005-2006 Etienne Petitjean
-// Copyright (C) 2007-2012 Christian Stehno
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in Irrlicht.h
-
-#import "AppDelegate.h"
-
-#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
-
-@implementation AppDelegate
-
-- (id)initWithDevice:(irr::CIrrDeviceMacOSX *)device
-{
-	self = [super init];
-	if (self) _device = device;
-	return (self);
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-	_quit = FALSE;
-}
-
-- (void)orderFrontStandardAboutPanel:(id)sender
-{
-	[NSApp orderFrontStandardAboutPanel:sender];
-}
-
-- (void)unhideAllApplications:(id)sender
-{
-	[NSApp unhideAllApplications:sender];
-}
-
-- (void)hide:(id)sender
-{
-	[NSApp hide:sender];
-}
-
-- (void)hideOtherApplications:(id)sender
-{
-	[NSApp hideOtherApplications:sender];
-}
-
-- (void)terminate:(id)sender
-{
-	_quit = TRUE;
-}
-
-- (void)windowWillClose:(id)sender
-{
-	_quit = TRUE;
-}
-
-- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize
-{
-	if (_device->isResizable())
-		return proposedFrameSize;
-	else
-		return [window frame].size;
-}
-
-- (void)windowDidResize:(NSNotification *)aNotification
-{
-	NSWindow	*window;
-	NSRect		frame;
-
-	window = [aNotification object];
-	frame = [window frame];
-	_device->setResize((int)frame.size.width,(int)frame.size.height);
-}
-
-- (BOOL)isQuit
-{
-	return (_quit);
-}
-
-@end
-
-#endif // _IRR_COMPILE_WITH_OSX_DEVICE_
+// Copyright (C) 2005-2006 Etienne Petitjean
+// Copyright (C) 2007-2012 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#import "AppDelegate.h"
+
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
+
+@implementation AppDelegate
+
+- (id)initWithDevice:(irr::CIrrDeviceMacOSX *)device
+{
+	self = [super init];
+	if (self) _device = device;
+	return (self);
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+	_quit = FALSE;
+}
+
+- (void)orderFrontStandardAboutPanel:(id)sender
+{
+	[NSApp orderFrontStandardAboutPanel:sender];
+}
+
+- (void)unhideAllApplications:(id)sender
+{
+	[NSApp unhideAllApplications:sender];
+}
+
+- (void)hide:(id)sender
+{
+	[NSApp hide:sender];
+}
+
+- (void)hideOtherApplications:(id)sender
+{
+	[NSApp hideOtherApplications:sender];
+}
+
+- (void)terminate:(id)sender
+{
+	_quit = TRUE;
+}
+
+- (void)windowWillClose:(id)sender
+{
+	_quit = TRUE;
+}
+
+- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize
+{
+	if (_device->isResizable())
+		return proposedFrameSize;
+	else
+		return [window frame].size;
+}
+
+- (void)windowDidResize:(NSNotification *)aNotification
+{
+	NSWindow	*window;
+	NSRect		frame;
+
+	window = [aNotification object];
+	frame = [window frame];
+	_device->setResize((int)frame.size.width,(int)frame.size.height);
+}
+
+- (BOOL)isQuit
+{
+	return (_quit);
+}
+
+
+- (void)keyDown:(NSEvent *)event
+{
+	[self interpretKeyEvents:@[event]];
+}
+
+- (void)insertText:(id)string
+{
+	[self setString: @""];
+	if ([string isKindOfClass:[NSAttributedString class]])
+	{
+		_device->handleInputEvent([[string string] UTF8String]);
+	}
+	else
+	{
+		_device->handleInputEvent([string UTF8String]);
+	}
+}
+
+- (void)doCommandBySelector:(SEL)selector
+{
+	_device->processKeyEvent();
+}
+
+@end
+
+#endif // _IRR_COMPILE_WITH_OSX_DEVICE_

source/Irrlicht/MacOSX/OSXClipboard.mm

-// Copyright (C) 2005-2006 Etienne Petitjean
-// Copyright (C) 2007-2012 Christian Stehno
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in Irrlicht.h
-
-#include "OSXClipboard.h"
-#import <Cocoa/Cocoa.h>
-
-void OSXCopyToClipboard(const char *text)
-{
-	NSString *str;
-	NSPasteboard *board;
-
-	if ((text != NULL) && (strlen(text) > 0))
-	{
-		str = [NSString stringWithCString:text encoding:NSWindowsCP1252StringEncoding];
-		board = [NSPasteboard generalPasteboard];
-		[board declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:NSApp];
-		[board setString:str forType:NSStringPboardType];
-	}
-}
-
-char* OSXCopyFromClipboard()
-{
-	NSString* str;
-	NSPasteboard* board;
-	char* result;
-
-	result = NULL;
-	board = [NSPasteboard generalPasteboard];
-	str = [board stringForType:NSStringPboardType];
-	if (str != nil)
-		result = (char*)[str cStringUsingEncoding:NSWindowsCP1252StringEncoding];
-	return (result);
-}
-
+// Copyright (C) 2005-2006 Etienne Petitjean
+// Copyright (C) 2007-2012 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "OSXClipboard.h"
+#import <Cocoa/Cocoa.h>
+
+void OSXCopyToClipboard(const char *text)
+{
+	NSString *str;
+	NSPasteboard *board;
+
+	if ((text != NULL) && (strlen(text) > 0))
+	{
+		str = [NSString stringWithUTF8String:text];
+		board = [NSPasteboard generalPasteboard];
+		[board declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:NSApp];
+		[board setString:str forType:NSStringPboardType];
+	}
+}
+
+char* OSXCopyFromClipboard()
+{
+	NSString* str;
+	NSPasteboard* board;
+	char* result;
+
+	result = NULL;
+	board = [NSPasteboard generalPasteboard];
+	str = [board stringForType:NSStringPboardType];
+	if (str != nil)
+		result = (char*)[str UTF8String];
+	return (result);
+}
+