X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/288efe84da6dc93db88c0a89f6be66e0ef4545f3..06a32e049c1bad9249079ad2e91659303424a774:/src/x11/bitmap.cpp diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index 31fd1858f0..b35d0861ac 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.cpp +// Name: src/x11/bitmap.cpp // Purpose: wxBitmap // Author: Julian Smart, Robert Roebling // Modified by: @@ -9,17 +9,18 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "bitmap.h" -#endif +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/bitmap.h" -#include "wx/icon.h" -#include "wx/log.h" -#include "wx/image.h" -#include "wx/app.h" -#if wxUSE_NANOX -#include "wx/dcmemory.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/dcmemory.h" + #include "wx/icon.h" + #include "wx/math.h" + #include "wx/image.h" #endif #include "wx/x11/private.h" @@ -33,6 +34,10 @@ bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, int height, wxImage& image); #endif +static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap, + int x, int y, int width, int height, + int depth ); + #if wxUSE_XPM #if wxHAVE_LIB_XPM #include @@ -41,7 +46,6 @@ bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, #include "wx/wfstream.h" #endif #endif -#include //----------------------------------------------------------------------------- // wxMask @@ -55,6 +59,24 @@ wxMask::wxMask() m_display = NULL; } +wxMask::wxMask(const wxMask& mask) +{ + m_display = mask.m_display; + if ( !mask.m_bitmap ) + { + m_bitmap = NULL; + return; + } + + m_size = mask.m_size; + + // Duplicate the mask bitmap using the existing wxGetSubPixmap() function. + // There are probably/surely better ways to do it. + m_bitmap = wxGetSubPixmap(m_display, mask.m_bitmap, + 0, 0, m_size.x, m_size.y, + 1); +} + wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) { m_bitmap = NULL; @@ -82,6 +104,8 @@ wxMask::~wxMask() bool wxMask::Create( const wxBitmap& bitmap, const wxColour& colour ) { + m_size = bitmap.GetSize(); + #if !wxUSE_NANOX if (m_bitmap) { @@ -91,18 +115,15 @@ bool wxMask::Create( const wxBitmap& bitmap, m_display = bitmap.GetDisplay(); - wxImage image( bitmap ); - if (!image.Ok()) return FALSE; - + wxImage image = bitmap.ConvertToImage(); + if (!image.IsOk()) return false; + m_display = bitmap.GetDisplay(); - - Display *xdisplay = (Display*) m_display; + Display *xdisplay = (Display*) m_display; int xscreen = DefaultScreen( xdisplay ); Window xroot = RootWindow( xdisplay, xscreen ); - Visual* xvisual = DefaultVisual( xdisplay, xscreen ); - int bpp = DefaultDepth( xdisplay, xscreen ); - + m_bitmap = (WXPixmap) XCreatePixmap( xdisplay, xroot, image.GetWidth(), image.GetHeight(), 1 ); GC gc = XCreateGC( xdisplay, (Pixmap) m_bitmap, 0, NULL ); @@ -117,35 +138,25 @@ bool wxMask::Create( const wxBitmap& bitmap, unsigned char green = colour.Green(); unsigned char blue = colour.Blue(); - XVisualInfo vinfo_template; - XVisualInfo *vi; + int bpp = wxTheApp->GetVisualInfo(m_display)->m_visualDepth; - vinfo_template.visual = xvisual; - vinfo_template.visualid = XVisualIDFromVisual( xvisual ); - vinfo_template.depth = bpp; - int nitem = 0; - - vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); - wxASSERT_MSG( vi, wxT("No visual info") ); - - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; if (bpp == 15) { - red = red & 0xf8; - green = green & 0xf8; - blue = blue & 0xf8; + red &= 0xf8; + green &= 0xf8; + blue &= 0xf8; } else if (bpp == 16) { - red = red & 0xf8; - green = green & 0xfc; - blue = blue & 0xf8; + red &= 0xf8; + green &= 0xfc; + blue &= 0xf8; } else if (bpp == 12) { - red = red & 0xf0; - green = green & 0xf0; - blue = blue & 0xf0; + red &= 0xf0; + green &= 0xf0; + blue &= 0xf0; } XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) ); @@ -178,12 +189,12 @@ bool wxMask::Create( const wxBitmap& bitmap, if (start_x != -1) XDrawLine( xdisplay, (Pixmap) m_bitmap, gc, start_x, j, i, j ); } - + XFreeGC( xdisplay, gc ); - return TRUE; + return true; #else - return FALSE; + return false; #endif // wxUSE_NANOX } @@ -193,7 +204,7 @@ bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex ) unsigned char r,g,b; wxPalette *pal = bitmap.GetPalette(); - wxCHECK_MSG( pal, FALSE, wxT("Cannot create mask from bitmap without palette") ); + wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") ); pal->GetRGB(paletteIndex, &r, &g, &b); @@ -209,46 +220,52 @@ bool wxMask::Create( const wxBitmap& bitmap ) m_bitmap = NULL; } - if (!bitmap.Ok()) return FALSE; + if (!bitmap.IsOk()) return false; + + wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") ); - wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") ); - m_display = bitmap.GetDisplay(); int xscreen = DefaultScreen( (Display*) m_display ); Window xroot = RootWindow( (Display*) m_display, xscreen ); - + m_bitmap = (WXPixmap) XCreatePixmap( (Display*) m_display, xroot, bitmap.GetWidth(), bitmap.GetHeight(), 1 ); - if (!m_bitmap) return FALSE; - + if (!m_bitmap) return false; + GC gc = XCreateGC( (Display*) m_display, (Pixmap) m_bitmap, 0, NULL ); XCopyPlane( (Display*) m_display, (Pixmap) bitmap.GetBitmap(), (Pixmap) m_bitmap, gc, 0, 0, bitmap.GetWidth(), bitmap.GetHeight(), 0, 0, 1 ); - + XFreeGC( (Display*) m_display, gc ); - return TRUE; + return true; #else - return FALSE; + return false; #endif // wxUSE_NANOX } //----------------------------------------------------------------------------- -// wxBitmap +// wxBitmapRefData //----------------------------------------------------------------------------- -class wxBitmapRefData: public wxObjectRefData +class wxBitmapRefData : public wxGDIRefData { public: wxBitmapRefData(); - ~wxBitmapRefData(); + wxBitmapRefData(const wxBitmapRefData& data); + virtual ~wxBitmapRefData(); + + // 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; } - WXPixmap m_pixmap; - WXPixmap m_bitmap; - WXDisplay *m_display; + Pixmap m_pixmap; + Pixmap m_bitmap; + Display *m_display; wxMask *m_mask; int m_width; int m_height; @@ -258,178 +275,207 @@ 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() +wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data) { - 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; + 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; -#define M_BMPDATA ((wxBitmapRefData *)m_refData) + m_display = wxGlobalDisplay(); -IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) + 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") ); -wxBitmap::wxBitmap() +#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(m_display, m_pixmap); + if (m_bitmap) + XFreePixmap(m_display, m_bitmap); + delete m_mask; + delete m_palette; } -wxBitmap::wxBitmap( int width, int height, int depth ) +//----------------------------------------------------------------------------- + +// helper function + +static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap, + int x, int y, int width, int height, + int depth ) { - Create( width, height, depth ); + Display * const dpy = (Display *)xdisplay; + + int xscreen = DefaultScreen( dpy ); + Window xroot = RootWindow( dpy, xscreen ); + Visual* xvisual = DefaultVisual( dpy, xscreen ); + + XImage* ximage = XCreateImage( dpy, xvisual, depth, + ZPixmap, 0, 0, width, height, 32, 0 ); + ximage->data = (char*)malloc( ximage->bytes_per_line * ximage->height ); + ximage = XGetSubImage( dpy, (Pixmap)xpixmap, + x, y, width, height, + AllPlanes, ZPixmap, ximage, 0, 0 ); + + GC gc = XCreateGC( dpy, (Pixmap)xpixmap, 0, NULL ); + Pixmap ret = XCreatePixmap( dpy, xroot, + width, height, depth ); + + XPutImage( dpy, ret, gc, ximage, + 0, 0, 0, 0, width, height ); + XDestroyImage( ximage ); + XFreeGC( dpy, gc ); + + return (WXPixmap)ret; } + +//----------------------------------------------------------------------------- +// wxBitmap +//----------------------------------------------------------------------------- + +#define M_BMPDATA ((wxBitmapRefData *)m_refData) + +IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) + bool wxBitmap::Create( int width, int height, int depth ) { UnRef(); - wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") ) + wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") ); 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::CreateFromXpm( const char **bits ) +bool wxBitmap::Create(const void* data, wxBitmapType type, + int width, int height, int depth) { -#if wxUSE_XPM -#if wxHAVE_LIB_XPM UnRef(); - wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") ) + wxBitmapHandler *handler = FindHandler(type); - m_refData = new wxBitmapRefData(); + if ( handler == NULL ) { + wxLogWarning(wxT("no data bitmap handler for type %ld defined."), + (long)type); - M_BMPDATA->m_display = wxGlobalDisplay(); - - Display *xdisplay = (Display*) M_BMPDATA->m_display; - + return false; + } + + return handler->Create(this, data, type, width, height, depth); +} + +bool wxBitmap::Create(WXPixmap pixmap) +{ + UnRef(); + Pixmap xpixmap = (Pixmap)pixmap; + Display* xdisplay = wxGlobalDisplay(); int xscreen = DefaultScreen( xdisplay ); Window xroot = RootWindow( xdisplay, xscreen ); - - int bpp = DefaultDepth( xdisplay, xscreen ); - - XpmAttributes xpmAttr; - xpmAttr.valuemask = XpmReturnInfos; // nothing yet, but get infos back - Pixmap pixmap; - Pixmap mask = 0; - - int ErrorStatus = XpmCreatePixmapFromData( xdisplay, xroot, (char**) bits, &pixmap, &mask, &xpmAttr ); - - if (ErrorStatus == XpmSuccess) - { - M_BMPDATA->m_width = xpmAttr.width; - M_BMPDATA->m_height = xpmAttr.height; + // make a copy of the Pixmap + Window root; + int x, y; + unsigned width, height, border, depth; - M_BMPDATA->m_bpp = bpp; // mono as well? + XGetGeometry( xdisplay, (Drawable)xpixmap, &root, &x, &y, + &width, &height, &border, &depth ); + Pixmap copy = XCreatePixmap( xdisplay, xroot, width, height, depth ); -#if __WXDEBUG__ - unsigned int depthRet; - int xRet, yRet; - unsigned int widthRet, heightRet, borderWidthRet; - XGetGeometry( xdisplay, pixmap, &xroot, &xRet, &yRet, - &widthRet, &heightRet, &borderWidthRet, &depthRet); + GC gc = XCreateGC( xdisplay, copy, 0, NULL ); + XCopyArea( xdisplay, xpixmap, copy, gc, 0, 0, width, height, 0, 0 ); + XFreeGC( xdisplay, gc ); - wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") ) -#endif + // fill in ref data + wxBitmapRefData* ref = new wxBitmapRefData(); - XpmFreeAttributes(&xpmAttr); - - M_BMPDATA->m_pixmap = (WXPixmap) pixmap; - - if (mask) - { - M_BMPDATA->m_mask = new wxMask; - M_BMPDATA->m_mask->SetBitmap( (WXPixmap) mask ); - M_BMPDATA->m_mask->SetDisplay( xdisplay ); - } - return TRUE; - } + if( depth == 1 ) + ref->m_bitmap = copy; else - { - UnRef(); - - return FALSE; - } -#else - wxXPMDecoder decoder; - wxImage image(decoder.ReadData(bits)); - if (image.Ok()) - return CreateFromImage(image); - else - return FALSE; -#endif -#endif - return FALSE; + ref->m_pixmap = copy; + + ref->m_display = xdisplay; + ref->m_width = width; + ref->m_height = height; + ref->m_bpp = depth; + + m_refData = ref; + + return true; +} + +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 - if (!image.Ok()) + if (!image.IsOk()) { - wxASSERT_MSG(image.Ok(), "Invalid wxImage passed to wxBitmap::CreateFromImage."); - return FALSE; + wxASSERT_MSG(image.IsOk(), wxT("Invalid wxImage passed to wxBitmap::CreateFromImage.")); + return false; } - + int w = image.GetWidth(); int h = image.GetHeight(); - + if (!Create(w, h, depth)) - return FALSE; + return false; // Unfortunately the mask has to be screen-depth since // 1-bpp bitmaps don't seem to be supported @@ -443,7 +489,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) // pixmap. See demos/nxroach.c. bool hasMask = image.HasMask(); - + GC pixmapGC = GrNewGC(); Pixmap pixmap = (Pixmap) GetPixmap(); @@ -459,11 +505,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) maskR = image.GetMaskRed(); maskG = image.GetMaskGreen(); maskB = image.GetMaskBlue(); - + maskGC = GrNewGC(); maskPixmap = GrNewPixmap(w, h, 0); if (!maskPixmap) - hasMask = FALSE; + hasMask = false; else { wxMask* mask = new wxMask; @@ -474,7 +520,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) GR_COLOR lastPixmapColour = 0; GR_COLOR lastMaskColour = 0; - + int i, j; for (i = 0; i < w; i++) { @@ -492,9 +538,9 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) GrSetGCForeground(pixmapGC, colour); lastPixmapColour = colour; } - + GrPoint(pixmap, pixmapGC, i, j); - + if (hasMask) { // scan the bitmap for the transparent colour and set the corresponding @@ -520,28 +566,28 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) GrDestroyGC(pixmapGC); if (hasMask) GrDestroyGC(maskGC); - - return TRUE; + + return true; #else // !wxUSE_NANOX - + UnRef(); - wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ) - wxCHECK_MSG( depth == -1, FALSE, wxT("invalid bitmap depth") ) + wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") ); + wxCHECK_MSG( depth == -1, false, wxT("invalid bitmap depth") ); m_refData = new wxBitmapRefData(); M_BMPDATA->m_display = wxGlobalDisplay(); - + Display *xdisplay = (Display*) M_BMPDATA->m_display; - + int xscreen = DefaultScreen( xdisplay ); Window xroot = RootWindow( xdisplay, xscreen ); Visual* xvisual = DefaultVisual( xdisplay, xscreen ); - - int bpp = DefaultDepth( xdisplay, xscreen ); - + + int bpp = wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_visualDepth; + int width = image.GetWidth(); int height = image.GetHeight(); M_BMPDATA->m_width = width; @@ -549,40 +595,41 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) if (depth != 1) depth = bpp; M_BMPDATA->m_bpp = depth; - + if (depth == 1) { - wxFAIL_MSG( "mono images later" ); + wxFAIL_MSG( wxT("mono images later") ); } else { // Create image - + XImage *data_image = XCreateImage( xdisplay, xvisual, bpp, ZPixmap, 0, 0, width, height, 32, 0 ); data_image->data = (char*) malloc( data_image->bytes_per_line * data_image->height ); - + if (data_image->data == NULL) { wxLogError( wxT("Out of memory.") ); // TODO clean - return FALSE; + 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 ); - + if (mask_image->data == NULL) { wxLogError( wxT("Out of memory.") ); // TODO clean - return FALSE; + return false; } - + wxMask *mask = new wxMask(); mask->SetDisplay( xdisplay ); mask->SetBitmap( (WXPixmap) XCreatePixmap( xdisplay, xroot, width, height, 1 ) ); @@ -590,20 +637,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) SetMask( mask ); } - // Retrieve info - - XVisualInfo vinfo_template; - XVisualInfo *vi; - - vinfo_template.visual = xvisual; - vinfo_template.visualid = XVisualIDFromVisual( xvisual ); - vinfo_template.depth = bpp; - int nitem = 0; - - vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); - wxASSERT_MSG( vi, wxT("No visual info") ); - - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; if (bpp < 8) bpp = 8; // Render @@ -611,26 +644,30 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR }; byte_order b_o = RGB; + wxXVisualInfo* vi = wxTheApp->GetVisualInfo(M_BMPDATA->m_display); + unsigned long greenMask = vi->m_visualGreenMask, + redMask = vi->m_visualRedMask, + blueMask = vi->m_visualBlueMask; + if (bpp > 8) { - if ((vi->red_mask > vi->green_mask) && (vi->green_mask > vi->blue_mask)) b_o = RGB; - else if ((vi->red_mask > vi->blue_mask) && (vi->blue_mask > vi->green_mask)) b_o = RBG; - else if ((vi->blue_mask > vi->red_mask) && (vi->red_mask > vi->green_mask)) b_o = BRG; - else if ((vi->blue_mask > vi->green_mask) && (vi->green_mask > vi->red_mask)) b_o = BGR; - else if ((vi->green_mask > vi->red_mask) && (vi->red_mask > vi->blue_mask)) b_o = GRB; - else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask)) b_o = GBR; + if ((redMask > greenMask) && (greenMask > blueMask)) b_o = RGB; + else if ((redMask > blueMask) && (blueMask > greenMask)) b_o = RBG; + else if ((blueMask > redMask) && (redMask > greenMask)) b_o = BRG; + else if ((blueMask > greenMask) && (greenMask > redMask))b_o = BGR; + else if ((greenMask > redMask) && (redMask > blueMask)) b_o = GRB; + else if ((greenMask > blueMask) && (blueMask > redMask)) b_o = GBR; } - XFree( vi ); - int r_mask = image.GetMaskRed(); int g_mask = image.GetMaskGreen(); int b_mask = image.GetMaskBlue(); unsigned char* data = image.GetData(); - wxASSERT_MSG( data, "No image data" ); + wxASSERT_MSG( data, wxT("No image data") ); - bool hasMask = image.HasMask(); + unsigned char *colorCube = + wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_colorCube; int index = 0; for (int y = 0; y < height; y++) @@ -657,27 +694,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) case 8: { int pixel = 0; -#if 0 - if (wxTheApp->m_colorCube) - { - pixel = wxTheApp->m_colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ]; - } - else - { - GdkColormap *cmap = gtk_widget_get_default_colormap(); - GdkColor *colors = cmap->colors; - int max = 3 * (65536); - - for (int i = 0; i < cmap->size; i++) - { - int rdiff = (r << 8) - colors[i].red; - int gdiff = (g << 8) - colors[i].green; - int bdiff = (b << 8) - colors[i].blue; - int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff); - if (sum < max) { pixel = i; max = sum; } - } - } -#endif + pixel = colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ]; XPutPixel( data_image, x, y, pixel ); break; } @@ -752,15 +769,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) GC gc = XCreateGC( xdisplay, (Pixmap) M_BMPDATA->m_pixmap, 0, NULL ); XPutImage( xdisplay, (Pixmap) M_BMPDATA->m_pixmap, gc, data_image, 0, 0, 0, 0, width, height ); -#ifdef __WXDEBUG__ - XSync(wxGlobalDisplay(), False); -#endif - XDestroyImage( data_image ); XFreeGC( xdisplay, gc ); // Blit mask - + if (image.HasMask()) { GC gc = XCreateGC( xdisplay, (Pixmap) GetMask()->GetBitmap(), 0, NULL ); @@ -771,48 +784,27 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) } } - return TRUE; + return true; #endif // wxUSE_NANOX } -static void wxCalcPrecAndShift( unsigned long mask, int *shift, int *prec ) -{ - *shift = 0; - *prec = 0; - - while (!(mask & 0x1)) - { - (*shift)++; - mask >>= 1; - } - - while (mask & 0x1) - { - (*prec)++; - mask >>= 1; - } -} - wxImage wxBitmap::ConvertToImage() const { wxImage image; - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); Display *xdisplay = (Display*) M_BMPDATA->m_display; wxASSERT_MSG( xdisplay, wxT("No display") ); - - int xscreen = DefaultScreen( xdisplay ); - Visual* xvisual = DefaultVisual( xdisplay, xscreen ); - - int bpp = DefaultDepth( xdisplay, xscreen ); #if wxUSE_NANOX + //int bpp = DefaultDepth(xdisplay, xscreen); wxGetImageFromDrawable((Pixmap) GetPixmap(), 0, 0, GetWidth(), GetHeight(), image); return image; #else // !wxUSE_NANOX + int bpp = wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_visualDepth; XImage *x_image = NULL; if (GetPixmap()) { @@ -849,7 +841,7 @@ wxImage wxBitmap::ConvertToImage() const { x_image_mask = XGetImage( xdisplay, (Pixmap) GetMask()->GetBitmap(), 0, 0, - GetWidth(), GetHeight(), + GetWidth(), GetHeight(), AllPlanes, ZPixmap ); image.SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable @@ -861,52 +853,30 @@ wxImage wxBitmap::ConvertToImage() const int red_shift_left = 0; int green_shift_left = 0; int blue_shift_left = 0; - bool use_shift = FALSE; + bool use_shift = false; if (GetPixmap()) { - // Retrieve info - - XVisualInfo vinfo_template; - XVisualInfo *vi; - - vinfo_template.visual = xvisual; - vinfo_template.visualid = XVisualIDFromVisual( xvisual ); - vinfo_template.depth = bpp; - int nitem = 0; - - vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); - wxASSERT_MSG( vi, wxT("No visual info") ); - - int red_prec,green_prec,blue_prec; - int red_shift,green_shift,blue_shift; - wxCalcPrecAndShift( vi->red_mask, &red_shift, &red_prec ); - wxCalcPrecAndShift( vi->green_mask, &green_shift, &green_prec ); - wxCalcPrecAndShift( vi->blue_mask, &blue_shift, &blue_prec ); - if (bpp == 16) bpp = red_prec + green_prec + blue_prec; - - red_shift_right = red_shift; - red_shift_left = 8-red_prec; - green_shift_right = green_shift; - green_shift_left = 8-green_prec; - blue_shift_right = blue_shift; - blue_shift_left = 8-blue_prec; - -#if 0 - use_shift = (vi->visual->c_class == TrueColor) || (vi->visual->c_class == DirectColor); -#else - use_shift = TRUE; -#endif - - XFree( vi ); + wxXVisualInfo* vi = wxTheApp->GetVisualInfo(M_BMPDATA->m_display); + + red_shift_right = vi->m_visualRedShift; + red_shift_left = 8 - vi->m_visualRedPrec; + green_shift_right = vi->m_visualGreenShift; + green_shift_left = 8 - vi->m_visualGreenPrec; + blue_shift_right = vi->m_visualBlueShift; + blue_shift_left = 8 - vi->m_visualBluePrec; + + use_shift = (vi->m_visualType == GrayScale) || + (vi->m_visualType != PseudoColor); } + if (GetBitmap()) { bpp = 1; } - -// GdkColormap *cmap = gtk_widget_get_default_colormap(); + XColor *colors = (XColor*)wxTheApp-> + GetVisualInfo(M_BMPDATA->m_display)->m_visualColormap; int width = GetWidth(); int height = GetHeight(); @@ -933,18 +903,16 @@ wxImage wxBitmap::ConvertToImage() const } else if (use_shift) { - data[pos] = (pixel >> red_shift_right) << red_shift_left; - data[pos+1] = (pixel >> green_shift_right) << green_shift_left; - data[pos+2] = (pixel >> blue_shift_right) << blue_shift_left; + data[pos] = (unsigned char)((pixel >> red_shift_right) << red_shift_left); + data[pos+1] = (unsigned char)((pixel >> green_shift_right) << green_shift_left); + data[pos+2] = (unsigned char)((pixel >> blue_shift_right) << blue_shift_left); } -#if 0 - else if (cmap->colors) + else if (colors) { - data[pos] = cmap->colors[pixel].red >> 8; - data[pos+1] = cmap->colors[pixel].green >> 8; - data[pos+2] = cmap->colors[pixel].blue >> 8; + data[pos] = (unsigned char)(colors[pixel].red >> 8); + data[pos+1] = (unsigned char)(colors[pixel].green >> 8); + data[pos+2] = (unsigned char)(colors[pixel].blue >> 8); } -#endif else { wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") ); @@ -972,96 +940,55 @@ wxImage wxBitmap::ConvertToImage() const // wxUSE_NANOX } -wxBitmap::wxBitmap( const wxBitmap& bmp ) -{ - Ref( bmp ); -} - -wxBitmap::wxBitmap( const wxString &filename, int type ) +wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type ) { LoadFile( filename, type ); } -wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth) ) +wxBitmap::wxBitmap( const char bits[], int width, int height, int depth ) { -#if !wxUSE_NANOX - m_refData = new wxBitmapRefData(); - - M_BMPDATA->m_display = wxGlobalDisplay(); + m_refData = new wxBitmapRefData; - Display *xdisplay = (Display*) M_BMPDATA->m_display; - - int xscreen = DefaultScreen( xdisplay ); - Window xroot = RootWindow( xdisplay, xscreen ); - - M_BMPDATA->m_mask = (wxMask *) NULL; - M_BMPDATA->m_bitmap = (WXPixmap) XCreateBitmapFromData( xdisplay, xroot, (char *) bits, width, height ); - M_BMPDATA->m_width = width; - M_BMPDATA->m_height = height; - M_BMPDATA->m_bpp = 1; -#endif - wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") ); + (void) Create(bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth); } wxBitmap::~wxBitmap() { } -wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp ) -{ - if ( m_refData != bmp.m_refData ) - Ref( bmp ); - - return *this; -} - -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::Ok() const -{ - return (m_refData != NULL); -} - int wxBitmap::GetHeight() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_height; } int wxBitmap::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_width; } int wxBitmap::GetDepth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_bpp; } wxMask *wxBitmap::GetMask() const { - wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_mask; } void wxBitmap::SetMask( wxMask *mask ) { - wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); + AllocExclusive(); if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; M_BMPDATA->m_mask = mask; @@ -1070,178 +997,136 @@ void wxBitmap::SetMask( wxMask *mask ) bool wxBitmap::CopyFromIcon(const wxIcon& icon) { *this = icon; - return TRUE; + return true; } wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( IsOk() && (rect.x >= 0) && (rect.y >= 0) && - (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height), + (rect.x+rect.width <= M_BMPDATA->m_width ) && + (rect.y+rect.height <= M_BMPDATA->m_height), wxNullBitmap, wxT("invalid bitmap or bitmap region") ); wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") ); - - wxFAIL_MSG( "wxBitmap::GetSubBitmap not yet implemented" ); - -#if 0 - if (ret.GetPixmap()) + if( GetMask() ) { - GdkGC *gc = gdk_gc_new( ret.GetPixmap() ); - gdk_draw_pixmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); - gdk_gc_destroy( gc ); + wxMask* mask = new wxMask(); + mask->SetDisplay( GetMask()->GetDisplay() ); + mask->SetBitmap( wxGetSubPixmap( GetMask()->GetDisplay(), + GetMask()->GetBitmap(), + rect.x, rect.y, + rect.width, rect.height, + 1 ) ); + + ret.SetMask( mask ); } - else + + if( GetPixmap() ) { - GdkGC *gc = gdk_gc_new( ret.GetBitmap() ); - gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); - gdk_gc_destroy( gc ); + ret.SetPixmap( wxGetSubPixmap( GetDisplay(), + GetPixmap(), + rect.x, rect.y, + rect.width, rect.height, + M_BMPDATA->m_bpp ) ); } - if (GetMask()) + if( GetBitmap() ) { - wxMask *mask = new wxMask; - mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 ); - - GdkGC *gc = gdk_gc_new( mask->m_bitmap ); - gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height ); - gdk_gc_destroy( gc ); - - ret.SetMask( mask ); + ret.SetBitmap( wxGetSubPixmap( GetDisplay(), + GetBitmap(), + rect.x, rect.y, + rect.width, rect.height, + 1 ) ); } -#endif return ret; } -bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) ) +bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, + const wxPalette *palette ) const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); + + wxBitmapHandler *handler = FindHandler(type); // Try to save the bitmap via wxImage handlers: + if (handler == NULL) { - wxImage image( *this ); - if (image.Ok()) return image.SaveFile( name, type ); + wxImage image(this->ConvertToImage()); + if (image.IsOk()) return image.SaveFile( name, type ); + + return false; } - return FALSE; + return handler->SaveFile(this, name, type, palette); } -bool wxBitmap::LoadFile( const wxString &name, int type ) +bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) { UnRef(); - if (!wxFileExists(name)) return FALSE; + if (!wxFileExists(name)) return false; + wxBitmapHandler *handler = FindHandler(type); - if (type == wxBITMAP_TYPE_XPM) + if (handler == NULL) { -#if wxUSE_XPM -#if wxHAVE_LIB_XPM - m_refData = new wxBitmapRefData(); - - M_BMPDATA->m_display = wxGlobalDisplay(); - - Display *xdisplay = (Display*) M_BMPDATA->m_display; - - int xscreen = DefaultScreen( xdisplay ); - Window xroot = RootWindow( xdisplay, xscreen ); - - int bpp = DefaultDepth( xdisplay, xscreen ); - - XpmAttributes xpmAttr; - xpmAttr.valuemask = XpmReturnInfos; // nothing yet, but get infos back - - Pixmap pixmap; - Pixmap mask = 0; - - int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot, (char*) name.c_str(), &pixmap, &mask, &xpmAttr); - - if (ErrorStatus == XpmSuccess) - { - M_BMPDATA->m_width = xpmAttr.width; - M_BMPDATA->m_height = xpmAttr.height; - - M_BMPDATA->m_bpp = bpp; // mono as well? + wxImage image; + if (!image.LoadFile( name, type )) + return false; - XpmFreeAttributes(&xpmAttr); - - M_BMPDATA->m_bitmap = (WXPixmap) pixmap; - - if (mask) - { - M_BMPDATA->m_mask = new wxMask; - M_BMPDATA->m_mask->SetBitmap( (WXPixmap) mask ); - M_BMPDATA->m_mask->SetDisplay( xdisplay ); - } - } - else + if (image.IsOk()) { - UnRef(); - - return FALSE; + *this = wxBitmap(image); + return true; } -#else -#if wxUSE_STREAMS - wxXPMDecoder decoder; - wxFileInputStream stream(name); - if (stream.Ok()) - { - wxImage image(decoder.ReadFile(stream)); - if (image.Ok()) - return CreateFromImage(image); - else - return FALSE; - } - else - return FALSE; -#else - return FALSE; -#endif - // wxUSE_STREAMS -#endif - // wxHAVE_LIB_XPM -#endif - // wxUSE_XPM - return FALSE; - } - else // try if wxImage can load it - { - wxImage image; - if (!image.LoadFile( name, type )) return FALSE; - if (image.Ok()) *this = image.ConvertToBitmap(); - else return FALSE; + else return false; } - return TRUE; + return handler->LoadFile(this, name, type, -1, -1); +} + +void wxBitmap::SetPalette(const wxPalette& palette) +{ + wxCHECK_RET(IsOk(), wxT("invalid bitmap")); + wxCHECK_RET(GetDepth() > 1 && GetDepth() <= 8, + wxT("cannot set palette for bitmap of this depth")); + + AllocExclusive(); + wxDELETE(M_BMPDATA->m_palette); + + if (!palette.IsOk()) return; + + M_BMPDATA->m_palette = new wxPalette(palette); } wxPalette *wxBitmap::GetPalette() const { - if (!Ok()) return (wxPalette *) NULL; + if (!IsOk()) 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; } @@ -1250,33 +1135,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") ); + wxCHECK_MSG( IsOk(), (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") ); + wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") ); - return M_BMPDATA->m_bitmap; + return (WXPixmap)M_BMPDATA->m_bitmap; +} + +WXPixmap wxBitmap::GetDrawable() const +{ + wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") ); + + 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( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_display; } @@ -1294,118 +1187,118 @@ bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, GrGetScreenInfo(&sinfo); if (sinfo.pixtype == MWPF_PALETTE) { - if(!(palette = (GR_PALETTE*) malloc(sizeof(GR_PALETTE)))) { - return FALSE; - } - GrGetSystemPalette(palette); - } + if(!(palette = (GR_PALETTE*) malloc(sizeof(GR_PALETTE)))) { + return false; + } + GrGetSystemPalette(palette); + } if(!(pixels = (GR_PIXELVAL*) malloc(sizeof(GR_PIXELVAL) * width * height))) { - return FALSE; + return false; } image.Create(width, height); - GrReadArea(drawable, srcX, srcY, width, height, - pixels); - - - for(x = 0; x < sinfo.cols; x++) { - - pp = (unsigned char *)pixels + - ((x + (y * sinfo.cols)) * - sizeof(GR_PIXELVAL)); - - switch(sinfo.pixtype) { - /* FIXME: These may need modifying on big endian. */ - case MWPF_TRUECOLOR0888: - case MWPF_TRUECOLOR888: - rgb[0] = pp[2]; - rgb[1] = pp[1]; - rgb[2] = pp[0]; - break; - case MWPF_PALETTE: - rgb[0] = palette->palette[pp[0]].r; - rgb[1] = palette->palette[pp[0]].g; - rgb[2] = palette->palette[pp[0]].b; - break; - case MWPF_TRUECOLOR565: - rgb[0] = pp[1] & 0xf8; - rgb[1] = ((pp[1] & 0x07) << 5) | - ((pp[0] & 0xe0) >> 3); - rgb[2] = (pp[0] & 0x1f) << 3; - break; - case MWPF_TRUECOLOR555: - rgb[0] = (pp[1] & 0x7c) << 1; - rgb[1] = ((pp[1] & 0x03) << 6) | - ((pp[0] & 0xe0) >> 2); - rgb[2] = (pp[0] & 0x1f) << 3; - break; - case MWPF_TRUECOLOR332: - rgb[0] = pp[0] & 0xe0; - rgb[1] = (pp[0] & 0x1c) << 3; - rgb[2] = (pp[0] & 0x03) << 6; - break; - default: - fprintf(stderr, "Unsupported pixel " - "format\n"); - return 1; - } - - image.SetRGB(x, y, rgb[0], rgb[1], rgb[2]); - - } + GrReadArea(drawable, srcX, srcY, width, height, + pixels); + + + for(x = 0; x < sinfo.cols; x++) { + + pp = (unsigned char *)pixels + + ((x + (y * sinfo.cols)) * + sizeof(GR_PIXELVAL)); + + switch(sinfo.pixtype) { + /* FIXME: These may need modifying on big endian. */ + case MWPF_TRUECOLOR0888: + case MWPF_TRUECOLOR888: + rgb[0] = pp[2]; + rgb[1] = pp[1]; + rgb[2] = pp[0]; + break; + case MWPF_PALETTE: + rgb[0] = palette->palette[pp[0]].r; + rgb[1] = palette->palette[pp[0]].g; + rgb[2] = palette->palette[pp[0]].b; + break; + case MWPF_TRUECOLOR565: + rgb[0] = pp[1] & 0xf8; + rgb[1] = ((pp[1] & 0x07) << 5) | + ((pp[0] & 0xe0) >> 3); + rgb[2] = (pp[0] & 0x1f) << 3; + break; + case MWPF_TRUECOLOR555: + rgb[0] = (pp[1] & 0x7c) << 1; + rgb[1] = ((pp[1] & 0x03) << 6) | + ((pp[0] & 0xe0) >> 2); + rgb[2] = (pp[0] & 0x1f) << 3; + break; + case MWPF_TRUECOLOR332: + rgb[0] = pp[0] & 0xe0; + rgb[1] = (pp[0] & 0x1c) << 3; + rgb[2] = (pp[0] & 0x03) << 6; + break; + default: + fprintf(stderr, "Unsupported pixel " + "format\n"); + return 1; + } + + image.SetRGB(x, y, rgb[0], rgb[1], rgb[2]); + + } free(pixels); if(palette) free(palette); - return TRUE; + return true; } #if 0 int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixel, unsigned char* red, unsigned char* green, unsigned char* blue) { - unsigned char rgb[3], *pp; + unsigned char rgb[3], *pp; pp = (unsigned char*) & pixel ; switch (sinfo.pixtype) { - /* FIXME: These may need modifying on big endian. */ - case MWPF_TRUECOLOR0888: - case MWPF_TRUECOLOR888: - rgb[0] = pp[2]; - rgb[1] = pp[1]; - rgb[2] = pp[0]; - break; - case MWPF_PALETTE: - rgb[0] = palette->palette[pp[0]].r; - rgb[1] = palette->palette[pp[0]].g; - rgb[2] = palette->palette[pp[0]].b; - break; - case MWPF_TRUECOLOR565: - rgb[0] = pp[1] & 0xf8; - rgb[1] = ((pp[1] & 0x07) << 5) | - ((pp[0] & 0xe0) >> 3); - rgb[2] = (pp[0] & 0x1f) << 3; - break; - case MWPF_TRUECOLOR555: - rgb[0] = (pp[1] & 0x7c) << 1; - rgb[1] = ((pp[1] & 0x03) << 6) | - ((pp[0] & 0xe0) >> 2); - rgb[2] = (pp[0] & 0x1f) << 3; - break; - case MWPF_TRUECOLOR332: - rgb[0] = pp[0] & 0xe0; - rgb[1] = (pp[0] & 0x1c) << 3; - rgb[2] = (pp[0] & 0x03) << 6; - break; - default: - fprintf(stderr, "Unsupported pixel format\n"); - return 0; - } + /* FIXME: These may need modifying on big endian. */ + case MWPF_TRUECOLOR0888: + case MWPF_TRUECOLOR888: + rgb[0] = pp[2]; + rgb[1] = pp[1]; + rgb[2] = pp[0]; + break; + case MWPF_PALETTE: + rgb[0] = palette->palette[pp[0]].r; + rgb[1] = palette->palette[pp[0]].g; + rgb[2] = palette->palette[pp[0]].b; + break; + case MWPF_TRUECOLOR565: + rgb[0] = pp[1] & 0xf8; + rgb[1] = ((pp[1] & 0x07) << 5) | + ((pp[0] & 0xe0) >> 3); + rgb[2] = (pp[0] & 0x1f) << 3; + break; + case MWPF_TRUECOLOR555: + rgb[0] = (pp[1] & 0x7c) << 1; + rgb[1] = ((pp[1] & 0x03) << 6) | + ((pp[0] & 0xe0) >> 2); + rgb[2] = (pp[0] & 0x1f) << 3; + break; + case MWPF_TRUECOLOR332: + rgb[0] = pp[0] & 0xe0; + rgb[1] = (pp[0] & 0x1c) << 3; + rgb[2] = (pp[0] & 0x03) << 6; + break; + default: + fprintf(stderr, "Unsupported pixel format\n"); + return 0; + } *(red) = rgb[0]; @@ -1418,3 +1311,312 @@ int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixe #endif // wxUSE_NANOX +// ============================================================================ +// Bitmap handlers +// ============================================================================ + +#define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData()) + +#if wxUSE_XPM + +#if wxHAVE_LIB_XPM || wxUSE_STREAMS + +// ---------------------------------------------------------------------------- +// wxXPMFileHandler +// ---------------------------------------------------------------------------- + +class wxXPMFileHandler : public wxBitmapHandler +{ +public: + wxXPMFileHandler() + { + SetName( wxT("XPM file") ); + SetExtension( wxT("xpm") ); + SetType( wxBITMAP_TYPE_XPM ); + }; + + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, + wxBitmapType flags, + int desiredWidth, int desiredHeight); + + virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, + 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, + wxBitmapType WXUNUSED(flags), + int WXUNUSED(desiredWidth), + int WXUNUSED(desiredHeight)) +{ +#if wxHAVE_LIB_XPM + if (!bitmap->GetRefData()) + bitmap->SetRefData( new wxBitmapRefData() ); + + M_BMPHANDLERDATA->m_display = wxGlobalDisplay(); + + Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display; + + int xscreen = DefaultScreen( xdisplay ); + Window xroot = RootWindow( xdisplay, xscreen ); + + int bpp = DefaultDepth( xdisplay, xscreen ); + + XpmAttributes xpmAttr; + xpmAttr.valuemask = XpmReturnInfos; // nothing yet, but get infos back + + Pixmap pixmap; + Pixmap mask = 0; + + int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot, + (char*) ((const char*) name.c_str()), + &pixmap, &mask, &xpmAttr); + + if (ErrorStatus == XpmSuccess) + { + M_BMPHANDLERDATA->m_width = xpmAttr.width; + M_BMPHANDLERDATA->m_height = xpmAttr.height; + + M_BMPHANDLERDATA->m_bpp = bpp; // mono as well? + + XpmFreeAttributes(&xpmAttr); + + M_BMPHANDLERDATA->m_bitmap = (Pixmap) pixmap; + + if (mask) + { + M_BMPHANDLERDATA->m_mask = new wxMask; + M_BMPHANDLERDATA->m_mask->SetBitmap( (WXPixmap) mask ); + M_BMPHANDLERDATA->m_mask->SetDisplay( xdisplay ); + } + } + else + { + UnRef(); + + return false; + } + + return true; +#elif wxUSE_STREAMS + wxXPMDecoder decoder; + wxFileInputStream stream(name); + if (stream.IsOk()) + { + wxImage image(decoder.ReadFile(stream)); + return image.IsOk() && bitmap->CreateFromImage(image); + } + + return false; +#else // !wxHAVE_LIB_XPM && !wxUSE_STREAMS + return false; +#endif // wxHAVE_LIB_XPM / wxUSE_STREAMS +} + +bool wxXPMFileHandler::SaveFile(const wxBitmap *bitmap, + const wxString& name, + wxBitmapType type, + const wxPalette *WXUNUSED(palette)) const +{ + wxImage image(bitmap->ConvertToImage()); + if (image.IsOk()) + return image.SaveFile( name, type ); + + return false; +} + +#endif // wxHAVE_LIB_XPM || wxUSE_STREAMS + +// ---------------------------------------------------------------------------- +// wxXPMDataHandler +// ---------------------------------------------------------------------------- + +class wxXPMDataHandler : public wxBitmapHandler +{ + DECLARE_DYNAMIC_CLASS(wxXPMDataHandler) +public: + wxXPMDataHandler() + { + SetName( wxT("XPM data") ); + SetExtension( wxT("xpm") ); + SetType( wxBITMAP_TYPE_XPM_DATA ); + }; + + virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap), + const wxString& WXUNUSED(name), + wxBitmapType WXUNUSED(flags), + int WXUNUSED(desiredWidth), + int WXUNUSED(desiredHeight)) + { return false; } + + virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap), + const wxString& WXUNUSED(name), + wxBitmapType WXUNUSED(type), + const wxPalette *WXUNUSED(palette) = NULL) const + { return false; } + + 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, + wxBitmapType WXUNUSED(flags), + int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth)) +{ +#if wxHAVE_LIB_XPM + wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") ); + + if (!bitmap->GetRefData()) + bitmap->SetRefData( new wxBitmapRefData() ); + + M_BMPHANDLERDATA->m_display = wxGlobalDisplay(); + + Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display; + + int xscreen = DefaultScreen( xdisplay ); + Window xroot = RootWindow( xdisplay, xscreen ); + + int bpp = DefaultDepth( xdisplay, xscreen ); + + XpmAttributes xpmAttr; + xpmAttr.valuemask = XpmReturnInfos; // nothing yet, but get infos back + + Pixmap pixmap = 0; + Pixmap mask = 0; + + int ErrorStatus = XpmCreatePixmapFromData( xdisplay, xroot, (char**) bits, + &pixmap, &mask, &xpmAttr ); + + if (ErrorStatus == XpmSuccess) + { + M_BMPHANDLERDATA->m_width = xpmAttr.width; + M_BMPHANDLERDATA->m_height = xpmAttr.height; + + M_BMPHANDLERDATA->m_bpp = bpp; // mono as well? + +#if wxDEBUG_LEVEL + unsigned int depthRet; + int xRet, yRet; + unsigned int widthRet, heightRet, borderWidthRet; + XGetGeometry( xdisplay, pixmap, &xroot, &xRet, &yRet, + &widthRet, &heightRet, &borderWidthRet, &depthRet); + + wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") ); +#endif // wxDEBUG_LEVEL + + XpmFreeAttributes(&xpmAttr); + + M_BMPHANDLERDATA->m_pixmap = (Pixmap) pixmap; + + if (mask) + { + M_BMPHANDLERDATA->m_mask = new wxMask; + M_BMPHANDLERDATA->m_mask->SetBitmap( (WXPixmap) mask ); + M_BMPHANDLERDATA->m_mask->SetDisplay( xdisplay ); + } + return true; + } + else + { + bitmap->UnRef(); + + return false; + } +#else // !wxHAVE_LIB_XPM + wxXPMDecoder decoder; + wxImage image(decoder.ReadData((const char **)bits)); + return image.IsOk() && bitmap->CreateFromImage(image); +#endif // wxHAVE_LIB_XPM/!wxHAVE_LIB_XPM +} + +#endif // wxUSE_XPM + +// ---------------------------------------------------------------------------- +// wxXBMDataHandler +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxXBMDataHandler: public wxBitmapHandler +{ + DECLARE_DYNAMIC_CLASS(wxXBMDataHandler) +public: + inline wxXBMDataHandler() + { + SetName( wxT("XBM data") ); + SetExtension( wxT("xbm") ); + SetType( wxBITMAP_TYPE_XBM_DATA ); + }; + + virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap), + const wxString& WXUNUSED(name), + wxBitmapType WXUNUSED(flags), + int WXUNUSED(desiredWidth), + int WXUNUSED(desiredHeight)) + { return false; } + + virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap), + const wxString& WXUNUSED(name), + wxBitmapType WXUNUSED(type), + const wxPalette *WXUNUSED(palette) = NULL) const + { return false; } + + 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, + wxBitmapType WXUNUSED(type), + int width, int height, int WXUNUSED(depth)) +{ +#if !wxUSE_NANOX + if (!bitmap->GetRefData()) + bitmap->SetRefData( new wxBitmapRefData() ); + + M_BMPHANDLERDATA->m_display = wxGlobalDisplay(); + + Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display; + + int xscreen = DefaultScreen( xdisplay ); + Window xroot = RootWindow( xdisplay, xscreen ); + + M_BMPHANDLERDATA->m_mask = NULL; + M_BMPHANDLERDATA->m_bitmap = + XCreateBitmapFromData(xdisplay, xroot, + (char *) bits, width, height ); + M_BMPHANDLERDATA->m_width = width; + M_BMPHANDLERDATA->m_height = height; + M_BMPHANDLERDATA->m_bpp = 1; + + return true; +#else + wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, false, + wxT("couldn't create bitmap") ); +#endif +} + +void wxBitmap::InitStandardHandlers() +{ + AddHandler(new wxXBMDataHandler); +#if wxUSE_XPM +#if wxHAVE_LIB_XPM || wxUSE_STREAMS + AddHandler(new wxXPMFileHandler); +#endif + AddHandler(new wxXPMDataHandler); +#endif +}