Mirclient: update with upstream changes

Merge in the changes up to revision 306 of the lp:qtubuntu repo.

Change-Id: I55dcb9e06e0a3503d6abe4b0894d5ef5a785b6bb
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

1 files changed, 201 insertions, 0 deletions

diff --git a/src/plugins/platforms/mirclient/qmirclientcursor.cpp b/src/plugins/platforms/mirclient/qmirclientcursor.cpp
new file mode 100644
index 0000000000..1d6ec8391e
--- /dev/null
+++ b/src/plugins/platforms/mirclient/qmirclientcursor.cpp
@@ -0,0 +1,201 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Canonical, Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include "qmirclientcursor.h"
+
+#include "qmirclientlogging.h"
+#include "qmirclientwindow.h"
+
+#include <mir_toolkit/mir_client_library.h>
+
+QMirClientCursor::QMirClientCursor(MirConnection *connection)
+    : mConnection(connection)
+{
+    mShapeToCursorName[Qt::ArrowCursor] = "left_ptr";
+    mShapeToCursorName[Qt::UpArrowCursor] = "up_arrow";
+    mShapeToCursorName[Qt::CrossCursor] = "cross";
+    mShapeToCursorName[Qt::WaitCursor] = "watch";
+    mShapeToCursorName[Qt::IBeamCursor] = "xterm";
+    mShapeToCursorName[Qt::SizeVerCursor] = "size_ver";
+    mShapeToCursorName[Qt::SizeHorCursor] = "size_hor";
+    mShapeToCursorName[Qt::SizeBDiagCursor] = "size_bdiag";
+    mShapeToCursorName[Qt::SizeFDiagCursor] = "size_fdiag";
+    mShapeToCursorName[Qt::SizeAllCursor] = "size_all";
+    mShapeToCursorName[Qt::BlankCursor] = "blank";
+    mShapeToCursorName[Qt::SplitVCursor] = "split_v";
+    mShapeToCursorName[Qt::SplitHCursor] = "split_h";
+    mShapeToCursorName[Qt::PointingHandCursor] = "hand";
+    mShapeToCursorName[Qt::ForbiddenCursor] = "forbidden";
+    mShapeToCursorName[Qt::WhatsThisCursor] = "whats_this";
+    mShapeToCursorName[Qt::BusyCursor] = "left_ptr_watch";
+    mShapeToCursorName[Qt::OpenHandCursor] = "openhand";
+    mShapeToCursorName[Qt::ClosedHandCursor] = "closedhand";
+    mShapeToCursorName[Qt::DragCopyCursor] = "dnd-copy";
+    mShapeToCursorName[Qt::DragMoveCursor] = "dnd-move";
+    mShapeToCursorName[Qt::DragLinkCursor] = "dnd-link";
+}
+
+namespace {
+#if !defined(QT_NO_DEBUG)
+const char *qtCursorShapeToStr(Qt::CursorShape shape)
+{
+    switch (shape) {
+    case Qt::ArrowCursor:
+        return "Arrow";
+    case Qt::UpArrowCursor:
+        return "UpArrow";
+    case Qt::CrossCursor:
+        return "Cross";
+    case Qt::WaitCursor:
+        return "Wait";
+    case Qt::IBeamCursor:
+        return "IBeam";
+    case Qt::SizeVerCursor:
+        return "SizeVer";
+    case Qt::SizeHorCursor:
+        return "SizeHor";
+    case Qt::SizeBDiagCursor:
+        return "SizeBDiag";
+    case Qt::SizeFDiagCursor:
+        return "SizeFDiag";
+    case Qt::SizeAllCursor:
+        return "SizeAll";
+    case Qt::BlankCursor:
+        return "Blank";
+    case Qt::SplitVCursor:
+        return "SplitV";
+    case Qt::SplitHCursor:
+        return "SplitH";
+    case Qt::PointingHandCursor:
+        return "PointingHand";
+    case Qt::ForbiddenCursor:
+        return "Forbidden";
+    case Qt::WhatsThisCursor:
+        return "WhatsThis";
+    case Qt::BusyCursor:
+        return "Busy";
+    case Qt::OpenHandCursor:
+        return "OpenHand";
+    case Qt::ClosedHandCursor:
+        return "ClosedHand";
+    case Qt::DragCopyCursor:
+        return "DragCopy";
+    case Qt::DragMoveCursor:
+        return "DragMove";
+    case Qt::DragLinkCursor:
+        return "DragLink";
+    case Qt::BitmapCursor:
+        return "Bitmap";
+    default:
+        return "???";
+    }
+}
+#endif // !defined(QT_NO_DEBUG)
+} // anonymous namespace
+
+void QMirClientCursor::changeCursor(QCursor *windowCursor, QWindow *window)
+{
+    if (!window) {
+        return;
+    }
+
+    MirSurface *surface = static_cast<QMirClientWindow*>(window->handle())->mirSurface();
+
+    if (!surface) {
+        return;
+    }
+
+
+    if (windowCursor) {
+        DLOG("[ubuntumirclient QPA] changeCursor shape=%s, window=%p\n", qtCursorShapeToStr(windowCursor->shape()), window);
+        if (!windowCursor->pixmap().isNull()) {
+            configureMirCursorWithPixmapQCursor(surface, *windowCursor);
+        } else if (windowCursor->shape() == Qt::BitmapCursor) {
+            // TODO: Implement bitmap cursor support
+            applyDefaultCursorConfiguration(surface);
+        } else {
+            const auto &cursorName = mShapeToCursorName.value(windowCursor->shape(), QByteArray("left_ptr"));
+            auto cursorConfiguration = mir_cursor_configuration_from_name(cursorName.data());
+            mir_surface_configure_cursor(surface, cursorConfiguration);
+            mir_cursor_configuration_destroy(cursorConfiguration);
+        }
+    } else {
+        applyDefaultCursorConfiguration(surface);
+    }
+
+}
+
+void QMirClientCursor::configureMirCursorWithPixmapQCursor(MirSurface *surface, QCursor &cursor)
+{
+    QImage image = cursor.pixmap().toImage();
+
+    if (image.format() != QImage::Format_ARGB32) {
+        image.convertToFormat(QImage::Format_ARGB32);
+    }
+
+    MirBufferStream *bufferStream = mir_connection_create_buffer_stream_sync(mConnection,
+            image.width(), image.height(), mir_pixel_format_argb_8888, mir_buffer_usage_software);
+
+    {
+        MirGraphicsRegion region;
+        mir_buffer_stream_get_graphics_region(bufferStream, &region);
+
+        char *regionLine = region.vaddr;
+        Q_ASSERT(image.bytesPerLine() <= region.stride);
+        for (int i = 0; i < image.height(); ++i) {
+            memcpy(regionLine, image.scanLine(i), image.bytesPerLine());
+            regionLine += region.stride;
+        }
+    }
+
+    mir_buffer_stream_swap_buffers_sync(bufferStream);
+
+    {
+        auto configuration = mir_cursor_configuration_from_buffer_stream(bufferStream, cursor.hotSpot().x(), cursor.hotSpot().y());
+        mir_surface_configure_cursor(surface, configuration);
+        mir_cursor_configuration_destroy(configuration);
+    }
+
+    mir_buffer_stream_release_sync(bufferStream);
+}
+
+void QMirClientCursor::applyDefaultCursorConfiguration(MirSurface *surface)
+{
+    auto cursorConfiguration = mir_cursor_configuration_from_name("left_ptr");
+    mir_surface_configure_cursor(surface, cursorConfiguration);
+    mir_cursor_configuration_destroy(cursorConfiguration);
+}