a98ae48 · unity8 · git.iko.soy

git.iko.soy/unity8

Cursor: Add more fallback names, a blank and custom cursor support

commita98ae4864bdffe34e77dd5a045d5aedec25af0bf authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateWed 11 Nov 2015, 16:54 (11 years ago) parentd527f6b

6 files changed+103−13

compare with xenial

unifiedsplit

CMakeLists.txt+1−1 debian/control+2−2 plugins/Cursor/CursorImageProvider.cpp+77−10 plugins/Cursor/CursorImageProvider.h+16 plugins/Cursor/MousePointer.cpp+5 plugins/Cursor/MousePointer.h+2

CMakeLists.txt+1−1

@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.4 REQUIRED)

5757find_package(Qt5Concurrent 5.4 REQUIRED)

5858find_package(Qt5Sql 5.4 REQUIRED)

5959

60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=10)

60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=11)

6161

6262# Standard install paths

6363include(GNUInstallDirs)

debian/control+2−2

@@ -128,7 +128,7 @@ Depends: qml-module-qtquick-layouts,

128128 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),

129129 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

130130 ubuntu-thumbnailer-impl-0,

131− unity-application-impl-10,

131+ unity-application-impl-11,

132132 unity-notifications-impl-3,

133133 unity-plugin-scopes | unity-scopes-impl,

134134 unity-scopes-impl-7,

@@ -174,7 +174,7 @@ Pre-Depends: ${misc:Pre-Depends},

174174Depends: ${misc:Depends},

175175 ${shlibs:Depends},

176176Provides: unity-application-impl,

177− unity-application-impl-10,

177+ unity-application-impl-11,

178178Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)

179179Description: Fake environment for running Unity 8 shell

180180 Provides fake implementations of some QML modules used by Unity 8 shell

plugins/Cursor/CursorImageProvider.cpp+77−10

@@ -16,6 +16,7 @@

1616

1717#include "CursorImageProvider.h"

1818

19+#include <QCursor>

1920#include <QDebug>

2021#include <QFile>

2122#include <QPainter>

@@ -49,6 +50,26 @@ BuiltInCursorImage::BuiltInCursorImage()

4950 delete svgRenderer;

5051}

5152

53+/////

54+// BlankCursorImage

55+

56+

57+BlankCursorImage::BlankCursorImage()

58+{

59+ qimage = QImage(1, 1, QImage::Format_ARGB32);

60+ qimage.fill(Qt::transparent);

61+}

62+

63+/////

64+// CustomCursorImage

65+

66+

67+CustomCursorImage::CustomCursorImage(const QCursor &cursor)

68+{

69+ qimage = cursor.pixmap().toImage();

70+ hotspot = cursor.hotSpot();

71+}

72+

5273/////

5374// XCursorImage

5475

@@ -91,6 +112,35 @@ CursorImageProvider::CursorImageProvider()

91112 qFatal("Cannot have multiple CursorImageProvider instances");

92113 }

93114 m_instance = this;

115+

116+ m_fallbackNames[QLatin1String("ibeam")].append(QLatin1String("xterm"));

117+ m_fallbackNames[QLatin1String("xterm")].append(QLatin1String("ibeam"));

118+ m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("dnd-none"));

119+ m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("grabbing"));

120+ m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("closedhand"));

121+ m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("dnd-none"));

122+ m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("grabbing"));

123+ m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("closedhand"));

124+ m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("dnd-none"));

125+ m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("grabbing"));

126+ m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("closedhand"));

127+ m_fallbackNames[QLatin1String("closedhand")].append(QLatin1String("grabbing"));

128+ m_fallbackNames[QLatin1String("closedhand")].append(QLatin1String("dnd-none"));

129+

130+ // Needed for DMZ-White and DMZ-Black xcursor themes at least.

131+ // Ideally those themes would have symbolic links to achieve the same, but that's not the case.

132+ m_fallbackNames[QLatin1String("up_arrow")].append(QLatin1String("sb_up_arrow"));

133+ m_fallbackNames[QLatin1String("size_ver")].append(QLatin1String("sb_v_double_arrow"));

134+ m_fallbackNames[QLatin1String("size_hor")].append(QLatin1String("sb_h_double_arrow"));

135+ m_fallbackNames[QLatin1String("size_bdiag")].append(QLatin1String("fd_double_arrow"));

136+ m_fallbackNames[QLatin1String("size_fdiag")].append(QLatin1String("bd_double_arrow"));

137+ m_fallbackNames[QLatin1String("split_v")].append(QLatin1String("sb_v_double_arrow"));

138+ m_fallbackNames[QLatin1String("split_h")].append(QLatin1String("sb_h_double_arrow"));

139+ m_fallbackNames[QLatin1String("forbidden")].append(QLatin1String("crossed_circle"));

140+

141+ m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("left_ptr_help"));

142+ m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("help"));

143+ m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("question_arrow"));

94144}

95145

96146CursorImageProvider::~CursorImageProvider()

@@ -151,12 +201,14 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS

151201

152202 // Try some fallbacks

153203 if (cursorImage->qimage.isNull()) {

154− if (cursorName == "ibeam") {

155− qDebug() << "CursorImageProvider: \"ibeam\" not found, falling back to \"xterm\"";

156− cursorImage = fetchCursorHelper(themeName, "xterm");

157− } else if (cursorName == "xterm") {

158− qDebug() << "CursorImageProvider: \"xterm\" not found, falling back to \"ibeam\"";

159− cursorImage = fetchCursorHelper(themeName, "ibeam");

204+ if (m_fallbackNames.contains(cursorName)) {

205+ const QList<QString> &fallbackNames = m_fallbackNames[cursorName];

206+ int i = 0;

207+ while (cursorImage->qimage.isNull() && i < fallbackNames.count()) {

208+ qDebug().nospace() << "CursorImageProvider: "<< cursorName <<" not found, trying " << fallbackNames.at(i);

209+ cursorImage = fetchCursorHelper(themeName, fallbackNames.at(i));

210+ ++i;

211+ }

160212 }

161213 }

162214

@@ -181,11 +233,26 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS

181233

182234CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName)

183235{

184− QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];

236+ if (cursorName == QLatin1String("blank")) {

237+ return &m_blankCursorImage;

238+ } else if (cursorName == QLatin1String("custom")) {

239+ return m_customCursorImage.data();

240+ } else {

241+ QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];

242+

243+ if (!themeCursors.contains(cursorName)) {

244+ themeCursors[cursorName] = new XCursorImage(themeName, cursorName);

245+ }

185246

186− if (!themeCursors.contains(cursorName)) {

187− themeCursors[cursorName] = new XCursorImage(themeName, cursorName);

247+ return themeCursors[cursorName];

188248 }

249+}

189250

190− return themeCursors[cursorName];

251+void CursorImageProvider::setCustomCursor(const QCursor &customCursor)

252+{

253+ if (customCursor.pixmap().isNull()) {

254+ m_customCursorImage.reset();

255+ } else {

256+ m_customCursorImage.reset(new CustomCursorImage(customCursor));

257+ }

191258}

plugins/Cursor/CursorImageProvider.h+16

@@ -47,6 +47,16 @@ public:

4747 BuiltInCursorImage();

4848};

4949

50+class BlankCursorImage : public CursorImage {

51+public:

52+ BlankCursorImage();

53+};

54+

55+class CustomCursorImage : public CursorImage {

56+public:

57+ CustomCursorImage(const QCursor &cursor);

58+};

59+

5060class CursorImageProvider : public QQuickImageProvider

5161{

5262public:

@@ -60,6 +70,8 @@ public:

6070

6171 QPoint hotspot(const QString &themeName, const QString &cursorName);

6272

73+ void setCustomCursor(const QCursor &customCursor);

74+

6375private:

6476 CursorImage *fetchCursor(const QString &cursorThemeAndName);

6577 CursorImage *fetchCursor(const QString &themeName, const QString &cursorName);

@@ -69,6 +81,10 @@ private:

6981 QMap<QString, QMap<QString, CursorImage*> > m_cursors;

7082

7183 QScopedPointer<CursorImage> m_builtInCursorImage;

84+ BlankCursorImage m_blankCursorImage;

85+ QScopedPointer<CursorImage> m_customCursorImage;

86+

87+ QMap<QString, QList<QString>> m_fallbackNames;

7288

7389 static CursorImageProvider *m_instance;

7490};

plugins/Cursor/MousePointer.cpp+5

@@ -123,3 +123,8 @@ void MousePointer::setThemeName(const QString &themeName)

123123 Q_EMIT themeNameChanged(m_themeName);

124124 }

125125}

126+

127+void MousePointer::setCustomCursor(const QCursor &customCursor)

128+{

129+ CursorImageProvider::instance()->setCustomCursor(customCursor);

130+}

plugins/Cursor/MousePointer.h+2

@@ -38,6 +38,8 @@ public:

3838 qreal hotspotX() const override { return m_hotspotX; }

3939 qreal hotspotY() const override { return m_hotspotY; }

4040

41+ void setCustomCursor(const QCursor &) override;

42+

4143public Q_SLOTS:

4244 void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,

4345 Qt::KeyboardModifiers modifiers) override;