#endif
-#if wxOSX_USE_COCOA_OR_IPHONE
+#if wxOSX_USE_COCOA
-CGContextRef wxOSXGetContextFromCurrentNSContext()
+CGContextRef wxOSXGetContextFromCurrentContext()
{
CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext]
graphicsPort];
return context;
}
-bool wxOSXLockFocus( WXWidget view)
+bool wxOSXLockFocus( WXWidget view)
{
return [view lockFocusIfCanDraw];
}
-void wxOSXUnlockFocus( WXWidget view)
+void wxOSXUnlockFocus( WXWidget view)
{
[view unlockFocus];
}
#endif
+#if wxOSX_USE_IPHONE
+
+CGContextRef wxOSXGetContextFromCurrentContext()
+{
+ CGContextRef context = UIGraphicsGetCurrentContext();
+ return context;
+}
+
+#endif
+
// ----------------------------------------------------------------------------
// NSObject Utils
// ----------------------------------------------------------------------------
#if wxOSX_USE_COCOA
-WX_NSFont wxFont::CreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)
+WX_NSFont wxFont::OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)
{
- NSFont* nsfont;
+ NSFont* nsfont = nil;
switch( font )
{
case wxOSX_SYSTEM_FONT_NORMAL:
nsfont = [NSFont boldSystemFontOfSize:[NSFont smallSystemFontSize]];
break;
case wxOSX_SYSTEM_FONT_MINI:
- nsfont = [NSFont systemFontOfSize:[NSFont systemFontSize]];
+ nsfont = [NSFont systemFontOfSize:
+ [NSFont systemFontSizeForControlSize:NSMiniControlSize]];
break;
case wxOSX_SYSTEM_FONT_MINI_BOLD:
nsfont = [NSFont boldSystemFontOfSize:
[NSFont systemFontSizeForControlSize:NSMiniControlSize]];
break;
case wxOSX_SYSTEM_FONT_LABELS:
- nsfont = [NSFont labelFontOfSize:
- [NSFont systemFontSizeForControlSize:NSMiniControlSize]];
+ nsfont = [NSFont labelFontOfSize:[NSFont labelFontSize]];
break;
case wxOSX_SYSTEM_FONT_VIEWS:
nsfont = [NSFont controlContentFontOfSize:0];
wxFontStyle fontstyle = wxFONTSTYLE_NORMAL;
wxFontWeight fontweight = wxFONTWEIGHT_NORMAL;
bool underlined = false;
-
+
int size = (int) ([desc pointSize]+0.5);
NSFontSymbolicTraits traits = [desc symbolicTraits];
-
+
if ( traits & NSFontBoldTrait )
fontweight = wxFONTWEIGHT_BOLD ;
else
fontweight = wxFONTWEIGHT_NORMAL ;
if ( traits & NSFontItalicTrait )
fontstyle = wxFONTSTYLE_ITALIC ;
-
+
wxCFStringRef fontname( [desc postscriptName] );
info->Init(size,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
fontname.AsString(), wxFONTENCODING_DEFAULT);
-
+
}
info->m_nsFontDescriptor = desc;
return nsfont;
}
-void wxNativeFontInfo::ValidateNSFontDescriptor()
+void wxNativeFontInfo::OSXValidateNSFontDescriptor()
{
- NSFontDescriptor* desc = [NSFontDescriptor fontDescriptorWithName:wxCFStringRef(m_faceName).AsNSString() size:m_pointSize];
+ NSFontDescriptor* desc = nil;
NSFontSymbolicTraits traits = 0;
+ float weight = 0;
if (m_weight == wxFONTWEIGHT_BOLD)
+ {
traits |= NSFontBoldTrait;
+ weight = 1.0;
+ }
+ else if (m_weight == wxFONTWEIGHT_LIGHT)
+ weight = -1;
+
if (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT)
traits |= NSFontItalicTrait;
- if ( traits != 0 )
- {
- [desc autorelease];
- desc = [desc fontDescriptorWithSymbolicTraits:traits];
- }
+ desc = [NSFontDescriptor fontDescriptorWithFontAttributes:
+ [[NSDictionary alloc] initWithObjectsAndKeys:
+ wxCFStringRef(m_faceName).AsNSString(), NSFontFamilyAttribute,
+ [NSNumber numberWithFloat:m_pointSize], NSFontSizeAttribute,
+ [NSNumber numberWithUnsignedInt:traits], NSFontSymbolicTrait,
+ [NSNumber numberWithFloat:weight],NSFontWeightTrait,
+ nil]];
+
+ wxMacCocoaRetain(desc);
m_nsFontDescriptor = desc;
}
-WX_NSFont wxFont::CreateNSFont(const wxNativeFontInfo* info)
+WX_NSFont wxFont::OSXCreateNSFont(const wxNativeFontInfo* info)
{
NSFont* nsFont;
nsFont = [NSFont fontWithDescriptor:info->m_nsFontDescriptor size:info->m_pointSize];
-
+ wxMacCocoaRetain(nsFont);
return nsFont;
}
#endif
+#if wxOSX_USE_IPHONE
+
+WX_UIFont wxFont::OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info)
+{
+ UIFont* uifont;
+ switch( font )
+ {
+ case wxOSX_SYSTEM_FONT_NORMAL:
+ uifont = [UIFont systemFontOfSize:[UIFont systemFontSize]];
+ break;
+ case wxOSX_SYSTEM_FONT_BOLD:
+ uifont = [UIFont boldSystemFontOfSize:[UIFont systemFontSize]];
+ break;
+ case wxOSX_SYSTEM_FONT_MINI:
+ case wxOSX_SYSTEM_FONT_SMALL:
+ uifont = [UIFont systemFontOfSize:[UIFont smallSystemFontSize]];
+ break;
+ case wxOSX_SYSTEM_FONT_MINI_BOLD:
+ case wxOSX_SYSTEM_FONT_SMALL_BOLD:
+ uifont = [UIFont boldSystemFontOfSize:[UIFont smallSystemFontSize]];
+ break;
+ case wxOSX_SYSTEM_FONT_VIEWS:
+ case wxOSX_SYSTEM_FONT_LABELS:
+ uifont = [UIFont systemFontOfSize:[UIFont labelFontSize]];
+ break;
+ default:
+ break;
+ }
+ [uifont retain];
+ if ( info->m_faceName.empty())
+ {
+ wxFontStyle fontstyle = wxFONTSTYLE_NORMAL;
+ wxFontWeight fontweight = wxFONTWEIGHT_NORMAL;
+ bool underlined = false;
+
+ int size = (int) ([uifont pointSize]+0.5);
+ /*
+ NSFontSymbolicTraits traits = [desc symbolicTraits];
+
+ if ( traits & NSFontBoldTrait )
+ fontweight = wxFONTWEIGHT_BOLD ;
+ else
+ fontweight = wxFONTWEIGHT_NORMAL ;
+ if ( traits & NSFontItalicTrait )
+ fontstyle = wxFONTSTYLE_ITALIC ;
+ */
+ wxCFStringRef fontname( wxCFRetain([uifont familyName]) );
+ info->Init(size,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
+ fontname.AsString(), wxFONTENCODING_DEFAULT);
+
+ }
+ return uifont;
+}
+
+WX_UIFont wxFont::OSXCreateUIFont(const wxNativeFontInfo* info)
+{
+ UIFont* uiFont;
+ uiFont = [UIFont fontWithName:wxCFStringRef(info->m_faceName).AsNSString() size:info->m_pointSize];
+ wxMacCocoaRetain(uiFont);
+ return uiFont;
+}
+
+#endif
// ----------------------------------------------------------------------------
// NSImage Utils
// ----------------------------------------------------------------------------
+#if wxOSX_USE_IPHONE
+
+WX_UIImage wxOSXCreateUIImageFromCGImage( CGImageRef image )
+{
+ UIImage *newImage = [UIImage imageWithCGImage:image];
+ [newImage autorelease];
+ return( newImage );
+}
+
+#endif
+
#if wxOSX_USE_COCOA
// From "Cocoa Drawing Guide:Working with Images"
WX_NSImage wxOSXCreateNSImageFromCGImage( CGImageRef image )
{
NSRect imageRect = NSMakeRect(0.0, 0.0, 0.0, 0.0);
-
+
// Get the image dimensions.
imageRect.size.height = CGImageGetHeight(image);
imageRect.size.width = CGImageGetWidth(image);
-
+
// Create a new image to receive the Quartz image data.
- NSImage *newImage = [[NSImage alloc] initWithSize:imageRect.size];
+ NSImage *newImage = [[NSImage alloc] initWithSize:imageRect.size];
[newImage lockFocus];
-
+
// Get the Quartz context and draw.
CGContextRef imageContext = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
CGContextDrawImage( imageContext, *(CGRect*)&imageRect, image );
[newImage unlockFocus];
-
+
/*
// Create a bitmap rep from the image...
NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage];
return( newImage );
}
+CGImageRef wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage )
+{
+ // based on http://www.mail-archive.com/cocoa-dev@lists.apple.com/msg18065.html
+
+ NSSize imageSize = [nsimage size];
+ CGColorSpaceRef genericRGB = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+ CGContextRef context = CGBitmapContextCreate(NULL, imageSize.width, imageSize.height, 8, 0, genericRGB, kCGImageAlphaPremultipliedFirst);
+ NSGraphicsContext *nsGraphicsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO];
+ [NSGraphicsContext saveGraphicsState];
+ [NSGraphicsContext setCurrentContext:nsGraphicsContext];
+ [[NSColor whiteColor] setFill];
+ NSRectFill(NSMakeRect(0.0, 0.0, imageSize.width, imageSize.height));
+ [nsimage drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];
+ [NSGraphicsContext setCurrentContext:nsGraphicsContext];
+ CGImageRef image = CGBitmapContextCreateImage(context);
+ CFRelease(context);
+ return image;
+ }
+
// ----------------------------------------------------------------------------
// NSCursor Utils
// ----------------------------------------------------------------------------
//NSCursor takes an NSImage takes a number of Representations - here
//we need only one for the raw data
- NSBitmapImageRep *theRep =
- [[NSBitmapImageRep alloc]
- initWithBitmapDataPlanes:nil // Allocate the buffer for us :)
- pixelsWide:16
- pixelsHigh:16
- bitsPerSample:1
- samplesPerPixel:2
- hasAlpha:YES // Well, more like a mask...
- isPlanar:NO
- colorSpaceName:NSCalibratedWhiteColorSpace // Normal B/W - 0 black 1 white
- bytesPerRow:0 // I don't care - figure it out for me :)
- bitsPerPixel:2]; // bitsPerSample * samplesPerPixel
-
- //unsigned int is better to put data in then a void*
- //note that working with bitfields would be a lot better here -
- //but since it breaks some compilers...
- wxUint32 *data = (wxUint32 *)[theRep bitmapData];
-
- //traverse through the bitmap data
- for (int i = 0; i < 16; ++i)
+ NSBitmapImageRep *theRep = [[NSBitmapImageRep alloc]
+ initWithBitmapDataPlanes: NULL // Tell Cocoa to allocate the planes for us.
+ pixelsWide: 16 // All classic cursors are 16x16
+ pixelsHigh: 16
+ bitsPerSample: 1 // All classic cursors are bitmaps with bitmasks
+ samplesPerPixel: 2 // Sample 0:image 1:mask
+ hasAlpha: YES // Identify last sample as a mask
+ isPlanar: YES // Use a separate array for each sample
+ colorSpaceName: NSCalibratedWhiteColorSpace // 0.0=black 1.0=white
+ bytesPerRow: 2 // Rows in each plane are on 2-byte boundaries (no pad)
+ bitsPerPixel: 1]; // same as bitsPerSample since data is planar
+
+ // Ensure that Cocoa allocated 2 and only 2 of the 5 possible planes
+ unsigned char *planes[5];
+ [theRep getBitmapDataPlanes:planes];
+ wxASSERT(planes[0] != NULL);
+ wxASSERT(planes[1] != NULL);
+ wxASSERT(planes[2] == NULL);
+ wxASSERT(planes[3] == NULL);
+ wxASSERT(planes[4] == NULL);
+
+ // NOTE1: The Cursor's bits field is white=0 black=1.. thus the bitwise-not
+ // Why not use NSCalibratedBlackColorSpace? Because that reverses the
+ // sense of the alpha (mask) plane.
+ // NOTE2: The mask data is 0=off 1=on
+ // NOTE3: Cocoa asks for "premultiplied" color planes. Since we have a
+ // 1-bit color plane and a 1-bit alpha plane we can just do a bitwise-and
+ // on the two. The original cursor bitmaps have 0 (white actually) for
+ // any masked-off pixels. Therefore every masked-off pixel would be wrong
+ // since we bit-flip all of the picture bits. In practice, Cocoa doesn't
+ // seem to care, but we are following the documentation.
+
+ // Fill in the color (black/white) plane
+ for(int i=0; i<16; ++i)
{
- //bit alpha bit alpha ... :D
-
- //Notice the = instead of |= -
- //this is to avoid doing a memset earlier
- data[i] = 0;
-
- //do the rest of those bits and alphas :)
- for (int shift = 0; shift < 32; ++shift)
- {
- const int bit = 1 << (shift >> 1);
- data[i] |= ( !!( (pCursor->mask[i] & bit) ) ) << shift;
- data[i] |= ( !( (pCursor->bits[i] & bit) ) ) << ++shift;
- }
+ planes[0][2*i ] = (~pCursor->bits[i] & pCursor->mask[i]) >> 8 & 0xff;
+ planes[0][2*i+1] = (~pCursor->bits[i] & pCursor->mask[i]) & 0xff;
+ }
+ // Fill in the alpha (i.e. mask) plane
+ for(int i=0; i<16; ++i)
+ {
+ planes[1][2*i ] = pCursor->mask[i] >> 8 & 0xff;
+ planes[1][2*i+1] = pCursor->mask[i] & 0xff;
}
//add the representation (data) to the image
case wxCURSOR_HAND:
cursor = [[NSCursor pointingHandCursor] retain];
break;
-
+
case wxCURSOR_BULLSEYE:
cursor = wxGetStockCursor(kwxCursorBullseye);
break;
WX_NSCursor wxMacCocoaCreateCursorFromCGImage( CGImageRef cgImageRef, float hotSpotX, float hotSpotY )
{
static BOOL firstTime = YES;
-
+
if ( firstTime )
{
// Must first call [[[NSWindow alloc] init] release] to get the NSWindow machinery set up so that NSCursor can use a window to cache the cursor image
[[[NSWindow alloc] init] release];
firstTime = NO;
}
-
+
NSImage *nsImage = wxOSXCreateNSImageFromCGImage( cgImageRef );
NSCursor *cursor = [[NSCursor alloc] initWithImage:nsImage hotSpot:NSMakePoint( hotSpotX, hotSpotY )];
-
+
[nsImage release];
-
+
return cursor;
}
projects / wxWidgets.git / blobdiff