X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..5f480c0bf140db144e00993b060af28e45cd9c94:/src/x11/bitmap.cpp?ds=sidebyside diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index 7e42116984..fac57599b1 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -224,18 +224,24 @@ bool wxMask::Create( const wxBitmap& bitmap ) } //----------------------------------------------------------------------------- -// wxBitmap +// wxBitmapRefData //----------------------------------------------------------------------------- -class wxBitmapRefData: public wxObjectRefData +class wxBitmapRefData : public wxGDIRefData { public: wxBitmapRefData(); + wxBitmapRefData(const wxBitmapRefData& data); virtual ~wxBitmapRefData(); - WXPixmap m_pixmap; - WXPixmap m_bitmap; - WXDisplay *m_display; + // shouldn't be called more than once as it doesn't free the existing data + bool Create(int width, int height, int depth); + + virtual bool IsOk() const { return m_pixmap || m_bitmap; } + + Pixmap m_pixmap; + Pixmap m_bitmap; + Display *m_display; wxMask *m_mask; int m_width; int m_height; @@ -245,22 +251,67 @@ public: wxBitmapRefData::wxBitmapRefData() { - m_pixmap = NULL; - m_bitmap = NULL; + m_pixmap = 0; + m_bitmap = 0; m_display = NULL; - m_mask = (wxMask *) NULL; + m_mask = NULL; m_width = 0; m_height = 0; m_bpp = 0; - m_palette = (wxPalette *) NULL; + m_palette = NULL; +} + +wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data) +{ + m_pixmap = 0; + m_bitmap = 0; + m_display = data.m_display; + m_mask = NULL; // FIXME: should copy + m_palette = NULL; // FIXME: should copy + + Create(data.m_width, data.m_height, data.m_bpp); +} + +bool wxBitmapRefData::Create(int width, int height, int depth) +{ + m_width = width; + m_height = height; + m_bpp = depth; + + m_display = wxGlobalDisplay(); + + wxCHECK_MSG( m_display, false, wxT("No display") ); + + int xscreen = DefaultScreen(m_display); + int bpp = DefaultDepth(m_display, xscreen); + if ( depth == -1 ) + depth = bpp; + + wxCHECK_MSG( (depth == bpp) || (depth == 1), false, + wxT("invalid bitmap depth") ); + +#if wxUSE_NANOX + m_pixmap = (WXPixmap) GrNewPixmap(width, height, NULL); +#else // !wxUSE_NANOX + Window xroot = RootWindow(m_display, xscreen); + + *(depth == 1 ? &m_bitmap : &m_pixmap) = + XCreatePixmap(m_display, xroot, width, height, depth); +#endif // wxUSE_NANOX/!wxUSE_NANOX + + wxCHECK_MSG( m_pixmap || m_bitmap, false, wxT("Bitmap creation failed") ); + + return true; } wxBitmapRefData::~wxBitmapRefData() { - if (m_pixmap) XFreePixmap( (Display*) m_display, (Pixmap) m_pixmap ); - if (m_bitmap) XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap ); - if (m_mask) delete m_mask; - if (m_palette) delete m_palette; + if (m_pixmap) + XFreePixmap(m_display, m_pixmap); + if (m_bitmap) + XFreePixmap(m_display, m_bitmap); + delete m_mask; + delete m_palette; } //----------------------------------------------------------------------------- @@ -296,18 +347,14 @@ static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap, return (WXPixmap)ret; } -#define M_BMPDATA ((wxBitmapRefData *)m_refData) -IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) +//----------------------------------------------------------------------------- +// wxBitmap +//----------------------------------------------------------------------------- -wxBitmap::wxBitmap() -{ -} +#define M_BMPDATA ((wxBitmapRefData *)m_refData) -wxBitmap::wxBitmap( int width, int height, int depth ) -{ - Create( width, height, depth ); -} +IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) bool wxBitmap::Create( int width, int height, int depth ) { @@ -317,47 +364,7 @@ bool wxBitmap::Create( int width, int height, int depth ) m_refData = new wxBitmapRefData(); - M_BMPDATA->m_display = wxGlobalDisplay(); - - wxASSERT_MSG( M_BMPDATA->m_display, wxT("No display") ); - - int xscreen = DefaultScreen( (Display*) M_BMPDATA->m_display ); - Window xroot = RootWindow( (Display*) M_BMPDATA->m_display, xscreen ); - - int bpp = DefaultDepth( (Display*) M_BMPDATA->m_display, xscreen ); - if (depth == -1) depth = bpp; - - wxCHECK_MSG( (depth == bpp) || - (depth == 1), false, wxT("invalid bitmap depth") ); - - M_BMPDATA->m_mask = (wxMask *) NULL; - M_BMPDATA->m_width = width; - M_BMPDATA->m_height = height; - -#if wxUSE_NANOX - M_BMPDATA->m_pixmap = (WXPixmap) GrNewPixmap(width, height, NULL); - M_BMPDATA->m_bpp = bpp; - - wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("Bitmap creation failed") ); -#else - if (depth == 1) - { - M_BMPDATA->m_bitmap = (WXPixmap) XCreatePixmap( (Display*) M_BMPDATA->m_display, xroot, width, height, 1 ); - - wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("Bitmap creation failed") ); - - M_BMPDATA->m_bpp = 1; - } - else - { - M_BMPDATA->m_pixmap = (WXPixmap) XCreatePixmap( (Display*) M_BMPDATA->m_display, xroot, width, height, depth ); - - wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("Pixmap creation failed") ); - - M_BMPDATA->m_bpp = depth; - } -#endif - return Ok(); + return M_BMPDATA->Create(width, height, depth); } bool wxBitmap::Create(const void* data, wxBitmapType type, @@ -387,13 +394,12 @@ bool wxBitmap::Create(WXPixmap pixmap) // make a copy of the Pixmap Window root; - Pixmap copy; int x, y; unsigned width, height, border, depth; XGetGeometry( xdisplay, (Drawable)xpixmap, &root, &x, &y, &width, &height, &border, &depth ); - copy = XCreatePixmap( xdisplay, xroot, width, height, depth ); + Pixmap copy = XCreatePixmap( xdisplay, xroot, width, height, depth ); GC gc = XCreateGC( xdisplay, copy, 0, NULL ); XCopyArea( xdisplay, xpixmap, copy, gc, 0, 0, width, height, 0, 0 ); @@ -403,11 +409,11 @@ bool wxBitmap::Create(WXPixmap pixmap) wxBitmapRefData* ref = new wxBitmapRefData(); if( depth == 1 ) - ref->m_bitmap = (WXPixmap)copy; + ref->m_bitmap = copy; else - ref->m_pixmap = (WXPixmap)copy; + ref->m_pixmap = copy; - ref->m_display = (WXDisplay*)xdisplay; + ref->m_display = xdisplay; ref->m_width = width; ref->m_height = height; ref->m_bpp = depth; @@ -422,6 +428,16 @@ wxBitmap::wxBitmap(const char* const* bits) Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); } +wxGDIRefData *wxBitmap::CreateGDIRefData() const +{ + return new wxBitmapRefData; +} + +wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const +{ + return new wxBitmapRefData(*static_cast(data)); +} + bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) { #if wxUSE_NANOX @@ -573,12 +589,13 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) return false; } - M_BMPDATA->m_pixmap = (WXPixmap) XCreatePixmap( xdisplay, xroot, width, height, depth ); + M_BMPDATA->m_pixmap = XCreatePixmap( xdisplay, xroot, width, height, depth ); - // Create mask + // Create mask if necessary + const bool hasMask = image.HasMask(); - XImage *mask_image = (XImage*) NULL; - if (image.HasMask()) + XImage *mask_image = NULL; + if ( hasMask ) { mask_image = XCreateImage( xdisplay, xvisual, 1, ZPixmap, 0, 0, width, height, 32, 0 ); mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height ); @@ -628,8 +645,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) unsigned char *colorCube = wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_colorCube; - bool hasMask = image.HasMask(); - int index = 0; for (int y = 0; y < height; y++) { @@ -917,21 +932,6 @@ wxBitmap::~wxBitmap() { } -bool wxBitmap::operator == ( const wxBitmap& bmp ) const -{ - return m_refData == bmp.m_refData; -} - -bool wxBitmap::operator != ( const wxBitmap& bmp ) const -{ - return m_refData != bmp.m_refData; -} - -bool wxBitmap::IsOk() const -{ - return (m_refData != NULL); -} - int wxBitmap::GetHeight() const { wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); @@ -955,7 +955,7 @@ int wxBitmap::GetDepth() const wxMask *wxBitmap::GetMask() const { - wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_mask; } @@ -964,6 +964,7 @@ void wxBitmap::SetMask( wxMask *mask ) { wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + AllocExclusive(); if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; M_BMPDATA->m_mask = mask; @@ -1070,8 +1071,8 @@ void wxBitmap::SetPalette(const wxPalette& palette) wxCHECK_RET(GetDepth() > 1 && GetDepth() <= 8, wxT("cannot set palette for bitmap of this depth")); - delete M_BMPDATA->m_palette; - M_BMPDATA->m_palette = NULL; + AllocExclusive(); + wxDELETE(M_BMPDATA->m_palette); if (!palette.Ok()) return; @@ -1080,28 +1081,28 @@ void wxBitmap::SetPalette(const wxPalette& palette) wxPalette *wxBitmap::GetPalette() const { - if (!Ok()) return (wxPalette *) NULL; + if (!Ok()) return NULL; return M_BMPDATA->m_palette; } void wxBitmap::SetHeight( int height ) { - if (!m_refData) m_refData = new wxBitmapRefData(); + AllocExclusive(); M_BMPDATA->m_height = height; } void wxBitmap::SetWidth( int width ) { - if (!m_refData) m_refData = new wxBitmapRefData(); + AllocExclusive(); M_BMPDATA->m_width = width; } void wxBitmap::SetDepth( int depth ) { - if (!m_refData) m_refData = new wxBitmapRefData(); + AllocExclusive(); M_BMPDATA->m_bpp = depth; } @@ -1110,40 +1111,41 @@ void wxBitmap::SetPixmap( WXPixmap pixmap ) { if (!m_refData) m_refData = new wxBitmapRefData(); - M_BMPDATA->m_pixmap = pixmap; + M_BMPDATA->m_pixmap = (Pixmap)pixmap; } void wxBitmap::SetBitmap( WXPixmap bitmap ) { if (!m_refData) m_refData = new wxBitmapRefData(); - M_BMPDATA->m_bitmap = bitmap; + M_BMPDATA->m_bitmap = (Pixmap)bitmap; } WXPixmap wxBitmap::GetPixmap() const { wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); - return M_BMPDATA->m_pixmap; + return (WXPixmap)M_BMPDATA->m_pixmap; } WXPixmap wxBitmap::GetBitmap() const { wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); - return M_BMPDATA->m_bitmap; + return (WXPixmap)M_BMPDATA->m_bitmap; } WXPixmap wxBitmap::GetDrawable() const { wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); - return M_BMPDATA->m_bpp == 1 ? M_BMPDATA->m_bitmap : M_BMPDATA->m_pixmap; + return (WXPixmap)(M_BMPDATA->m_bpp == 1 ? M_BMPDATA->m_bitmap + : M_BMPDATA->m_pixmap); } WXDisplay *wxBitmap::GetDisplay() const { - wxCHECK_MSG( Ok(), (WXDisplay*) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_display; } @@ -1289,8 +1291,6 @@ int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixe // Bitmap handlers // ============================================================================ -IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase) - #define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData()) #if wxUSE_XPM @@ -1303,7 +1303,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase) class wxXPMFileHandler : public wxBitmapHandler { - DECLARE_DYNAMIC_CLASS(wxXPMFileHandler) public: wxXPMFileHandler() { @@ -1312,21 +1311,31 @@ public: SetType( wxBITMAP_TYPE_XPM ); }; - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, + wxBitmapType flags, int desiredWidth, int desiredHeight); virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, - int type, const wxPalette *palette = NULL); - - virtual bool Create(wxBitmap *WXUNUSED(bitmap), const void* WXUNUSED(data), long WXUNUSED(flags), - int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth) = 1) + wxBitmapType type, + const wxPalette *palette = NULL) const; + + virtual bool Create(wxBitmap *WXUNUSED(bitmap), + const void* WXUNUSED(data), + wxBitmapType WXUNUSED(flags), + int WXUNUSED(width), + int WXUNUSED(height), + int WXUNUSED(depth) = 1) { return false; } + + DECLARE_DYNAMIC_CLASS(wxXPMFileHandler) }; IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler) -bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, - long WXUNUSED(flags), int WXUNUSED(desiredWidth), +bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, + const wxString& name, + wxBitmapType WXUNUSED(flags), + int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) { #if wxHAVE_LIB_XPM @@ -1349,7 +1358,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, Pixmap mask = 0; int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot, - (char*) name.c_str(), + (char*) ((const char*) name.c_str()), &pixmap, &mask, &xpmAttr); if (ErrorStatus == XpmSuccess) @@ -1361,7 +1370,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, XpmFreeAttributes(&xpmAttr); - M_BMPHANDLERDATA->m_bitmap = (WXPixmap) pixmap; + M_BMPHANDLERDATA->m_bitmap = (Pixmap) pixmap; if (mask) { @@ -1381,10 +1390,10 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, #elif wxUSE_STREAMS wxXPMDecoder decoder; wxFileInputStream stream(name); - if (stream.Ok()) + if (stream.IsOk()) { wxImage image(decoder.ReadFile(stream)); - return image.Ok() && bitmap->CreateFromImage(image); + return image.IsOk() && bitmap->CreateFromImage(image); } return false; @@ -1393,12 +1402,14 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, #endif // wxHAVE_LIB_XPM / wxUSE_STREAMS } -bool wxXPMFileHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, - int type, - const wxPalette *WXUNUSED(palette)) +bool wxXPMFileHandler::SaveFile(const wxBitmap *bitmap, + const wxString& name, + wxBitmapType type, + const wxPalette *WXUNUSED(palette)) const { wxImage image(bitmap->ConvertToImage()); - if (image.Ok()) return image.SaveFile( name, (wxBitmapType)type ); + if (image.Ok()) + return image.SaveFile( name, type ); return false; } @@ -1422,25 +1433,25 @@ public: virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), - long WXUNUSED(flags), + wxBitmapType WXUNUSED(flags), int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) { return false; } virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), - int WXUNUSED(type), - const wxPalette *WXUNUSED(palette) = NULL) + wxBitmapType WXUNUSED(type), + const wxPalette *WXUNUSED(palette) = NULL) const { return false; } - virtual bool Create(wxBitmap *bitmap, const void* data, long flags, + virtual bool Create(wxBitmap *bitmap, const void* data, wxBitmapType flags, int width, int height, int depth = 1); }; IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler) bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits, - long WXUNUSED(flags), + wxBitmapType WXUNUSED(flags), int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth)) { #if wxHAVE_LIB_XPM @@ -1474,7 +1485,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits, M_BMPHANDLERDATA->m_bpp = bpp; // mono as well? -#if __WXDEBUG__ +#if wxDEBUG_LEVEL unsigned int depthRet; int xRet, yRet; unsigned int widthRet, heightRet, borderWidthRet; @@ -1482,11 +1493,11 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits, &widthRet, &heightRet, &borderWidthRet, &depthRet); wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") ); -#endif +#endif // wxDEBUG_LEVEL XpmFreeAttributes(&xpmAttr); - M_BMPHANDLERDATA->m_pixmap = (WXPixmap) pixmap; + M_BMPHANDLERDATA->m_pixmap = (Pixmap) pixmap; if (mask) { @@ -1528,25 +1539,25 @@ public: virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), - long WXUNUSED(flags), + wxBitmapType WXUNUSED(flags), int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) { return false; } virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), - int WXUNUSED(type), - const wxPalette *WXUNUSED(palette) = NULL) + wxBitmapType WXUNUSED(type), + const wxPalette *WXUNUSED(palette) = NULL) const { return false; } - virtual bool Create(wxBitmap *bitmap, const void* data, long flags, + virtual bool Create(wxBitmap *bitmap, const void* data, wxBitmapType type, int width, int height, int depth = 1); }; IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler) bool wxXBMDataHandler::Create( wxBitmap *bitmap, const void* bits, - long WXUNUSED(flags), + wxBitmapType WXUNUSED(type), int width, int height, int WXUNUSED(depth)) { #if !wxUSE_NANOX @@ -1560,10 +1571,10 @@ bool wxXBMDataHandler::Create( wxBitmap *bitmap, const void* bits, int xscreen = DefaultScreen( xdisplay ); Window xroot = RootWindow( xdisplay, xscreen ); - M_BMPHANDLERDATA->m_mask = (wxMask *) NULL; + M_BMPHANDLERDATA->m_mask = NULL; M_BMPHANDLERDATA->m_bitmap = - (WXPixmap) XCreateBitmapFromData( xdisplay, xroot, - (char *) bits, width, height ); + XCreateBitmapFromData(xdisplay, xroot, + (char *) bits, width, height ); M_BMPHANDLERDATA->m_width = width; M_BMPHANDLERDATA->m_height = height; M_BMPHANDLERDATA->m_bpp = 1;