X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c47addef107f756f1a342d2f3f8d432e784691a2..2b0246530d08cf7724d94c70d631c166f9717c2c:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index a56e537832..cf75d3e84e 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dc.cpp -// Purpose: wxDC class +// Name: src/msw/dc.cpp +// Purpose: wxDC class for MSW port // Author: Julian Smart // Modified by: // Created: 01/02/97 @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dc.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -41,9 +37,6 @@ #include "wx/icon.h" #endif -#include "wx/msw/private.h" // needs to be before #include -#include "wx/msw/missing.h" // needs to be before #include - #include "wx/sysopt.h" #include "wx/dcprint.h" #include "wx/module.h" @@ -55,10 +48,7 @@ #include -#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__) - #include -#endif - +#include "wx/msw/wrapcdlg.h" #ifndef __WIN32__ #include #endif @@ -109,10 +99,10 @@ static const int MM_METRIC = 10; */ #ifdef __WXWINCE__ - #define XLOG2DEV(x) ((x-m_logicalOriginX)*m_signX+m_deviceOriginX) - #define YLOG2DEV(y) ((y-m_logicalOriginY)*m_signY+m_deviceOriginY) - #define XDEV2LOG(x) ((x-m_deviceOriginX)*m_signX+m_logicalOriginX) - #define YDEV2LOG(y) ((y-m_deviceOriginY)*m_signY+m_logicalOriginY) + #define XLOG2DEV(x) ((x-m_logicalOriginX)*m_signX) + #define YLOG2DEV(y) ((y-m_logicalOriginY)*m_signY) + #define XDEV2LOG(x) ((x)*m_signX+m_logicalOriginX) + #define YDEV2LOG(y) ((y)*m_signY+m_logicalOriginY) #else #define XLOG2DEV(x) (x) #define YLOG2DEV(y) (y) @@ -137,14 +127,17 @@ static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } // otherwise static bool AlphaBlt(HDC hdcDst, int x, int y, int w, int h, - HDC hdcSrc, + int srcX, int srcY, HDC hdcSrc, const wxBitmap& bmpSrc); #ifdef wxHAVE_RAW_BITMAP -// our (limited) AlphaBlend() replacement + +// our (limited) AlphaBlend() replacement for Windows versions not providing it static void -wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h, const wxBitmap& bmp); -#endif +wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h, + int srcX, int srcY, const wxBitmap& bmp); + +#endif // wxHAVE_RAW_BITMAP // ---------------------------------------------------------------------------- // private classes @@ -176,15 +169,14 @@ private: class StretchBltModeChanger { public: - StretchBltModeChanger(HDC hdc, int mode) + StretchBltModeChanger(HDC hdc, + int WXUNUSED_IN_WINCE(mode)) : m_hdc(hdc) { #ifndef __WXWINCE__ m_modeOld = ::SetStretchBltMode(m_hdc, mode); if ( !m_modeOld ) wxLogLastError(_T("SetStretchBltMode")); -#else - wxUnusedVar(mode); #endif } @@ -413,6 +405,12 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn) if ( !::GetClipBox(GetHdc(), &rectClip) ) return; + // GetClipBox returns logical coordinates, so transform to device + rectClip.left = LogicalToDeviceX(rectClip.left); + rectClip.top = LogicalToDeviceY(rectClip.top); + rectClip.right = LogicalToDeviceX(rectClip.right); + rectClip.bottom = LogicalToDeviceY(rectClip.bottom); + HRGN hrgnDest = ::CreateRectRgn(0, 0, 0, 0); HRGN hrgnClipOld = ::CreateRectRgn(rectClip.left, rectClip.top, rectClip.right, rectClip.bottom); @@ -560,16 +558,14 @@ void wxDC::Clear() #endif } -bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style) +bool wxDC::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x), + wxCoord WXUNUSED_IN_WINCE(y), + const wxColour& WXUNUSED_IN_WINCE(col), + int WXUNUSED_IN_WINCE(style)) { #ifdef __WXWINCE__ - wxUnusedVar(x); - wxUnusedVar(y); - wxUnusedVar(col); - wxUnusedVar(style); return false; #else - WXMICROWIN_CHECK_HDC_RET(false) bool success = (0 != ::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), @@ -758,7 +754,11 @@ void wxDC::DoDrawPoint(wxCoord x, wxCoord y) CalcBoundingBox(x, y); } -void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) +void wxDC::DoDrawPolygon(int n, + wxPoint points[], + wxCoord xoffset, + wxCoord yoffset, + int WXUNUSED_IN_WINCE(fillStyle)) { WXMICROWIN_CHECK_HDC @@ -778,8 +778,6 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs } #ifndef __WXWINCE__ int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING); -#else - wxUnusedVar(fillStyle); #endif (void)Polygon(GetHdc(), cpoints, n); #ifndef __WXWINCE__ @@ -914,8 +912,11 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR. if ( m_pen.GetStyle() == wxTRANSPARENT ) { + // Apparently not needed for WinCE (see e.g. Life! demo) +#ifndef __WXWINCE__ x2++; y2++; +#endif } (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); @@ -975,6 +976,105 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) CalcBoundingBox(x2, y2); } +#if wxUSE_SPLINES +void wxDC::DoDrawSpline(wxList *points) +{ +#ifdef __WXWINCE__ + // WinCE does not support ::PolyBezier so use generic version + wxDCBase::DoDrawSpline(points); +#else + // quadratic b-spline to cubic bezier spline conversion + // + // quadratic spline with control points P0,P1,P2 + // P(s) = P0*(1-s)^2 + P1*2*(1-s)*s + P2*s^2 + // + // bezier spline with control points B0,B1,B2,B3 + // B(s) = B0*(1-s)^3 + B1*3*(1-s)^2*s + B2*3*(1-s)*s^2 + B3*s^3 + // + // control points of bezier spline calculated from b-spline + // B0 = P0 + // B1 = (2*P1 + P0)/3 + // B2 = (2*P1 + P2)/3 + // B3 = P2 + + WXMICROWIN_CHECK_HDC + + wxASSERT_MSG( points, wxT("NULL pointer to spline points?") ); + + const size_t n_points = points->GetCount(); + wxASSERT_MSG( n_points > 2 , wxT("incomplete list of spline points?") ); + + const size_t n_bezier_points = n_points * 3 + 1; + POINT *lppt = (POINT *)malloc(n_bezier_points*sizeof(POINT)); + size_t bezier_pos = 0; + wxCoord x1, y1, x2, y2, cx1, cy1, cx4, cy4; + + wxList::compatibility_iterator node = points->GetFirst(); + wxPoint *p = (wxPoint *)node->GetData(); + lppt[ bezier_pos ].x = x1 = p->x; + lppt[ bezier_pos ].y = y1 = p->y; + bezier_pos++; + lppt[ bezier_pos ] = lppt[ bezier_pos-1 ]; + bezier_pos++; + + node = node->GetNext(); + p = (wxPoint *)node->GetData(); + + x2 = p->x; + y2 = p->y; + cx1 = ( x1 + x2 ) / 2; + cy1 = ( y1 + y2 ) / 2; + lppt[ bezier_pos ].x = XLOG2DEV(cx1); + lppt[ bezier_pos ].y = YLOG2DEV(cy1); + bezier_pos++; + lppt[ bezier_pos ] = lppt[ bezier_pos-1 ]; + bezier_pos++; + +#if !wxUSE_STL + while ((node = node->GetNext()) != NULL) +#else + while ((node = node->GetNext())) +#endif // !wxUSE_STL + { + p = (wxPoint *)node->GetData(); + x1 = x2; + y1 = y2; + x2 = p->x; + y2 = p->y; + cx4 = (x1 + x2) / 2; + cy4 = (y1 + y2) / 2; + // B0 is B3 of previous segment + // B1: + lppt[ bezier_pos ].x = XLOG2DEV((x1*2+cx1)/3); + lppt[ bezier_pos ].y = YLOG2DEV((y1*2+cy1)/3); + bezier_pos++; + // B2: + lppt[ bezier_pos ].x = XLOG2DEV((x1*2+cx4)/3); + lppt[ bezier_pos ].y = YLOG2DEV((y1*2+cy4)/3); + bezier_pos++; + // B3: + lppt[ bezier_pos ].x = XLOG2DEV(cx4); + lppt[ bezier_pos ].y = YLOG2DEV(cy4); + bezier_pos++; + cx1 = cx4; + cy1 = cy4; + } + + lppt[ bezier_pos ] = lppt[ bezier_pos-1 ]; + bezier_pos++; + lppt[ bezier_pos ].x = XLOG2DEV(x2); + lppt[ bezier_pos ].y = YLOG2DEV(y2); + bezier_pos++; + lppt[ bezier_pos ] = lppt[ bezier_pos-1 ]; + bezier_pos++; + + ::PolyBezier( GetHdc(), lppt, bezier_pos ); + + free(lppt); +#endif +} +#endif + // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { @@ -1062,7 +1162,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask MemoryHDC hdcMem; SelectInHDC select(hdcMem, GetHbitmapOf(bmp)); - if ( AlphaBlt(GetHdc(), x, y, width, height, hdcMem, bmp) ) + if ( AlphaBlt(GetHdc(), x, y, width, height, 0, 0, hdcMem, bmp) ) return; } @@ -1632,7 +1732,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, SIZE sizeRect; TEXTMETRIC tm; - GetTextExtentPoint(GetHdc(), string, string.length(), &sizeRect); + ::GetTextExtentPoint32(GetHdc(), string, string.length(), &sizeRect); GetTextMetrics(GetHdc(), &tm); if (x) @@ -1660,7 +1760,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con static int maxWidth = -1; int fit = 0; SIZE sz = {0,0}; - int stlen = text.Length(); + int stlen = text.length(); if (maxLenText == -1) { @@ -1672,6 +1772,8 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con widths.Empty(); widths.Add(0, stlen); // fill the array with zeros + if (stlen == 0) + return true; if (!::GetTextExtentExPoint(GetHdc(), text.c_str(), // string to check @@ -1777,7 +1879,8 @@ void wxDC::SetUserScale(double x, double y) this->SetMapMode(m_mappingMode); } -void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp) +void wxDC::SetAxisOrientation(bool WXUNUSED_IN_WINCE(xLeftRight), + bool WXUNUSED_IN_WINCE(yBottomUp)) { WXMICROWIN_CHECK_HDC @@ -1792,9 +1895,6 @@ void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp) SetMapMode(m_mappingMode); } -#else - wxUnusedVar(xLeftRight); - wxUnusedVar(yBottomUp); #endif } @@ -1838,9 +1938,7 @@ void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y) m_deviceOriginX = x; m_deviceOriginY = y; -#ifndef __WXWINCE__ ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL); -#endif } // --------------------------------------------------------------------------- @@ -1912,7 +2010,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, (m_selectedBitmap.Ok() && m_selectedBitmap.HasAlpha())) ) { if ( AlphaBlt(GetHdc(), xdest, ydest, width, height, - GetHdcOf(*source), bmpSrc) ) + xsrc, ysrc, GetHdcOf(*source), bmpSrc) ) return true; } @@ -2387,7 +2485,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule) static bool AlphaBlt(HDC hdcDst, int x, int y, int width, int height, - HDC hdcSrc, + int srcX, int srcY, HDC hdcSrc, const wxBitmap& bmp) { wxASSERT_MSG( bmp.Ok() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") ); @@ -2435,7 +2533,7 @@ static bool AlphaBlt(HDC hdcDst, bf.AlphaFormat = AC_SRC_ALPHA; if ( pfnAlphaBlend(hdcDst, x, y, width, height, - hdcSrc, 0, 0, width, height, + hdcSrc, srcX, srcY, width, height, bf) ) { // skip wxAlphaBlend() call below @@ -2444,12 +2542,14 @@ static bool AlphaBlt(HDC hdcDst, wxLogLastError(_T("AlphaBlend")); } +#else + wxUnusedVar(hdcSrc); #endif // defined(AC_SRC_OVER) // AlphaBlend() unavailable of failed: use our own (probably much slower) // implementation #ifdef wxHAVE_RAW_BITMAP - wxAlphaBlend(hdcDst, x, y, width, height, bmp); + wxAlphaBlend(hdcDst, x, y, width, height, srcX, srcY, bmp); return true; #else // !wxHAVE_RAW_BITMAP @@ -2465,14 +2565,16 @@ static bool AlphaBlt(HDC hdcDst, #ifdef wxHAVE_RAW_BITMAP static void -wxAlphaBlend(HDC hdcDst, int xDst, int yDst, int w, int h, const wxBitmap& bmpSrc) +wxAlphaBlend(HDC hdcDst, int xDst, int yDst, + int w, int h, + int srcX, int srcY, const wxBitmap& bmpSrc) { // get the destination DC pixels wxBitmap bmpDst(w, h, 32 /* force creating RGBA DIB */); MemoryHDC hdcMem; SelectInHDC select(hdcMem, GetHbitmapOf(bmpDst)); - if ( !::BitBlt(hdcMem, 0, 0, w, h, hdcDst, 0, 0, SRCCOPY) ) + if ( !::BitBlt(hdcMem, 0, 0, w, h, hdcDst, xDst, yDst, SRCCOPY) ) { wxLogLastError(_T("BitBlt")); } @@ -2487,6 +2589,8 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst, int w, int h, const wxBitmap& bmpSr wxAlphaPixelData::Iterator pDst(dataDst), pSrc(dataSrc); + pSrc.Offset(dataSrc, srcX, srcY); + for ( int y = 0; y < h; y++ ) { wxAlphaPixelData::Iterator pDstRowStart = pDst,