missing commit

[wxWidgets.git] / src / dfb / toplevel.cpp

diff --git a/src/dfb/toplevel.cpp b/src/dfb/toplevel.cpp
index 41b05ce9b1a74273aa0ec8d5c72c339701c99bfa..8a5ef12fa92229a3a218421206f911fcd432c47d 100644 (file)
--- a/src/dfb/toplevel.cpp
+++ b/src/dfb/toplevel.cpp
@@ -15,65 +15,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/dynarray.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/hashmap.h"
-#include "wx/evtloop.h"

 #include "wx/dfb/private.h"
 
 #include "wx/dfb/private.h"
 

-#define TRACE_EVENTS _T("events")
-#define TRACE_PAINT  _T("paint")
-
-// ============================================================================
-// globals
-// ============================================================================
-
-// mapping of DirectFB windows to wxTLWs:
-WX_DECLARE_HASH_MAP(DFBWindowID, wxTopLevelWindowDFB*,
-                    wxIntegerHash, wxIntegerEqual,
-                    wxDfbWindowsMap);
-static wxDfbWindowsMap gs_dfbWindowsMap;
-
-// ============================================================================
-// helpers
-// ============================================================================
-
-struct wxDfbPaintRequest
-{
-    wxDfbPaintRequest(const wxRect& rect, bool eraseBackground)
-        : m_rect(rect), m_eraseBackground(eraseBackground) {}
-    wxDfbPaintRequest(const wxDfbPaintRequest& r)
-        : m_rect(r.m_rect), m_eraseBackground(r.m_eraseBackground) {}
-
-    wxRect m_rect;
-    bool   m_eraseBackground;
-};
-
-WX_DEFINE_ARRAY_PTR(wxDfbPaintRequest*, wxDfbQueuedPaintRequestsList);
-
-// Queue of paint requests
-class wxDfbQueuedPaintRequests
-{
-public:
-    ~wxDfbQueuedPaintRequests() { Clear(); }
-
-    // Adds paint request to the queue
-    void Add(const wxRect& rect, bool eraseBack)
-        { m_queue.push_back(new wxDfbPaintRequest(rect, eraseBack)); }
-
-    // Is the queue empty?
-    bool IsEmpty() const { return m_queue.empty(); }
-
-    // Empties the queue
-    void Clear() { WX_CLEAR_ARRAY(m_queue); }
-
-    // Gets requests in the queue
-    const wxDfbQueuedPaintRequestsList& GetRequests() const { return m_queue; }
-
-private:
-    wxDfbQueuedPaintRequestsList m_queue;
-};
+#define TRACE_EVENTS "events"

 
 // ============================================================================
 // wxTopLevelWindowDFB
 
 // ============================================================================
 // wxTopLevelWindowDFB


@@ -85,12 +31,8 @@ private:
 
 void wxTopLevelWindowDFB::Init()
 {
 
 void wxTopLevelWindowDFB::Init()
 {

-    m_isShown = false;

     m_isMaximized = false;
     m_fsIsShowing = false;
     m_isMaximized = false;
     m_fsIsShowing = false;

-    m_sizeSet = false;
-    m_opacity = 255;
-    m_toPaint = new wxDfbQueuedPaintRequests;

 }
 
 bool wxTopLevelWindowDFB::Create(wxWindow *parent,
 }
 
 bool wxTopLevelWindowDFB::Create(wxWindow *parent,


@@ -101,8 +43,6 @@ bool wxTopLevelWindowDFB::Create(wxWindow *parent,
                                  long style,
                                  const wxString &name)
 {
                                  long style,
                                  const wxString &name)
 {

-    m_tlw = this;
-

     // always create a frame of some reasonable, even if arbitrary, size (at
     // least for MSW compatibility)
     wxSize size(sizeOrig);
     // always create a frame of some reasonable, even if arbitrary, size (at
     // least for MSW compatibility)
     wxSize size(sizeOrig);


@@ -121,114 +61,23 @@ bool wxTopLevelWindowDFB::Create(wxWindow *parent,
     if ( pos.y == wxDefaultCoord )
         pos.y = 0;
 
     if ( pos.y == wxDefaultCoord )
         pos.y = 0;
 

-    // create DirectFB window:
-    wxIDirectFBDisplayLayerPtr layer(wxIDirectFB::Get()->GetDisplayLayer());
-    wxCHECK_MSG( layer, false, _T("no display layer") );
-
-    DFBWindowDescription desc;
-    desc.flags = (DFBWindowDescriptionFlags)
-                   (DWDESC_CAPS |
-                    DWDESC_WIDTH | DWDESC_HEIGHT | DWDESC_POSX | DWDESC_POSY);
-    desc.caps = DWCAPS_DOUBLEBUFFER;
-    desc.posx = pos.x;
-    desc.posy = pos.y;
-    desc.width = size.x;
-    desc.height = size.y;
-    m_dfbwin = layer->CreateWindow(&desc);
-    if ( !layer )
-        return false;
-
-    // add the new TLW to DFBWindowID->wxTLW map:
-    DFBWindowID winid;
-    if ( !m_dfbwin->GetID(&winid) )
+    if ( !wxNonOwnedWindow::Create(parent, id, pos, size, style, name) )

         return false;
         return false;

-    gs_dfbWindowsMap[winid] = this;
-
-    // TLWs are created initially hidden:
-    if ( !m_dfbwin->SetOpacity(wxALPHA_TRANSPARENT) )
-        return false;
-
-    wxWindow::Create(NULL, id, pos, size, style, name);
-
-    SetParent(parent);
-    if ( parent )
-        parent->AddChild(this);

 
     wxTopLevelWindows.Append(this);
     m_title = title;
 
 
     wxTopLevelWindows.Append(this);
     m_title = title;
 

-    if ( style & (wxSTAY_ON_TOP | wxPOPUP_WINDOW) )
-    {
-        m_dfbwin->SetStackingClass(DWSC_UPPER);
-    }
-
-    // direct events in this window to the global event buffer:
-    m_dfbwin->AttachEventBuffer(wxEventLoop::GetDirectFBEventBuffer());
-

     return true;
 }
 
     return true;
 }
 

-wxTopLevelWindowDFB::~wxTopLevelWindowDFB()
-{
-    m_isBeingDeleted = true;
-
-    wxTopLevelWindows.DeleteObject(this);
-
-    if ( wxTheApp->GetTopWindow() == this )
-        wxTheApp->SetTopWindow(NULL);
-
-    if ( wxTopLevelWindows.empty() && wxTheApp->GetExitOnFrameDelete() )
-    {
-        wxTheApp->ExitMainLoop();
-    }
-
-    wxDELETE(m_toPaint);
-
-    // remove the TLW from DFBWindowID->wxTLW map:
-    DFBWindowID winid;
-    if ( m_dfbwin->GetID(&winid) )
-        gs_dfbWindowsMap.erase(winid);
-}
-
-// ----------------------------------------------------------------------------
-// window size & position
-// ----------------------------------------------------------------------------
-
-void wxTopLevelWindowDFB::DoGetPosition(int *x, int *y) const
-{
-    m_dfbwin->GetPosition(x, y);
-}
-
-void wxTopLevelWindowDFB::DoGetSize(int *width, int *height) const
-{
-    m_dfbwin->GetSize(width, height);
-}
-
-void wxTopLevelWindowDFB::DoMoveWindow(int x, int y, int width, int height)
-{
-    wxPoint curpos = GetPosition();
-    if ( curpos.x != x || curpos.y != y )
-    {
-        m_dfbwin->MoveTo(x, y);
-    }
-
-    wxSize cursize = GetSize();
-    if ( cursize.x != width || cursize.y != height )
-    {
-        m_dfbwin->Resize(width, height);
-        // we must repaint the window after it changed size:
-        Refresh();
-    }
-}
-

 // ----------------------------------------------------------------------------
 // showing and hiding
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // showing and hiding
 // ----------------------------------------------------------------------------
 

-#warning "FIXME: the rest of this file is almost same as for MGL, merge it"

 bool wxTopLevelWindowDFB::ShowFullScreen(bool show, long style)
 {
 bool wxTopLevelWindowDFB::ShowFullScreen(bool show, long style)
 {

-    if (show == m_fsIsShowing) return false; // return what?
+    if ( show == m_fsIsShowing )
+        return true;

 
     m_fsIsShowing = show;
 
 
     m_fsIsShowing = show;
 


@@ -258,32 +107,6 @@ bool wxTopLevelWindowDFB::ShowFullScreen(bool show, long style)
     return true;
 }
 
     return true;
 }
 

-bool wxTopLevelWindowDFB::Show(bool show)
-{
-    if ( !wxTopLevelWindowBase::Show(show) )
-        return false;
-
-    // hide/show the window by setting its opacity to 0/full:
-    m_dfbwin->SetOpacity(show ? m_opacity : 0);
-
-    // If this is the first time Show was called, send size event,
-    // so that the frame can adjust itself (think auto layout or single child)
-    if ( !m_sizeSet )
-    {
-        m_sizeSet = true;
-        wxSizeEvent event(GetSize(), GetId());
-        event.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(event);
-    }
-
-    // FIXME_DFB: do this at all?
-    if ( show && AcceptsFocus() )
-        SetFocus();
-        // FIXME_DFB -- don't do this for popup windows?
-
-    return true;
-}
-

 bool wxTopLevelWindowDFB::SetTransparent(wxByte alpha)
 {
     if ( IsShown() )
 bool wxTopLevelWindowDFB::SetTransparent(wxByte alpha)
 {
     if ( IsShown() )


@@ -345,142 +168,39 @@ bool wxTopLevelWindowDFB::IsIconized() const
     return false;
 }
 
     return false;
 }
 

-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// surfaces and painting
+// focus handling

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxIDirectFBSurfacePtr wxTopLevelWindowDFB::ObtainDfbSurface() const
-{
-    return m_dfbwin->GetSurface();
-}
-
-void wxTopLevelWindowDFB::HandleQueuedPaintRequests()
-{
-    if ( m_toPaint->IsEmpty() )
-        return; // nothing to do
-
-    if ( IsFrozen() || !IsShown() )
-    {
-        // nothing to do if the window is frozen or hidden; clear the queue
-        // and return (note that it's OK to clear the queue even if the window
-        // is frozen, because Thaw() calls Refresh()):
-        m_toPaint->Clear();
-        return;
-    }
-
-    const wxDfbQueuedPaintRequestsList& requests = m_toPaint->GetRequests();
-
-    // process queued paint requests:
-    wxRect winRect(wxPoint(0, 0), GetSize());
-    wxRect paintedRect;
-
-    size_t cnt = requests.size();
-    for ( size_t i = 0; i < cnt; ++i )
-    {
-        const wxDfbPaintRequest& request = *requests[i];
-
-        wxRect clipped(request.m_rect);
-
-        wxLogTrace(TRACE_PAINT,
-                   _T("%p ('%s'): processing paint request [x=%i,y=%i,w=%i,h=%i]"),
-                   this, GetName().c_str(),
-                   clipped.x, clipped.y, clipped.width, clipped.height);
-
-        clipped.Intersect(winRect);
-        if ( clipped.IsEmpty() )
-            continue; // nothing to refresh
-
-        PaintWindow(clipped, request.m_eraseBackground);
-
-        // remember rectangle covering all repainted areas:
-        if ( paintedRect.IsEmpty() )
-            paintedRect = clipped;
-        else
-            paintedRect.Union(clipped);
-    }
-
-    m_toPaint->Clear();
-
-    if ( paintedRect.IsEmpty() )
-        return; // no painting occurred, no need to flip
-
-    // flip the surface to make the changes visible:
-    DFBRegion r = {paintedRect.GetLeft(), paintedRect.GetTop(),
-                   paintedRect.GetRight(), paintedRect.GetBottom()};
-    DFBRegion *rptr = (winRect == paintedRect) ? NULL : &r;
-
-    GetDfbSurface()->Flip(rptr, DSFLIP_NONE);
-}
-
-void wxTopLevelWindowDFB::DoRefreshRect(const wxRect& rect, bool eraseBack)
-{
-    // defer painting until idle time or until Update() is called:
-    m_toPaint->Add(rect, eraseBack);
-}
-
-void wxTopLevelWindowDFB::Update()
-{
-    HandleQueuedPaintRequests();
-}
-
-// ---------------------------------------------------------------------------
-// events handling
-// ---------------------------------------------------------------------------
-
-/* static */
-void wxTopLevelWindowDFB::HandleDFBWindowEvent(const wxDFBWindowEvent& event_)
+void wxTopLevelWindowDFB::HandleFocusEvent(const wxDFBWindowEvent& event_)

 {
 {

-    const DFBWindowEvent& event = event_;
+    const DFBWindowEvent& dfbevent = event_;
+    const bool activate = (dfbevent.type == DWET_GOTFOCUS);

 
 

-    if ( gs_dfbWindowsMap.find(event.window_id) == gs_dfbWindowsMap.end() )
-    {
-        wxLogTrace(TRACE_EVENTS,
-                   _T("received event for unknown DirectFB window, ignoring"));
-        return;
-    }
+    wxLogTrace(TRACE_EVENTS,
+               "toplevel window %p ('%s') %s focus",
+               this, GetName(),
+               activate ? "got" : "lost");

 
 

-    wxTopLevelWindowDFB *tlw = gs_dfbWindowsMap[event.window_id];
-    wxWindow *recipient = NULL;
-    void (wxWindow::*handlerFunc)(const wxDFBWindowEvent&) = NULL;
+    wxActivateEvent event(wxEVT_ACTIVATE, activate, GetId());
+    event.SetEventObject(this);
+    HandleWindowEvent(event);

 
 

-    switch ( event.type )
+    // if a frame that doesn't have wx focus inside it just got focus, we
+    // need to set focus to it (or its child):
+    if ( activate )

     {
     {

-        case DWET_KEYDOWN:
-        case DWET_KEYUP:
+        wxWindow *focused = wxWindow::FindFocus();
+        if ( !focused || focused->GetTLW() != this )

         {
         {

-            recipient = wxWindow::FindFocus();
-            handlerFunc = &wxWindowDFB::HandleKeyEvent;
-            break;
+            wxLogTrace(TRACE_EVENTS,
+                       "setting wx focus to toplevel window %p ('%s')",
+                       this, GetName());
+
+            if ( CanAcceptFocus() )
+                SetFocus();
+            else
+                wxLogTrace(TRACE_EVENTS, "...which doesn't accept it");

         }
         }

-
-        case DWET_NONE:
-        case DWET_ALL:
-        {
-            wxFAIL_MSG( _T("invalid event type") );
-            break;
-        }
-    }
-
-    if ( !recipient )
-    {
-        wxLogTrace(TRACE_EVENTS, _T("ignoring event: no recipient window"));
-        return;

     }
     }

-
-    wxCHECK_RET( recipient && recipient->GetTLW() == tlw,
-                 _T("event recipient not in TLW which received the event") );
-
-    // process the event:
-    (recipient->*handlerFunc)(event_);
-}
-
-// ---------------------------------------------------------------------------
-// idle events processing
-// ---------------------------------------------------------------------------
-
-void wxTopLevelWindowDFB::OnInternalIdle()
-{
-    wxTopLevelWindowBase::OnInternalIdle();
-    HandleQueuedPaintRequests();

 }
 }