X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7266b6723573ce6317577226cb1e5d32826e24e8..6c0d0845c205a59cb0d8c73c0e4bcc84a9d6c550:/src/x11/bitmap.cpp diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index cd66d61993..ad2ae57169 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // 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 ///////////////////////////////////////////////////////////////////////////// @@ -13,1037 +13,1236 @@ #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 +#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) - -wxBitmapRefData::wxBitmapRefData() -{ - m_ok = FALSE; - m_width = 0; - m_height = 0; - m_depth = 0; - m_quality = 0; - m_numColors = 0; - m_bitmapMask = NULL; - - m_pixmap = (WXPixmap) 0; - m_display = (WXDisplay*) 0; - - m_freePixmap = TRUE; //TODO: necessary? - m_freeColors = (unsigned long*) 0; - m_freeColorsCount = 0; -} - -wxBitmapRefData::~wxBitmapRefData() -{ - if (m_pixmap && m_freePixmap) - XFreePixmap ((Display*) m_display, (Pixmap) m_pixmap); - - if (m_freeColors) - { - 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; - }; - - if (m_bitmapMask) - delete m_bitmapMask; - m_bitmapMask = NULL; -} - -wxList wxBitmap::sm_handlers; - -#define M_BMPDATA ((wxBitmapRefData *)m_refData) - -wxBitmap::wxBitmap() -{ - m_refData = NULL; -} +IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject) -wxBitmap::~wxBitmap() +wxMask::wxMask() { + m_bitmap = NULL; + m_display = NULL; } -wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) +wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) { - m_refData = new wxBitmapRefData; - - (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth); + m_bitmap = NULL; + Create( bitmap, colour ); } -wxBitmap::wxBitmap(int w, int h, int d) +wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex ) { - (void)Create(w, h, d); + m_bitmap = NULL; + Create( bitmap, paletteIndex ); } -wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth) +wxMask::wxMask( const wxBitmap& bitmap ) { - (void) Create(data, type, width, height, depth); + m_bitmap = NULL; + Create( bitmap ); } -wxBitmap::wxBitmap(const wxString& filename, long type) +wxMask::~wxMask() { - LoadFile(filename, (int)type); + if (m_bitmap) + XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap ); } -bool wxBitmap::Create(int w, int h, int d) +bool wxMask::Create( const wxBitmap& bitmap, + const wxColour& colour ) { - UnRef(); +#if !wxUSE_NANOX + if (m_bitmap) + { + XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap ); + m_bitmap = NULL; + } - m_refData = new wxBitmapRefData; + m_display = bitmap.GetDisplay(); - if (d < 1) - d = wxDisplayDepth(); + wxImage image( bitmap ); + if (!image.Ok()) return FALSE; + + m_display = bitmap.GetDisplay(); + + Display *xdisplay = (Display*) m_display; - M_BITMAPDATA->m_width = w; - M_BITMAPDATA->m_height = h; - M_BITMAPDATA->m_depth = d; - M_BITMAPDATA->m_freePixmap = TRUE; + 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 ); - Display *dpy = (Display*) wxGetDisplay(); + XSetForeground( xdisplay, gc, WhitePixel(xdisplay,xscreen) ); + XSetFillStyle( xdisplay, gc, FillSolid ); + XFillRectangle( xdisplay, (Pixmap) m_bitmap, gc, 0, 0, image.GetWidth(), image.GetHeight() ); - M_BITMAPDATA->m_display = dpy; /* MATTHEW: [4] Remember the display */ + unsigned char *data = image.GetData(); + int index = 0; - M_BITMAPDATA->m_pixmap = (WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)), - w, h, d); + unsigned char red = colour.Red(); + unsigned char green = colour.Green(); + unsigned char blue = colour.Blue(); - M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_pixmap != (WXPixmap) 0) ; - return M_BITMAPDATA->m_ok; -} + XVisualInfo vinfo_template; + XVisualInfo *vi; -bool wxBitmap::LoadFile(const wxString& filename, long type) -{ - UnRef(); + vinfo_template.visual = xvisual; + vinfo_template.visualid = XVisualIDFromVisual( xvisual ); + vinfo_template.depth = bpp; + int nitem = 0; - m_refData = new wxBitmapRefData; + 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; + } 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; + } - wxBitmapHandler *handler = FindHandler(type); + XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) ); - if ( handler == NULL ) { - wxImage image; - if (!image.LoadFile( filename, type )) return FALSE; - if (image.Ok()) + for (int j = 0; j < image.GetHeight(); j++) + { + int start_x = -1; + int i; + for (i = 0; i < image.GetWidth(); i++) { - *this = image.ConvertToBitmap(); - return TRUE; + 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; } - else return FALSE; + if (start_x != -1) + XDrawLine( xdisplay, (Pixmap) m_bitmap, gc, start_x, j, i, j ); } + + XFreeGC( xdisplay, gc ); - return handler->LoadFile(this, filename, type, -1, -1); + return TRUE; +#else + return FALSE; +#endif + // wxUSE_NANOX } -bool wxBitmap::Create(void *data, long type, int width, int height, int depth) +bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex ) { - UnRef(); + unsigned char r,g,b; + wxPalette *pal = bitmap.GetPalette(); - m_refData = new wxBitmapRefData; + wxCHECK_MSG( pal, FALSE, wxT("Cannot create mask from bitmap without palette") ); - wxBitmapHandler *handler = FindHandler(type); - - if ( handler == NULL ) { - wxLogWarning("no data bitmap handler for type %d defined.", type); - - return FALSE; - } + pal->GetRGB(paletteIndex, &r, &g, &b); - return handler->Create(this, data, type, width, height, depth); + return Create(bitmap, wxColour(r, g, b)); } -bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette) +bool wxMask::Create( const wxBitmap& bitmap ) { - wxBitmapHandler *handler = FindHandler(type); - - if ( handler == NULL ) { // try wxImage - wxImage image( *this ); - if (image.Ok()) return image.SaveFile( filename, type ); - else return FALSE; +#if !wxUSE_NANOX + if (m_bitmap) + { + XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap ); + m_bitmap = NULL; } - return handler->SaveFile(this, filename, type, palette); -} - -void wxBitmap::SetWidth(int w) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + if (!bitmap.Ok()) return FALSE; - M_BITMAPDATA->m_width = w; -} + wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") ); + + m_display = bitmap.GetDisplay(); -void wxBitmap::SetHeight(int h) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + 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 ); - M_BITMAPDATA->m_height = h; -} + if (!m_bitmap) return FALSE; + + GC gc = XCreateGC( (Display*) m_display, (Pixmap) m_bitmap, 0, NULL ); -void wxBitmap::SetDepth(int d) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + 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 ); - M_BITMAPDATA->m_depth = d; + return TRUE; +#else + return FALSE; +#endif + // wxUSE_NANOX } -void wxBitmap::SetQuality(int q) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - - M_BITMAPDATA->m_quality = q; -} +//----------------------------------------------------------------------------- +// wxBitmap +//----------------------------------------------------------------------------- -void wxBitmap::SetOk(bool isOk) +class wxBitmapRefData: public wxObjectRefData { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - - M_BITMAPDATA->m_ok = isOk; -} +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 wxBitmap::SetPalette(const wxPalette& palette) +wxBitmapRefData::wxBitmapRefData() { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - - M_BITMAPDATA->m_bitmapPalette = palette ; + 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; } -void wxBitmap::SetMask(wxMask *mask) +wxBitmapRefData::~wxBitmapRefData() { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - - M_BITMAPDATA->m_bitmapMask = mask ; + 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::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") ); +//----------------------------------------------------------------------------- - wxBitmap ret( rect.width, rect.height, 0 ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); +#define M_BMPDATA ((wxBitmapRefData *)m_refData) - // The remaining still TODO - return ret; -} +IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) -void wxBitmap::AddHandler(wxBitmapHandler *handler) +wxBitmap::wxBitmap() { - sm_handlers.Append(handler); } -void wxBitmap::InsertHandler(wxBitmapHandler *handler) +wxBitmap::wxBitmap( int width, int height, int depth ) { - sm_handlers.Insert(handler); + Create( width, height, depth ); } -bool wxBitmap::RemoveHandler(const wxString& name) +bool wxBitmap::Create( int width, int height, int depth ) { - wxBitmapHandler *handler = FindHandler(name); - if ( handler ) - { - sm_handlers.DeleteObject(handler); - return TRUE; - } - else - return FALSE; -} + UnRef(); -wxBitmapHandler *wxBitmap::FindHandler(const wxString& name) -{ - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetName() == name ) - return handler; - node = node->Next(); - } - return NULL; -} + wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") ) -wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType) -{ - wxNode *node = sm_handlers.First(); - while ( node ) + 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_bitmap = (WXPixmap) GrNewPixmap(width, height, NULL); + M_BMPDATA->m_bpp = bpp; + + wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("Bitmap creation failed") ); +#else + if (depth == 1) { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetExtension() == extension && - (bitmapType == -1 || handler->GetType() == bitmapType) ) - return handler; - node = node->Next(); + 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; } - return NULL; -} - -wxBitmapHandler *wxBitmap::FindHandler(long bitmapType) -{ - wxNode *node = sm_handlers.First(); - while ( node ) + else { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if (handler->GetType() == bitmapType) - return handler; - node = node->Next(); + 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; } - return NULL; +#endif + return Ok(); } -/* -* wxMask -*/ - -wxMask::wxMask() +bool wxBitmap::CreateFromXpm( const char **bits ) { - m_pixmap = (WXPixmap) 0; -} +#if wxUSE_XPM +#if wxHAVE_LIB_XPM + UnRef(); -// Construct a mask from a bitmap and a colour indicating -// the transparent area -wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour) -{ - m_pixmap = (WXPixmap) 0; + wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") ) - Create(bitmap, colour); -} + m_refData = new wxBitmapRefData(); -// Construct a mask from a bitmap and a palette index indicating -// the transparent area -wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex) -{ - m_pixmap = (WXPixmap) 0; + 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 ); - Create(bitmap, paletteIndex); -} + XpmAttributes xpmAttr; + xpmAttr.valuemask = XpmReturnInfos; // nothing yet, but get infos back -// Construct a mask from a mono bitmap (copies the bitmap). -wxMask::wxMask(const wxBitmap& bitmap) -{ - m_pixmap = (WXPixmap) 0; + 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; - Create(bitmap); -} + M_BMPDATA->m_bpp = bpp; // mono as well? -wxMask::~wxMask() -{ - // TODO: this may be the wrong display - if ( m_pixmap ) - XFreePixmap ((Display*) wxGetDisplay(), (Pixmap) m_pixmap); -} +#if __WXDEBUG__ + unsigned int depthRet; + int xRet, yRet; + unsigned int widthRet, heightRet, borderWidthRet; + XGetGeometry( xdisplay, pixmap, &xroot, &xRet, &yRet, + &widthRet, &heightRet, &borderWidthRet, &depthRet); -// Create a mask from a mono bitmap (copies the bitmap). -bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap)) -{ - // TODO - return FALSE; -} + wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") ) +#endif -// Create a mask from a bitmap and a palette index indicating -// the transparent area -bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex)) -{ - // TODO + 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; } -// Create a mask from a bitmap and a colour indicating -// the transparent area -bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour)) +bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) { - // TODO - return FALSE; -} - -/* -* wxBitmapHandler -*/ +#if wxUSE_NANOX + if (!image.Ok()) + { + wxASSERT_MSG(image.Ok(), "Invalid wxImage passed to wxBitmap::CreateFromImage."); + return FALSE; + } + + int w = image.GetWidth(); + int h = image.GetHeight(); + + if (!Create(w, h, depth)) + return FALSE; -IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) + wxMemoryDC memDC; + memDC.SelectObject(*this); -bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), void *WXUNUSED(data), long WXUNUSED(type), - int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth)) -{ - return FALSE; -} + // Warning: this is very inefficient. + wxPen pen; + pen.SetStyle(wxSOLID); + pen.SetWidth(1); + + 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); + wxColour colour(red, green, blue); + + pen.SetColour(colour); + memDC.SetPen(pen); + memDC.DrawPoint(i, j); + +#if 0 + 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) + ::SetPixel(hMaskDC, i, j, PALETTERGB(0, 0, 0)); + else + ::SetPixel(hMaskDC, i, j, PALETTERGB(255, 255, 255)); + } +#endif + } + } + memDC.SelectObject(wxNullBitmap); + + return TRUE; +#else + // !wxUSE_NANOX + + UnRef(); -bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), long WXUNUSED(type), - int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) -{ - return FALSE; -} + wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ) + wxCHECK_MSG( depth == -1, FALSE, wxT("invalid bitmap depth") ) -bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), int WXUNUSED(type), - const wxPalette *WXUNUSED(palette)) -{ - return FALSE; -} + m_refData = new wxBitmapRefData(); -/* -* Standard handlers -*/ + 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 width = image.GetWidth(); + int height = image.GetHeight(); + M_BMPDATA->m_width = width; + M_BMPDATA->m_height = height; -class WXDLLEXPORT wxXBMFileHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxXBMFileHandler) -public: - inline wxXBMFileHandler() + if (depth != 1) depth = bpp; + M_BMPDATA->m_bpp = depth; + + if (depth == 1) { - m_name = "XBM file"; - m_extension = "xbm"; - m_type = wxBITMAP_TYPE_XBM; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); -}; -IMPLEMENT_DYNAMIC_CLASS(wxXBMFileHandler, wxBitmapHandler) + wxFAIL_MSG( "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; + } -bool wxXBMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags), - int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) -{ - M_BITMAPHANDLERDATA->m_freePixmap = TRUE; + M_BMPDATA->m_pixmap = (WXPixmap) XCreatePixmap( xdisplay, xroot, width, height, depth ); - int hotX, hotY; - unsigned int w, h; - Pixmap pixmap; + // Create mask - Display *dpy = (Display*) wxGetDisplay(); - M_BITMAPDATA->m_display = (WXDisplay*) dpy; + 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 ) ); - 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; + SetMask( mask ); + } - if ((value == BitmapFileInvalid) || - (value == BitmapOpenFailed) || - (value == BitmapNoMemory)) - { - M_BITMAPHANDLERDATA->m_ok = FALSE; - M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) 0; - } - else - M_BITMAPHANDLERDATA->m_ok = TRUE; + // Retrieve info - return M_BITMAPHANDLERDATA->m_ok ; -} + XVisualInfo vinfo_template; + XVisualInfo *vi; -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; - }; + vinfo_template.visual = xvisual; + vinfo_template.visualid = XVisualIDFromVisual( xvisual ); + vinfo_template.depth = bpp; + int nitem = 0; - virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1); -}; -IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler) + vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); + wxASSERT_MSG( vi, wxT("No visual info") ); -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; + if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; + if (bpp < 8) bpp = 8; - Display *dpy = (Display*) wxGetDisplay(); - M_BITMAPHANDLERDATA->m_display = (WXDisplay*) dpy; + // Render - 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) ; + enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR }; + byte_order b_o = RGB; - return TRUE; -} + 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; + } -void wxBitmap::CleanUpHandlers() -{ - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - wxNode *next = node->Next(); - delete handler; - delete node; - node = next; - } -} + XFree( vi ); -void wxBitmap::InitStandardHandlers() -{ - // Initialize all standard bitmap or derived class handlers here. - AddHandler(new wxXBMFileHandler); - AddHandler(new wxXBMDataHandler); + int r_mask = image.GetMaskRed(); + int g_mask = image.GetMaskGreen(); + int b_mask = image.GetMaskBlue(); - // XPM will be handled by wxImage -} + unsigned char* data = image.GetData(); + wxASSERT_MSG( data, "No image data" ); -// 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; -} + bool hasMask = image.HasMask(); -//----------------------------------------------------------------------------- -// wxImage conversion routines -//----------------------------------------------------------------------------- + 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; +#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 + 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 -Date: Wed, 05 Jan 2000 11:45:40 +0100 -From: Frits Boel -To: julian.smart@ukonline.co.uk -Subject: Patch for Motif ConvertToBitmap + // Blit picture -Hi Julian, + 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 -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! + XDestroyImage( data_image ); + XFreeGC( xdisplay, gc ); -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. + // Blit mask + + if (image.HasMask()) + { + GC gc = XCreateGC( xdisplay, (Pixmap) GetMask()->GetBitmap(), 0, NULL ); + XPutImage( xdisplay, (Pixmap) GetMask()->GetBitmap(), gc, data_image, 0, 0, 0, 0, width, height ); -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? + XDestroyImage( mask_image ); + XFreeGC( xdisplay, gc ); + } + } -The code of the patch is attached, have a look on it, and maybe you will -ship it with the next release of wxMotif? + return TRUE; +#endif + // wxUSE_NANOX +} -Regards, +static void wxCalcPrecAndShift( unsigned long mask, int *shift, int *prec ) +{ + *shift = 0; + *prec = 0; -Frits Boel -Software engineer at Hubrecht Laboratory, The Netherlands. + while (!(mask & 0x1)) + { + (*shift)++; + mask >>= 1; + } -*/ + while (mask & 0x1) + { + (*prec)++; + mask >>= 1; + } +} -class wxSearchColor +wxImage wxBitmap::ConvertToImage() const { -public: - wxSearchColor( void ); - wxSearchColor( int size, XColor *colors ); - ~wxSearchColor( void ); + wxImage image; - int SearchColor( int r, int g, int b ); -private: - int AddColor( unsigned int value, int pos ); + wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); - int size; - XColor *colors; - unsigned int *color; - int *entry; + 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 ); - int bottom; - int top; -}; +#if wxUSE_NANOX + int w = image.GetWidth(); + int h = image.GetHeight(); + + wxMemoryDC memDC; + memDC.SelectObject(*this); -wxSearchColor::wxSearchColor( void ) -{ - size = 0; - colors = (XColor*) NULL; - color = (unsigned int *) NULL; - entry = (int*) NULL; + wxColour pixelCol; - bottom = 0; - top = 0; -} + // Warning: this is very inefficient. + int i, j; + for (i = 0; i < w; i++) + { + for (j = 0; j < h; j++) + { + memDC.GetPixel(i, j, & pixelCol); -wxSearchColor::wxSearchColor( int size_, XColor *colors_ ) -{ - int i; - size = size_; - colors = colors_; - color = new unsigned int[size]; - entry = new int [size]; - - for (i = 0; i < size; i++ ) { - entry[i] = -1; + // TODO: make wxColour accessors more efficient + // by inlining, if possible + image.SetRGB(i, j, + pixelCol.Red(), pixelCol.Green(), + pixelCol.Blue()); + } } + memDC.SelectObject(wxNullBitmap); - bottom = top = ( size >> 1 ); -} + return image; + +#else + // !wxUSE_NANOX + 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") ); + } -wxSearchColor::~wxSearchColor( void ) -{ - if ( color ) delete color; - if ( entry ) delete entry; -} + wxCHECK_MSG( x_image, wxNullImage, wxT("couldn't create image") ); -int wxSearchColor::SearchColor( int r, int g, int b ) -{ - unsigned int value = ( ( ( r * 256 ) + g ) * 256 ) + b; - int begin = bottom; - int end = top; - int middle = 0; + image.Create( GetWidth(), GetHeight() ); + char unsigned *data = image.GetData(); - while ( begin <= end ) { + if (!data) + { + XDestroyImage( x_image ); + wxFAIL_MSG( wxT("couldn't create image") ); + return wxNullImage; + } - middle = ( begin + end ) >> 1; + XImage *x_image_mask = NULL; + if (GetMask()) + { + x_image_mask = XGetImage( xdisplay, (Pixmap) GetMask()->GetBitmap(), + 0, 0, + GetWidth(), GetHeight(), + AllPlanes, ZPixmap ); - if ( value == color[middle] ) { - return( entry[middle] ); - } else if ( value < color[middle] ) { - end = middle - 1; - } else { - begin = middle + 1; + image.SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable } - } - - return AddColor( value, middle ); -} + 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; -int wxSearchColor::AddColor( unsigned int value, int pos ) -{ - 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; + 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 ); } - - } 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; + if (GetBitmap()) + { + bpp = 1; } - } - return( pixel ); +// GdkColormap *cmap = gtk_widget_get_default_colormap(); + + long pos = 0; + for (int j = 0; j < GetHeight(); j++) + { + for (int i = 0; i < GetWidth(); 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; + } +#if 0 + else if (cmap->colors) + { + data[pos] = cmap->colors[pixel].red >> 8; + data[pos+1] = cmap->colors[pixel].green >> 8; + data[pos+2] = cmap->colors[pixel].blue >> 8; + } +#endif + 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; + } + } + + XDestroyImage( x_image ); + if (x_image_mask) XDestroyImage( x_image_mask ); + return image; +#endif + // wxUSE_NANOX } +wxBitmap::wxBitmap( const wxBitmap& bmp ) +{ + Ref( bmp ); +} -bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) +wxBitmap::wxBitmap( const wxString &filename, int type ) { - wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ) - wxCHECK_MSG( depth == -1, FALSE, wxT("invalid bitmap depth") ) + LoadFile( filename, type ); +} +wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth) ) +{ +#if !wxUSE_NANOX m_refData = new wxBitmapRefData(); - int width = image.GetWidth(); - int height = image.GetHeight(); + M_BMPDATA->m_display = wxGlobalDisplay(); - SetHeight( height ); - SetWidth( width ); + 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") ); +} - Display *dpy = (Display*) wxGetDisplay(); - Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) ); - int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) ); +wxBitmap::~wxBitmap() +{ +} - // Create image +wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp ) +{ + if ( m_refData != bmp.m_refData ) + Ref( bmp ); - 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 ); + return *this; +} - Create( width, height, bpp ); +bool wxBitmap::operator == ( const wxBitmap& bmp ) const +{ + return m_refData == bmp.m_refData; +} - // Create mask +bool wxBitmap::operator != ( const wxBitmap& bmp ) const +{ + return m_refData != bmp.m_refData; +} - 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 ); - } +bool wxBitmap::Ok() const +{ + return (m_refData != NULL); +} - // Retrieve depth info +int wxBitmap::GetHeight() const +{ + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); - XVisualInfo vinfo_template; - XVisualInfo *vi; + return M_BMPDATA->m_height; +} - vinfo_template.visual = vis; - vinfo_template.visualid = XVisualIDFromVisual( vis ); - vinfo_template.depth = bpp; - int nitem = 0; +int wxBitmap::GetWidth() const +{ + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); - vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); + return M_BMPDATA->m_width; +} - wxCHECK_MSG( vi, FALSE, wxT("no visual") ); +int wxBitmap::GetDepth() const +{ + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); - XFree( vi ); + return M_BMPDATA->m_bpp; +} - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; - if (bpp < 8) bpp = 8; +wxMask *wxBitmap::GetMask() const +{ + wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") ); - // Render + return M_BMPDATA->m_mask; +} - enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR }; - byte_order b_o = RGB; +void wxBitmap::SetMask( wxMask *mask ) +{ + wxCHECK_RET( Ok(), wxT("invalid bitmap") ); - if (bpp >= 24) - { - 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; - } + if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; - int r_mask = image.GetMaskRed(); - int g_mask = image.GetMaskGreen(); - int b_mask = image.GetMaskBlue(); + M_BMPDATA->m_mask = mask; +} - XColor colors[256]; - if (bpp == 8) - { - Colormap cmap = (Colormap) wxTheApp->GetMainColormap( dpy ); +bool wxBitmap::CopyFromIcon(const wxIcon& icon) +{ + *this = icon; + return TRUE; +} - for (int i = 0; i < 256; i++) colors[i].pixel = i; - XQueryColors( dpy, cmap, colors, 256 ); - } +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") ); - wxSearchColor scolor( 256, colors ); - unsigned char* data = image.GetData(); + wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp ); + wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); - bool hasMask = image.HasMask(); + + wxFAIL_MSG( "wxBitmap::GetSubBitmap not yet implemented" ); + +#if 0 + if (ret.GetPixmap()) + { + 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 ); + } + else + { + 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 ); + } - int index = 0; - for (int y = 0; y < height; y++) + if (GetMask()) { - for (int x = 0; x < width; x++) - { - int r = data[index]; - index++; - int g = data[index]; - index++; - int b = data[index]; - index++; + wxMask *mask = new wxMask; + mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 ); - 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 ); - } + 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 ); - 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; } - } - /* - } - */ + ret.SetMask( mask ); + } #endif - // 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 - - // Blit picture - - 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 ); + return ret; +} - XDestroyImage( data_image ); - XFreeGC( dpy, gc ); +bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) ) +{ + wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") ); - // Blit mask - if (image.HasMask()) + // Try to save the bitmap via wxImage handlers: { - 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 ); + wxImage image( *this ); + if (image.Ok()) return image.SaveFile( name, type ); + } - wxMask* mask = new wxMask; - mask->SetPixmap(maskBitmap.GetPixmap()); + return FALSE; +} - SetMask(mask); +bool wxBitmap::LoadFile( const wxString &name, int type ) +{ + UnRef(); - maskBitmap.SetPixmapNull(); - } + if (!wxFileExists(name)) return FALSE; - return TRUE; -} + if (type == wxBITMAP_TYPE_XPM) + { +#if wxUSE_XPM +#if wxHAVE_LIB_XPM + m_refData = new wxBitmapRefData(); -wxImage wxBitmap::ConvertToImage() const -{ - wxImage image; + M_BMPDATA->m_display = wxGlobalDisplay(); - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); - - Display *dpy = (Display*) wxGetDisplay(); - Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) ); - int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) ); + Display *xdisplay = (Display*) M_BMPDATA->m_display; + + int xscreen = DefaultScreen( xdisplay ); + Window xroot = RootWindow( xdisplay, xscreen ); + + int bpp = DefaultDepth( xdisplay, xscreen ); - XImage *ximage = XGetImage( dpy, - (Drawable)GetPixmap(), - 0, 0, - GetWidth(), GetHeight(), - AllPlanes, ZPixmap ); + XpmAttributes xpmAttr; + xpmAttr.valuemask = XpmReturnInfos; // nothing yet, but get infos back - wxCHECK_MSG( ximage, wxNullImage, wxT("couldn't create image") ); + 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; - image.Create( GetWidth(), GetHeight() ); - char unsigned *data = image.GetData(); + M_BMPDATA->m_bpp = bpp; // mono as well? - if (!data) + 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 + { + UnRef(); + + return FALSE; + } +#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 { - XDestroyImage( ximage ); - wxFAIL_MSG( wxT("couldn't create image") ); - return wxNullImage; + wxImage image; + if (!image.LoadFile( name, type )) return FALSE; + if (image.Ok()) *this = image.ConvertToBitmap(); + else return FALSE; } - /* - GdkImage *gdk_image_mask = (GdkImage*) NULL; - if (GetMask()) - { - gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(), - 0, 0, - GetWidth(), GetHeight() ); + return TRUE; +} - image.SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable - } - */ +wxPalette *wxBitmap::GetPalette() const +{ + if (!Ok()) return (wxPalette *) NULL; - // Retrieve depth info + return M_BMPDATA->m_palette; +} - XVisualInfo vinfo_template; - XVisualInfo *vi; +void wxBitmap::SetHeight( int height ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); - vinfo_template.visual = vis; - vinfo_template.visualid = XVisualIDFromVisual( vis ); - vinfo_template.depth = bpp; - int nitem = 0; + M_BMPDATA->m_height = height; +} - vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); +void wxBitmap::SetWidth( int width ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); - wxCHECK_MSG( vi, wxNullImage, wxT("no visual") ); + M_BMPDATA->m_width = width; +} - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; +void wxBitmap::SetDepth( int depth ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); - XFree( vi ); + M_BMPDATA->m_bpp = depth; +} - XColor colors[256]; - if (bpp == 8) - { - Colormap cmap = (Colormap)wxTheApp->GetMainColormap( dpy ); +void wxBitmap::SetPixmap( WXPixmap pixmap ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); - for (int i = 0; i < 256; i++) colors[i].pixel = i; - XQueryColors( dpy, cmap, colors, 256 ); - } + M_BMPDATA->m_pixmap = pixmap; +} - long pos = 0; - for (int j = 0; j < GetHeight(); j++) - { - 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; - } +void wxBitmap::SetBitmap( WXPixmap bitmap ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); - /* - 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; - } - } - */ + M_BMPDATA->m_bitmap = bitmap; +} - pos += 3; - } - } +WXPixmap wxBitmap::GetPixmap() const +{ + wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); - XDestroyImage( ximage ); - /* - if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); - */ + return M_BMPDATA->m_pixmap; +} - return image; +WXPixmap wxBitmap::GetBitmap() const +{ + wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); + + return M_BMPDATA->m_bitmap; } -bool wxBitmap::CopyFromIcon(const wxIcon& icon) +WXDisplay *wxBitmap::GetDisplay() const { - // TODO - return FALSE; + wxCHECK_MSG( Ok(), (WXDisplay*) NULL, wxT("invalid bitmap") ); + + return M_BMPDATA->m_display; } +