X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a20c04abf2e6fb5ebe43a95202a752bb6f837477..7af64aace1813c851c7cb8366fb4ba4be0b68f7f:/src/x11/bitmap.cpp diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index 5054537f2b..b2edff7387 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -91,17 +91,14 @@ bool wxMask::Create( const wxBitmap& bitmap, m_display = bitmap.GetDisplay(); - wxImage image( bitmap ); + wxImage image = bitmap.ConvertToImage(); if (!image.Ok()) return FALSE; m_display = bitmap.GetDisplay(); 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,18 +114,8 @@ bool wxMask::Create( const wxBitmap& bitmap, unsigned char green = colour.Green(); unsigned char blue = colour.Blue(); - 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 bpp = wxTheApp->GetVisualInfo(m_display)->m_visualDepth; - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; if (bpp == 15) { red = red & 0xf8; @@ -150,11 +137,13 @@ bool wxMask::Create( const wxBitmap& bitmap, XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) ); - for (int j = 0; j < image.GetHeight(); j++) + int width = image.GetWidth(); + int height = image.GetHeight(); + for (int j = 0; j < height; j++) { int start_x = -1; int i; - for (i = 0; i < image.GetWidth(); i++) + for (i = 0; i < width; i++) { if ((data[index] == red) && (data[index+1] == green) && @@ -276,6 +265,35 @@ wxBitmapRefData::~wxBitmapRefData() //----------------------------------------------------------------------------- +// helper function + +static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap, + int x, int y, int width, int height, + int depth ) +{ + int xscreen = DefaultScreen( (Display*)xdisplay ); + Window xroot = RootWindow( (Display*)xdisplay, xscreen ); + Visual* xvisual = DefaultVisual( xdisplay, xscreen ); + + XImage* ximage = XCreateImage( (Display*)xdisplay, xvisual, depth, + ZPixmap, 0, 0, width, height, 32, 0 ); + ximage->data = (char*)malloc( ximage->bytes_per_line * ximage->height ); + ximage = XGetSubImage( (Display*)xdisplay, (Pixmap)xpixmap, + x, y, width, height, + AllPlanes, ZPixmap, ximage, 0, 0 ); + + GC gc = XCreateGC( (Display*)xdisplay, (Pixmap)xpixmap, 0, NULL ); + Pixmap ret = XCreatePixmap( (Display*)xdisplay, xroot, + width, height, depth ); + + XPutImage( (Display*)xdisplay, ret, gc, ximage, + 0, 0, 0, 0, width, height ); + XDestroyImage( ximage ); + XFreeGC( (Display*)xdisplay, gc ); + + return (WXPixmap)ret; +} + #define M_BMPDATA ((wxBitmapRefData *)m_refData) IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) @@ -340,78 +358,28 @@ bool wxBitmap::Create( int width, int height, int depth ) return Ok(); } -bool wxBitmap::CreateFromXpm( const char **bits ) +bool wxBitmap::Create(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("no data bitmap handler for type %ld defined.", + (long)type); - 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 = XpmCreatePixmapFromData( xdisplay, xroot, (char**) bits, &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? + return FALSE; + } -#if __WXDEBUG__ - unsigned int depthRet; - int xRet, yRet; - unsigned int widthRet, heightRet, borderWidthRet; - XGetGeometry( xdisplay, pixmap, &xroot, &xRet, &yRet, - &widthRet, &heightRet, &borderWidthRet, &depthRet); + return handler->Create(this, data, type, width, height, depth); +} - wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") ) -#endif +bool wxBitmap::CreateFromXpm( const char **bits ) +{ + wxCHECK_MSG( bits, FALSE, _T("NULL pointer in wxBitmap::CreateFromXpm") ); - 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; - } - 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; + return Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); } bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) @@ -435,6 +403,10 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) // by doing several blits as per the Windows // implementation because Nano-X doesn't support // XSetClipMask. + // TODO: could perhaps speed this function up + // by making a buffer of pixel values, + // and then calling GrArea to write that to the + // pixmap. See demos/nxroach.c. bool hasMask = image.HasMask(); @@ -534,7 +506,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) 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(); @@ -584,20 +556,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 @@ -605,24 +563,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" ); + + unsigned char *colorCube = + wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_colorCube; bool hasMask = image.HasMask(); @@ -651,27 +615,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; } @@ -746,10 +690,6 @@ 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 ); @@ -770,24 +710,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) // 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; @@ -796,43 +718,14 @@ wxImage wxBitmap::ConvertToImage() const 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 w = image.GetWidth(); - int h = image.GetHeight(); - - wxMemoryDC memDC; - memDC.SelectObject(*this); - - wxColour pixelCol; - - // Warning: this is very inefficient. - // TODO: use GrReadArea to get an array of pixels - int i, j; - for (i = 0; i < w; i++) - { - for (j = 0; j < h; j++) - { - memDC.GetPixel(i, j, & pixelCol); - - // TODO: make wxColour accessors more efficient - // by inlining, if possible - image.SetRGB(i, j, - pixelCol.Red(), pixelCol.Green(), - pixelCol.Blue()); - } - } - memDC.SelectObject(wxNullBitmap); - + //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()) { @@ -885,53 +778,33 @@ wxImage wxBitmap::ConvertToImage() const 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 + 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; - XFree( vi ); + use_shift = (vi->m_visualType == GrayScale) || + (vi->m_visualType != PseudoColor); } + if (GetBitmap()) { bpp = 1; } + XColor *colors = (XColor*)wxTheApp-> + GetVisualInfo(M_BMPDATA->m_display)->m_visualColormap; -// GdkColormap *cmap = gtk_widget_get_default_colormap(); - + int width = GetWidth(); + int height = GetHeight(); long pos = 0; - for (int j = 0; j < GetHeight(); j++) + for (int j = 0; j < height; j++) { - for (int i = 0; i < GetWidth(); i++) + for (int i = 0; i < width; i++) { unsigned long pixel = XGetPixel( x_image, i, j ); if (bpp == 1) @@ -955,14 +828,12 @@ wxImage wxBitmap::ConvertToImage() const data[pos+1] = (pixel >> green_shift_right) << green_shift_left; data[pos+2] = (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] = colors[pixel].red >> 8; + data[pos+1] = colors[pixel].green >> 8; + data[pos+2] = colors[pixel].blue >> 8; } -#endif else { wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") ); @@ -995,30 +866,16 @@ 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_refData = new wxBitmapRefData; - M_BMPDATA->m_display = wxGlobalDisplay(); - - 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((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth); } wxBitmap::~wxBitmap() @@ -1095,145 +952,103 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const { wxCHECK_MSG( Ok() && (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") ); - - 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") ); + wxBitmapHandler *handler = FindHandler(type); + // Try to save the bitmap via wxImage handlers: - { - wxImage image( *this ); + if (handler == NULL) + { + wxImage image(this->ConvertToImage()); if (image.Ok()) 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; + 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.Ok()) { - 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; } - return TRUE; + return handler->LoadFile(this, name, type, -1, -1); +} + +void wxBitmap::SetPalette(const wxPalette& palette) +{ + wxCHECK_RET(Ok(), wxT("invalid bitmap")); + 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; + + if (!palette.Ok()) return; + + M_BMPDATA->m_palette = new wxPalette(palette); } wxPalette *wxBitmap::GetPalette() const @@ -1292,6 +1107,13 @@ WXPixmap wxBitmap::GetBitmap() const return 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; +} + WXDisplay *wxBitmap::GetDisplay() const { wxCHECK_MSG( Ok(), (WXDisplay*) NULL, wxT("invalid bitmap") ); @@ -1303,32 +1125,27 @@ WXDisplay *wxBitmap::GetDisplay() const // Copy from the drawable to the wxImage bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, int height, wxImage& image) { - GR_SCREEN_INFO sinfo; + GR_SCREEN_INFO sinfo; int x, y; GR_PIXELVAL *pixels; - GR_PIXELVAL pixel; - GR_COLOR colour; GR_PALETTE* palette = NULL; + unsigned char rgb[3], *pp; - GrGetScreenInfo(&sinfo); + GrGetScreenInfo(&sinfo); - if (sinfo.pixtype == MWPF_PALETTE) { - if(!(palette = malloc(sizeof(GR_PALETTE)))) { + if (sinfo.pixtype == MWPF_PALETTE) { + if(!(palette = (GR_PALETTE*) malloc(sizeof(GR_PALETTE)))) { return FALSE; } GrGetSystemPalette(palette); } - if(!(pixels = (GR_PIXELVAL*) malloc(sizeof(GR_PIXELVAL) * width * height))) + if(!(pixels = (GR_PIXELVAL*) malloc(sizeof(GR_PIXELVAL) * width * height))) { return FALSE; } - if (!image.Create(width, height)) - { - free(pixels); - return FALSE; - } + image.Create(width, height); GrReadArea(drawable, srcX, srcY, width, height, pixels); @@ -1378,11 +1195,10 @@ bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, image.SetRGB(x, y, rgb[0], rgb[1], rgb[2]); - } } free(pixels); - if(palette) free(palette); + if(palette) free(palette); return TRUE; } @@ -1438,6 +1254,300 @@ int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixe return 1; } #endif + #endif // wxUSE_NANOX +// ============================================================================ +// Bitmap handlers +// ============================================================================ + +IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase); + +#define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData()) + +#if wxUSE_XPM + +#if wxHAVE_LIB_XPM || wxUSE_STREAMS + +// ---------------------------------------------------------------------------- +// wxXPMFileHandler +// ---------------------------------------------------------------------------- + +class wxXPMFileHandler : public wxBitmapHandler +{ + DECLARE_DYNAMIC_CLASS(wxXPMFileHandler); +public: + wxXPMFileHandler() + { + m_name = "XPM file"; + m_extension = "xpm"; + m_type = wxBITMAP_TYPE_XPM; + }; + + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, + int desiredWidth, int desiredHeight); + + virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, + int type, const wxPalette *palette = NULL); + + virtual bool Create(wxBitmap *bitmap, void *data, long flags, + int width, int height, int depth = 1) + { return FALSE; } +}; + +IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler); + +bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, + long flags, int desiredWidth, + int 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*) 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 = (WXPixmap) 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.Ok()) + { + wxImage image(decoder.ReadFile(stream)); + if (image.Ok()) + return CreateFromImage(image); + else + return FALSE; + } + else + return FALSE; +#endif // wxHAVE_LIB_XPM / wxUSE_STREAMS +} + +bool wxXPMFileHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, + int type, + const wxPalette *WXUNUSED(palette)) +{ + wxImage image(bitmap->ConvertToImage()); + if (image.Ok()) return image.SaveFile( name, (wxBitmapType)type ); + + return FALSE; +} + +#endif // wxHAVE_LIB_XPM || wxUSE_STREAMS + +// ---------------------------------------------------------------------------- +// wxXPMDataHandler +// ---------------------------------------------------------------------------- + +class wxXPMDataHandler : public wxBitmapHandler +{ + DECLARE_DYNAMIC_CLASS(wxXPMDataHandler); +public: + wxXPMDataHandler() + { + m_name = "XPM data"; + m_extension = "xpm"; + m_type = wxBITMAP_TYPE_XPM_DATA; + }; + + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, + int desiredWidth, int desiredHeight) + { return FALSE; } + + virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, + int type, const wxPalette *palette = NULL) + { return FALSE; } + + 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 *bits, + long WXUNUSED(flags), + int width, int 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__ + 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 + + XpmFreeAttributes(&xpmAttr); + + M_BMPHANDLERDATA->m_pixmap = (WXPixmap) 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 + wxXPMDecoder decoder; + wxImage image(decoder.ReadData(bits)); + if (image.Ok()) + return bitmap->CreateFromImage(image); + else + return FALSE; +#endif +} + +#endif // wxUSE_XPM + +// ---------------------------------------------------------------------------- +// wxXBMDataHandler +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxXBMDataHandler: public wxBitmapHandler +{ + DECLARE_DYNAMIC_CLASS(wxXBMDataHandler) +public: + inline wxXBMDataHandler() + { + m_name = "XBM data"; + m_extension = "xbm"; + m_type = wxBITMAP_TYPE_XBM_DATA; + }; + + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, + int desiredWidth, int desiredHeight) + { return FALSE; } + + virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, + int type, const wxPalette *palette = NULL) + { return FALSE; } + + virtual bool Create(wxBitmap *bitmap, void *data, long flags, + int width, int height, int depth = 1); +}; + +IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler); + +bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits, + long WXUNUSED(flags), + int width, int height, int 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 = (wxMask *) NULL; + M_BMPHANDLERDATA->m_bitmap = + (WXPixmap) XCreateBitmapFromData( xdisplay, xroot, + (char *) bits, width, height ); + M_BMPHANDLERDATA->m_width = width; + M_BMPHANDLERDATA->m_height = height; + M_BMPHANDLERDATA->m_bpp = 1; + + return TRUE; +#endif + wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, FALSE, + wxT("couldn't create bitmap") ); +} + +void wxBitmap::InitStandardHandlers() +{ + AddHandler(new wxXBMDataHandler); +#if wxUSE_XPM +#if wxHAVE_LIB_XPM || wxUSE_STREAMS + AddHandler(new wxXPMFileHandler); +#endif + AddHandler(new wxXPMDataHandler); +#endif +}