rebaked after listctrl/imagelist and wxUniv changes

[wxWidgets.git] / src / dfb / bitmap.cpp

diff --git a/src/dfb/bitmap.cpp b/src/dfb/bitmap.cpp
index 691898dc8e656a5a67c670e47619c0e19bf8ddb4..b50e4aac90cd8313a34d3b2d8ab93378b1ff93bd 100644 (file)
--- a/src/dfb/bitmap.cpp
+++ b/src/dfb/bitmap.cpp
@@ -49,6 +49,27 @@ static wxColour wxQuantizeColour(const wxColour& clr, const wxBitmap& bmp)
 #endif
 }
 
+// Creates a surface that will use wxImage's pixel data (RGB only)
+static wxIDirectFBSurfacePtr CreateSurfaceForImage(const wxImage& image)
+{
+    wxCHECK_MSG( image.Ok(), NULL, _T("invalid image") );
+    // FIXME_DFB: implement alpha handling by merging alpha buffer with RGB
+    //            into a temporary RGBA surface
+    wxCHECK_MSG( !image.HasAlpha(), NULL, _T("alpha channel not supported") );
+
+    DFBSurfaceDescription desc;
+    desc.flags = (DFBSurfaceDescriptionFlags)
+        (DSDESC_CAPS | DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT |
+         DSDESC_PREALLOCATED);
+    desc.caps = DSCAPS_NONE;
+    desc.width = image.GetWidth();
+    desc.height = image.GetHeight();
+    desc.pixelformat = DSPF_RGB24;
+    desc.preallocated[0].data = image.GetData();
+    desc.preallocated[0].pitch = 3 * desc.width;
+
+    return wxIDirectFB::Get()->CreateSurface(&desc);
+}
 
 //-----------------------------------------------------------------------------
 // wxMask
@@ -158,8 +179,9 @@ public:
 
     wxBitmapRefData(const wxBitmapRefData& data)
     {
-        m_surface = wxDfbCloneSurface(data.m_surface,
-                                      wxDfbCloneSurface_NoPixels);
+        if ( data.m_surface )
+            m_surface = data.m_surface->Clone();
+
         m_mask = data.m_mask ? new wxMask(*data.m_mask) : NULL;
 #if wxUSE_PALETTE
         m_palette = data.m_palette ? new wxPalette(*data.m_palette) : NULL;
@@ -174,10 +196,10 @@ public:
 #endif
     }
 
-    IDirectFBSurfacePtr m_surface;
-    wxMask             *m_mask;
+    wxIDirectFBSurfacePtr m_surface;
+    wxMask               *m_mask;
 #if wxUSE_PALETTE
-    wxPalette          *m_palette;
+    wxPalette            *m_palette;
 #endif
 };
 
@@ -195,11 +217,23 @@ wxBitmap::wxBitmap(int width, int height, int depth)
     Create(width, height, depth);
 }
 
+bool wxBitmap::Create(const wxIDirectFBSurfacePtr& surface)
+{
+    UnRef();
+
+    wxCHECK_MSG( surface, false, _T("invalid surface") );
+
+    m_refData = new wxBitmapRefData();
+    M_BITMAP->m_surface = surface;
+    return true;
+}
+
 bool wxBitmap::Create(int width, int height, int depth)
 {
     UnRef();
 
     wxCHECK_MSG( width > 0 && height > 0, false, wxT("invalid bitmap size") );
+    wxCHECK_MSG( depth == -1, false, wxT("only default depth supported now") );
 
     DFBSurfaceDescription desc;
     desc.flags = (DFBSurfaceDescriptionFlags)(
@@ -208,15 +242,7 @@ bool wxBitmap::Create(int width, int height, int depth)
     desc.width = width;
     desc.height = height;
 
-    IDirectFBSurfacePtr surface;
-    IDirectFBPtr dfb(wxTheApp->GetDirectFBInterface());
-    if ( !DFB_CALL( dfb->CreateSurface(dfb, &desc, &surface) ) )
-        return false;
-
-    m_refData = new wxBitmapRefData();
-    M_BITMAP->m_surface = surface;
-
-    return true;
+    return Create(wxIDirectFB::Get()->CreateSurface(&desc));
 }
 
 #warning "FIXME: move this to common code"
@@ -242,13 +268,41 @@ bool wxBitmap::CreateFromXpm(const char **bits)
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {
     wxCHECK_RET( image.Ok(), wxT("invalid image") );
+
+    // create surface in screen's format:
+    if ( !Create(image.GetWidth(), image.GetHeight(), depth) )
+        return;
+
+    // then copy the image to it:
+    wxIDirectFBSurfacePtr src(CreateSurfaceForImage(image));
+    wxIDirectFBSurfacePtr dst = M_BITMAP->m_surface;
+
+    if ( !dst->SetBlittingFlags(DSBLIT_NOFX) )
+        return;
+    if ( !dst->Blit(src->GetRaw(), NULL, 0, 0) )
+        return;
+
+    // FIXME: implement mask creation from image's mask (or alpha channel?)
+    wxASSERT_MSG( !image.HasMask(), _T("image masks are ignored for now") );
 }
 
 wxImage wxBitmap::ConvertToImage() const
 {
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
-    return wxNullImage; // FIXME
+    wxImage img(GetWidth(), GetHeight());
+    wxIDirectFBSurfacePtr dst(CreateSurfaceForImage(img));
+    wxIDirectFBSurfacePtr src = M_BITMAP->m_surface;
+
+    if ( !dst->SetBlittingFlags(DSBLIT_NOFX) )
+        return wxNullImage;
+    if ( !dst->Blit(src->GetRaw(), NULL, 0, 0) )
+        return wxNullImage;
+
+    // FIXME: implement mask setting in the image
+    wxASSERT_MSG( GetMask() == NULL, _T("bitmap masks are ignored for now") );
+
+    return img;
 }
 #endif // wxUSE_IMAGE
 
@@ -260,6 +314,8 @@ wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 {
     wxCHECK_RET( depth == 1, wxT("can only create mono bitmap from XBM data") );
+
+    wxFAIL_MSG( _T("not implemented") );
 }
 
 bool wxBitmap::Ok() const
@@ -278,7 +334,7 @@ int wxBitmap::GetHeight() const
     wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 
     int h = -1;
-    DFB_CALL( M_BITMAP->m_surface->GetSize(M_BITMAP->m_surface, NULL, &h) );
+    M_BITMAP->m_surface->GetSize(NULL, &h);
     return h;
 }
 
@@ -287,7 +343,7 @@ int wxBitmap::GetWidth() const
     wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 
     int w = -1;
-    DFB_CALL( M_BITMAP->m_surface->GetSize(M_BITMAP->m_surface, &w, NULL) );
+    M_BITMAP->m_surface->GetSize(&w, NULL);
     return w;
 }
 
@@ -295,7 +351,7 @@ int wxBitmap::GetDepth() const
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 
-    return wxDfbGetSurfaceDepth(M_BITMAP->m_surface);
+    return M_BITMAP->m_surface->GetDepth();
 }
 
 wxMask *wxBitmap::GetMask() const
@@ -328,6 +384,10 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const
                  wxNullBitmap,
                  wxT("invalid bitmap or bitmap region") );
 
+    // NB: DirectFB subsurfaces share the same pixels buffer, so we must
+    //     clone the obtained subsurface
+    DFBRectangle r = { rect.x, rect.y, rect.width, rect.height };
+    return wxBitmap(M_BITMAP->m_surface->GetSubSurface(&r)->Clone());
 }
 
 #warning "to common code"
@@ -409,22 +469,25 @@ void wxBitmap::SetPalette(const wxPalette& palette)
 void wxBitmap::SetHeight(int height)
 {
     AllocExclusive();
-#warning "todo"
+
+    wxFAIL_MSG( _T("SetHeight not implemented") );
 }
 
 void wxBitmap::SetWidth(int width)
 {
     AllocExclusive();
-#warning "todo"
+
+    wxFAIL_MSG( _T("SetWidth not implemented") );
 }
 
 void wxBitmap::SetDepth(int depth)
 {
     AllocExclusive();
-#warning "todo"
+
+    wxFAIL_MSG( _T("SetDepth not implemented") );
 }
 
-IDirectFBSurfacePtr wxBitmap::GetDirectFBSurface() const
+wxIDirectFBSurfacePtr wxBitmap::GetDirectFBSurface() const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );