3 files changed, 47 insertions, 19 deletions

diff --git a/src/plugins/platforms/haiku/qhaikuclipboard.cpp b/src/plugins/platforms/haiku/qhaikuclipboard.cpp
index f3aa9dc36e..a2d7e96d71 100644
--- a/src/plugins/platforms/haiku/qhaikuclipboard.cpp
+++ b/src/plugins/platforms/haiku/qhaikuclipboard.cpp
@@ -41,6 +41,8 @@
 #include <Clipboard.h>
 
 QHaikuClipboard::QHaikuClipboard()
+    : m_systemMimeData(Q_NULLPTR)
+    , m_userMimeData(Q_NULLPTR)
 {
     if (be_clipboard)
         be_clipboard->StartWatching(BMessenger(this));
@@ -50,17 +52,26 @@ QHaikuClipboard::~QHaikuClipboard()
 {
     if (be_clipboard)
         be_clipboard->StopWatching(BMessenger(this));
+
+    delete m_userMimeData;
+    delete m_systemMimeData;
 }
 
 QMimeData *QHaikuClipboard::mimeData(QClipboard::Mode mode)
 {
-    QMimeData *mimeData = new QMimeData();
-
     if (mode != QClipboard::Clipboard)
-        return mimeData;
+        return 0;
+
+    if (m_userMimeData)
+        return m_userMimeData;
 
     if (!be_clipboard->Lock())
-        return mimeData;
+        return 0;
+
+    if (!m_systemMimeData)
+        m_systemMimeData = new QMimeData();
+    else
+        m_systemMimeData->clear();
 
     const BMessage *clipboard = be_clipboard->Data();
     if (clipboard) {
@@ -76,11 +87,11 @@ QMimeData *QHaikuClipboard::mimeData(QClipboard::Mode mode)
             if (dataLen && (status == B_OK)) {
                 const QString format = QString::fromLatin1(name);
                 if (format == QStringLiteral("text/plain")) {
-                    mimeData->setText(QString::fromLocal8Bit(reinterpret_cast<const char*>(data), dataLen));
+                    m_systemMimeData->setText(QString::fromLocal8Bit(reinterpret_cast<const char*>(data), dataLen));
                 } else if (format == QStringLiteral("text/html")) {
-                    mimeData->setHtml(QString::fromLocal8Bit(reinterpret_cast<const char*>(data), dataLen));
+                    m_systemMimeData->setHtml(QString::fromLocal8Bit(reinterpret_cast<const char*>(data), dataLen));
                 } else {
-                    mimeData->setData(format, QByteArray(reinterpret_cast<const char*>(data), dataLen));
+                    m_systemMimeData->setData(format, QByteArray(reinterpret_cast<const char*>(data), dataLen));
                 }
             }
         }
@@ -88,7 +99,7 @@ QMimeData *QHaikuClipboard::mimeData(QClipboard::Mode mode)
 
     be_clipboard->Unlock();
 
-    return mimeData;
+    return m_systemMimeData;
 }
 
 void QHaikuClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
@@ -96,6 +107,14 @@ void QHaikuClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
     if (mode != QClipboard::Clipboard)
         return;
 
+    if (mimeData) {
+        if (m_systemMimeData == mimeData)
+            return;
+
+        if (m_userMimeData == mimeData)
+            return;
+    }
+
     if (!be_clipboard->Lock())
         return;
 
@@ -115,6 +134,10 @@ void QHaikuClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
         qWarning("Unable to store mime data on clipboard");
 
     be_clipboard->Unlock();
+
+    m_userMimeData = mimeData;
+
+    emitChanged(QClipboard::Clipboard);
 }
 
 bool QHaikuClipboard::supportsMode(QClipboard::Mode mode) const
@@ -131,8 +154,12 @@ bool QHaikuClipboard::ownsMode(QClipboard::Mode mode) const
 
 void QHaikuClipboard::MessageReceived(BMessage* message)
 {
-    if (message->what == B_CLIPBOARD_CHANGED)
+    if (message->what == B_CLIPBOARD_CHANGED) {
+        delete m_userMimeData;
+        m_userMimeData = Q_NULLPTR;
+
         emitChanged(QClipboard::Clipboard);
+    }
 
     BHandler::MessageReceived(message);
 }
diff --git a/src/plugins/platforms/haiku/qhaikuclipboard.h b/src/plugins/platforms/haiku/qhaikuclipboard.h
index 0dc2bfdd3b..3c1f92c615 100644
--- a/src/plugins/platforms/haiku/qhaikuclipboard.h
+++ b/src/plugins/platforms/haiku/qhaikuclipboard.h
@@ -55,6 +55,10 @@ public:
 
     // override from BHandler to catch change notifications from Haiku clipboard
     void MessageReceived(BMessage* message) Q_DECL_OVERRIDE;
+
+private:
+    QMimeData *m_systemMimeData;
+    QMimeData *m_userMimeData;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/haiku/qhaikuwindow.cpp b/src/plugins/platforms/haiku/qhaikuwindow.cpp
index 5768e1cb40..9622d12111 100644
--- a/src/plugins/platforms/haiku/qhaikuwindow.cpp
+++ b/src/plugins/platforms/haiku/qhaikuwindow.cpp
@@ -130,6 +130,7 @@ QHaikuWindow::QHaikuWindow(QWindow *window)
     if (!m_window)
         qFatal("QHaikuWindow: failed to create window");
 
+    setGeometry(rect);
     setWindowFlags(window->flags());
 }
 
@@ -164,13 +165,13 @@ void QHaikuWindow::setVisible(bool visible)
 {
     if (visible) {
         m_window->Show();
+
+        window()->requestActivate();
+
+        QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(0, 0), window()->geometry().size()));
     } else {
         m_window->Hide();
     }
-
-    window()->requestActivate();
-
-    QWindowSystemInterface::handleExposeEvent(window(), window()->geometry());
 }
 
 bool QHaikuWindow::isExposed() const
@@ -306,10 +307,8 @@ void QHaikuWindow::haikuWindowMoved(const QPoint &pos)
     const QRect newGeometry(pos, geometry().size());
 
     QPlatformWindow::setGeometry(newGeometry);
-    QWindowSystemInterface::setSynchronousWindowsSystemEvents(true);
     QWindowSystemInterface::handleGeometryChange(window(), newGeometry);
-    QWindowSystemInterface::handleExposeEvent(window(), newGeometry);
-    QWindowSystemInterface::setSynchronousWindowsSystemEvents(false);
+    QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(0, 0), newGeometry.size()));
 }
 
 void QHaikuWindow::haikuWindowResized(const QSize &size, bool zoomInProgress)
@@ -317,10 +316,8 @@ void QHaikuWindow::haikuWindowResized(const QSize &size, bool zoomInProgress)
     const QRect newGeometry(geometry().topLeft(), size);
 
     QPlatformWindow::setGeometry(newGeometry);
-    QWindowSystemInterface::setSynchronousWindowsSystemEvents(true);
     QWindowSystemInterface::handleGeometryChange(window(), newGeometry);
-    QWindowSystemInterface::handleExposeEvent(window(), newGeometry);
-    QWindowSystemInterface::setSynchronousWindowsSystemEvents(false);
+    QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(0, 0), newGeometry.size()));
 
     if ((m_windowState == Qt::WindowMaximized) && !zoomInProgress) {
         // the user has resized the window while maximized -> reset maximized flag