Unity 8

Merge lp:~dandrader/unity8/animatedCursors into lp:unity8

animatedCursors
Merge into trunk

Proposed by Daniel d'Andrada on 2016-05-03

Status:	Merged
Approved by:	Lukáš Tinkl on 2016-05-09
Approved revision:	no longer in the source branch.
Merged at revision:	2439
Proposed branch:	lp:~dandrader/unity8/animatedCursors
Merge into:	lp:unity8
Diff against target:	894 lines (+467/-145) 19 files modified CMakeLists.txt (+1/-1) debian/control (+2/-2) plugins/Cursor/CMakeLists.txt (+2/-1) plugins/Cursor/Cursor.qml (+21/-5) plugins/Cursor/Cursor.qmltypes (+0/-78) plugins/Cursor/CursorImageInfo.cpp (+106/-0) plugins/Cursor/CursorImageInfo.h (+76/-0) plugins/Cursor/CursorImageProvider.cpp (+52/-23) plugins/Cursor/CursorImageProvider.h (+12/-4) plugins/Cursor/MousePointer.cpp (+0/-19) plugins/Cursor/MousePointer.h (+0/-6) plugins/Cursor/plugin.cpp (+4/-2) plugins/Cursor/qmldir (+1/-1) qml/Shell.qml (+1/-1) tests/mocks/Cursor/qmldir (+1/-1) tests/plugins/CMakeLists.txt (+2/-1) tests/plugins/Cursor/CMakeLists.txt (+8/-0) tests/plugins/Cursor/TextEntry.qml (+34/-0) tests/plugins/Cursor/tst_Cursor.qml (+144/-0)
To merge this branch:	bzr merge lp:~dandrader/unity8/animatedCursors
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-05-09
Lukáš Tinkl (community)			Approve on 2016-05-09
Michael Zanetti		2016-05-03	Pending
Review via email: mp+293628@code.launchpad.net

Commit Message

Support animated cursors

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/unity-api/removeHotspot/+merge/293627
https://code.launchpad.net/~dandrader/qtmir/removeHotspot/+merge/293629

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.
For testing you have two options:
1 - Run "make tryCursor". Then type "watch" in the cursorName field and hit the "Apply" button.

2 - Run the demo app:
- bzr branch lp:~dandrader/+junk/animatedDemos
- cd animatedDemos/CustomCursor
- qmake && make
- cd ..
- qmlscene CursorShapes.qml -I . --desktop_file_hint=unity8
- hover mouse over the "Wait" or "Busy" boxes as they are the only ones with animated cursors.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-03:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1113/rebuild

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/animatedCursors updated on 2016-05-04

2382. By CI Train Bot Account on 2016-05-04

Resync trunk.

2383. By Andrea Cimitan on 2016-05-04

Add social actions to cards
Approved by: Josh Arenson

2384. By Albert Astals Cid on 2016-05-04

Pass the category correctly

Approved by: Pawel Stolowski

2385. By Albert Astals Cid on 2016-05-04

Make the previewActions react to the actions model changing

i.e. use a binding instead of a direct assingment Fixes: #1485887
Approved by: Andrea Cimitan

2386. By Albert Astals Cid on 2016-05-04

Update the icon also to the original one if that's what the scope wants

Approved by: Andrea Cimitan

2387. By Albert Astals Cid on 2016-05-04

Reload Preview Zoomable Image source if it gets updated

Approved by: Michael Zanetti

2388. By CI Train Bot Account on 2016-05-04

Make the previewActions react to the actions model changing

i.e. use a binding instead of a direct assingment Fixes: #1485887
Approved by: Andrea Cimitan

2389. By CI Train Bot Account on 2016-05-04

Update the icon also to the original one if that's what the scope wants

Approved by: Andrea Cimitan

2390. By CI Train Bot Account on 2016-05-04

Reload Preview Zoomable Image source if it gets updated

Approved by: Michael Zanetti

2391. By Albert Astals Cid on 2016-05-04

Expandable Filter Widget
Approved by: Andrea Cimitan, Pawel Stolowski

2392. By CI Train Bot Account on 2016-05-04

Releasing 8.12+16.04.20160504.2-0ubuntu1

Albert Astals Cid (aacid) wrote on 2016-05-05:

Text conflict in tests/plugins/CMakeLists.txt
1 conflicts encountered.

Daniel d'Andrada (dandrader) wrote on 2016-05-05:

On 05/05/2016 04:29, Albert Astals Cid wrote:
> Text conflict in tests/plugins/CMakeLists.txt
> 1 conflicts encountered.
Fixed, thanks.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-05:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1134/rebuild

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/animatedCursors updated on 2016-05-06

2393. By CI Train Bot Account on 2016-05-05: Resync trunk.
2394. By Launchpad Translations on behalf of unity-team on 2016-05-06: Launchpad automatic translations update.

Lukáš Tinkl (lukas-kde) wrote on 2016-05-09:

Please regenerate the Cursor.qmltypes file, it still contains the hotspot stuff

review: Needs Fixing

Lukáš Tinkl (lukas-kde) wrote on 2016-05-09:

Arguably, you should probably bump the Cursor plugin version to 1.1 (in qmldir and plugin.cpp) as this is not backwards compatible.

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2016-05-09:

On 09/05/2016 14:05, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Please regenerate the Cursor.qmltypes file, it still contains the hotspot stuff

Nuked the file.

Daniel d'Andrada (dandrader) wrote on 2016-05-09:

On 09/05/2016 14:06, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Arguably, you should probably bump the Cursor plugin version to 1.1 (in qmldir and plugin.cpp) as this is not backwards compatible.

Not convinced of the usefulness of that but did it anyway.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-09:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1159/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-05-09:

Approving, tested this and works fine, all issues addressed

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

No, due to unity-api version bump

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-09:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1160/rebuild

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/animatedCursors updated on 2016-05-19

2395. By Launchpad Translations on behalf of unity-team on 2016-05-11

Launchpad automatic translations update.

2396. By Launchpad Translations on behalf of unity-team on 2016-05-17

Launchpad automatic translations update.

2397. By Daniel d'Andrada on 2016-05-18

Move prompt surfaces from MirSurface to Application

prompt surfaces can show up even before an application creates its first surface

2398. By CI Train Bot Account on 2016-05-18

Releasing 8.12+16.04.20160518.1-0ubuntu1

2399. By Daniel d'Andrada on 2016-05-19

Support animated cursors

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-05-18 11:17:20 +0000
 +++ CMakeLists.txt	2016-05-19 19:45:00 +0000
@@ -57,7 +57,7 @@
  find_package(Qt5Concurrent 5.4 REQUIRED)
  find_package(Qt5Sql 5.4 REQUIRED)
--pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=16)
++pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=17)
  pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
  pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 === modified file 'debian/control'
 --- debian/control	2016-05-17 19:42:10 +0000
 +++ debian/control	2016-05-19 19:45:00 +0000
@@ -30,7 +30,7 @@
                 libqt5xmlpatterns5-dev,
                 libsystemsettings-dev,
                 libudev-dev,
--               libunity-api-dev (>= 7.112),
++               libunity-api-dev (>= 7.113),
                 libusermetricsoutput1-dev,
  # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                 libx11-dev[!armhf],
@@ -133,7 +133,7 @@
           qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
           qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
           ubuntu-thumbnailer-impl-0,
--         unity-application-impl-16,
++         unity-application-impl-17,
           unity-notifications-impl-3,
           unity-plugin-scopes | unity-scopes-impl,
           unity-scopes-impl-12,
 === modified file 'plugins/Cursor/CMakeLists.txt'
 --- plugins/Cursor/CMakeLists.txt	2015-09-29 13:45:05 +0000
 +++ plugins/Cursor/CMakeLists.txt	2016-05-19 19:45:00 +0000
@@ -8,8 +8,9 @@
  set(QMLPLUGIN_SRC
      plugin.cpp
++    CursorImageInfo.cpp
++    CursorImageProvider.cpp
      MousePointer.cpp
--    CursorImageProvider.cpp
      # We need to run moc on this header
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
+     )
 === modified file 'plugins/Cursor/Cursor.qml'
 --- plugins/Cursor/Cursor.qml	2015-12-03 15:00:04 +0000
 +++ plugins/Cursor/Cursor.qml	2016-05-19 19:45:00 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -15,14 +15,30 @@
   */
  import QtQuick 2.4
--import Cursor 1.0 // For MousePointer
++import Cursor 1.1
  MousePointer {
      id: mousePointer
--    Image {
--        x: -mousePointer.hotspotX
--        y: -mousePointer.hotspotY
++    CursorImageInfo {
++        id: imageInfo
++        themeName: mousePointer.themeName
++        cursorName: mousePointer.cursorName
++    }
++
++    AnimatedSprite {
++        x: -imageInfo.hotspot.x
++        y: -imageInfo.hotspot.y
          source: "image://cursor/" + mousePointer.themeName + "/" + mousePointer.cursorName
++
++        interpolate: false
++
++        width: imageInfo.frameWidth
++        height: imageInfo.frameHeight
++
++        frameCount: imageInfo.frameCount
++        frameDuration: imageInfo.frameDuration
++        frameWidth: imageInfo.frameWidth
++        frameHeight: imageInfo.frameHeight
+     }
+ }
 === removed file 'plugins/Cursor/Cursor.qmltypes'
 --- plugins/Cursor/Cursor.qmltypes	2016-03-11 20:18:12 +0000
 +++ plugins/Cursor/Cursor.qmltypes	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
--import QtQuick.tooling 1.1
--
--// This file describes the plugin-supplied types contained in the library.
--// It is used for QML tooling purposes only.
--//
--// This file was auto-generated by:
--// 'qmlplugindump -notrelocatable Cursor 1.0 plugins'
--
--Module {
--    Component {
--        name: "MirMousePointerInterface"
--        defaultProperty: "data"
--        prototype: "QQuickItem"
--        Property { name: "cursorName"; type: "string"; isReadonly: true }
--        Property { name: "themeName"; type: "string"; isReadonly: true }
--        Property { name: "hotspotX"; type: "double"; isReadonly: true }
--        Property { name: "hotspotY"; type: "double"; isReadonly: true }
--        Signal {
--            name: "cursorNameChanged"
--            Parameter { name: "name"; type: "string" }
--        }
--        Signal {
--            name: "themeNameChanged"
--            Parameter { name: "name"; type: "string" }
--        }
--        Signal {
--            name: "hotspotXChanged"
--            Parameter { name: "value"; type: "double" }
--        }
--        Signal {
--            name: "hotspotYChanged"
--            Parameter { name: "value"; type: "double" }
--        }
--        Method {
--            name: "handleMouseEvent"
--            Parameter { name: "timestamp"; type: "ulong" }
--            Parameter { name: "movement"; type: "QPointF" }
--            Parameter { name: "buttons"; type: "Qt::MouseButtons" }
--            Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
--        }
--        Method {
--            name: "handleWheelEvent"
--            Parameter { name: "timestamp"; type: "ulong" }
--            Parameter { name: "angleDelta"; type: "QPoint" }
--            Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
--        }
--    }
--    Component {
--        name: "MousePointer"
--        defaultProperty: "data"
--        prototype: "MirMousePointerInterface"
--        exports: ["Cursor/MousePointer 1.0"]
--        exportMetaObjectRevisions: [0]
--        Signal {
--            name: "pushedLeftBoundary"
--            Parameter { name: "amount"; type: "double" }
--            Parameter { name: "buttons"; type: "Qt::MouseButtons" }
--        }
--        Signal {
--            name: "pushedRightBoundary"
--            Parameter { name: "amount"; type: "double" }
--            Parameter { name: "buttons"; type: "Qt::MouseButtons" }
--        }
--        Method {
--            name: "handleMouseEvent"
--            Parameter { name: "timestamp"; type: "ulong" }
--            Parameter { name: "movement"; type: "QPointF" }
--            Parameter { name: "buttons"; type: "Qt::MouseButtons" }
--            Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
--        }
--        Method {
--            name: "handleWheelEvent"
--            Parameter { name: "timestamp"; type: "ulong" }
--            Parameter { name: "angleDelta"; type: "QPoint" }
--            Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
--        }
--    }
--}
 === added file 'plugins/Cursor/CursorImageInfo.cpp'
 --- plugins/Cursor/CursorImageInfo.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Cursor/CursorImageInfo.cpp	2016-05-19 19:45:00 +0000
@@ -0,0 +1,106 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "CursorImageInfo.h"
++
++CursorImageInfo::CursorImageInfo(QObject *parent)
++    : QObject(parent)
++{
++    m_updateTimer.setInterval(0);
++    m_updateTimer.setSingleShot(true);
++    connect(&m_updateTimer, &QTimer::timeout, this, &CursorImageInfo::update);
++}
++
++void CursorImageInfo::setCursorName(const QString &cursorName)
++{
++    if (cursorName != m_cursorName) {
++        m_cursorName = cursorName;
++        Q_EMIT cursorNameChanged();
++        scheduleUpdate();
++    }
++}
++
++void CursorImageInfo::setThemeName(const QString &themeName)
++{
++    if (m_themeName != themeName) {
++        m_themeName = themeName;
++        Q_EMIT themeNameChanged();
++        scheduleUpdate();
++    }
++}
++
++void CursorImageInfo::scheduleUpdate()
++{
++    if (!m_updateTimer.isActive()) {
++        m_updateTimer.start();
++    }
++}
++
++void CursorImageInfo::update()
++{
++    m_cursorImage = CursorImageProvider::instance()->fetchCursor(m_themeName, m_cursorName);
++
++    Q_EMIT hotspotChanged();
++    Q_EMIT frameWidthChanged();
++    Q_EMIT frameHeightChanged();
++    Q_EMIT frameCountChanged();
++    Q_EMIT frameDurationChanged();
++}
++
++QPoint CursorImageInfo::hotspot() const
++{
++    if (m_cursorImage) {
++        return m_cursorImage->hotspot;
++    } else {
++        return QPoint();
++    }
++}
++
++qreal CursorImageInfo::frameWidth() const
++{
++    if (m_cursorImage) {
++        return m_cursorImage->frameWidth;
++    } else {
++        return 0;
++    }
++}
++
++qreal CursorImageInfo::frameHeight() const
++{
++    if (m_cursorImage) {
++        return m_cursorImage->frameHeight;
++    } else {
++        return 0;
++    }
++}
++
++int CursorImageInfo::frameCount() const
++{
++    if (m_cursorImage) {
++        return m_cursorImage->frameCount;
++    } else {
++        return 0;
++    }
++}
++
++int CursorImageInfo::frameDuration() const
++{
++    if (m_cursorImage) {
++        return m_cursorImage->frameDuration;
++    } else {
++        return 0;
++    }
++}
 === added file 'plugins/Cursor/CursorImageInfo.h'
 --- plugins/Cursor/CursorImageInfo.h	1970-01-01 00:00:00 +0000
 +++ plugins/Cursor/CursorImageInfo.h	2016-05-19 19:45:00 +0000
@@ -0,0 +1,76 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef CURSOR_IMAGE_INFO_H
++#define CURSOR_IMAGE_INFO_H
++
++#include "CursorImageProvider.h"
++
++#include <QObject>
++#include <QString>
++#include <QTimer>
++
++class CursorImageInfo : public QObject
++{
++    Q_OBJECT
++
++    Q_PROPERTY(QString themeName READ themeName WRITE setThemeName NOTIFY themeNameChanged)
++    Q_PROPERTY(QString cursorName READ cursorName WRITE setCursorName NOTIFY cursorNameChanged)
++
++    Q_PROPERTY(QPoint hotspot READ hotspot NOTIFY hotspotChanged)
++    Q_PROPERTY(qreal frameWidth READ frameWidth NOTIFY frameWidthChanged)
++    Q_PROPERTY(qreal frameHeight READ frameHeight NOTIFY frameHeightChanged)
++    Q_PROPERTY(int frameCount READ frameCount NOTIFY frameCountChanged)
++    Q_PROPERTY(int frameDuration READ frameDuration NOTIFY frameDurationChanged)
++
++public:
++    CursorImageInfo(QObject *parent = nullptr);
++
++    QString themeName() const { return m_themeName; }
++    void setThemeName(const QString &);
++
++    QString cursorName() const { return m_cursorName; }
++    void setCursorName(const QString &);
++
++    QPoint hotspot() const;
++    qreal frameWidth() const;
++    qreal frameHeight() const;
++    int frameCount() const;
++    int frameDuration() const;
++
++Q_SIGNALS:
++    void themeNameChanged();
++    void cursorNameChanged();
++    void hotspotChanged();
++    void frameWidthChanged();
++    void frameHeightChanged();
++    void frameCountChanged();
++    void frameDurationChanged();
++
++private Q_SLOTS:
++    void update();
++
++private:
++    void scheduleUpdate();
++    QTimer m_updateTimer;
++
++    QString m_themeName;
++    QString m_cursorName;
++
++    CursorImage *m_cursorImage{nullptr};
++};
++
++#endif // CURSOR_IMAGE_INFO_H
 === modified file 'plugins/Cursor/CursorImageProvider.cpp'
 --- plugins/Cursor/CursorImageProvider.cpp	2015-11-30 17:38:20 +0000
 +++ plugins/Cursor/CursorImageProvider.cpp	2016-05-19 19:45:00 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015-2016 Canonical, Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it under
   * the terms of the GNU Lesser General Public License version 3, as published by
@@ -46,6 +46,9 @@
      qimage.fill(Qt::transparent);
      QPainter imagePainter(&qimage);
++    frameWidth = qimage.width();
++    frameHeight = qimage.height();
++
      QSvgRenderer *svgRenderer = new QSvgRenderer(QByteArray(svgString));
      svgRenderer->render(&imagePainter);
      delete svgRenderer;
@@ -59,6 +62,8 @@
+ {
      qimage = QImage(1, 1, QImage::Format_ARGB32);
      qimage.fill(Qt::transparent);
++    frameWidth = qimage.width();
++    frameHeight = qimage.height();
+ }
  /////
@@ -69,40 +74,74 @@
+ {
      qimage = cursor.pixmap().toImage();
      hotspot = cursor.hotSpot();
++    frameWidth = qimage.width();
++    frameHeight = qimage.height();
+ }
  /////
  // XCursorImage
  XCursorImage::XCursorImage(const QString &theme, const QString &file)
--    : xcursorImages(nullptr)
+ {
      // TODO: Consider grid unit value
      //       Hardcoding to a medium size for now
      int preferredCursorHeightPx = 32;
--    xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),
++    XcursorImages *xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),
              preferredCursorHeightPx);
--    if (!xcursorImages) {
++    if (!xcursorImages || xcursorImages->nimage == 0) {
          return;
+     }
--    // Just take the first one. It will have multiple images in case of an animated cursor.
--    // TODO: Support animated cursors
--    if ( xcursorImages->nimage > 0) {
--        XcursorImage *xcursorImage = xcursorImages->images[0];
--
--        qimage = QImage((uchar*)xcursorImage->pixels,
--                xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);
--
++    frameCount = xcursorImages->nimage;
++
++    for (int i = 0; i < xcursorImages->nimage; ++i) {
++        XcursorImage *xcursorImage = xcursorImages->images[0];
++        if (frameWidth <  (int)xcursorImage->width) {
++            frameWidth = xcursorImage->width;
++        }
++        if (frameHeight <  (int)xcursorImage->height) {
++            frameHeight = xcursorImage->height;
++        }
++        if (i == 0) {
++            frameDuration = (int)xcursorImage->delay;
++        } else {
++            if (frameDuration != (int)xcursorImage->delay) {
++                qWarning().nospace() << "CursorImageProvider: XCursorImage("<<theme<<","<<file<<") has"
++                                        " varying delays in its animation. Animation won't look right.";
++            }
++        }
++    }
++
++    {
++        // Assume that the hotspot position does not animate
++        XcursorImage *xcursorImage = xcursorImages->images[0];
          hotspot.setX(xcursorImage->xhot);
          hotspot.setY(xcursorImage->yhot);
+     }
++
++    // Build the sprite as a single row of frames
++    qimage = QImage(frameWidth*frameCount, frameHeight, QImage::Format_ARGB32);
++    qimage.fill(Qt::transparent);
++
++    {
++        QPainter painter(&qimage);
++
++        for (int i = 0; i < xcursorImages->nimage; ++i) {
++            XcursorImage *xcursorImage = xcursorImages->images[i];
++
++            auto frameImage = QImage((uchar*)xcursorImage->pixels,
++                    xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);
++
++            painter.drawImage(QPoint(i*frameWidth, 0), frameImage);
++        }
++    }
++
++    XcursorImagesDestroy(xcursorImages);
+ }
  XCursorImage::~XCursorImage()
+ {
--    XcursorImagesDestroy(xcursorImages);
+ }
  /////
@@ -205,16 +244,6 @@
      return cursorImage->qimage;
+ }
--QPoint CursorImageProvider::hotspot(const QString &themeName, const QString &cursorName)
--{
--    CursorImage *cursorImage = fetchCursor(themeName, cursorName);
--    if (cursorImage) {
--        return cursorImage->hotspot;
--    } else {
--        return QPoint(0,0);
--    }
--}
--
  CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndName)
+ {
      QString themeName;
 === modified file 'plugins/Cursor/CursorImageProvider.h'
 --- plugins/Cursor/CursorImageProvider.h	2015-11-16 14:27:31 +0000
 +++ plugins/Cursor/CursorImageProvider.h	2016-05-19 19:45:00 +0000
@@ -31,15 +31,23 @@
      virtual ~CursorImage() {}
      QImage qimage;
++
++    // TODO: consider if there's a need to animate the hotspot
++    // ie, if there's a need to make it an array of points, one for each frame.
++    // Maybe no single xcursor (or at least the ones we know of or use)
++    // vary its hotspot position through its animation.
      QPoint hotspot;
++
++    int frameWidth{0};
++    int frameHeight{0};
++    int frameCount{1};
++    int frameDuration{40};
  };
  class XCursorImage : public CursorImage {
  public:
      XCursorImage(const QString &theme, const QString &file);
      virtual ~XCursorImage();
--
--    XcursorImages *xcursorImages;
  };
  class BuiltInCursorImage : public CursorImage {
@@ -68,16 +76,16 @@
      QImage requestImage(const QString &cursorName, QSize *size, const QSize &requestedSize) override;
--    QPoint hotspot(const QString &themeName, const QString &cursorName);
++    CursorImage *fetchCursor(const QString &themeName, const QString &cursorName);
      void setCustomCursor(const QCursor &customCursor);
  private:
      CursorImage *fetchCursor(const QString &cursorThemeAndName);
--    CursorImage *fetchCursor(const QString &themeName, const QString &cursorName);
      CursorImage *fetchCursorHelper(const QString &themeName, const QString &cursorName);
      // themeName -> (cursorName -> cursorImage)
++    // TODO: discard old, unused, cursors
      QMap<QString, QMap<QString, CursorImage*> > m_cursors;
      QScopedPointer<CursorImage> m_builtInCursorImage;
 === modified file 'plugins/Cursor/MousePointer.cpp'
 --- plugins/Cursor/MousePointer.cpp	2015-12-01 21:54:18 +0000
 +++ plugins/Cursor/MousePointer.cpp	2016-05-19 19:45:00 +0000
@@ -29,10 +29,7 @@
      : MirMousePointerInterface(parent)
      , m_cursorName(QStringLiteral("left_ptr"))
      , m_themeName(QStringLiteral("default"))
--    , m_hotspotX(0)
--    , m_hotspotY(0)
+ {
--    updateHotspot();
+ }
  void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
@@ -115,22 +112,6 @@
      if (cursorName != m_cursorName) {
          m_cursorName = cursorName;
          Q_EMIT cursorNameChanged(m_cursorName);
--        updateHotspot();
--    }
--}
--
--void MousePointer::updateHotspot()
--{
--    QPoint newHotspot = CursorImageProvider::instance()->hotspot(m_themeName, m_cursorName);
--
--    if (m_hotspotX != newHotspot.x()) {
--        m_hotspotX = newHotspot.x();
--        Q_EMIT hotspotXChanged(m_hotspotX);
--    }
--
--    if (m_hotspotY != newHotspot.y()) {
--        m_hotspotY = newHotspot.y();
--        Q_EMIT hotspotYChanged(m_hotspotY);
+     }
+ }
 === modified file 'plugins/Cursor/MousePointer.h'
 --- plugins/Cursor/MousePointer.h	2015-12-01 21:40:13 +0000
 +++ plugins/Cursor/MousePointer.h	2016-05-19 19:45:00 +0000
@@ -35,9 +35,6 @@
      void setThemeName(const QString &themeName) override;
      QString themeName() const override { return m_themeName; }
--    qreal hotspotX() const override { return m_hotspotX; }
--    qreal hotspotY() const override { return m_hotspotY; }
--
      void setCustomCursor(const QCursor &) override;
  public Q_SLOTS:
@@ -55,13 +52,10 @@
  private:
      void registerWindow(QWindow *window);
--    void updateHotspot();
      QPointer<QWindow> m_registeredWindow;
      QString m_cursorName;
      QString m_themeName;
--    int m_hotspotX;
--    int m_hotspotY;
  };
  #endif // MOUSEPOINTER_H
 === modified file 'plugins/Cursor/plugin.cpp'
 --- plugins/Cursor/plugin.cpp	2015-11-20 15:01:39 +0000
 +++ plugins/Cursor/plugin.cpp	2016-05-19 19:45:00 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -22,13 +22,15 @@
  #include "plugin.h"
  // local
++#include "CursorImageInfo.h"
  #include "CursorImageProvider.h"
  #include "MousePointer.h"
  void CursorPlugin::registerTypes(const char *uri)
+ {
      Q_ASSERT(uri == QLatin1String("Cursor"));
--    qmlRegisterType<MousePointer>(uri, 1, 0, "MousePointer");
++    qmlRegisterType<CursorImageInfo>(uri, 1, 1, "CursorImageInfo");
++    qmlRegisterType<MousePointer>(uri, 1, 1, "MousePointer");
+ }
  void CursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 === modified file 'plugins/Cursor/qmldir'
 --- plugins/Cursor/qmldir	2015-09-29 13:45:05 +0000
 +++ plugins/Cursor/qmldir	2016-05-19 19:45:00 +0000
@@ -1,3 +1,3 @@
  module Cursor
  plugin Cursor-qml
--Cursor 1.0 Cursor.qml
++Cursor 1.1 Cursor.qml
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-04-29 20:06:54 +0000
 +++ qml/Shell.qml	2016-05-19 19:45:00 +0000
@@ -41,7 +41,7 @@
  import Unity.Session 0.1
  import Unity.DashCommunicator 0.1
  import Unity.Indicators 0.1 as Indicators
--import Cursor 1.0
++import Cursor 1.1
  import WindowManager 0.1
 === modified file 'tests/mocks/Cursor/qmldir'
 --- tests/mocks/Cursor/qmldir	2015-09-29 13:45:05 +0000
 +++ tests/mocks/Cursor/qmldir	2016-05-19 19:45:00 +0000
@@ -1,2 +1,2 @@
  module Cursor
--Cursor 1.0 Cursor.qml
++Cursor 1.1 Cursor.qml
 === modified file 'tests/plugins/CMakeLists.txt'
 --- tests/plugins/CMakeLists.txt	2016-04-28 12:06:22 +0000
 +++ tests/plugins/CMakeLists.txt	2016-05-19 19:45:00 +0000
@@ -1,8 +1,9 @@
  add_subdirectory(AccountsService)
++add_subdirectory(Cursor)
++add_subdirectory(Dash)
  add_subdirectory(GlobalShortcut)
  add_subdirectory(Greeter)
  add_subdirectory(IntegratedLightDM)
--add_subdirectory(Dash)
  add_subdirectory(Ubuntu)
  add_subdirectory(Unity)
  add_subdirectory(Utils)
 === added directory 'tests/plugins/Cursor'
 === added file 'tests/plugins/Cursor/CMakeLists.txt'
 --- tests/plugins/Cursor/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Cursor/CMakeLists.txt	2016-05-19 19:45:00 +0000
@@ -0,0 +1,8 @@
++include(QmlTest)
++
++set(UNITY_IMPORT_PATHS
++    ${CMAKE_BINARY_DIR}/tests/utils/modules
++    ${UNITY_PLUGINPATH}
++)
++
++add_manual_qml_test(. Cursor IMPORT_PATHS ${UNITY_IMPORT_PATHS})
 === added file 'tests/plugins/Cursor/TextEntry.qml'
 --- tests/plugins/Cursor/TextEntry.qml	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Cursor/TextEntry.qml	2016-05-19 19:45:00 +0000
@@ -0,0 +1,34 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++
++Column {
++    property alias name: entryText.text
++    property alias value: textInput.text
++    Text { id: entryText }
++    Rectangle {
++        color: "white"
++        width: parent.width - 20
++        height: 40
++        TextInput {
++            id: textInput
++            anchors.fill: parent
++            verticalAlignment: TextInput.AlignVCenter
++            selectByMouse: true
++        }
++    }
++}
 === added file 'tests/plugins/Cursor/tst_Cursor.qml'
 --- tests/plugins/Cursor/tst_Cursor.qml	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Cursor/tst_Cursor.qml	2016-05-19 19:45:00 +0000
@@ -0,0 +1,144 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++
++import QtQuick 2.4
++import Cursor 1.1
++
++Rectangle {
++    id: root
++    color: "blue"
++    width: 400
++    height: 600
++
++    property string themeName: "default"
++    property string cursorName: "left_ptr"
++
++    CursorImageInfo {
++        id: imageInfo
++        themeName: root.themeName
++        cursorName: root.cursorName
++    }
++
++    Item {
++        id: cursor
++        x: (200 - animatedSprite.width) / 2
++        y: (root.height - animatedSprite.height) / 2
++
++        AnimatedSprite {
++            id: animatedSprite
++
++            x: -imageInfo.hotspot.x
++            y: -imageInfo.hotspot.y
++            source: "image://cursor/" + root.themeName + "/" + root.cursorName
++
++            interpolate: false
++
++            width: imageInfo.frameWidth
++            height: imageInfo.frameHeight
++
++            frameCount: imageInfo.frameCount
++            frameDuration: imageInfo.frameDuration
++            frameWidth: imageInfo.frameWidth
++            frameHeight: imageInfo.frameHeight
++        }
++    }
++
++    Rectangle {
++        id: hotspotCrossH
++        color: "red"
++        width: 200
++        height: 1
++        anchors.top: cursor.top
++        opacity: 0.6
++    }
++    Rectangle {
++        id: hotspotCrossV
++        color: "red"
++        width: 1
++        anchors.left: cursor.left
++        anchors.top: parent.top
++        anchors.bottom: parent.bottom
++        opacity: 0.6
++    }
++    MouseArea {
++        anchors.top: parent.top
++        anchors.bottom: parent.bottom
++        anchors.left: parent.left
++        anchors.right: controls.left
++        onClicked: {
++            if (hotspotCrossH.visible) {
++                hotspotCrossH.visible = false;
++                hotspotCrossV.visible = false;
++            } else {
++                hotspotCrossH.visible = true;
++                hotspotCrossV.visible = true;
++            }
++        }
++    }
++
++    Rectangle {
++        id: controls
++        color: "lightgrey"
++        anchors.right: parent.right
++        anchors.top: parent.top
++        anchors.bottom: parent.bottom
++        width: root.width - 200
++
++        Column {
++            anchors.fill: parent
++            anchors.margins: 10
++
++            TextEntry { id: themeNameEntry; name: "themeName"; value: "default" }
++
++            Item {width: 10; height: 20}
++
++            TextEntry { id: cursorNameEntry; name: "cursorName"; value: "left_ptr" }
++
++            Item {width: 10; height: 40}
++
++            Rectangle {
++                color: applyMouseArea.pressed ? "green" : "lightslategray"
++                width: parent.width - 20
++                height: 40
++                Text { anchors.centerIn: parent; text: "Apply" }
++                MouseArea {
++                    id: applyMouseArea
++                    anchors.fill: parent
++                    onClicked: {
++                        root.themeName = themeNameEntry.value;
++                        root.cursorName = cursorNameEntry.value;
++                    }
++                }
++            }
++
++            Item {width: 10; height: 10}
++            Rectangle {
++                color: "black"
++                height: 2
++                anchors.left: parent.left
++                anchors.right: parent.right
++            }
++            Item {width: 10; height: 10}
++
++            Text { text: "frameWidth: " + imageInfo.frameWidth }
++            Text { text: "frameHeight: " + imageInfo.frameHeight }
++            Text { text: "frameCount: " + imageInfo.frameCount }
++            Text { text: "frameDuration: " + imageInfo.frameDuration }
++            Text { text: "currentFrame: " + animatedSprite.currentFrame }
++        }
++    }
++}