Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Copying/Dragging text should be setting URL pasteboard data where appropriate. Patch by Stan Shebs. b=386790 r=josh sr=roc

Browse Source
This commit is contained in:
joshmoz@gmail.com 2007-09-24 13:43:01 -07:00
parent e82f3fedb7
commit 47bdbdabb1
4 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widget/src/cocoa/nsChildView.mm
View File

@ -1818,6 +1818,8 @@ NSEvent* gLastDragEvent = nil;
NSURLPboardType,
NSFilesPromisePboardType,
kWildcardPboardType,
kCorePasteboardFlavorType_url,
kCorePasteboardFlavorType_urln,
nil]];
return self;

37
widget/src/cocoa/nsClipboard.mm
View File

@ -46,6 +46,8 @@
#include "nsIImage.h"
#include "nsILocalFile.h"
#include "nsStringStream.h"
#include "nsDragService.h"
#include "nsEscape.h"
// Screenshots use the (undocumented) png pasteboard type.
#define IMAGE_PASTEBOARD_TYPES NSTIFFPboardType, @"Apple PNG pasteboard type", nil
@ -469,7 +471,42 @@ nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
else if (flavorStr.EqualsLiteral(kFilePromiseMime)) {
[pasteboardOutputDict setObject:[NSArray arrayWithObject:@""] forKey:NSFilesPromisePboardType];
}
else if (flavorStr.EqualsLiteral(kURLMime)) {
PRUint32 len = 0;
nsCOMPtr<nsISupports> genericURL;
rv = aTransferable->GetTransferData(flavorStr, getter_AddRefs(genericURL), &len);
nsCOMPtr<nsISupportsString> urlObject(do_QueryInterface(genericURL));
nsAutoString url;
urlObject->GetData(url);
// A newline embedded in the URL means that the form is actually URL + title.
PRInt32 newlinePos = url.FindChar(PRUnichar('\n'));
if (newlinePos >= 0) {
url.Truncate(newlinePos);
nsAutoString urlTitle;
urlObject->GetData(urlTitle);
urlTitle.Mid(urlTitle, newlinePos + 1, len - (newlinePos + 1));
NSString *nativeTitle = [[NSString alloc] initWithCharacters:urlTitle.get() length:urlTitle.Length()];
// be nice to Carbon apps, normalize the receiver's contents using Form C.
[pasteboardOutputDict setObject:[nativeTitle precomposedStringWithCanonicalMapping] forKey:kCorePasteboardFlavorType_urln];
[nativeTitle release];
}
// The Finder doesn't like getting random binary data aka
// Unicode, so change it into an escaped URL containing only
// ASCII.
nsCAutoString utf8Data = NS_ConvertUTF16toUTF8(url.get(), url.Length());
nsCAutoString escData;
NS_EscapeURL(utf8Data.get(), utf8Data.Length(), esc_OnlyNonASCII|esc_AlwaysCopy, escData);
// printf("Escaped url is %s, length %d\n", escData.get(), escData.Length());
NSString *nativeURL = [NSString stringWithUTF8String:escData.get()];
[pasteboardOutputDict setObject:nativeURL forKey:kCorePasteboardFlavorType_url];
}
// If it wasn't a type that we recognize as exportable we don't put it on the system
// clipboard. We'll just access it from our cached transferable when we need it.
}

2
widget/src/cocoa/nsDragService.h
View File

@ -44,6 +44,8 @@
#include <Cocoa/Cocoa.h>
extern NSString* const kWildcardPboardType;
extern NSString* const kCorePasteboardFlavorType_url;
extern NSString* const kCorePasteboardFlavorType_urln;
class nsDragService : public nsBaseDragService
{

6
widget/src/cocoa/nsDragService.mm
View File

@ -83,6 +83,8 @@ extern NSEvent* gLastDragEvent;
nsISupportsArray *gDraggedTransferables = nsnull;
NSString* const kWildcardPboardType = @"MozillaWildcard";
NSString* const kCorePasteboardFlavorType_url = @"CorePasteboardFlavorType 0x75726C20"; // 'url ' url
NSString* const kCorePasteboardFlavorType_urln = @"CorePasteboardFlavorType 0x75726C6E"; // 'urln' title
nsDragService::nsDragService()
{
@ -131,7 +133,9 @@ static nsresult SetUpDragClipboard(nsISupportsArray* aTransferableArray)
for (unsigned int i = 0; i < typeCount; i++) {
NSString* currentKey = [types objectAtIndex:i];
id currentValue = [pasteboardOutputDict valueForKey:currentKey];
if (currentKey == NSStringPboardType) {
if (currentKey == NSStringPboardType ||
currentKey == kCorePasteboardFlavorType_url ||
currentKey == kCorePasteboardFlavorType_urln) {
[dragPBoard setString:currentValue forType:currentKey];
}
else if (currentKey == NSTIFFPboardType) {