X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dc9a81d7eded5ff93f9e799e4cbac5f917f1186..11fe6505b848a968f4c89cb3c3fd37a6a03bcaea:/src/dfb/dcclient.cpp diff --git a/src/dfb/dcclient.cpp b/src/dfb/dcclient.cpp index 48da653d56..6514a4f599 100644 --- a/src/dfb/dcclient.cpp +++ b/src/dfb/dcclient.cpp @@ -27,11 +27,12 @@ #ifndef WX_PRECOMP #include "wx/window.h" + #include "wx/nonownedwnd.h" #endif #include "wx/dfb/private.h" -#define TRACE_PAINT _T("paint") +#define TRACE_PAINT "paint" // =========================================================================== // implementation @@ -45,7 +46,7 @@ // boundaries ("hidden behind its borders"), recursively: static wxRect GetUncoveredWindowArea(wxWindow *win) { - wxRect r(win->GetRect()); + wxRect r(win->GetSize()); if ( win->IsTopLevel() ) return r; @@ -58,6 +59,11 @@ static wxRect GetUncoveredWindowArea(wxWindow *win) // coordinates; this will remove parts of 'r' that are outside of the // parent's area: wxRect rp(GetUncoveredWindowArea(parent)); + + // normal windows cannot extend out of its parent's client area: + if ( !win->CanBeOutsideClientArea() ) + rp.Intersect(parent->GetClientRect()); + rp.Offset(-win->GetPosition()); rp.Offset(-parent->GetClientAreaOrigin()); r.Intersect(rp); @@ -71,10 +77,19 @@ static wxRect GetUncoveredWindowArea(wxWindow *win) static wxIDirectFBSurfacePtr CreateDummySurface(wxWindow *win, const wxRect *rect) { - wxLogTrace(TRACE_PAINT, _T("%p ('%s'): creating dummy DC surface"), + wxLogTrace(TRACE_PAINT, "%p ('%s'): creating dummy DC surface", win, win->GetName().c_str()); wxSize size(rect ? rect->GetSize() : win->GetSize()); - return win->GetDfbSurface()->CreateCompatible(size); + + // we can't create a surface of 0 size but the size of the window may be 0, + // so ensure that we have at least a single pixel to draw on + size.IncTo(wxSize(1, 1)); + + return win->GetDfbSurface()->CreateCompatible + ( + size, + wxIDirectFBSurface::CreateCompatible_NoBackBuffer + ); } //----------------------------------------------------------------------------- @@ -90,41 +105,36 @@ wxWindowDC::wxWindowDC(wxWindow *win) void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect) { - wxCHECK_RET( win, _T("invalid window") ); + wxCHECK_RET( win, "invalid window" ); + + m_win = win; // obtain the surface used for painting: wxPoint origin; wxIDirectFBSurfacePtr surface; + 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: - 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; + // 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); + r = rectOrig; const wxRegion& updateRegion = win->GetUpdateRegion(); if ( win->GetTLW()->IsPainting() && !updateRegion.IsEmpty() ) { r.Intersect(updateRegion.AsRect()); + wxCHECK_RET( !r.IsEmpty(), "invalid painting rectangle" ); + // parent TLW will flip the entire surface when painting is done m_shouldFlip = false; - - wxCHECK_RET( !r.IsEmpty(), _T("invalid painting rectangle") ); } else { @@ -137,41 +147,50 @@ void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect) // 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)); - if ( r.IsEmpty() ) - { - // the window is fully hidden, we can't paint on it, so create - // a dummy surface as above - surface = CreateDummySurface(win, &rectOrig); - m_shouldFlip = false; - } - else - { - DFBRectangle dfbrect = { r.x, r.y, r.width, r.height }; - surface = win->GetDfbSurface()->GetSubSurface(&dfbrect); - - // paint the results immediately - m_shouldFlip = true; - } + m_shouldFlip = true; // paint the results immediately } + } - // if the DC was clipped thanks to rectPaint, we must adjust the origin - // accordingly; but we do *not* adjust for 'rect', because + // 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 // 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); + // m_shouldFlip was set in the "if" block above this one } if ( !surface ) return; - Init(surface); + wxLogTrace(TRACE_PAINT, + "%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); + + DFBInit(surface); SetFont(win->GetFont()); // offset coordinates to account for subsurface's origin coordinates: @@ -190,8 +209,18 @@ wxWindowDC::~wxWindowDC() 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 @@ -205,7 +234,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) wxClientDC::wxClientDC(wxWindow *win) { - wxCHECK_RET( win, _T("invalid window") ); + wxCHECK_RET( win, "invalid window" ); wxRect rect = win->GetClientRect(); InitForWin(win, &rect);