ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac: Synthesize additional bitmap pasteboard types from any that Cocoa can convert. 

Mac apps generally put TIFF on the pasteboard, but Windows programs are
more likely to handle CF_DIB or CF_BITMAP which map to BMP.
This commit is contained in:
Ken Thomases 2013-03-13 16:52:43 -05:00 committed by Alexandre Julliard
parent 6528619494
commit 95d5270a0d
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dlls/winemac.drv/cocoa_clipboard.m
View File

@ -25,6 +25,10 @@
static int owned_change_count = -1; static int owned_change_count = -1;
static NSArray* BitmapOutputTypes;
static NSDictionary* BitmapOutputTypeMap;
static dispatch_once_t BitmapOutputTypesInitOnce;
/*********************************************************************** /***********************************************************************
* macdrv_is_pasteboard_owner * macdrv_is_pasteboard_owner
@ -54,11 +58,43 @@ CFArrayRef macdrv_copy_pasteboard_types(void)
__block CFArrayRef ret = NULL; __block CFArrayRef ret = NULL;
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
dispatch_once(&BitmapOutputTypesInitOnce, ^{
NSArray* bitmapFileTypes = [NSArray arrayWithObjects:
[NSNumber numberWithUnsignedInteger:NSTIFFFileType],
[NSNumber numberWithUnsignedInteger:NSPNGFileType],
[NSNumber numberWithUnsignedInteger:NSBMPFileType],
[NSNumber numberWithUnsignedInteger:NSGIFFileType],
[NSNumber numberWithUnsignedInteger:NSJPEGFileType],
[NSNumber numberWithUnsignedInteger:NSJPEG2000FileType],
nil];
BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png",
@"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg",
@"public.jpeg-2000", nil];
BitmapOutputTypeMap = [[NSDictionary alloc] initWithObjects:bitmapFileTypes
forKeys:BitmapOutputTypes];
});
OnMainThread(^{ OnMainThread(^{
@try @try
{ {
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
NSArray* types = [pb types]; NSArray* types = [pb types];
// If there are any types understood by NSBitmapImageRep, then we
// can offer all of the types that it can output, too. For example,
// if TIFF is on the pasteboard, we can offer PNG, BMP, etc. to the
// Windows program. We'll convert on demand.
if ([types firstObjectCommonWithArray:[NSBitmapImageRep imageTypes]] ||
[types firstObjectCommonWithArray:[NSBitmapImageRep imagePasteboardTypes]])
{
NSMutableArray* newTypes = [BitmapOutputTypes mutableCopy];
[newTypes removeObjectsInArray:types];
types = [types arrayByAddingObjectsFromArray:newTypes];
[newTypes release];
}
ret = (CFArrayRef)[types copy]; ret = (CFArrayRef)[types copy];
} }
@catch (id e) @catch (id e)
@ -89,6 +125,18 @@ CFDataRef macdrv_copy_pasteboard_data(CFStringRef type)
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]])
ret = [[pb dataForType:(NSString*)type] copy]; ret = [[pb dataForType:(NSString*)type] copy];
else
{
NSNumber* bitmapType = [BitmapOutputTypeMap objectForKey:(NSString*)type];
if (bitmapType)
{
NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:pb];
ret = [NSBitmapImageRep representationOfImageRepsInArray:reps
usingType:[bitmapType unsignedIntegerValue]
properties:nil];
ret = [ret copy];
}
}
} }
@catch (id e) @catch (id e)
{ {