6 files changed, 50 insertions, 12 deletions

diff --git a/src/platformsupport/fbconvenience/qfbcursor.cpp b/src/platformsupport/fbconvenience/qfbcursor.cpp
index fecf9f6380..b86f5830ea 100644
--- a/src/platformsupport/fbconvenience/qfbcursor.cpp
+++ b/src/platformsupport/fbconvenience/qfbcursor.cpp
@@ -137,5 +137,12 @@ void QFbCursor::changeCursor(QCursor * widgetCursor, QWindow *window)
 }
 #endif
 
-QT_END_NAMESPACE
+void QFbCursor::setDirty()
+{
+    if (!mDirty) {
+        mDirty = true;
+        mScreen->scheduleUpdate();
+    }
+}
 
+QT_END_NAMESPACE
diff --git a/src/platformsupport/fbconvenience/qfbcursor_p.h b/src/platformsupport/fbconvenience/qfbcursor_p.h
index cee9f56ab5..40377e2075 100644
--- a/src/platformsupport/fbconvenience/qfbcursor_p.h
+++ b/src/platformsupport/fbconvenience/qfbcursor_p.h
@@ -63,7 +63,7 @@ public:
     virtual void changeCursor(QCursor *widgetCursor, QWindow *window);
 #endif
 
-    virtual void setDirty() { mDirty = true; /* screen->setDirty(QRect()); */ }
+    virtual void setDirty();
     virtual bool isDirty() const { return mDirty; }
     virtual bool isOnScreen() const { return mOnScreen; }
     virtual QRect lastPainted() const { return mPrevRect; }
diff --git a/src/platformsupport/fbconvenience/qfbscreen.cpp b/src/platformsupport/fbconvenience/qfbscreen.cpp
index e5b9f09c14..37d16ddeb6 100644
--- a/src/platformsupport/fbconvenience/qfbscreen.cpp
+++ b/src/platformsupport/fbconvenience/qfbscreen.cpp
@@ -149,9 +149,13 @@ void QFbScreen::setDirty(const QRect &rect)
     QRect intersection = rect.intersected(mGeometry);
     QPoint screenOffset = mGeometry.topLeft();
     mRepaintRegion += intersection.translated(-screenOffset);    // global to local translation
-    if (!mRedrawTimer.isActive()) {
+    scheduleUpdate();
+}
+
+void QFbScreen::scheduleUpdate()
+{
+    if (!mRedrawTimer.isActive())
         mRedrawTimer.start();
-    }
 }
 
 void QFbScreen::setPhysicalSize(const QSize &size)
@@ -254,8 +258,9 @@ QRegion QFbScreen::doRedraw()
                     QRect windowRect = mWindowStack[layerIndex]->geometry().translated(-screenOffset);
                     QRect windowIntersect = rect.translated(-windowRect.left(),
                                                             -windowRect.top());
-                    mCompositePainter->drawImage(rect, mWindowStack[layerIndex]->backingStore()->image(),
-                                                windowIntersect);
+                    QFbBackingStore *backingStore = mWindowStack[layerIndex]->backingStore();
+                    if (backingStore)
+                        mCompositePainter->drawImage(rect, backingStore->image(), windowIntersect);
                     if (firstLayer) {
                         firstLayer = false;
                     }
diff --git a/src/platformsupport/fbconvenience/qfbscreen_p.h b/src/platformsupport/fbconvenience/qfbscreen_p.h
index 01a352e96a..dd940c4a1d 100644
--- a/src/platformsupport/fbconvenience/qfbscreen_p.h
+++ b/src/platformsupport/fbconvenience/qfbscreen_p.h
@@ -45,6 +45,7 @@
 #include <qpa/qplatformscreen.h>
 #include <QtCore/QTimer>
 #include <QtCore/QSize>
+#include "qfbcursor_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -60,13 +61,14 @@ public:
     QFbScreen();
     ~QFbScreen();
 
-    virtual QRect geometry() const { return mGeometry; }
-    virtual int depth() const { return mDepth; }
-    virtual QImage::Format format() const { return mFormat; }
-    virtual QSizeF physicalSize() const { return mPhysicalSize; }
+    QRect geometry() const Q_DECL_OVERRIDE { return mGeometry; }
+    int depth() const Q_DECL_OVERRIDE { return mDepth; }
+    QImage::Format format() const Q_DECL_OVERRIDE { return mFormat; }
+    QSizeF physicalSize() const Q_DECL_OVERRIDE { return mPhysicalSize; }
+    QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return mCursor; }
 
     QWindow *topWindow() const;
-    virtual QWindow *topLevelAt(const QPoint & p) const;
+    QWindow *topLevelAt(const QPoint & p) const Q_DECL_OVERRIDE;
 
     // compositor api
     virtual void addWindow(QFbWindow *window);
@@ -77,6 +79,8 @@ public:
 
     void addBackingStore(QFbBackingStore *bs) {mBackingStores << bs;}
 
+    void scheduleUpdate();
+
 public slots:
     virtual void setDirty(const QRect &rect);
     void setPhysicalSize(const QSize &size);
@@ -114,4 +118,3 @@ private:
 QT_END_NAMESPACE
 
 #endif // QFBSCREEN_P_H
-
diff --git a/src/platformsupport/fbconvenience/qfbwindow.cpp b/src/platformsupport/fbconvenience/qfbwindow.cpp
index 246f50b4a9..8b6186db79 100644
--- a/src/platformsupport/fbconvenience/qfbwindow.cpp
+++ b/src/platformsupport/fbconvenience/qfbwindow.cpp
@@ -77,6 +77,26 @@ void QFbWindow::setGeometry(const QRect &rect)
     QPlatformWindow::setGeometry(rect);
 }
 
+void QFbWindow::setVisible(bool visible)
+{
+    if (visible) {
+        if (mWindowState & Qt::WindowFullScreen)
+            setGeometry(platformScreen()->geometry());
+        else if (mWindowState & Qt::WindowMaximized)
+            setGeometry(platformScreen()->availableGeometry());
+    }
+    QPlatformWindow::setVisible(visible);
+}
+
+
+void QFbWindow::setWindowState(Qt::WindowState state)
+{
+    QPlatformWindow::setWindowState(state);
+    mWindowState = state;
+    platformScreen()->invalidateRectCache();
+}
+
+
 void QFbWindow::setWindowFlags(Qt::WindowFlags flags)
 {
     mWindowFlags = flags;
diff --git a/src/platformsupport/fbconvenience/qfbwindow_p.h b/src/platformsupport/fbconvenience/qfbwindow_p.h
index 25e2afca14..5ad921b0d7 100644
--- a/src/platformsupport/fbconvenience/qfbwindow_p.h
+++ b/src/platformsupport/fbconvenience/qfbwindow_p.h
@@ -59,7 +59,9 @@ public:
     virtual void lower();
 
     virtual void setGeometry(const QRect &rect);
+    virtual void setVisible(bool visible);
 
+    virtual void setWindowState(Qt::WindowState state);
     virtual void setWindowFlags(Qt::WindowFlags type);
     virtual Qt::WindowFlags windowFlags() const;
 
@@ -78,6 +80,7 @@ protected:
     QFbBackingStore *mBackingStore;
     QRect mOldGeometry;
     Qt::WindowFlags mWindowFlags;
+    Qt::WindowState mWindowState;
 
     WId mWindowId;
 };