X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e12be2f7fb5f55553795b7c4168007173511d581..30b5fc118f6fa8bad8cd3692ca42c164aa5007f9:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 45c51e9417..d6be602027 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -23,6 +23,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/msw/private.h" // needs to be before #include #ifdef __BORLANDC__ #pragma hdrstop @@ -56,8 +57,6 @@ #include #endif -#include "wx/msw/private.h" - IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) // --------------------------------------------------------------------------- @@ -599,27 +598,85 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask { if (!bmp.Ok()) return; - + + bool needsPixelCopy = FALSE ; + bool isPrinter = FALSE ; + if (IsKindOf(CLASSINFO(wxPrinterDC)) ) + { + isPrinter = TRUE ; + if ( ::GetDeviceCaps((HDC) m_hDC, RASTERCAPS) & RC_STRETCHDIB ) + { + } + else + { + needsPixelCopy = TRUE ; + } + } // If we're not drawing transparently, and not drawing to a printer, // optimize this function to use Windows functions. - if (!useMask && !IsKindOf(CLASSINFO(wxPrinterDC))) + if (!useMask && !needsPixelCopy) { - HDC cdc = GetHdc(); - HDC memdc = ::CreateCompatibleDC( cdc ); - HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( ); + if ( isPrinter ) + { + BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) ) ; + int iBitsSize = ((bmp.GetWidth() + 3 ) & ~3 ) * bmp.GetHeight() ; + + void* bits = malloc( iBitsSize ) ; + + memset( info , 0 , sizeof( BITMAPINFOHEADER ) ) ; + + info->bmiHeader.biSize = sizeof( BITMAPINFOHEADER ) ; + info->bmiHeader.biWidth = bmp.GetWidth() ; + info->bmiHeader.biHeight = bmp.GetHeight() ; + info->bmiHeader.biPlanes = 1 ; + info->bmiHeader.biBitCount = 8 ; + info->bmiHeader.biCompression = BI_RGB ; + + HDC display = GetDC( NULL ) ; + if ( GetDIBits( display , (HBITMAP) bmp.GetHBITMAP( ) , 0 , bmp.GetHeight() , bits , info , DIB_RGB_COLORS ) ) + { + StretchDIBits( (HDC) m_hDC, + x, y, bmp.GetWidth(), bmp.GetHeight() , + 0 , 0 ,bmp.GetWidth(), bmp.GetHeight() , + bits , info , DIB_RGB_COLORS , SRCCOPY ) ; + } + ReleaseDC( NULL , display ) ; + free ( bits ) ; + free( info ) ; + } + else + { + HDC cdc = GetHdc(); + HDC memdc = ::CreateCompatibleDC( cdc ); + HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( ); + + wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") ); + + COLORREF old_textground = ::GetTextColor(GetHdc()); + COLORREF old_background = ::GetBkColor(GetHdc()); + if (m_textForegroundColour.Ok()) + { + ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() ); + } + if (m_textBackgroundColour.Ok()) + { + ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); + } - wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") ); + ::SelectObject( memdc, hbitmap ); + ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY); + ::DeleteDC( memdc ); - ::SelectObject( memdc, hbitmap ); - ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY); - ::DeleteDC( memdc ); + ::SetTextColor(GetHdc(), old_textground); + ::SetBkColor(GetHdc(), old_background); + } } else { // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level wxMemoryDC memDC; memDC.SelectObject(bmp); - + /* Not sure if we need this. The mask should leave the * masked areas as per the original background of this DC. */ @@ -629,9 +686,9 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask memDC.SetBackground(* GetBackground()); memDC.Clear(); */ - + Blit(x, y, bmp.GetWidth(), bmp.GetHeight(), & memDC, 0, 0, wxCOPY, useMask); - + memDC.SelectObject(wxNullBitmap); } } @@ -1188,8 +1245,6 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxCoord xsrc1 = xsrc; wxCoord ysrc1 = ysrc; - // Chris Breeze 18/5/98: use text foreground/background colours - // when blitting from 1-bit bitmaps COLORREF old_textground = ::GetTextColor(GetHdc()); COLORREF old_background = ::GetBkColor(GetHdc()); if (m_textForegroundColour.Ok()) @@ -1216,7 +1271,27 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, SRCCOPY; bool success = TRUE; - if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask()) + bool needsPixelCopy = FALSE ; + bool isPrinter = FALSE ; + + if (IsKindOf(CLASSINFO(wxPrinterDC)) ) + { + isPrinter = TRUE ; + if ( ::GetDeviceCaps((HDC) m_hDC, RASTERCAPS) & RC_STRETCHDIB ) + { + } + else + { + needsPixelCopy = TRUE ; + } + } + if (useMask && !source->m_selectedBitmap.Ok()) + return FALSE; + + if (useMask && !source->m_selectedBitmap.GetMask()) + useMask = FALSE; + + if (useMask) { #if 0 // __WIN32__ @@ -1233,7 +1308,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, // New code from Chris Breeze, 15/7/98 // Blit bitmap with mask - if (IsKindOf(CLASSINFO(wxPrinterDC))) + if (isPrinter) { // If we are printing source colours are screen colours // not printer colours and so we need copy the bitmap @@ -1305,12 +1380,12 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, } } } - else + else if (needsPixelCopy) // not masked, but we need pixel copy. Only true if it's a printer { // If we are printing, source colours are screen colours // not printer colours and so we need copy the bitmap // pixel by pixel. - if (IsKindOf(CLASSINFO(wxPrinterDC))) + if (isPrinter) { HDC dc_src = (HDC) source->m_hDC; RECT rect; @@ -1318,8 +1393,6 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, { // This is Stefan Csomor's optimisation, where // identical adjacent pixels are drawn together. - // We still need a faster way of drawing bitmaps, - // perhaps converting to a DIB first and using SetDIBitsToDevice. for (int x = 0; x < width; x++) { COLORREF col = ::GetPixel(dc_src, x, y) ; @@ -1337,27 +1410,47 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, ::DeleteObject(brush); } } -/* - HDC dc_src = (HDC) source->m_hDC; - RECT rect; - for (int x = 0; x < width; x++) - { - for (int y = 0; y < height; y++) - { - HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y)); - rect.left = xdest1 + x; rect.right = rect.left + 1; - rect.top = ydest1 + y; rect.bottom = rect.top + 1; - ::FillRect(GetHdc(), &rect, brush); - ::DeleteObject(brush); - } - } -*/ } else { - success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC, - xsrc1, ysrc1, dwRop) != 0); + wxFAIL_MSG( "If needsPixelCopy is true, isPrinter should be true also." ); + } + } + else if (isPrinter) // not masked, not pixel copy + { + wxBitmap& bmp = source->m_selectedBitmap ; + BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) ) ; + int iBitsSize = ((bmp.GetWidth() + 3 ) & ~3 ) * bmp.GetHeight() ; + + void* bits = malloc( iBitsSize ) ; + + memset( info , 0 , sizeof( BITMAPINFOHEADER ) ) ; + + info->bmiHeader.biSize = sizeof( BITMAPINFOHEADER ) ; + info->bmiHeader.biWidth = bmp.GetWidth() ; + info->bmiHeader.biHeight = bmp.GetHeight() ; + info->bmiHeader.biPlanes = 1 ; + info->bmiHeader.biBitCount = 8 ; + info->bmiHeader.biCompression = BI_RGB ; + + HDC display = GetDC( NULL ) ; + if ( GetDIBits( display , (HBITMAP) bmp.GetHBITMAP( ) , 0 , bmp.GetHeight() , bits , info , DIB_RGB_COLORS ) ) + { + success = (GDI_ERROR != StretchDIBits( (HDC) m_hDC, + xdest1, ydest1, bmp.GetWidth(), bmp.GetHeight() , + xsrc1 , ysrc1 ,bmp.GetWidth(), bmp.GetHeight() , + bits , info , DIB_RGB_COLORS , SRCCOPY )) ; } + else + success = FALSE; + ReleaseDC( NULL , display ) ; + free ( bits ) ; + free( info ) ; + } + else // Not masked, not printer, not pixel copy + { + success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC, + xsrc1, ysrc1, dwRop) != 0); } ::SetTextColor(GetHdc(), old_textground); ::SetBkColor(GetHdc(), old_background);