X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6ed456530113db11efc397e2a0a4ecfa7c3f3fc..31444b6aa411253e0523edfa8e7e361d408c2adc:/src/x11/bitmap.cpp diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index 794b7df0d8..10f3bc41e9 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -1,177 +1,373 @@ ///////////////////////////////////////////////////////////////////////////// // Name: bitmap.cpp // Purpose: wxBitmap -// Author: Julian Smart +// Author: Julian Smart, Robert Roebling // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) Julian Smart, Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "bitmap.h" #endif -#include "wx/setup.h" -#include "wx/utils.h" -#include "wx/palette.h" #include "wx/bitmap.h" #include "wx/icon.h" #include "wx/log.h" -#include "wx/control.h" -#include "wx/dcmemory.h" #include "wx/image.h" #include "wx/app.h" - -#ifdef __VMS__ -#pragma message disable nosimpint -#endif -#ifdef __VMS__ -#pragma message enable nosimpint +#if wxUSE_NANOX +#include "wx/dcmemory.h" #endif #include "wx/x11/private.h" +/* No point in using libXPM for NanoX */ +#if wxUSE_NANOX +#undef wxHAVE_LIB_XPM +#define wxHAVE_LIB_XPM 0 + +// Copy from the drawable to the wxImage +bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, int height, wxImage& image); +#endif + +#if wxUSE_XPM #if wxHAVE_LIB_XPM - #include +#include +#else +#include "wx/xpmdecod.h" +#include "wx/wfstream.h" +#endif #endif #include +//----------------------------------------------------------------------------- +// wxMask +//----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) -IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject) -wxBitmapRefData::wxBitmapRefData() +wxMask::wxMask() { - m_ok = FALSE; - m_width = 0; - m_height = 0; - m_depth = 0; - m_quality = 0; - m_numColors = 0; - m_bitmapMask = NULL; + m_bitmap = NULL; + m_display = NULL; +} - m_pixmap = (WXPixmap) 0; - m_display = (WXDisplay*) 0; +wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) +{ + m_bitmap = NULL; + Create( bitmap, colour ); +} - m_freePixmap = TRUE; //TODO: necessary? - m_freeColors = (unsigned long*) 0; - m_freeColorsCount = 0; +wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex ) +{ + m_bitmap = NULL; + Create( bitmap, paletteIndex ); } -wxBitmapRefData::~wxBitmapRefData() +wxMask::wxMask( const wxBitmap& bitmap ) +{ + m_bitmap = NULL; + Create( bitmap ); +} + +wxMask::~wxMask() { - if (m_pixmap && m_freePixmap) - XFreePixmap ((Display*) m_display, (Pixmap) m_pixmap); + if (m_bitmap) + XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap ); +} - if (m_freeColors) +bool wxMask::Create( const wxBitmap& bitmap, + const wxColour& colour ) +{ +#if !wxUSE_NANOX + if (m_bitmap) { - int screen = DefaultScreen((Display*) m_display); - Colormap cmp = DefaultColormap((Display*) m_display,screen); - long llp; - for(llp = 0;llp < m_freeColorsCount;llp++) - XFreeColors((Display*) m_display, cmp, &m_freeColors[llp], 1, 0L); - delete m_freeColors; - }; + XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap ); + m_bitmap = NULL; + } - if (m_bitmapMask) - delete m_bitmapMask; - m_bitmapMask = NULL; -} + m_display = bitmap.GetDisplay(); -wxList wxBitmap::sm_handlers; + wxImage image = bitmap.ConvertToImage(); + if (!image.Ok()) return FALSE; -#define M_BMPDATA ((wxBitmapRefData *)m_refData) + m_display = bitmap.GetDisplay(); -wxBitmap::wxBitmap() + Display *xdisplay = (Display*) m_display; + int xscreen = DefaultScreen( xdisplay ); + Window xroot = RootWindow( xdisplay, xscreen ); + + m_bitmap = (WXPixmap) XCreatePixmap( xdisplay, xroot, image.GetWidth(), image.GetHeight(), 1 ); + GC gc = XCreateGC( xdisplay, (Pixmap) m_bitmap, 0, NULL ); + + XSetForeground( xdisplay, gc, WhitePixel(xdisplay,xscreen) ); + XSetFillStyle( xdisplay, gc, FillSolid ); + XFillRectangle( xdisplay, (Pixmap) m_bitmap, gc, 0, 0, image.GetWidth(), image.GetHeight() ); + + unsigned char *data = image.GetData(); + int index = 0; + + unsigned char red = colour.Red(); + unsigned char green = colour.Green(); + unsigned char blue = colour.Blue(); + + int bpp = wxTheApp->GetVisualInfo(m_display)->m_visualDepth; + + if (bpp == 15) + { + red = red & 0xf8; + green = green & 0xf8; + blue = blue & 0xf8; + } else + if (bpp == 16) + { + red = red & 0xf8; + green = green & 0xfc; + blue = blue & 0xf8; + } else + if (bpp == 12) + { + red = red & 0xf0; + green = green & 0xf0; + blue = blue & 0xf0; + } + + XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) ); + + 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 < width; i++) + { + if ((data[index] == red) && + (data[index+1] == green) && + (data[index+2] == blue)) + { + if (start_x == -1) + start_x = i; + } + else + { + if (start_x != -1) + { + XDrawLine( xdisplay, (Pixmap) m_bitmap, gc, start_x, j, i-1, j ); + start_x = -1; + } + } + index += 3; + } + if (start_x != -1) + XDrawLine( xdisplay, (Pixmap) m_bitmap, gc, start_x, j, i, j ); + } + + XFreeGC( xdisplay, gc ); + + return TRUE; +#else + return FALSE; +#endif + // wxUSE_NANOX +} + +bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex ) { - m_refData = NULL; + unsigned char r,g,b; + wxPalette *pal = bitmap.GetPalette(); + + wxCHECK_MSG( pal, FALSE, wxT("Cannot create mask from bitmap without palette") ); + + pal->GetRGB(paletteIndex, &r, &g, &b); + + return Create(bitmap, wxColour(r, g, b)); } -wxBitmap::~wxBitmap() +bool wxMask::Create( const wxBitmap& bitmap ) { +#if !wxUSE_NANOX + if (m_bitmap) + { + XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap ); + m_bitmap = NULL; + } + + if (!bitmap.Ok()) return FALSE; + + 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; + + 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; +#else + return FALSE; +#endif + // wxUSE_NANOX } -wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) +//----------------------------------------------------------------------------- +// wxBitmap +//----------------------------------------------------------------------------- + +class wxBitmapRefData: public wxObjectRefData { - m_refData = new wxBitmapRefData; +public: + wxBitmapRefData(); + ~wxBitmapRefData(); + + WXPixmap m_pixmap; + WXPixmap m_bitmap; + WXDisplay *m_display; + wxMask *m_mask; + int m_width; + int m_height; + int m_bpp; + wxPalette *m_palette; +}; - (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth); +wxBitmapRefData::wxBitmapRefData() +{ + m_pixmap = NULL; + m_bitmap = NULL; + m_display = NULL; + m_mask = (wxMask *) NULL; + m_width = 0; + m_height = 0; + m_bpp = 0; + m_palette = (wxPalette *) NULL; +} + +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; } -wxBitmap::wxBitmap(int w, int h, int d) +//----------------------------------------------------------------------------- + +// helper function + +static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap, + int x, int y, int width, int height, + int depth ) { - (void)Create(w, h, d); + 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; } -wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth) +#define M_BMPDATA ((wxBitmapRefData *)m_refData) + +IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) + +wxBitmap::wxBitmap() { - (void) Create(data, type, width, height, depth); } -wxBitmap::wxBitmap(const wxString& filename, long type) +wxBitmap::wxBitmap( int width, int height, int depth ) { - LoadFile(filename, (int)type); + Create( width, height, depth ); } -bool wxBitmap::Create(int w, int h, int d) +bool wxBitmap::Create( int width, int height, int depth ) { UnRef(); - m_refData = new wxBitmapRefData; + wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") ) - if (d < 1) - d = wxDisplayDepth(); + m_refData = new wxBitmapRefData(); - M_BITMAPDATA->m_width = w; - M_BITMAPDATA->m_height = h; - M_BITMAPDATA->m_depth = d; - M_BITMAPDATA->m_freePixmap = TRUE; + M_BMPDATA->m_display = wxGlobalDisplay(); - Display *dpy = (Display*) wxGetDisplay(); + wxASSERT_MSG( M_BMPDATA->m_display, wxT("No display") ); - M_BITMAPDATA->m_display = dpy; /* MATTHEW: [4] Remember the display */ + int xscreen = DefaultScreen( (Display*) M_BMPDATA->m_display ); + Window xroot = RootWindow( (Display*) M_BMPDATA->m_display, xscreen ); - M_BITMAPDATA->m_pixmap = (WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)), - w, h, d); + int bpp = DefaultDepth( (Display*) M_BMPDATA->m_display, xscreen ); + if (depth == -1) depth = bpp; - M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_pixmap != (WXPixmap) 0) ; - return M_BITMAPDATA->m_ok; -} + wxCHECK_MSG( (depth == bpp) || + (depth == 1), FALSE, wxT("invalid bitmap depth") ) -bool wxBitmap::LoadFile(const wxString& filename, long type) -{ - UnRef(); + M_BMPDATA->m_mask = (wxMask *) NULL; + M_BMPDATA->m_width = width; + M_BMPDATA->m_height = height; - m_refData = new wxBitmapRefData; +#if wxUSE_NANOX + M_BMPDATA->m_pixmap = (WXPixmap) GrNewPixmap(width, height, NULL); + M_BMPDATA->m_bpp = bpp; - wxBitmapHandler *handler = FindHandler(type); + 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 ); - if ( handler == NULL ) { - wxImage image; - if (!image.LoadFile( filename, type )) return FALSE; - if (image.Ok()) - { - *this = image.ConvertToBitmap(); - return TRUE; - } - else return FALSE; + 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 ); - return handler->LoadFile(this, filename, type, -1, -1); + wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("Pixmap creation failed") ); + + M_BMPDATA->m_bpp = depth; + } +#endif + return Ok(); } -bool wxBitmap::Create(void *data, long type, int width, int height, int depth) +bool wxBitmap::Create(void *data, wxBitmapType type, + int width, int height, int depth) { UnRef(); - m_refData = new wxBitmapRefData; - wxBitmapHandler *handler = FindHandler(type); if ( handler == NULL ) { - wxLogWarning("no data bitmap handler for type %d defined.", type); + wxLogWarning(wxT("no data bitmap handler for type %ld defined."), + (long)type); return FALSE; } @@ -179,874 +375,1216 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth) return handler->Create(this, data, type, width, height, depth); } -bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette) +bool wxBitmap::Create(WXPixmap pixmap) { - wxBitmapHandler *handler = FindHandler(type); + UnRef(); + Pixmap xpixmap = (Pixmap)pixmap; + Display* xdisplay = wxGlobalDisplay(); + int xscreen = DefaultScreen( xdisplay ); + Window xroot = RootWindow( xdisplay, xscreen ); + + // 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 ); + + GC gc = XCreateGC( xdisplay, copy, 0, NULL ); + XCopyArea( xdisplay, xpixmap, copy, gc, 0, 0, width, height, 0, 0 ); + XFreeGC( xdisplay, gc ); + + // fill in ref data + wxBitmapRefData* ref = new wxBitmapRefData(); + + if( depth == 1 ) + ref->m_bitmap = (WXPixmap)copy; + else + ref->m_pixmap = (WXPixmap)copy; - if ( handler == NULL ) { // try wxImage - wxImage image( *this ); - if (image.Ok()) return image.SaveFile( filename, type ); - else return FALSE; - } + ref->m_display = (WXDisplay*)xdisplay; + ref->m_width = width; + ref->m_height = height; + ref->m_bpp = depth; - return handler->SaveFile(this, filename, type, palette); + m_refData = ref; + + return true; } -void wxBitmap::SetWidth(int w) +bool wxBitmap::CreateFromXpm( const char **bits ) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + wxCHECK_MSG( bits, FALSE, wxT("NULL pointer in wxBitmap::CreateFromXpm") ); - M_BITMAPDATA->m_width = w; + return Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); } -void wxBitmap::SetHeight(int h) +bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; +#if wxUSE_NANOX + if (!image.Ok()) + { + wxASSERT_MSG(image.Ok(), wxT("Invalid wxImage passed to wxBitmap::CreateFromImage.")); + return FALSE; + } - M_BITMAPDATA->m_height = h; -} + int w = image.GetWidth(); + int h = image.GetHeight(); -void wxBitmap::SetDepth(int d) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + if (!Create(w, h, depth)) + return FALSE; - M_BITMAPDATA->m_depth = d; -} + // Unfortunately the mask has to be screen-depth since + // 1-bpp bitmaps don't seem to be supported + // TODO: implement transparent drawing, presumably + // 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. -void wxBitmap::SetQuality(int q) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + bool hasMask = image.HasMask(); - M_BITMAPDATA->m_quality = q; -} + GC pixmapGC = GrNewGC(); + Pixmap pixmap = (Pixmap) GetPixmap(); -void wxBitmap::SetOk(bool isOk) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + GC maskGC = 0; + Pixmap maskPixmap = 0; - M_BITMAPDATA->m_ok = isOk; -} + unsigned char maskR = 0; + unsigned char maskG = 0; + unsigned char maskB = 0; -void wxBitmap::SetPalette(const wxPalette& palette) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + if (hasMask) + { + maskR = image.GetMaskRed(); + maskG = image.GetMaskGreen(); + maskB = image.GetMaskBlue(); + + maskGC = GrNewGC(); + maskPixmap = GrNewPixmap(w, h, 0); + if (!maskPixmap) + hasMask = FALSE; + else + { + wxMask* mask = new wxMask; + mask->SetBitmap((WXPixmap) maskPixmap); + SetMask(mask); + } + } - M_BITMAPDATA->m_bitmapPalette = palette ; -} + GR_COLOR lastPixmapColour = 0; + GR_COLOR lastMaskColour = 0; -void wxBitmap::SetMask(wxMask *mask) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + int i, j; + for (i = 0; i < w; i++) + { + for (j = 0; j < h; j++) + { + unsigned char red = image.GetRed(i, j); + unsigned char green = image.GetGreen(i, j); + unsigned char blue = image.GetBlue(i, j); - M_BITMAPDATA->m_bitmapMask = mask ; -} + GR_COLOR colour = GR_RGB(red, green, blue); -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), - wxNullBitmap, wxT("invalid bitmap or bitmap region") ); + // Efficiency measure + if (colour != lastPixmapColour || (i == 0 && j == 0)) + { + GrSetGCForeground(pixmapGC, colour); + lastPixmapColour = colour; + } - wxBitmap ret( rect.width, rect.height, 0 ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); + GrPoint(pixmap, pixmapGC, i, j); - // The remaining still TODO - return ret; -} + if (hasMask) + { + // scan the bitmap for the transparent colour and set the corresponding + // pixels in the mask to BLACK and the rest to WHITE + if (maskR == red && maskG == green && maskB == blue) + { + colour = GR_RGB(0, 0, 0); + } + else + { + colour = GR_RGB(255, 255, 255); + } + if (colour != lastMaskColour || (i == 0 && j == 0)) + { + GrSetGCForeground(maskGC, colour); + lastMaskColour = colour; + } + GrPoint(maskPixmap, maskGC, i, j); + } + } + } -void wxBitmap::AddHandler(wxBitmapHandler *handler) -{ - sm_handlers.Append(handler); -} + GrDestroyGC(pixmapGC); + if (hasMask) + GrDestroyGC(maskGC); -void wxBitmap::InsertHandler(wxBitmapHandler *handler) -{ - sm_handlers.Insert(handler); -} + return TRUE; +#else + // !wxUSE_NANOX -bool wxBitmap::RemoveHandler(const wxString& name) -{ - wxBitmapHandler *handler = FindHandler(name); - if ( handler ) + UnRef(); + + wxCHECK_MSG( image.Ok(), 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 = wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_visualDepth; + + int width = image.GetWidth(); + int height = image.GetHeight(); + M_BMPDATA->m_width = width; + M_BMPDATA->m_height = height; + + if (depth != 1) depth = bpp; + M_BMPDATA->m_bpp = depth; + + if (depth == 1) { - sm_handlers.DeleteObject(handler); - return TRUE; + wxFAIL_MSG( wxT("mono images later") ); } else - return FALSE; + { + // 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; + } + + M_BMPDATA->m_pixmap = (WXPixmap) XCreatePixmap( xdisplay, xroot, width, height, depth ); + + // Create mask + + XImage *mask_image = (XImage*) NULL; + if (image.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; + } + + wxMask *mask = new wxMask(); + mask->SetDisplay( xdisplay ); + mask->SetBitmap( (WXPixmap) XCreatePixmap( xdisplay, xroot, width, height, 1 ) ); + + SetMask( mask ); + } + + if (bpp < 8) bpp = 8; + + // Render + + 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 ((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; + } + + int r_mask = image.GetMaskRed(); + int g_mask = image.GetMaskGreen(); + int b_mask = image.GetMaskBlue(); + + unsigned char* data = image.GetData(); + wxASSERT_MSG( data, wxT("No image data") ); + + 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++) + { + for (int x = 0; x < width; x++) + { + int r = data[index]; + index++; + int g = data[index]; + index++; + int b = data[index]; + index++; + + if (hasMask) + { + if ((r == r_mask) && (b == b_mask) && (g == g_mask)) + XPutPixel( mask_image, x, y, 0 ); + else + XPutPixel( mask_image, x, y, 1 ); + } + + switch (bpp) + { + case 8: + { + int pixel = 0; + pixel = colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ]; + XPutPixel( data_image, x, y, pixel ); + break; + } + case 12: // SGI only + { + int pixel = 0; + switch (b_o) + { + case RGB: pixel = ((r & 0xf0) << 4) | (g & 0xf0) | ((b & 0xf0) >> 4); break; + case RBG: pixel = ((r & 0xf0) << 4) | (b & 0xf0) | ((g & 0xf0) >> 4); break; + case GRB: pixel = ((g & 0xf0) << 4) | (r & 0xf0) | ((b & 0xf0) >> 4); break; + case GBR: pixel = ((g & 0xf0) << 4) | (b & 0xf0) | ((r & 0xf0) >> 4); break; + case BRG: pixel = ((b & 0xf0) << 4) | (r & 0xf0) | ((g & 0xf0) >> 4); break; + case BGR: pixel = ((b & 0xf0) << 4) | (g & 0xf0) | ((r & 0xf0) >> 4); break; + } + XPutPixel( data_image, x, y, pixel ); + break; + } + case 15: + { + int pixel = 0; + switch (b_o) + { + case RGB: pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); break; + case RBG: pixel = ((r & 0xf8) << 7) | ((b & 0xf8) << 2) | ((g & 0xf8) >> 3); break; + case GRB: pixel = ((g & 0xf8) << 7) | ((r & 0xf8) << 2) | ((b & 0xf8) >> 3); break; + case GBR: pixel = ((g & 0xf8) << 7) | ((b & 0xf8) << 2) | ((r & 0xf8) >> 3); break; + case BRG: pixel = ((b & 0xf8) << 7) | ((r & 0xf8) << 2) | ((g & 0xf8) >> 3); break; + case BGR: pixel = ((b & 0xf8) << 7) | ((g & 0xf8) << 2) | ((r & 0xf8) >> 3); break; + } + XPutPixel( data_image, x, y, pixel ); + break; + } + case 16: + { + // I actually don't know if for 16-bit displays, it is alway the green + // component or the second component which has 6 bits. + int pixel = 0; + switch (b_o) + { + case RGB: pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); break; + case RBG: pixel = ((r & 0xf8) << 8) | ((b & 0xfc) << 3) | ((g & 0xf8) >> 3); break; + case GRB: pixel = ((g & 0xf8) << 8) | ((r & 0xfc) << 3) | ((b & 0xf8) >> 3); break; + case GBR: pixel = ((g & 0xf8) << 8) | ((b & 0xfc) << 3) | ((r & 0xf8) >> 3); break; + case BRG: pixel = ((b & 0xf8) << 8) | ((r & 0xfc) << 3) | ((g & 0xf8) >> 3); break; + case BGR: pixel = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3); break; + } + XPutPixel( data_image, x, y, pixel ); + break; + } + case 32: + case 24: + { + int pixel = 0; + switch (b_o) + { + case RGB: pixel = (r << 16) | (g << 8) | b; break; + case RBG: pixel = (r << 16) | (b << 8) | g; break; + case BRG: pixel = (b << 16) | (r << 8) | g; break; + case BGR: pixel = (b << 16) | (g << 8) | r; break; + case GRB: pixel = (g << 16) | (r << 8) | b; break; + case GBR: pixel = (g << 16) | (b << 8) | r; break; + } + XPutPixel( data_image, x, y, pixel ); + } + default: break; + } + } // for + } // for + + // Blit picture + + 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 ); + XDestroyImage( data_image ); + XFreeGC( xdisplay, gc ); + + // Blit mask + + if (image.HasMask()) + { + GC gc = XCreateGC( xdisplay, (Pixmap) GetMask()->GetBitmap(), 0, NULL ); + XPutImage( xdisplay, (Pixmap) GetMask()->GetBitmap(), gc, mask_image, 0, 0, 0, 0, width, height ); + + XDestroyImage( mask_image ); + XFreeGC( xdisplay, gc ); + } + } + + return TRUE; +#endif + // wxUSE_NANOX } -wxBitmapHandler *wxBitmap::FindHandler(const wxString& name) +wxImage wxBitmap::ConvertToImage() const { - wxNode *node = sm_handlers.First(); - while ( node ) + wxImage image; + + wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + + Display *xdisplay = (Display*) M_BMPDATA->m_display; + wxASSERT_MSG( xdisplay, wxT("No display") ); + +#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()) + { + x_image = XGetImage( xdisplay, (Pixmap) GetPixmap(), + 0, 0, + GetWidth(), GetHeight(), + AllPlanes, ZPixmap ); + } else + if (GetBitmap()) + { + x_image = XGetImage( xdisplay, (Pixmap) GetBitmap(), + 0, 0, + GetWidth(), GetHeight(), + AllPlanes, ZPixmap ); + } else + { + wxFAIL_MSG( wxT("Ill-formed bitmap") ); + } + + wxCHECK_MSG( x_image, wxNullImage, wxT("couldn't create image") ); + + image.Create( GetWidth(), GetHeight() ); + char unsigned *data = image.GetData(); + + if (!data) { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetName() == name ) - return handler; - node = node->Next(); + XDestroyImage( x_image ); + wxFAIL_MSG( wxT("couldn't create image") ); + return wxNullImage; + } + + XImage *x_image_mask = NULL; + if (GetMask()) + { + x_image_mask = XGetImage( xdisplay, (Pixmap) GetMask()->GetBitmap(), + 0, 0, + GetWidth(), GetHeight(), + AllPlanes, ZPixmap ); + + image.SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable + } + + int red_shift_right = 0; + int green_shift_right = 0; + int blue_shift_right = 0; + int red_shift_left = 0; + int green_shift_left = 0; + int blue_shift_left = 0; + bool use_shift = FALSE; + + if (GetPixmap()) + { + 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; + } + + XColor *colors = (XColor*)wxTheApp-> + GetVisualInfo(M_BMPDATA->m_display)->m_visualColormap; + + int width = GetWidth(); + int height = GetHeight(); + long pos = 0; + for (int j = 0; j < height; j++) + { + for (int i = 0; i < width; i++) + { + unsigned long pixel = XGetPixel( x_image, i, j ); + if (bpp == 1) + { + if (pixel == 0) + { + data[pos] = 0; + data[pos+1] = 0; + data[pos+2] = 0; + } + else + { + data[pos] = 255; + data[pos+1] = 255; + data[pos+2] = 255; + } + } + 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; + } + else if (colors) + { + data[pos] = colors[pixel].red >> 8; + data[pos+1] = colors[pixel].green >> 8; + data[pos+2] = colors[pixel].blue >> 8; + } + else + { + wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") ); + } + + if (x_image_mask) + { + int mask_pixel = XGetPixel( x_image_mask, i, j ); + if (mask_pixel == 0) + { + data[pos] = 16; + data[pos+1] = 16; + data[pos+2] = 16; + } + } + + pos += 3; + } } - return NULL; -} -wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType) -{ - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetExtension() == extension && - (bitmapType == -1 || handler->GetType() == bitmapType) ) - return handler; - node = node->Next(); - } - return NULL; + XDestroyImage( x_image ); + if (x_image_mask) XDestroyImage( x_image_mask ); + return image; +#endif + // wxUSE_NANOX } -wxBitmapHandler *wxBitmap::FindHandler(long bitmapType) +wxBitmap::wxBitmap( const wxBitmap& bmp ) { - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if (handler->GetType() == bitmapType) - return handler; - node = node->Next(); - } - return NULL; + Ref( bmp ); } -/* -* wxMask -*/ - -wxMask::wxMask() +wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type ) { - m_pixmap = (WXPixmap) 0; + LoadFile( filename, type ); } -// Construct a mask from a bitmap and a colour indicating -// the transparent area -wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour) +wxBitmap::wxBitmap( const char bits[], int width, int height, int depth ) { - m_pixmap = (WXPixmap) 0; + m_refData = new wxBitmapRefData; - Create(bitmap, colour); + (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth); } -// Construct a mask from a bitmap and a palette index indicating -// the transparent area -wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex) +wxBitmap::~wxBitmap() { - m_pixmap = (WXPixmap) 0; - - Create(bitmap, paletteIndex); } -// Construct a mask from a mono bitmap (copies the bitmap). -wxMask::wxMask(const wxBitmap& bitmap) +wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp ) { - m_pixmap = (WXPixmap) 0; + if ( m_refData != bmp.m_refData ) + Ref( bmp ); - Create(bitmap); + return *this; } -wxMask::~wxMask() +bool wxBitmap::operator == ( const wxBitmap& bmp ) const { - // TODO: this may be the wrong display - if ( m_pixmap ) - XFreePixmap ((Display*) wxGetDisplay(), (Pixmap) m_pixmap); + return m_refData == bmp.m_refData; } -// Create a mask from a mono bitmap (copies the bitmap). -bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap)) +bool wxBitmap::operator != ( const wxBitmap& bmp ) const { - // TODO - return FALSE; + return m_refData != bmp.m_refData; } -// Create a mask from a bitmap and a palette index indicating -// the transparent area -bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex)) +bool wxBitmap::Ok() const { - // TODO - return FALSE; + return (m_refData != NULL); } -// Create a mask from a bitmap and a colour indicating -// the transparent area -bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour)) +int wxBitmap::GetHeight() const { - // TODO - return FALSE; + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + + return M_BMPDATA->m_height; } -/* -* wxBitmapHandler -*/ +int wxBitmap::GetWidth() const +{ + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); -IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) + return M_BMPDATA->m_width; +} -bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), void *WXUNUSED(data), long WXUNUSED(type), - int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth)) +int wxBitmap::GetDepth() const { - return FALSE; + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + + return M_BMPDATA->m_bpp; } -bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), long WXUNUSED(type), - int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) +wxMask *wxBitmap::GetMask() const { - return FALSE; + wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") ); + + return M_BMPDATA->m_mask; } -bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), int WXUNUSED(type), - const wxPalette *WXUNUSED(palette)) +void wxBitmap::SetMask( wxMask *mask ) { - return FALSE; -} + wxCHECK_RET( Ok(), wxT("invalid bitmap") ); -/* -* Standard handlers -*/ + if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; -class WXDLLEXPORT wxXBMFileHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxXBMFileHandler) -public: - inline wxXBMFileHandler() - { - m_name = "XBM file"; - m_extension = "xbm"; - m_type = wxBITMAP_TYPE_XBM; - }; + M_BMPDATA->m_mask = mask; +} - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); -}; -IMPLEMENT_DYNAMIC_CLASS(wxXBMFileHandler, wxBitmapHandler) +bool wxBitmap::CopyFromIcon(const wxIcon& icon) +{ + *this = icon; + return TRUE; +} -bool wxXBMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags), - int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) +wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const { - M_BITMAPHANDLERDATA->m_freePixmap = TRUE; + 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), + wxNullBitmap, wxT("invalid bitmap or bitmap region") ); - int hotX, hotY; - unsigned int w, h; - Pixmap pixmap; + wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp ); + wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); - Display *dpy = (Display*) wxGetDisplay(); - M_BITMAPDATA->m_display = (WXDisplay*) dpy; + if( GetMask() ) + { + 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 ); + } - int value = XReadBitmapFile (dpy, RootWindow (dpy, DefaultScreen (dpy)), - (char*) (const char*) name, &w, &h, &pixmap, &hotX, &hotY); - M_BITMAPHANDLERDATA->m_width = w; - M_BITMAPHANDLERDATA->m_height = h; - M_BITMAPHANDLERDATA->m_depth = 1; - M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) pixmap; + if( GetPixmap() ) + { + ret.SetPixmap( wxGetSubPixmap( GetDisplay(), + GetPixmap(), + rect.x, rect.y, + rect.width, rect.height, + M_BMPDATA->m_bpp ) ); + } - if ((value == BitmapFileInvalid) || - (value == BitmapOpenFailed) || - (value == BitmapNoMemory)) + if( GetBitmap() ) { - M_BITMAPHANDLERDATA->m_ok = FALSE; - M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) 0; + ret.SetBitmap( wxGetSubPixmap( GetDisplay(), + GetBitmap(), + rect.x, rect.y, + rect.width, rect.height, + 1 ) ); } - else - M_BITMAPHANDLERDATA->m_ok = TRUE; - return M_BITMAPHANDLERDATA->m_ok ; + return ret; } -class WXDLLEXPORT wxXBMDataHandler: public wxBitmapHandler +bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, + const wxPalette *palette ) const { - DECLARE_DYNAMIC_CLASS(wxXBMDataHandler) -public: - inline wxXBMDataHandler() - { - m_name = "XBM data"; - m_extension = "xbm"; - m_type = wxBITMAP_TYPE_XBM_DATA; - }; + wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") ); - 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 *data, long WXUNUSED(flags), - int width, int height, int WXUNUSED(depth)) -{ - M_BITMAPHANDLERDATA->m_width = width; - M_BITMAPHANDLERDATA->m_height = height; - M_BITMAPHANDLERDATA->m_depth = 1; - M_BITMAPHANDLERDATA->m_freePixmap = TRUE; + wxBitmapHandler *handler = FindHandler(type); - Display *dpy = (Display*) wxGetDisplay(); - M_BITMAPHANDLERDATA->m_display = (WXDisplay*) dpy; + // Try to save the bitmap via wxImage handlers: + if (handler == NULL) + { + wxImage image(this->ConvertToImage()); + if (image.Ok()) return image.SaveFile( name, type ); - M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) XCreateBitmapFromData (dpy, RootWindow (dpy, DefaultScreen (dpy)), (char*) data, width, height); - M_BITMAPHANDLERDATA->m_ok = (M_BITMAPHANDLERDATA->m_pixmap != (WXPixmap) 0) ; + return FALSE; + } - return TRUE; + return handler->SaveFile(this, name, type, palette); } -void wxBitmap::CleanUpHandlers() +bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) { - wxNode *node = sm_handlers.First(); - while ( node ) + UnRef(); + + if (!wxFileExists(name)) return FALSE; + + wxBitmapHandler *handler = FindHandler(type); + + if (handler == NULL) { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - wxNode *next = node->Next(); - delete handler; - delete node; - node = next; + wxImage image; + if (!image.LoadFile( name, type )) + return FALSE; + + if (image.Ok()) + { + *this = wxBitmap(image); + return TRUE; + } + else return FALSE; } + + return handler->LoadFile(this, name, type, -1, -1); } -void wxBitmap::InitStandardHandlers() +void wxBitmap::SetPalette(const wxPalette& palette) { - // Initialize all standard bitmap or derived class handlers here. - AddHandler(new wxXBMFileHandler); - AddHandler(new wxXBMDataHandler); + wxCHECK_RET(Ok(), wxT("invalid bitmap")); + wxCHECK_RET(GetDepth() > 1 && GetDepth() <= 8, + wxT("cannot set palette for bitmap of this depth")); - // XPM will be handled by wxImage -} + delete M_BMPDATA->m_palette; + M_BMPDATA->m_palette = NULL; -// Creates a bitmap with transparent areas drawn in -// the given colour. -wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour) -{ - wxBitmap newBitmap(bitmap.GetWidth(), - bitmap.GetHeight(), - bitmap.GetDepth()); - wxMemoryDC destDC; - wxMemoryDC srcDC; - srcDC.SelectObject(bitmap); - destDC.SelectObject(newBitmap); - - wxBrush brush(colour, wxSOLID); - destDC.SetOptimization(FALSE); - destDC.SetBackground(brush); - destDC.Clear(); - destDC.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & srcDC, 0, 0, wxCOPY, TRUE); - - return newBitmap; -} + if (!palette.Ok()) return; -//----------------------------------------------------------------------------- -// wxImage conversion routines -//----------------------------------------------------------------------------- + M_BMPDATA->m_palette = new wxPalette(palette); +} -/* +wxPalette *wxBitmap::GetPalette() const +{ + if (!Ok()) return (wxPalette *) NULL; -Date: Wed, 05 Jan 2000 11:45:40 +0100 -From: Frits Boel -To: julian.smart@ukonline.co.uk -Subject: Patch for Motif ConvertToBitmap + return M_BMPDATA->m_palette; +} -Hi Julian, +void wxBitmap::SetHeight( int height ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); -I've been working on a wxWin application for image processing. From the -beginning, I was surprised by the (lack of) speed of ConvertToBitmap, -till I looked in the source code of image.cpp. I saw that converting a -wxImage to a bitmap with 8-bit pixels is done with comparing every pixel -to the 256 colors of the palet. A very time-consuming piece of code! + M_BMPDATA->m_height = height; +} -Because I wanted a faster application, I've made a 'patch' for this. In -short: every pixel of the image is compared to a sorted list with -colors. If the color is found in the list, the palette entry is -returned; if the color is not found, the color palette is searched and -then the palette entry is returned and the color added to the sorted -list. +void wxBitmap::SetWidth( int width ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); -Maybe there is another method for this, namely changing the palette -itself (if the colors are known, as is the case with tiffs with a -colormap). I did not look at this, maybe someone else did? + M_BMPDATA->m_width = width; +} -The code of the patch is attached, have a look on it, and maybe you will -ship it with the next release of wxMotif? +void wxBitmap::SetDepth( int depth ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); -Regards, + M_BMPDATA->m_bpp = depth; +} -Frits Boel -Software engineer at Hubrecht Laboratory, The Netherlands. +void wxBitmap::SetPixmap( WXPixmap pixmap ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); -*/ + M_BMPDATA->m_pixmap = pixmap; +} -class wxSearchColor +void wxBitmap::SetBitmap( WXPixmap bitmap ) { -public: - wxSearchColor( void ); - wxSearchColor( int size, XColor *colors ); - ~wxSearchColor( void ); + if (!m_refData) m_refData = new wxBitmapRefData(); - int SearchColor( int r, int g, int b ); -private: - int AddColor( unsigned int value, int pos ); + M_BMPDATA->m_bitmap = bitmap; +} - int size; - XColor *colors; - unsigned int *color; - int *entry; +WXPixmap wxBitmap::GetPixmap() const +{ + wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); - int bottom; - int top; -}; + return M_BMPDATA->m_pixmap; +} -wxSearchColor::wxSearchColor( void ) +WXPixmap wxBitmap::GetBitmap() const { - size = 0; - colors = (XColor*) NULL; - color = (unsigned int *) NULL; - entry = (int*) NULL; + wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); - bottom = 0; - top = 0; + return M_BMPDATA->m_bitmap; } -wxSearchColor::wxSearchColor( int size_, XColor *colors_ ) +WXPixmap wxBitmap::GetDrawable() const { - int i; - size = size_; - colors = colors_; - color = new unsigned int[size]; - entry = new int [size]; - - for (i = 0; i < size; i++ ) { - entry[i] = -1; - } + wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); - bottom = top = ( size >> 1 ); + return M_BMPDATA->m_bpp == 1 ? M_BMPDATA->m_bitmap : M_BMPDATA->m_pixmap; } -wxSearchColor::~wxSearchColor( void ) +WXDisplay *wxBitmap::GetDisplay() const { - if ( color ) delete color; - if ( entry ) delete entry; + wxCHECK_MSG( Ok(), (WXDisplay*) NULL, wxT("invalid bitmap") ); + + return M_BMPDATA->m_display; } -int wxSearchColor::SearchColor( int r, int g, int b ) +#if wxUSE_NANOX +// Copy from the drawable to the wxImage +bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, int height, wxImage& image) { - unsigned int value = ( ( ( r * 256 ) + g ) * 256 ) + b; - int begin = bottom; - int end = top; - int middle = 0; + GR_SCREEN_INFO sinfo; + int x, y; + GR_PIXELVAL *pixels; + GR_PALETTE* palette = NULL; + unsigned char rgb[3], *pp; + + GrGetScreenInfo(&sinfo); - while ( begin <= end ) { + 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))) + { + 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; + } - middle = ( begin + end ) >> 1; + image.SetRGB(x, y, rgb[0], rgb[1], rgb[2]); - if ( value == color[middle] ) { - return( entry[middle] ); - } else if ( value < color[middle] ) { - end = middle - 1; - } else { - begin = middle + 1; } - } + free(pixels); + if(palette) free(palette); - return AddColor( value, middle ); + return TRUE; } -int wxSearchColor::AddColor( unsigned int value, int pos ) +#if 0 +int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixel, + unsigned char* red, unsigned char* green, unsigned char* blue) { - int i; - int pixel = -1; - int max = 3 * (65536); - for ( i = 0; i < 256; i++ ) { - int rdiff = ((value >> 8) & 0xFF00 ) - colors[i].red; - int gdiff = ((value ) & 0xFF00 ) - colors[i].green; - int bdiff = ((value << 8) & 0xFF00 ) - colors[i].blue; - int sum = abs (rdiff) + abs (gdiff) + abs (bdiff); - if (sum < max) { pixel = i; max = sum; } - } - - if ( entry[pos] < 0 ) { - color[pos] = value; - entry[pos] = pixel; - } else if ( value < color[pos] ) { - - if ( bottom > 0 ) { - for ( i = bottom; i < pos; i++ ) { - color[i-1] = color[i]; - entry[i-1] = entry[i]; - } - bottom--; - color[pos-1] = value; - entry[pos-1] = pixel; - } else if ( top < size-1 ) { - for ( i = top; i >= pos; i-- ) { - color[i+1] = color[i]; - entry[i+1] = entry[i]; - } - top++; - color[pos] = value; - entry[pos] = pixel; - } + unsigned char rgb[3], *pp; - } else { - - if ( top < size-1 ) { - for ( i = top; i > pos; i-- ) { - color[i+1] = color[i]; - entry[i+1] = entry[i]; - } - top++; - color[pos+1] = value; - entry[pos+1] = pixel; - } else if ( bottom > 0 ) { - for ( i = bottom; i < pos; i++ ) { - color[i-1] = color[i]; - entry[i-1] = entry[i]; - } - bottom--; - color[pos] = value; - entry[pos] = pixel; + 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; } - } - return( pixel ); + *(red) = rgb[0]; + *(green) = rgb[1]; + *(blue) = rgb[2]; + return 1; } +#endif +#endif + // wxUSE_NANOX -bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) -{ - wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ) - wxCHECK_MSG( depth == -1, FALSE, wxT("invalid bitmap depth") ) +// ============================================================================ +// Bitmap handlers +// ============================================================================ - m_refData = new wxBitmapRefData(); +IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase); - int width = image.GetWidth(); - int height = image.GetHeight(); +#define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData()) - SetHeight( height ); - SetWidth( width ); +#if wxUSE_XPM - Display *dpy = (Display*) wxGetDisplay(); - Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) ); - int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) ); +#if wxHAVE_LIB_XPM || wxUSE_STREAMS - // Create image +// ---------------------------------------------------------------------------- +// wxXPMFileHandler +// ---------------------------------------------------------------------------- - XImage *data_image = XCreateImage( dpy, vis, bpp, ZPixmap, 0, 0, width, height, 32, 0 ); - data_image->data = (char*) malloc( data_image->bytes_per_line * data_image->height ); +class wxXPMFileHandler : public wxBitmapHandler +{ + DECLARE_DYNAMIC_CLASS(wxXPMFileHandler); +public: + wxXPMFileHandler() + { + m_name = wxT("XPM file"); + m_extension = wxT("xpm"); + m_type = wxBITMAP_TYPE_XPM; + }; - Create( width, height, bpp ); + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, + int desiredWidth, int desiredHeight); - // Create mask + virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, + int type, const wxPalette *palette = NULL); - XImage *mask_image = (XImage*) NULL; - if (image.HasMask()) - { - mask_image = XCreateImage( dpy, vis, 1, ZPixmap, 0, 0, width, height, 32, 0 ); - mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height ); - } + virtual bool Create(wxBitmap *bitmap, void *data, long flags, + int width, int height, int depth = 1) + { return FALSE; } +}; - // Retrieve depth info +IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler); - XVisualInfo vinfo_template; - XVisualInfo *vi; +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() ); - vinfo_template.visual = vis; - vinfo_template.visualid = XVisualIDFromVisual( vis ); - vinfo_template.depth = bpp; - int nitem = 0; + M_BMPHANDLERDATA->m_display = wxGlobalDisplay(); - vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); + Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display; - wxCHECK_MSG( vi, FALSE, wxT("no visual") ); + int xscreen = DefaultScreen( xdisplay ); + Window xroot = RootWindow( xdisplay, xscreen ); - XFree( vi ); + int bpp = DefaultDepth( xdisplay, xscreen ); - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; - if (bpp < 8) bpp = 8; + XpmAttributes xpmAttr; + xpmAttr.valuemask = XpmReturnInfos; // nothing yet, but get infos back - // Render + Pixmap pixmap; + Pixmap mask = 0; - enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR }; - byte_order b_o = RGB; + int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot, + (char*) name.c_str(), + &pixmap, &mask, &xpmAttr); - if (bpp >= 24) + if (ErrorStatus == XpmSuccess) { - 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 = RGB; - 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; - } + M_BMPHANDLERDATA->m_width = xpmAttr.width; + M_BMPHANDLERDATA->m_height = xpmAttr.height; - int r_mask = image.GetMaskRed(); - int g_mask = image.GetMaskGreen(); - int b_mask = image.GetMaskBlue(); + M_BMPHANDLERDATA->m_bpp = bpp; // mono as well? - XColor colors[256]; - if (bpp == 8) - { - Colormap cmap = (Colormap) wxTheApp->GetMainColormap( dpy ); + XpmFreeAttributes(&xpmAttr); - for (int i = 0; i < 256; i++) colors[i].pixel = i; - XQueryColors( dpy, cmap, colors, 256 ); - } + M_BMPHANDLERDATA->m_bitmap = (WXPixmap) pixmap; - wxSearchColor scolor( 256, colors ); - unsigned char* data = image.GetData(); + if (mask) + { + M_BMPHANDLERDATA->m_mask = new wxMask; + M_BMPHANDLERDATA->m_mask->SetBitmap( (WXPixmap) mask ); + M_BMPHANDLERDATA->m_mask->SetDisplay( xdisplay ); + } + } + else + { + UnRef(); - bool hasMask = image.HasMask(); + return FALSE; + } - int index = 0; - for (int y = 0; y < height; y++) + return TRUE; +#elif wxUSE_STREAMS + wxXPMDecoder decoder; + wxFileInputStream stream(name); + if (stream.Ok()) { - for (int x = 0; x < width; x++) - { - int r = data[index]; - index++; - int g = data[index]; - index++; - int b = data[index]; - index++; - - if (hasMask) - { - if ((r == r_mask) && (b == b_mask) && (g == g_mask)) - XPutPixel( mask_image, x, y, 0 ); - else - XPutPixel( mask_image, x, y, 1 ); - } + wxImage image(decoder.ReadFile(stream)); + return image.Ok() && bitmap->CreateFromImage(image); + } - switch (bpp) - { - case 8: - { -#if 0 // Old, slower code - int pixel = -1; - /* - if (wxTheApp->m_colorCube) - { - pixel = wxTheApp->m_colorCube - [ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ]; - } - else - { - */ - int max = 3 * (65536); - for (int i = 0; i < 256; 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 + return FALSE; +#else // !wxHAVE_LIB_XPM && !wxUSE_STREAMS + return FALSE; +#endif // wxHAVE_LIB_XPM / wxUSE_STREAMS +} - // And this is all to get the 'right' color... - int pixel = scolor.SearchColor( r, g, b ); - XPutPixel( data_image, x, y, pixel ); - break; - } - case 15: - { - int pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); - XPutPixel( data_image, x, y, pixel ); - break; - } - case 16: - { - int pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); - XPutPixel( data_image, x, y, pixel ); - break; - } - case 32: - case 24: - { - int pixel = 0; - switch (b_o) - { - case RGB: pixel = (r << 16) | (g << 8) | b; break; - case RBG: pixel = (r << 16) | (b << 8) | g; break; - case BRG: pixel = (b << 16) | (r << 8) | g; break; - case BGR: pixel = (b << 16) | (g << 8) | r; break; - case GRB: pixel = (g << 16) | (r << 8) | b; break; - case GBR: pixel = (g << 16) | (b << 8) | r; break; - } - XPutPixel( data_image, x, y, pixel ); - } - default: break; - } - } // for - } // for +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 ); - // Blit picture + return FALSE; +} - XGCValues gcvalues; - gcvalues.foreground = BlackPixel( dpy, DefaultScreen( dpy ) ); - GC gc = XCreateGC( dpy, RootWindow ( dpy, DefaultScreen(dpy) ), GCForeground, &gcvalues ); - XPutImage( dpy, (Drawable)GetPixmap(), gc, data_image, 0, 0, 0, 0, width, height ); +#endif // wxHAVE_LIB_XPM || wxUSE_STREAMS - XDestroyImage( data_image ); - XFreeGC( dpy, gc ); +// ---------------------------------------------------------------------------- +// wxXPMDataHandler +// ---------------------------------------------------------------------------- - // Blit mask - if (image.HasMask()) +class wxXPMDataHandler : public wxBitmapHandler +{ + DECLARE_DYNAMIC_CLASS(wxXPMDataHandler); +public: + wxXPMDataHandler() { - wxBitmap maskBitmap(width, height, 1); - - GC gcMask = XCreateGC( dpy, (Pixmap) maskBitmap.GetPixmap(), 0, (XGCValues*)NULL ); - XPutImage( dpy, (Drawable)maskBitmap.GetPixmap(), gcMask, mask_image, 0, 0, 0, 0, width, height ); - - XDestroyImage( mask_image ); - XFreeGC( dpy, gcMask ); - - wxMask* mask = new wxMask; - mask->SetPixmap(maskBitmap.GetPixmap()); + m_name = wxT("XPM data"); + m_extension = wxT("xpm"); + m_type = wxBITMAP_TYPE_XPM_DATA; + }; - SetMask(mask); + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, + int desiredWidth, int desiredHeight) + { return FALSE; } - maskBitmap.SetPixmapNull(); - } + 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); +}; - return TRUE; -} +IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler); -wxImage wxBitmap::ConvertToImage() const +bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits, + long WXUNUSED(flags), + int width, int height, int WXUNUSED(depth)) { - wxImage image; - - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); +#if wxHAVE_LIB_XPM + wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") ) - Display *dpy = (Display*) wxGetDisplay(); - Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) ); - int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) ); + if (!bitmap->GetRefData()) + bitmap->SetRefData( new wxBitmapRefData() ); - XImage *ximage = XGetImage( dpy, - (Drawable)GetPixmap(), - 0, 0, - GetWidth(), GetHeight(), - AllPlanes, ZPixmap ); + M_BMPHANDLERDATA->m_display = wxGlobalDisplay(); - wxCHECK_MSG( ximage, wxNullImage, wxT("couldn't create image") ); + Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display; - image.Create( GetWidth(), GetHeight() ); - char unsigned *data = image.GetData(); + int xscreen = DefaultScreen( xdisplay ); + Window xroot = RootWindow( xdisplay, xscreen ); - if (!data) - { - XDestroyImage( ximage ); - wxFAIL_MSG( wxT("couldn't create image") ); - return wxNullImage; - } + int bpp = DefaultDepth( xdisplay, xscreen ); - /* - GdkImage *gdk_image_mask = (GdkImage*) NULL; - if (GetMask()) - { - gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(), - 0, 0, - GetWidth(), GetHeight() ); + XpmAttributes xpmAttr; + xpmAttr.valuemask = XpmReturnInfos; // nothing yet, but get infos back - image.SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable - } - */ + Pixmap pixmap = 0; + Pixmap mask = 0; - // Retrieve depth info + int ErrorStatus = XpmCreatePixmapFromData( xdisplay, xroot, (char**) bits, + &pixmap, &mask, &xpmAttr ); - XVisualInfo vinfo_template; - XVisualInfo *vi; + if (ErrorStatus == XpmSuccess) + { + M_BMPHANDLERDATA->m_width = xpmAttr.width; + M_BMPHANDLERDATA->m_height = xpmAttr.height; - vinfo_template.visual = vis; - vinfo_template.visualid = XVisualIDFromVisual( vis ); - vinfo_template.depth = bpp; - int nitem = 0; + M_BMPHANDLERDATA->m_bpp = bpp; // mono as well? - vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); +#if __WXDEBUG__ + unsigned int depthRet; + int xRet, yRet; + unsigned int widthRet, heightRet, borderWidthRet; + XGetGeometry( xdisplay, pixmap, &xroot, &xRet, &yRet, + &widthRet, &heightRet, &borderWidthRet, &depthRet); - wxCHECK_MSG( vi, wxNullImage, wxT("no visual") ); + wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") ); +#endif - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; + XpmFreeAttributes(&xpmAttr); - XFree( vi ); + M_BMPHANDLERDATA->m_pixmap = (WXPixmap) pixmap; - XColor colors[256]; - if (bpp == 8) + if (mask) + { + M_BMPHANDLERDATA->m_mask = new wxMask; + M_BMPHANDLERDATA->m_mask->SetBitmap( (WXPixmap) mask ); + M_BMPHANDLERDATA->m_mask->SetDisplay( xdisplay ); + } + return TRUE; + } + else { - Colormap cmap = (Colormap)wxTheApp->GetMainColormap( dpy ); + bitmap->UnRef(); - for (int i = 0; i < 256; i++) colors[i].pixel = i; - XQueryColors( dpy, cmap, colors, 256 ); + return FALSE; } +#else // !wxHAVE_LIB_XPM + wxXPMDecoder decoder; + wxImage image(decoder.ReadData((const char **)bits)); + return image.Ok() && bitmap->CreateFromImage(image); +#endif // wxHAVE_LIB_XPM/!wxHAVE_LIB_XPM +} - long pos = 0; - for (int j = 0; j < GetHeight(); j++) +#endif // wxUSE_XPM + +// ---------------------------------------------------------------------------- +// wxXBMDataHandler +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxXBMDataHandler: public wxBitmapHandler +{ + DECLARE_DYNAMIC_CLASS(wxXBMDataHandler) +public: + inline wxXBMDataHandler() { - for (int i = 0; i < GetWidth(); i++) - { - int pixel = XGetPixel( ximage, i, j ); - if (bpp <= 8) - { - data[pos] = colors[pixel].red >> 8; - data[pos+1] = colors[pixel].green >> 8; - data[pos+2] = colors[pixel].blue >> 8; - } else if (bpp == 15) - { - data[pos] = (pixel >> 7) & 0xf8; - data[pos+1] = (pixel >> 2) & 0xf8; - data[pos+2] = (pixel << 3) & 0xf8; - } else if (bpp == 16) - { - data[pos] = (pixel >> 8) & 0xf8; - data[pos+1] = (pixel >> 3) & 0xfc; - data[pos+2] = (pixel << 3) & 0xf8; - } else - { - data[pos] = (pixel >> 16) & 0xff; - data[pos+1] = (pixel >> 8) & 0xff; - data[pos+2] = pixel & 0xff; - } + m_name = wxT("XBM data"); + m_extension = wxT("xbm"); + m_type = wxBITMAP_TYPE_XBM_DATA; + }; - /* - if (gdk_image_mask) - { - int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j ); - if (mask_pixel == 0) - { - data[pos] = 16; - data[pos+1] = 16; - data[pos+2] = 16; - } - } - */ + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, + int desiredWidth, int desiredHeight) + { return FALSE; } - pos += 3; - } - } + virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, + int type, const wxPalette *palette = NULL) + { return FALSE; } - XDestroyImage( ximage ); - /* - if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); - */ + virtual bool Create(wxBitmap *bitmap, void *data, long flags, + int width, int height, int depth = 1); +}; - return image; -} +IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler); -bool wxBitmap::CopyFromIcon(const wxIcon& icon) +bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits, + long WXUNUSED(flags), + int width, int height, int depth) { - wxBitmap* bitmap = (wxBitmap*) & icon; +#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 ); - *this = *bitmap; + 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; +#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 }