1
=== modified file 'src/ubuntumirclient/qmirclientcursor.cpp'
2
--- src/ubuntumirclient/qmirclientcursor.cpp	2017-02-07 16:16:54 +0000
3
+++ src/ubuntumirclient/qmirclientcursor.cpp	2017-02-21 18:25:18 +0000
4
@@ -133,6 +133,28 @@
5
133
        return "???";
133
        return "???";
6
134
    }
134
    }
7
135
}
135
}
8
136
9
137
class CursorWindowSpec
10
138
{
11
139
public:
12
140
    CursorWindowSpec(MirConnection *connection, const char *name)
13
141
    :  spec(mir_create_window_spec(connection))
14
142
    {
15
143
        mir_window_spec_set_cursor_name(spec, name);
16
144
    }
17
145
18
146
    ~CursorWindowSpec()
19
147
    {
20
148
        mir_window_spec_release(spec);
21
149
    }
22
150
23
151
    void apply(MirWindow *window)
24
152
    {
25
153
        mir_window_apply_spec(window, spec);
26
154
    }
27
155
private:
28
156
    MirWindowSpec * const spec;
29
157
};
30
136
} // anonymous namespace
158
} // anonymous namespace
31
137
159
32
138
void QMirClientCursor::changeCursor(QCursor *windowCursor, QWindow *window)
160
void QMirClientCursor::changeCursor(QCursor *windowCursor, QWindow *window)
33
@@ -157,12 +179,8 @@
34
157
            applyDefaultCursorConfiguration(mirWindow);
179
            applyDefaultCursorConfiguration(mirWindow);
35
158
        } else {
180
        } else {
36
159
            const auto &cursorName = mShapeToCursorName.value(windowCursor->shape(), QByteArray("left_ptr"));
181
            const auto &cursorName = mShapeToCursorName.value(windowCursor->shape(), QByteArray("left_ptr"));
43
160
#pragma GCC diagnostic push
182
            CursorWindowSpec spec(mConnection, cursorName.data());
44
161
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
183
            spec.apply(mirWindow);
39
162
            auto cursorConfiguration = mir_cursor_configuration_from_name(cursorName.data());
40
163
#pragma GCC diagnostic pop
41
164
            mir_window_configure_cursor(mirWindow, cursorConfiguration);
42
165
            mir_cursor_configuration_destroy(cursorConfiguration);
45
166
        }
184
        }
46
167
    } else {
185
    } else {
47
168
        applyDefaultCursorConfiguration(mirWindow);
186
        applyDefaultCursorConfiguration(mirWindow);
48
@@ -206,10 +224,7 @@
49
206
224
50
207
void QMirClientCursor::applyDefaultCursorConfiguration(MirWindow *window)
225
void QMirClientCursor::applyDefaultCursorConfiguration(MirWindow *window)
51
208
{
226
{
58
209
#pragma GCC diagnostic push
227
59
210
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
228
    CursorWindowSpec spec(mConnection, "left_ptr");
60
211
    auto cursorConfiguration = mir_cursor_configuration_from_name("left_ptr");
229
    spec.apply(window);
55
212
#pragma GCC diagnostic pop
56
213
    mir_window_configure_cursor(window, cursorConfiguration);
57
214
    mir_cursor_configuration_destroy(cursorConfiguration);
61
215
}
230
}
62
216
231
63
=== modified file 'src/ubuntumirclient/qmirclientdebugextension.cpp'
64
--- src/ubuntumirclient/qmirclientdebugextension.cpp	2017-02-07 16:18:59 +0000
65
+++ src/ubuntumirclient/qmirclientdebugextension.cpp	2017-02-21 18:25:18 +0000
66
@@ -43,42 +43,31 @@
67
43
#include "qmirclientlogging.h"
43
#include "qmirclientlogging.h"
68
44
44
69
45
// mir client debug
45
// mir client debug
71
46
#include <mir_toolkit/debug/surface.h>
46
#include <mir_toolkit/extensions/window_coordinate_translation.h>
72
47
47
73
48
Q_LOGGING_CATEGORY(mirclientDebug, "qt.qpa.mirclient.debug")
48
Q_LOGGING_CATEGORY(mirclientDebug, "qt.qpa.mirclient.debug")
74
49
49
78
50
QMirClientDebugExtension::QMirClientDebugExtension()
50
QMirClientDebugExtension::QMirClientDebugExtension(MirConnection *connection)
79
51
    : m_mirclientDebug(QStringLiteral("mirclient-debug-extension"), 1)
51
    : mExtension(mir_extension_window_coordinate_translation_v1(connection))
77
52
    , m_mapper(nullptr)
80
53
{
52
{
90
54
    qCDebug(mirclientDebug) << "NOTICE: Loading mirclient-debug-extension";
53
    if (mExtension == nullptr) {
91
55
    m_mapper = (MapperPrototype) m_mirclientDebug.resolve("mir_extension_window_coordinate_translation");
54
        qCWarning(mirclientDebug) << "ERROR: no window coordinate translation extension available";
83
56
84
57
    if (!m_mirclientDebug.isLoaded()) {
85
58
        qCWarning(mirclientDebug) << "ERROR: mirclient-debug-extension failed to load:"
86
59
                                  << m_mirclientDebug.errorString();
87
60
    } else if (!m_mapper) {
88
61
        qCWarning(mirclientDebug) << "ERROR: unable to find required symbols in mirclient-debug-extension:"
89
62
                                  << m_mirclientDebug.errorString();
92
63
    }
55
    }
93
64
}
56
}
94
65
57
95
66
bool QMirClientDebugExtension::isEnabled() const
58
bool QMirClientDebugExtension::isEnabled() const
96
67
{
59
{
98
68
    return m_mirclientDebug.isLoaded() && m_mapper;
60
    return mExtension != nullptr;
99
69
}
61
}
100
70
62
101
71
QPoint QMirClientDebugExtension::mapWindowPointToScreen(MirWindow *window, const QPoint &point)
63
QPoint QMirClientDebugExtension::mapWindowPointToScreen(MirWindow *window, const QPoint &point)
102
72
{
64
{
104
73
    if (!m_mapper) {
65
    if (!mExtension) {
105
74
        return point;
66
        return point;
106
75
    }
67
    }
107
76
68
108
77
    QPoint mappedPoint;
69
    QPoint mappedPoint;
115
78
    bool status = m_mapper(window, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());
70
    mExtension->window_translate_coordinates(window, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());
116
79
    if (status) {
71
117
80
        return mappedPoint;
72
    return mappedPoint;
112
81
    } else {
113
82
        return point;
114
83
    }
118
84
}
73
}
119
85
74
120
=== modified file 'src/ubuntumirclient/qmirclientdebugextension.h'
121
--- src/ubuntumirclient/qmirclientdebugextension.h	2017-02-07 16:16:54 +0000
122
+++ src/ubuntumirclient/qmirclientdebugextension.h	2017-02-21 18:25:18 +0000
123
@@ -42,25 +42,22 @@
124
42
#define QMIRCLIENTDEBUGEXTENSION_H
42
#define QMIRCLIENTDEBUGEXTENSION_H
125
43
43
126
44
#include <QPoint>
44
#include <QPoint>
127
45
#include <QLibrary>
128
46
45
129
47
#include <mir_toolkit/mir_window.h>
46
#include <mir_toolkit/mir_window.h>
130
48
47
133
49
typedef bool (*MapperPrototype)(MirWindow* window, int x, int y, int* screenX, int* screenY);
48
struct MirExtensionWindowCoordinateTranslationV1;
132
50
134
51
49
135
52
class QMirClientDebugExtension
50
class QMirClientDebugExtension
136
53
{
51
{
137
54
public:
52
public:
139
55
    QMirClientDebugExtension();
53
    QMirClientDebugExtension(MirConnection *connection);
140
56
54
141
57
    bool isEnabled() const;
55
    bool isEnabled() const;
142
58
56
143
59
    QPoint mapWindowPointToScreen(MirWindow *, const QPoint &point);
57
    QPoint mapWindowPointToScreen(MirWindow *, const QPoint &point);
144
60
58
145
61
private:
59
private:
148
62
    QLibrary m_mirclientDebug;
60
    MirExtensionWindowCoordinateTranslationV1 const *mExtension;
147
63
    MapperPrototype m_mapper;
149
64
};
61
};
150
65
62
151
66
#endif // QMIRCLIENTDEBUGEXTENSION_H
63
#endif // QMIRCLIENTDEBUGEXTENSION_H
152
67
64
153
=== modified file 'src/ubuntumirclient/qmirclientintegration.cpp'
154
--- src/ubuntumirclient/qmirclientintegration.cpp	2017-02-07 15:37:20 +0000
155
+++ src/ubuntumirclient/qmirclientintegration.cpp	2017-02-21 18:25:18 +0000
156
@@ -163,7 +163,7 @@
157
163
        }
163
        }
158
164
    }
164
    }
159
165
    if (testability) {
165
    if (testability) {
161
166
        mDebugExtension.reset(new QMirClientDebugExtension);
166
        mDebugExtension.reset(new QMirClientDebugExtension(mMirConnection));
162
167
        if (!mDebugExtension->isEnabled()) {
167
        if (!mDebugExtension->isEnabled()) {
163
168
            mDebugExtension.reset();
168
            mDebugExtension.reset();
164
169
        }
169
        }
Status:	Merged
Approved by:	Gerry Boland on 2017-03-27
Approved revision:	381
Merged at revision:	389
Proposed branch:	lp:~albaguirre/qtubuntu/more-new-mir-apis
Merge into:	lp:qtubuntu
Prerequisite:	lp:~artmello/qtubuntu/qtubuntu-new_mir_api
Diff against target:	164 lines (+41/-40) 4 files modified src/ubuntumirclient/qmirclientcursor.cpp (+27/-12) src/ubuntumirclient/qmirclientdebugextension.cpp (+10/-21) src/ubuntumirclient/qmirclientdebugextension.h (+3/-6) src/ubuntumirclient/qmirclientintegration.cpp (+1/-1)
To merge this branch:	bzr merge lp:~albaguirre/qtubuntu/more-new-mir-apis
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)			Approve on 2017-03-27
Daniel d'Andrada (community)		2017-02-07	Approve on 2017-02-21
Unity8 CI Bot	continuous-integration		Approve on 2017-02-21
Review via email: mp+316646@code.launchpad.net
1	=== modified file 'src/ubuntumirclient/qmirclientcursor.cpp'
2	--- src/ubuntumirclient/qmirclientcursor.cpp 2017-02-07 16:16:54 +0000
3	+++ src/ubuntumirclient/qmirclientcursor.cpp 2017-02-21 18:25:18 +0000
4	@@ -133,6 +133,28 @@
5	133	return "???";	133	return "???";
6	134	}	134	}
7	135	}	135	}
8			136
9			137	class CursorWindowSpec
10			138	{
11			139	public:
12			140	CursorWindowSpec(MirConnection connection, const char name)
13			141	: spec(mir_create_window_spec(connection))
14			142	{
15			143	mir_window_spec_set_cursor_name(spec, name);
16			144	}
17			145
18			146	~CursorWindowSpec()
19			147	{
20			148	mir_window_spec_release(spec);
21			149	}
22			150
23			151	void apply(MirWindow *window)
24			152	{
25			153	mir_window_apply_spec(window, spec);
26			154	}
27			155	private:
28			156	MirWindowSpec * const spec;
29			157	};
30	136	} // anonymous namespace	158	} // anonymous namespace
31	137		159
32	138	void QMirClientCursor::changeCursor(QCursor windowCursor, QWindow window)	160	void QMirClientCursor::changeCursor(QCursor windowCursor, QWindow window)
33	@@ -157,12 +179,8 @@
34	157	applyDefaultCursorConfiguration(mirWindow);	179	applyDefaultCursorConfiguration(mirWindow);
35	158	} else {	180	} else {
36	159	const auto &cursorName = mShapeToCursorName.value(windowCursor->shape(), QByteArray("left_ptr"));	181	const auto &cursorName = mShapeToCursorName.value(windowCursor->shape(), QByteArray("left_ptr"));
43	160	#pragma GCC diagnostic push	182	CursorWindowSpec spec(mConnection, cursorName.data());
44	161	#pragma GCC diagnostic ignored "-Wdeprecated-declarations"	183	spec.apply(mirWindow);
39	162	auto cursorConfiguration = mir_cursor_configuration_from_name(cursorName.data());
40	163	#pragma GCC diagnostic pop
41	164	mir_window_configure_cursor(mirWindow, cursorConfiguration);
42	165	mir_cursor_configuration_destroy(cursorConfiguration);
45	166	}	184	}
46	167	} else {	185	} else {
47	168	applyDefaultCursorConfiguration(mirWindow);	186	applyDefaultCursorConfiguration(mirWindow);
48	@@ -206,10 +224,7 @@
49	206		224
50	207	void QMirClientCursor::applyDefaultCursorConfiguration(MirWindow *window)	225	void QMirClientCursor::applyDefaultCursorConfiguration(MirWindow *window)
51	208	{	226	{
58	209	#pragma GCC diagnostic push	227
59	210	#pragma GCC diagnostic ignored "-Wdeprecated-declarations"	228	CursorWindowSpec spec(mConnection, "left_ptr");
60	211	auto cursorConfiguration = mir_cursor_configuration_from_name("left_ptr");	229	spec.apply(window);
55	212	#pragma GCC diagnostic pop
56	213	mir_window_configure_cursor(window, cursorConfiguration);
57	214	mir_cursor_configuration_destroy(cursorConfiguration);
61	215	}	230	}
62	216		231
63	=== modified file 'src/ubuntumirclient/qmirclientdebugextension.cpp'
64	--- src/ubuntumirclient/qmirclientdebugextension.cpp 2017-02-07 16:18:59 +0000
65	+++ src/ubuntumirclient/qmirclientdebugextension.cpp 2017-02-21 18:25:18 +0000
66	@@ -43,42 +43,31 @@
67	43	#include "qmirclientlogging.h"	43	#include "qmirclientlogging.h"
68	44		44
69	45	// mir client debug	45	// mir client debug
71	46	#include <mir_toolkit/debug/surface.h>	46	#include <mir_toolkit/extensions/window_coordinate_translation.h>
72	47		47
73	48	Q_LOGGING_CATEGORY(mirclientDebug, "qt.qpa.mirclient.debug")	48	Q_LOGGING_CATEGORY(mirclientDebug, "qt.qpa.mirclient.debug")
74	49		49
78	50	QMirClientDebugExtension::QMirClientDebugExtension()	50	QMirClientDebugExtension::QMirClientDebugExtension(MirConnection *connection)
79	51	: m_mirclientDebug(QStringLiteral("mirclient-debug-extension"), 1)	51	: mExtension(mir_extension_window_coordinate_translation_v1(connection))
77	52	, m_mapper(nullptr)
80	53	{	52	{
90	54	qCDebug(mirclientDebug) << "NOTICE: Loading mirclient-debug-extension";	53	if (mExtension == nullptr) {
91	55	m_mapper = (MapperPrototype) m_mirclientDebug.resolve("mir_extension_window_coordinate_translation");	54	qCWarning(mirclientDebug) << "ERROR: no window coordinate translation extension available";
83	56
84	57	if (!m_mirclientDebug.isLoaded()) {
85	58	qCWarning(mirclientDebug) << "ERROR: mirclient-debug-extension failed to load:"
86	59	<< m_mirclientDebug.errorString();
87	60	} else if (!m_mapper) {
88	61	qCWarning(mirclientDebug) << "ERROR: unable to find required symbols in mirclient-debug-extension:"
89	62	<< m_mirclientDebug.errorString();
92	63	}	55	}
93	64	}	56	}
94	65		57
95	66	bool QMirClientDebugExtension::isEnabled() const	58	bool QMirClientDebugExtension::isEnabled() const
96	67	{	59	{
98	68	return m_mirclientDebug.isLoaded() && m_mapper;	60	return mExtension != nullptr;
99	69	}	61	}
100	70		62
101	71	QPoint QMirClientDebugExtension::mapWindowPointToScreen(MirWindow *window, const QPoint &point)	63	QPoint QMirClientDebugExtension::mapWindowPointToScreen(MirWindow *window, const QPoint &point)
102	72	{	64	{
104	73	if (!m_mapper) {	65	if (!mExtension) {
105	74	return point;	66	return point;
106	75	}	67	}
107	76		68
108	77	QPoint mappedPoint;	69	QPoint mappedPoint;
115	78	bool status = m_mapper(window, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());	70	mExtension->window_translate_coordinates(window, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());
116	79	if (status) {	71
117	80	return mappedPoint;	72	return mappedPoint;
112	81	} else {
113	82	return point;
114	83	}
118	84	}	73	}
119	85		74
120	=== modified file 'src/ubuntumirclient/qmirclientdebugextension.h'
121	--- src/ubuntumirclient/qmirclientdebugextension.h 2017-02-07 16:16:54 +0000
122	+++ src/ubuntumirclient/qmirclientdebugextension.h 2017-02-21 18:25:18 +0000
123	@@ -42,25 +42,22 @@
124	42	#define QMIRCLIENTDEBUGEXTENSION_H	42	#define QMIRCLIENTDEBUGEXTENSION_H
125	43		43
126	44	#include <QPoint>	44	#include <QPoint>
127	45	#include <QLibrary>
128	46		45
129	47	#include <mir_toolkit/mir_window.h>	46	#include <mir_toolkit/mir_window.h>
130	48		47
133	49	typedef bool (MapperPrototype)(MirWindow window, int x, int y, int* screenX, int* screenY);	48	struct MirExtensionWindowCoordinateTranslationV1;
132	50
134	51		49
135	52	class QMirClientDebugExtension	50	class QMirClientDebugExtension
136	53	{	51	{
137	54	public:	52	public:
139	55	QMirClientDebugExtension();	53	QMirClientDebugExtension(MirConnection *connection);
140	56		54
141	57	bool isEnabled() const;	55	bool isEnabled() const;
142	58		56
143	59	QPoint mapWindowPointToScreen(MirWindow *, const QPoint &point);	57	QPoint mapWindowPointToScreen(MirWindow *, const QPoint &point);
144	60		58
145	61	private:	59	private:
148	62	QLibrary m_mirclientDebug;	60	MirExtensionWindowCoordinateTranslationV1 const *mExtension;
147	63	MapperPrototype m_mapper;
149	64	};	61	};
150	65		62
151	66	#endif // QMIRCLIENTDEBUGEXTENSION_H	63	#endif // QMIRCLIENTDEBUGEXTENSION_H
152	67		64
153	=== modified file 'src/ubuntumirclient/qmirclientintegration.cpp'
154	--- src/ubuntumirclient/qmirclientintegration.cpp 2017-02-07 15:37:20 +0000
155	+++ src/ubuntumirclient/qmirclientintegration.cpp 2017-02-21 18:25:18 +0000
156	@@ -163,7 +163,7 @@
157	163	}	163	}
158	164	}	164	}
159	165	if (testability) {	165	if (testability) {
161	166	mDebugExtension.reset(new QMirClientDebugExtension);	166	mDebugExtension.reset(new QMirClientDebugExtension(mMirConnection));
162	167	if (!mDebugExtension->isEnabled()) {	167	if (!mDebugExtension->isEnabled()) {
163	168	mDebugExtension.reset();	168	mDebugExtension.reset();
164	169	}	169	}