Added list style to text attributes, independent from paragraph style

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

diff --git a/src/dfb/toplevel.cpp b/src/dfb/toplevel.cpp
index b607ecc863cc93b0b33c32a965e986fc8f202652..c7f23b52df4246338aba7e12f37a079631f71de9 100644 (file)
--- a/src/dfb/toplevel.cpp
+++ b/src/dfb/toplevel.cpp
@@ -15,7 +15,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/dynarray.h"

 #endif // WX_PRECOMP
 
 #include "wx/hashmap.h"
 #endif // WX_PRECOMP
 
 #include "wx/hashmap.h"


@@ -39,16 +38,6 @@ static wxDfbWindowsMap gs_dfbWindowsMap;
 // helpers
 // ============================================================================
 
 // helpers
 // ============================================================================
 

-struct wxDfbPaintRequest
-{
-    wxDfbPaintRequest(const wxRect& rect) : m_rect(rect) {}
-    wxDfbPaintRequest(const wxDfbPaintRequest& r) : m_rect(r.m_rect) {}
-
-    wxRect m_rect;
-};
-
-WX_DEFINE_ARRAY_PTR(wxDfbPaintRequest*, wxDfbQueuedPaintRequestsList);
-

 // Queue of paint requests
 class wxDfbQueuedPaintRequests
 {
 // Queue of paint requests
 class wxDfbQueuedPaintRequests
 {


@@ -57,19 +46,35 @@ public:
 
     // Adds paint request to the queue
     void Add(const wxRect& rect)
 
     // Adds paint request to the queue
     void Add(const wxRect& rect)

-        { m_queue.push_back(new wxDfbPaintRequest(rect)); }
+    {
+        // We use a simple implementation here for now: all refresh requests
+        // are merged together into single rectangle that is superset of
+        // all the requested rectangles. This wastes some blitting and painting
+        // time, but OTOH, EVT_PAINT handler is called only once per window.
+        m_invalidated.Union(rect);
+    }

 
     // Is the queue empty?
 
     // Is the queue empty?

-    bool IsEmpty() const { return m_queue.empty(); }
+    bool IsEmpty() const { return m_invalidated.IsEmpty(); }

 
     // Empties the queue
 
     // Empties the queue

-    void Clear() { WX_CLEAR_ARRAY(m_queue); }
+    void Clear() { m_invalidated = wxRect(); }

 
 

-    // Gets requests in the queue
-    const wxDfbQueuedPaintRequestsList& GetRequests() const { return m_queue; }
+    // Gets the next request in the queue, returns true if there was one,
+    // false if the queue was empty
+    bool GetNext(wxRect& rect)
+    {
+        if ( m_invalidated.IsEmpty() )
+            return false;
+
+        rect = m_invalidated;
+        Clear(); // there's only one item in the queue
+        return true;
+    }

 
 private:
 
 private:

-    wxDfbQueuedPaintRequestsList m_queue;
+    // currently invalidated region
+    wxRect m_invalidated;

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -214,7 +219,11 @@ void wxTopLevelWindowDFB::DoMoveWindow(int x, int y, int width, int height)
     wxSize cursize = GetSize();
     if ( cursize.x != width || cursize.y != height )
     {
     wxSize cursize = GetSize();
     if ( cursize.x != width || cursize.y != height )
     {

+        // changing window's size changes its surface:
+        InvalidateDfbSurface();
+

         m_dfbwin->Resize(width, height);
         m_dfbwin->Resize(width, height);

+

         // we must repaint the window after it changed size:
         if ( IsShown() )
             DoRefreshWindow();
         // we must repaint the window after it changed size:
         if ( IsShown() )
             DoRefreshWindow();


@@ -276,10 +285,21 @@ bool wxTopLevelWindowDFB::Show(bool show)
         GetEventHandler()->ProcessEvent(event);
     }
 
         GetEventHandler()->ProcessEvent(event);
     }
 

-    // FIXME_DFB: do this at all?
-    if ( show && AcceptsFocus() )
-        SetFocus();
-        // FIXME_DFB -- don't do this for popup windows?
+    if ( show )
+    {
+        wxWindow *focused = wxWindow::FindFocus();
+        if ( focused && focused->GetTLW() == this )
+        {
+            SetDfbFocus();
+        }
+        else if ( AcceptsFocus() )
+        {
+            // FIXME: we should probably always call SetDfbFocus instead
+            // and call SetFocus() from wxActivateEvent/DWET_GOTFOCUS
+            // handler
+            SetFocus();
+        }
+    }

 
     return true;
 }
 
     return true;
 }


@@ -369,8 +389,6 @@ void wxTopLevelWindowDFB::HandleQueuedPaintRequests()
         return;
     }
 
         return;
     }
 

-    const wxDfbQueuedPaintRequestsList& requests = m_toPaint->GetRequests();
-

     // process queued paint requests:
     wxRect winRect(wxPoint(0, 0), GetSize());
     wxRect paintedRect;
     // process queued paint requests:
     wxRect winRect(wxPoint(0, 0), GetSize());
     wxRect paintedRect;


@@ -380,15 +398,17 @@ void wxTopLevelWindowDFB::HandleQueuedPaintRequests()
     // blit the entire back buffer to front soon
     m_isPainting = true;
 
     // blit the entire back buffer to front soon
     m_isPainting = true;
 

-    size_t cnt = requests.size();
-    wxLogTrace(TRACE_PAINT, _T("%p ('%s'): processing %i paint requests"),
-               this, GetName().c_str(), cnt);
+#ifdef __WXDEBUG__
+    int requestsCount = 0;
+#endif

 
 

-    for ( size_t i = 0; i < cnt; ++i )
+    wxRect request;
+    while ( m_toPaint->GetNext(request) )

     {
     {

-        const wxDfbPaintRequest& request = *requests[i];
-
-        wxRect clipped(request.m_rect);
+#ifdef __WXDEBUG__
+        requestsCount++;
+#endif
+        wxRect clipped(request);

         clipped.Intersect(winRect);
         if ( clipped.IsEmpty() )
             continue; // nothing to refresh
         clipped.Intersect(winRect);
         if ( clipped.IsEmpty() )
             continue; // nothing to refresh


@@ -433,8 +453,9 @@ void wxTopLevelWindowDFB::HandleQueuedPaintRequests()
     GetDfbSurface()->FlipToFront(rptr);
 
     wxLogTrace(TRACE_PAINT,
     GetDfbSurface()->FlipToFront(rptr);
 
     wxLogTrace(TRACE_PAINT,

-               _T("%p ('%s'): flipped surface: [%i,%i,%i,%i]"),
+               _T("%p ('%s'): processed %i paint requests, flipped surface: [%i,%i,%i,%i]"),

                this, GetName().c_str(),
                this, GetName().c_str(),

+               requestsCount,

                paintedRect.x, paintedRect.y,
                paintedRect.GetRight(), paintedRect.GetBottom());
 }
                paintedRect.x, paintedRect.y,
                paintedRect.GetRight(), paintedRect.GetBottom());
 }


@@ -465,6 +486,15 @@ void wxTopLevelWindowDFB::Update()
 // events handling
 // ---------------------------------------------------------------------------
 
 // events handling
 // ---------------------------------------------------------------------------
 

+void wxTopLevelWindowDFB::SetDfbFocus()
+{
+    wxCHECK_RET( IsShown(), _T("cannot set focus to hidden window") );
+    wxASSERT_MSG( FindFocus() && FindFocus()->GetTLW() == this,
+                  _T("setting DirectFB focus to unexpected window") );
+
+    GetDirectFBWindow()->RequestFocus();
+}
+

 /* static */
 void wxTopLevelWindowDFB::HandleDFBWindowEvent(const wxDFBWindowEvent& event_)
 {
 /* static */
 void wxTopLevelWindowDFB::HandleDFBWindowEvent(const wxDFBWindowEvent& event_)
 {


@@ -497,6 +527,10 @@ void wxTopLevelWindowDFB::HandleDFBWindowEvent(const wxDFBWindowEvent& event_)
             wxFAIL_MSG( _T("invalid event type") );
             break;
         }
             wxFAIL_MSG( _T("invalid event type") );
             break;
         }

+
+        default:
+            // we're not interested in them here
+            break;

     }
 
     if ( !recipient )
     }
 
     if ( !recipient )