X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2c6d54928e7ba32b2bf6ddf0ca5f3dd4339758b..01526d4f6cd7dd242e561aa24066f8ca0290a9ac:/src/mac/carbon/bitmap.cpp diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp index 5d2b9fa638..28c71c4336 100644 --- a/src/mac/carbon/bitmap.cpp +++ b/src/mac/carbon/bitmap.cpp @@ -1,42 +1,34 @@ ///////////////////////////////////////////////////////////////////////////// // Name: bitmap.cpp // Purpose: wxBitmap -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "bitmap.h" #endif -#include "wx/wx.h" -#include "wx/setup.h" -#include "wx/utils.h" -#include "wx/palette.h" +#include "wx/wxprec.h" + #include "wx/bitmap.h" #include "wx/icon.h" #include "wx/log.h" #include "wx/image.h" +#include "wx/metafile.h" +#include "wx/xpmdecod.h" -extern "C" -{ -#ifdef __UNIX__ - #include "xpm/xpm.h" -#else - #include "xpm.h" -#endif -} ; +#include "wx/rawbmp.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject ) -#ifdef __UNIX__ +#ifdef __DARWIN__ #include #else #include @@ -44,454 +36,783 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) #include "wx/mac/uma.h" -CTabHandle wxMacCreateColorTable( int numColors ) +#include "wx/dcmemory.h" + +// Implementation Notes +// -------------------- +// +// we are always working with a 32 bit deep pixel buffer +// under QuickDraw its alpha parts are going to be ignored in the GWorld, +// therefore we have a separate GWorld there for blitting the mask in + +// under Quartz then content is transformed into a CGImageRef representing the same data +// which can be transferred to the GPU by the OS for fast rendering + +// we don't dare premultiplied alpha yet +#define wxMAC_USE_PREMULTIPLIED_ALPHA 0 + +IconFamilyHandle wxMacCreateIconFamily(const wxBitmap& bmp) { - CTabHandle newColors; /* Handle to the new color table */ - - /* Allocate memory for the color table */ - newColors = (CTabHandle)NewHandleClear( sizeof (ColorTable) + - sizeof (ColorSpec) * (numColors - 1) ); - if (newColors != nil) - { - /* Initialize the fields */ - (**newColors).ctSeed = GetCTSeed(); - (**newColors).ctFlags = 0; - (**newColors).ctSize = numColors - 1; - /* Initialize the table of colors */ - } - return newColors ; -} - -void wxMacDestroyColorTable( CTabHandle colors ) -{ - DisposeHandle( (Handle) colors ) ; -} - -void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ) -{ - (**newColors).ctTable[index].value = index; - (**newColors).ctTable[index].rgb.red = 0 ;// someRedValue; - (**newColors).ctTable[index].rgb.green = 0 ; // someGreenValue; - (**newColors).ctTable[index].rgb.blue = 0 ; // someBlueValue; -} - -GWorldPtr wxMacCreateGWorld( int width , int height , int depth ) -{ - OSErr err = noErr ; - GWorldPtr port ; - Rect rect = { 0 , 0 , height , width } ; - - if ( depth < 0 ) - { - depth = wxDisplayDepth() ; - } - - err = NewGWorld( &port , depth , &rect , NULL , NULL , 0 ) ; - if ( err == noErr ) - { - return port ; - } - return NULL ; -} - -void wxMacDestroyGWorld( GWorldPtr gw ) -{ - if ( gw ) - DisposeGWorld( gw ) ; -} - -PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask) -{ - CGrafPtr origPort ; - GDHandle origDev ; - - PicHandle pict; // this is the Picture we give back - - RGBColor gray = { 0xCCCC ,0xCCCC , 0xCCCC } ; - RGBColor white = { 0xffff ,0xffff , 0xffff } ; - RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ; - - unsigned char *maskimage = NULL ; - Rect portRect ; - GetPortBounds( wp , &portRect ) ; - int width = portRect.right - portRect.left ; - int height = portRect.bottom - portRect.top ; - - LockPixels( GetGWorldPixMap( wp ) ) ; - GetGWorld( &origPort , &origDev ) ; - - if ( mask ) - { - maskimage = (unsigned char*) malloc( width * height ) ; - SetGWorld( mask , NULL ) ; - LockPixels( GetGWorldPixMap( mask ) ) ; - for ( int y = 0 ; y < height ; y++ ) - { - for( int x = 0 ; x < width ; x++ ) - { - RGBColor col ; - - GetCPixel( x + portRect.left , y + portRect.top , &col ) ; - maskimage[y*width + x] = ( col.red == 0 ) ; // for monochrome masks - } - } - UnlockPixels( GetGWorldPixMap( mask ) ) ; - } - - SetGWorld( wp , NULL ) ; - - pict = OpenPicture(&portRect); // open a picture, this disables drawing - if(!pict) - return NULL; - - if ( maskimage ) - { - RGBForeColor( &black ) ; - RGBBackColor( &white ) ; - PenMode(transparent); - - for ( int y = 0 ; y < height ; ++y ) - { - for( int x = 0 ; x < width ; ++x ) - { - if ( maskimage[y*width + x] ) - { - RGBColor col ; + // setup the header properly + + IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle(8) ; + (**iconFamily).resourceType = kIconFamilyType ; + (**iconFamily).resourceSize = sizeof(OSType) + sizeof(Size); + + int w = bmp.GetWidth() ; + int h = bmp.GetHeight() ; + int sz = wxMax( w , h ) ; + if ( sz > 128 ) + { + wxFAIL_MSG( wxT("Currently only 128 pixels wide images are supported") ) ; + } + + Handle data = NULL ; + Handle maskdata = NULL ; + unsigned char * maskptr = NULL ; + unsigned char * ptr = NULL ; + size_t size ; + size_t masksize ; + OSType dataType ; + OSType maskType ; + + bool hasAlpha = bmp.HasAlpha() ; + wxMask *mask = bmp.GetMask() ; + // thumbnail is 128 x 128 with 32 bits per pixel + + if ( sz > 48 ) + { + sz = 128 ; + dataType = kThumbnail32BitData ; + maskType = kThumbnail8BitMask ; + } + else if ( sz > 32 ) + { + sz = 48 ; + dataType = kHuge32BitData ; + maskType = kHuge8BitMask ; + } + else if ( sz > 16 ) + { + sz = 32 ; + dataType = kLarge32BitData ; + maskType = kLarge8BitMask ; + } + else + { + sz = 16 ; + dataType = kSmall32BitData ; + maskType = kSmall8BitMask ; + } - GetCPixel( x + portRect.left , y + portRect.top , &col ) ; - SetCPixel( x + portRect.left , y + portRect.top , &col ) ; + size = sz * sz * 4 ; + data = NewHandle( size) ; + HLock( data ) ; + ptr = (unsigned char*) *data ; + memset( ptr , 0, size ) ; + + masksize = sz * sz ; + maskdata = NewHandle( masksize ) ; + HLock( maskdata ) ; + maskptr = (unsigned char*) *maskdata ; + memset( maskptr , 0 , masksize ) ; + + unsigned char * source = (unsigned char*) bmp.GetRawAccess() ; + unsigned char * masksource = mask ? (unsigned char*) mask->GetRawAccess() : NULL ; + for ( int y = 0 ; y < h ; ++y ) + { + unsigned char * dest = ptr + y * sz * 4 ; + unsigned char * maskdest = maskptr + y * sz ; + for ( int x = 0 ; x < w ; ++x ) + { + unsigned char a = *source ++ ; + unsigned char r = *source ++ ; + unsigned char g = *source ++ ; + unsigned char b = *source ++ ; + + *dest++ = 0 ; + *dest++ = r ; + *dest++ = g ; + *dest++ = b ; + + if ( mask ) + *maskdest++ = *masksource++ ; + else if ( hasAlpha ) + *maskdest++ = a ; + else + *maskdest++ = 0xFF ; + } + } + + OSStatus err = SetIconFamilyData( iconFamily, dataType , data ) ; + wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ; + + err = SetIconFamilyData( iconFamily, maskType , maskdata ) ; + wxASSERT_MSG( err == noErr , wxT("Error when adding mask") ) ; + HUnlock( data ) ; + HUnlock( maskdata ) ; + DisposeHandle( data ) ; + DisposeHandle( maskdata ) ; + return iconFamily ; +} + +IconRef wxMacCreateIconRef(const wxBitmap& bmp) +{ + IconFamilyHandle iconFamily = wxMacCreateIconFamily( bmp ) ; + IconRef iconRef ; + static int iconCounter = 2 ; + + OSStatus err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) iconCounter, iconFamily, &iconRef ) ; + UInt16 owners ; + err = GetIconRefOwners(iconRef , &owners ) ; + + wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ; + // we have to retain a reference, as Unregister will decrement it + AcquireIconRef( iconRef ) ; + UnregisterIconRef( 'WXNG' , (OSType) iconCounter ) ; + DisposeHandle( (Handle) iconFamily ) ; + ++iconCounter ; + + return iconRef ; +} + +PicHandle wxMacCreatePicHandle( const wxBitmap &bmp ) +{ + CGrafPtr origPort = NULL ; + GDHandle origDev = NULL ; + PicHandle pict = NULL ; + GWorldPtr wp = NULL ; + GWorldPtr mask = NULL ; + + GetGWorld( &origPort , &origDev ) ; + + wp = (GWorldPtr) bmp.GetHBITMAP( (WXHBITMAP*) &mask ) ; + + SetGWorld( wp , NULL ) ; + Rect portRect ; + GetPortBounds( wp , &portRect ) ; + pict = OpenPicture(&portRect); + + if(pict) + { + RGBColor white = { 0xffff ,0xffff , 0xffff } ; + RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ; + RGBForeColor( &black ) ; + RGBBackColor( &white ) ; + + LockPixels( GetGWorldPixMap( wp ) ) ; + CopyBits(GetPortBitMapForCopyBits(wp), + GetPortBitMapForCopyBits(wp), + &portRect, + &portRect, + srcCopy,NULL); + UnlockPixels( GetGWorldPixMap( wp ) ) ; + ClosePicture(); + } + SetGWorld( origPort , origDev ) ; + + return pict; +} + +void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType ) +{ + memset( info , 0 , sizeof(ControlButtonContentInfo) ) ; + if ( bitmap.Ok() ) + { + wxBitmapRefData * bmap = (wxBitmapRefData*) ( bitmap.GetRefData()) ; + if ( bmap == NULL ) + return ; + info->contentType = kControlContentIconRef ; + info->u.iconRef = wxMacCreateIconRef( bitmap ) ; + +#if wxMAC_USE_CORE_GRAPHICS + /* + // only on 10.4 more controls will accept a CGImage + + info->contentType = kControlContentCGImageRef ; + info->u.imageRef = (CGImageRef) bmap->CGImageCreate() ; + */ +#endif + } +} + +void wxMacReleaseBitmapButton( ControlButtonContentInfo*info ) +{ + if ( info->contentType == kControlContentIconRef ) + { + ReleaseIconRef(info->u.iconRef) ; + } +#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 + else if ( info->contentType == kControlContentCGImageRef ) + { + CGImageRelease( info->u.imageRef ) ; + } +#endif + else + { + wxFAIL_MSG(wxT("Unexpected bitmap type") ) ; + } +} + + +void wxBitmapRefData::Init() +{ + m_width = 0 ; + m_height = 0 ; + m_depth = 0 ; + m_ok = false ; + m_bitmapMask = NULL ; +#if wxMAC_USE_CORE_GRAPHICS + m_cgImageRef = NULL ; +#endif + m_hBitmap = NULL ; + m_hMaskBitmap = NULL; + m_maskBytesPerRow = NULL ; + + m_rawAccessCount = 0 ; + m_hasAlpha = false; +} + +wxBitmapRefData::wxBitmapRefData() +{ + Init() ; +} + +wxBitmapRefData::wxBitmapRefData( int w , int h , int d ) +{ + Init() ; + Create( w , h , d ) ; +} + +bool wxBitmapRefData::Create( int w , int h , int d ) +{ + m_width = w ; + m_height = h ; + m_depth = d ; + + m_bytesPerRow = w * 4 ; + size_t size = m_bytesPerRow * h ; + void* data = m_memBuf.GetWriteBuf(size) ; + memset( data , 0 , size) ; + m_memBuf.UngetWriteBuf(size) ; + + m_hBitmap = NULL ; + Rect rect = { 0 , 0 , m_height , m_width } ; + verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 , + (char*) data , m_bytesPerRow ) ) ; + wxASSERT_MSG( m_hBitmap , wxT("Unable to create GWorld context") ) ; + m_ok = ( m_hBitmap != NULL ) ; + + return m_ok ; +} + +void wxBitmapRefData::UseAlpha( bool use ) +{ + if ( m_hasAlpha == use ) + return ; + + m_hasAlpha = use ; + if ( m_hasAlpha ) + { + int width = GetWidth() ; + int height = GetHeight() ; + m_maskBytesPerRow = ( width + 3 ) & 0xFFFFFFC ; + size_t size = height * m_maskBytesPerRow ; + unsigned char * data = (unsigned char * ) m_maskMemBuf.GetWriteBuf( size ) ; + memset( data , 0 , size ) ; + wxASSERT( m_hMaskBitmap == NULL ) ; + Rect rect = { 0 , 0 , height , width } ; + verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hMaskBitmap , k8IndexedGrayPixelFormat , &rect , NULL , NULL , 0 , + (char*) data , m_maskBytesPerRow ) ) ; + wxASSERT_MSG( m_hMaskBitmap , wxT("Unable to create GWorld context for alpha mask") ) ; + m_maskMemBuf.UngetWriteBuf(size) ; +#if !wxMAC_USE_CORE_GRAPHICS + UpdateAlphaMask() ; +#endif + } + else + { + DisposeGWorld( m_hMaskBitmap ) ; + m_hMaskBitmap = NULL ; + m_maskBytesPerRow = 0 ; + } +} + +void *wxBitmapRefData::GetRawAccess() const +{ + wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ; + return m_memBuf.GetData() ; +} + +void *wxBitmapRefData::BeginRawAccess() +{ + wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ) ; + wxASSERT( m_rawAccessCount == 0 ) ; + ++m_rawAccessCount ; +#if wxMAC_USE_CORE_GRAPHICS + // we must destroy an existing cached image, as + // the bitmap data may change now + if ( m_cgImageRef ) + { + CGImageRelease( m_cgImageRef ) ; + m_cgImageRef = NULL ; + } +#endif + return m_memBuf.GetData() ; +} + +void wxBitmapRefData::EndRawAccess() +{ + wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ; + wxASSERT( m_rawAccessCount == 1 ) ; + --m_rawAccessCount ; +#if !wxMAC_USE_CORE_GRAPHICS + UpdateAlphaMask() ; +#endif +} + + +#if wxMAC_USE_CORE_GRAPHICS +void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size) +{ + wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ; + wxASSERT( data == membuf->GetData() ) ; + delete membuf ; +} + +CGImageRef wxBitmapRefData::CGImageCreate() const +{ + wxASSERT( m_ok ) ; + wxASSERT( m_rawAccessCount >= 0 ) ; + CGImageRef image ; + if ( m_rawAccessCount > 0 || m_cgImageRef == NULL ) + { + size_t imageSize = m_width * m_height * 4 ; + void * dataBuffer = m_memBuf.GetData() ; + int w = m_width ; + int h = m_height ; + CGImageAlphaInfo alphaInfo = kCGImageAlphaNoneSkipFirst ; + wxMemoryBuffer* membuf = NULL ; + + if ( m_bitmapMask ) + { + membuf = new wxMemoryBuffer( imageSize ) ; + memcpy( membuf->GetData() , dataBuffer , imageSize ) ; + unsigned char *sourcemaskstart = (unsigned char *) m_bitmapMask->GetRawAccess() ; + int maskrowbytes = m_bitmapMask->GetBytesPerRow() ; + unsigned char *destalpha = (unsigned char *) membuf->GetData() ; + alphaInfo = kCGImageAlphaFirst ; + for ( int y = 0 ; y < h ; ++y , sourcemaskstart += maskrowbytes) + { + unsigned char *sourcemask = sourcemaskstart ; + for( int x = 0 ; x < w ; ++x , sourcemask++ , destalpha += 4 ) + { + *destalpha = *sourcemask ; + } } - else { - // With transparency set this sets a blank pixel not a white one - SetCPixel( x + portRect.left , y + portRect.top , &white); + } + else if ( m_hasAlpha ) + { +#if wxMAC_USE_PREMULTIPLIED_ALPHA + alphaInfo = kCGImageAlphaPremultipliedFirst ; +#else + alphaInfo = kCGImageAlphaFirst ; +#endif + membuf = new wxMemoryBuffer( m_memBuf ) ; + } + else + { + membuf = new wxMemoryBuffer( m_memBuf ) ; + } + CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace(); + CGDataProviderRef dataProvider = + CGDataProviderCreateWithData( membuf , (const void *)membuf->GetData() , imageSize, + wxMacMemoryBufferReleaseProc ); + image = + ::CGImageCreate( w, h, 8 , 32 , 4 * m_width , colorSpace, alphaInfo , + dataProvider, NULL , false , kCGRenderingIntentDefault ); + CGDataProviderRelease( dataProvider); + } + else + { + image = m_cgImageRef ; + CGImageRetain( image ) ; + } + if ( m_rawAccessCount == 0 && m_cgImageRef == NULL) + { + // we keep it for later use + m_cgImageRef = image ; + CGImageRetain( image ) ; + } + return image ; +} +#endif + +GWorldPtr wxBitmapRefData::GetHBITMAP(GWorldPtr* mask) const +{ + wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + if ( mask ) + { + *mask = NULL ; + if ( m_bitmapMask ) + *mask = (GWorldPtr) m_bitmapMask->GetHBITMAP() ; + else if ( m_hasAlpha ) + { +#if !wxMAC_USE_CORE_GRAPHICS + if ( m_rawAccessCount > 0 ) + UpdateAlphaMask() ; +#else + // this structure is not kept in synch when using CG, so if someone + // is really accessing the Graphports, we have to sync it + UpdateAlphaMask() ; +#endif + *mask = m_hMaskBitmap ; + } + } + return m_hBitmap ; +} + +void wxBitmapRefData::UpdateAlphaMask() const +{ + if ( m_hasAlpha ) + { + unsigned char *sourcemask = (unsigned char *) GetRawAccess() ; + unsigned char *destalphabase = (unsigned char *) m_maskMemBuf.GetData() ; + + int h = GetHeight() ; + int w = GetWidth() ; + + for ( int y = 0 ; y < h ; ++y , destalphabase += m_maskBytesPerRow ) + { + unsigned char* destalpha = destalphabase ; + for( int x = 0 ; x < w ; ++x , sourcemask += 4, ++destalpha ) + { + *destalpha = *sourcemask ; } - } - } - free( maskimage ) ; - maskimage = NULL ; - } - else - { - RGBBackColor( &gray ) ; - EraseRect(&portRect); - RGBForeColor( &black ) ; - RGBBackColor( &white ) ; - - CopyBits(GetPortBitMapForCopyBits(wp), /* src PixMap - we copy image over - * itself - */ - GetPortBitMapForCopyBits(wp), // dst PixMap - no drawing occurs - &portRect, // srcRect - it will be recorded and compressed - - &portRect, // dstRect - into the picture that is open - - srcCopy,NULL); // copyMode and no clip region - } - ClosePicture(); // We are done recording the picture - UnlockPixels( GetGWorldPixMap( wp ) ) ; - SetGWorld( origPort , origDev ) ; - - return pict; // return our groovy pict handle + } + } } -wxBitmapRefData::wxBitmapRefData() +void wxBitmapRefData::Free() { - m_ok = FALSE; - m_width = 0; - m_height = 0; - m_depth = 0; - m_quality = 0; - m_numColors = 0; - m_bitmapMask = NULL; - m_hBitmap = NULL ; - m_hPict = NULL ; - m_bitmapType = kMacBitmapTypeUnknownType ; + wxASSERT_MSG( m_rawAccessCount == 0 , wxT("Bitmap still selected when destroyed") ) ; + +#if wxMAC_USE_CORE_GRAPHICS + if ( m_cgImageRef ) + { + CGImageRelease( m_cgImageRef ) ; + m_cgImageRef = NULL ; + } +#endif + if ( m_hBitmap ) + { + DisposeGWorld( MAC_WXHBITMAP(m_hBitmap) ) ; + m_hBitmap = NULL ; + } + if ( m_hMaskBitmap ) + { + DisposeGWorld( MAC_WXHBITMAP(m_hMaskBitmap) ) ; + m_hMaskBitmap = NULL ; + } + + if (m_bitmapMask) + { + delete m_bitmapMask; + m_bitmapMask = NULL; + } } wxBitmapRefData::~wxBitmapRefData() { - switch (m_bitmapType) - { - case kMacBitmapTypePict : - { - if ( m_hPict ) - { - KillPicture( m_hPict ) ; - m_hPict = NULL ; - } - } - break ; - case kMacBitmapTypeGrafWorld : - { - if ( m_hBitmap ) - { - wxMacDestroyGWorld( m_hBitmap ) ; - m_hBitmap = NULL ; - } - } - break ; - default : - // unkown type ? - break ; - } - - if (m_bitmapMask) - { - delete m_bitmapMask; - m_bitmapMask = NULL; - } -} - -wxList wxBitmap::sm_handlers; + Free() ; +} -wxBitmap::wxBitmap() +bool wxBitmap::CopyFromIcon(const wxIcon& icon) { - m_refData = NULL; + int w = icon.GetWidth() ; + int h = icon.GetHeight() ; + Create( icon.GetWidth() , icon.GetHeight() ) ; - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + if ( w == h && ( w == 16 || w == 32 || w == 48 || w == 128 ) ) + { + IconFamilyHandle iconFamily = NULL ; + Handle imagehandle = NewHandle(0) ; + Handle maskhandle = NewHandle(0) ; + + OSType maskType ; + OSType dataType ; + IconSelectorValue selector ; + if ( w == 128 ) + { + dataType = kThumbnail32BitData ; + maskType = kThumbnail8BitMask ; + selector = kSelectorAllAvailableData ; + } + else if ( w == 48 ) + { + dataType = kHuge32BitData ; + maskType = kHuge8BitMask ; + selector = kSelectorHuge32Bit | kSelectorHuge8BitMask ; + } + else if ( w == 32 ) + { + dataType = kLarge32BitData ; + maskType = kLarge8BitMask ; + selector = kSelectorLarge32Bit | kSelectorLarge8BitMask ; + } + else if ( w == 16 ) + { + dataType = kSmall32BitData ; + maskType = kSmall8BitMask ; + selector = kSelectorSmall32Bit | kSelectorSmall8BitMask ; + } + else + { + wxFAIL_MSG(wxT("Illegal icon size for conversion") ) ; + } + + + OSStatus err = ( IconRefToIconFamily( MAC_WXHICON(icon.GetHICON()) , selector , &iconFamily ) ) ; + + err =( GetIconFamilyData( iconFamily , dataType , imagehandle ) ) ; + err =( GetIconFamilyData( iconFamily , maskType , maskhandle ) ) ; + wxASSERT( GetHandleSize( imagehandle ) == w * 4 * h ) ; + wxASSERT( GetHandleSize( maskhandle ) == w * h ) ; + UseAlpha() ; + unsigned char *source = (unsigned char *) *imagehandle ; + unsigned char *sourcemask = (unsigned char *) *maskhandle ; + + unsigned char* destination = (unsigned char*) BeginRawAccess() ; + for ( int y = 0 ; y < h ; ++y ) + { + for ( int x = 0 ; x < w ; ++x ) + { + *destination++ = *sourcemask++ ; + source++ ; + *destination++ = *source++ ; + *destination++ = *source++ ; + *destination++ = *source++ ; + } + } + EndRawAccess() ; + DisposeHandle( imagehandle ) ; + DisposeHandle( maskhandle ) ; + } + else + { + wxMemoryDC dc ; + dc.SelectObject( *this ) ; + dc.DrawIcon( icon , 0 , 0 ) ; + dc.SelectObject( wxNullBitmap ) ; + } + return true; +} + +wxBitmap::wxBitmap() +{ } wxBitmap::~wxBitmap() { - if (wxTheBitmapList) - wxTheBitmapList->DeleteObject(this); } wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits) { - m_refData = new wxBitmapRefData; + m_refData = new wxBitmapRefData( the_width , the_height , no_bits ) ; - M_BITMAPDATA->m_width = the_width ; - M_BITMAPDATA->m_height = the_height ; - M_BITMAPDATA->m_depth = no_bits ; - M_BITMAPDATA->m_numColors = 0; if ( no_bits == 1 ) { - M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ; - M_BITMAPDATA->m_hBitmap = wxMacCreateGWorld( the_width , the_height , no_bits ) ; - M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ; - - CGrafPtr origPort ; - GDHandle origDevice ; - - GetGWorld( &origPort , &origDevice ) ; - SetGWorld( M_BITMAPDATA->m_hBitmap , NULL ) ; - LockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ; - - // bits is a char array - - unsigned char* linestart = (unsigned char*) bits ; - int linesize = ( the_width / (sizeof(unsigned char) * 8)) ; - if ( the_width % (sizeof(unsigned char) * 8) ) { - linesize += sizeof(unsigned char); - } - - RGBColor colors[2] = { - { 0xFFFF , 0xFFFF , 0xFFFF } , - { 0, 0 , 0 } - } ; - - for ( int y = 0 ; y < the_height ; ++y , linestart += linesize ) - { - for ( int x = 0 ; x < the_width ; ++x ) - { - int index = x / 8 ; - int bit = x % 8 ; - int mask = 1 << bit ; - if ( linestart[index] & mask ) - { - SetCPixel( x , y , &colors[1] ) ; - } - else - { - SetCPixel( x , y , &colors[0] ) ; - } - } - - } - UnlockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ; - - SetGWorld( origPort , origDevice ) ; + int linesize = ( the_width / (sizeof(unsigned char) * 8)) ; + if ( the_width % (sizeof(unsigned char) * 8) ) { + linesize += sizeof(unsigned char); + } + unsigned char* linestart = (unsigned char*) bits ; + unsigned char* destination = (unsigned char*) BeginRawAccess() ; + for ( int y = 0 ; y < the_height ; ++y , linestart += linesize ) + { + for ( int x = 0 ; x < the_width ; ++x ) + { + int index = x / 8 ; + int bit = x % 8 ; + int mask = 1 << bit ; + if ( linestart[index] & mask ) + { + *destination++ = 0xFF ; + *destination++ = 0 ; + *destination++ = 0 ; + *destination++ = 0 ; + } + else + { + *destination++ = 0xFF ; + *destination++ = 0xFF ; + *destination++ = 0xFF ; + *destination++ = 0xFF ; + } + } + } + EndRawAccess() ; } else { - wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented")); - } - - if ( wxTheBitmapList ) { - wxTheBitmapList->AddBitmap(this); + wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented")); } } wxBitmap::wxBitmap(int w, int h, int d) { (void)Create(w, h, d); - - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); } -wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth) +wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth) { (void) Create(data, type, width, height, depth); +} + +wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type) +{ + LoadFile(filename, type); +} + +wxBitmap::wxBitmap(const char **bits) +{ + (void) CreateFromXpm(bits); +} - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); +wxBitmap::wxBitmap(char **bits) +{ + (void) CreateFromXpm((const char **)bits); } -wxBitmap::wxBitmap(const wxString& filename, long type) +void* wxBitmap::GetRawAccess() const { - LoadFile(filename, (int)type); + wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ; + return M_BITMAPDATA->GetRawAccess() ; +} - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); +void* wxBitmap::BeginRawAccess() +{ + wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ; + return M_BITMAPDATA->BeginRawAccess() ; } -wxBitmap::wxBitmap(const char **data) +void wxBitmap::EndRawAccess() { - (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); + wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ; + M_BITMAPDATA->EndRawAccess() ; +} + +bool wxBitmap::CreateFromXpm(const char **bits) +{ + wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") ) + wxXPMDecoder decoder; + wxImage img = decoder.ReadData(bits); + wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") ) + *this = wxBitmap(img); + return TRUE; } -wxBitmap::wxBitmap(char **data) +#if wxMAC_USE_CORE_GRAPHICS +WXCGIMAGEREF wxBitmap::CGImageCreate() const { - (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); + wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ; + return M_BITMAPDATA->CGImageCreate() ; } +#endif wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( Ok() && (rect.x >= 0) && (rect.y >= 0) && (rect.x+rect.width <= GetWidth()) && (rect.y+rect.height <= GetHeight()), wxNullBitmap, wxT("invalid bitmap or bitmap region") ); - - wxBitmap ret( rect.width, rect.height, GetDepth() ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); - - WXHBITMAP origPort; - GDHandle origDevice; - - GetGWorld( &origPort, &origDevice ); - - // Update the subbitmaps reference data - wxBitmapRefData *ref = (wxBitmapRefData *)ret.GetRefData(); - - ref->m_numColors = M_BITMAPDATA->m_numColors; - ref->m_bitmapPalette = M_BITMAPDATA->m_bitmapPalette; - ref->m_bitmapType = M_BITMAPDATA->m_bitmapType; - - // Copy sub region of this bitmap - if(M_BITMAPDATA->m_bitmapType == kMacBitmapTypePict) - { - printf("GetSubBitmap: Copy a region of a Pict structure - TODO\n"); - } - else if(M_BITMAPDATA->m_bitmapType == kMacBitmapTypeGrafWorld) - { - // Copy mask - if(GetMask()) - { - WXHBITMAP submask, mask; - RGBColor color; - - mask = GetMask()->GetMaskBitmap(); - submask = wxMacCreateGWorld(rect.width, rect.height, 1); - LockPixels(GetGWorldPixMap(mask)); - LockPixels(GetGWorldPixMap(submask)); - - for(int yy = 0; yy < rect.height; yy++) - { - for(int xx = 0; xx < rect.width; xx++) - { - SetGWorld(mask, NULL); - GetCPixel(rect.x + xx, rect.y + yy, &color); - SetGWorld(submask, NULL); - SetCPixel(xx,yy, &color); - } - } - UnlockPixels(GetGWorldPixMap(mask)); - UnlockPixels(GetGWorldPixMap(submask)); - ref->m_bitmapMask = new wxMask; - ref->m_bitmapMask->SetMaskBitmap(submask); - } - - // Copy bitmap - if(GetHBITMAP()) - { - WXHBITMAP subbitmap, bitmap; - RGBColor color; - - bitmap = GetHBITMAP(); - subbitmap = wxMacCreateGWorld(rect.width, rect.height, GetDepth()); - LockPixels(GetGWorldPixMap(bitmap)); - LockPixels(GetGWorldPixMap(subbitmap)); - - for(int yy = 0; yy < rect.height; yy++) - { - for(int xx = 0; xx < rect.width; xx++) - { - SetGWorld(bitmap, NULL); - GetCPixel(rect.x + xx, rect.y + yy, &color); - SetGWorld(subbitmap, NULL); - SetCPixel(xx, yy, &color); - } - } - UnlockPixels(GetGWorldPixMap(bitmap)); - UnlockPixels(GetGWorldPixMap(subbitmap)); - ret.SetHBITMAP(subbitmap); - } - } - SetGWorld( origPort, origDevice ); - - return ret; -} -bool wxBitmap::Create(int w, int h, int d) -{ - UnRef(); + wxBitmap ret( rect.width, rect.height, GetDepth() ); + wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); - m_refData = new wxBitmapRefData; - M_BITMAPDATA->m_width = w; - M_BITMAPDATA->m_height = h; - M_BITMAPDATA->m_depth = d; + int sourcewidth = GetWidth() ; + int destwidth = rect.width ; + int destheight = rect.height ; + { + unsigned char * sourcedata = (unsigned char*) GetRawAccess() ; + unsigned char * destdata = (unsigned char*) ret.BeginRawAccess() ; + int sourcelinesize = sourcewidth * 4 ; + int destlinesize = destwidth * 4 ; + unsigned char *source = sourcedata + rect.x * 4 + rect.y * sourcelinesize ; + unsigned char *dest = destdata ; + for(int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize) + { + memcpy( dest , source , destlinesize ) ; + } + } + ret.EndRawAccess() ; + + if ( M_BITMAPDATA->m_bitmapMask ) + { + wxMemoryBuffer maskbuf ; + int rowBytes = ( destwidth + 3 ) & 0xFFFFFFC ; + size_t maskbufsize = rowBytes * destheight ; + unsigned char * destdata = (unsigned char * ) maskbuf.GetWriteBuf( maskbufsize ) ; + + int sourcelinesize = M_BITMAPDATA->m_bitmapMask->GetBytesPerRow() ; + int destlinesize = rowBytes ; + unsigned char *source = (unsigned char *) M_BITMAPDATA->m_bitmapMask->GetRawAccess() ; + source += rect.x + rect.y * sourcelinesize ; + unsigned char *dest = destdata ; + + for(int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize) + { + memcpy( dest , source , destlinesize ) ; + } + maskbuf.UngetWriteBuf( maskbufsize ) ; + ret.SetMask( new wxMask( maskbuf , destwidth , destheight , rowBytes ) ) ; + } + else if ( HasAlpha() ) + ret.UseAlpha() ; - M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ; - M_BITMAPDATA->m_hBitmap = wxMacCreateGWorld( w , h , d ) ; - M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ; - return M_BITMAPDATA->m_ok; + return ret; } -int wxBitmap::GetBitmapType() const +bool wxBitmap::Create(int w, int h, int d) { - wxCHECK_MSG( Ok(), kMacBitmapTypeUnknownType, wxT("invalid bitmap") ); + UnRef(); - return M_BITMAPDATA->m_bitmapType; -} + if ( d < 0 ) + d = wxDisplayDepth() ; -void wxBitmap::SetHBITMAP(WXHBITMAP bmp) -{ - M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ; - M_BITMAPDATA->m_hBitmap = bmp ; - M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ; + m_refData = new wxBitmapRefData( w , h , d ); + + return M_BITMAPDATA->Ok() ; } -bool wxBitmap::LoadFile(const wxString& filename, long type) +bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) { UnRef(); - m_refData = new wxBitmapRefData; - wxBitmapHandler *handler = FindHandler(type); - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); + if ( handler ) + { + m_refData = new wxBitmapRefData; - return FALSE; + return handler->LoadFile(this, filename, type, -1, -1); } - - return handler->LoadFile(this, filename, type, -1, -1); + else + { + wxImage loadimage(filename, type); + if (loadimage.Ok()) { + *this = loadimage; + return true; + } + } + wxLogWarning(wxT("no bitmap handler for type %d defined."), type); + return false; } -bool wxBitmap::Create(void *data, long type, int width, int height, int depth) +bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int depth) { UnRef(); @@ -500,7 +821,7 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth) wxBitmapHandler *handler = FindHandler(type); if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); + wxLogWarning(wxT("no bitmap handler for type %d defined."), type); return FALSE; } @@ -511,74 +832,71 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth) wxBitmap::wxBitmap(const wxImage& image, int depth) { wxCHECK_RET( image.Ok(), wxT("invalid image") ) - wxCHECK_RET( depth == -1, wxT("invalid bitmap depth") ) - - m_refData = new wxBitmapRefData(); - - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); // width and height of the device-dependent bitmap int width = image.GetWidth(); int height = image.GetHeight(); + m_refData = new wxBitmapRefData( width , height , depth ) ;; + // Create picture - Create( width , height , wxDisplayDepth() ) ; - wxBitmap maskBitmap( width, height, 1); + bool hasAlpha = false ; - CGrafPtr origPort ; - GDHandle origDevice ; - - LockPixels( GetGWorldPixMap(GetHBITMAP()) ); - LockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) ); - - GetGWorld( &origPort , &origDevice ) ; - SetGWorld( GetHBITMAP() , NULL ) ; + if ( image.HasMask() ) + { + // takes precedence, don't mix with alpha info + } + else + { + hasAlpha = image.HasAlpha() ; + } - // Render image - wxColour rgb, maskcolor(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue()); - RGBColor color; - RGBColor white = { 0xffff, 0xffff, 0xffff }; - RGBColor black = { 0 , 0 , 0 }; + if ( hasAlpha ) + UseAlpha() ; + + unsigned char* destination = (unsigned char*) BeginRawAccess() ; register unsigned char* data = image.GetData(); - - int index = 0; + const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ; for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { - rgb.Set(data[index++], data[index++], data[index++]); - color = rgb.GetPixel(); - SetCPixel( x , y , &color ) ; - if (image.HasMask()) + if ( hasAlpha ) { - SetGWorld(maskBitmap.GetHBITMAP(), NULL); - if (rgb == maskcolor) { - SetCPixel(x,y, &white); - } - else { - SetCPixel(x,y, &black); - } - SetGWorld(GetHBITMAP(), NULL); + const unsigned char a = *alpha++; + *destination++ = a ; +#if wxMAC_USE_PREMULTIPLIED_ALPHA + *destination++ = ((*data++) * a + 127 ) / 255 ; + *destination++ = ((*data++) * a + 127 ) / 255 ; + *destination++ = ((*data++) * a + 127 ) / 255 ; +#else + *destination++ = *data++ ; + *destination++ = *data++ ; + *destination++ = *data++ ; +#endif + } + else + { + *destination++ = 0xFF ; + *destination++ = *data++ ; + *destination++ = *data++ ; + *destination++ = *data++ ; } } - } // for height - - // Create mask - if ( image.HasMask() ) { - wxMask *mask = new wxMask( maskBitmap ); } - - UnlockPixels( GetGWorldPixMap(GetHBITMAP()) ); - UnlockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) ); - SetGWorld( origPort, origDevice ); + EndRawAccess() ; + if ( image.HasMask() ) + { + SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ; + } } wxImage wxBitmap::ConvertToImage() const { wxImage image; - + wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); // create an wxImage object @@ -587,105 +905,128 @@ wxImage wxBitmap::ConvertToImage() const image.Create( width, height ); unsigned char *data = image.GetData(); - wxCHECK_MSG( data, wxNullImage, wxT("Could not allocate data for image") ); - WXHBITMAP origPort; - GDHandle origDevice; - int index; - RGBColor color; - // background color set to RGB(16,16,16) in consistent with wxGTK - unsigned char mask_r=16, mask_g=16, mask_b=16; - SInt16 r,g,b; - wxMask *mask = GetMask(); - - GetGWorld( &origPort, &origDevice ); - LockPixels(GetGWorldPixMap(GetHBITMAP())); - SetGWorld( GetHBITMAP(), NULL); - - // Copy data into image - index = 0; + unsigned char* source = (unsigned char*) GetRawAccess() ; + + bool hasAlpha = false ; + bool hasMask = false ; + unsigned char *alpha = NULL ; + unsigned char *mask = NULL ; + if ( HasAlpha() ) + { + hasAlpha = true ; + } + + if ( GetMask() ) + { + hasMask = true ; + mask = (unsigned char*) GetMask()->GetRawAccess() ; + } + + if ( hasAlpha ) + { + image.SetAlpha() ; + alpha = image.GetAlpha() ; + } + int index = 0; + + // The following masking algorithm is the same as well in msw/gtk: + // the colour used as transparent one in wxImage and the one it is + // replaced with when it really occurs in the bitmap + static const int MASK_RED = 1; + static const int MASK_GREEN = 2; + static const int MASK_BLUE = 3; + static const int MASK_BLUE_REPLACEMENT = 2; + for (int yy = 0; yy < height; yy++) { for (int xx = 0; xx < width; xx++) { - GetCPixel(xx,yy, &color); - r = ((color.red ) >> 8); - g = ((color.green ) >> 8); - b = ((color.blue ) >> 8); - data[index ] = r; - data[index + 1] = g; - data[index + 2] = b; - if (mask) + long color = *((long*) source) ; + unsigned char a = ((color&0xFF000000) >> 24) ; + unsigned char r = ((color&0x00FF0000) >> 16) ; + unsigned char g = ((color&0x0000FF00) >> 8) ; + unsigned char b = (color&0x000000FF); + if ( hasMask ) { - if (mask->PointMasked(xx,yy)) + if ( *mask++ == 0 ) { - data[index ] = mask_r; - data[index + 1] = mask_g; - data[index + 2] = mask_b; + if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE ) + b = MASK_BLUE_REPLACEMENT ; + } + else + { + r = MASK_RED ; + g = MASK_GREEN ; + b = MASK_BLUE ; } } + else if ( hasAlpha ) + *alpha++ = a ; + + data[index ] = r ; + data[index + 1] = g ; + data[index + 2] = b ; index += 3; + source += 4 ; } } - if (mask) - { - image.SetMaskColour( mask_r, mask_g, mask_b ); - image.SetMask( true ); - } - - // Free resources - UnlockPixels(GetGWorldPixMap(GetHBITMAP())); - SetGWorld(origPort, origDevice); - + if ( hasMask ) + image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE ); return image; } -bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette) +bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, + const wxPalette *palette) const { wxBitmapHandler *handler = FindHandler(type); - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); + if ( handler ) + { + return handler->SaveFile(this, filename, type, palette); + } + else + { + wxImage image = ConvertToImage(); - return FALSE; - } + return image.SaveFile(filename, type); + } - return handler->SaveFile(this, filename, type, palette); + wxLogWarning(wxT("no bitmap handler for type %d defined."), type); + return false; } bool wxBitmap::Ok() const { - return (M_BITMAPDATA && M_BITMAPDATA->m_ok); + return (M_BITMAPDATA && M_BITMAPDATA->Ok()); } int wxBitmap::GetHeight() const { wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); - return M_BITMAPDATA->m_height; + return M_BITMAPDATA->GetHeight(); } int wxBitmap::GetWidth() const { wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); - return M_BITMAPDATA->m_width; + return M_BITMAPDATA->GetWidth() ; } int wxBitmap::GetDepth() const { wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); - return M_BITMAPDATA->m_depth; + return M_BITMAPDATA->GetDepth(); } int wxBitmap::GetQuality() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); - - return M_BITMAPDATA->m_quality; + return 0; } wxMask *wxBitmap::GetMask() const @@ -695,12 +1036,19 @@ wxMask *wxBitmap::GetMask() const return M_BITMAPDATA->m_bitmapMask; } +bool wxBitmap::HasAlpha() const +{ + wxCHECK_MSG( Ok(), false , wxT("invalid bitmap") ); + + return M_BITMAPDATA->HasAlpha() ; +} + void wxBitmap::SetWidth(int w) { if (!M_BITMAPDATA) m_refData = new wxBitmapRefData; - M_BITMAPDATA->m_width = w; + M_BITMAPDATA->SetWidth(w); } void wxBitmap::SetHeight(int h) @@ -708,7 +1056,7 @@ void wxBitmap::SetHeight(int h) if (!M_BITMAPDATA) m_refData = new wxBitmapRefData; - M_BITMAPDATA->m_height = h; + M_BITMAPDATA->SetHeight(h); } void wxBitmap::SetDepth(int d) @@ -716,15 +1064,11 @@ void wxBitmap::SetDepth(int d) if (!M_BITMAPDATA) m_refData = new wxBitmapRefData; - M_BITMAPDATA->m_depth = d; + M_BITMAPDATA->SetDepth(d); } -void wxBitmap::SetQuality(int q) +void wxBitmap::SetQuality(int WXUNUSED(quality)) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - - M_BITMAPDATA->m_quality = q; } void wxBitmap::SetOk(bool isOk) @@ -732,9 +1076,10 @@ void wxBitmap::SetOk(bool isOk) if (!M_BITMAPDATA) m_refData = new wxBitmapRefData; - M_BITMAPDATA->m_ok = isOk; + M_BITMAPDATA->SetOk(isOk); } +#if wxUSE_PALETTE wxPalette *wxBitmap::GetPalette() const { wxCHECK_MSG( Ok(), NULL, wxT("Invalid bitmap GetPalette()") ); @@ -749,357 +1094,193 @@ void wxBitmap::SetPalette(const wxPalette& palette) M_BITMAPDATA->m_bitmapPalette = palette ; } +#endif // wxUSE_PALETTE void wxBitmap::SetMask(wxMask *mask) { if (!M_BITMAPDATA) m_refData = new wxBitmapRefData; - M_BITMAPDATA->m_bitmapMask = mask ; -} - -WXHBITMAP wxBitmap::GetHBITMAP() const -{ - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); - - return M_BITMAPDATA->m_hBitmap; -} - -PicHandle wxBitmap::GetPict() const -{ - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); - - PicHandle picture; // This is the returned picture - - // If bitmap already in Pict format return pointer - if(M_BITMAPDATA->m_bitmapType == kMacBitmapTypePict) { - return M_BITMAPDATA->m_hPict; - } - else if(M_BITMAPDATA->m_bitmapType != kMacBitmapTypeGrafWorld) { - // Invalid bitmap - return NULL; - } - - RGBColor gray = { 0xCCCC ,0xCCCC , 0xCCCC } ; - RGBColor white = { 0xffff ,0xffff , 0xffff } ; - RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ; - CGrafPtr origPort; - GDHandle origDev ; - wxMask *mask; - Rect portRect ; - - GetPortBounds( GetHBITMAP() , &portRect ) ; - int width = portRect.right - portRect.left ; - int height = portRect.bottom - portRect.top ; - - LockPixels( GetGWorldPixMap( GetHBITMAP() ) ) ; - GetGWorld( &origPort , &origDev ) ; - - mask = GetMask(); - - SetGWorld( GetHBITMAP() , NULL ) ; - - picture = OpenPicture(&portRect); // open a picture, this disables drawing - if(!picture) { - return NULL; - } - - if( mask ) - { -#ifdef __UNIX__ - RGBColor trans = white; -#else - RGBBackColor( &gray ); - EraseRect( &portRect ); - RGBColor trans = gray; -#endif - RGBForeColor( &black ) ; - RGBBackColor( &white ) ; - PenMode(transparent); - - for ( int y = 0 ; y < height ; ++y ) - { - for( int x = 0 ; x < width ; ++x ) - { - if ( !mask->PointMasked(x,y) ) - { - RGBColor col ; - - GetCPixel( x + portRect.left , y + portRect.top , &col ) ; - SetCPixel( x + portRect.left , y + portRect.top , &col ) ; - } - else { - // With transparency this sets a blank pixel - SetCPixel( x + portRect.left , y + portRect.top , &trans); - } - } - } - } - else - { - RGBBackColor( &gray ) ; - EraseRect(&portRect); - RGBForeColor( &black ) ; - RGBBackColor( &white ) ; - - CopyBits(GetPortBitMapForCopyBits(GetHBITMAP()), - // src PixMap - we copy image over itself - - GetPortBitMapForCopyBits(GetHBITMAP()), - // dst PixMap - no drawing occurs - &portRect, // srcRect - it will be recorded and compressed - - &portRect, // dstRect - into the picture that is open - - srcCopy,NULL); // copyMode and no clip region - } - ClosePicture(); // We are done recording the picture - UnlockPixels( GetGWorldPixMap( GetHBITMAP() ) ) ; - SetGWorld( origPort , origDev ) ; - - return picture; // return our groovy pict handle -} - -void wxBitmap::AddHandler(wxBitmapHandler *handler) -{ - sm_handlers.Append(handler); -} - -void wxBitmap::InsertHandler(wxBitmapHandler *handler) -{ - sm_handlers.Insert(handler); -} - -bool wxBitmap::RemoveHandler(const wxString& name) -{ - wxBitmapHandler *handler = FindHandler(name); - if ( handler ) - { - sm_handlers.DeleteObject(handler); - return TRUE; - } - else - return FALSE; -} - -wxBitmapHandler *wxBitmap::FindHandler(const wxString& name) -{ - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetName() == name ) - return handler; - node = node->Next(); - } - return NULL; -} + // Remove existing mask if there is one. + delete M_BITMAPDATA->m_bitmapMask; -wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType) -{ - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetExtension() == extension && - (bitmapType == -1 || handler->GetType() == bitmapType) ) - return handler; - node = node->Next(); - } - return NULL; + M_BITMAPDATA->m_bitmapMask = mask ; } -wxBitmapHandler *wxBitmap::FindHandler(long bitmapType) +WXHBITMAP wxBitmap::GetHBITMAP(WXHBITMAP* mask) const { - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if (handler->GetType() == bitmapType) - return handler; - node = node->Next(); - } - return NULL; + return WXHBITMAP(M_BITMAPDATA->GetHBITMAP((GWorldPtr*)mask)); } -/* - * wxMask - */ +// ---------------------------------------------------------------------------- +// wxMask +// ---------------------------------------------------------------------------- wxMask::wxMask() { - m_maskBitmap = 0; + Init() ; } // Construct a mask from a bitmap and a colour indicating // the transparent area wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour) { - m_maskBitmap = 0; + Init() ; Create(bitmap, colour); } -// Construct a mask from a bitmap and a palette index indicating -// the transparent area -wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex) +// Construct a mask from a mono bitmap (copies the bitmap). +wxMask::wxMask(const wxBitmap& bitmap) { - m_maskBitmap = 0; - Create(bitmap, paletteIndex); + Init() ; + Create(bitmap); } // Construct a mask from a mono bitmap (copies the bitmap). -wxMask::wxMask(const wxBitmap& bitmap) +wxMask::wxMask(const wxMemoryBuffer& data, int width , int height , int bytesPerRow ) { - m_maskBitmap = 0; - Create(bitmap); + Init() ; + Create(data, width , height , bytesPerRow ); } wxMask::~wxMask() { - if ( m_maskBitmap ) - { - wxMacDestroyGWorld( m_maskBitmap ) ; - m_maskBitmap = NULL ; - } + if ( m_maskBitmap ) + { + DisposeGWorld( (GWorldPtr) m_maskBitmap ) ; + m_maskBitmap = NULL ; + } } -// Create a mask from a mono bitmap (copies the bitmap). -bool wxMask::Create(const wxBitmap& bitmap) +void wxMask::Init() { - if ( m_maskBitmap ) - { - wxMacDestroyGWorld( m_maskBitmap ) ; - m_maskBitmap = NULL ; - } - wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false, - wxT("Cannot create mask from this bitmap type (TODO)")); - // other types would require a temporary bitmap. not yet implemented - - wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap")); - - wxCHECK_MSG(bitmap.GetDepth() == 1, false, - wxT("Cannot create mask from colour bitmap")); + m_width = m_height = m_bytesPerRow = 0 ; + m_maskBitmap = NULL ; +} - m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), 1); - Rect rect = { 0,0, bitmap.GetHeight(), bitmap.GetWidth() }; +void *wxMask::GetRawAccess() const +{ + return m_memBuf.GetData() ; +} - LockPixels( GetGWorldPixMap(m_maskBitmap) ); - LockPixels( GetGWorldPixMap(bitmap.GetHBITMAP()) ); - CopyBits(GetPortBitMapForCopyBits(bitmap.GetHBITMAP()), - GetPortBitMapForCopyBits(m_maskBitmap), - &rect, &rect, srcCopy, 0); - UnlockPixels( GetGWorldPixMap(m_maskBitmap) ); - UnlockPixels( GetGWorldPixMap(bitmap.GetHBITMAP()) ); +void wxMask::RealizeNative() +{ + if ( m_maskBitmap ) + { + DisposeGWorld( (GWorldPtr) m_maskBitmap ) ; + m_maskBitmap = NULL ; + } + Rect rect = { 0 , 0 , m_height , m_width } ; + verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_maskBitmap , k8IndexedGrayPixelFormat , &rect , NULL , NULL , 0 , + (char*) m_memBuf.GetData() , m_bytesPerRow ) ) ; +} - return FALSE; +// Create a mask from a mono bitmap (copies the bitmap). +bool wxMask::Create(const wxMemoryBuffer& data,int width , int height , int bytesPerRow) +{ + m_memBuf = data ; + m_width = width ; + m_height = height ; + m_bytesPerRow = bytesPerRow ; + wxASSERT( data.GetDataLen() == (size_t)(height * bytesPerRow) ) ; + RealizeNative() ; + return true ; } -// Create a mask from a bitmap and a palette index indicating -// the transparent area -bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex) +// Create a mask from a mono bitmap (copies the bitmap). +bool wxMask::Create(const wxBitmap& bitmap) { -// TODO - wxCHECK_MSG( 0, false, wxT("Not implemented")); - return FALSE; + m_width = bitmap.GetWidth() ; + m_height = bitmap.GetHeight() ; + m_bytesPerRow = ( m_width + 3 ) & 0xFFFFFFC ; + size_t size = m_bytesPerRow * m_height ; + unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ; + memset( destdatabase , 0 , size ) ; + unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ; + for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow ) + { + unsigned char *destdata= destdatabase ; + for( int x = 0 ; x < m_width ; ++x ) + { + srcdata++ ; + unsigned char r = *srcdata++ ; + unsigned char g = *srcdata++ ; + unsigned char b = *srcdata++ ; + if ( ( r + g + b ) > 0x10 ) + *destdata++ = 0x00 ; + else + *destdata++ = 0xFF ; + } + } + m_memBuf.UngetWriteBuf( size ) ; + RealizeNative() ; + return TRUE; } // Create a mask from a bitmap and a colour indicating // the transparent area bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) { - if ( m_maskBitmap ) - { - wxMacDestroyGWorld( m_maskBitmap ) ; - m_maskBitmap = NULL ; - } - wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false, - wxT("Cannot create mask from this bitmap type (TODO)")); - // other types would require a temporary bitmap. not yet implemented - - wxCHECK_MSG( bitmap.Ok(), false, wxT("Illigal bitmap")); - - m_maskBitmap = wxMacCreateGWorld( bitmap.GetWidth() , bitmap.GetHeight() , 1 ); - LockPixels( GetGWorldPixMap( m_maskBitmap ) ); - LockPixels( GetGWorldPixMap( bitmap.GetHBITMAP() ) ); - RGBColor maskColor = colour.GetPixel(); - - // this is not very efficient, but I can't think - // of a better way of doing it - CGrafPtr origPort ; - GDHandle origDevice ; - RGBColor col; - RGBColor colors[2] = { - { 0xFFFF, 0xFFFF, 0xFFFF }, - { 0, 0, 0 }}; - - GetGWorld( &origPort , &origDevice ) ; - for (int w = 0; w < bitmap.GetWidth(); w++) + m_width = bitmap.GetWidth() ; + m_height = bitmap.GetHeight() ; + m_bytesPerRow = ( m_width + 3 ) & 0xFFFFFFC ; + size_t size = m_bytesPerRow * m_height ; + + unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ; + memset( destdatabase , 0 , size ) ; + unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ; + for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow) { - for (int h = 0; h < bitmap.GetHeight(); h++) - { - SetGWorld( bitmap.GetHBITMAP(), NULL ) ; - GetCPixel( w , h , &col ) ; - SetGWorld( m_maskBitmap , NULL ) ; - if (col.red == maskColor.red && col.green == maskColor.green && col.blue == maskColor.blue) - { - SetCPixel( w , h , &colors[0] ) ; - } + unsigned char *destdata= destdatabase ; + for( int x = 0 ; x < m_width ; ++x ) + { + srcdata++ ; + unsigned char r = *srcdata++ ; + unsigned char g = *srcdata++ ; + unsigned char b = *srcdata++ ; + if ( colour == wxColour( r , g , b) ) + *destdata++ = 0x00 ; else - { - SetCPixel( w , h , &colors[1] ) ; - } + *destdata++ = 0xFF ; } } - UnlockPixels( GetGWorldPixMap( (CGrafPtr) m_maskBitmap ) ) ; - UnlockPixels( GetGWorldPixMap( bitmap.GetHBITMAP() ) ) ; - SetGWorld( origPort , origDevice ) ; - + m_memBuf.UngetWriteBuf( size ) ; + RealizeNative() ; return TRUE; } -bool wxMask::PointMasked(int x, int y) +WXHBITMAP wxMask::GetHBITMAP() const { - WXHBITMAP origPort; - GDHandle origDevice; - RGBColor color; - bool masked = true; - - GetGWorld( &origPort, &origDevice); - - //Set port to mask and see if it masked (1) or not ( 0 ) - SetGWorld(m_maskBitmap, NULL); - LockPixels(GetGWorldPixMap(m_maskBitmap)); - GetCPixel(x,y, &color); - masked = !(color.red == 0 && color.green == 0 && color.blue == 0); - UnlockPixels(GetGWorldPixMap(m_maskBitmap)); - - SetGWorld( origPort, origDevice); - - return masked; + return m_maskBitmap ; } -/* - * wxBitmapHandler - */ +// ---------------------------------------------------------------------------- +// wxBitmapHandler +// ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) +wxBitmapHandler::~wxBitmapHandler() +{ +} bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth) { return FALSE; } -bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long type, +bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, int desiredWidth, int desiredHeight) { return FALSE; } -bool wxBitmapHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) +bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) { return FALSE; } -/* - * Standard handlers - */ +// ---------------------------------------------------------------------------- +// Standard Handlers +// ---------------------------------------------------------------------------- class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler { @@ -1107,9 +1288,9 @@ class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler public: inline wxPICTResourceHandler() { - m_name = "Macintosh Pict resource"; - m_extension = ""; - m_type = wxBITMAP_TYPE_PICT_RESOURCE; + SetName(wxT("Macintosh Pict resource")); + SetExtension(wxEmptyString); + SetType(wxBITMAP_TYPE_PICT_RESOURCE); }; virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, @@ -1120,306 +1301,99 @@ IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler) bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, int desiredWidth, int desiredHeight) { - Str255 theName ; - -#if TARGET_CARBON - c2pstrcpy( (StringPtr) theName , name ) ; -#else - strcpy( (char *) theName , name ) ; - c2pstr( (char *)theName ) ; -#endif - - PicHandle thePict = (PicHandle ) GetNamedResource( 'PICT' , theName ) ; - if ( thePict ) - { - PictInfo theInfo ; - - GetPictInfo( thePict , &theInfo , 0 , 0 , systemMethod , 0 ) ; - DetachResource( (Handle) thePict ) ; - M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypePict ; - M_BITMAPHANDLERDATA->m_hPict = thePict ; - M_BITMAPHANDLERDATA->m_width = theInfo.sourceRect.right - theInfo.sourceRect.left ; - M_BITMAPHANDLERDATA->m_height = theInfo.sourceRect.bottom - theInfo.sourceRect.top ; - - M_BITMAPHANDLERDATA->m_depth = theInfo.depth ; - M_BITMAPHANDLERDATA->m_ok = true ; - M_BITMAPHANDLERDATA->m_numColors = theInfo.uniqueColors ; -// M_BITMAPHANDLERDATA->m_bitmapPalette; -// M_BITMAPHANDLERDATA->m_quality; - return TRUE ; - } - return FALSE ; -} - -/* TODO: bitmap handlers, a bit like this: -class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler) -public: - inline wxBMPResourceHandler() - { - m_name = "Windows bitmap resource"; - m_extension = ""; - m_type = wxBITMAP_TYPE_BMP_RESOURCE; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); -}; -IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler) -*/ - -class WXDLLEXPORT wxXPMFileHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxXPMFileHandler) -public: - inline wxXPMFileHandler(void) - { - m_name = "XPM bitmap file"; - m_extension = "xpm"; - m_type = wxBITMAP_TYPE_XPM; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth = -1, int desiredHeight = -1); - virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); -}; -IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler) + Str255 theName ; + wxMacStringToPascal( name , theName ) ; -bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) -{ -#if USE_XPM_IN_MSW - XImage *ximage; - XpmAttributes xpmAttr; - HDC dc; - - M_BITMAPHANDLERDATA->m_ok = FALSE; - dc = CreateCompatibleDC(NULL); - if (dc) + PicHandle thePict = (PicHandle ) GetNamedResource( 'PICT' , theName ) ; + if ( thePict ) { - xpmAttr.valuemask = XpmReturnPixels; - int errorStatus = XpmReadFileToImage(&dc, WXSTRINGCAST name, &ximage, (XImage **) NULL, &xpmAttr); - DeleteDC(dc); - if (errorStatus == XpmSuccess) - { - M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap; - - BITMAP bm; - GetObject((HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm); - - M_BITMAPHANDLERDATA->m_width = (bm.bmWidth); - M_BITMAPHANDLERDATA->m_height = (bm.bmHeight); - M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel); - M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels; - XpmFreeAttributes(&xpmAttr); - XImageFree(ximage); - - M_BITMAPHANDLERDATA->m_ok = TRUE; - return TRUE; - } - else - { - M_BITMAPHANDLERDATA->m_ok = FALSE; - return FALSE; - } + wxMetafile mf ; + mf.SetHMETAFILE((WXHMETAFILE) thePict ) ; + bitmap->Create( mf.GetWidth() , mf.GetHeight() ) ; + wxMemoryDC dc ; + dc.SelectObject( *bitmap ) ; + mf.Play( &dc ) ; + dc.SelectObject( wxNullBitmap ) ; + return TRUE ; } -#endif - - return FALSE; + return FALSE ; } -bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) +void wxBitmap::InitStandardHandlers() { -#if USE_XPM_IN_MSW - HDC dc = NULL; - - Visual *visual = NULL; - XImage ximage; - - dc = CreateCompatibleDC(NULL); - if (dc) - { - if (SelectObject(dc, (HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap)) - { - - ximage.width = M_BITMAPHANDLERDATA->m_width; - ximage.height = M_BITMAPHANDLERDATA->m_height; - ximage.depth = M_BITMAPHANDLERDATA->m_depth; - ximage.bitmap = (void *)M_BITMAPHANDLERDATA->m_hBitmap; - int errorStatus = XpmWriteFileFromImage(&dc, WXSTRINGCAST name, - &ximage, (XImage *) NULL, (XpmAttributes *) NULL); - - if (dc) - DeleteDC(dc); - - if (errorStatus == XpmSuccess) - return TRUE; - else - return FALSE; - } else return FALSE; - } else return FALSE; -#else - return FALSE; -#endif + AddHandler(new wxPICTResourceHandler) ; + AddHandler(new wxICONResourceHandler) ; } +// ---------------------------------------------------------------------------- +// raw bitmap access support +// ---------------------------------------------------------------------------- -class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxXPMDataHandler) -public: - inline wxXPMDataHandler(void) - { - m_name = "XPM bitmap data"; - m_extension = "xpm"; - m_type = wxBITMAP_TYPE_XPM_DATA; - }; - - virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1); -}; -IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler) - -bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth) +void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) { - XImage * ximage = NULL ; - XImage * xshapeimage = NULL ; - int ErrorStatus; - XpmAttributes xpmAttr; - - xpmAttr.valuemask = XpmReturnInfos; // get infos back - ErrorStatus = XpmCreateImageFromData( GetMainDevice() , (char **)data, - &ximage, &xshapeimage, &xpmAttr); - - if (ErrorStatus == XpmSuccess) + if ( !Ok() ) { - M_BITMAPHANDLERDATA->m_ok = FALSE; - M_BITMAPHANDLERDATA->m_numColors = 0; - M_BITMAPHANDLERDATA->m_hBitmap = ximage->gworldptr ; - - M_BITMAPHANDLERDATA->m_width = ximage->width; - M_BITMAPHANDLERDATA->m_height = ximage->height; - M_BITMAPHANDLERDATA->m_depth = ximage->depth; - M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels; - XpmFreeAttributes(&xpmAttr); - M_BITMAPHANDLERDATA->m_ok = TRUE; - ximage->gworldptr = NULL ; - XImageFree(ximage); // releases the malloc, but does not detroy - // the bitmap - M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeGrafWorld ; - if ( xshapeimage != NULL ) - { - wxMask* m = new wxMask() ; - m->SetMaskBitmap( xshapeimage->gworldptr ) ; - M_BITMAPHANDLERDATA->m_bitmapMask = m ; - } - return TRUE; - } - else - { - M_BITMAPHANDLERDATA->m_ok = FALSE; - return FALSE; + // no bitmap, no data (raw or otherwise) + return NULL; } - return FALSE; + + data.m_width = GetWidth() ; + data.m_height = GetHeight() ; + data.m_stride = GetWidth() * 4 ; + return GetRawAccess() ; } -class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler +void wxBitmap::UngetRawData(wxPixelDataBase& dataBase) { - DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler) -public: - inline wxBMPResourceHandler() - { - m_name = "Windows bitmap resource"; - m_extension = ""; - m_type = wxBITMAP_TYPE_BMP_RESOURCE; - }; + if ( !Ok() ) + return; - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); -}; + // TODO : if we have some information about the API we should check + // this code looks strange... -IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler) + if ( M_BITMAPDATA->HasAlpha() ) + { + wxAlphaPixelData& data = (wxAlphaPixelData&)dataBase; -bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) -{ - // TODO: load colourmap. - // it's probably not found - wxLogError("Can't load bitmap '%s' from resources! Check .rc file.", name.c_str()); + int w = data.GetWidth(), + h = data.GetHeight(); - return FALSE; -} + wxBitmap bmpMask(GetWidth(), GetHeight(), 32); + wxAlphaPixelData dataMask(bmpMask, data.GetOrigin(), wxSize(w, h)); + wxAlphaPixelData::Iterator pMask(dataMask), + p(data); + for ( int y = 0; y < h; y++ ) + { + wxAlphaPixelData::Iterator rowStartMask = pMask, + rowStart = p; -class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxBMPFileHandler) -public: - inline wxBMPFileHandler(void) - { - m_name = "Windows bitmap file"; - m_extension = "bmp"; - m_type = wxBITMAP_TYPE_BMP; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); - virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); -}; + for ( int x = 0; x < w; x++ ) + { + const wxAlphaPixelData::Iterator::ChannelType + alpha = p.Alpha(); -IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler) + pMask.Red() = alpha; + pMask.Green() = alpha; + pMask.Blue() = alpha; -bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) -{ -#if USE_IMAGE_LOADING_IN_MSW - wxPalette *palette = NULL; - bool success = FALSE; - success = (wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0); - if (!success && palette) - { - delete palette; - palette = NULL; - } - if (palette) - M_BITMAPHANDLERDATA->m_bitmapPalette = *palette; - return success; -#else - return FALSE; -#endif -} + ++p; + ++pMask; + } -bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal) -{ -#if USE_IMAGE_LOADING_IN_MSW - wxPalette *actualPalette = (wxPalette *)pal; - if (!actualPalette && (!M_BITMAPHANDLERDATA->m_bitmapPalette.IsNull())) - actualPalette = & (M_BITMAPHANDLERDATA->m_bitmapPalette); - return (wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0); -#else - return FALSE; -#endif -} + p = rowStart; + p.OffsetY(data, 1); + pMask = rowStartMask; + pMask.OffsetY(dataMask, 1); + } -void wxBitmap::CleanUpHandlers() -{ - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - wxNode *next = node->Next(); - delete handler; - delete node; - node = next; + SetMask(new wxMask(bmpMask)); } } -void wxBitmap::InitStandardHandlers() +void wxBitmap::UseAlpha() { - AddHandler( new wxPICTResourceHandler ) ; - AddHandler( new wxICONResourceHandler ) ; - AddHandler(new wxXPMFileHandler); - AddHandler(new wxXPMDataHandler); - AddHandler(new wxBMPResourceHandler); - AddHandler(new wxBMPFileHandler); + // remember that we are using alpha channel, we'll need to create a proper + // mask in UngetRawData() + M_BITMAPDATA->UseAlpha( true ); }