1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-12-16 08:24:29 +0000
3
+++ CMakeLists.txt	2017-01-04 17:43:31 +0000
4
@@ -88,7 +88,7 @@
5
88
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
88
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
6
89
pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
89
pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
7
90
pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
90
pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
9
91
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
91
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=25)
10
92
pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
92
pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
11
93
pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)
93
pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)
12
94
94
13
95
95
14
=== modified file 'debian/control'
15
--- debian/control	2016-12-13 15:51:14 +0000
16
+++ debian/control	2017-01-04 17:43:31 +0000
17
@@ -25,7 +25,7 @@
18
25
               libubuntu-app-launch2-dev (>= 0.9),
25
               libubuntu-app-launch2-dev (>= 0.9),
19
26
               libubuntu-application-api-dev (>= 2.1.0),
26
               libubuntu-application-api-dev (>= 2.1.0),
20
27
               libudev-dev,
27
               libudev-dev,
22
28
               libunity-api-dev (>= 8.0),
28
               libunity-api-dev (>= 8.1),
23
29
               liburl-dispatcher1-dev,
29
               liburl-dispatcher1-dev,
24
30
               libxkbcommon-dev,
30
               libxkbcommon-dev,
25
31
               libxrender-dev,
31
               libxrender-dev,
26
32
32
27
=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
28
--- src/modules/Unity/Application/mirsurface.cpp	2017-01-04 17:43:31 +0000
29
+++ src/modules/Unity/Application/mirsurface.cpp	2017-01-04 17:43:31 +0000
30
@@ -89,8 +89,8 @@
31
89
    void cursor_image_set_to(mir::graphics::CursorImage const&) override;
89
    void cursor_image_set_to(mir::graphics::CursorImage const&) override;
32
90
    void orientation_set_to(MirOrientation) override {}
90
    void orientation_set_to(MirOrientation) override {}
33
91
    void client_surface_close_requested() override {}
91
    void client_surface_close_requested() override {}
36
92
    void keymap_changed(MirInputDeviceId, std::string const& model, std::string const& layout,
92
    void keymap_changed(MirInputDeviceId, std::string const&, std::string const&,
37
93
                        std::string const& variant, std::string const& options) override;
93
                        std::string const&, std::string const&) override {}
38
94
    void renamed(char const * name) override;
94
    void renamed(char const * name) override;
39
95
    void cursor_image_removed() override;
95
    void cursor_image_removed() override;
40
96
96
41
@@ -1142,12 +1142,6 @@
42
1142
    Q_EMIT cursorChanged(qcursor);
1142
    Q_EMIT cursorChanged(qcursor);
43
1143
}
1143
}
44
1144
1144
45
1145
void MirSurface::SurfaceObserverImpl::keymap_changed(MirInputDeviceId, const std::string &, const std::string &layout,
46
1146
                                                     const std::string &variant, const std::string &)
47
1147
{
48
1148
    Q_EMIT keymapChanged(QString::fromStdString(layout), QString::fromStdString(variant));
49
1149
}
50
1150
51
1151
QCursor MirSurface::SurfaceObserverImpl::createQCursorFromMirCursorImage(const mir::graphics::CursorImage &cursorImage) {
1145
QCursor MirSurface::SurfaceObserverImpl::createQCursorFromMirCursorImage(const mir::graphics::CursorImage &cursorImage) {
52
1152
    if (cursorImage.as_argb_8888() == nullptr) {
1146
    if (cursorImage.as_argb_8888() == nullptr) {
53
1153
        // Must be a named cursor
1147
        // Must be a named cursor
54
1154
1148
55
=== modified file 'src/platforms/mirserver/CMakeLists.txt'
56
--- src/platforms/mirserver/CMakeLists.txt	2016-11-03 20:17:46 +0000
57
+++ src/platforms/mirserver/CMakeLists.txt	2017-01-04 17:43:31 +0000
58
@@ -101,6 +101,7 @@
59
101
    mirserverintegration.cpp
101
    mirserverintegration.cpp
60
102
    miropenglcontext.cpp
102
    miropenglcontext.cpp
61
103
    offscreensurface.cpp
103
    offscreensurface.cpp
62
104
    inputdeviceobserver.cpp
63
104
    promptsessionmanager.cpp promptsessionmanager.h promptsession.h
105
    promptsessionmanager.cpp promptsessionmanager.h promptsession.h
64
105
# We need to run moc on these headers
106
# We need to run moc on these headers
65
106
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
107
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
66
107
108
67
=== added file 'src/platforms/mirserver/inputdeviceobserver.cpp'
68
--- src/platforms/mirserver/inputdeviceobserver.cpp	1970-01-01 00:00:00 +0000
69
+++ src/platforms/mirserver/inputdeviceobserver.cpp	2017-01-04 17:43:31 +0000
70
@@ -0,0 +1,106 @@
71
1
/*
72
2
 * Copyright (C) 2016-2017 Canonical, Ltd.
73
3
 *
74
4
 * This program is free software: you can redistribute it and/or modify it under
75
5
 * the terms of the GNU Lesser General Public License version 3, as published by
76
6
 * the Free Software Foundation.
77
7
 *
78
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
79
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
80
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
81
11
 * Lesser General Public License for more details.
82
12
 *
83
13
 * You should have received a copy of the GNU Lesser General Public License
84
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
85
15
 */
86
16
87
17
#include <mir/input/device.h>
88
18
#include <mir/input/device_capability.h>
89
19
#include <mir/input/keyboard_configuration.h>
90
20
91
21
#include <Qt>
92
22
#include <QTimer>
93
23
94
24
#include "inputdeviceobserver.h"
95
25
#include "mirsingleton.h"
96
26
#include "logging.h"
97
27
98
28
using namespace qtmir;
99
29
namespace mi = mir::input;
100
30
101
31
// Note: MirInputDeviceObserver has affinity to a Mir thread, but it is expected setKeymap will be called from the Qt GUI thread
102
32
103
33
MirInputDeviceObserver::MirInputDeviceObserver(QObject *parent):
104
34
    QObject(parent)
105
35
{
106
36
    // NB: have to use a Direct connection here, as it's called from Qt GUI thread
107
37
    connect(Mir::instance(), &Mir::currentKeymapChanged, this, &MirInputDeviceObserver::setKeymap, Qt::DirectConnection);
108
38
}
109
39
110
40
void MirInputDeviceObserver::setKeymap(const QString &keymap)
111
41
{
112
42
    QMutexLocker locker(&m_mutex); // lock so that Qt and Mir don't apply the keymap at the same time
113
43
114
44
    if (keymap != m_keymap) {
115
45
        qCDebug(QTMIR_MIR_KEYMAP) << "SET KEYMAP" << keymap;
116
46
        m_keymap = keymap;
117
47
        applyKeymap();
118
48
    }
119
49
}
120
50
121
51
void MirInputDeviceObserver::applyKeymap()
122
52
{
123
53
    Q_FOREACH(const auto &device, m_devices) {
124
54
        applyKeymap(device);
125
55
    }
126
56
}
127
57
128
58
void MirInputDeviceObserver::device_added(const std::shared_ptr<mi::Device> &device)
129
59
{
130
60
    QMutexLocker locker(&m_mutex);  // lock so that Qt and Mir don't apply the keymap at the same time
131
61
132
62
    if (mir::contains(device->capabilities(), mi::DeviceCapability::keyboard) &&
133
63
            mir::contains(device->capabilities(), mi::DeviceCapability::alpha_numeric)) {
134
64
        qCDebug(QTMIR_MIR_KEYMAP) << "Device added" << device->id();
135
65
        m_devices.append(device);
136
66
        applyKeymap(device);
137
67
    }
138
68
}
139
69
140
70
void MirInputDeviceObserver::device_removed(const std::shared_ptr<mi::Device> &device)
141
71
{
142
72
    QMutexLocker locker(&m_mutex);  // lock so that Qt and Mir don't apply the keymap at the same time
143
73
144
74
    if (device && m_devices.contains(device)) {
145
75
        qCDebug(QTMIR_MIR_KEYMAP) << "Device removed" << device->id();
146
76
        m_devices.removeAll(device);
147
77
    }
148
78
}
149
79
150
80
void MirInputDeviceObserver::applyKeymap(const std::shared_ptr<mi::Device> &device)
151
81
{
152
82
    if (!m_keymap.isEmpty()) {
153
83
        const QStringList stringList = m_keymap.split('+', QString::SkipEmptyParts);
154
84
155
85
        const QString &layout = stringList.at(0);
156
86
        QString variant;
157
87
158
88
        if (stringList.count() > 1) {
159
89
            variant = stringList.at(1);
160
90
        }
161
91
162
92
        qCDebug(QTMIR_MIR_KEYMAP) << "Applying keymap" <<  layout << variant << "on" << device->id() << QString::fromStdString(device->name());
163
93
        mi::KeyboardConfiguration oldConfig;
164
94
        mi::Keymap keymap;
165
95
        if (device->keyboard_configuration().is_set()) { // preserve the model and options
166
96
            oldConfig = device->keyboard_configuration().value();
167
97
            keymap.model = oldConfig.device_keymap.model;
168
98
            keymap.options = oldConfig.device_keymap.options;
169
99
        }
170
100
        keymap.layout = layout.toStdString();
171
101
        keymap.variant = variant.toStdString();
172
102
173
103
        device->apply_keyboard_configuration(std::move(keymap));
174
104
        qCDebug(QTMIR_MIR_KEYMAP) << "Keymap applied";
175
105
    }
176
106
}
177
0
107
178
=== added file 'src/platforms/mirserver/inputdeviceobserver.h'
179
--- src/platforms/mirserver/inputdeviceobserver.h	1970-01-01 00:00:00 +0000
180
+++ src/platforms/mirserver/inputdeviceobserver.h	2017-01-04 17:43:31 +0000
181
@@ -0,0 +1,55 @@
182
1
/*
183
2
 * Copyright (C) 2016-2017 Canonical, Ltd.
184
3
 *
185
4
 * This program is free software: you can redistribute it and/or modify it under
186
5
 * the terms of the GNU Lesser General Public License version 3, as published by
187
6
 * the Free Software Foundation.
188
7
 *
189
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
190
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
191
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
192
11
 * Lesser General Public License for more details.
193
12
 *
194
13
 * You should have received a copy of the GNU Lesser General Public License
195
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
196
15
 */
197
16
198
17
#ifndef INPUTDEVICEOBSERVER_H
199
18
#define INPUTDEVICEOBSERVER_H
200
19
201
20
#include <mir/input/input_device_observer.h>
202
21
203
22
#include <QObject>
204
23
#include <QString>
205
24
#include <QVector>
206
25
#include <QMutex>
207
26
208
27
namespace qtmir {
209
28
210
29
class MirInputDeviceObserver: public QObject, public mir::input::InputDeviceObserver
211
30
{
212
31
    Q_OBJECT
213
32
public:
214
33
    MirInputDeviceObserver(QObject * parent = nullptr);
215
34
    ~MirInputDeviceObserver() = default;
216
35
217
36
protected:
218
37
    void device_added(std::shared_ptr<mir::input::Device> const& device) override;
219
38
    void device_changed(std::shared_ptr<mir::input::Device> const& /*device*/) override {}
220
39
    void device_removed(std::shared_ptr<mir::input::Device> const& device) override;
221
40
    void changes_complete() override {}
222
41
223
42
private Q_SLOTS:
224
43
    void setKeymap(const QString &keymap);
225
44
226
45
private:
227
46
    void applyKeymap();
228
47
    void applyKeymap(const std::shared_ptr<mir::input::Device> &device);
229
48
    QString m_keymap;
230
49
    QVector<std::shared_ptr<mir::input::Device>> m_devices;
231
50
    QMutex m_mutex;
232
51
};
233
52
234
53
} // namespace qtmir
235
54
236
55
#endif
237
0
56
238
=== modified file 'src/platforms/mirserver/logging.cpp'
239
--- src/platforms/mirserver/logging.cpp	2016-07-01 16:15:54 +0000
240
+++ src/platforms/mirserver/logging.cpp	2017-01-04 17:43:31 +0000
241
@@ -21,6 +21,7 @@
242
21
Q_LOGGING_CATEGORY(QTMIR_SURFACES, "qtmir.surfaces")
21
Q_LOGGING_CATEGORY(QTMIR_SURFACES, "qtmir.surfaces")
243
22
Q_LOGGING_CATEGORY(QTMIR_MIR_INPUT, "qtmir.mir.input", QtWarningMsg)
22
Q_LOGGING_CATEGORY(QTMIR_MIR_INPUT, "qtmir.mir.input", QtWarningMsg)
244
23
Q_LOGGING_CATEGORY(QTMIR_MIR_MESSAGES, "qtmir.mir")
23
Q_LOGGING_CATEGORY(QTMIR_MIR_MESSAGES, "qtmir.mir")
245
24
Q_LOGGING_CATEGORY(QTMIR_MIR_KEYMAP, "qtmir.mir.keymap")
246
24
Q_LOGGING_CATEGORY(QTMIR_CLIPBOARD, "qtmir.clipboard")
25
Q_LOGGING_CATEGORY(QTMIR_CLIPBOARD, "qtmir.clipboard")
247
25
Q_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES, "qtmir.sensor")
26
Q_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES, "qtmir.sensor")
248
26
Q_LOGGING_CATEGORY(QTMIR_SCREENS, "qtmir.screens")
27
Q_LOGGING_CATEGORY(QTMIR_SCREENS, "qtmir.screens")
249
27
28
250
=== modified file 'src/platforms/mirserver/logging.h'
251
--- src/platforms/mirserver/logging.h	2016-07-01 16:15:54 +0000
252
+++ src/platforms/mirserver/logging.h	2017-01-04 17:43:31 +0000
253
@@ -24,6 +24,7 @@
254
24
Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_MESSAGES)
24
Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_MESSAGES)
255
25
Q_DECLARE_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES)
25
Q_DECLARE_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES)
256
26
Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_INPUT)
26
Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_INPUT)
257
27
Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_KEYMAP)
258
27
Q_DECLARE_LOGGING_CATEGORY(QTMIR_CLIPBOARD)
28
Q_DECLARE_LOGGING_CATEGORY(QTMIR_CLIPBOARD)
259
28
Q_DECLARE_LOGGING_CATEGORY(QTMIR_SCREENS)
29
Q_DECLARE_LOGGING_CATEGORY(QTMIR_SCREENS)
260
29
Q_DECLARE_LOGGING_CATEGORY(QTMIR_DBUS)
30
Q_DECLARE_LOGGING_CATEGORY(QTMIR_DBUS)
261
30
31
262
=== modified file 'src/platforms/mirserver/mirserverhooks.cpp'
263
--- src/platforms/mirserver/mirserverhooks.cpp	2016-11-03 20:17:46 +0000
264
+++ src/platforms/mirserver/mirserverhooks.cpp	2017-01-04 17:43:31 +0000
265
@@ -23,11 +23,13 @@
266
23
#include "promptsessionlistener.h"
23
#include "promptsessionlistener.h"
267
24
#include "screenscontroller.h"
24
#include "screenscontroller.h"
268
25
#include "logging.h"
25
#include "logging.h"
269
26
#include "inputdeviceobserver.h"
270
26
27
271
27
// mir
28
// mir
272
28
#include <mir/server.h>
29
#include <mir/server.h>
273
29
#include <mir/graphics/cursor.h>
30
#include <mir/graphics/cursor.h>
274
30
#include <mir/scene/prompt_session_listener.h>
31
#include <mir/scene/prompt_session_listener.h>
275
32
#include <mir/input/input_device_hub.h>
276
31
33
277
32
namespace mg = mir::graphics;
34
namespace mg = mir::graphics;
278
33
namespace ms = mir::scene;
35
namespace ms = mir::scene;
279
@@ -74,6 +76,7 @@
280
74
    std::weak_ptr<mir::graphics::Display> m_mirDisplay;
76
    std::weak_ptr<mir::graphics::Display> m_mirDisplay;
281
75
    std::weak_ptr<mir::shell::DisplayConfigurationController> m_mirDisplayConfigurationController;
77
    std::weak_ptr<mir::shell::DisplayConfigurationController> m_mirDisplayConfigurationController;
282
76
    std::weak_ptr<mir::scene::PromptSessionManager> m_mirPromptSessionManager;
78
    std::weak_ptr<mir::scene::PromptSessionManager> m_mirPromptSessionManager;
283
79
    std::weak_ptr<mir::input::InputDeviceHub> m_inputDeviceHub;
284
77
};
80
};
285
78
81
286
79
qtmir::MirServerHooks::MirServerHooks() :
82
qtmir::MirServerHooks::MirServerHooks() :
287
@@ -104,6 +107,7 @@
288
104
            self->m_mirDisplay = server.the_display();
107
            self->m_mirDisplay = server.the_display();
289
105
            self->m_mirDisplayConfigurationController = server.the_display_configuration_controller();
108
            self->m_mirDisplayConfigurationController = server.the_display_configuration_controller();
290
106
            self->m_mirPromptSessionManager = server.the_prompt_session_manager();
109
            self->m_mirPromptSessionManager = server.the_prompt_session_manager();
291
110
            self->m_inputDeviceHub = server.the_input_device_hub();
292
107
        });
111
        });
293
108
}
112
}
294
109
113
295
@@ -131,12 +135,25 @@
296
131
    throw std::logic_error("No display available. Server not running?");
135
    throw std::logic_error("No display available. Server not running?");
297
132
}
136
}
298
133
137
299
138
std::shared_ptr<mir::input::InputDeviceHub> qtmir::MirServerHooks::theInputDeviceHub() const
300
139
{
301
140
    if (auto result = self->m_inputDeviceHub.lock())
302
141
        return result;
303
142
304
143
    throw std::logic_error("No input device hub available. Server not running?");
305
144
}
306
145
307
134
QSharedPointer<ScreensController> qtmir::MirServerHooks::createScreensController(QSharedPointer<ScreensModel> const &screensModel) const
146
QSharedPointer<ScreensController> qtmir::MirServerHooks::createScreensController(QSharedPointer<ScreensModel> const &screensModel) const
308
135
{
147
{
309
136
    return QSharedPointer<ScreensController>(
148
    return QSharedPointer<ScreensController>(
310
137
        new ScreensController(screensModel, theMirDisplay(), self->m_mirDisplayConfigurationController.lock()));
149
        new ScreensController(screensModel, theMirDisplay(), self->m_mirDisplayConfigurationController.lock()));
311
138
}
150
}
312
139
151
313
152
void qtmir::MirServerHooks::createInputDeviceObserver()
314
153
{
315
154
    theInputDeviceHub()->add_observer(std::make_shared<qtmir::MirInputDeviceObserver>());
316
155
}
317
156
318
140
PromptSessionListenerImpl::~PromptSessionListenerImpl() = default;
157
PromptSessionListenerImpl::~PromptSessionListenerImpl() = default;
319
141
158
320
142
void PromptSessionListenerImpl::starting(std::shared_ptr<ms::PromptSession> const& prompt_session)
159
void PromptSessionListenerImpl::starting(std::shared_ptr<ms::PromptSession> const& prompt_session)
321
143
160
322
=== modified file 'src/platforms/mirserver/mirserverhooks.h'
323
--- src/platforms/mirserver/mirserverhooks.h	2016-11-03 20:17:46 +0000
324
+++ src/platforms/mirserver/mirserverhooks.h	2017-01-04 17:43:31 +0000
325
@@ -25,6 +25,7 @@
326
25
namespace mir { class Server; }
25
namespace mir { class Server; }
327
26
namespace mir { namespace scene { class PromptSessionManager; }}
26
namespace mir { namespace scene { class PromptSessionManager; }}
328
27
namespace mir { namespace graphics { class Display; }}
27
namespace mir { namespace graphics { class Display; }}
329
28
namespace mir { namespace input { class InputDeviceHub; } }
330
28
29
331
29
class PromptSessionListener;
30
class PromptSessionListener;
332
30
class ScreensController;
31
class ScreensController;
333
@@ -42,8 +43,10 @@
334
42
    PromptSessionListener *promptSessionListener() const;
43
    PromptSessionListener *promptSessionListener() const;
335
43
    std::shared_ptr<mir::scene::PromptSessionManager> thePromptSessionManager() const;
44
    std::shared_ptr<mir::scene::PromptSessionManager> thePromptSessionManager() const;
336
44
    std::shared_ptr<mir::graphics::Display> theMirDisplay() const;
45
    std::shared_ptr<mir::graphics::Display> theMirDisplay() const;
337
46
    std::shared_ptr<mir::input::InputDeviceHub> theInputDeviceHub() const;
338
45
47
339
46
    QSharedPointer<ScreensController> createScreensController(QSharedPointer<ScreensModel> const &screensModel) const;
48
    QSharedPointer<ScreensController> createScreensController(QSharedPointer<ScreensModel> const &screensModel) const;
340
49
    void createInputDeviceObserver();
341
47
50
342
48
private:
51
private:
343
49
    struct Self;
52
    struct Self;
344
50
53
345
=== modified file 'src/platforms/mirserver/mirsingleton.cpp'
346
--- src/platforms/mirserver/mirsingleton.cpp	2016-11-03 20:17:46 +0000
347
+++ src/platforms/mirserver/mirsingleton.cpp	2017-01-04 17:43:31 +0000
348
@@ -1,3 +1,19 @@
349
1
/*
350
2
 * Copyright (C) 2015-2016 Canonical, Ltd.
351
3
 *
352
4
 * This program is free software: you can redistribute it and/or modify it under
353
5
 * the terms of the GNU Lesser General Public License version 3, as published by
354
6
 * the Free Software Foundation.
355
7
 *
356
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
357
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
358
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
359
11
 * Lesser General Public License for more details.
360
12
 *
361
13
 * You should have received a copy of the GNU Lesser General Public License
362
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
363
15
 */
364
16
365
1
#include "mirsingleton.h"
17
#include "mirsingleton.h"
366
2
18
367
3
qtmir::Mir *qtmir::Mir::m_instance = nullptr;
19
qtmir::Mir *qtmir::Mir::m_instance = nullptr;
368
@@ -32,3 +48,17 @@
369
32
{
48
{
370
33
    return m_cursorName;
49
    return m_cursorName;
371
34
}
50
}
372
51
373
52
QString qtmir::Mir::currentKeymap() const
374
53
{
375
54
    return m_currentKeymap;
376
55
}
377
56
378
57
void qtmir::Mir::setCurrentKeymap(const QString &currentKeymap)
379
58
{
380
59
    if (m_currentKeymap == currentKeymap)
381
60
        return;
382
61
383
62
    m_currentKeymap = currentKeymap;
384
63
    Q_EMIT currentKeymapChanged(m_currentKeymap);
385
64
}
386
35
65
387
=== modified file 'src/platforms/mirserver/mirsingleton.h'
388
--- src/platforms/mirserver/mirsingleton.h	2015-09-22 20:22:20 +0000
389
+++ src/platforms/mirserver/mirsingleton.h	2017-01-04 17:43:31 +0000
390
@@ -1,5 +1,5 @@
391
1
/*
1
/*
393
2
 * Copyright (C) 2015 Canonical, Ltd.
2
 * Copyright (C) 2015-2016 Canonical, Ltd.
394
3
 *
3
 *
395
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
396
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
397
@@ -33,11 +33,15 @@
398
33
    void setCursorName(const QString &cursorName) override;
33
    void setCursorName(const QString &cursorName) override;
399
34
    QString cursorName() const override;
34
    QString cursorName() const override;
400
35
35
401
36
    QString currentKeymap() const override;
402
37
    void setCurrentKeymap(const QString &currentKeymap) override;
403
38
404
36
private:
39
private:
405
37
    Mir();
40
    Mir();
406
38
    Q_DISABLE_COPY(Mir)
41
    Q_DISABLE_COPY(Mir)
407
39
42
408
40
    QString m_cursorName;
43
    QString m_cursorName;
409
44
    QString m_currentKeymap;
410
41
    static qtmir::Mir *m_instance;
45
    static qtmir::Mir *m_instance;
411
42
};
46
};
412
43
47
413
44
48
414
=== modified file 'src/platforms/mirserver/qmirserver_p.cpp'
415
--- src/platforms/mirserver/qmirserver_p.cpp	2016-11-16 17:39:06 +0000
416
+++ src/platforms/mirserver/qmirserver_p.cpp	2017-01-04 17:43:31 +0000
417
@@ -117,6 +117,7 @@
418
117
    {
117
    {
419
118
        screensModel->update();
118
        screensModel->update();
420
119
        screensController = m_mirServerHooks.createScreensController(screensModel);
119
        screensController = m_mirServerHooks.createScreensController(screensModel);
421
120
        m_mirServerHooks.createInputDeviceObserver();
422
120
    });
121
    });
423
121
122
424
122
    runner.add_start_callback(startCallback);
123
    runner.add_start_callback(startCallback);
425
123
124
426
=== modified file 'src/platforms/mirserver/qteventfeeder.cpp'
427
--- src/platforms/mirserver/qteventfeeder.cpp	2016-11-03 20:17:46 +0000
428
+++ src/platforms/mirserver/qteventfeeder.cpp	2017-01-04 17:43:31 +0000
429
@@ -27,7 +27,6 @@
430
27
#include <qpa/qplatformintegration.h>
27
#include <qpa/qplatformintegration.h>
431
28
#include <qpa/qwindowsysteminterface_p.h>
28
#include <qpa/qwindowsysteminterface_p.h>
432
29
#include <QGuiApplication>
29
#include <QGuiApplication>
433
30
#include <private/qguiapplication_p.h>
434
31
#include <QTextCodec>
30
#include <QTextCodec>
435
32
#include <QDebug>
31
#include <QDebug>
436
33
32
437
@@ -677,22 +676,6 @@
438
677
    }
676
    }
439
678
    int keyCode = translateKeysym(xk_sym, text);
677
    int keyCode = translateKeysym(xk_sym, text);
440
679
678
441
680
    QPlatformInputContext* context = QGuiApplicationPrivate::platformIntegration()->inputContext();
442
681
    if (context) {
443
682
        // TODO: consider event.repeat_count
444
683
        QKeyEvent qKeyEvent(keyType, keyCode, modifiers,
445
684
                            mir_keyboard_event_scan_code(kev),
446
685
                            mir_keyboard_event_key_code(kev),
447
686
                            mir_keyboard_event_modifiers(kev),
448
687
                            text, is_auto_rep);
449
688
        qKeyEvent.setTimestamp(timestamp.count());
450
689
        if (context->filterEvent(&qKeyEvent)) {
451
690
            qCDebug(QTMIR_MIR_INPUT) << "Received" << qPrintable(mirKeyboardEventToString(kev))
452
691
                << "but not dispatching as it was filtered out by input context";
453
692
            return;
454
693
        }
455
694
    }
456
695
457
696
    qCDebug(QTMIR_MIR_INPUT).nospace() << "Received " << qPrintable(mirKeyboardEventToString(kev))
679
    qCDebug(QTMIR_MIR_INPUT).nospace() << "Received " << qPrintable(mirKeyboardEventToString(kev))
458
697
        << ". Dispatching to " << mQtWindowSystem->focusedWindow();
680
        << ". Dispatching to " << mQtWindowSystem->focusedWindow();
459
698
681
460
699
682
461
=== modified file 'src/platforms/mirserver/surfaceobserver.h'
462
--- src/platforms/mirserver/surfaceobserver.h	2016-12-13 15:31:26 +0000
463
+++ src/platforms/mirserver/surfaceobserver.h	2017-01-04 17:43:31 +0000
464
@@ -50,7 +50,6 @@
465
50
    void attributeChanged(const MirSurfaceAttrib attribute, const int value);
50
    void attributeChanged(const MirSurfaceAttrib attribute, const int value);
466
51
    void framesPosted();
51
    void framesPosted();
467
52
    void resized(const QSize &size);
52
    void resized(const QSize &size);
468
53
    void keymapChanged(const QString &rules, const QString &variant);
469
54
    void nameChanged(const QString &name);
53
    void nameChanged(const QString &name);
470
55
    void cursorChanged(const QCursor &cursor);
54
    void cursorChanged(const QCursor &cursor);
471
56
55
472
57
56
473
=== modified file 'tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h'
474
--- tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h	2016-06-23 13:22:42 +0000
475
+++ tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h	2017-01-04 17:43:31 +0000
476
@@ -28,14 +28,25 @@
477
28
    MOCK_METHOD1(getWindowForTouchPoint, QWindow*(const QPoint &point));
28
    MOCK_METHOD1(getWindowForTouchPoint, QWindow*(const QPoint &point));
478
29
    MOCK_METHOD0(lastWindow, QWindow*());
29
    MOCK_METHOD0(lastWindow, QWindow*());
479
30
    MOCK_METHOD0(focusedWindow, QWindow*());
30
    MOCK_METHOD0(focusedWindow, QWindow*());
480
31
    // ignores the last parameter count, due to parameter limit in gmock
481
32
    MOCK_METHOD10(handleExtendedKeyEvent,
482
33
                  void(QWindow *window, ulong timestamp, QEvent::Type type,
483
34
                       int key, Qt::KeyboardModifiers modifiers,
484
35
                       quint32 nativeScanCode, quint32 nativeVirtualKey,
485
36
                       quint32 nativeModifiers, const QString &text,
486
37
                       bool autorep));
487
31
38
495
32
    // Wanted to use GMock, but MOCK_METHOD11 not implemented
39
    void handleExtendedKeyEvent(QWindow *window, ulong timestamp, QEvent::Type type, int key,
496
33
    void handleExtendedKeyEvent(QWindow */*window*/, ulong /*timestamp*/, QEvent::Type /*type*/, int /*key*/,
40
            Qt::KeyboardModifiers modifiers,
497
34
            Qt::KeyboardModifiers /*modifiers*/,
41
            quint32 nativeScanCode, quint32 nativeVirtualKey,
498
35
            quint32 /*nativeScanCode*/, quint32 /*nativeVirtualKey*/,
42
            quint32 nativeModifiers,
499
36
            quint32 /*nativeModifiers*/,
43
            const QString& text, bool autorep,
500
37
            const QString& /*text*/ = QString(), bool /*autorep*/ = false,
44
            ushort /*count*/ )
501
38
            ushort /*count*/ = 1) {}
45
    {
502
46
        handleExtendedKeyEvent(window, timestamp, type, key, modifiers,
503
47
                               nativeScanCode, nativeVirtualKey,
504
48
                               nativeModifiers, text, autorep);
505
49
    }
506
39
50
507
40
    MOCK_METHOD5(handleTouchEvent, void(QWindow *window, ulong timestamp, QTouchDevice *device,
51
    MOCK_METHOD5(handleTouchEvent, void(QWindow *window, ulong timestamp, QTouchDevice *device,
508
41
            const QList<struct QWindowSystemInterface::TouchPoint> &points,
52
            const QList<struct QWindowSystemInterface::TouchPoint> &points,
509
42
53
510
=== modified file 'tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp'
511
--- tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2016-05-30 10:23:52 +0000
512
+++ tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2017-01-04 17:43:31 +0000
513
@@ -27,6 +27,9 @@
514
27
27
515
28
#include "mock_qtwindowsystem.h"
28
#include "mock_qtwindowsystem.h"
516
29
29
517
30
#include <linux/input.h>
518
31
#include <xkbcommon/xkbcommon-keysyms.h>
519
32
520
30
using ::testing::_;
33
using ::testing::_;
521
31
using ::testing::AllOf;
34
using ::testing::AllOf;
522
32
using ::testing::AnyNumber;
35
using ::testing::AnyNumber;
523
@@ -280,3 +283,42 @@
524
280
    qtEventFeeder->dispatch(*ev2);
283
    qtEventFeeder->dispatch(*ev2);
525
281
    ASSERT_TRUE(Mock::VerifyAndClearExpectations(mockWindowSystem));
284
    ASSERT_TRUE(Mock::VerifyAndClearExpectations(mockWindowSystem));
526
282
}
285
}
527
286
528
287
TEST_F(QtEventFeederTest, composeKeysNotFilteredOut)
529
288
{
530
289
    auto down = mir_keyboard_action_down;
531
290
    auto up = mir_keyboard_action_up;
532
291
533
292
    auto dispatch_key_event = [&](MirKeyboardAction action, int scan_code, xkb_keysym_t key_sym)
534
293
    {
535
294
        qtEventFeeder->dispatch(*mev::make_event(
536
295
                MirInputDeviceId{0}, std::chrono::nanoseconds{0}, std::vector<uint8_t>{},
537
296
                action, key_sym, scan_code, mir_input_event_modifier_none));
538
297
    };
539
298
540
299
    InSequence seq;
541
300
    EXPECT_CALL(
542
301
        *mockWindowSystem,
543
302
        handleExtendedKeyEvent(_, _, QEvent::KeyPress, _, _, KEY_RIGHTSHIFT,
544
303
                               XKB_KEY_Shift_R, _, _, _));
545
304
    EXPECT_CALL(*mockWindowSystem,
546
305
                handleExtendedKeyEvent(_, _, QEvent::KeyPress, _, _,
547
306
                                       KEY_APOSTROPHE, XKB_KEY_NoSymbol,
548
307
                                       _, _, _));
549
308
    EXPECT_CALL(*mockWindowSystem,
550
309
                handleExtendedKeyEvent(_, _, QEvent::KeyRelease, _, _,
551
310
                                       KEY_APOSTROPHE, XKB_KEY_NoSymbol,
552
311
                                       _, _, _));
553
312
    EXPECT_CALL(
554
313
        *mockWindowSystem,
555
314
        handleExtendedKeyEvent(_, _, QEvent::KeyRelease, _, _, KEY_RIGHTSHIFT,
556
315
                               XKB_KEY_Shift_R, _, _, _));
557
316
    EXPECT_CALL(*mockWindowSystem,
558
317
                handleExtendedKeyEvent(_, _, QEvent::KeyPress, _, _, KEY_U,
559
318
                                       XKB_KEY_udiaeresis, _, _, _));
560
319
    dispatch_key_event(down, KEY_RIGHTSHIFT, XKB_KEY_Shift_R);
561
320
    dispatch_key_event(down, KEY_APOSTROPHE, XKB_KEY_NoSymbol);
562
321
    dispatch_key_event(up, KEY_APOSTROPHE, XKB_KEY_NoSymbol);
563
322
    dispatch_key_event(up, KEY_RIGHTSHIFT, XKB_KEY_Shift_R);
564
323
    dispatch_key_event(down, KEY_U, XKB_KEY_udiaeresis);
565
324
}
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot (community)	continuous-integration	2017-01-04	Approve on 2017-01-17
Gerry Boland (community)		2017-01-04	Approve on 2017-01-04
Daniel d'Andrada		2017-01-04	Pending
Review via email: mp+314079@code.launchpad.net