X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d120f8391920145647ec10e84629bc21fa9f1bb..6a44bffd1ac68163e4c1cfe8aa8fe4f7f98a02e7:/src/motif/dcclient.cpp diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp index 3997b771da..f442f9ebca 100644 --- a/src/motif/dcclient.cpp +++ b/src/motif/dcclient.cpp @@ -6,43 +6,62 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /* -About pens, brushes, and the autoSetting flag: - - Under X, pens and brushes control some of the same X drawing - parameters. Therefore, it is impossible to independently maintain - the current pen and the current brush. Also, some settings depend - on the current logical function. The m_currentFill, etc. instance - variables remember state across the brush and pen. - - Since pens are used more than brushes, the autoSetting flag - is used to indicate that a brush was recently used, and SetPen - must be called to reinstall the current pen's parameters. - If autoSetting includes 0x2, then the pens color may need - to be set based on XOR. - - There is, unfortunately, some confusion between setting the - current pen/brush and actually installing the brush/pen parameters. - Both functionalies are perform by SetPen and SetBrush. C'est la vie. + About pens, brushes, and the autoSetting flag: + + Under X, pens and brushes control some of the same X drawing parameters. + Therefore, it is impossible to independently maintain the current pen and the + current brush. Also, some settings depend on the current logical function. The + m_currentFill, etc. instance variables remember state across the brush and + pen. + + Since pens are used more than brushes, the autoSetting flag is used to + indicate that a brush was recently used, and SetPen must be called to + reinstall the current pen's parameters. If autoSetting includes 0x2, then the + pens color may need to be set based on XOR. + + There is, unfortunately, some confusion between setting the current pen/brush + and actually installing the brush/pen parameters. Both functionalies are + perform by SetPen and SetBrush. C'est la vie. */ +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "dcclient.h" + #pragma implementation "dcclient.h" #endif #include "wx/dcclient.h" #include "wx/dcmemory.h" #include "wx/window.h" #include "wx/app.h" +#include "wx/image.h" + #include +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "wx/motif/private.h" +#ifdef __EMX__ + #include // for M_PI +#endif // __EMX__ + #include "bdiag.xbm" #include "fdiag.xbm" #include "cdiag.xbm" @@ -52,27 +71,61 @@ About pens, brushes, and the autoSetting flag: static Pixmap bdiag, cdiag, fdiag, cross, horiz, verti; -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // constants -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- -#define RAD2DEG 57.2957795131 - -// Fudge factor. Obsolete? -// No. Robert Roebling +// Fudge factor (VZ: what??) #define WX_GC_CF 1 -//----------------------------------------------------------------------------- -// wxWindowDC -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) -IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) -IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) -#endif + IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) + IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) + IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) + +// ---------------------------------------------------------------------------- +// prototypes +// ---------------------------------------------------------------------------- + +static void XCopyRemote(Display *src_display, Display *dest_display, + Drawable src, Drawable dest, + GC destgc, + int srcx, int srcy, + unsigned int w, unsigned int h, + int destx, int desty, + bool more, XImage **cache); + +// ============================================================================ +// implementation +// ============================================================================ + +/* + * compare two doubles and return the larger rounded + * to the nearest int + */ +static int roundmax(double a, double b) +{ + return (int)((a > b ? a : b) + 0.5); +} + +/* + * compare two doubles and return the smaller rounded + * to the nearest int + */ +static int roundmin(double a, double b) +{ + return (int)((a < b ? a : b) - 0.5); +} + + +// ---------------------------------------------------------------------------- +// wxWindowDC +// ---------------------------------------------------------------------------- -wxWindowDC::wxWindowDC(void) +wxWindowDC::wxWindowDC() { m_gc = (WXGC) 0; m_gcBacking = (WXGC) 0; @@ -81,7 +134,7 @@ wxWindowDC::wxWindowDC(void) m_currentPenWidth = 1; m_currentPenJoin = -1; m_currentPenDashCount = -1; - m_currentPenDash = (char*) NULL; + m_currentPenDash = (wxMOTIFDash*) NULL; m_currentStyle = -1; m_currentFill = -1; // m_currentBkMode = wxTRANSPARENT; @@ -92,20 +145,21 @@ wxWindowDC::wxWindowDC(void) m_pixmap = (WXPixmap) 0; m_autoSetting = 0; m_oldFont = (WXFont) 0; -}; +} wxWindowDC::wxWindowDC( wxWindow *window ) { wxASSERT_MSG( (window != (wxWindow*) NULL), "You must pass a valid wxWindow to wxWindowDC/wxClientDC/wxPaintDC constructor." ); - + m_window = window; + m_font = window->GetFont(); m_gc = (WXGC) 0; m_gcBacking = (WXGC) 0; m_backgroundPixel = -1; m_currentPenWidth = 1; m_currentPenJoin = -1; m_currentPenDashCount = -1; - m_currentPenDash = (char*) NULL; + m_currentPenDash = (wxMOTIFDash*) NULL; m_currentStyle = -1; m_currentFill = -1; // m_currentBkMode = wxTRANSPARENT; @@ -114,111 +168,122 @@ wxWindowDC::wxWindowDC( wxWindow *window ) m_userRegion = (WXRegion) 0; m_ok = TRUE; m_autoSetting = 0; - + m_display = window->GetXDisplay(); m_pixmap = window->GetXWindow(); Display* display = (Display*) m_display; - + XSetWindowColormap (display, (Pixmap) m_pixmap, (Colormap) wxTheApp->GetMainColormap(m_display)); - + XGCValues gcvalues; gcvalues.foreground = BlackPixel (display, DefaultScreen (display)); gcvalues.background = WhitePixel (display, DefaultScreen (display)); gcvalues.graphics_exposures = False; + gcvalues.subwindow_mode = IncludeInferiors; gcvalues.line_width = 1; m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)), - GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth, + GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode, &gcvalues); - + if (m_window->GetBackingPixmap()) { m_gcBacking = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)), - GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth, + GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode, &gcvalues); } - + m_backgroundPixel = (int) gcvalues.background; - + // Get the current Font so we can set it back later XGCValues valReturn; XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn); m_oldFont = (WXFont) valReturn.font; -}; -wxWindowDC::~wxWindowDC(void) + SetBackground(wxBrush(m_window->GetBackgroundColour(), wxSOLID)); +} + +wxWindowDC::~wxWindowDC() { if (m_gc && (m_oldFont != (WXFont) 0) && ((long) m_oldFont != -1)) { XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont); - + if (m_window && m_window->GetBackingPixmap()) XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont); } - + if (m_gc) XFreeGC ((Display*) m_display, (GC) m_gc); m_gc = (WXGC) 0; - + if (m_gcBacking) XFreeGC ((Display*) m_display, (GC) m_gcBacking); m_gcBacking = (WXGC) 0; - + if (m_currentRegion) XDestroyRegion ((Region) m_currentRegion); m_currentRegion = (WXRegion) 0; - + if (m_userRegion) XDestroyRegion ((Region) m_userRegion); m_userRegion = (WXRegion) 0; -}; +} -void wxWindowDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1), +void wxWindowDC::DoFloodFill( wxCoord WXUNUSED(x1), wxCoord WXUNUSED(y1), const wxColour& WXUNUSED(col), int WXUNUSED(style) ) { - // TODO -}; + wxFAIL_MSG("not implemented"); +} -bool wxWindowDC::GetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXUNUSED(col) ) const +bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const { - // TODO - return FALSE; -}; + // Generic (and therefore rather inefficient) method. + // Could be improved. + wxMemoryDC memdc; + wxBitmap bitmap(1, 1); + memdc.SelectObject(bitmap); + memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1); + memdc.SelectObject(wxNullBitmap); + wxImage image(bitmap); + col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0)); + return TRUE; +} -void wxWindowDC::DrawLine( long x1, long y1, long x2, long y2 ) +void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + int x1d, y1d, x2d, y2d; - + // FreeGetPixelCache(); - + x1d = XLOG2DEV(x1); y1d = YLOG2DEV(y1); x2d = XLOG2DEV(x2); y2d = YLOG2DEV(y2); - + if (m_autoSetting) SetPen (m_pen); - + XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, x1d, y1d, x2d, y2d); - + if (m_window && m_window->GetBackingPixmap()) - XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, + XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, XLOG2DEV_2(x1), YLOG2DEV_2(y1), XLOG2DEV_2(x2), YLOG2DEV_2(y2)); - + CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); -}; +} -void wxWindowDC::CrossHair( long x, long y ) +void wxWindowDC::DoCrossHair( wxCoord x, wxCoord y ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + if (m_autoSetting) SetPen (m_pen); - + int xx = XLOG2DEV (x); int yy = YLOG2DEV (y); int ww, hh; @@ -227,7 +292,7 @@ void wxWindowDC::CrossHair( long x, long y ) ww, yy); XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xx, 0, xx, hh); - + if (m_window && m_window->GetBackingPixmap()) { xx = XLOG2DEV_2 (x); @@ -239,14 +304,14 @@ void wxWindowDC::CrossHair( long x, long y ) xx, 0, xx, hh); } -}; +} -void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc ) +void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + // FreeGetPixelCache(); - + int xx1 = XLOG2DEV (x1); int yy1 = YLOG2DEV (y1); int xx2 = XLOG2DEV (x2); @@ -255,14 +320,14 @@ void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc ) int yyc = YLOG2DEV (yc); int xxc_2 = XLOG2DEV_2 (xc); int yyc_2 = YLOG2DEV_2 (yc); - - long dx = xx1 - xxc; - long dy = yy1 - yyc; - double radius = sqrt (dx * dx + dy * dy); - long r = (long) radius; - + + wxCoord dx = xx1 - xxc; + wxCoord dy = yy1 - yyc; + double radius = sqrt ((double)(dx * dx + dy * dy)); + wxCoord r = (wxCoord) radius; + double radius1, radius2; - + if (xx1 == xx2 && yy1 == yy2) { radius1 = 0.0; @@ -279,7 +344,7 @@ void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc ) radius1 = -90.0; else radius1 = -atan2 ((double) (yy1 - yyc), (double) (xx1 - xxc)) * 360.0 / (2 * M_PI); - + if (xx2 - xxc == 0) if (yy2 - yyc < 0) radius2 = 90.0; @@ -296,45 +361,45 @@ void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc ) alpha2 += 360 * 64; while (alpha2 > 360 * 64) alpha2 -= 360 * 64; - + if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT) { SetBrush (m_brush); XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) (GC) m_gc, xxc - r, yyc - r, 2 * r, 2 * r, alpha1, alpha2); - + if (m_window && m_window->GetBackingPixmap()) XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, xxc_2 - r, yyc_2 - r, 2 * r, 2 * r, alpha1, alpha2); - + } - + if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT) { if (m_autoSetting) SetPen (m_pen); XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xxc - r, yyc - r, 2 * r, 2 * r, alpha1, alpha2); - + if (m_window && m_window->GetBackingPixmap()) XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, xxc_2 - r, yyc_2 - r, 2 * r, 2 * r, alpha1, alpha2); } CalcBoundingBox (x1, y1); CalcBoundingBox (x2, y2); -}; +} -void wxWindowDC::DrawEllipticArc( long x, long y, long width, long height, double sa, double ea ) +void wxWindowDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + int xd, yd, wd, hd; - + xd = XLOG2DEV(x); yd = YLOG2DEV(y); wd = XLOG2DEVREL(width); hd = YLOG2DEVREL(height); - + if (sa>=360 || sa<=-360) sa=sa-int(sa/360)*360; if (ea>=360 || ea<=-360) ea=ea-int(ea/360)*360; int start = int(sa*64); @@ -343,19 +408,19 @@ void wxWindowDC::DrawEllipticArc( long x, long y, long width, long height, doubl if (end <0) end +=360*64; if (end>start) end-=start; else end+=360*64-start; - + if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT) { m_autoSetting = TRUE; // must be reset - + SetBrush (m_brush); XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, start, end); - + if (m_window && m_window->GetBackingPixmap()) XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y),wd,hd,start,end); } - + if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT) { if (m_autoSetting) @@ -367,45 +432,45 @@ void wxWindowDC::DrawEllipticArc( long x, long y, long width, long height, doubl } CalcBoundingBox (x, y); CalcBoundingBox (x + width, y + height); -}; +} -void wxWindowDC::DrawPoint( long x, long y ) +void wxWindowDC::DoDrawPoint( wxCoord x, wxCoord y ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + // FreeGetPixelCache(); - + if (m_pen.Ok() && m_autoSetting) SetPen (m_pen); - + XDrawPoint ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y)); if (m_window && m_window->GetBackingPixmap()) XDrawPoint ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y)); - + CalcBoundingBox (x, y); -}; +} -void wxWindowDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset ) +void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + // FreeGetPixelCache(); - + if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT) { if (m_autoSetting) SetPen (m_pen); - + XPoint *xpoints = new XPoint[n]; int i; - + for (i = 0; i < n; i++) { xpoints[i].x = XLOG2DEV (points[i].x + xoffset); xpoints[i].y = YLOG2DEV (points[i].y + yoffset); } XDrawLines ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xpoints, n, 0); - + if (m_window && m_window->GetBackingPixmap()) { for (i = 0; i < n; i++) @@ -417,32 +482,15 @@ void wxWindowDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset } delete[]xpoints; } -}; +} -void wxWindowDC::DrawLines( wxList *list, long xoffset, long yoffset ) +void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], + wxCoord xoffset, wxCoord yoffset, int fillStyle ) { - if (!Ok()) return; - - if (m_pen.GetStyle() == wxTRANSPARENT) return; - - int n = list->Number(); - wxPoint *points = new wxPoint[n]; - - int i = 0; - for(wxNode *node = list->First(); node; node = node->Next()) { - wxPoint *point = (wxPoint *)node->Data(); - points[i].x = point->x; - points[i++].y = point->y; - } - DrawLines(n, points, xoffset, yoffset); - delete []points; -}; + wxCHECK_RET( Ok(), "invalid dc" ); -void wxWindowDC::DrawPolygon( int n, wxPoint points[], - long xoffset, long yoffset, int fillStyle ) -{ // FreeGetPixelCache(); - + XPoint *xpoints1 = new XPoint[n + 1]; XPoint *xpoints2 = new XPoint[n + 1]; int i; @@ -454,13 +502,13 @@ void wxWindowDC::DrawPolygon( int n, wxPoint points[], xpoints2[i].y = YLOG2DEV_2 (points[i].y + yoffset); CalcBoundingBox (points[i].x + xoffset, points[i].y + yoffset); } - + // Close figure for XDrawLines (not needed for XFillPolygon) xpoints1[i].x = xpoints1[0].x; xpoints1[i].y = xpoints1[0].y; xpoints2[i].x = xpoints2[0].x; xpoints2[i].y = xpoints2[0].y; - + if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT) { SetBrush (m_brush); @@ -475,75 +523,57 @@ void wxWindowDC::DrawPolygon( int n, wxPoint points[], XSetFillRule ((Display*) m_display,(GC) m_gcBacking, EvenOddRule); // default mode } } - + if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT) { if (m_autoSetting) SetPen (m_pen); XDrawLines ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xpoints1, n + 1, 0); - + if (m_window && m_window->GetBackingPixmap()) XDrawLines ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xpoints2, n + 1, 0); } - + delete[]xpoints1; delete[]xpoints2; -}; +} -void wxWindowDC::DrawPolygon( wxList *list, long xoffset, - long yoffset, int fillStyle ) +void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - if (!Ok()) return; - - int n = list->Number(); - wxPoint *points = new wxPoint[n]; - - int i = 0; - for(wxNode *node = list->First(); node; node = node->Next()) { - wxPoint *point = (wxPoint *)node->Data(); - points[i].x = point->x; - points[i++].y = point->y; - } - DrawPolygon(n, points, xoffset, yoffset,fillStyle); - delete[] points; -}; + wxCHECK_RET( Ok(), "invalid dc" ); -void wxWindowDC::DrawRectangle( long x, long y, long width, long height ) -{ - if (!Ok()) return; - // FreeGetPixelCache(); - + int xd, yd, wfd, hfd, wd, hd; - + xd = XLOG2DEV(x); yd = YLOG2DEV(y); wfd = XLOG2DEVREL(width); wd = wfd - WX_GC_CF; hfd = YLOG2DEVREL(height); hd = hfd - WX_GC_CF; - + if (wfd == 0 || hfd == 0) return; if (wd < 0) { wd = - wd; xd = xd - wd; } if (hd < 0) { hd = - hd; yd = yd - hd; } - + if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT) { SetBrush (m_brush); XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wfd, hfd); - + if (m_window && m_window->GetBackingPixmap()) XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y), wfd, hfd); } - + if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT) { if (m_autoSetting) SetPen (m_pen); XDrawRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd); - + if (m_window && m_window->GetBackingPixmap()) XDrawRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y), @@ -551,27 +581,27 @@ void wxWindowDC::DrawRectangle( long x, long y, long width, long height ) } CalcBoundingBox (x, y); CalcBoundingBox (x + width, y + height); -}; +} -void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, double radius ) +void wxWindowDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + // FreeGetPixelCache(); - + // If radius is negative, it's a proportion of the smaller dimension. - + if (radius < 0.0) radius = - radius * ((width < height) ? width : height); - + int xd = XLOG2DEV (x); int yd = YLOG2DEV (y); int rd = XLOG2DEVREL ((long) radius); int wd = XLOG2DEVREL (width) - WX_GC_CF; int hd = YLOG2DEVREL (height) - WX_GC_CF; - + int rw_d = rd * 2; int rh_d = rw_d; - + // If radius is zero use DrawRectangle() instead to avoid // X drawing errors with small radii if (rd == 0) @@ -579,10 +609,10 @@ void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, DrawRectangle( x, y, width, height ); return; } - + // Draw nothing if transformed w or h is 0 if (wd == 0 || hd == 0) return; - + // CMB: adjust size if outline is drawn otherwise the result is // 1 pixel too wide and high if (m_pen.GetStyle() != wxTRANSPARENT) @@ -590,32 +620,32 @@ void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, wd--; hd--; } - + // CMB: ensure dd is not larger than rectangle otherwise we // get an hour glass shape if (rw_d > wd) rw_d = wd; if (rw_d > hd) rw_d = hd; rd = rw_d / 2; - + // For backing pixmap int xd2 = XLOG2DEV_2 (x); int yd2 = YLOG2DEV_2 (y); int rd2 = XLOG2DEVREL ((long) radius); int wd2 = XLOG2DEVREL (width) ; int hd2 = YLOG2DEVREL (height) ; - + int rw_d2 = rd2 * 2; int rh_d2 = rw_d2; - + if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT) { SetBrush (m_brush); - + XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + rd, yd, wd - rw_d, hd); XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + rd, wd, hd - rh_d); - + // Arcs start from 3 o'clock, positive angles anticlockwise // Top-left XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, @@ -632,14 +662,14 @@ void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, // Bottom-left XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + hd - rh_d, rw_d, rh_d, 180 * 64, 90 * 64); - + if (m_window && m_window->GetBackingPixmap()) { XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xd2 + rd2, yd2, wd2 - rw_d2, hd2); XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xd2, yd2 + rd2, wd2, hd2 - rh_d2); - + XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xd2, yd2, rw_d2, rh_d2, 90 * 64, 90 * 64); XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, @@ -656,7 +686,7 @@ void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, rw_d2, rh_d2, 180 * 64, 90 * 64); } } - + if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT) { SetPen (m_pen); @@ -664,7 +694,7 @@ void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, xd + wd - rd + 1, yd); XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + rd, yd + hd, xd + wd - rd, yd + hd); - + XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + rd, xd, yd + hd - rd); XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd, yd + rd, @@ -679,7 +709,7 @@ void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, rw_d, rh_d, 269 * 64, 92 * 64); XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + hd - rh_d, rw_d, rh_d, 180 * 64, 90 * 64); - + if (m_window && m_window->GetBackingPixmap()) { XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, @@ -688,7 +718,7 @@ void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xd2 + rd2, yd2 + hd2, xd2 + wd2 - rd2, yd2 + hd2); - + XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xd2, yd2 + rd2, xd2, yd2 + hd2 - rd2); @@ -713,38 +743,38 @@ void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, } CalcBoundingBox (x, y); CalcBoundingBox (x + width, y + height); - - -}; -void wxWindowDC::DrawEllipse( long x, long y, long width, long height ) + +} + +void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + // Check for negative width and height if (height < 0) { y = y + height; height = - height ; } - + if (width < 0) { x = x + width; width = - width ; } - + // FreeGetPixelCache(); - + static const int angle = 23040; - + int xd, yd, wd, hd; - + xd = XLOG2DEV(x); yd = YLOG2DEV(y); wd = XLOG2DEVREL(width) ; hd = YLOG2DEVREL(height) ; - + if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT) { SetBrush (m_brush); @@ -755,7 +785,7 @@ void wxWindowDC::DrawEllipse( long x, long y, long width, long height ) XLOG2DEVREL (width) - WX_GC_CF, YLOG2DEVREL (height) - WX_GC_CF, 0, angle); } - + if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT) { if (m_autoSetting) @@ -769,106 +799,28 @@ void wxWindowDC::DrawEllipse( long x, long y, long width, long height ) } CalcBoundingBox (x, y); CalcBoundingBox (x + width, y + height); - -}; -bool wxWindowDC::CanDrawBitmap(void) const -{ - return TRUE; -}; - -/* Used when copying between drawables on different (Display*) m_displays. -Not very fast, but better than giving up. -*/ +} -static void XCopyRemote(Display *src_display, Display *dest_display, - Drawable src, Drawable dest, - GC destgc, - int srcx, int srcy, - unsigned int w, unsigned int h, - int destx, int desty, - bool more, XImage **cache) +bool wxWindowDC::CanDrawBitmap() const { - XImage *image, *destimage; - Colormap destcm, srccm; -#define CACHE_SIZE 256 - unsigned int i, j; - unsigned long cachesrc[CACHE_SIZE], cachedest[CACHE_SIZE]; - int k, cache_pos, all_cache; - - if (!cache || !*cache) - image = XGetImage(src_display, src, srcx, srcy, w, h, AllPlanes, ZPixmap); - else - image = *cache; - - destimage = XGetImage(dest_display, dest, destx, desty, w, h, AllPlanes, ZPixmap); - - srccm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) src_display); - destcm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dest_display); - - cache_pos = 0; - all_cache = FALSE; - - for (i = 0; i < w; i++) - for (j = 0; j < h; j++) { - unsigned long pixel; - XColor xcol; - - pixel = XGetPixel(image, i, j); - for (k = cache_pos; k--; ) - if (cachesrc[k] == pixel) { - pixel = cachedest[k]; - goto install; - } - if (all_cache) - for (k = CACHE_SIZE; k-- > cache_pos; ) - if (cachesrc[k] == pixel) { - pixel = cachedest[k]; - goto install; - } - - cachesrc[cache_pos] = xcol.pixel = pixel; - XQueryColor(src_display, srccm, &xcol); - if (!XAllocColor(dest_display, destcm, &xcol)) - xcol.pixel = 0; - cachedest[cache_pos] = pixel = xcol.pixel; - - if (++cache_pos >= CACHE_SIZE) { - cache_pos = 0; - all_cache = TRUE; - } - -install: - XPutPixel(destimage, i, j, pixel); - } - - XPutImage(dest_display, dest, destgc, destimage, 0, 0, destx, desty, w, h); - XDestroyImage(destimage); - - if (more) - *cache = image; - else - XDestroyImage(image); + wxCHECK_MSG( Ok(), FALSE, "invalid dc" ); + + return TRUE; } -void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y) -{ - if (!Ok()) return; - - if (!icon.Ok()) return; - - DrawBitmap(icon, x, y, TRUE); - #if 0 +void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y) +{ // FreeGetPixelCache(); - + // Be sure that foreground pixels (1) of // the Icon will be painted with pen colour. [m_pen.SetColour()] // Background pixels (0) will be painted with // last selected background color. [::SetBackground] if (m_pen.Ok() && m_autoSetting) SetPen (m_pen); - + int width, height; Pixmap iconPixmap = (Pixmap) icon.GetPixmap(); width = icon.GetWidth(); @@ -887,8 +839,8 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y) 0, 0, width, height, (int) XLOG2DEV (x), (int) YLOG2DEV (y)); } - - + + if (m_window && m_window->GetBackingPixmap()) { if (icon.GetDepth() <= 1) @@ -914,41 +866,81 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y) (int) XLOG2DEV (x), (int) YLOG2DEV (y), FALSE, &cache); } CalcBoundingBox (x, y); -#endif -}; +} +#endif // 0 -bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, - wxDC *source, long xsrc, long ysrc, int rop, bool useMask ) +// TODO: use scaled Blit e.g. as per John Price's implementation in Contrib/Utilities +bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, + wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask, + wxCoord xsrcMask, wxCoord ysrcMask ) { - if (!Ok()) return FALSE; - - wxASSERT_MSG( (source->IsKindOf(CLASSINFO(wxWindowDC))), "Blit source DC must be wxWindowDC or derived class." ); - - wxWindowDC* sourceDC = (wxWindowDC*) source; - + wxCHECK_MSG( Ok(), FALSE, "invalid dc" ); + + wxWindowDC* sourceDC = wxDynamicCast(source, wxWindowDC); + + wxASSERT_MSG( sourceDC, "Blit source DC must be wxWindowDC or derived class." ); + // FreeGetPixelCache(); - - // Be sure that foreground pixels (1) of - // the Icon will be painted with pen colour. [m_pen.SetColour()] - // Background pixels (0) will be painted with + + // Be sure that foreground pixels (1) of the Icon will be painted with pen + // colour. [m_pen.SetColour()] Background pixels (0) will be painted with // last selected background color. [::SetBackground] if (m_pen.Ok() && m_autoSetting) SetPen (m_pen); - - if (m_pixmap && sourceDC->m_pixmap) + + // Do bitmap scaling if necessary + + wxBitmap *scaledBitmap = (wxBitmap*) NULL; + Pixmap sourcePixmap = (Pixmap) NULL; + double scaleX, scaleY; + GetUserScale(& scaleX, & scaleY); + + /* TODO: use the mask origin when drawing transparently */ + if (xsrcMask == -1 && ysrcMask == -1) + { + xsrcMask = xsrc; ysrcMask = ysrc; + } + + // Sorry, can't scale masks just yet + if (!useMask && (scaleX != 1.0 || scaleY != 1.0) && sourceDC->IsKindOf(CLASSINFO(wxMemoryDC))) + { + wxMemoryDC* memDC = (wxMemoryDC*) sourceDC; + wxBitmap& bitmap = memDC->GetBitmap(); + + wxASSERT_MSG( (bitmap.Ok()), "Bad source bitmap in wxWindowDC::Blit"); + + wxImage image(bitmap); + if (!image.Ok()) + { + sourcePixmap = (Pixmap) bitmap.GetPixmap(); + } + else + { + int scaledW = (int) (bitmap.GetWidth() * scaleX); + int scaledH = (int) (bitmap.GetHeight() * scaleY); + + image = image.Scale(scaledW, scaledH); + scaledBitmap = new wxBitmap(image.ConvertToBitmap()); + sourcePixmap = (Pixmap) scaledBitmap->GetPixmap(); + } + } + else + sourcePixmap = (Pixmap) sourceDC->m_pixmap; + + if (m_pixmap && sourcePixmap) { /* MATTHEW: [9] */ int orig = m_logicalFunction; - + SetLogicalFunction (rop); - + if (m_display != sourceDC->m_display) { XImage *cache = NULL; - + if (m_window && m_window->GetBackingPixmap()) XCopyRemote((Display*) sourceDC->m_display, (Display*) m_display, - (Pixmap) sourceDC->m_pixmap, (Pixmap) m_window->GetBackingPixmap(), + (Pixmap) sourcePixmap, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, source->LogicalToDeviceX (xsrc), source->LogicalToDeviceY (ysrc), @@ -956,7 +948,7 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, source->LogicalToDeviceYRel(height), XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest), TRUE, &cache); - + if ( useMask && source->IsKindOf(CLASSINFO(wxMemoryDC)) ) { wxMemoryDC *memDC = (wxMemoryDC *)source; @@ -967,21 +959,21 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, XSetClipOrigin ((Display*) m_display, (GC) m_gc, XLOG2DEV (xdest), YLOG2DEV (ydest)); } } - - XCopyRemote((Display*) sourceDC->m_display, (Display*) m_display, (Pixmap) sourceDC->m_pixmap, (Pixmap) m_pixmap, (GC) m_gc, + + XCopyRemote((Display*) sourceDC->m_display, (Display*) m_display, (Pixmap) sourcePixmap, (Pixmap) m_pixmap, (GC) m_gc, source->LogicalToDeviceX (xsrc), source->LogicalToDeviceY (ysrc), source->LogicalToDeviceXRel(width), source->LogicalToDeviceYRel(height), XLOG2DEV (xdest), YLOG2DEV (ydest), FALSE, &cache); - + if ( useMask ) { XSetClipMask ((Display*) m_display, (GC) m_gc, None); XSetClipOrigin ((Display*) m_display, (GC) m_gc, 0, 0); } - + } else { if (m_window && m_window->GetBackingPixmap()) @@ -989,7 +981,7 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, // +++ MARKUS (mho@comnets.rwth-aachen): error on blitting bitmaps with depth 1 if (source->IsKindOf(CLASSINFO(wxMemoryDC)) && ((wxMemoryDC*) source)->GetBitmap().GetDepth() == 1) { - XCopyPlane ((Display*) m_display, (Pixmap) sourceDC->m_pixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, + XCopyPlane ((Display*) m_display, (Pixmap) sourcePixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, source->LogicalToDeviceX (xsrc), source->LogicalToDeviceY (ysrc), source->LogicalToDeviceXRel(width), @@ -998,7 +990,7 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, } else { - XCopyArea ((Display*) m_display, (Pixmap) sourceDC->m_pixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, + XCopyArea ((Display*) m_display, (Pixmap) sourcePixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, source->LogicalToDeviceX (xsrc), source->LogicalToDeviceY (ysrc), source->LogicalToDeviceXRel(width), @@ -1016,12 +1008,12 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, XSetClipOrigin ((Display*) m_display, (GC) m_gc, XLOG2DEV (xdest), YLOG2DEV (ydest)); } } - + // Check if we're copying from a mono bitmap if (source->IsKindOf(CLASSINFO(wxMemoryDC)) && ((wxMemoryDC*)source)->GetBitmap().Ok() && (((wxMemoryDC*)source)->GetBitmap().GetDepth () == 1)) { - XCopyPlane ((Display*) m_display, (Pixmap) sourceDC->m_pixmap, (Pixmap) m_pixmap, (GC) m_gc, + XCopyPlane ((Display*) m_display, (Pixmap) sourcePixmap, (Pixmap) m_pixmap, (GC) m_gc, source->LogicalToDeviceX (xsrc), source->LogicalToDeviceY (ysrc), source->LogicalToDeviceXRel(width), @@ -1030,77 +1022,67 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, } else { - XCopyArea ((Display*) m_display, (Pixmap) sourceDC->m_pixmap, (Pixmap) m_pixmap, (GC) m_gc, + XCopyArea ((Display*) m_display, (Pixmap) sourcePixmap, (Pixmap) m_pixmap, (GC) m_gc, source->LogicalToDeviceX (xsrc), source->LogicalToDeviceY (ysrc), source->LogicalToDeviceXRel(width), source->LogicalToDeviceYRel(height), XLOG2DEV (xdest), YLOG2DEV (ydest)); - + } if ( useMask ) { XSetClipMask ((Display*) m_display, (GC) m_gc, None); XSetClipOrigin ((Display*) m_display, (GC) m_gc, 0, 0); } - + } /* Remote/local (Display*) m_display */ CalcBoundingBox (xdest, ydest); CalcBoundingBox (xdest + width, ydest + height); - + SetLogicalFunction(orig); - + + if (scaledBitmap) delete scaledBitmap; + return TRUE; } - return FALSE; -}; + if (scaledBitmap) delete scaledBitmap; -/* Helper function for 16-bit fonts */ -static int str16len(const char *s) -{ - int count = 0; - - while (s[0] && s[1]) { - count++; - s += 2; - } - - return count; + return FALSE; } -void wxWindowDC::DrawText( const wxString &text, long x, long y, bool use16 ) +void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) { - if (!Ok()) return; - - // Since X draws from the baseline of the text, must - // add the text height + wxCHECK_RET( Ok(), "invalid dc" ); + + // Since X draws from the baseline of the text, must add the text height int cx = 0; int cy = 0; int ascent = 0; int slen; - - if (use16) - slen = str16len(text); - else - slen = strlen(text); - + + slen = strlen(text); + if (m_font.Ok()) { WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display); int direction, descent; XCharStruct overall_return; +#if 0 if (use16) (void)XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *)(const char*) text, slen, &direction, &ascent, &descent, &overall_return); else +#endif // 0 (void)XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) text, slen, &direction, - &ascent, &descent, &overall_return); + &ascent, &descent, &overall_return); + cx = overall_return.width; cy = ascent + descent; } - - // First draw a rectangle representing the text background, - // if a text background is specified + + // First draw a rectangle representing the text background, if a text + // background is specified if (m_textBackgroundColour.Ok () && (m_backgroundMode != wxTRANSPARENT)) { wxColour oldPenColour = m_currentColour; @@ -1109,17 +1091,17 @@ void wxWindowDC::DrawText( const wxString &text, long x, long y, bool use16 ) (oldPenColour.Red () == m_textBackgroundColour.Red ()) && (oldPenColour.Blue () == m_textBackgroundColour.Blue ()) && (oldPenColour.Green () == m_textBackgroundColour.Green ())); - + // This separation of the big && test required for gcc2.7/HP UX 9.02 // or pixel value can be corrupted! sameColour = (sameColour && (oldPenColour.GetPixel() == m_textBackgroundColour.GetPixel())); - + if (!sameColour || !GetOptimization()) { int pixel = m_textBackgroundColour.AllocColour(m_display); m_currentColour = m_textBackgroundColour; - + // Set the GC to the required colour if (pixel > -1) { @@ -1130,13 +1112,13 @@ void wxWindowDC::DrawText( const wxString &text, long x, long y, bool use16 ) } else m_textBackgroundColour = oldPenColour ; - + XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y), cx, cy); if (m_window && m_window->GetBackingPixmap()) XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y), cx, cy); } - + // Now set the text foreground and draw the text if (m_textForegroundColour.Ok ()) { @@ -1147,7 +1129,7 @@ void wxWindowDC::DrawText( const wxString &text, long x, long y, bool use16 ) (oldPenColour.Blue () == m_currentColour.Blue ()) && (oldPenColour.Green () == m_currentColour.Green ()) && (oldPenColour.GetPixel() == m_currentColour.GetPixel())); - + if (!sameColour || !GetOptimization()) { int pixel = -1; @@ -1178,7 +1160,7 @@ void wxWindowDC::DrawText( const wxString &text, long x, long y, bool use16 ) pixel = m_textForegroundColour.AllocColour((Display*) m_display); m_currentColour.SetPixel(pixel); } - + // Set the GC to the required colour if (pixel > -1) { @@ -1190,122 +1172,266 @@ void wxWindowDC::DrawText( const wxString &text, long x, long y, bool use16 ) else m_textForegroundColour = oldPenColour; } - - // We need to add the ascent, not the whole height, since X draws - // at the point above the descender. + + // We need to add the ascent, not the whole height, since X draws at the + // point above the descender. +#if 0 if (use16) - XDrawString16((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, + XDrawString16((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, (XChar2b *)(char*) (const char*) text, slen); else - XDrawString((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, - text, slen); - +#endif // 0 + XDrawString((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, text, slen); + if (m_window && m_window->GetBackingPixmap()) { +#if 0 if (use16) XDrawString16((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent, (XChar2b *)(char*) (const char*) text, slen); else +#endif // 0 XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent, (char*) (const char*) text, slen); } - + + wxCoord w, h; + GetTextExtent (text, &w, &h); + CalcBoundingBox (x + w, y + h); + CalcBoundingBox (x, y); +} + +void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle ) +{ + if (angle == 0.0) + { + DrawText(text, x, y); + return; + } + + wxCHECK_RET( Ok(), "invalid dc" ); + + // Since X draws from the baseline of the text, must add the text height + int cx = 0; + int cy = 0; + int ascent = 0; + int slen; + + slen = strlen(text); + + if (m_font.Ok()) + { + // Calculate text extent. + WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display); + int direction, descent; + XCharStruct overall_return; +#if 0 + if (use16) + (void)XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *)(const char*) text, slen, &direction, + &ascent, &descent, &overall_return); + else +#endif // 0 + (void)XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) text, slen, &direction, + &ascent, &descent, &overall_return); + + cx = overall_return.width; + cy = ascent + descent; + } + + wxBitmap src(cx, cy); + wxMemoryDC dc; + dc.SelectObject(src); + dc.SetFont(GetFont()); + dc.SetBackground(*wxWHITE_BRUSH); + dc.SetBrush(*wxBLACK_BRUSH); + dc.Clear(); + dc.DrawText(text, 0, 0); + dc.SetFont(wxNullFont); + + // Calculate the size of the rotated bounding box. + double dx = cos(angle / 180.0 * M_PI); + double dy = sin(angle / 180.0 * M_PI); + double x4 = -cy * dy; + double y4 = cy * dx; + double x3 = cx * dx; + double y3 = cx * dy; + double x2 = x3 + x4; + double y2 = y3 + y4; + double x1 = x; + double y1 = y; + + // Create image from the source bitmap after writing the text into it. + wxImage image(src); + + int minx = roundmin(0, roundmin(x4, roundmin(x2, x3))); + int miny = roundmin(0, roundmin(y4, roundmin(y2, y3))); + int maxx = roundmax(0, roundmax(x4, roundmax(x2, x3))); + int maxy = roundmax(0, roundmax(y4, roundmax(y2, y3))); + + // This rotates counterclockwise around the top left corner. + for (int rx = minx; rx < maxx; rx++) + { + for (int ry = miny; ry < maxy; ry++) + { + // transform dest coords to source coords + int sx = (int) (rx * dx + ry * dy + 0.5); + int sy = (int) (ry * dx - rx * dy + 0.5); + if (sx >= 0 && sx < cx && sy >= 0 && sy < cy) + { + // draw black pixels, ignore white ones (i.e. transparent b/g) + if (image.GetRed(sx, sy) == 0) + { + DrawPoint((wxCoord) (x1 + maxx - rx), (wxCoord) (cy + y1 - ry)); + } + else + { + // Background + //DrawPoint(x1 + maxx - rx, cy + y1 + maxy - ry); + } + } + } + } + +#if 0 + // First draw a rectangle representing the text background, if a text + // background is specified + if (m_textBackgroundColour.Ok () && (m_backgroundMode != wxTRANSPARENT)) + { + wxColour oldPenColour = m_currentColour; + m_currentColour = m_textBackgroundColour; + bool sameColour = (oldPenColour.Ok () && m_textBackgroundColour.Ok () && + (oldPenColour.Red () == m_textBackgroundColour.Red ()) && + (oldPenColour.Blue () == m_textBackgroundColour.Blue ()) && + (oldPenColour.Green () == m_textBackgroundColour.Green ())); + + // This separation of the big && test required for gcc2.7/HP UX 9.02 + // or pixel value can be corrupted! + sameColour = (sameColour && + (oldPenColour.GetPixel() == m_textBackgroundColour.GetPixel())); + + if (!sameColour || !GetOptimization()) + { + int pixel = m_textBackgroundColour.AllocColour(m_display); + m_currentColour = m_textBackgroundColour; + + // Set the GC to the required colour + if (pixel > -1) + { + XSetForeground ((Display*) m_display, (GC) m_gc, pixel); + if (m_window && m_window->GetBackingPixmap()) + XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel); + } + } + else + m_textBackgroundColour = oldPenColour ; + + XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y), cx, cy); + if (m_window && m_window->GetBackingPixmap()) + XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, + XLOG2DEV_2 (x), YLOG2DEV_2 (y), cx, cy); + } +#endif + long w, h; + // XXX use pixmap size GetTextExtent (text, &w, &h); CalcBoundingBox (x + w, y + h); CalcBoundingBox (x, y); -}; +} -bool wxWindowDC::CanGetTextExtent(void) const +bool wxWindowDC::CanGetTextExtent() const { return TRUE; -}; +} -void wxWindowDC::GetTextExtent( const wxString &string, long *width, long *height, - long *descent, long *externalLeading, - wxFont *font, bool use16 ) +void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height, + wxCoord *descent, wxCoord *externalLeading, + wxFont *font ) const { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + wxFont* theFont = font; if (!theFont) - theFont = & m_font; - + theFont = (wxFont *)&m_font; // const_cast + if (!theFont->Ok()) { // TODO: this should be an error log function wxFAIL_MSG("set a valid font before calling GetTextExtent!"); - - *width = -1; - *height = -1; + + if (width) *width = -1; + if (height) *height = -1; return; } - + WXFontStructPtr pFontStruct = theFont->GetFontStruct(m_userScaleY*m_logicalScaleY, m_display); - + int direction, ascent, descent2; XCharStruct overall; int slen; - - if (use16) slen = str16len(string); else slen = strlen(string); - + +#if 0 + if (use16) + slen = str16len(string); + else +#endif // 0 + slen = strlen(string); + +#if 0 if (use16) XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction, &ascent, &descent2, &overall); else +#endif // 0 XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) string, slen, &direction, &ascent, &descent2, &overall); - - *width = XDEV2LOGREL (overall.width); - *height = YDEV2LOGREL (ascent + descent2); + + if (width) *width = XDEV2LOGREL (overall.width); + if (height) *height = YDEV2LOGREL (ascent + descent2); if (descent) *descent = descent2; if (externalLeading) *externalLeading = 0; -}; +} -long wxWindowDC::GetCharWidth(void) +wxCoord wxWindowDC::GetCharWidth() const { - if (!Ok()) return 0; - - if (!m_font.Ok()) - return 0; - + wxCHECK_MSG( Ok(), 0, "invalid dc" ); + wxCHECK_MSG( m_font.Ok(), 0, "invalid font" ); + WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY * m_logicalScaleY, m_display); - + int direction, ascent, descent; XCharStruct overall; XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent, &descent, &overall); return XDEV2LOGREL(overall.width); -}; +} -long wxWindowDC::GetCharHeight(void) +wxCoord wxWindowDC::GetCharHeight() const { - if (!Ok()) return 0; - - if (!m_font.Ok()) - return 0; - + wxCHECK_MSG( Ok(), 0, "invalid dc" ); + wxCHECK_MSG( m_font.Ok(), 0, "invalid font" ); + WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display); - + int direction, ascent, descent; XCharStruct overall; XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent, &descent, &overall); // return XDEV2LOGREL(overall.ascent + overall.descent); return XDEV2LOGREL(ascent + descent); -}; +} -void wxWindowDC::Clear(void) +void wxWindowDC::Clear() { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + int w, h; if (m_window) { m_window->GetSize(&w, &h); - + if (m_window && m_window->GetBackingPixmap()) { w = m_window->GetPixmapWidth(); @@ -1323,71 +1449,71 @@ void wxWindowDC::Clear(void) else return; } - + wxBrush saveBrush = m_brush; SetBrush (m_backgroundBrush); - + XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, 0, 0, w, h); - + if (m_window && m_window->GetBackingPixmap()) XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, 0, 0, w, h); - + m_brush = saveBrush; -}; +} void wxWindowDC::Clear(const wxRect& rect) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + int x = rect.x; int y = rect.y; int w = rect.width; int h = rect.height; - + wxBrush saveBrush = m_brush; SetBrush (m_backgroundBrush); - + XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, x, y, w, h); - + if (m_window && m_window->GetBackingPixmap()) XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, x, y, w, h); - + m_brush = saveBrush; -}; +} void wxWindowDC::SetFont( const wxFont &font ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + m_font = font; - + if (!m_font.Ok()) { - if ((m_oldFont != (WXFont) 0) && ((long) m_oldFont != -1)) + if ((m_oldFont != (WXFont) 0) && ((wxCoord) m_oldFont != -1)) { XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont); - + if (m_window && m_window->GetBackingPixmap()) XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont); } return; } - + WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display); - + Font fontId = ((XFontStruct*)pFontStruct)->fid; XSetFont ((Display*) m_display, (GC) m_gc, fontId); - + if (m_window && m_window->GetBackingPixmap()) XSetFont ((Display*) m_display,(GC) m_gcBacking, fontId); -}; +} void wxWindowDC::SetPen( const wxPen &pen ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + m_pen = pen; if (!m_pen.Ok()) return; - + wxBitmap oldStipple = m_currentStipple; int oldStyle = m_currentStyle; int oldFill = m_currentFill; @@ -1395,8 +1521,8 @@ void wxWindowDC::SetPen( const wxPen &pen ) int old_pen_join = m_currentPenJoin; int old_pen_cap = m_currentPenCap; int old_pen_nb_dash = m_currentPenDashCount; - char *old_pen_dash = m_currentPenDash; - + wxMOTIFDash *old_pen_dash = m_currentPenDash; + wxColour oldPenColour = m_currentColour; m_currentColour = m_pen.GetColour (); m_currentStyle = m_pen.GetStyle (); @@ -1405,11 +1531,11 @@ void wxWindowDC::SetPen( const wxPen &pen ) m_currentPenJoin = m_pen.GetJoin (); m_currentPenCap = m_pen.GetCap (); m_currentPenDashCount = m_pen.GetDashCount(); - m_currentPenDash = m_pen.GetDash(); - + m_currentPenDash = (wxMOTIFDash*)m_pen.GetDash(); + if (m_currentStyle == wxSTIPPLE) m_currentStipple = * m_pen.GetStipple (); - + bool sameStyle = (oldStyle == m_currentStyle && oldFill == m_currentFill && old_pen_join == m_currentPenJoin && @@ -1417,36 +1543,32 @@ void wxWindowDC::SetPen( const wxPen &pen ) old_pen_nb_dash == m_currentPenDashCount && old_pen_dash == m_currentPenDash && old_pen_width == m_currentPenWidth); - + bool sameColour = (oldPenColour.Ok () && (oldPenColour.Red () == m_currentColour.Red ()) && (oldPenColour.Blue () == m_currentColour.Blue ()) && (oldPenColour.Green () == m_currentColour.Green ()) && (oldPenColour.GetPixel() == m_currentColour.GetPixel())); - + if (!sameStyle || !GetOptimization()) { int scaled_width = (int) XLOG2DEVREL (m_pen.GetWidth ()); if (scaled_width < 0) scaled_width = 0; - + int style; int join; int cap; - static char dotted[] = - {2, 5}; - static char short_dashed[] = - {4, 4}; - static char long_dashed[] = - {4, 8}; - static char dotted_dashed[] = - {6, 6, 2, 6}; - + static const wxMOTIFDash dotted[] = {2, 5}; + static const wxMOTIFDash short_dashed[] = {4, 4}; + static const wxMOTIFDash long_dashed[] = {4, 8}; + static const wxMOTIFDash dotted_dashed[] = {6, 6, 2, 6}; + // We express dash pattern in pen width unit, so we are // independent of zoom factor and so on... int req_nb_dash; - char *req_dash; - + const wxMOTIFDash *req_dash; + switch (m_pen.GetStyle ()) { case wxUSER_DASH: @@ -1479,20 +1601,20 @@ void wxWindowDC::SetPen( const wxPen &pen ) case wxTRANSPARENT: default: style = LineSolid; - req_dash = NULL; + req_dash = (wxMOTIFDash*)NULL; req_nb_dash = 0; } - + if (req_dash && req_nb_dash) { - char *real_req_dash = new char[req_nb_dash]; + wxMOTIFDash *real_req_dash = new wxMOTIFDash[req_nb_dash]; if (real_req_dash) { int factor = scaled_width == 0 ? 1 : scaled_width; for (int i = 0; i < req_nb_dash; i++) real_req_dash[i] = req_dash[i] * factor; XSetDashes ((Display*) m_display, (GC) m_gc, 0, real_req_dash, req_nb_dash); - + if (m_window && m_window->GetBackingPixmap()) XSetDashes ((Display*) m_display,(GC) m_gcBacking, 0, real_req_dash, req_nb_dash); delete[]real_req_dash; @@ -1501,12 +1623,12 @@ void wxWindowDC::SetPen( const wxPen &pen ) { // No Memory. We use non-scaled dash pattern... XSetDashes ((Display*) m_display, (GC) m_gc, 0, req_dash, req_nb_dash); - + if (m_window && m_window->GetBackingPixmap()) XSetDashes ((Display*) m_display,(GC) m_gcBacking, 0, req_dash, req_nb_dash); } } - + switch (m_pen.GetCap ()) { case wxCAP_PROJECTING: @@ -1520,7 +1642,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) cap = (scaled_width <= 1) ? CapNotLast : CapRound; break; } - + switch (m_pen.GetJoin ()) { case wxJOIN_BEVEL: @@ -1534,19 +1656,19 @@ void wxWindowDC::SetPen( const wxPen &pen ) join = JoinRound; break; } - + XSetLineAttributes ((Display*) m_display, (GC) m_gc, scaled_width, style, cap, join); - + if (m_window && m_window->GetBackingPixmap()) XSetLineAttributes ((Display*) m_display,(GC) m_gcBacking, scaled_width, style, cap, join); } - + if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GetOptimization())) { Pixmap myStipple; - + oldStipple = wxNullBitmap; // For later reset!! - + switch (m_currentFill) { case wxBDIAGONAL_HATCH: @@ -1594,7 +1716,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) break; } XSetStipple ((Display*) m_display, (GC) m_gc, myStipple); - + if (m_window && m_window->GetBackingPixmap()) XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple); } @@ -1602,15 +1724,15 @@ void wxWindowDC::SetPen( const wxPen &pen ) && ((m_currentStipple != oldStipple) || !GetOptimization())) { XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetPixmap()); - + if (m_window && m_window->GetBackingPixmap()) XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetPixmap()); } - + if ((m_currentFill != oldFill) || !GetOptimization()) { int fill_style; - + if (m_currentFill == wxSTIPPLE) fill_style = FillStippled; else if (IS_HATCH (m_currentFill)) @@ -1621,7 +1743,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) if (m_window && m_window->GetBackingPixmap()) XSetFillStyle ((Display*) m_display,(GC) m_gcBacking, fill_style); } - + // must test m_logicalFunction, because it involves background! if (!sameColour || !GetOptimization() || ((m_logicalFunction == wxXOR) || (m_autoSetting & 0x2))) @@ -1654,7 +1776,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) pixel = m_pen.GetColour ().AllocColour(m_display); m_currentColour.SetPixel(pixel); } - + // Finally, set the GC to the required colour if (pixel > -1) { @@ -1676,37 +1798,37 @@ void wxWindowDC::SetPen( const wxPen &pen ) } else m_pen.GetColour().SetPixel(oldPenColour.GetPixel()); - + m_autoSetting = 0; -}; +} void wxWindowDC::SetBrush( const wxBrush &brush ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + m_brush = brush; - + if (!m_brush.Ok() || m_brush.GetStyle () == wxTRANSPARENT) return; - + int oldFill = m_currentFill; wxBitmap oldStipple = m_currentStipple; - + m_autoSetting |= 0x1; - + m_currentFill = m_brush.GetStyle (); if (m_currentFill == wxSTIPPLE) m_currentStipple = * m_brush.GetStipple (); - + wxColour oldBrushColour(m_currentColour); m_currentColour = m_brush.GetColour (); - + bool sameColour = (oldBrushColour.Ok () && (oldBrushColour.Red () == m_currentColour.Red ()) && (oldBrushColour.Blue () == m_currentColour.Blue ()) && (oldBrushColour.Green () == m_currentColour.Green ()) && (oldBrushColour.GetPixel() == m_currentColour.GetPixel())); - + if ((oldFill != m_brush.GetStyle ()) || !GetOptimization()) { switch (brush.GetStyle ()) @@ -1736,11 +1858,11 @@ void wxWindowDC::SetBrush( const wxBrush &brush ) XSetFillStyle ((Display*) m_display,(GC) m_gcBacking, FillSolid); } } - + if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GetOptimization())) { Pixmap myStipple; - + switch (m_currentFill) { case wxBDIAGONAL_HATCH: @@ -1788,7 +1910,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush ) break; } XSetStipple ((Display*) m_display, (GC) m_gc, myStipple); - + if (m_window && m_window->GetBackingPixmap()) XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple); } @@ -1800,7 +1922,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush ) if (m_window && m_window->GetBackingPixmap()) XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetPixmap()); } - + // must test m_logicalFunction, because it involves background! if (!sameColour || !GetOptimization() || m_logicalFunction == wxXOR) { @@ -1812,7 +1934,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush ) unsigned char red = m_brush.GetColour ().Red (); unsigned char blue = m_brush.GetColour ().Blue (); unsigned char green = m_brush.GetColour ().Green (); - + if (red == (unsigned char) 0 && blue == (unsigned char) 0 && green == (unsigned char) 0) { @@ -1828,7 +1950,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush ) m_brush.GetColour().SetPixel(pixel); m_currentColour.SetPixel(pixel); } - + // N.B. comment out the above line and uncomment the following lines // if you want non-white colours to be black on a monochrome display. /* @@ -1865,38 +1987,44 @@ void wxWindowDC::SetBrush( const wxBrush &brush ) } else m_brush.GetColour().SetPixel(oldBrushColour.GetPixel()); -}; +} void wxWindowDC::SetBackground( const wxBrush &brush ) { - if (!Ok()) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + m_backgroundBrush = brush; - + if (!m_backgroundBrush.Ok()) return; - + int pixel = m_backgroundBrush.GetColour().AllocColour(m_display); - + + // New behaviour, 10/2/99: setting the background brush of a DC + // doesn't affect the window background colour. +/* // XSetWindowBackground doesn't work for non-Window pixmaps if (!this->IsKindOf(CLASSINFO(wxMemoryDC))) XSetWindowBackground ((Display*) m_display, (Pixmap) m_pixmap, pixel); - +*/ + // Necessary for ::DrawIcon, which use fg/bg pixel or the GC. // And Blit,... (Any fct that use XCopyPlane, in fact.) XSetBackground ((Display*) m_display, (GC) m_gc, pixel); if (m_window && m_window->GetBackingPixmap()) XSetBackground ((Display*) m_display,(GC) m_gcBacking, pixel); -}; +} void wxWindowDC::SetLogicalFunction( int function ) { + wxCHECK_RET( Ok(), "invalid dc" ); + int x_function; - + /* MATTHEW: [9] */ if (m_logicalFunction == function) return; - + switch (function) { case wxCLEAR: @@ -1949,44 +2077,46 @@ void wxWindowDC::SetLogicalFunction( int function ) x_function = GXcopy; break; } - + XSetFunction((Display*) m_display, (GC) m_gc, x_function); if (m_window && m_window->GetBackingPixmap()) XSetFunction((Display*) m_display, (GC) m_gcBacking, x_function); - + if ((m_logicalFunction == wxXOR) != (function == wxXOR)) /* MATTHEW: [9] Need to redo pen simply */ m_autoSetting |= 0x2; - + m_logicalFunction = function; - -}; + +} void wxWindowDC::SetTextForeground( const wxColour &col ) { - if (!Ok()) return; - - if (m_textForegroundColour == col) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + + if (m_textForegroundColour == col) + return; + m_textForegroundColour = col; - -}; + +} void wxWindowDC::SetTextBackground( const wxColour &col ) { - if (!Ok()) return; - - if (m_textBackgroundColour == col) return; - + wxCHECK_RET( Ok(), "invalid dc" ); + + if (m_textBackgroundColour == col) + return; + m_textBackgroundColour = col; - if (!m_textBackgroundColour.Ok()) return; -}; + if (!m_textBackgroundColour.Ok()) + return; +} void wxWindowDC::SetBackgroundMode( int mode ) { m_backgroundMode = mode; - -}; +} void wxWindowDC::SetPalette( const wxPalette& palette ) { @@ -2001,16 +2131,16 @@ void wxWindowDC::SetPalette( const wxPalette& palette ) XSetWindowColormap ((Display*) m_display, (Window) m_window->GetXWindow(), (Colormap) wxTheApp->GetMainColormap(m_display)); } -}; +} // Helper function -void wxWindowDC:: SetDCClipping () +void wxWindowDC::SetDCClipping() { // m_userRegion is the region set by calling SetClippingRegion - + if (m_currentRegion) XDestroyRegion ((Region) m_currentRegion); - + // We need to take into account // clipping imposed on a window by a repaint. // We'll combine it with the user region. But for now, @@ -2019,15 +2149,15 @@ void wxWindowDC:: SetDCClipping () m_currentRegion = (WXRegion) XCreateRegion (); else m_currentRegion = (WXRegion) NULL; - + if ((m_window && m_window->GetUpdateRegion().Ok()) && m_userRegion) XIntersectRegion ((Region) m_window->GetUpdateRegion().GetXRegion(), (Region) m_userRegion, (Region) m_currentRegion); else if (m_userRegion) XIntersectRegion ((Region) m_userRegion, (Region) m_userRegion, (Region) m_currentRegion); else if (m_window && m_window->GetUpdateRegion().Ok()) - XIntersectRegion ((Region) m_window->GetUpdateRegion().GetXRegion(), (Region) m_window->GetUpdateRegion().GetXRegion(), + XIntersectRegion ((Region) m_window->GetUpdateRegion().GetXRegion(), (Region) m_window->GetUpdateRegion().GetXRegion(), (Region) m_currentRegion); - + if (m_currentRegion) { XSetRegion ((Display*) m_display, (GC) m_gc, (Region) m_currentRegion); @@ -2036,13 +2166,13 @@ void wxWindowDC:: SetDCClipping () { XSetClipMask ((Display*) m_display, (GC) m_gc, None); } - + } -void wxWindowDC::SetClippingRegion( long x, long y, long width, long height ) +void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - wxDC::SetClippingRegion( x, y, width, height ); - + wxDC::DoSetClippingRegion( x, y, width, height ); + if (m_userRegion) XDestroyRegion ((Region) m_userRegion); m_userRegion = (WXRegion) XCreateRegion (); @@ -2052,36 +2182,36 @@ void wxWindowDC::SetClippingRegion( long x, long y, long width, long height ) r.width = XLOG2DEVREL(width); r.height = YLOG2DEVREL(height); XUnionRectWithRegion (&r, (Region) m_userRegion, (Region) m_userRegion); - + SetDCClipping (); - + // Needs to work differently for Pixmap: without this, // there's a nasty (Display*) m_display bug. 8/12/94 if (m_window && m_window->GetBackingPixmap()) { XRectangle rects[1]; - rects[0].x = XLOG2DEV_2(x); + rects[0].x = XLOG2DEV_2(x); rects[0].y = YLOG2DEV_2(y); rects[0].width = XLOG2DEVREL(width); rects[0].height = YLOG2DEVREL(height); XSetClipRectangles((Display*) m_display, (GC) m_gcBacking, 0, 0, rects, 1, Unsorted); } -}; +} -void wxWindowDC::SetClippingRegion( const wxRegion& region ) +void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region ) { wxRect box = region.GetBox(); - - wxDC::SetClippingRegion( box.x, box.y, box.width, box.height ); - + + wxDC::DoSetClippingRegion( box.x, box.y, box.width, box.height ); + if (m_userRegion) XDestroyRegion ((Region) m_userRegion); m_userRegion = (WXRegion) XCreateRegion (); - + XUnionRegion((Region) m_userRegion, (Region) region.GetXRegion(), (Region) m_userRegion); - + SetDCClipping (); - + // Needs to work differently for Pixmap: without this, // there's a nasty (Display*) m_display bug. 8/12/94 if (m_window && m_window->GetBackingPixmap()) @@ -2093,210 +2223,58 @@ void wxWindowDC::SetClippingRegion( const wxRegion& region ) rects[0].height = YLOG2DEVREL(box.height); XSetClipRectangles((Display*) m_display, (GC) m_gcBacking, 0, 0, rects, 1, Unsorted); } -}; +} -void wxWindowDC::DestroyClippingRegion(void) +void wxWindowDC::DestroyClippingRegion() { wxDC::DestroyClippingRegion(); - + if (m_userRegion) XDestroyRegion ((Region) m_userRegion); m_userRegion = NULL; - + SetDCClipping (); - + XGCValues gc_val; gc_val.clip_mask = None; if (m_window && m_window->GetBackingPixmap()) XChangeGC((Display*) m_display, (GC) m_gcBacking, GCClipMask, &gc_val); -}; - -// ----------------------------------- spline code ---------------------------------------- - -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); - -wxList wx_spline_point_list; - -#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( x1, y1 ); - wx_spline_add_point( xmid, 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) +// Resolution in pixels per logical inch +wxSize wxWindowDC::GetPPI() const { - 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++; + return wxSize(100, 100); } -int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, - double *x3, double *y3, double *x4, double *y4) +int wxWindowDC::GetDepth() const { - 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); + // TODO + return 24; } -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, 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(); - } -} -void wxWindowDC::DrawSpline( wxList *points ) -{ - wxPoint *p; - double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4; - double x1, y1, x2, y2; - - wxNode *node = 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( cx1, cy1 ); - wx_spline_add_point( x2, y2 ); - - wx_spline_draw_point_array( this ); -}; -/* -* wxPaintDC -*/ +// ---------------------------------------------------------------------------- +// wxPaintDC +// ---------------------------------------------------------------------------- -wxPaintDC::wxPaintDC(wxWindow* win): wxWindowDC(win) +wxPaintDC::wxPaintDC(wxWindow* win) : wxWindowDC(win) { wxRegion* region = NULL; - + // Combine all the update rects into a region - if (win->m_updateRects.Number() > 0) + const wxRectList& updateRects(win->GetUpdateRects()); + if ( updateRects.GetCount() != 0 ) { - int i = 0; - for (i = 0; i < win->m_updateRects.Number(); i++) + for ( wxRectList::Node *node = updateRects.GetFirst(); + node; + node = node->GetNext() ) { - wxRect* rect = (wxRect*) win->m_updateRects.Nth(i)->Data(); - /* - cout << "wxPaintDC. wxRect: " << rect->x << ", " << rect->y << ", "; - cout << rect->width << ", " << rect->height << "\n\n"; - */ - + wxRect* rect = node->GetData(); + if (!region) region = new wxRegion(*rect); else @@ -2312,13 +2290,16 @@ wxPaintDC::wxPaintDC(wxWindow* win): wxWindowDC(win) win->GetClientSize(&cw, &ch); region = new wxRegion(wxRect(0, 0, cw, ch)); } - - win->m_updateRegion = *region; - + + win->SetUpdateRegion(*region); + + wxRegion& theRegion(win->GetUpdateRegion()); + theRegion.SetRects(updateRects); // We also store in terms of rects, for iteration to work. + // Set the clipping region. Any user-defined region will be combined with this // one in SetDCClipping. XSetRegion ((Display*) m_display, (GC) m_gc, (Region) region->GetXRegion()); - + delete region; } @@ -2326,6 +2307,102 @@ wxPaintDC::~wxPaintDC() { XSetClipMask ((Display*) m_display, (GC) m_gc, None); if (m_window) - m_window->m_updateRegion.Clear(); + m_window->ClearUpdateRegion(); +} + +// ---------------------------------------------------------------------------- +// private functions +// ---------------------------------------------------------------------------- + +/* + Used when copying between drawables on different (Display*) m_displays. Not + very fast, but better than giving up. +*/ + +static void XCopyRemote(Display *src_display, Display *dest_display, + Drawable src, Drawable dest, + GC destgc, + int srcx, int srcy, + unsigned int w, unsigned int h, + int destx, int desty, + bool more, XImage **cache) +{ + XImage *image, *destimage; + Colormap destcm, srccm; + static const int CACHE_SIZE = 256; + + unsigned int i, j; + unsigned long cachesrc[CACHE_SIZE], cachedest[CACHE_SIZE]; + int k, cache_pos, all_cache; + + if (!cache || !*cache) + image = XGetImage(src_display, src, srcx, srcy, w, h, AllPlanes, ZPixmap); + else + image = *cache; + + destimage = XGetImage(dest_display, dest, destx, desty, w, h, AllPlanes, ZPixmap); + + srccm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) src_display); + destcm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dest_display); + + cache_pos = 0; + all_cache = FALSE; + + for (i = 0; i < w; i++) + for (j = 0; j < h; j++) { + unsigned long pixel; + XColor xcol; + + pixel = XGetPixel(image, i, j); + for (k = cache_pos; k--; ) + if (cachesrc[k] == pixel) { + pixel = cachedest[k]; + goto install; + } + if (all_cache) + for (k = CACHE_SIZE; k-- > cache_pos; ) + if (cachesrc[k] == pixel) { + pixel = cachedest[k]; + goto install; + } + + cachesrc[cache_pos] = xcol.pixel = pixel; + XQueryColor(src_display, srccm, &xcol); + if (!XAllocColor(dest_display, destcm, &xcol)) + xcol.pixel = 0; + cachedest[cache_pos] = pixel = xcol.pixel; + + if (++cache_pos >= CACHE_SIZE) { + cache_pos = 0; + all_cache = TRUE; + } + +install: + XPutPixel(destimage, i, j, pixel); + } + + XPutImage(dest_display, dest, destgc, destimage, 0, 0, destx, desty, w, h); + XDestroyImage(destimage); + + if (more) + *cache = image; + else + XDestroyImage(image); +} + +#if 0 + +/* Helper function for 16-bit fonts */ +static int str16len(const char *s) +{ + int count = 0; + + while (s[0] && s[1]) { + count++; + s += 2; + } + + return count; } +#endif // 0