ab229d8 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Merge lp:~dandrader/unity8/fallbackCursorNames

ab229d8Albert Astals Cid11 years ago

CMakeLists.txt+1−1

compare with xenial

unifiedsplit

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

57find_package(Qt5Concurrent 5.4 REQUIRED)

58find_package(Qt5Sql 5.4 REQUIRED)

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

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

62# Standard install paths

63include(GNUInstallDirs)

debian/control+3−3

@@ -29,7 +29,7 @@ Build-Depends: cmake,

29 libqt5xmlpatterns5-dev,

30 libsystemsettings-dev,

31 libudev-dev,

32− libunity-api-dev (>= 7.102),

32+ libunity-api-dev (>= 7.103),

33 libusermetricsoutput1-dev,

34 libxcb1-dev,

35 pkg-config,

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

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

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

130 ubuntu-thumbnailer-impl-0,

131− unity-application-impl-10,

131+ unity-application-impl-11,

132 unity-notifications-impl-3,

133 unity-plugin-scopes | unity-scopes-impl,

134 unity-scopes-impl-7,

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

174Depends: ${misc:Depends},

175 ${shlibs:Depends},

176Provides: unity-application-impl,

177− unity-application-impl-10,

177+ unity-application-impl-11,

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

179Description: Fake environment for running Unity 8 shell

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

plugins/Cursor/CursorImageProvider.cpp+110−10

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

17#include "CursorImageProvider.h"

19+#include <QCursor>

19#include <QDebug>

20#include <QDebug>

20#include <QFile>

21#include <QFile>

21#include <QPainter>

22#include <QPainter>

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

49 delete svgRenderer;

50 delete svgRenderer;

50}

51}

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+

52/////

73/////

53// XCursorImage

74// XCursorImage

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

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

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

92 }

113 }

93 m_instance = this;

114 m_instance = this;

115+

116+ m_fallbackNames[QStringLiteral("closedhand")].append(QStringLiteral("grabbing"));

117+ m_fallbackNames[QStringLiteral("closedhand")].append(QStringLiteral("dnd-none"));

118+

119+ m_fallbackNames[QStringLiteral("dnd-copy")].append(QStringLiteral("dnd-none"));

120+ m_fallbackNames[QStringLiteral("dnd-copy")].append(QStringLiteral("grabbing"));

121+ m_fallbackNames[QStringLiteral("dnd-copy")].append(QStringLiteral("closedhand"));

122+

123+ m_fallbackNames[QStringLiteral("dnd-move")].append(QStringLiteral("dnd-none"));

124+ m_fallbackNames[QStringLiteral("dnd-move")].append(QStringLiteral("grabbing"));

125+ m_fallbackNames[QStringLiteral("dnd-move")].append(QStringLiteral("closedhand"));

126+

127+ m_fallbackNames[QStringLiteral("dnd-link")].append(QStringLiteral("dnd-none"));

128+ m_fallbackNames[QStringLiteral("dnd-link")].append(QStringLiteral("grabbing"));

129+ m_fallbackNames[QStringLiteral("dnd-link")].append(QStringLiteral("closedhand"));

130+

131+ m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("crossed_circle")); // DMZ-White and DMZ-Black themes

132+ m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("not-allowed"));

133+ m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("circle"));

134+

135+ m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointing_hand"));

136+ m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointer"));

137+

138+ m_fallbackNames[QStringLiteral("ibeam")].append(QStringLiteral("xterm"));

139+ m_fallbackNames[QStringLiteral("ibeam")].append(QStringLiteral("text"));

140+

141+ m_fallbackNames[QStringLiteral("left_ptr")].append(QStringLiteral("default"));

142+ m_fallbackNames[QStringLiteral("left_ptr")].append(QStringLiteral("top_left_arrow"));

143+ m_fallbackNames[QStringLiteral("left_ptr")].append(QStringLiteral("left_arrow"));

144+

145+ m_fallbackNames[QStringLiteral("left_ptr_watch")].append(QStringLiteral("half-busy"));

146+ m_fallbackNames[QStringLiteral("left_ptr_watch")].append(QStringLiteral("progress"));

147+

148+ m_fallbackNames[QStringLiteral("size_bdiag")].append(QStringLiteral("fd_double_arrow"));

149+ m_fallbackNames[QStringLiteral("size_bdiag")].append(QStringLiteral("nesw-resize"));

150+

151+ m_fallbackNames[QStringLiteral("size_fdiag")].append(QStringLiteral("bd_double_arrow")); // DMZ-White and DMZ-Black themes

152+ m_fallbackNames[QStringLiteral("size_fdiag")].append(QStringLiteral("nwse-resize"));

153+

154+ m_fallbackNames[QStringLiteral("size_hor")].append(QStringLiteral("sb_h_double_arrow")); // DMZ-White and DMZ-Black themes

155+ m_fallbackNames[QStringLiteral("size_hor")].append(QStringLiteral("ew-resize"));

156+ m_fallbackNames[QStringLiteral("size_hor")].append(QStringLiteral("h_double_arrow"));

157+

158+ m_fallbackNames[QStringLiteral("size_ver")].append(QStringLiteral("sb_v_double_arrow")); // DMZ-White and DMZ-Black themes

159+ m_fallbackNames[QStringLiteral("size_ver")].append(QStringLiteral("ns-resize"));

160+ m_fallbackNames[QStringLiteral("size_ver")].append(QStringLiteral("v_double_arrow"));

161+

162+ m_fallbackNames[QStringLiteral("split_h")].append(QStringLiteral("sb_h_double_arrow")); // DMZ-White and DMZ-Black themes

163+ m_fallbackNames[QStringLiteral("split_h")].append(QStringLiteral("col-resize"));

164+

165+ m_fallbackNames[QStringLiteral("split_v")].append(QStringLiteral("sb_v_double_arrow")); // DMZ-White and DMZ-Black themes

166+ m_fallbackNames[QStringLiteral("split_v")].append(QStringLiteral("row-resize"));

167+

168+ m_fallbackNames[QStringLiteral("up_arrow")].append(QStringLiteral("sb_up_arrow")); // DMZ-White and DMZ-Black themes

169+

170+ m_fallbackNames[QStringLiteral("watch")].append(QStringLiteral("wait"));

171+

172+ m_fallbackNames[QStringLiteral("whats_this")].append(QStringLiteral("left_ptr_help"));

173+ m_fallbackNames[QStringLiteral("whats_this")].append(QStringLiteral("help"));

174+ m_fallbackNames[QStringLiteral("whats_this")].append(QStringLiteral("question_arrow"));

175+

176+ m_fallbackNames[QStringLiteral("xterm")].append(QStringLiteral("ibeam"));

94}

177}

178

96CursorImageProvider::~CursorImageProvider()

179CursorImageProvider::~CursorImageProvider()

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

151

234

152 // Try some fallbacks

235 // Try some fallbacks

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

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

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

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

238+ const QStringList &fallbackNames = m_fallbackNames[cursorName];

239+ int i = 0;

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

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

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

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

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

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

243+ ++i;

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

244+ }

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

160 }

245 }

161 }

246 }

162

247

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

181

266

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

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

183{

268{

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

270+ return &m_blankCursorImage;

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

272+ return m_customCursorImage.data();

273+ } else {

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

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

275+

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

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

278+ }

185

279

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

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

280+ return themeCursors[cursorName];

188 }

281 }

282+}

189

283

190− return themeCursors[cursorName];

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

285+{

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

287+ m_customCursorImage.reset();

288+ } else {

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

290+ }

191}

291}

plugins/Cursor/CursorImageProvider.h+16

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

47 BuiltInCursorImage();

48};

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+

50class CursorImageProvider : public QQuickImageProvider

60class CursorImageProvider : public QQuickImageProvider

51{

61{

52public:

62public:

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

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

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

73+ void setCustomCursor(const QCursor &customCursor);

74+

63private:

75private:

64 CursorImage *fetchCursor(const QString &cursorThemeAndName);

76 CursorImage *fetchCursor(const QString &cursorThemeAndName);

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

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

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

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

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

71 QScopedPointer<CursorImage> m_builtInCursorImage;

83 QScopedPointer<CursorImage> m_builtInCursorImage;

84+ BlankCursorImage m_blankCursorImage;

85+ QScopedPointer<CursorImage> m_customCursorImage;

86+

87+ QMap<QString, QStringList> m_fallbackNames;

73 static CursorImageProvider *m_instance;

89 static CursorImageProvider *m_instance;

74};

90};

plugins/Cursor/MousePointer.cpp+5

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

124 Q_EMIT themeNameChanged(m_themeName);

125 }

126}

127+

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

129+{

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

131+}

plugins/Cursor/MousePointer.h+2

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

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

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

41+ void setCustomCursor(const QCursor &) override;

42+

41public Q_SLOTS:

43public Q_SLOTS:

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

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

43 Qt::KeyboardModifiers modifiers) override;

45 Qt::KeyboardModifiers modifiers) override;