X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f7eb299f00935a2d83ed3443c3a18260bb02427..66c71d8a3d5dff6759b941eed4762896a76e9642:/src/dfb/window.cpp diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp index 121ffb80a5..9e33f696c7 100644 --- a/src/dfb/window.cpp +++ b/src/dfb/window.cpp @@ -28,11 +28,14 @@ #ifndef WX_PRECOMP #include "wx/dcclient.h" + #include "wx/nonownedwnd.h" #endif #include "wx/caret.h" +#include "wx/dynarray.h" #include "wx/dfb/private.h" +#include "wx/private/overlay.h" #define TRACE_EVENTS _T("events") #define TRACE_PAINT _T("paint") @@ -53,6 +56,12 @@ static wxWindow *gs_toBeFocusedWindow = NULL; // the window that has mouse capture static wxWindowDFB *gs_mouseCapture = NULL; +// --------------------------------------------------------------------------- +// overlays support +// --------------------------------------------------------------------------- + +WX_DEFINE_ARRAY_PTR(wxOverlayImpl*, wxDfbOverlaysList); + // --------------------------------------------------------------------------- // event tables // --------------------------------------------------------------------------- @@ -72,6 +81,7 @@ void wxWindowDFB::Init() m_isShown = true; m_frozenness = 0; m_tlw = NULL; + m_overlays = NULL; } // Destructor @@ -84,25 +94,6 @@ wxWindowDFB::~wxWindowDFB() if ( gs_mouseCapture == this ) ReleaseMouse(); -#warning "FIXME: what to do with gs_activeFrame here and elsewhere?" -#if 0 - if (gs_activeFrame == this) - { - gs_activeFrame = NULL; - // activate next frame in Z-order: - if ( m_wnd->prev ) - { - wxWindowDFB *win = (wxWindowDFB*)m_wnd->prev->userData; - win->SetFocus(); - } - else if ( m_wnd->next ) - { - wxWindowDFB *win = (wxWindowDFB*)m_wnd->next->userData; - win->SetFocus(); - } - } -#endif - if ( gs_focusedWindow == this ) DFBKillFocus(); @@ -203,7 +194,8 @@ void wxWindowDFB::SetFocus() gs_focusedWindow = this; - if ( IsShownOnScreen() ) + if ( IsShownOnScreen() && + (!oldFocusedWindow || oldFocusedWindow->GetTLW() != m_tlw) ) { m_tlw->SetDfbFocus(); } @@ -211,26 +203,6 @@ void wxWindowDFB::SetFocus() // are hidden; when the TLW becomes visible, it will set the focus // to use from wxTLW::Show() - #warning "FIXME: implement in terms of DWET_{GOT,LOST}FOCUS" - #warning "FIXME: keep this or not? not, think multiapp core" -#if 0 - wxWindowDFB *active = wxGetTopLevelParent((wxWindow*)this); - if ( !(m_windowStyle & wxPOPUP_WINDOW) && active != gs_activeFrame ) - { - if ( gs_activeFrame ) - { - wxActivateEvent event(wxEVT_ACTIVATE, false, gs_activeFrame->GetId()); - event.SetEventObject(gs_activeFrame); - gs_activeFrame->GetEventHandler()->ProcessEvent(event); - } - - gs_activeFrame = active; - wxActivateEvent event(wxEVT_ACTIVATE, true, gs_activeFrame->GetId()); - event.SetEventObject(gs_activeFrame); - gs_activeFrame->GetEventHandler()->ProcessEvent(event); - } -#endif - // notify the parent keeping track of focus for the kbd navigation // purposes that we got it wxChildFocusEvent eventFocus((wxWindow*)this); @@ -291,30 +263,6 @@ bool wxWindowDFB::Show(bool show) // parent area at the place of this window (if hiding): DoRefreshWindow(); -#warning "FIXME: all of this must be implemented for DFB" -#if 0 - DFB_wmShowWindow(m_wnd, show); - - if (!show && gs_activeFrame == this) - { - // activate next frame in Z-order: - if ( m_wnd->prev ) - { - wxWindowDFB *win = (wxWindowDFB*)m_wnd->prev->userData; - win->SetFocus(); - } - else if ( m_wnd->next ) - { - wxWindowDFB *win = (wxWindowDFB*)m_wnd->next->userData; - win->SetFocus(); - } - else - { - gs_activeFrame = NULL; - } - } -#endif - return true; } @@ -483,6 +431,15 @@ void wxWindowDFB::DoMoveWindow(int x, int y, int width, int height) { // queue both former and new position of the window for repainting: wxWindow *parent = GetParent(); + + // only refresh the visible parts: + if ( !CanBeOutsideClientArea() ) + { + wxRect parentClient(parent->GetClientSize()); + oldpos.Intersect(parentClient); + newpos.Intersect(parentClient); + } + parent->RefreshRect(oldpos); parent->RefreshRect(newpos); } @@ -623,7 +580,7 @@ void wxWindowDFB::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect) // NB[1]: We intentionally ignore the eraseBack argument here. This is // because of the way wxDFB's painting is implemented: the refresh - // request is probagated up to wxTLW, which is then painted in + // request is propagated up to wxTLW, which is then painted in // top-down order. This means that this window's area is first // painted by its parent and this window is then painted over it, so // it's not safe to not paint this window's background even if @@ -638,6 +595,14 @@ void wxWindowDFB::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect) DoRefreshWindow(); } +void wxWindowDFB::RefreshWindowRect(const wxRect& rect) +{ + if ( !IsShown() || IsFrozen() ) + return; + + DoRefreshRect(rect); +} + void wxWindowDFB::DoRefreshWindow() { // NB: DoRefreshRect() takes window coords, not client, so this is correct @@ -665,6 +630,11 @@ void wxWindowDFB::DoRefreshRect(const wxRect& rect) r.Offset(GetPosition()); r.Offset(parent->GetClientAreaOrigin()); + // normal windows cannot extend out of its parent's client area, so don't + // refresh any hidden parts: + if ( !CanBeOutsideClientArea() ) + r.Intersect(parent->GetClientRect()); + parent->DoRefreshRect(r); } @@ -701,21 +671,11 @@ void wxWindowDFB::PaintWindow(const wxRect& rect) this, GetName().c_str(), rect.x, rect.y, rect.GetRight(), rect.GetBottom()); -#if wxUSE_CARET - // FIXME: we're doing this before setting m_updateRegion because wxDFB - // clips all DCs for this window to it, but this results in flicker, - // it should be fixed by using overlays for the caret - - // must hide caret temporarily, otherwise we'd get rendering artifacts - wxCaret *caret = GetCaret(); - if ( caret ) - caret->Hide(); -#endif // wxUSE_CARET - m_updateRegion = rect; // FIXME_DFB: don't waste time rendering the area if it's fully covered // by some children, go directly to rendering the children + // (unless some child has HasTransparentBackground()=true!) // NB: unconditionally send wxEraseEvent, because our implementation of // wxWindow::Refresh() ignores the eraseBack argument @@ -752,14 +712,14 @@ void wxWindowDFB::PaintWindow(const wxRect& rect) this, GetName().c_str()); } + // draw window's overlays on top of the painted window, if we have any: + PaintOverlays(rect); + m_updateRegion.Clear(); -#if wxUSE_CARET - // FIXME: this should be ideally done before m_updateRegion.Clear() or not - // at all, see the comment where the caret is hidden - if ( caret ) - caret->Show(); -#endif // wxUSE_CARET + // client area portion of 'rect': + wxRect rectClientOnly(rect); + rectClientOnly.Intersect(clientRect); // paint the children: wxPoint origin = GetClientAreaOrigin(); @@ -775,7 +735,12 @@ void wxWindowDFB::PaintWindow(const wxRect& rect) // compute child's area to repaint wxRect childrect(child->GetRect()); childrect.Offset(origin); - childrect.Intersect(rect); + + if ( child->CanBeOutsideClientArea() ) + childrect.Intersect(rect); + else + childrect.Intersect(rectClientOnly); + if ( childrect.IsEmpty() ) continue; @@ -786,6 +751,61 @@ void wxWindowDFB::PaintWindow(const wxRect& rect) } } +void wxWindowDFB::PaintOverlays(const wxRect& rect) +{ + if ( !m_overlays ) + return; + + for ( wxDfbOverlaysList::const_iterator i = m_overlays->begin(); + i != m_overlays->end(); ++i ) + { + // FIXME: the cast is necessary for STL build where the iterator + // (incorrectly) returns void* and not wxOverlayImpl* + wxOverlayImpl *overlay = (wxOverlayImpl*) *i; + + wxRect orectOrig(overlay->GetRect()); + wxRect orect(orectOrig); + orect.Intersect(rect); + if ( orect.IsEmpty() ) + continue; + + if ( overlay->IsEmpty() ) + continue; // nothing to paint + + DFBRectangle dfbRect = { orect.x - orectOrig.x, orect.y - orectOrig.y, + orect.width, orect.height }; + GetDfbSurface()->Blit + ( + overlay->GetDirectFBSurface(), + &dfbRect, + orect.x, orect.y + ); + } +} + +void wxWindowDFB::AddOverlay(wxOverlayImpl *overlay) +{ + if ( !m_overlays ) + m_overlays = new wxDfbOverlaysList; + + m_overlays->Add(overlay); +} + +void wxWindowDFB::RemoveOverlay(wxOverlayImpl *overlay) +{ + wxCHECK_RET( m_overlays, _T("no overlays to remove") ); + + m_overlays->Remove(overlay); + + if ( m_overlays->empty() ) + { + wxDELETE(m_overlays); + } + + if ( !m_isBeingDeleted ) + RefreshWindowRect(overlay->GetRect()); +} + // --------------------------------------------------------------------------- // events handling @@ -862,6 +882,11 @@ static long GetTranslatedKeyCode(DFBInputDeviceKeyIdentifier key_id) KEY(DIKI_CONTROL_R, WXK_CONTROL); KEY(DIKI_ALT_L, WXK_ALT); KEY(DIKI_ALT_R, WXK_ALT); + // this key was removed in 0.9.25 but include it for previous versions + // just to avoid gcc warnings about unhandled enum value in switch +#if !wxCHECK_DFB_VERSION(0, 9, 24) + KEY(DIKI_ALTGR, 0); +#endif KEY(DIKI_META_L, 0); KEY(DIKI_META_R, 0); KEY(DIKI_SUPER_L, 0);