Fixed: #1359 Applied patch from GelluleX adding cut/paste functionality to Ryzom for OSX.

This commit is contained in:
sfb 2011-12-07 07:20:05 -06:00
parent 5cf3e1f4d7
commit 5106a12702

View file

@ -149,14 +149,28 @@ static NLMISC::TKey virtualKeycodeToNelKey(unsigned short keycode)
bool CCocoaEventEmitter::pasteTextFromClipboard(ucstring &text) bool CCocoaEventEmitter::pasteTextFromClipboard(ucstring &text)
{ {
#warning "OpenGL Driver: Missing Mac Implementation for pasteTextFromClipboard" NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
NSArray *classArray = [NSArray arrayWithObject:[NSString class]];
NSDictionary *options = [NSDictionary dictionary];
BOOL ok = [pasteboard canReadObjectForClasses:classArray options:options];
if (ok)
{
NSArray *objectsToPaste = [pasteboard readObjectsForClasses:classArray options:options];
NSString *nstext = [objectsToPaste objectAtIndex:0];
text.fromUtf8([nstext UTF8String]);
return true;
}
return false; return false;
} }
bool CCocoaEventEmitter::copyTextToClipboard(const ucstring &text) bool CCocoaEventEmitter::copyTextToClipboard(const ucstring &text)
{ {
#warning "OpenGL Driver: Missing Mac Implementation for copyTextToClipboard" NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
return false; [pasteboard clearContents];
NSArray *copiedObjects = [NSArray arrayWithObject:[NSString stringWithUTF8String:text.toUtf8().c_str()]];
[pasteboard writeObjects:copiedObjects];
return true;
} }
/// convert modifier key state to nel internal modifier key state /// convert modifier key state to nel internal modifier key state