/////////////////////////////////////////////////////////////////////////////
-// Name: bitmap.cpp
+// Name: src/x11/bitmap.cpp
// Purpose: wxBitmap
// Author: Julian Smart, Robert Roebling
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "bitmap.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/bitmap.h"
-#include "wx/icon.h"
-#include "wx/log.h"
-#include "wx/image.h"
-#include "wx/app.h"
-#if wxUSE_NANOX
-#include "wx/dcmemory.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/dcmemory.h"
+ #include "wx/icon.h"
+ #include "wx/math.h"
#endif
+#include "wx/image.h"
+
#include "wx/x11/private.h"
/* No point in using libXPM for NanoX */
#include "wx/wfstream.h"
#endif
#endif
-#include <math.h>
//-----------------------------------------------------------------------------
// wxMask
m_display = bitmap.GetDisplay();
wxImage image = bitmap.ConvertToImage();
- if (!image.Ok()) return FALSE;
-
+ if (!image.Ok()) return false;
+
m_display = bitmap.GetDisplay();
-
+
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 );
unsigned char green = colour.Green();
unsigned char blue = colour.Blue();
- int bpp = wxTheApp->m_visualDepth;
-
+ int bpp = wxTheApp->GetVisualInfo(m_display)->m_visualDepth;
+
if (bpp == 15)
{
- red = red & 0xf8;
- green = green & 0xf8;
- blue = blue & 0xf8;
+ red &= 0xf8;
+ green &= 0xf8;
+ blue &= 0xf8;
} else
if (bpp == 16)
{
- red = red & 0xf8;
- green = green & 0xfc;
- blue = blue & 0xf8;
+ red &= 0xf8;
+ green &= 0xfc;
+ blue &= 0xf8;
} else
if (bpp == 12)
{
- red = red & 0xf0;
- green = green & 0xf0;
- blue = blue & 0xf0;
+ red &= 0xf0;
+ green &= 0xf0;
+ blue &= 0xf0;
}
XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) );
if (start_x != -1)
XDrawLine( xdisplay, (Pixmap) m_bitmap, gc, start_x, j, i, j );
}
-
+
XFreeGC( xdisplay, gc );
- return TRUE;
+ return true;
#else
- return FALSE;
+ return false;
#endif
// wxUSE_NANOX
}
unsigned char r,g,b;
wxPalette *pal = bitmap.GetPalette();
- wxCHECK_MSG( pal, FALSE, wxT("Cannot create mask from bitmap without palette") );
+ wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") );
pal->GetRGB(paletteIndex, &r, &g, &b);
m_bitmap = NULL;
}
- if (!bitmap.Ok()) return FALSE;
+ if (!bitmap.Ok()) return false;
+
+ wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") );
- wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
-
m_display = bitmap.GetDisplay();
int xscreen = DefaultScreen( (Display*) m_display );
Window xroot = RootWindow( (Display*) m_display, xscreen );
-
+
m_bitmap = (WXPixmap) XCreatePixmap( (Display*) m_display, xroot, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
- if (!m_bitmap) return FALSE;
-
+ if (!m_bitmap) return false;
+
GC gc = XCreateGC( (Display*) m_display, (Pixmap) m_bitmap, 0, NULL );
XCopyPlane( (Display*) m_display, (Pixmap) bitmap.GetBitmap(), (Pixmap) m_bitmap,
gc, 0, 0, bitmap.GetWidth(), bitmap.GetHeight(), 0, 0, 1 );
-
+
XFreeGC( (Display*) m_display, gc );
- return TRUE;
+ return true;
#else
- return FALSE;
+ return false;
#endif
// wxUSE_NANOX
}
int x, int y, int width, int height,
int depth )
{
- int xscreen = DefaultScreen( (Display*)xdisplay );
- Window xroot = RootWindow( (Display*)xdisplay, xscreen );
- Visual* xvisual = DefaultVisual( xdisplay, xscreen );
+ Display * const dpy = (Display *)xdisplay;
- XImage* ximage = XCreateImage( (Display*)xdisplay, xvisual, depth,
+ int xscreen = DefaultScreen( dpy );
+ Window xroot = RootWindow( dpy, xscreen );
+ Visual* xvisual = DefaultVisual( dpy, xscreen );
+
+ XImage* ximage = XCreateImage( dpy, xvisual, depth,
ZPixmap, 0, 0, width, height, 32, 0 );
ximage->data = (char*)malloc( ximage->bytes_per_line * ximage->height );
- ximage = XGetSubImage( (Display*)xdisplay, (Pixmap)xpixmap,
- x, y, width, height,
+ ximage = XGetSubImage( dpy, (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,
+ GC gc = XCreateGC( dpy, (Pixmap)xpixmap, 0, NULL );
+ Pixmap ret = XCreatePixmap( dpy, xroot,
width, height, depth );
- XPutImage( (Display*)xdisplay, ret, gc, ximage,
+ XPutImage( dpy, ret, gc, ximage,
0, 0, 0, 0, width, height );
XDestroyImage( ximage );
- XFreeGC( (Display*)xdisplay, gc );
+ XFreeGC( dpy, gc );
return (WXPixmap)ret;
}
{
UnRef();
- wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
+ wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") );
m_refData = new wxBitmapRefData();
-
+
M_BMPDATA->m_display = wxGlobalDisplay();
-
+
wxASSERT_MSG( M_BMPDATA->m_display, wxT("No display") );
-
+
int xscreen = DefaultScreen( (Display*) M_BMPDATA->m_display );
Window xroot = RootWindow( (Display*) M_BMPDATA->m_display, xscreen );
-
+
int bpp = DefaultDepth( (Display*) M_BMPDATA->m_display, xscreen );
if (depth == -1) depth = bpp;
wxCHECK_MSG( (depth == bpp) ||
- (depth == 1), FALSE, wxT("invalid bitmap depth") )
+ (depth == 1), false, wxT("invalid bitmap depth") );
M_BMPDATA->m_mask = (wxMask *) NULL;
M_BMPDATA->m_width = width;
if (depth == 1)
{
M_BMPDATA->m_bitmap = (WXPixmap) XCreatePixmap( (Display*) M_BMPDATA->m_display, xroot, width, height, 1 );
-
+
wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("Bitmap creation failed") );
-
+
M_BMPDATA->m_bpp = 1;
}
else
{
M_BMPDATA->m_pixmap = (WXPixmap) XCreatePixmap( (Display*) M_BMPDATA->m_display, xroot, width, height, depth );
-
+
wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("Pixmap creation failed") );
-
+
M_BMPDATA->m_bpp = depth;
}
#endif
wxBitmapHandler *handler = FindHandler(type);
if ( handler == NULL ) {
- wxLogWarning("no data bitmap handler for type %ld defined.",
+ wxLogWarning(wxT("no data bitmap handler for type %ld defined."),
(long)type);
- return FALSE;
+ return false;
}
return handler->Create(this, data, type, width, height, depth);
}
+bool wxBitmap::Create(WXPixmap pixmap)
+{
+ UnRef();
+ Pixmap xpixmap = (Pixmap)pixmap;
+ Display* xdisplay = wxGlobalDisplay();
+ int xscreen = DefaultScreen( xdisplay );
+ Window xroot = RootWindow( xdisplay, xscreen );
+
+ // 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;
+
+ ref->m_display = (WXDisplay*)xdisplay;
+ ref->m_width = width;
+ ref->m_height = height;
+ ref->m_bpp = depth;
+
+ m_refData = ref;
+
+ return true;
+}
+
bool wxBitmap::CreateFromXpm( const char **bits )
{
- wxCHECK_MSG( bits, FALSE, _T("NULL pointer in wxBitmap::CreateFromXpm") );
+ wxCHECK_MSG( bits, false, wxT("NULL pointer in wxBitmap::CreateFromXpm") );
return Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
}
#if wxUSE_NANOX
if (!image.Ok())
{
- wxASSERT_MSG(image.Ok(), "Invalid wxImage passed to wxBitmap::CreateFromImage.");
- return FALSE;
+ wxASSERT_MSG(image.Ok(), wxT("Invalid wxImage passed to wxBitmap::CreateFromImage."));
+ return false;
}
-
+
int w = image.GetWidth();
int h = image.GetHeight();
-
+
if (!Create(w, h, depth))
- return FALSE;
+ return false;
// Unfortunately the mask has to be screen-depth since
// 1-bpp bitmaps don't seem to be supported
// pixmap. See demos/nxroach.c.
bool hasMask = image.HasMask();
-
+
GC pixmapGC = GrNewGC();
Pixmap pixmap = (Pixmap) GetPixmap();
maskR = image.GetMaskRed();
maskG = image.GetMaskGreen();
maskB = image.GetMaskBlue();
-
+
maskGC = GrNewGC();
maskPixmap = GrNewPixmap(w, h, 0);
if (!maskPixmap)
- hasMask = FALSE;
+ hasMask = false;
else
{
wxMask* mask = new wxMask;
GR_COLOR lastPixmapColour = 0;
GR_COLOR lastMaskColour = 0;
-
+
int i, j;
for (i = 0; i < w; i++)
{
GrSetGCForeground(pixmapGC, colour);
lastPixmapColour = colour;
}
-
+
GrPoint(pixmap, pixmapGC, i, j);
-
+
if (hasMask)
{
// scan the bitmap for the transparent colour and set the corresponding
GrDestroyGC(pixmapGC);
if (hasMask)
GrDestroyGC(maskGC);
-
- return TRUE;
+
+ return true;
#else
// !wxUSE_NANOX
-
+
UnRef();
- wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
- wxCHECK_MSG( depth == -1, FALSE, wxT("invalid bitmap depth") )
+ wxCHECK_MSG( image.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->m_visualDepth;
-
+
+ int bpp = wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_visualDepth;
+
int width = image.GetWidth();
int height = image.GetHeight();
M_BMPDATA->m_width = width;
if (depth != 1) depth = bpp;
M_BMPDATA->m_bpp = depth;
-
+
if (depth == 1)
{
- wxFAIL_MSG( "mono images later" );
+ wxFAIL_MSG( wxT("mono images later") );
}
else
{
// Create image
-
+
XImage *data_image = XCreateImage( xdisplay, xvisual, bpp, ZPixmap, 0, 0, width, height, 32, 0 );
data_image->data = (char*) malloc( data_image->bytes_per_line * data_image->height );
-
+
if (data_image->data == NULL)
{
wxLogError( wxT("Out of memory.") ); // TODO clean
- return FALSE;
+ return false;
}
M_BMPDATA->m_pixmap = (WXPixmap) XCreatePixmap( xdisplay, xroot, width, height, depth );
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;
+ return false;
}
-
+
wxMask *mask = new wxMask();
mask->SetDisplay( xdisplay );
mask->SetBitmap( (WXPixmap) XCreatePixmap( xdisplay, xroot, width, height, 1 ) );
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 ((wxTheApp->m_visualRedMask > wxTheApp->m_visualGreenMask) && (wxTheApp->m_visualGreenMask > wxTheApp->m_visualBlueMask)) b_o = RGB;
- else if ((wxTheApp->m_visualRedMask > wxTheApp->m_visualBlueMask) && (wxTheApp->m_visualBlueMask > wxTheApp->m_visualGreenMask)) b_o = RBG;
- else if ((wxTheApp->m_visualBlueMask > wxTheApp->m_visualRedMask) && (wxTheApp->m_visualRedMask > wxTheApp->m_visualGreenMask)) b_o = BRG;
- else if ((wxTheApp->m_visualBlueMask > wxTheApp->m_visualGreenMask) && (wxTheApp->m_visualGreenMask > wxTheApp->m_visualRedMask)) b_o = BGR;
- else if ((wxTheApp->m_visualGreenMask > wxTheApp->m_visualRedMask) && (wxTheApp->m_visualRedMask > wxTheApp->m_visualBlueMask)) b_o = GRB;
- else if ((wxTheApp->m_visualGreenMask > wxTheApp->m_visualBlueMask) && (wxTheApp->m_visualBlueMask > wxTheApp->m_visualRedMask)) b_o = GBR;
+ if ((redMask > greenMask) && (greenMask > blueMask)) b_o = RGB;
+ else if ((redMask > blueMask) && (blueMask > greenMask)) b_o = RBG;
+ else if ((blueMask > redMask) && (redMask > greenMask)) b_o = BRG;
+ else if ((blueMask > greenMask) && (greenMask > redMask))b_o = BGR;
+ else if ((greenMask > redMask) && (redMask > blueMask)) b_o = GRB;
+ else if ((greenMask > blueMask) && (blueMask > redMask)) b_o = GBR;
}
int r_mask = image.GetMaskRed();
int b_mask = image.GetMaskBlue();
unsigned char* data = image.GetData();
- wxASSERT_MSG( data, "No image data" );
-
- unsigned char *colorCube = wxTheApp->m_colorCube;
+ wxASSERT_MSG( data, wxT("No image data") );
+
+ unsigned char *colorCube =
+ wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_colorCube;
bool hasMask = image.HasMask();
XFreeGC( xdisplay, gc );
// Blit mask
-
+
if (image.HasMask())
{
GC gc = XCreateGC( xdisplay, (Pixmap) GetMask()->GetBitmap(), 0, NULL );
}
}
- return TRUE;
+ return true;
#endif
// wxUSE_NANOX
}
return image;
#else
// !wxUSE_NANOX
- int bpp = wxTheApp->m_visualDepth;
+ int bpp = wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_visualDepth;
XImage *x_image = NULL;
if (GetPixmap())
{
{
x_image_mask = XGetImage( xdisplay, (Pixmap) GetMask()->GetBitmap(),
0, 0,
- GetWidth(), GetHeight(),
+ GetWidth(), GetHeight(),
AllPlanes, ZPixmap );
image.SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable
int red_shift_left = 0;
int green_shift_left = 0;
int blue_shift_left = 0;
- bool use_shift = FALSE;
+ bool use_shift = false;
if (GetPixmap())
{
- red_shift_right = wxTheApp->m_visualRedShift;
- red_shift_left = 8-wxTheApp->m_visualRedPrec;
- green_shift_right = wxTheApp->m_visualGreenShift;
- green_shift_left = 8-wxTheApp->m_visualGreenPrec;
- blue_shift_right = wxTheApp->m_visualBlueShift;
- blue_shift_left = 8-wxTheApp->m_visualBluePrec;
-
- use_shift = (wxTheApp->m_visualType == GrayScale) || (wxTheApp->m_visualType != PseudoColor);
+ 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->m_visualColormap;
+ XColor *colors = (XColor*)wxTheApp->
+ GetVisualInfo(M_BMPDATA->m_display)->m_visualColormap;
int width = GetWidth();
int height = GetHeight();
}
else if (use_shift)
{
- data[pos] = (pixel >> red_shift_right) << red_shift_left;
- data[pos+1] = (pixel >> green_shift_right) << green_shift_left;
- data[pos+2] = (pixel >> blue_shift_right) << blue_shift_left;
+ data[pos] = (unsigned char)((pixel >> red_shift_right) << red_shift_left);
+ data[pos+1] = (unsigned char)((pixel >> green_shift_right) << green_shift_left);
+ data[pos+2] = (unsigned char)((pixel >> blue_shift_right) << blue_shift_left);
}
else if (colors)
{
- data[pos] = colors[pixel].red >> 8;
- data[pos+1] = colors[pixel].green >> 8;
- data[pos+2] = colors[pixel].blue >> 8;
+ data[pos] = (unsigned char)(colors[pixel].red >> 8);
+ data[pos+1] = (unsigned char)(colors[pixel].green >> 8);
+ data[pos+2] = (unsigned char)(colors[pixel].blue >> 8);
}
else
{
// wxUSE_NANOX
}
-wxBitmap::wxBitmap( const wxBitmap& bmp )
-{
- Ref( bmp );
-}
-
wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
{
LoadFile( filename, type );
{
}
-wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
-{
- if ( m_refData != bmp.m_refData )
- Ref( bmp );
-
- return *this;
-}
-
bool wxBitmap::operator == ( const wxBitmap& bmp ) const
{
return m_refData == bmp.m_refData;
bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{
*this = icon;
- return TRUE;
+ return true;
}
wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type,
const wxPalette *palette ) const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
wxBitmapHandler *handler = FindHandler(type);
// Try to save the bitmap via wxImage handlers:
if (handler == NULL)
- {
+ {
wxImage image(this->ConvertToImage());
if (image.Ok()) return image.SaveFile( name, type );
- return FALSE;
+ return false;
}
return handler->SaveFile(this, name, type, palette);
{
UnRef();
- if (!wxFileExists(name)) return FALSE;
+ if (!wxFileExists(name)) return false;
wxBitmapHandler *handler = FindHandler(type);
{
wxImage image;
if (!image.LoadFile( name, type ))
- return FALSE;
+ return false;
- if (image.Ok())
+ if (image.Ok())
{
*this = wxBitmap(image);
- return TRUE;
+ return true;
}
- else return FALSE;
+ else return false;
}
return handler->LoadFile(this, name, type, -1, -1);
M_BMPDATA->m_palette = NULL;
if (!palette.Ok()) return;
-
+
M_BMPDATA->m_palette = new wxPalette(palette);
}
return M_BMPDATA->m_bitmap;
}
+WXPixmap wxBitmap::GetDrawable() const
+{
+ wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
+
+ return M_BMPDATA->m_bpp == 1 ? M_BMPDATA->m_bitmap : M_BMPDATA->m_pixmap;
+}
+
WXDisplay *wxBitmap::GetDisplay() const
{
wxCHECK_MSG( Ok(), (WXDisplay*) NULL, wxT("invalid bitmap") );
GrGetScreenInfo(&sinfo);
if (sinfo.pixtype == MWPF_PALETTE) {
- if(!(palette = (GR_PALETTE*) malloc(sizeof(GR_PALETTE)))) {
- return FALSE;
- }
- GrGetSystemPalette(palette);
- }
+ if(!(palette = (GR_PALETTE*) malloc(sizeof(GR_PALETTE)))) {
+ return false;
+ }
+ GrGetSystemPalette(palette);
+ }
if(!(pixels = (GR_PIXELVAL*) malloc(sizeof(GR_PIXELVAL) * width * height)))
{
- return FALSE;
+ return false;
}
image.Create(width, height);
- GrReadArea(drawable, srcX, srcY, width, height,
- pixels);
-
-
- for(x = 0; x < sinfo.cols; x++) {
-
- pp = (unsigned char *)pixels +
- ((x + (y * sinfo.cols)) *
- sizeof(GR_PIXELVAL));
-
- switch(sinfo.pixtype) {
- /* FIXME: These may need modifying on big endian. */
- case MWPF_TRUECOLOR0888:
- case MWPF_TRUECOLOR888:
- rgb[0] = pp[2];
- rgb[1] = pp[1];
- rgb[2] = pp[0];
- break;
- case MWPF_PALETTE:
- rgb[0] = palette->palette[pp[0]].r;
- rgb[1] = palette->palette[pp[0]].g;
- rgb[2] = palette->palette[pp[0]].b;
- break;
- case MWPF_TRUECOLOR565:
- rgb[0] = pp[1] & 0xf8;
- rgb[1] = ((pp[1] & 0x07) << 5) |
- ((pp[0] & 0xe0) >> 3);
- rgb[2] = (pp[0] & 0x1f) << 3;
- break;
- case MWPF_TRUECOLOR555:
- rgb[0] = (pp[1] & 0x7c) << 1;
- rgb[1] = ((pp[1] & 0x03) << 6) |
- ((pp[0] & 0xe0) >> 2);
- rgb[2] = (pp[0] & 0x1f) << 3;
- break;
- case MWPF_TRUECOLOR332:
- rgb[0] = pp[0] & 0xe0;
- rgb[1] = (pp[0] & 0x1c) << 3;
- rgb[2] = (pp[0] & 0x03) << 6;
- break;
- default:
- fprintf(stderr, "Unsupported pixel "
- "format\n");
- return 1;
- }
-
- image.SetRGB(x, y, rgb[0], rgb[1], rgb[2]);
-
- }
+ GrReadArea(drawable, srcX, srcY, width, height,
+ pixels);
+
+
+ for(x = 0; x < sinfo.cols; x++) {
+
+ pp = (unsigned char *)pixels +
+ ((x + (y * sinfo.cols)) *
+ sizeof(GR_PIXELVAL));
+
+ switch(sinfo.pixtype) {
+ /* FIXME: These may need modifying on big endian. */
+ case MWPF_TRUECOLOR0888:
+ case MWPF_TRUECOLOR888:
+ rgb[0] = pp[2];
+ rgb[1] = pp[1];
+ rgb[2] = pp[0];
+ break;
+ case MWPF_PALETTE:
+ rgb[0] = palette->palette[pp[0]].r;
+ rgb[1] = palette->palette[pp[0]].g;
+ rgb[2] = palette->palette[pp[0]].b;
+ break;
+ case MWPF_TRUECOLOR565:
+ rgb[0] = pp[1] & 0xf8;
+ rgb[1] = ((pp[1] & 0x07) << 5) |
+ ((pp[0] & 0xe0) >> 3);
+ rgb[2] = (pp[0] & 0x1f) << 3;
+ break;
+ case MWPF_TRUECOLOR555:
+ rgb[0] = (pp[1] & 0x7c) << 1;
+ rgb[1] = ((pp[1] & 0x03) << 6) |
+ ((pp[0] & 0xe0) >> 2);
+ rgb[2] = (pp[0] & 0x1f) << 3;
+ break;
+ case MWPF_TRUECOLOR332:
+ rgb[0] = pp[0] & 0xe0;
+ rgb[1] = (pp[0] & 0x1c) << 3;
+ rgb[2] = (pp[0] & 0x03) << 6;
+ break;
+ default:
+ fprintf(stderr, "Unsupported pixel "
+ "format\n");
+ return 1;
+ }
+
+ image.SetRGB(x, y, rgb[0], rgb[1], rgb[2]);
+
+ }
free(pixels);
if(palette) free(palette);
- return TRUE;
+ return true;
}
#if 0
int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixel,
unsigned char* red, unsigned char* green, unsigned char* blue)
{
- unsigned char rgb[3], *pp;
+ unsigned char rgb[3], *pp;
pp = (unsigned char*) & pixel ;
switch (sinfo.pixtype)
{
- /* FIXME: These may need modifying on big endian. */
- case MWPF_TRUECOLOR0888:
- case MWPF_TRUECOLOR888:
- rgb[0] = pp[2];
- rgb[1] = pp[1];
- rgb[2] = pp[0];
- break;
- case MWPF_PALETTE:
- rgb[0] = palette->palette[pp[0]].r;
- rgb[1] = palette->palette[pp[0]].g;
- rgb[2] = palette->palette[pp[0]].b;
- break;
- case MWPF_TRUECOLOR565:
- rgb[0] = pp[1] & 0xf8;
- rgb[1] = ((pp[1] & 0x07) << 5) |
- ((pp[0] & 0xe0) >> 3);
- rgb[2] = (pp[0] & 0x1f) << 3;
- break;
- case MWPF_TRUECOLOR555:
- rgb[0] = (pp[1] & 0x7c) << 1;
- rgb[1] = ((pp[1] & 0x03) << 6) |
- ((pp[0] & 0xe0) >> 2);
- rgb[2] = (pp[0] & 0x1f) << 3;
- break;
- case MWPF_TRUECOLOR332:
- rgb[0] = pp[0] & 0xe0;
- rgb[1] = (pp[0] & 0x1c) << 3;
- rgb[2] = (pp[0] & 0x03) << 6;
- break;
- default:
- fprintf(stderr, "Unsupported pixel format\n");
- return 0;
- }
+ /* FIXME: These may need modifying on big endian. */
+ case MWPF_TRUECOLOR0888:
+ case MWPF_TRUECOLOR888:
+ rgb[0] = pp[2];
+ rgb[1] = pp[1];
+ rgb[2] = pp[0];
+ break;
+ case MWPF_PALETTE:
+ rgb[0] = palette->palette[pp[0]].r;
+ rgb[1] = palette->palette[pp[0]].g;
+ rgb[2] = palette->palette[pp[0]].b;
+ break;
+ case MWPF_TRUECOLOR565:
+ rgb[0] = pp[1] & 0xf8;
+ rgb[1] = ((pp[1] & 0x07) << 5) |
+ ((pp[0] & 0xe0) >> 3);
+ rgb[2] = (pp[0] & 0x1f) << 3;
+ break;
+ case MWPF_TRUECOLOR555:
+ rgb[0] = (pp[1] & 0x7c) << 1;
+ rgb[1] = ((pp[1] & 0x03) << 6) |
+ ((pp[0] & 0xe0) >> 2);
+ rgb[2] = (pp[0] & 0x1f) << 3;
+ break;
+ case MWPF_TRUECOLOR332:
+ rgb[0] = pp[0] & 0xe0;
+ rgb[1] = (pp[0] & 0x1c) << 3;
+ rgb[2] = (pp[0] & 0x03) << 6;
+ break;
+ default:
+ fprintf(stderr, "Unsupported pixel format\n");
+ return 0;
+ }
*(red) = rgb[0];
// Bitmap handlers
// ============================================================================
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase);
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
#define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
class wxXPMFileHandler : public wxBitmapHandler
{
- DECLARE_DYNAMIC_CLASS(wxXPMFileHandler);
+ DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
public:
wxXPMFileHandler()
{
- m_name = "XPM file";
- m_extension = "xpm";
- m_type = wxBITMAP_TYPE_XPM;
+ SetName( wxT("XPM file") );
+ SetExtension( wxT("xpm") );
+ SetType( wxBITMAP_TYPE_XPM );
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
int type, const wxPalette *palette = NULL);
- virtual bool Create(wxBitmap *bitmap, void *data, long flags,
- int width, int height, int depth = 1)
- { return FALSE; }
+ virtual bool Create(wxBitmap *WXUNUSED(bitmap), void *WXUNUSED(data), long WXUNUSED(flags),
+ int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth) = 1)
+ { return false; }
};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler);
+IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
- long flags, int desiredWidth,
- int desiredHeight)
+ long WXUNUSED(flags), int WXUNUSED(desiredWidth),
+ int WXUNUSED(desiredHeight))
{
#if wxHAVE_LIB_XPM
if (!bitmap->GetRefData())
bitmap->SetRefData( new wxBitmapRefData() );
M_BMPHANDLERDATA->m_display = wxGlobalDisplay();
-
+
Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display;
-
+
int xscreen = DefaultScreen( xdisplay );
Window xroot = RootWindow( xdisplay, xscreen );
-
+
int bpp = DefaultDepth( xdisplay, xscreen );
XpmAttributes xpmAttr;
Pixmap pixmap;
Pixmap mask = 0;
-
+
int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot,
(char*) name.c_str(),
&pixmap, &mask, &xpmAttr);
-
+
if (ErrorStatus == XpmSuccess)
{
M_BMPHANDLERDATA->m_width = xpmAttr.width;
XpmFreeAttributes(&xpmAttr);
M_BMPHANDLERDATA->m_bitmap = (WXPixmap) pixmap;
-
+
if (mask)
{
M_BMPHANDLERDATA->m_mask = new wxMask;
else
{
UnRef();
-
- return FALSE;
+
+ return false;
}
- return TRUE;
+ return true;
#elif wxUSE_STREAMS
wxXPMDecoder decoder;
wxFileInputStream stream(name);
if (stream.Ok())
{
wxImage image(decoder.ReadFile(stream));
- if (image.Ok())
- return CreateFromImage(image);
- else
- return FALSE;
+ return image.Ok() && bitmap->CreateFromImage(image);
}
- else
- return FALSE;
+
+ return false;
+#else // !wxHAVE_LIB_XPM && !wxUSE_STREAMS
+ return false;
#endif // wxHAVE_LIB_XPM / wxUSE_STREAMS
}
wxImage image(bitmap->ConvertToImage());
if (image.Ok()) return image.SaveFile( name, (wxBitmapType)type );
- return FALSE;
+ return false;
}
#endif // wxHAVE_LIB_XPM || wxUSE_STREAMS
class wxXPMDataHandler : public wxBitmapHandler
{
- DECLARE_DYNAMIC_CLASS(wxXPMDataHandler);
+ DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
public:
wxXPMDataHandler()
{
- m_name = "XPM data";
- m_extension = "xpm";
- m_type = wxBITMAP_TYPE_XPM_DATA;
+ SetName( wxT("XPM data") );
+ SetExtension( wxT("xpm") );
+ SetType( wxBITMAP_TYPE_XPM_DATA );
};
- virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight)
- { return FALSE; }
+ virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ long WXUNUSED(flags),
+ int WXUNUSED(desiredWidth),
+ int WXUNUSED(desiredHeight))
+ { return false; }
- virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
- int type, const wxPalette *palette = NULL)
- { return FALSE; }
+ virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ int WXUNUSED(type),
+ const wxPalette *WXUNUSED(palette) = NULL)
+ { return false; }
virtual bool Create(wxBitmap *bitmap, void *data, long flags,
int width, int height, int depth = 1);
};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler);
+IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits,
long WXUNUSED(flags),
- int width, int height, int WXUNUSED(depth))
+ int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
{
#if wxHAVE_LIB_XPM
- wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
+ wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
if (!bitmap->GetRefData())
bitmap->SetRefData( new wxBitmapRefData() );
M_BMPHANDLERDATA->m_display = wxGlobalDisplay();
-
+
Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display;
-
+
int xscreen = DefaultScreen( xdisplay );
Window xroot = RootWindow( xdisplay, xscreen );
-
+
int bpp = DefaultDepth( xdisplay, xscreen );
XpmAttributes xpmAttr;
Pixmap pixmap = 0;
Pixmap mask = 0;
-
+
int ErrorStatus = XpmCreatePixmapFromData( xdisplay, xroot, (char**) bits,
&pixmap, &mask, &xpmAttr );
-
+
if (ErrorStatus == XpmSuccess)
{
M_BMPHANDLERDATA->m_width = xpmAttr.width;
#endif
XpmFreeAttributes(&xpmAttr);
-
+
M_BMPHANDLERDATA->m_pixmap = (WXPixmap) pixmap;
-
+
if (mask)
{
M_BMPHANDLERDATA->m_mask = new wxMask;
M_BMPHANDLERDATA->m_mask->SetBitmap( (WXPixmap) mask );
M_BMPHANDLERDATA->m_mask->SetDisplay( xdisplay );
}
- return TRUE;
+ return true;
}
else
{
bitmap->UnRef();
-
- return FALSE;
+
+ return false;
}
-#else
+#else // !wxHAVE_LIB_XPM
wxXPMDecoder decoder;
- wxImage image(decoder.ReadData(bits));
- if (image.Ok())
- return bitmap->CreateFromImage(image);
- else
- return FALSE;
-#endif
+ wxImage image(decoder.ReadData((const char **)bits));
+ return image.Ok() && bitmap->CreateFromImage(image);
+#endif // wxHAVE_LIB_XPM/!wxHAVE_LIB_XPM
}
#endif // wxUSE_XPM
public:
inline wxXBMDataHandler()
{
- m_name = "XBM data";
- m_extension = "xbm";
- m_type = wxBITMAP_TYPE_XBM_DATA;
+ SetName( wxT("XBM data") );
+ SetExtension( wxT("xbm") );
+ SetType( wxBITMAP_TYPE_XBM_DATA );
};
- virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight)
- { return FALSE; }
+ virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ long WXUNUSED(flags),
+ int WXUNUSED(desiredWidth),
+ int WXUNUSED(desiredHeight))
+ { return false; }
- virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
- int type, const wxPalette *palette = NULL)
- { return FALSE; }
+ virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ int WXUNUSED(type),
+ const wxPalette *WXUNUSED(palette) = NULL)
+ { return false; }
virtual bool Create(wxBitmap *bitmap, void *data, long flags,
int width, int height, int depth = 1);
};
-IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler);
+IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits,
long WXUNUSED(flags),
- int width, int height, int depth)
+ int width, int height, int WXUNUSED(depth))
{
#if !wxUSE_NANOX
if (!bitmap->GetRefData())
M_BMPHANDLERDATA->m_display = wxGlobalDisplay();
Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display;
-
+
int xscreen = DefaultScreen( xdisplay );
Window xroot = RootWindow( xdisplay, xscreen );
-
+
M_BMPHANDLERDATA->m_mask = (wxMask *) NULL;
M_BMPHANDLERDATA->m_bitmap =
(WXPixmap) XCreateBitmapFromData( xdisplay, xroot,
M_BMPHANDLERDATA->m_height = height;
M_BMPHANDLERDATA->m_bpp = 1;
- return TRUE;
-#endif
- wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, FALSE,
+ return true;
+#else
+ wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, false,
wxT("couldn't create bitmap") );
+#endif
}
void wxBitmap::InitStandardHandlers()
projects / wxWidgets.git / blobdiff