// return true if we could draw the bitmap in one way or the other, false
// otherwise
static bool AlphaBlt(HDC hdcDst,
- int x, int y, int w, int h,
- int srcX, int srcY, HDC hdcSrc,
- const wxBitmap& bmpSrc);
+ int x, int y, int dstWidth, int dstHeight,
+ int srcX, int srcY,
+ int srcWidth, int srcHeight,
+ HDC hdcSrc,
+ const wxBitmap& bmp);
#ifdef wxHAVE_RAW_BITMAP
// our (limited) AlphaBlend() replacement for Windows versions not providing it
static void
-wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h,
- int srcX, int srcY, const wxBitmap& bmp);
+wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
+ int dstWidth, int dstHeight,
+ int srcX, int srcY,
+ int srcWidth, int srcHeight,
+ const wxBitmap& bmpSrc);
#endif // wxHAVE_RAW_BITMAP
// transparent pen) one pixel smaller in both directions and we want them
// to have the same size regardless of which pen is used - adjust
- // I wonder if this shouldnยดt be done after the LOG2DEV() conversions. RR.
+ // I wonder if this shouldnt be done after the LOG2DEV() conversions. RR.
if ( m_pen.GetStyle() == wxTRANSPARENT )
{
// Apparently not needed for WinCE (see e.g. Life! demo)
MemoryHDC hdcMem;
SelectInHDC select(hdcMem, GetHbitmapOf(bmp));
- if ( AlphaBlt(GetHdc(), x, y, width, height, 0, 0, hdcMem, bmp) )
+ if ( AlphaBlt(GetHdc(), x, y, width, height, 0, 0, width, height, hdcMem, bmp) )
return;
}
// Rather than reproduce wxDC::Blit, let's do it at the wxWin API
// level
wxMemoryDC memDC;
- memDC.SelectObject(bmp);
+
+ memDC.SelectObjectAsSource(bmp);
Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
// ---------------------------------------------------------------------------
// bit blit
// ---------------------------------------------------------------------------
-
-bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
- wxCoord width, wxCoord height,
- wxDC *source, wxCoord xsrc, wxCoord ysrc,
+bool wxDC::DoBlit(wxCoord dstX, wxCoord dstY,
+ wxCoord dstWidth, wxCoord dstHeight,
+ wxDC *source,
+ wxCoord srcX, wxCoord srcY,
int rop, bool useMask,
- wxCoord xsrcMask, wxCoord ysrcMask)
+ wxCoord srcMaskX, wxCoord srcMaskY)
+{
+ return DoStretchBlit(dstX, dstY, dstWidth, dstHeight, source, srcX, srcY, dstWidth, dstHeight, rop, useMask, srcMaskX, srcMaskY);
+}
+
+bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
+ wxCoord dstWidth, wxCoord dstHeight,
+ wxDC *source,
+ wxCoord xsrc, wxCoord ysrc,
+ wxCoord srcWidth, wxCoord srcHeight,
+ int rop, bool useMask,
+ wxCoord xsrcMask, wxCoord ysrcMask)
{
wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") );
if ( bmpSrc.Ok() && (bmpSrc.HasAlpha() ||
(m_selectedBitmap.Ok() && m_selectedBitmap.HasAlpha())) )
{
- if ( AlphaBlt(GetHdc(), xdest, ydest, width, height,
- xsrc, ysrc, GetHdcOf(*source), bmpSrc) )
+ if ( AlphaBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
+ xsrc, ysrc, srcWidth, srcHeight, GetHdcOf(*source), bmpSrc) )
return true;
}
if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
#endif
{
- success = ::MaskBlt
- (
+ if ( dstWidth == srcWidth && dstHeight == srcHeight )
+ {
+ success = ::MaskBlt
+ (
GetHdc(),
- xdest, ydest, width, height,
+ xdest, ydest, dstWidth, dstHeight,
GetHdcOf(*source),
xsrc, ysrc,
(HBITMAP)mask->GetMaskBitmap(),
xsrcMask, ysrcMask,
MAKEROP4(dwRop, DSTCOPY)
- ) != 0;
+ ) != 0;
+ }
}
if ( !success )
dc_buffer = (HDC) dcCacheEntry2->m_dc;
wxDCCacheEntry* bitmapCacheEntry = FindBitmapInCache(GetHDC(),
- width, height);
+ dstWidth, dstHeight);
buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
#else // !wxUSE_DC_CACHEING
// create a temp buffer bitmap and DCs to access it and the mask
dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
dc_buffer = ::CreateCompatibleDC(GetHdc());
- buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
+ buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight);
#endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING
HGDIOBJ hOldMaskBitmap = ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap());
HGDIOBJ hOldBufferBitmap = ::SelectObject(dc_buffer, buffer_bmap);
// copy dest to buffer
- if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+ if ( !::BitBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
GetHdc(), xdest, ydest, SRCCOPY) )
{
wxLogLastError(wxT("BitBlt"));
}
+#ifndef __WXWINCE__
+ StretchBltModeChanger changeMode(dc_buffer, COLORONCOLOR);
+#endif
+
// copy src to buffer using selected raster op
- if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
- GetHdcOf(*source), xsrc, ysrc, dwRop) )
+ if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
+ GetHdcOf(*source), xsrc, ysrc, srcWidth, srcHeight, dwRop) )
{
- wxLogLastError(wxT("BitBlt"));
+ wxLogLastError(wxT("StretchBlt"));
}
// set masked area in buffer to BLACK (pixel value 0)
COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255));
COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0));
- if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
- dc_mask, xsrcMask, ysrcMask, SRCAND) )
+ if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
+ dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) )
{
- wxLogLastError(wxT("BitBlt"));
+ wxLogLastError(wxT("StretchBlt"));
}
// set unmasked area in dest to BLACK
::SetBkColor(GetHdc(), RGB(0, 0, 0));
::SetTextColor(GetHdc(), RGB(255, 255, 255));
- if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
- dc_mask, xsrcMask, ysrcMask, SRCAND) )
+ if ( !::StretchBlt(GetHdc(), xdest, ydest, (int)dstWidth, (int)dstHeight,
+ dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) )
{
- wxLogLastError(wxT("BitBlt"));
+ wxLogLastError(wxT("StretchBlt"));
}
::SetBkColor(GetHdc(), prevBkCol); // restore colours to original values
::SetTextColor(GetHdc(), prevCol);
// OR buffer to dest
success = ::BitBlt(GetHdc(), xdest, ydest,
- (int)width, (int)height,
+ (int)dstWidth, (int)dstHeight,
dc_buffer, 0, 0, SRCPAINT) != 0;
if ( !success )
{
if ( hDIB > 0 )
{
// reflect ysrc
- ysrc = hDIB - (ysrc + height);
+ ysrc = hDIB - (ysrc + dstHeight);
}
if ( ::StretchDIBits(GetHdc(),
xdest, ydest,
- width, height,
+ dstWidth, dstHeight,
xsrc, ysrc,
- width, height,
+ srcWidth, srcHeight,
ds.dsBm.bmBits,
(LPBITMAPINFO)&ds.dsBmih,
DIB_RGB_COLORS,
if ( !::StretchBlt
(
GetHdc(),
- xdest, ydest, width, height,
+ xdest, ydest, dstWidth, dstHeight,
GetHdcOf(*source),
- xsrc, ysrc, width, height,
+ xsrc, ysrc, srcWidth, srcHeight,
dwRop
) )
{
(
GetHdc(),
xdest, ydest,
- (int)width, (int)height,
+ (int)dstWidth, (int)dstHeight,
GetHdcOf(*source),
xsrc, ysrc,
dwRop
// ----------------------------------------------------------------------------
static bool AlphaBlt(HDC hdcDst,
- int x, int y, int width, int height,
- int srcX, int srcY, HDC hdcSrc,
+ int x, int y, int dstWidth, int dstHeight,
+ int srcX, int srcY,
+ int srcWidth, int srcHeight,
+ HDC hdcSrc,
const wxBitmap& bmp)
{
wxASSERT_MSG( bmp.Ok() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );
bf.SourceConstantAlpha = 0xff;
bf.AlphaFormat = AC_SRC_ALPHA;
- if ( pfnAlphaBlend(hdcDst, x, y, width, height,
- hdcSrc, srcX, srcY, width, height,
+ if ( pfnAlphaBlend(hdcDst, x, y, dstWidth, dstHeight,
+ hdcSrc, srcX, srcY, srcWidth, srcHeight,
bf) )
{
// skip wxAlphaBlend() call below
// AlphaBlend() unavailable of failed: use our own (probably much slower)
// implementation
#ifdef wxHAVE_RAW_BITMAP
- wxAlphaBlend(hdcDst, x, y, width, height, srcX, srcY, bmp);
+ wxAlphaBlend(hdcDst, x, y, dstWidth, dstHeight, srcX, srcY, srcWidth, srcHeight, bmp);
return true;
#else // !wxHAVE_RAW_BITMAP
static void
wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
- int w, int h,
- int srcX, int srcY, const wxBitmap& bmpSrc)
+ int dstWidth, int dstHeight,
+ int srcX, int srcY,
+ int srcWidth, int srcHeight,
+ const wxBitmap& bmpSrc)
{
// get the destination DC pixels
- wxBitmap bmpDst(w, h, 32 /* force creating RGBA DIB */);
+ wxBitmap bmpDst(dstWidth, dstHeight, 32 /* force creating RGBA DIB */);
MemoryHDC hdcMem;
SelectInHDC select(hdcMem, GetHbitmapOf(bmpDst));
- if ( !::BitBlt(hdcMem, 0, 0, w, h, hdcDst, xDst, yDst, SRCCOPY) )
+ if ( !::BitBlt(hdcMem, 0, 0, dstWidth, dstHeight, hdcDst, xDst, yDst, SRCCOPY) )
{
wxLogLastError(_T("BitBlt"));
}
wxAlphaPixelData::Iterator pDst(dataDst),
pSrc(dataSrc);
- pSrc.Offset(dataSrc, srcX, srcY);
- for ( int y = 0; y < h; y++ )
+ for ( int y = 0; y < dstHeight; y++ )
{
- wxAlphaPixelData::Iterator pDstRowStart = pDst,
- pSrcRowStart = pSrc;
+ wxAlphaPixelData::Iterator pDstRowStart = pDst;
- for ( int x = 0; x < w; x++ )
+ for ( int x = 0; x < dstWidth; x++ )
{
+ // source is point sampled, Alpha StretchBlit is ugly on Win95
+ // (but does not impact performance)
+ pSrc.MoveTo(dataSrc, srcX + (srcWidth*x/dstWidth), srcY + (srcHeight*y/dstHeight));
+
// note that source bitmap uses premultiplied alpha (as required by
// the real AlphaBlend)
const unsigned beta = 255 - pSrc.Alpha();
pDst.Green() = pSrc.Green() + (beta * pDst.Green() + 127) / 255;
++pDst;
- ++pSrc;
}
pDst = pDstRowStart;
- pSrc = pSrcRowStart;
pDst.OffsetY(dataDst, 1);
- pSrc.OffsetY(dataSrc, 1);
}
// and finally blit them back to the destination DC
- if ( !::BitBlt(hdcDst, xDst, yDst, w, h, hdcMem, 0, 0, SRCCOPY) )
+ if ( !::BitBlt(hdcDst, xDst, yDst, dstWidth, dstHeight, hdcMem, 0, 0, SRCCOPY) )
{
wxLogLastError(_T("BitBlt"));
}
vertices[0].x = rect.GetLeft();
vertices[0].y = rect.GetTop();
- vertices[1].x = rect.GetRight();
- vertices[1].y = rect.GetBottom();
+ vertices[1].x = rect.GetRight()+1;
+ vertices[1].y = rect.GetBottom()+1;
vertices[firstVertex].Red = (COLOR16)(initialColour.Red() << 8);
vertices[firstVertex].Green = (COLOR16)(initialColour.Green() << 8);
projects / wxWidgets.git / blobdiff