@@ -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,68 @@ CursorImageProvider::CursorImageProvider()
91112 qFatal("Cannot have multiple CursorImageProvider instances");
92113 }
93114 m_instance = this;
115+
116+ m_fallbackNames[QLatin1String("closedhand")].append(QLatin1String("grabbing"));
117+ m_fallbackNames[QLatin1String("closedhand")].append(QLatin1String("dnd-none"));
118+
119+ m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("dnd-none"));
120+ m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("grabbing"));
121+ m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("closedhand"));
122+
123+ m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("dnd-none"));
124+ m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("grabbing"));
125+ m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("closedhand"));
126+
127+ m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("dnd-none"));
128+ m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("grabbing"));
129+ m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("closedhand"));
130+
131+ m_fallbackNames[QLatin1String("forbidden")].append(QLatin1String("crossed_circle")); // DMZ-White and DMZ-Black themes
132+ m_fallbackNames[QLatin1String("forbidden")].append(QLatin1String("not-allowed"));
133+ m_fallbackNames[QLatin1String("forbidden")].append(QLatin1String("circle"));
134+
135+ m_fallbackNames[QLatin1String("hand")].append(QLatin1String("pointing_hand"));
136+ m_fallbackNames[QLatin1String("hand")].append(QLatin1String("pointer"));
137+
138+ m_fallbackNames[QLatin1String("ibeam")].append(QLatin1String("xterm"));
139+ m_fallbackNames[QLatin1String("ibeam")].append(QLatin1String("text"));
140+
141+ m_fallbackNames[QLatin1String("left_ptr")].append(QLatin1String("default"));
142+ m_fallbackNames[QLatin1String("left_ptr")].append(QLatin1String("top_left_arrow"));
143+ m_fallbackNames[QLatin1String("left_ptr")].append(QLatin1String("left_arrow"));
144+
145+ m_fallbackNames[QLatin1String("left_ptr_watch")].append(QLatin1String("half-busy"));
146+ m_fallbackNames[QLatin1String("left_ptr_watch")].append(QLatin1String("progress"));
147+
148+ m_fallbackNames[QLatin1String("size_bdiag")].append(QLatin1String("fd_double_arrow"));
149+ m_fallbackNames[QLatin1String("size_bdiag")].append(QLatin1String("nesw-resize"));
150+
151+ m_fallbackNames[QLatin1String("size_fdiag")].append(QLatin1String("bd_double_arrow")); // DMZ-White and DMZ-Black themes
152+ m_fallbackNames[QLatin1String("size_fdiag")].append(QLatin1String("nwse-resize"));
153+
154+ m_fallbackNames[QLatin1String("size_hor")].append(QLatin1String("sb_h_double_arrow")); // DMZ-White and DMZ-Black themes
155+ m_fallbackNames[QLatin1String("size_hor")].append(QLatin1String("ew-resize"));
156+ m_fallbackNames[QLatin1String("size_hor")].append(QLatin1String("h_double_arrow"));
157+
158+ m_fallbackNames[QLatin1String("size_ver")].append(QLatin1String("sb_v_double_arrow")); // DMZ-White and DMZ-Black themes
159+ m_fallbackNames[QLatin1String("size_ver")].append(QLatin1String("ns-resize"));
160+ m_fallbackNames[QLatin1String("size_ver")].append(QLatin1String("v_double_arrow"));
161+
162+ m_fallbackNames[QLatin1String("split_h")].append(QLatin1String("sb_h_double_arrow")); // DMZ-White and DMZ-Black themes
163+ m_fallbackNames[QLatin1String("split_h")].append(QLatin1String("col-resize"));
164+
165+ m_fallbackNames[QLatin1String("split_v")].append(QLatin1String("sb_v_double_arrow")); // DMZ-White and DMZ-Black themes
166+ m_fallbackNames[QLatin1String("split_v")].append(QLatin1String("row-resize"));
167+
168+ m_fallbackNames[QLatin1String("up_arrow")].append(QLatin1String("sb_up_arrow")); // DMZ-White and DMZ-Black themes
169+
170+ m_fallbackNames[QLatin1String("watch")].append(QLatin1String("wait"));
171+
172+ m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("left_ptr_help"));
173+ m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("help"));
174+ m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("question_arrow"));
175+
176+ m_fallbackNames[QLatin1String("xterm")].append(QLatin1String("ibeam"));
94177}
95178
96179CursorImageProvider::~CursorImageProvider()
@@ -151,12 +234,14 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
151234
152235 // Try some fallbacks
153236 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");
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()) {
241+ qDebug().nospace() << "CursorImageProvider: "<< cursorName <<" not found, trying " << fallbackNames.at(i);
242+ cursorImage = fetchCursorHelper(themeName, fallbackNames.at(i));
243+ ++i;
244+ }
160245 }
161246 }
162247
@@ -181,11 +266,26 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
181266
182267CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName)
183268{
184− QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];
269+ if (cursorName == QLatin1String("blank")) {
270+ return &m_blankCursorImage;
271+ } else if (cursorName == QLatin1String("custom")) {
272+ return m_customCursorImage.data();
273+ } else {
274+ QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];
275+
276+ if (!themeCursors.contains(cursorName)) {
277+ themeCursors[cursorName] = new XCursorImage(themeName, cursorName);
278+ }
185279
186− if (!themeCursors.contains(cursorName)) {
187− themeCursors[cursorName] = new XCursorImage(themeName, cursorName);
280+ return themeCursors[cursorName];
188281 }
282+}
189283
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+ }
191291}