1 files changed, 56 insertions, 17 deletions

diff --git a/src/plugins/platforms/wayland/qwaylandcursor.cpp b/src/plugins/platforms/wayland/qwaylandcursor.cpp
index 87b846cefb..bbbab6dca7 100644
--- a/src/plugins/platforms/wayland/qwaylandcursor.cpp
+++ b/src/plugins/platforms/wayland/qwaylandcursor.cpp
@@ -43,10 +43,11 @@
 
 #include "qwaylanddisplay.h"
 #include "qwaylandinputdevice.h"
-#include "qwaylandshmsurface.h"
 #include "qwaylandscreen.h"
+#include "qwaylandshmbackingstore.h"
 
 #include <QtGui/QImageReader>
+#include <QDebug>
 
 #define DATADIR "/usr/share"
 
@@ -108,14 +109,15 @@ QWaylandCursor::QWaylandCursor(QWaylandScreen *screen)
 {
 }
 
-void QWaylandCursor::changeCursor(QCursor *cursor, QWidget *widget)
+void QWaylandCursor::changeCursor(QCursor *cursor, QWindow *window)
 {
     const struct pointer_image *p;
 
-    if (widget == NULL)
+    if (window == NULL)
         return;
 
     p = NULL;
+    bool isBitmap = false;
 
     switch (cursor->shape()) {
     case Qt::ArrowCursor:
@@ -152,32 +154,53 @@ void QWaylandCursor::changeCursor(QCursor *cursor, QWidget *widget)
         p = &pointer_images[cursor->shape()];
         break;
 
-    default:
     case Qt::BitmapCursor:
+        isBitmap = true;
+        break;
+
+    default:
         break;
     }
 
-    if (!p) {
+    if (!p && !isBitmap) {
         p = &pointer_images[0];
         qWarning("unhandled cursor %d", cursor->shape());
     }
 
-    QImageReader reader(p->filename);
-
-    if (!reader.canRead())
-        return;
-
-    if (mBuffer == NULL || mBuffer->size() != reader.size()) {
-        if (mBuffer)
+    if (isBitmap && !cursor->pixmap().isNull()) {
+        setupPixmapCursor(cursor);
+    } else if (isBitmap && cursor->bitmap()) {
+        qWarning("unsupported QBitmap cursor");
+    } else {
+        QImageReader reader(p->filename);
+        if (!reader.canRead())
+            return;
+        if (mBuffer == NULL || mBuffer->size() != reader.size()) {
             delete mBuffer;
+            mBuffer = new QWaylandShmBuffer(mDisplay, reader.size(),
+                                            QImage::Format_ARGB32);
+        }
+        reader.read(mBuffer->image());
+        mDisplay->setCursor(mBuffer, p->hotspot_x, p->hotspot_y);
+    }
+}
 
-        mBuffer = new QWaylandShmBuffer(mDisplay, reader.size(),
+void QWaylandCursor::setupPixmapCursor(QCursor *cursor)
+{
+    if (!cursor) {
+        delete mBuffer;
+        mBuffer = 0;
+        return;
+    }
+    if (!mBuffer || mBuffer->size() != cursor->pixmap().size()) {
+        delete mBuffer;
+        mBuffer = new QWaylandShmBuffer(mDisplay, cursor->pixmap().size(),
                                         QImage::Format_ARGB32);
     }
-
-    reader.read(mBuffer->image());
-
-    mDisplay->setCursor(mBuffer, p->hotspot_x, p->hotspot_y);
+    QImage src = cursor->pixmap().toImage().convertToFormat(QImage::Format_ARGB32);
+    for (int y = 0; y < src.height(); ++y)
+        qMemCopy(mBuffer->image()->scanLine(y), src.scanLine(y), src.bytesPerLine());
+    mDisplay->setCursor(mBuffer, cursor->hotSpot().x(), cursor->hotSpot().y());
 }
 
 void QWaylandDisplay::setCursor(QWaylandBuffer *buffer, int32_t x, int32_t y)
@@ -189,3 +212,19 @@ void QWaylandDisplay::setCursor(QWaylandBuffer *buffer, int32_t x, int32_t y)
         inputDevice->attach(buffer, x, y);
     }
 }
+
+void QWaylandCursor::pointerEvent(const QMouseEvent &event)
+{
+    mLastPos = event.globalPos();
+}
+
+QPoint QWaylandCursor::pos() const
+{
+    return mLastPos;
+}
+
+void QWaylandCursor::setPos(const QPoint &pos)
+{
+    Q_UNUSED(pos);
+    qWarning() << "QWaylandCursor::setPos: not implemented";
+}