X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20671963efabd70a208b415c4734ee813b9eb439..39bc12ff4b0670692750055cd7004480fd7b84ee:/src/dfb/dcclient.cpp?ds=sidebyside diff --git a/src/dfb/dcclient.cpp b/src/dfb/dcclient.cpp index 160f3e336d..149067554f 100644 --- a/src/dfb/dcclient.cpp +++ b/src/dfb/dcclient.cpp @@ -37,6 +37,50 @@ // implementation // =========================================================================== +//----------------------------------------------------------------------------- +// helpers +//----------------------------------------------------------------------------- + +// Returns subrect of the window that is not outside of its parent's +// boundaries ("hidden behind its borders"), recursively: +static wxRect GetUncoveredWindowArea(wxWindow *win) +{ + wxRect r(win->GetSize()); + + if ( win->IsTopLevel() ) + return r; + + wxWindow *parent = win->GetParent(); + if ( !parent ) + return r; + + // intersect with parent's uncovered area, after offsetting it into win's + // coordinates; this will remove parts of 'r' that are outside of the + // parent's area: + wxRect rp(GetUncoveredWindowArea(parent)); + rp.Offset(-win->GetPosition()); + rp.Offset(-parent->GetClientAreaOrigin()); + r.Intersect(rp); + + return r; +} + +// creates a dummy surface that has the same format as the real window's +// surface, but is not visible and so can be painted on even if the window +// is hidden +static +wxIDirectFBSurfacePtr CreateDummySurface(wxWindow *win, const wxRect *rect) +{ + wxLogTrace(TRACE_PAINT, _T("%p ('%s'): creating dummy DC surface"), + win, win->GetName().c_str()); + wxSize size(rect ? rect->GetSize() : win->GetSize()); + return win->GetDfbSurface()->CreateCompatible + ( + size, + wxIDirectFBSurface::CreateCompatible_NoBackBuffer + ); +} + //----------------------------------------------------------------------------- // wxWindowDC //----------------------------------------------------------------------------- @@ -50,58 +94,91 @@ wxWindowDC::wxWindowDC(wxWindow *win) void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect) { - m_win = win; - wxCHECK_RET( win, _T("invalid window") ); + m_win = win; + // obtain the surface used for painting: wxPoint origin; wxIDirectFBSurfacePtr surface; - if ( !win->IsVisible() ) + wxRect rectOrig(rect ? *rect : wxRect(win->GetSize())); + wxRect r; + + if ( !win->IsShownOnScreen() ) { - // we're painting on invisible window: the changes won't have any - // effect, as the window will be repainted anyhow when it is shown, but - // we still need a valid DC so that e.g. text extents can be measured, - // so let's create a dummy surface that has the same format as the real - // one would have and let the code paint on it: - wxLogTrace(TRACE_PAINT, _T("%p ('%s'): creating dummy DC surface"), - win, win->GetName().c_str()); - wxSize size(rect ? rect->GetSize() : win->GetSize()); - surface = win->GetDfbSurface()->CreateCompatible(size); + // leave 'r' rectangle empty to indicate the window is not visible, + // see below (below "create the surface:") for how is this case handled } else { - wxRect rectOrig(rect ? *rect : wxRect(win->GetSize())); - // compute painting rectangle after clipping if we're in PaintWindow // code, otherwise paint on the entire window: - wxRect r(rectOrig); - if ( win->GetTLW()->IsPainting() ) - r.Intersect(win->GetUpdateRegion().AsRect()); + r = rectOrig; + + const wxRegion& updateRegion = win->GetUpdateRegion(); + if ( win->GetTLW()->IsPainting() && !updateRegion.IsEmpty() ) + { + r.Intersect(updateRegion.AsRect()); + wxCHECK_RET( !r.IsEmpty(), _T("invalid painting rectangle") ); + + // parent TLW will flip the entire surface when painting is done + m_shouldFlip = false; + } + else + { + // One of two things happened: + // (1) the TLW is not being painted by PaintWindow() now; or + // (2) we're drawing on some window other than the one that is + // currently painted on by PaintWindow() + // In either case, we need to flip the surface when we're done + // painting and we don't have to use updateRegion for clipping. + // OTOH, if the window is (partially) hidden by being + // out of its parent's area, we must clip the surface accordingly. + r.Intersect(GetUncoveredWindowArea(win)); + m_shouldFlip = true; // paint the results immediately + } + } - wxCHECK_RET( !r.IsEmpty(), _T("invalid painting rectangle") ); + // create the surface: + if ( r.IsEmpty() ) + { + // we're painting on invisible window: the changes won't have any + // effect, as the window will be repainted anyhow when it is shown, + // but we still need a valid DC so that e.g. text extents can be + // measured, so let's create a dummy surface that has the same + // format as the real one would have and let the code paint on it: + surface = CreateDummySurface(win, rect); + + // painting on hidden window has no effect on TLW's surface, don't + // waste time flipping the dummy surface: + m_shouldFlip = false; + } + else + { + m_winRect = r; + DFBRectangle dfbrect = { r.x, r.y, r.width, r.height }; + surface = win->GetDfbSurface()->GetSubSurface(&dfbrect); - // if the DC was clipped thanks to rectPaint, we must adjust the origin - // accordingly; but we do *not* adjust for 'rect', because + // if the DC was clipped thanks to rectPaint, we must adjust the + // origin accordingly; but we do *not* adjust for 'rect', because // rect.GetPosition() has coordinates (0,0) in the DC: origin.x = rectOrig.x - r.x; origin.y = rectOrig.y - r.y; - wxLogTrace(TRACE_PAINT, - _T("%p ('%s'): creating DC for area [%i,%i,%i,%i], clipped to [%i,%i,%i,%i], origin [%i,%i]"), - win, win->GetName().c_str(), - rectOrig.x, rectOrig.y, rectOrig.GetRight(), rectOrig.GetBottom(), - r.x, r.y, r.GetRight(), r.GetBottom(), - origin.x, origin.y); - - DFBRectangle dfbrect = { r.x, r.y, r.width, r.height }; - surface = win->GetDfbSurface()->GetSubSurface(&dfbrect); + // m_shouldFlip was set in the "if" block above this one } if ( !surface ) return; + wxLogTrace(TRACE_PAINT, + _T("%p ('%s'): creating DC for area [%i,%i,%i,%i], clipped to [%i,%i,%i,%i], origin [%i,%i]"), + win, win->GetName().c_str(), + rectOrig.x, rectOrig.y, rectOrig.GetRight(), rectOrig.GetBottom(), + r.x, r.y, r.GetRight(), r.GetBottom(), + origin.x, origin.y); + Init(surface); SetFont(win->GetFont()); @@ -112,22 +189,27 @@ void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect) wxWindowDC::~wxWindowDC() { wxIDirectFBSurfacePtr surface(GetDirectFBSurface()); - if ( !surface || !m_win ) - return; - - // painting on hidden window has no effect on TLW's surface, don't - // waste time flipping the dummy surface: - if ( !m_win->IsVisible() ) + if ( !surface ) return; // if no painting was done on the DC, we don't have to flip the surface: if ( !m_isBBoxValid ) return; - if ( !m_win->GetTLW()->IsPainting() ) + if ( m_shouldFlip ) { - // FIXME: flip only modified parts of the surface - surface->FlipToFront(); + // paint overlays on top of the surface being drawn to by this DC + // before showing anything on the screen: + m_win->PaintOverlays(m_winRect); + + DFBSurfaceCapabilities caps = DSCAPS_NONE; + surface->GetCapabilities(&caps); + if ( caps & DSCAPS_DOUBLE ) + { + // FIXME: flip only modified parts of the surface + surface->FlipToFront(); + } + // else: the surface is not double-buffered and so cannot be flipped } // else: don't flip the surface, wxTLW will do it when it finishes // painting of its invalidated areas