X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2aef89b7a675805b601e757492c982031f38d21..520e470fdd0daef09c77938db642e4583933c90d:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index bdecb6b626..7e1e5a36af 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -33,9 +33,8 @@ #include #include -#include -#if USE_COMMON_DIALOGS +#if wxUSE_COMMON_DIALOGS #include #endif @@ -386,7 +385,7 @@ void wxDC::DrawLine(long x1, long y1, long x2, long y2) CalcBoundingBox(x2, y2); } -void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc) +void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long yc) { double dx = xc-x1 ; double dy = yc-y1 ; @@ -412,7 +411,12 @@ void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc) long yyy2 = (long) (yyc+ray); if (m_brush.Ok() && m_brush.GetStyle() !=wxTRANSPARENT) { - Pie((HDC) m_hDC,xxx1,yyy1,xxx2,yyy2, + // Have to add 1 to bottom-right corner of rectangle + // to make semi-circles look right (crooked line otherwise). + // Unfortunately this is not a reliable method, depends + // on the size of shape. + // TODO: figure out why this happens! + Pie((HDC) m_hDC,xxx1,yyy1,xxx2+1,yyy2+1, xx1,yy1,xx2,yy2) ; } else @@ -643,6 +647,10 @@ void wxDC::SetFont(const wxFont& the_font) wxDebugMsg("wxDC::SetFont: Selecting HFONT %X\n", m_font.GetResourceHandle()); #endif HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); + if (f == NULL) + { + wxDebugMsg("::SelectObject failed in wxDC::SetFont."); + } if (!m_oldFont) m_oldFont = (WXHFONT) f; } @@ -711,6 +719,8 @@ void wxDC::SetBrush(const wxBrush& brush) void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit) { + // Should be unnecessary: SetFont should have done this already. +#if 0 if (m_font.Ok() && m_font.GetResourceHandle()) { #if WXDEBUG > 1 @@ -720,6 +730,7 @@ void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit) if (!m_oldFont) m_oldFont = (WXHFONT) f; } +#endif if (m_textForegroundColour.Ok()) SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ; @@ -833,31 +844,40 @@ bool wxDC::StartDoc(const wxString& message) if (!this->IsKindOf(CLASSINFO(wxPrinterDC))) return TRUE; - bool flag = FALSE; - DOCINFO docinfo; docinfo.cbSize = sizeof(DOCINFO); docinfo.lpszDocName = (const char *)message; - docinfo.lpszOutput = (const char *)m_filename; + + if (m_filename.IsEmpty()) + docinfo.lpszOutput = NULL; + else + docinfo.lpszOutput = (const char *)m_filename; + #if defined(__WIN95__) docinfo.lpszDatatype = NULL; docinfo.fwType = 0; #endif - if (m_hDC) flag = (SP_ERROR != + if (!m_hDC) + return FALSE; + + int ret = #ifndef __WIN32__ - ::StartDoc((HDC) m_hDC, &docinfo)); + ::StartDoc((HDC) m_hDC, &docinfo); #else #ifdef UNICODE - ::StartDocW((HDC) m_hDC, &docinfo)); + ::StartDocW((HDC) m_hDC, &docinfo); #else - ::StartDocA((HDC) m_hDC, &docinfo)); + ::StartDocA((HDC) m_hDC, &docinfo); #endif #endif - else flag = FALSE; - - return flag; + if (ret <= 0) + { + DWORD lastError = GetLastError(); + wxDebugMsg("wxDC::StartDoc failed with error: %d\n", lastError); + } + return (ret > 0); } void wxDC::EndDoc(void) @@ -914,8 +934,8 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y, GetTextExtentPoint((HDC) m_hDC, (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect); GetTextMetrics((HDC) m_hDC, &tm); - *x = XDEV2LOGREL(sizeRect.cx); - *y = YDEV2LOGREL(sizeRect.cy); + if (x) *x = XDEV2LOGREL(sizeRect.cx); + if (y) *y = YDEV2LOGREL(sizeRect.cy); if (descent) *descent = tm.tmDescent; if (externalLeading) *externalLeading = tm.tmExternalLeading; } @@ -1181,53 +1201,107 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height, ::SelectObject(dc_mask, 0); ::DeleteDC(dc_mask); #endif - // New code from Chris Breeze, 8/5/98 - - // create a temp buffer bitmap and DCs to access it and the mask - HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC); - HDC dc_buffer = ::CreateCompatibleDC((HDC) m_hDC); - HBITMAP buffer_bmap = ::CreateCompatibleBitmap((HDC) m_hDC, width, height); - ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); - ::SelectObject(dc_buffer, buffer_bmap); - - // copy dest to buffer - ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - (HDC) m_hDC, xdest1, ydest1, SRCCOPY); - - // copy src to buffer using selected raster op - ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - (HDC) source->m_hDC, xsrc1, ysrc1, dwRop); - - // set masked area in buffer to BLACK (pixel value 0) - COLORREF prevBkCol = ::SetBkColor((HDC) m_hDC, RGB(255, 255, 255)); - COLORREF prevCol = ::SetTextColor((HDC) m_hDC, RGB(0, 0, 0)); - ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - dc_mask, xsrc1, ysrc1, SRCAND); - - // set unmasked area in dest to BLACK - ::SetBkColor((HDC) m_hDC, RGB(0, 0, 0)); - ::SetTextColor((HDC) m_hDC, RGB(255, 255, 255)); - ::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, - dc_mask, xsrc1, ysrc1, SRCAND); - ::SetBkColor((HDC) m_hDC, prevBkCol); // restore colours to original values - ::SetTextColor((HDC) m_hDC, prevCol); - - // OR buffer to dest - success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, - dc_buffer, 0, 0, SRCPAINT) != 0); - - // tidy up temporary DCs and bitmap - ::SelectObject(dc_mask, 0); - ::DeleteDC(dc_mask); - ::SelectObject(dc_buffer, 0); - ::DeleteDC(dc_buffer); - ::DeleteObject(buffer_bmap); - } + // New code from Chris Breeze, 15/7/98 + // Blit bitmap with mask + + if (IsKindOf(CLASSINFO(wxPrinterDC))) + { + // 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_mask = ::CreateCompatibleDC((HDC) source->m_hDC); + HDC dc_src = (HDC) source->m_hDC; + + ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); + for (int x = 0; x < width; x++) + { + for (int y = 0; y < height; y++) + { + COLORREF cref = ::GetPixel(dc_mask, x, y); + if (cref) + { + 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((HDC) m_hDC, &rect, brush); + ::DeleteObject(brush); + } + } + } + ::SelectObject(dc_mask, 0); + ::DeleteDC(dc_mask); + } + else + { + // create a temp buffer bitmap and DCs to access it and the mask + HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC); + HDC dc_buffer = ::CreateCompatibleDC((HDC) m_hDC); + HBITMAP buffer_bmap = ::CreateCompatibleBitmap((HDC) m_hDC, width, height); + ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); + ::SelectObject(dc_buffer, buffer_bmap); + + // copy dest to buffer + ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + (HDC) m_hDC, xdest1, ydest1, SRCCOPY); + + // copy src to buffer using selected raster op + ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + (HDC) source->m_hDC, xsrc1, ysrc1, dwRop); + + // set masked area in buffer to BLACK (pixel value 0) + COLORREF prevBkCol = ::SetBkColor((HDC) m_hDC, RGB(255, 255, 255)); + COLORREF prevCol = ::SetTextColor((HDC) m_hDC, RGB(0, 0, 0)); + ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + dc_mask, xsrc1, ysrc1, SRCAND); + + // set unmasked area in dest to BLACK + ::SetBkColor((HDC) m_hDC, RGB(0, 0, 0)); + ::SetTextColor((HDC) m_hDC, RGB(255, 255, 255)); + ::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, + dc_mask, xsrc1, ysrc1, SRCAND); + ::SetBkColor((HDC) m_hDC, prevBkCol); // restore colours to original values + ::SetTextColor((HDC) m_hDC, prevCol); + + // OR buffer to dest + success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, + dc_buffer, 0, 0, SRCPAINT) != 0); + + // tidy up temporary DCs and bitmap + ::SelectObject(dc_mask, 0); + ::DeleteDC(dc_mask); + ::SelectObject(dc_buffer, 0); + ::DeleteDC(dc_buffer); + ::DeleteObject(buffer_bmap); + } + } } else { + if (IsKindOf(CLASSINFO(wxPrinterDC))) + { + // If we are printing source colours are screen colours + // not printer colours and so we need copy the bitmap + // pixel by pixel. + 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((HDC) m_hDC, &rect, brush); + ::DeleteObject(brush); + } + } + } + else + { success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC, xsrc1, ysrc1, dwRop) != 0); + } } ::SetTextColor((HDC)m_hDC, old_textground); ::SetBkColor((HDC)m_hDC, old_background); @@ -1251,10 +1325,6 @@ void wxDC::GetSizeMM(long *width, long *height) const *height = h; } -#if USE_SPLINES -#include "xfspline.inc" -#endif // USE_SPLINES - void wxDC::DrawPolygon(wxList *list, long xoffset, long yoffset,int fillStyle) { int n = list->Number(); @@ -1295,34 +1365,6 @@ void wxDC::SetTextBackground(const wxColour& colour) m_textBackgroundColour = colour; } -#if USE_SPLINES -// Make a 3-point spline -void wxDC::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3) -{ - wxList *point_list = new wxList; - - wxPoint *point1 = new wxPoint; - point1->x = x1; point1->y = y1; - point_list->Append((wxObject*)point1); - - wxPoint *point2 = new wxPoint; - point2->x = x2; point2->y = y2; - point_list->Append((wxObject*)point2); - - wxPoint *point3 = new wxPoint; - point3->x = x3; point3->y = y3; - point_list->Append((wxObject*)point3); - - DrawSpline(point_list); - - for(wxNode *node = point_list->First(); node; node = node->Next()) { - wxPoint *p = (wxPoint *)node->Data(); - delete p; - } - delete point_list; -} -#endif - // For use by wxWindows only, unless custom units are required. void wxDC::SetLogicalScale(double x, double y) { @@ -1366,3 +1408,279 @@ void wxDC::GetTextExtent(const wxString& string, float *x, float *y, } #endif +int wxDC::GetDepth(void) const +{ + return (int) ::GetDeviceCaps((HDC) m_hDC,BITSPIXEL); +} + +#if wxUSE_SPLINES + +// Make a 3-point spline +void wxDC::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3) +{ + wxList *point_list = new wxList; + + wxPoint *point1 = new wxPoint; + point1->x = x1; point1->y = y1; + point_list->Append((wxObject*)point1); + + wxPoint *point2 = new wxPoint; + point2->x = x2; point2->y = y2; + point_list->Append((wxObject*)point2); + + wxPoint *point3 = new wxPoint; + point3->x = x3; point3->y = y3; + point_list->Append((wxObject*)point3); + + DrawSpline(point_list); + + for(wxNode *node = point_list->First(); node; node = node->Next()) { + wxPoint *p = (wxPoint *)node->Data(); + delete p; + } + delete point_list; +} + +////#define wx_round(a) (int)((a)+.5) +//#define wx_round(a) (a) + +class wxSpline: public wxObject +{ + public: + int type; + wxList *points; + + wxSpline(wxList *list); + void DeletePoints(void); + + // Doesn't delete points + ~wxSpline(void); +}; + +void wxDC::DrawSpline(int n, wxPoint points[]) +{ + wxList list; + int i; + for (i =0; i < n; i++) + list.Append((wxObject*)&points[i]); + DrawSpline((wxList *)&list); +} + +void wx_draw_open_spline(wxDC *dc, wxSpline *spline); + +void wx_quadratic_spline(double a1, double b1, double a2, double b2, + double a3, double b3, double a4, double b4); +void wx_clear_stack(void); +int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3, + double *y3, double *x4, double *y4); +void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, + double x4, double y4); +static bool wx_spline_add_point(double x, double y); +static void wx_spline_draw_point_array(wxDC *dc); +wxSpline *wx_make_spline(int x1, int y1, int x2, int y2, int x3, int y3); + +void wxDC::DrawSpline(wxList *list) +{ + wxSpline spline(list); + + wx_draw_open_spline(this, &spline); +} + + +wxList wx_spline_point_list; + +void wx_draw_open_spline(wxDC *dc, wxSpline *spline) +{ + wxPoint *p; + double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4; + double x1, y1, x2, y2; + + wxNode *node = spline->points->First(); + p = (wxPoint *)node->Data(); + + x1 = p->x; + y1 = p->y; + + node = node->Next(); + p = (wxPoint *)node->Data(); + + x2 = p->x; + y2 = p->y; + cx1 = (double)((x1 + x2) / 2); + cy1 = (double)((y1 + y2) / 2); + cx2 = (double)((cx1 + x2) / 2); + cy2 = (double)((cy1 + y2) / 2); + + wx_spline_add_point(x1, y1); + + while ((node = node->Next()) != NULL) + { + p = (wxPoint *)node->Data(); + x1 = x2; + y1 = y2; + x2 = p->x; + y2 = p->y; + cx4 = (double)(x1 + x2) / 2; + cy4 = (double)(y1 + y2) / 2; + cx3 = (double)(x1 + cx4) / 2; + cy3 = (double)(y1 + cy4) / 2; + + wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4); + + cx1 = cx4; + cy1 = cy4; + cx2 = (double)(cx1 + x2) / 2; + cy2 = (double)(cy1 + y2) / 2; + } + + wx_spline_add_point((double)wx_round(cx1), (double)wx_round(cy1)); + wx_spline_add_point(x2, y2); + + wx_spline_draw_point_array(dc); + +} + +/********************* CURVES FOR SPLINES ***************************** + + The following spline drawing routine is from + + "An Algorithm for High-Speed Curve Generation" + by George Merrill Chaikin, + Computer Graphics and Image Processing, 3, Academic Press, + 1974, 346-349. + + and + + "On Chaikin's Algorithm" by R. F. Riesenfeld, + Computer Graphics and Image Processing, 4, Academic Press, + 1975, 304-310. + +***********************************************************************/ + +#define half(z1, z2) ((z1+z2)/2.0) +#define THRESHOLD 5 + +/* iterative version */ + +void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4, + double b4) +{ + register double xmid, ymid; + double x1, y1, x2, y2, x3, y3, x4, y4; + + wx_clear_stack(); + wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4); + + while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) { + xmid = (double)half(x2, x3); + ymid = (double)half(y2, y3); + if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD && + fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) { + wx_spline_add_point((double)wx_round(x1), (double)wx_round(y1)); + wx_spline_add_point((double)wx_round(xmid), (double)wx_round(ymid)); + } else { + wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3), + (double)half(x3, x4), (double)half(y3, y4), x4, y4); + wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2), + (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid); + } + } +} + + +/* utilities used by spline drawing routines */ + + +typedef struct wx_spline_stack_struct { + double x1, y1, x2, y2, x3, y3, x4, y4; +} + Stack; + +#define SPLINE_STACK_DEPTH 20 +static Stack wx_spline_stack[SPLINE_STACK_DEPTH]; +static Stack *wx_stack_top; +static int wx_stack_count; + +void wx_clear_stack(void) +{ + wx_stack_top = wx_spline_stack; + wx_stack_count = 0; +} + +void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4) +{ + wx_stack_top->x1 = x1; + wx_stack_top->y1 = y1; + wx_stack_top->x2 = x2; + wx_stack_top->y2 = y2; + wx_stack_top->x3 = x3; + wx_stack_top->y3 = y3; + wx_stack_top->x4 = x4; + wx_stack_top->y4 = y4; + wx_stack_top++; + wx_stack_count++; +} + +int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, + double *x3, double *y3, double *x4, double *y4) +{ + if (wx_stack_count == 0) + return (0); + wx_stack_top--; + wx_stack_count--; + *x1 = wx_stack_top->x1; + *y1 = wx_stack_top->y1; + *x2 = wx_stack_top->x2; + *y2 = wx_stack_top->y2; + *x3 = wx_stack_top->x3; + *y3 = wx_stack_top->y3; + *x4 = wx_stack_top->x4; + *y4 = wx_stack_top->y4; + return (1); +} + +static bool wx_spline_add_point(double x, double y) +{ + wxPoint *point = new wxPoint ; + point->x = (int) x; + point->y = (int) y; + wx_spline_point_list.Append((wxObject*)point); + return TRUE; +} + +static void wx_spline_draw_point_array(wxDC *dc) +{ + dc->DrawLines(&wx_spline_point_list, (double)0.0, (double)0.0); + wxNode *node = wx_spline_point_list.First(); + while (node) + { + wxPoint *point = (wxPoint *)node->Data(); + delete point; + delete node; + node = wx_spline_point_list.First(); + } +} + +wxSpline::wxSpline(wxList *list) +{ + points = list; +} + +wxSpline::~wxSpline(void) +{ +} + +void wxSpline::DeletePoints(void) +{ + for(wxNode *node = points->First(); node; node = points->First()) + { + wxPoint *point = (wxPoint *)node->Data(); + delete point; + delete node; + } + delete points; +} + + +#endif // wxUSE_SPLINES +