Fixed: #1359 Applied patch from GelluleX adding cut/paste functionality to Ryzom for OSX.
This commit is contained in:
parent
979a0b7d86
commit
48a7eb1af2
1 changed files with 17 additions and 3 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue