1
=== modified file 'debian/control'
2
--- debian/control	2016-08-24 12:40:30 +0000
3
+++ debian/control	2016-10-04 16:22:27 +0000
4
@@ -11,6 +11,7 @@
5
11
               libglib2.0-dev,
11
               libglib2.0-dev,
6
12
               libinput-dev,
12
               libinput-dev,
7
13
               libmirclient-dev (>= 0.13.0),
13
               libmirclient-dev (>= 0.13.0),
8
14
               libmirclient-debug-extension-dev,
9
14
               libmtdev-dev,
15
               libmtdev-dev,
10
15
               libubuntu-application-api-dev (>= 2.9.0),
16
               libubuntu-application-api-dev (>= 2.9.0),
11
16
               libudev-dev,
17
               libudev-dev,
12
17
18
13
=== added file 'src/ubuntumirclient/debugextension.cpp'
14
--- src/ubuntumirclient/debugextension.cpp	1970-01-01 00:00:00 +0000
15
+++ src/ubuntumirclient/debugextension.cpp	2016-10-04 16:22:27 +0000
16
@@ -0,0 +1,55 @@
17
1
/*
18
2
 * Copyright (C) 2016 Canonical, Ltd.
19
3
 *
20
4
 * This program is free software: you can redistribute it and/or modify it under
21
5
 * the terms of the GNU Lesser General Public License version 3, as published by
22
6
 * the Free Software Foundation.
23
7
 *
24
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
25
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
26
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
27
11
 * Lesser General Public License for more details.
28
12
 *
29
13
 * You should have received a copy of the GNU Lesser General Public License
30
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
31
15
 */
32
16
33
17
#include "debugextension.h"
34
18
35
19
#include "logging.h"
36
20
37
21
// mir client debug
38
22
#include <mir_toolkit/debug/surface.h>
39
23
40
24
Q_LOGGING_CATEGORY(ubuntumirclientDebug, "ubuntumirclient.debug")
41
25
42
26
UbuntuDebugExtension::UbuntuDebugExtension()
43
27
    : m_mirclientDebug(QStringLiteral("mirclient-debug-extension"), 1)
44
28
    , m_mapper(nullptr)
45
29
{
46
30
    qCDebug(ubuntumirclientDebug) << "NOTICE: Loading mirclient-debug-extension";
47
31
    m_mapper = (MapperPrototype) m_mirclientDebug.resolve("mir_debug_surface_coords_to_screen");
48
32
49
33
    if (!m_mirclientDebug.isLoaded()) {
50
34
        qCWarning(ubuntumirclientDebug) << "ERROR: mirclient-debug-extension failed to load:"
51
35
                                        << m_mirclientDebug.errorString();
52
36
    } else if (!m_mapper) {
53
37
        qCWarning(ubuntumirclientDebug) << "ERROR: unable to find required symbols in mirclient-debug-extension:"
54
38
                                        << m_mirclientDebug.errorString();
55
39
    }
56
40
}
57
41
58
42
QPoint UbuntuDebugExtension::mapSurfacePointToScreen(MirSurface *surface, const QPoint &point)
59
43
{
60
44
    if (!m_mapper) {
61
45
        return point;
62
46
    }
63
47
64
48
    QPoint mappedPoint;
65
49
    bool status = m_mapper(surface, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());
66
50
    if (status) {
67
51
        return mappedPoint;
68
52
    } else {
69
53
        return point;
70
54
    }
71
55
}
72
0
56
73
=== added file 'src/ubuntumirclient/debugextension.h'
74
--- src/ubuntumirclient/debugextension.h	1970-01-01 00:00:00 +0000
75
+++ src/ubuntumirclient/debugextension.h	2016-10-04 16:22:27 +0000
76
@@ -0,0 +1,39 @@
77
1
/*
78
2
 * Copyright (C) 2016 Canonical, Ltd.
79
3
 *
80
4
 * This program is free software: you can redistribute it and/or modify it under
81
5
 * the terms of the GNU Lesser General Public License version 3, as published by
82
6
 * the Free Software Foundation.
83
7
 *
84
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
85
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
86
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
87
11
 * Lesser General Public License for more details.
88
12
 *
89
13
 * You should have received a copy of the GNU Lesser General Public License
90
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
91
15
 */
92
16
93
17
#ifndef UBUNTU_DEBUG_EXTENSION_H
94
18
#define UBUNTU_DEBUG_EXTENSION_H
95
19
96
20
#include <QPoint>
97
21
#include <QLibrary>
98
22
struct MirSurface;
99
23
100
24
typedef bool (*MapperPrototype)(MirSurface* surface, int x, int y, int* screenX, int* screenY);
101
25
102
26
103
27
class UbuntuDebugExtension
104
28
{
105
29
public:
106
30
    UbuntuDebugExtension();
107
31
108
32
    QPoint mapSurfacePointToScreen(MirSurface *, const QPoint &point);
109
33
110
34
private:
111
35
    QLibrary m_mirclientDebug;
112
36
    MapperPrototype m_mapper;
113
37
};
114
38
115
39
#endif // UBUNTU_DEBUG_EXTENSION_H
116
0
40
117
=== modified file 'src/ubuntumirclient/integration.cpp'
118
--- src/ubuntumirclient/integration.cpp	2016-09-28 10:51:25 +0000
119
+++ src/ubuntumirclient/integration.cpp	2016-10-04 16:22:27 +0000
120
@@ -18,6 +18,7 @@
121
18
#include "integration.h"
18
#include "integration.h"
122
19
#include "backingstore.h"
19
#include "backingstore.h"
123
20
#include "clipboard.h"
20
#include "clipboard.h"
124
21
#include "debugextension.h"
125
21
#include "glcontext.h"
22
#include "glcontext.h"
126
22
#include "input.h"
23
#include "input.h"
127
23
#include "logging.h"
24
#include "logging.h"
128
@@ -70,7 +71,8 @@
129
70
    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);
71
    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);
130
71
}
72
}
131
72
73
133
73
UbuntuClientIntegration::UbuntuClientIntegration()
74
134
75
UbuntuClientIntegration::UbuntuClientIntegration(int argc, char **argv)
135
74
    : QPlatformIntegration()
76
    : QPlatformIntegration()
136
75
    , mNativeInterface(new UbuntuNativeInterface(this))
77
    , mNativeInterface(new UbuntuNativeInterface(this))
137
76
    , mFontDb(new QGenericUnixFontDatabase)
78
    , mFontDb(new QGenericUnixFontDatabase)
138
@@ -105,6 +107,17 @@
139
105
    mEglNativeDisplay = mir_connection_get_egl_native_display(mMirConnection);
107
    mEglNativeDisplay = mir_connection_get_egl_native_display(mMirConnection);
140
106
    ASSERT((mEglDisplay = eglGetDisplay(mEglNativeDisplay)) != EGL_NO_DISPLAY);
108
    ASSERT((mEglDisplay = eglGetDisplay(mEglNativeDisplay)) != EGL_NO_DISPLAY);
141
107
    ASSERT(eglInitialize(mEglDisplay, nullptr, nullptr) == EGL_TRUE);
109
    ASSERT(eglInitialize(mEglDisplay, nullptr, nullptr) == EGL_TRUE);
142
110
143
111
    // Has debug mode been requsted, either with "-testability" switch or QT_LOAD_TESTABILITY env var
144
112
    bool testability = qEnvironmentVariableIsSet("QT_LOAD_TESTABILITY");
145
113
    for (int i=1; !testability && i<argc; i++) {
146
114
        if (strcmp(argv[i], "-testability") == 0) {
147
115
            testability = true;
148
116
        }
149
117
    }
150
118
    if (testability) {
151
119
        mDebugExtension.reset(new UbuntuDebugExtension);
152
120
    }
153
108
}
121
}
154
109
122
155
110
void UbuntuClientIntegration::initialize()
123
void UbuntuClientIntegration::initialize()
156
@@ -211,7 +224,7 @@
157
211
224
158
212
QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window) const
225
QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window) const
159
213
{
226
{
161
214
    return new UbuntuWindow(window, mInput, mNativeInterface, mEglDisplay, mMirConnection);
227
    return new UbuntuWindow(window, mInput, mNativeInterface, mEglDisplay, mMirConnection, mDebugExtension.data());
162
215
}
228
}
163
216
229
164
217
bool UbuntuClientIntegration::hasCapability(QPlatformIntegration::Capability cap) const
230
bool UbuntuClientIntegration::hasCapability(QPlatformIntegration::Capability cap) const
165
218
231
166
=== modified file 'src/ubuntumirclient/integration.h'
167
--- src/ubuntumirclient/integration.h	2016-08-24 12:40:30 +0000
168
+++ src/ubuntumirclient/integration.h	2016-10-04 16:22:27 +0000
169
@@ -29,6 +29,7 @@
170
29
29
171
30
#include <EGL/egl.h>
30
#include <EGL/egl.h>
172
31
31
173
32
class UbuntuDebugExtension;
174
32
class UbuntuInput;
33
class UbuntuInput;
175
33
class UbuntuNativeInterface;
34
class UbuntuNativeInterface;
176
34
class UbuntuScreen;
35
class UbuntuScreen;
177
@@ -39,7 +40,7 @@
178
39
    Q_OBJECT
40
    Q_OBJECT
179
40
41
180
41
public:
42
public:
182
42
    UbuntuClientIntegration();
43
    UbuntuClientIntegration(int argc, char **argv);
183
43
    virtual ~UbuntuClientIntegration();
44
    virtual ~UbuntuClientIntegration();
184
44
45
185
45
    // QPlatformIntegration methods.
46
    // QPlatformIntegration methods.
186
@@ -64,6 +65,7 @@
187
64
    EGLDisplay eglDisplay() const { return mEglDisplay; }
65
    EGLDisplay eglDisplay() const { return mEglDisplay; }
188
65
    EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }
66
    EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }
189
66
    UbuntuScreenObserver *screenObserver() const { return mScreenObserver.data(); }
67
    UbuntuScreenObserver *screenObserver() const { return mScreenObserver.data(); }
190
68
    UbuntuDebugExtension *debugExtension() const { return mDebugExtension.data(); }
191
67
69
192
68
private Q_SLOTS:
70
private Q_SLOTS:
193
69
    void destroyScreen(UbuntuScreen *screen);
71
    void destroyScreen(UbuntuScreen *screen);
194
@@ -81,6 +83,7 @@
195
81
83
196
82
    UbuntuInput* mInput;
84
    UbuntuInput* mInput;
197
83
    QPlatformInputContext* mInputContext;
85
    QPlatformInputContext* mInputContext;
198
86
    QScopedPointer<UbuntuDebugExtension> mDebugExtension;
199
84
    QScopedPointer<UbuntuScreenObserver> mScreenObserver;
87
    QScopedPointer<UbuntuScreenObserver> mScreenObserver;
200
85
    qreal mScaleFactor;
88
    qreal mScaleFactor;
201
86
89
202
87
90
203
=== modified file 'src/ubuntumirclient/logging.h'
204
--- src/ubuntumirclient/logging.h	2016-06-22 17:16:33 +0000
205
+++ src/ubuntumirclient/logging.h	2016-10-04 16:22:27 +0000
206
@@ -26,5 +26,6 @@
207
26
Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientInput)
26
Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientInput)
208
27
Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientGraphics)
27
Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientGraphics)
209
28
Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientCursor)
28
Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientCursor)
210
29
Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientDebug)
211
29
30
212
30
#endif  // QUBUNTULOGGING_H
31
#endif  // QUBUNTULOGGING_H
213
31
32
214
=== modified file 'src/ubuntumirclient/plugin.cpp'
215
--- src/ubuntumirclient/plugin.cpp	2015-12-04 16:19:33 +0000
216
+++ src/ubuntumirclient/plugin.cpp	2016-10-04 16:22:27 +0000
217
@@ -1,5 +1,5 @@
218
1
/*
1
/*
220
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014-2016 Canonical, Ltd.
221
3
 *
3
 *
222
4
 * This program is free software: you can redistribute it and/or modify it under
4
 * This program is free software: you can redistribute it and/or modify it under
223
5
 * the terms of the GNU Lesser General Public License version 3, as published by
5
 * the terms of the GNU Lesser General Public License version 3, as published by
224
@@ -20,15 +20,9 @@
225
20
20
226
21
Q_LOGGING_CATEGORY(ubuntumirclient, "ubuntumirclient", QtWarningMsg)
21
Q_LOGGING_CATEGORY(ubuntumirclient, "ubuntumirclient", QtWarningMsg)
227
22
22
237
23
QStringList UbuntuMirClientIntegrationPlugin::keys() const
23
QPlatformIntegration *UbuntuMirClientIntegrationPlugin::create(const QString &system,
238
24
{
24
                                                               const QStringList &/*paramList*/,
239
25
    QStringList list;
25
                                                               int &argc, char **argv)
231
26
    list << QStringLiteral("ubuntumirclient");
232
27
    return list;
233
28
}
234
29
235
30
QPlatformIntegration* UbuntuMirClientIntegrationPlugin::create(const QString &system,
236
31
                                                               const QStringList &)
240
32
{
26
{
241
33
    if (system.toLower() == QLatin1String("ubuntumirclient")) {
27
    if (system.toLower() == QLatin1String("ubuntumirclient")) {
242
34
#ifdef PLATFORM_API_TOUCH
28
#ifdef PLATFORM_API_TOUCH
243
@@ -36,7 +30,7 @@
244
36
#else
30
#else
245
37
        setenv("UBUNTU_PLATFORM_API_BACKEND", "desktop_mirclient", 1);
31
        setenv("UBUNTU_PLATFORM_API_BACKEND", "desktop_mirclient", 1);
246
38
#endif
32
#endif
248
39
        return new UbuntuClientIntegration;
33
        return new UbuntuClientIntegration(argc, argv);
249
40
    } else {
34
    } else {
250
41
        return 0;
35
        return 0;
251
42
    }
36
    }
252
43
37
253
=== modified file 'src/ubuntumirclient/plugin.h'
254
--- src/ubuntumirclient/plugin.h	2014-06-18 23:10:00 +0000
255
+++ src/ubuntumirclient/plugin.h	2016-10-04 16:22:27 +0000
256
@@ -1,5 +1,5 @@
257
1
/*
1
/*
259
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014-2016 Canonical, Ltd.
260
3
 *
3
 *
261
4
 * This program is free software: you can redistribute it and/or modify it under
4
 * This program is free software: you can redistribute it and/or modify it under
262
5
 * the terms of the GNU Lesser General Public License version 3, as published by
5
 * the terms of the GNU Lesser General Public License version 3, as published by
263
@@ -25,8 +25,7 @@
264
25
    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "ubuntumirclient.json")
25
    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "ubuntumirclient.json")
265
26
26
266
27
public:
27
public:
269
28
    QStringList keys() const;
28
    QPlatformIntegration *create(const QString &system, const QStringList &paramList, int &argc, char **argv) override;
268
29
    QPlatformIntegration* create(const QString&, const QStringList&);
270
30
};
29
};
271
31
30
272
32
#endif // UBUNTU_CLIENT_PLUGIN_H
31
#endif // UBUNTU_CLIENT_PLUGIN_H
273
33
32
274
=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
275
--- src/ubuntumirclient/ubuntumirclient.pro	2016-09-28 10:51:25 +0000
276
+++ src/ubuntumirclient/ubuntumirclient.pro	2016-10-04 16:22:27 +0000
277
@@ -18,6 +18,7 @@
278
18
    backingstore.cpp \
18
    backingstore.cpp \
279
19
    clipboard.cpp \
19
    clipboard.cpp \
280
20
    cursor.cpp \
20
    cursor.cpp \
281
21
    debugextension.cpp \
282
21
    glcontext.cpp \
22
    glcontext.cpp \
283
22
    input.cpp \
23
    input.cpp \
284
23
    integration.cpp \
24
    integration.cpp \
285
@@ -33,6 +34,7 @@
286
33
    backingstore.h \
34
    backingstore.h \
287
34
    clipboard.h \
35
    clipboard.h \
288
35
    cursor.h \
36
    cursor.h \
289
37
    debugextension.h \
290
36
    glcontext.h \
38
    glcontext.h \
291
37
    input.h \
39
    input.h \
292
38
    integration.h \
40
    integration.h \
293
39
41
294
=== modified file 'src/ubuntumirclient/window.cpp'
295
--- src/ubuntumirclient/window.cpp	2016-09-28 10:33:40 +0000
296
+++ src/ubuntumirclient/window.cpp	2016-10-04 16:22:27 +0000
297
@@ -16,8 +16,10 @@
298
16
16
299
17
// Local
17
// Local
300
18
#include "window.h"
18
#include "window.h"
301
19
#include "debugextension.h"
302
19
#include "nativeinterface.h"
20
#include "nativeinterface.h"
303
20
#include "input.h"
21
#include "input.h"
304
22
#include "integration.h"
305
21
#include "screen.h"
23
#include "screen.h"
306
22
#include "logging.h"
24
#include "logging.h"
307
23
25
308
@@ -600,13 +602,14 @@
309
600
}
602
}
310
601
603
311
602
UbuntuWindow::UbuntuWindow(QWindow *w, UbuntuInput *input, UbuntuNativeInterface *native,
604
UbuntuWindow::UbuntuWindow(QWindow *w, UbuntuInput *input, UbuntuNativeInterface *native,
313
603
                           EGLDisplay eglDisplay, MirConnection *mirConnection)
605
                           EGLDisplay eglDisplay, MirConnection *mirConnection, UbuntuDebugExtension *debugExt)
314
604
    : QObject(nullptr)
606
    : QObject(nullptr)
315
605
    , QPlatformWindow(w)
607
    , QPlatformWindow(w)
316
606
    , mId(makeId())
608
    , mId(makeId())
317
607
    , mWindowState(w->windowState())
609
    , mWindowState(w->windowState())
318
608
    , mWindowFlags(w->flags())
610
    , mWindowFlags(w->flags())
319
609
    , mWindowVisible(false)
611
    , mWindowVisible(false)
320
612
    , mDebugExtention(debugExt)
321
610
    , mNativeInterface(native)
613
    , mNativeInterface(native)
322
611
    , mSurface(new UbuntuSurface{this, eglDisplay, input, mirConnection})
614
    , mSurface(new UbuntuSurface{this, eglDisplay, input, mirConnection})
323
612
    , mScale(1.0)
615
    , mScale(1.0)
324
@@ -819,6 +822,15 @@
325
819
    return mSurface->format();
822
    return mSurface->format();
326
820
}
823
}
327
821
824
328
825
QPoint UbuntuWindow::mapToGlobal(const QPoint &pos) const
329
826
{
330
827
    if (mDebugExtention) {
331
828
        return mDebugExtention->mapSurfacePointToScreen(mSurface->mirSurface(), pos);
332
829
    } else {
333
830
        return pos;
334
831
    }
335
832
}
336
833
337
822
void* UbuntuWindow::eglSurface() const
834
void* UbuntuWindow::eglSurface() const
338
823
{
835
{
339
824
    return mSurface->eglSurface();
836
    return mSurface->eglSurface();
340
825
837
341
=== modified file 'src/ubuntumirclient/window.h'
342
--- src/ubuntumirclient/window.h	2016-09-21 10:25:33 +0000
343
+++ src/ubuntumirclient/window.h	2016-10-04 16:22:27 +0000
344
@@ -27,6 +27,7 @@
345
27
27
346
28
#include <EGL/egl.h>
28
#include <EGL/egl.h>
347
29
29
348
30
class UbuntuDebugExtension;
349
30
class UbuntuNativeInterface;
31
class UbuntuNativeInterface;
350
31
class UbuntuInput;
32
class UbuntuInput;
351
32
class UbuntuScreen;
33
class UbuntuScreen;
352
@@ -39,7 +40,7 @@
353
39
    Q_OBJECT
40
    Q_OBJECT
354
40
public:
41
public:
355
41
    UbuntuWindow(QWindow *w, UbuntuInput *input, UbuntuNativeInterface* native, EGLDisplay eglDisplay,
42
    UbuntuWindow(QWindow *w, UbuntuInput *input, UbuntuNativeInterface* native, EGLDisplay eglDisplay,
357
42
                 MirConnection *mirConnection);
43
                 MirConnection *mirConnection, UbuntuDebugExtension *debugExt);
358
43
    virtual ~UbuntuWindow();
44
    virtual ~UbuntuWindow();
359
44
45
360
45
    // QPlatformWindow methods.
46
    // QPlatformWindow methods.
361
@@ -52,6 +53,7 @@
362
52
    void propagateSizeHints() override;
53
    void propagateSizeHints() override;
363
53
    bool isExposed() const override;
54
    bool isExposed() const override;
364
54
55
365
56
    QPoint mapToGlobal(const QPoint &pos) const override;
366
55
    QSurfaceFormat format() const override;
57
    QSurfaceFormat format() const override;
367
56
58
368
57
    // Additional Window properties exposed by NativeInterface
59
    // Additional Window properties exposed by NativeInterface
369
@@ -79,6 +81,7 @@
370
79
    Qt::WindowFlags mWindowFlags;
81
    Qt::WindowFlags mWindowFlags;
371
80
    bool mWindowVisible;
82
    bool mWindowVisible;
372
81
    bool mWindowExposed;
83
    bool mWindowExposed;
373
84
    UbuntuDebugExtension *mDebugExtention;
374
82
    UbuntuNativeInterface *mNativeInterface;
85
    UbuntuNativeInterface *mNativeInterface;
375
83
    std::unique_ptr<UbuntuSurface> mSurface;
86
    std::unique_ptr<UbuntuSurface> mSurface;
376
84
    float mScale;
87
    float mScale;
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-09-22	Approve on 2016-09-22
Daniel d'Andrada (community)		2016-09-22	Approve on 2016-09-22
Michael Terry		2016-09-22	Pending
Nick Dedekind		2016-09-22	Pending
PS Jenkins bot	continuous-integration	2016-09-22	Pending
Review via email: mp+306527@code.launchpad.net
1	=== modified file 'debian/control'
2	--- debian/control 2016-08-24 12:40:30 +0000
3	+++ debian/control 2016-10-04 16:22:27 +0000
4	@@ -11,6 +11,7 @@
5	11	libglib2.0-dev,	11	libglib2.0-dev,
6	12	libinput-dev,	12	libinput-dev,
7	13	libmirclient-dev (>= 0.13.0),	13	libmirclient-dev (>= 0.13.0),
8			14	libmirclient-debug-extension-dev,
9	14	libmtdev-dev,	15	libmtdev-dev,
10	15	libubuntu-application-api-dev (>= 2.9.0),	16	libubuntu-application-api-dev (>= 2.9.0),
11	16	libudev-dev,	17	libudev-dev,
12	17		18
13	=== added file 'src/ubuntumirclient/debugextension.cpp'
14	--- src/ubuntumirclient/debugextension.cpp 1970-01-01 00:00:00 +0000
15	+++ src/ubuntumirclient/debugextension.cpp 2016-10-04 16:22:27 +0000
16	@@ -0,0 +1,55 @@
17			1	/*
18			2	* Copyright (C) 2016 Canonical, Ltd.
19			3	*
20			4	* This program is free software: you can redistribute it and/or modify it under
21			5	* the terms of the GNU Lesser General Public License version 3, as published by
22			6	* the Free Software Foundation.
23			7	*
24			8	* This program is distributed in the hope that it will be useful, but WITHOUT
25			9	* ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
26			10	* SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27			11	* Lesser General Public License for more details.
28			12	*
29			13	* You should have received a copy of the GNU Lesser General Public License
30			14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
31			15	*/
32			16
33			17	#include "debugextension.h"
34			18
35			19	#include "logging.h"
36			20
37			21	// mir client debug
38			22	#include <mir_toolkit/debug/surface.h>
39			23
40			24	Q_LOGGING_CATEGORY(ubuntumirclientDebug, "ubuntumirclient.debug")
41			25
42			26	UbuntuDebugExtension::UbuntuDebugExtension()
43			27	: m_mirclientDebug(QStringLiteral("mirclient-debug-extension"), 1)
44			28	, m_mapper(nullptr)
45			29	{
46			30	qCDebug(ubuntumirclientDebug) << "NOTICE: Loading mirclient-debug-extension";
47			31	m_mapper = (MapperPrototype) m_mirclientDebug.resolve("mir_debug_surface_coords_to_screen");
48			32
49			33	if (!m_mirclientDebug.isLoaded()) {
50			34	qCWarning(ubuntumirclientDebug) << "ERROR: mirclient-debug-extension failed to load:"
51			35	<< m_mirclientDebug.errorString();
52			36	} else if (!m_mapper) {
53			37	qCWarning(ubuntumirclientDebug) << "ERROR: unable to find required symbols in mirclient-debug-extension:"
54			38	<< m_mirclientDebug.errorString();
55			39	}
56			40	}
57			41
58			42	QPoint UbuntuDebugExtension::mapSurfacePointToScreen(MirSurface *surface, const QPoint &point)
59			43	{
60			44	if (!m_mapper) {
61			45	return point;
62			46	}
63			47
64			48	QPoint mappedPoint;
65			49	bool status = m_mapper(surface, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());
66			50	if (status) {
67			51	return mappedPoint;
68			52	} else {
69			53	return point;
70			54	}
71			55	}
72	0		56
73	=== added file 'src/ubuntumirclient/debugextension.h'
74	--- src/ubuntumirclient/debugextension.h 1970-01-01 00:00:00 +0000
75	+++ src/ubuntumirclient/debugextension.h 2016-10-04 16:22:27 +0000
76	@@ -0,0 +1,39 @@
77			1	/*
78			2	* Copyright (C) 2016 Canonical, Ltd.
79			3	*
80			4	* This program is free software: you can redistribute it and/or modify it under
81			5	* the terms of the GNU Lesser General Public License version 3, as published by
82			6	* the Free Software Foundation.
83			7	*
84			8	* This program is distributed in the hope that it will be useful, but WITHOUT
85			9	* ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
86			10	* SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
87			11	* Lesser General Public License for more details.
88			12	*
89			13	* You should have received a copy of the GNU Lesser General Public License
90			14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
91			15	*/
92			16
93			17	#ifndef UBUNTU_DEBUG_EXTENSION_H
94			18	#define UBUNTU_DEBUG_EXTENSION_H
95			19
96			20	#include <QPoint>
97			21	#include <QLibrary>
98			22	struct MirSurface;
99			23
100			24	typedef bool (MapperPrototype)(MirSurface surface, int x, int y, int* screenX, int* screenY);
101			25
102			26
103			27	class UbuntuDebugExtension
104			28	{
105			29	public:
106			30	UbuntuDebugExtension();
107			31
108			32	QPoint mapSurfacePointToScreen(MirSurface *, const QPoint &point);
109			33
110			34	private:
111			35	QLibrary m_mirclientDebug;
112			36	MapperPrototype m_mapper;
113			37	};
114			38
115			39	#endif // UBUNTU_DEBUG_EXTENSION_H
116	0		40
117	=== modified file 'src/ubuntumirclient/integration.cpp'
118	--- src/ubuntumirclient/integration.cpp 2016-09-28 10:51:25 +0000
119	+++ src/ubuntumirclient/integration.cpp 2016-10-04 16:22:27 +0000
120	@@ -18,6 +18,7 @@
121	18	#include "integration.h"	18	#include "integration.h"
122	19	#include "backingstore.h"	19	#include "backingstore.h"
123	20	#include "clipboard.h"	20	#include "clipboard.h"
124			21	#include "debugextension.h"
125	21	#include "glcontext.h"	22	#include "glcontext.h"
126	22	#include "input.h"	23	#include "input.h"
127	23	#include "logging.h"	24	#include "logging.h"
128	@@ -70,7 +71,8 @@
129	70	QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);	71	QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);
130	71	}	72	}
131	72		73
133	73	UbuntuClientIntegration::UbuntuClientIntegration()	74
134			75	UbuntuClientIntegration::UbuntuClientIntegration(int argc, char **argv)
135	74	: QPlatformIntegration()	76	: QPlatformIntegration()
136	75	, mNativeInterface(new UbuntuNativeInterface(this))	77	, mNativeInterface(new UbuntuNativeInterface(this))
137	76	, mFontDb(new QGenericUnixFontDatabase)	78	, mFontDb(new QGenericUnixFontDatabase)
138	@@ -105,6 +107,17 @@
139	105	mEglNativeDisplay = mir_connection_get_egl_native_display(mMirConnection);	107	mEglNativeDisplay = mir_connection_get_egl_native_display(mMirConnection);
140	106	ASSERT((mEglDisplay = eglGetDisplay(mEglNativeDisplay)) != EGL_NO_DISPLAY);	108	ASSERT((mEglDisplay = eglGetDisplay(mEglNativeDisplay)) != EGL_NO_DISPLAY);
141	107	ASSERT(eglInitialize(mEglDisplay, nullptr, nullptr) == EGL_TRUE);	109	ASSERT(eglInitialize(mEglDisplay, nullptr, nullptr) == EGL_TRUE);
142			110
143			111	// Has debug mode been requsted, either with "-testability" switch or QT_LOAD_TESTABILITY env var
144			112	bool testability = qEnvironmentVariableIsSet("QT_LOAD_TESTABILITY");
145			113	for (int i=1; !testability && i<argc; i++) {
146			114	if (strcmp(argv[i], "-testability") == 0) {
147			115	testability = true;
148			116	}
149			117	}
150			118	if (testability) {
151			119	mDebugExtension.reset(new UbuntuDebugExtension);
152			120	}
153	108	}	121	}
154	109		122
155	110	void UbuntuClientIntegration::initialize()	123	void UbuntuClientIntegration::initialize()
156	@@ -211,7 +224,7 @@
157	211		224
158	212	QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window) const	225	QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window) const
159	213	{	226	{
161	214	return new UbuntuWindow(window, mInput, mNativeInterface, mEglDisplay, mMirConnection);	227	return new UbuntuWindow(window, mInput, mNativeInterface, mEglDisplay, mMirConnection, mDebugExtension.data());
162	215	}	228	}
163	216		229
164	217	bool UbuntuClientIntegration::hasCapability(QPlatformIntegration::Capability cap) const	230	bool UbuntuClientIntegration::hasCapability(QPlatformIntegration::Capability cap) const
165	218		231
166	=== modified file 'src/ubuntumirclient/integration.h'
167	--- src/ubuntumirclient/integration.h 2016-08-24 12:40:30 +0000
168	+++ src/ubuntumirclient/integration.h 2016-10-04 16:22:27 +0000
169	@@ -29,6 +29,7 @@
170	29		29
171	30	#include <EGL/egl.h>	30	#include <EGL/egl.h>
172	31		31
173			32	class UbuntuDebugExtension;
174	32	class UbuntuInput;	33	class UbuntuInput;
175	33	class UbuntuNativeInterface;	34	class UbuntuNativeInterface;
176	34	class UbuntuScreen;	35	class UbuntuScreen;
177	@@ -39,7 +40,7 @@
178	39	Q_OBJECT	40	Q_OBJECT
179	40		41
180	41	public:	42	public:
182	42	UbuntuClientIntegration();	43	UbuntuClientIntegration(int argc, char **argv);
183	43	virtual ~UbuntuClientIntegration();	44	virtual ~UbuntuClientIntegration();
184	44		45
185	45	// QPlatformIntegration methods.	46	// QPlatformIntegration methods.
186	@@ -64,6 +65,7 @@
187	64	EGLDisplay eglDisplay() const { return mEglDisplay; }	65	EGLDisplay eglDisplay() const { return mEglDisplay; }
188	65	EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }	66	EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }
189	66	UbuntuScreenObserver *screenObserver() const { return mScreenObserver.data(); }	67	UbuntuScreenObserver *screenObserver() const { return mScreenObserver.data(); }
190			68	UbuntuDebugExtension *debugExtension() const { return mDebugExtension.data(); }
191	67		69
192	68	private Q_SLOTS:	70	private Q_SLOTS:
193	69	void destroyScreen(UbuntuScreen *screen);	71	void destroyScreen(UbuntuScreen *screen);
194	@@ -81,6 +83,7 @@
195	81		83
196	82	UbuntuInput* mInput;	84	UbuntuInput* mInput;
197	83	QPlatformInputContext* mInputContext;	85	QPlatformInputContext* mInputContext;
198			86	QScopedPointer<UbuntuDebugExtension> mDebugExtension;
199	84	QScopedPointer<UbuntuScreenObserver> mScreenObserver;	87	QScopedPointer<UbuntuScreenObserver> mScreenObserver;
200	85	qreal mScaleFactor;	88	qreal mScaleFactor;
201	86		89
202	87		90
203	=== modified file 'src/ubuntumirclient/logging.h'
204	--- src/ubuntumirclient/logging.h 2016-06-22 17:16:33 +0000
205	+++ src/ubuntumirclient/logging.h 2016-10-04 16:22:27 +0000
206	@@ -26,5 +26,6 @@
207	26	Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientInput)	26	Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientInput)
208	27	Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientGraphics)	27	Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientGraphics)
209	28	Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientCursor)	28	Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientCursor)
210			29	Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientDebug)
211	29		30
212	30	#endif // QUBUNTULOGGING_H	31	#endif // QUBUNTULOGGING_H
213	31		32
214	=== modified file 'src/ubuntumirclient/plugin.cpp'
215	--- src/ubuntumirclient/plugin.cpp 2015-12-04 16:19:33 +0000
216	+++ src/ubuntumirclient/plugin.cpp 2016-10-04 16:22:27 +0000
217	@@ -1,5 +1,5 @@
218	1	/*	1	/*
220	2	* Copyright (C) 2014 Canonical, Ltd.	2	* Copyright (C) 2014-2016 Canonical, Ltd.
221	3	*	3	*
222	4	* This program is free software: you can redistribute it and/or modify it under	4	* This program is free software: you can redistribute it and/or modify it under
223	5	* the terms of the GNU Lesser General Public License version 3, as published by	5	* the terms of the GNU Lesser General Public License version 3, as published by
224	@@ -20,15 +20,9 @@
225	20		20
226	21	Q_LOGGING_CATEGORY(ubuntumirclient, "ubuntumirclient", QtWarningMsg)	21	Q_LOGGING_CATEGORY(ubuntumirclient, "ubuntumirclient", QtWarningMsg)
227	22		22
237	23	QStringList UbuntuMirClientIntegrationPlugin::keys() const	23	QPlatformIntegration *UbuntuMirClientIntegrationPlugin::create(const QString &system,
238	24	{	24	const QStringList &/paramList/,
239	25	QStringList list;	25	int &argc, char **argv)
231	26	list << QStringLiteral("ubuntumirclient");
232	27	return list;
233	28	}
234	29
235	30	QPlatformIntegration* UbuntuMirClientIntegrationPlugin::create(const QString &system,
236	31	const QStringList &)
240	32	{	26	{
241	33	if (system.toLower() == QLatin1String("ubuntumirclient")) {	27	if (system.toLower() == QLatin1String("ubuntumirclient")) {
242	34	#ifdef PLATFORM_API_TOUCH	28	#ifdef PLATFORM_API_TOUCH
243	@@ -36,7 +30,7 @@
244	36	#else	30	#else
245	37	setenv("UBUNTU_PLATFORM_API_BACKEND", "desktop_mirclient", 1);	31	setenv("UBUNTU_PLATFORM_API_BACKEND", "desktop_mirclient", 1);
246	38	#endif	32	#endif
248	39	return new UbuntuClientIntegration;	33	return new UbuntuClientIntegration(argc, argv);
249	40	} else {	34	} else {
250	41	return 0;	35	return 0;
251	42	}	36	}
252	43		37
253	=== modified file 'src/ubuntumirclient/plugin.h'
254	--- src/ubuntumirclient/plugin.h 2014-06-18 23:10:00 +0000
255	+++ src/ubuntumirclient/plugin.h 2016-10-04 16:22:27 +0000
256	@@ -1,5 +1,5 @@
257	1	/*	1	/*
259	2	* Copyright (C) 2014 Canonical, Ltd.	2	* Copyright (C) 2014-2016 Canonical, Ltd.
260	3	*	3	*
261	4	* This program is free software: you can redistribute it and/or modify it under	4	* This program is free software: you can redistribute it and/or modify it under
262	5	* the terms of the GNU Lesser General Public License version 3, as published by	5	* the terms of the GNU Lesser General Public License version 3, as published by
263	@@ -25,8 +25,7 @@
264	25	Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "ubuntumirclient.json")	25	Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "ubuntumirclient.json")
265	26		26
266	27	public:	27	public:
269	28	QStringList keys() const;	28	QPlatformIntegration create(const QString &system, const QStringList &paramList, int &argc, char *argv) override;
268	29	QPlatformIntegration* create(const QString&, const QStringList&);
270	30	};	29	};
271	31		30
272	32	#endif // UBUNTU_CLIENT_PLUGIN_H	31	#endif // UBUNTU_CLIENT_PLUGIN_H
273	33		32
274	=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
275	--- src/ubuntumirclient/ubuntumirclient.pro 2016-09-28 10:51:25 +0000
276	+++ src/ubuntumirclient/ubuntumirclient.pro 2016-10-04 16:22:27 +0000
277	@@ -18,6 +18,7 @@
278	18	backingstore.cpp \	18	backingstore.cpp \
279	19	clipboard.cpp \	19	clipboard.cpp \
280	20	cursor.cpp \	20	cursor.cpp \
281			21	debugextension.cpp \
282	21	glcontext.cpp \	22	glcontext.cpp \
283	22	input.cpp \	23	input.cpp \
284	23	integration.cpp \	24	integration.cpp \
285	@@ -33,6 +34,7 @@
286	33	backingstore.h \	34	backingstore.h \
287	34	clipboard.h \	35	clipboard.h \
288	35	cursor.h \	36	cursor.h \
289			37	debugextension.h \
290	36	glcontext.h \	38	glcontext.h \
291	37	input.h \	39	input.h \
292	38	integration.h \	40	integration.h \
293	39		41
294	=== modified file 'src/ubuntumirclient/window.cpp'
295	--- src/ubuntumirclient/window.cpp 2016-09-28 10:33:40 +0000
296	+++ src/ubuntumirclient/window.cpp 2016-10-04 16:22:27 +0000
297	@@ -16,8 +16,10 @@
298	16		16
299	17	// Local	17	// Local
300	18	#include "window.h"	18	#include "window.h"
301			19	#include "debugextension.h"
302	19	#include "nativeinterface.h"	20	#include "nativeinterface.h"
303	20	#include "input.h"	21	#include "input.h"
304			22	#include "integration.h"
305	21	#include "screen.h"	23	#include "screen.h"
306	22	#include "logging.h"	24	#include "logging.h"
307	23		25
308	@@ -600,13 +602,14 @@
309	600	}	602	}
310	601		603
311	602	UbuntuWindow::UbuntuWindow(QWindow w, UbuntuInput input, UbuntuNativeInterface *native,	604	UbuntuWindow::UbuntuWindow(QWindow w, UbuntuInput input, UbuntuNativeInterface *native,
313	603	EGLDisplay eglDisplay, MirConnection *mirConnection)	605	EGLDisplay eglDisplay, MirConnection mirConnection, UbuntuDebugExtension debugExt)
314	604	: QObject(nullptr)	606	: QObject(nullptr)
315	605	, QPlatformWindow(w)	607	, QPlatformWindow(w)
316	606	, mId(makeId())	608	, mId(makeId())
317	607	, mWindowState(w->windowState())	609	, mWindowState(w->windowState())
318	608	, mWindowFlags(w->flags())	610	, mWindowFlags(w->flags())
319	609	, mWindowVisible(false)	611	, mWindowVisible(false)
320			612	, mDebugExtention(debugExt)
321	610	, mNativeInterface(native)	613	, mNativeInterface(native)
322	611	, mSurface(new UbuntuSurface{this, eglDisplay, input, mirConnection})	614	, mSurface(new UbuntuSurface{this, eglDisplay, input, mirConnection})
323	612	, mScale(1.0)	615	, mScale(1.0)
324	@@ -819,6 +822,15 @@
325	819	return mSurface->format();	822	return mSurface->format();
326	820	}	823	}
327	821		824
328			825	QPoint UbuntuWindow::mapToGlobal(const QPoint &pos) const
329			826	{
330			827	if (mDebugExtention) {
331			828	return mDebugExtention->mapSurfacePointToScreen(mSurface->mirSurface(), pos);
332			829	} else {
333			830	return pos;
334			831	}
335			832	}
336			833
337	822	void* UbuntuWindow::eglSurface() const	834	void* UbuntuWindow::eglSurface() const
338	823	{	835	{
339	824	return mSurface->eglSurface();	836	return mSurface->eglSurface();
340	825		837
341	=== modified file 'src/ubuntumirclient/window.h'
342	--- src/ubuntumirclient/window.h 2016-09-21 10:25:33 +0000
343	+++ src/ubuntumirclient/window.h 2016-10-04 16:22:27 +0000
344	@@ -27,6 +27,7 @@
345	27		27
346	28	#include <EGL/egl.h>	28	#include <EGL/egl.h>
347	29		29
348			30	class UbuntuDebugExtension;
349	30	class UbuntuNativeInterface;	31	class UbuntuNativeInterface;
350	31	class UbuntuInput;	32	class UbuntuInput;
351	32	class UbuntuScreen;	33	class UbuntuScreen;
352	@@ -39,7 +40,7 @@
353	39	Q_OBJECT	40	Q_OBJECT
354	40	public:	41	public:
355	41	UbuntuWindow(QWindow w, UbuntuInput input, UbuntuNativeInterface* native, EGLDisplay eglDisplay,	42	UbuntuWindow(QWindow w, UbuntuInput input, UbuntuNativeInterface* native, EGLDisplay eglDisplay,
357	42	MirConnection *mirConnection);	43	MirConnection mirConnection, UbuntuDebugExtension debugExt);
358	43	virtual ~UbuntuWindow();	44	virtual ~UbuntuWindow();
359	44		45
360	45	// QPlatformWindow methods.	46	// QPlatformWindow methods.
361	@@ -52,6 +53,7 @@
362	52	void propagateSizeHints() override;	53	void propagateSizeHints() override;
363	53	bool isExposed() const override;	54	bool isExposed() const override;
364	54		55
365			56	QPoint mapToGlobal(const QPoint &pos) const override;
366	55	QSurfaceFormat format() const override;	57	QSurfaceFormat format() const override;
367	56		58
368	57	// Additional Window properties exposed by NativeInterface	59	// Additional Window properties exposed by NativeInterface
369	@@ -79,6 +81,7 @@
370	79	Qt::WindowFlags mWindowFlags;	81	Qt::WindowFlags mWindowFlags;
371	80	bool mWindowVisible;	82	bool mWindowVisible;
372	81	bool mWindowExposed;	83	bool mWindowExposed;
373			84	UbuntuDebugExtension *mDebugExtention;
374	82	UbuntuNativeInterface *mNativeInterface;	85	UbuntuNativeInterface *mNativeInterface;
375	83	std::unique_ptr<UbuntuSurface> mSurface;	86	std::unique_ptr<UbuntuSurface> mSurface;
376	84	float mScale;	87	float mScale;