1
=== modified file 'plugins/Utils/windowkeysfilter.cpp'
2
--- plugins/Utils/windowkeysfilter.cpp	2014-09-08 15:07:24 +0000
3
+++ plugins/Utils/windowkeysfilter.cpp	2015-10-27 14:54:18 +0000
4
@@ -21,7 +21,8 @@
5
21
#include <QQuickWindow>
21
#include <QQuickWindow>
6
22
22
7
23
WindowKeysFilter::WindowKeysFilter(QQuickItem *parent)
23
WindowKeysFilter::WindowKeysFilter(QQuickItem *parent)
9
24
    : QQuickItem(parent)
24
    : QQuickItem(parent),
10
25
      m_currentEventTimestamp(0)
11
25
{
26
{
12
26
    connect(this, &QQuickItem::windowChanged,
27
    connect(this, &QQuickItem::windowChanged,
13
27
            this, &WindowKeysFilter::setupFilterOnWindow);
28
            this, &WindowKeysFilter::setupFilterOnWindow);
14
@@ -36,7 +37,15 @@
15
36
    if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
37
    if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
16
37
        // Let QML see this event and decide if it does not want it
38
        // Let QML see this event and decide if it does not want it
17
38
        event->accept();
39
        event->accept();
18
40
19
41
        m_currentEventTimestamp = static_cast<QInputEvent*>(event)->timestamp();
20
42
        Q_EMIT currentEventTimestampChanged();
21
43
22
39
        QCoreApplication::sendEvent(this, event);
44
        QCoreApplication::sendEvent(this, event);
23
45
24
46
        m_currentEventTimestamp = 0;
25
47
        Q_EMIT currentEventTimestampChanged();
26
48
27
40
        return event->isAccepted();
49
        return event->isAccepted();
28
41
    } else {
50
    } else {
29
42
        // Not interested
51
        // Not interested
30
@@ -56,3 +65,8 @@
31
56
        m_filteredWindow = window;
65
        m_filteredWindow = window;
32
57
    }
66
    }
33
58
}
67
}
34
68
35
69
ulong WindowKeysFilter::currentEventTimestamp() const
36
70
{
37
71
    return m_currentEventTimestamp;
38
72
}
39
59
73
40
=== modified file 'plugins/Utils/windowkeysfilter.h'
41
--- plugins/Utils/windowkeysfilter.h	2015-04-30 09:31:51 +0000
42
+++ plugins/Utils/windowkeysfilter.h	2015-10-27 14:54:18 +0000
43
@@ -36,16 +36,23 @@
44
36
class WindowKeysFilter : public QQuickItem
36
class WindowKeysFilter : public QQuickItem
45
37
{
37
{
46
38
    Q_OBJECT
38
    Q_OBJECT
47
39
    Q_PROPERTY(ulong currentEventTimestamp READ currentEventTimestamp NOTIFY currentEventTimestampChanged)
48
39
public:
40
public:
49
40
    WindowKeysFilter(QQuickItem *parent = 0);
41
    WindowKeysFilter(QQuickItem *parent = 0);
50
41
42
51
42
    bool eventFilter(QObject *watched, QEvent *event) override;
43
    bool eventFilter(QObject *watched, QEvent *event) override;
52
43
44
53
45
    ulong currentEventTimestamp() const;
54
46
55
47
Q_SIGNALS:
56
48
    void currentEventTimestampChanged();
57
49
58
44
private Q_SLOTS:
50
private Q_SLOTS:
59
45
    void setupFilterOnWindow(QQuickWindow *window);
51
    void setupFilterOnWindow(QQuickWindow *window);
60
46
52
61
47
private:
53
private:
62
48
    QPointer<QQuickWindow> m_filteredWindow;
54
    QPointer<QQuickWindow> m_filteredWindow;
63
55
    ulong m_currentEventTimestamp;
64
49
};
56
};
65
50
57
66
51
#endif // UNITY_WINDOWKEYSFILTER_H
58
#endif // UNITY_WINDOWKEYSFILTER_H
67
52
59
68
=== modified file 'qml/Components/PhysicalKeysMapper.qml'
69
--- qml/Components/PhysicalKeysMapper.qml	2015-09-02 09:30:32 +0000
70
+++ qml/Components/PhysicalKeysMapper.qml	2015-10-27 14:54:18 +0000
71
@@ -57,27 +57,20 @@
72
57
57
73
58
        property bool altPressed: false
58
        property bool altPressed: false
74
59
        property bool altTabPressed: false
59
        property bool altTabPressed: false
96
60
    }
60
97
61
61
        property var powerButtonPressStart: 0
98
62
    Timer {
62
    }
99
63
        id: powerKeyLongPressTimer
63
100
64
        interval: root.powerKeyLongPressTime
64
    function onKeyPressed(event, currentEventTimestamp) {
101
65
        onTriggered: root.powerKeyLongPressed();
65
        if (event.key == Qt.Key_PowerDown || event.key == Qt.Key_PowerOff) {
102
66
    }
66
            if (event.isAutoRepeat) {
103
67
67
                if (d.powerButtonPressStart > 0
104
68
    function onKeyPressed(event) {
68
                        && currentEventTimestamp - d.powerButtonPressStart >= powerKeyLongPressTime) {
105
69
        if ((event.key == Qt.Key_PowerDown || event.key == Qt.Key_PowerOff)
69
                    d.powerButtonPressStart = 0;
106
70
            && (!event.isAutoRepeat || !powerKeyLongPressTimer.running)) {
70
                    root.powerKeyLongPressed();
107
71
71
                }
108
72
            // FIXME: We only consider power key presses if the screen is
72
            } else {
109
73
            // on because of bugs 1410830/1409003.  The theory is that when
73
                d.powerButtonPressStart = currentEventTimestamp;
89
74
            // those bugs are encountered, there is a >2s delay between the
90
75
            // power press event and the power release event, which causes
91
76
            // the shutdown dialog to appear on resume.  So to avoid that
92
77
            // symptom while we investigate the root cause, we simply won't
93
78
            // initiate any dialogs when the screen is off.
94
79
            if (Powerd.status === Powerd.On) {
95
80
                powerKeyLongPressTimer.restart();
110
81
            }
74
            }
111
82
        } else if ((event.key == Qt.Key_MediaTogglePlayPause || event.key == Qt.Key_MediaPlay) && !event.isAutoRepeat) {
75
        } else if ((event.key == Qt.Key_MediaTogglePlayPause || event.key == Qt.Key_MediaPlay) && !event.isAutoRepeat) {
112
83
            event.accepted = callManager.handleMediaKey(false);
76
            event.accepted = callManager.handleMediaKey(false);
113
@@ -113,9 +106,9 @@
114
113
        }
106
        }
115
114
    }
107
    }
116
115
108
118
116
    function onKeyReleased(event) {
109
    function onKeyReleased(event, currentEventTimestamp) {
119
117
        if (event.key == Qt.Key_PowerDown || event.key == Qt.Key_PowerOff) {
110
        if (event.key == Qt.Key_PowerDown || event.key == Qt.Key_PowerOff) {
121
118
            powerKeyLongPressTimer.stop();
111
            d.powerButtonPressStart = 0;
122
119
            event.accepted = true;
112
            event.accepted = true;
123
120
        } else if (event.key == Qt.Key_VolumeDown) {
113
        } else if (event.key == Qt.Key_VolumeDown) {
124
121
            if (!d.ignoreVolumeEvents) root.volumeDownTriggered();
114
            if (!d.ignoreVolumeEvents) root.volumeDownTriggered();
125
122
115
126
=== modified file 'qml/Shell.qml'
127
--- qml/Shell.qml	2015-10-16 17:11:54 +0000
128
+++ qml/Shell.qml	2015-10-27 14:54:18 +0000
129
@@ -172,8 +172,8 @@
130
172
    }
172
    }
131
173
173
132
174
    WindowKeysFilter {
174
    WindowKeysFilter {
135
175
        Keys.onPressed: physicalKeysMapper.onKeyPressed(event);
175
        Keys.onPressed: physicalKeysMapper.onKeyPressed(event, currentEventTimestamp);
136
176
        Keys.onReleased: physicalKeysMapper.onKeyReleased(event);
176
        Keys.onReleased: physicalKeysMapper.onKeyReleased(event, currentEventTimestamp);
137
177
    }
177
    }
138
178
178
139
179
    HomeKeyWatcher {
179
    HomeKeyWatcher {
140
180
180
141
=== modified file 'tests/qmltests/Components/tst_PhysicalKeysMapper.qml'
142
--- tests/qmltests/Components/tst_PhysicalKeysMapper.qml	2015-09-15 12:05:17 +0000
143
+++ tests/qmltests/Components/tst_PhysicalKeysMapper.qml	2015-10-27 14:54:18 +0000
144
@@ -67,25 +67,26 @@
145
67
        Powerd.setStatus(data.status, Powerd.Unknown);
67
        Powerd.setStatus(data.status, Powerd.Unknown);
146
68
        physicalKeysMapper.powerKeyLongPressTime = 500;
68
        physicalKeysMapper.powerKeyLongPressTime = 500;
147
69
69
149
70
        physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: false });
70
        physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: false }, 100);
150
71
71
151
72
        // After the first key press the screen is always on
72
        // After the first key press the screen is always on
152
73
        // and the rest of keypresses are auto repeat
73
        // and the rest of keypresses are auto repeat
153
74
        Powerd.setStatus(Powerd.On, Powerd.Unknown);
74
        Powerd.setStatus(Powerd.On, Powerd.Unknown);
154
75
75
159
76
        for (var i = 0; i < 3; ++i) {
76
        physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 300);
160
77
            wait(10);
77
        physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 400);
161
78
            physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true});
78
        physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 500);
162
79
        }
79
        physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 599);
163
80
80
164
81
        // powerKeyLongPressed should not have been emitted yet.
81
        // powerKeyLongPressed should not have been emitted yet.
165
82
        compare(powerSpy.count, 0);
82
        compare(powerSpy.count, 0);
166
83
83
172
84
        for (var i = 0; i < 10; ++i) {
84
        physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 600);
173
85
            wait(50);
85
174
86
            physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true});
86
        compare(powerSpy.count, 1);
175
87
        }
87
176
88
88
        // Confirm we only emit once
177
89
        physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 601);
178
89
        compare(powerSpy.count, 1);
90
        compare(powerSpy.count, 1);
179
90
    }
91
    }
180
91
92
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-10-27
Albert Astals Cid (community)		2015-10-21	Approve on 2015-10-23
Michael Zanetti (community)			Needs Information on 2015-10-22
Review via email: mp+275240@code.launchpad.net
1	=== modified file 'plugins/Utils/windowkeysfilter.cpp'
2	--- plugins/Utils/windowkeysfilter.cpp 2014-09-08 15:07:24 +0000
3	+++ plugins/Utils/windowkeysfilter.cpp 2015-10-27 14:54:18 +0000
4	@@ -21,7 +21,8 @@
5	21	#include <QQuickWindow>	21	#include <QQuickWindow>
6	22		22
7	23	WindowKeysFilter::WindowKeysFilter(QQuickItem *parent)	23	WindowKeysFilter::WindowKeysFilter(QQuickItem *parent)
9	24	: QQuickItem(parent)	24	: QQuickItem(parent),
10			25	m_currentEventTimestamp(0)
11	25	{	26	{
12	26	connect(this, &QQuickItem::windowChanged,	27	connect(this, &QQuickItem::windowChanged,
13	27	this, &WindowKeysFilter::setupFilterOnWindow);	28	this, &WindowKeysFilter::setupFilterOnWindow);
14	@@ -36,7 +37,15 @@
15	36	if (event->type() == QEvent::KeyPress \|\| event->type() == QEvent::KeyRelease) {	37	if (event->type() == QEvent::KeyPress \|\| event->type() == QEvent::KeyRelease) {
16	37	// Let QML see this event and decide if it does not want it	38	// Let QML see this event and decide if it does not want it
17	38	event->accept();	39	event->accept();
18			40
19			41	m_currentEventTimestamp = static_cast<QInputEvent*>(event)->timestamp();
20			42	Q_EMIT currentEventTimestampChanged();
21			43
22	39	QCoreApplication::sendEvent(this, event);	44	QCoreApplication::sendEvent(this, event);
23			45
24			46	m_currentEventTimestamp = 0;
25			47	Q_EMIT currentEventTimestampChanged();
26			48
27	40	return event->isAccepted();	49	return event->isAccepted();
28	41	} else {	50	} else {
29	42	// Not interested	51	// Not interested
30	@@ -56,3 +65,8 @@
31	56	m_filteredWindow = window;	65	m_filteredWindow = window;
32	57	}	66	}
33	58	}	67	}
34			68
35			69	ulong WindowKeysFilter::currentEventTimestamp() const
36			70	{
37			71	return m_currentEventTimestamp;
38			72	}
39	59		73
40	=== modified file 'plugins/Utils/windowkeysfilter.h'
41	--- plugins/Utils/windowkeysfilter.h 2015-04-30 09:31:51 +0000
42	+++ plugins/Utils/windowkeysfilter.h 2015-10-27 14:54:18 +0000
43	@@ -36,16 +36,23 @@
44	36	class WindowKeysFilter : public QQuickItem	36	class WindowKeysFilter : public QQuickItem
45	37	{	37	{
46	38	Q_OBJECT	38	Q_OBJECT
47			39	Q_PROPERTY(ulong currentEventTimestamp READ currentEventTimestamp NOTIFY currentEventTimestampChanged)
48	39	public:	40	public:
49	40	WindowKeysFilter(QQuickItem *parent = 0);	41	WindowKeysFilter(QQuickItem *parent = 0);
50	41		42
51	42	bool eventFilter(QObject watched, QEvent event) override;	43	bool eventFilter(QObject watched, QEvent event) override;
52	43		44
53			45	ulong currentEventTimestamp() const;
54			46
55			47	Q_SIGNALS:
56			48	void currentEventTimestampChanged();
57			49
58	44	private Q_SLOTS:	50	private Q_SLOTS:
59	45	void setupFilterOnWindow(QQuickWindow *window);	51	void setupFilterOnWindow(QQuickWindow *window);
60	46		52
61	47	private:	53	private:
62	48	QPointer<QQuickWindow> m_filteredWindow;	54	QPointer<QQuickWindow> m_filteredWindow;
63			55	ulong m_currentEventTimestamp;
64	49	};	56	};
65	50		57
66	51	#endif // UNITY_WINDOWKEYSFILTER_H	58	#endif // UNITY_WINDOWKEYSFILTER_H
67	52		59
68	=== modified file 'qml/Components/PhysicalKeysMapper.qml'
69	--- qml/Components/PhysicalKeysMapper.qml 2015-09-02 09:30:32 +0000
70	+++ qml/Components/PhysicalKeysMapper.qml 2015-10-27 14:54:18 +0000
71	@@ -57,27 +57,20 @@
72	57		57
73	58	property bool altPressed: false	58	property bool altPressed: false
74	59	property bool altTabPressed: false	59	property bool altTabPressed: false
96	60	}	60
97	61		61	property var powerButtonPressStart: 0
98	62	Timer {	62	}
99	63	id: powerKeyLongPressTimer	63
100	64	interval: root.powerKeyLongPressTime	64	function onKeyPressed(event, currentEventTimestamp) {
101	65	onTriggered: root.powerKeyLongPressed();	65	if (event.key == Qt.Key_PowerDown \|\| event.key == Qt.Key_PowerOff) {
102	66	}	66	if (event.isAutoRepeat) {
103	67		67	if (d.powerButtonPressStart > 0
104	68	function onKeyPressed(event) {	68	&& currentEventTimestamp - d.powerButtonPressStart >= powerKeyLongPressTime) {
105	69	if ((event.key == Qt.Key_PowerDown \|\| event.key == Qt.Key_PowerOff)	69	d.powerButtonPressStart = 0;
106	70	&& (!event.isAutoRepeat \|\| !powerKeyLongPressTimer.running)) {	70	root.powerKeyLongPressed();
107	71		71	}
108	72	// FIXME: We only consider power key presses if the screen is	72	} else {
109	73	// on because of bugs 1410830/1409003. The theory is that when	73	d.powerButtonPressStart = currentEventTimestamp;
89	74	// those bugs are encountered, there is a >2s delay between the
90	75	// power press event and the power release event, which causes
91	76	// the shutdown dialog to appear on resume. So to avoid that
92	77	// symptom while we investigate the root cause, we simply won't
93	78	// initiate any dialogs when the screen is off.
94	79	if (Powerd.status === Powerd.On) {
95	80	powerKeyLongPressTimer.restart();
110	81	}	74	}
111	82	} else if ((event.key == Qt.Key_MediaTogglePlayPause \|\| event.key == Qt.Key_MediaPlay) && !event.isAutoRepeat) {	75	} else if ((event.key == Qt.Key_MediaTogglePlayPause \|\| event.key == Qt.Key_MediaPlay) && !event.isAutoRepeat) {
112	83	event.accepted = callManager.handleMediaKey(false);	76	event.accepted = callManager.handleMediaKey(false);
113	@@ -113,9 +106,9 @@
114	113	}	106	}
115	114	}	107	}
116	115		108
118	116	function onKeyReleased(event) {	109	function onKeyReleased(event, currentEventTimestamp) {
119	117	if (event.key == Qt.Key_PowerDown \|\| event.key == Qt.Key_PowerOff) {	110	if (event.key == Qt.Key_PowerDown \|\| event.key == Qt.Key_PowerOff) {
121	118	powerKeyLongPressTimer.stop();	111	d.powerButtonPressStart = 0;
122	119	event.accepted = true;	112	event.accepted = true;
123	120	} else if (event.key == Qt.Key_VolumeDown) {	113	} else if (event.key == Qt.Key_VolumeDown) {
124	121	if (!d.ignoreVolumeEvents) root.volumeDownTriggered();	114	if (!d.ignoreVolumeEvents) root.volumeDownTriggered();
125	122		115
126	=== modified file 'qml/Shell.qml'
127	--- qml/Shell.qml 2015-10-16 17:11:54 +0000
128	+++ qml/Shell.qml 2015-10-27 14:54:18 +0000
129	@@ -172,8 +172,8 @@
130	172	}	172	}
131	173		173
132	174	WindowKeysFilter {	174	WindowKeysFilter {
135	175	Keys.onPressed: physicalKeysMapper.onKeyPressed(event);	175	Keys.onPressed: physicalKeysMapper.onKeyPressed(event, currentEventTimestamp);
136	176	Keys.onReleased: physicalKeysMapper.onKeyReleased(event);	176	Keys.onReleased: physicalKeysMapper.onKeyReleased(event, currentEventTimestamp);
137	177	}	177	}
138	178		178
139	179	HomeKeyWatcher {	179	HomeKeyWatcher {
140	180		180
141	=== modified file 'tests/qmltests/Components/tst_PhysicalKeysMapper.qml'
142	--- tests/qmltests/Components/tst_PhysicalKeysMapper.qml 2015-09-15 12:05:17 +0000
143	+++ tests/qmltests/Components/tst_PhysicalKeysMapper.qml 2015-10-27 14:54:18 +0000
144	@@ -67,25 +67,26 @@
145	67	Powerd.setStatus(data.status, Powerd.Unknown);	67	Powerd.setStatus(data.status, Powerd.Unknown);
146	68	physicalKeysMapper.powerKeyLongPressTime = 500;	68	physicalKeysMapper.powerKeyLongPressTime = 500;
147	69		69
149	70	physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: false });	70	physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: false }, 100);
150	71		71
151	72	// After the first key press the screen is always on	72	// After the first key press the screen is always on
152	73	// and the rest of keypresses are auto repeat	73	// and the rest of keypresses are auto repeat
153	74	Powerd.setStatus(Powerd.On, Powerd.Unknown);	74	Powerd.setStatus(Powerd.On, Powerd.Unknown);
154	75		75
159	76	for (var i = 0; i < 3; ++i) {	76	physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 300);
160	77	wait(10);	77	physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 400);
161	78	physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true});	78	physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 500);
162	79	}	79	physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 599);
163	80		80
164	81	// powerKeyLongPressed should not have been emitted yet.	81	// powerKeyLongPressed should not have been emitted yet.
165	82	compare(powerSpy.count, 0);	82	compare(powerSpy.count, 0);
166	83		83
172	84	for (var i = 0; i < 10; ++i) {	84	physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 600);
173	85	wait(50);	85
174	86	physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true});	86	compare(powerSpy.count, 1);
175	87	}	87
176	88		88	// Confirm we only emit once
177			89	physicalKeysMapper.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true}, 601);
178	89	compare(powerSpy.count, 1);	90	compare(powerSpy.count, 1);
179	90	}	91	}
180	91		92