X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..d3e780ecdf69233c872d51216eedbc64a1b6db25:/src/msw/dcprint.cpp diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index eb6842a4ca..53542de5ea 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dcprint.h" #endif @@ -38,6 +38,11 @@ #if wxUSE_PRINTING_ARCHITECTURE #include "wx/msw/private.h" + +#if wxUSE_WXDIB +#include "wx/msw/dib.h" +#endif + #include "wx/dcprint.h" #include "math.h" @@ -50,7 +55,7 @@ #endif // mingw32 defines GDI_ERROR incorrectly -#ifdef __GNUWIN32__ +#if defined(__GNUWIN32__) || !defined(GDI_ERROR) #undef GDI_ERROR #define GDI_ERROR ((int)-1) #endif @@ -224,7 +229,6 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName) deviceName.clear(); LPDEVNAMES lpDevNames; - LPTSTR lpszDriverName; LPTSTR lpszDeviceName; LPTSTR lpszPortName; @@ -258,7 +262,6 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName) if (pd.hDevNames) { lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames); - lpszDriverName = (LPTSTR)lpDevNames + lpDevNames->wDriverOffset; lpszDeviceName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset; lpszPortName = (LPTSTR)lpDevNames + lpDevNames->wOutputOffset; @@ -275,86 +278,9 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName) GlobalFree(pd.hDevMode); pd.hDevMode=NULL; } - return ( deviceName != wxT("") ); + return ( deviceName != wxEmptyString ); } -#if 0 -// This uses defaults, except for orientation, so we should eliminate this function -// and use the 2nd form (passing wxPrintData) instead. -WXHDC wxGetPrinterDC(int orientation) -{ - HDC hDC; - LPDEVMODE lpDevMode = NULL; - LPDEVNAMES lpDevNames; - LPSTR lpszDriverName; - LPSTR lpszDeviceName; - LPSTR lpszPortName; - - PRINTDLG pd; - // __GNUWIN32__ has trouble believing PRINTDLG is 66 bytes - thinks it is 68 -#ifdef __GNUWIN32__ - pd.lStructSize = 66; // sizeof(PRINTDLG); -#else - pd.lStructSize = sizeof(PRINTDLG); -#endif - pd.hwndOwner = (HWND)NULL; - pd.hDevMode = NULL; // Will be created by PrintDlg - pd.hDevNames = NULL; // Ditto - pd.Flags = PD_RETURNDEFAULT; - pd.nCopies = 1; - - if (!PrintDlg((LPPRINTDLG)&pd)) - { - if ( pd.hDevMode ) - GlobalFree(pd.hDevMode); - if (pd.hDevNames) - GlobalFree(pd.hDevNames); - - return(0); - } - - if (!pd.hDevNames) - { - if ( pd.hDevMode ) - GlobalFree(pd.hDevMode); - } - - lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames); - lpszDriverName = (LPSTR)lpDevNames + lpDevNames->wDriverOffset; - lpszDeviceName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset; - lpszPortName = (LPSTR)lpDevNames + lpDevNames->wOutputOffset; - GlobalUnlock(pd.hDevNames); - - if ( pd.hDevMode ) - { - lpDevMode = (DEVMODE*) GlobalLock(pd.hDevMode); - lpDevMode->dmOrientation = orientation; - lpDevMode->dmFields |= DM_ORIENTATION; - } - -#ifdef __WIN32__ - hDC = CreateDC(lpszDriverName, lpszDeviceName, lpszPortName, (DEVMODE *)lpDevMode); -#else - hDC = CreateDC(lpszDriverName, lpszDeviceName, lpszPortName, (LPSTR)lpDevMode); -#endif - - if (pd.hDevMode && lpDevMode) - GlobalUnlock(pd.hDevMode); - - if (pd.hDevNames) - { - GlobalFree(pd.hDevNames); - pd.hDevNames=NULL; - } - if (pd.hDevMode) - { - GlobalFree(pd.hDevMode); - pd.hDevMode=NULL; - } - return (WXHDC) hDC; -} -#endif // 0 - // Gets an HDC for the specified printer configuration WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst) { @@ -383,15 +309,10 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst) { // Retrieve the default device name wxString portName; -#ifdef __WXDEBUG__ - bool ret = -#else // !Debug - (void) -#endif // Debug/Release - wxGetDefaultDeviceName(devNameStr, portName); - - wxASSERT_MSG( ret, wxT("Could not get default device name.") ); - + if ( !wxGetDefaultDeviceName(devNameStr, portName) ) + { + return 0; // Could not get default device name + } deviceName = devNameStr.c_str(); } @@ -411,101 +332,64 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst) // wxPrinterDC bit blitting/bitmap drawing // ---------------------------------------------------------------------------- -// Win16 doesn't define GDI_ERROR. -#ifndef GDI_ERROR -#define GDI_ERROR -1 -#endif - -// Just in case we want to go back to using 8 bits for -// any reason: set this to 0 for 8 bits. -#define wxUSE_DRAWBITMAP_24BITS 1 - -void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp, - wxCoord x, wxCoord y, - bool useMask) +// helper of DoDrawBitmap() and DoBlit() +static +bool DrawBitmapUsingStretchDIBits(HDC hdc, + const wxBitmap& bmp, + wxCoord x, wxCoord y) { - wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") ); - - int width = bmp.GetWidth(), - height = bmp.GetHeight(); +#if wxUSE_WXDIB + wxDIB dib(bmp); + bool ok = dib.IsOk(); + if ( !ok ) + return FALSE; - if ( ::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB ) + DIBSECTION ds; + if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) ) { -#if wxUSE_DIB_FOR_BITMAP - if ( bmp.IsDIB() ) - { - DIBSECTION dib; - if ( ::GetObject(GetHbitmapOf(bmp), - sizeof(dib), - &dib) == sizeof(dib) ) - { - if ( ::StretchDIBits - ( - GetHdc(), - x, y, - width, height, - 0, 0, - width, height, - dib.dsBm.bmBits, - (LPBITMAPINFO)&dib.dsBmih, - DIB_RGB_COLORS, - SRCCOPY - ) == GDI_ERROR ) - { - wxLogLastError(wxT("StretchDIBits")); - } - } - else - { - wxLogLastError(wxT("GetObject")); - } - } - else -#endif // wxUSE_DIB_FOR_BITMAP - { - BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) ); - memset( info, 0, sizeof( BITMAPINFOHEADER ) ); + wxLogLastError(_T("GetObject(DIBSECTION)")); -#if wxUSE_DRAWBITMAP_24BITS - int iBitsSize = (((width * 3) + 3 ) & ~3 ) * height; -#else - int iBitsSize = ((width + 3 ) & ~3 ) * height ; -#endif + return FALSE; + } + + // ok, we've got all data we need, do blit it + if ( ::StretchDIBits + ( + hdc, + x, y, + ds.dsBmih.biWidth, ds.dsBmih.biHeight, + 0, 0, + ds.dsBmih.biWidth, ds.dsBmih.biHeight, + ds.dsBm.bmBits, + (LPBITMAPINFO)&ds.dsBmih, + DIB_RGB_COLORS, + SRCCOPY + ) == GDI_ERROR ) + { + wxLogLastError(wxT("StretchDIBits")); - void* bits = malloc( iBitsSize ); + return FALSE; + } - info->bmiHeader.biSize = sizeof( BITMAPINFOHEADER ); - info->bmiHeader.biWidth = width; - info->bmiHeader.biHeight = height; - info->bmiHeader.biPlanes = 1; -#if wxUSE_DRAWBITMAP_24BITS - info->bmiHeader.biBitCount = 24; + return TRUE; #else - info->bmiHeader.biBitCount = 8; + return FALSE; #endif - info->bmiHeader.biCompression = BI_RGB; +} - ScreenHDC display; - if ( GetDIBits(display, GetHbitmapOf(bmp), 0, - bmp.GetHeight(), bits, info, - DIB_RGB_COLORS) ) - { - if ( ::StretchDIBits(GetHdc(), x, y, - width, height, - 0 , 0, width, height, - bits, info, - DIB_RGB_COLORS, SRCCOPY) == GDI_ERROR ) - { - wxLogLastError(wxT("StretchDIBits")); - } - } +void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp, + wxCoord x, wxCoord y, + bool useMask) +{ + wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") ); - free(bits); - free(info); - } - } - else // no support for StretchDIBits() + int width = bmp.GetWidth(), + height = bmp.GetHeight(); + + if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) || + !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, x, y) ) { + // no support for StretchDIBits() or an error occured if we got here wxMemoryDC memDC; memDC.SelectObject(bmp); @@ -518,29 +402,29 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp, bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, - wxCoord xsrc, wxCoord ysrc, + wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc), int WXUNUSED(rop), bool useMask, wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask)) { - bool success = TRUE; - - if ( useMask ) + wxBitmap& bmp = source->GetSelectedBitmap(); + wxMask *mask = useMask ? bmp.GetMask() : NULL; + if ( mask ) { // If we are printing source colours are screen colours not printer // colours and so we need copy the bitmap pixel by pixel. RECT rect; - HDC dc_src = GetHdcOf(*source); - HDC dc_mask = ::CreateCompatibleDC(dc_src); + HDC dcSrc = GetHdcOf(*source); + MemoryHDC dcMask(dcSrc); + SelectInHDC selectMask(dcMask, (HBITMAP)mask->GetMaskBitmap()); - ::SelectObject(dc_mask, (HBITMAP) source->GetSelectedBitmap().GetMask()->GetMaskBitmap()); for (int x = 0; x < width; x++) { for (int y = 0; y < height; y++) { - COLORREF cref = ::GetPixel(dc_mask, x, y); + COLORREF cref = ::GetPixel(dcMask, x, y); if (cref) { - HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y)); + HBRUSH brush = ::CreateSolidBrush(::GetPixel(dcSrc, x, y)); rect.left = xdest + x; rect.right = rect.left + 1; rect.top = ydest + y; @@ -550,115 +434,30 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, } } } - ::SelectObject(dc_mask, 0); - ::DeleteDC(dc_mask); } else // no mask { - if ( ::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB ) + if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) || + !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, xdest, ydest) ) { - wxBitmap& bmp = source->GetSelectedBitmap(); - int width = bmp.GetWidth(), - height = bmp.GetHeight(); -#if wxUSE_DIB_FOR_BITMAP - if ( bmp.IsDIB() ) - { - DIBSECTION dib; - if( ::GetObject(GetHbitmapOf(bmp), - sizeof(dib), - &dib) == sizeof(dib) ) - { - if ( ::StretchDIBits - ( - GetHdc(), - xdest, ydest, - width, height, - xsrc, ysrc, - width, height, - dib.dsBm.bmBits, - (LPBITMAPINFO)&dib.dsBmih, - DIB_RGB_COLORS, - SRCCOPY - ) == GDI_ERROR ) - { - wxLogLastError(wxT("StretchDIBits")); - } - } - else - { - wxLogLastError(wxT("GetObject")); - } - } - else -#endif // wxUSE_DIB_FOR_BITMAP - { - BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) ); -#if wxUSE_DRAWBITMAP_24BITS - int iBitsSize = (((width * 3) + 3 ) & ~3 ) * height; -#else - int iBitsSize = ((width + 3 ) & ~3 ) * height ; -#endif - - void* bits = malloc( iBitsSize ); - - memset( info , 0 , sizeof( BITMAPINFOHEADER ) ); + // no support for StretchDIBits - info->bmiHeader.biSize = sizeof( BITMAPINFOHEADER ); - info->bmiHeader.biWidth = width; - info->bmiHeader.biHeight = height; - info->bmiHeader.biPlanes = 1; -#if wxUSE_DRAWBITMAP_24BITS - info->bmiHeader.biBitCount = 24; -#else - info->bmiHeader.biBitCount = 8; -#endif - info->bmiHeader.biCompression = BI_RGB; - - ScreenHDC display; - if ( !::GetDIBits(display, GetHbitmapOf(bmp), 0, - height, bits, info, DIB_RGB_COLORS) ) - { - wxLogLastError(wxT("GetDIBits")); - - success = FALSE; - } - - if ( success ) - { - success = ::StretchDIBits(GetHdc(), xdest, ydest, - width, height, - xsrc, ysrc, - width, height, - bits, info , - DIB_RGB_COLORS, - SRCCOPY) != GDI_ERROR; - if ( !success ) - { - wxLogLastError(wxT("StretchDIBits")); - } - } - - free(bits); - free(info); - } - } - else // no support for StretchDIBits - { // as we are printing, source colours are screen colours not // printer colours and so we need copy the bitmap pixel by pixel. - HDC dc_src = GetHdcOf(*source); + HDC dcSrc = GetHdcOf(*source); RECT rect; for (int y = 0; y < height; y++) { // optimization: draw identical adjacent pixels together. for (int x = 0; x < width; x++) { - COLORREF col = ::GetPixel(dc_src, x, y); + COLORREF col = ::GetPixel(dcSrc, x, y); HBRUSH brush = ::CreateSolidBrush( col ); rect.left = xdest + x; rect.top = ydest + y; - while( (x + 1 < width) && (::GetPixel(dc_src, x + 1, y) == col ) ) + while( (x + 1 < width) && + (::GetPixel(dcSrc, x + 1, y) == col ) ) { ++x; } @@ -671,7 +470,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, } } - return success; + return TRUE; } #endif