Mir

Merge lp:~mir-team/mir/privatize-event into lp:mir

  1. privatize-event
  2. Merge into development-branch
Proposed by Robert Carr
Status: Merged
Approved by: Chris Halse Rogers
Approved revision: no longer in the source branch.
Merged at revision: 2473
Proposed branch: lp:~mir-team/mir/privatize-event
Merge into: lp:mir
Prerequisite: lp:~mir-team/mir/prepare-to-privatize-event
Diff against target: 1099 lines (+85/-155)
58 files modified
CMakeLists.txt (+0/-2)
include/client/mir/events/event_builders.h (+0/-2)
include/client/mir_toolkit/events/event.h (+0/-9)
playground/demo-shell/window_manager.cpp (+1/-2)
src/client/event.cpp (+1/-1)
src/client/events/event_builders.cpp (+1/-2)
src/client/input/android/android_input_lexicon.cpp (+1/-2)
src/client/input/android/android_input_receiver.cpp (+1/-2)
src/client/input/input_event.cpp (+1/-2)
src/client/input/xkb_mapper.cpp (+1/-2)
src/client/mir_connection.cpp (+0/-2)
src/client/rpc/mir_protobuf_rpc_channel.cpp (+1/-2)
src/include/common/mir/events/event_private.h (+6/-5)
src/include/common/mir/input/xkb_mapper.h (+0/-2)
src/server/display_server.cpp (+0/-4)
src/server/frontend/event_sender.cpp (+1/-2)
src/server/graphics/nested/display_buffer.cpp (+2/-2)
src/server/input/android/android_input_dispatcher.cpp (+2/-2)
src/server/input/android/android_input_manager.cpp (+0/-2)
src/server/input/android/event_filter_dispatcher_policy.cpp (+1/-2)
src/server/input/android/event_filter_dispatcher_policy.h (+4/-3)
src/server/input/android/input_sender.cpp (+1/-1)
src/server/input/android/input_translator.cpp (+2/-2)
src/server/input/default_configuration.cpp (+1/-2)
src/server/input/default_input_device_hub.cpp (+1/-0)
src/server/input/null_input_dispatcher.cpp (+0/-2)
src/server/input/vt_filter.cpp (+1/-2)
src/server/report/lttng/message_processor_report.cpp (+0/-2)
src/server/scene/application_session.cpp (+0/-2)
tests/acceptance-tests/test_client_surface_events.cpp (+26/-37)
tests/acceptance-tests/throwback/test_client_input.cpp (+2/-3)
tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp (+1/-2)
tests/include/mir_test_doubles/mock_event_filter.h (+0/-2)
tests/integration-tests/input/android/test_android_cursor_listener.cpp (+1/-2)
tests/integration-tests/input/android/test_android_input_manager.cpp (+1/-1)
tests/integration-tests/input/test_nested_input.cpp (+1/-2)
tests/integration-tests/test_display_server_main_loop_events.cpp (+1/-2)
tests/mir_test_doubles/test_protobuf_client.cpp (+1/-2)
tests/mir_test_framework/stubbed_server_configuration.cpp (+0/-2)
tests/unit-tests/client/input/test_android_input_receiver.cpp (+2/-2)
tests/unit-tests/client/input/test_xkb_mapper.cpp (+1/-0)
tests/unit-tests/client/test_event_distributor.cpp (+2/-2)
tests/unit-tests/frontend/test_published_socket_connector.cpp (+1/-2)
tests/unit-tests/input/android/test_android_input_application_handle.cpp (+1/-2)
tests/unit-tests/input/android/test_android_input_dispatcher.cpp (+1/-2)
tests/unit-tests/input/android/test_android_input_lexicon.cpp (+1/-3)
tests/unit-tests/input/android/test_android_input_sender.cpp (+1/-1)
tests/unit-tests/input/android/test_android_input_window_handle.cpp (+1/-2)
tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp (+1/-2)
tests/unit-tests/input/android/test_input_translator.cpp (+2/-1)
tests/unit-tests/input/test_default_input_device_hub.cpp (+1/-0)
tests/unit-tests/input/test_event_builders.cpp (+0/-2)
tests/unit-tests/input/test_event_filter_chain.cpp (+1/-2)
tests/unit-tests/input/test_input_event.cpp (+1/-3)
tests/unit-tests/scene/test_application_session.cpp (+1/-2)
tests/unit-tests/scene/test_basic_surface.cpp (+1/-1)
tests/unit-tests/scene/test_surface.cpp (+1/-2)
tests/unit-tests/scene/test_surface_impl.cpp (+1/-2)
To merge this branch: bzr merge lp:~mir-team/mir/privatize-event
Reviewer Review Type Date Requested Status
Chris Halse Rogers Approve
PS Jenkins bot (community) continuous-integration Approve
Alan Griffiths Approve
Review via email: mp+254149@code.launchpad.net

Commit message

Privatize event definition header.

Description of the change

Privatize event definition header.

To post a comment you must log in.
Revision history for this message
Robert Carr (robertcarr) wrote :

https://code.launchpad.net/~mir-team/unity-system-compositor/respond-to-event-privatization is available

Revision history for this message
Robert Carr (robertcarr) wrote :

As is https://code.launchpad.net/~mir-team/qtmir/respond-to-event-privatization/+merge/254157

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2424
http://jenkins.qa.ubuntu.com/job/mir-ci/3372/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1830/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1829/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1780/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1369/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1780/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3372/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Chris Halse Rogers (raof) wrote :

You seem to hamve moved event_deprecated.h to event_private.h without changing any of the compile guards and such; they should probably match the new filename.

Also, I think you can still cut the diff down substantially by doing bzr mv --after event_deprecated.h event_private.h to get bzr to record that as a move.

1055 - memset(&last_event, 0, sizeof last_event);
1056 + last_event = nullptr;

Shouldn't this unref last_event if it wasn't nullptr

Otherwise, WOOT!

review: Needs Fixing
Revision history for this message
Robert Carr (robertcarr) wrote :

Thanks Chris, fixed up.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2425
http://jenkins.qa.ubuntu.com/job/mir-ci/3394/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1863
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1862
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1813
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1391
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1813
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1813/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4768
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19227

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3394/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

600 - EXPECT_THAT(last_event_surface, Eq(surface));
601 - EXPECT_THAT(last_event.type, Eq(mir_event_type_surface));
602 - EXPECT_THAT(last_event.surface.id, Eq(surface_id));
603 - EXPECT_THAT(last_event.surface.attrib, Eq(mir_surface_attrib_state));
604 - EXPECT_THAT(last_event.surface.value, Eq(mir_surface_state_minimized));
605 - }
606 -
607 - reset_last_event();
608 -
609 - {
610 - mir_wait_for(mir_surface_set_state(surface, static_cast<MirSurfaceState>(777)));
611 - mir_wait_for(mir_surface_set_state(other_surface, mir_surface_state_maximized));
612 -
613 - std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
614 -
615 - EXPECT_THAT(last_event_surface, IsNull());
616 - EXPECT_THAT(last_event.type, Eq(0));
617 - EXPECT_THAT(last_event.surface.id, Eq(0));
618 - EXPECT_THAT(last_event.surface.attrib, Eq(0));
619 - EXPECT_THAT(last_event.surface.value, Eq(0));
620 + EXPECT_THAT(last_event, mt::SurfaceEvent(mir_surface_attrib_state, mir_surface_state_minimized));

this test has been weakened to deal with fewer state changes.

review: Needs Fixing
Revision history for this message
Robert Carr (robertcarr) wrote :

Merged trunk and fixed 'weakened' test while resolving conflict in same.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2426
http://jenkins.qa.ubuntu.com/job/mir-ci/3428/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1919
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1918
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1425
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1425/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1869
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1869/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4820
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19365

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3428/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Ok

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2427
http://jenkins.qa.ubuntu.com/job/mir-ci/3454/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1954
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1953/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1904
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1451
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1451/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1904
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1904/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4850
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19427

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3454/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2428
http://jenkins.qa.ubuntu.com/job/mir-ci/3463/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1970/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1969/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1920/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1460/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1920/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3463/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2429
http://jenkins.qa.ubuntu.com/job/mir-ci/3465/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1974
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1973
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1924
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1462
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1462/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1924
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1924/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4869
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19464

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3465/rebuild

review: Approve (continuous-integration)
Revision history for this message
Chris Halse Rogers (raof) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-03-31 02:35:42 +0000
3+++ CMakeLists.txt 2015-04-07 21:28:28 +0000
4@@ -120,8 +120,6 @@
5 # consume CPU time...
6 add_definitions(-DLOG_NDEBUG=1)
7
8-add_definitions(-DMIR_REQUIRE_DEPRECATED_EVENT_OPT_IN=1)
9-
10 enable_testing()
11
12 include_directories(include/common)
13
14=== modified file 'include/client/mir/events/event_builders.h'
15--- include/client/mir/events/event_builders.h 2015-03-31 02:35:42 +0000
16+++ include/client/mir/events/event_builders.h 2015-04-07 21:28:28 +0000
17@@ -16,8 +16,6 @@
18 * Author: Robert Carr <robert.carr@canonical.com>
19 */
20
21-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
22-
23 #ifndef MIR_EVENT_BUILDERS_H_
24 #define MIR_EVENT_BUILDERS_H_
25
26
27=== modified file 'include/client/mir_toolkit/events/event.h'
28--- include/client/mir_toolkit/events/event.h 2015-03-31 02:35:42 +0000
29+++ include/client/mir_toolkit/events/event.h 2015-04-07 21:28:28 +0000
30@@ -61,15 +61,6 @@
31 /**@}*/
32 #endif
33
34-#ifdef MIR_REQUIRE_DEPRECATED_EVENT_OPT_IN
35- #ifdef MIR_INCLUDE_DEPRECATED_EVENT_HEADER
36- #include "mir_toolkit/events/event_deprecated.h"
37- #endif // MIR_INCLUDE_DEPRECATED_EVENT_HEADER
38-#else
39- #include "mir_toolkit/events/event_deprecated.h"
40-#endif // MIR_REQUIRE_DEPRECATED_EVENT_OPT_IN
41-
42-
43 #include "mir_toolkit/events/input/input_event.h"
44 #include "mir_toolkit/events/resize_event.h"
45 #include "mir_toolkit/events/surface_event.h"
46
47=== modified file 'playground/demo-shell/window_manager.cpp'
48--- playground/demo-shell/window_manager.cpp 2015-03-31 02:35:42 +0000
49+++ playground/demo-shell/window_manager.cpp 2015-04-07 21:28:28 +0000
50@@ -17,8 +17,6 @@
51 * Daniel van Vugt <daniel.van.vugt@canonical.com>
52 */
53
54-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
55-
56 #include "window_manager.h"
57 #include "demo_compositor.h"
58
59@@ -28,6 +26,7 @@
60 #include "mir/graphics/display.h"
61 #include "mir/graphics/display_configuration.h"
62 #include "mir/compositor/compositor.h"
63+#include "mir/events/event_private.h"
64
65 #include <linux/input.h>
66
67
68=== modified file 'src/client/event.cpp'
69--- src/client/event.cpp 2015-03-31 02:35:42 +0000
70+++ src/client/event.cpp 2015-04-07 21:28:28 +0000
71@@ -22,7 +22,7 @@
72 #include "mir/log.h"
73
74 #include "mir_toolkit/events/event.h"
75-#include "mir_toolkit/events/event_deprecated.h"
76+#include "mir/events/event_private.h"
77
78 #include "mir_toolkit/events/surface_event.h"
79 #include "mir_toolkit/events/resize_event.h"
80
81=== modified file 'src/client/events/event_builders.cpp'
82--- src/client/events/event_builders.cpp 2015-03-31 02:35:42 +0000
83+++ src/client/events/event_builders.cpp 2015-04-07 21:28:28 +0000
84@@ -16,9 +16,8 @@
85 * Author: Robert Carr <robert.carr@canonical.com>
86 */
87
88-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
89-
90 #include "mir/events/event_builders.h"
91+#include "mir/events/event_private.h"
92
93 #include <string.h>
94
95
96=== modified file 'src/client/input/android/android_input_lexicon.cpp'
97--- src/client/input/android/android_input_lexicon.cpp 2015-03-31 02:35:42 +0000
98+++ src/client/input/android/android_input_lexicon.cpp 2015-04-07 21:28:28 +0000
99@@ -17,9 +17,8 @@
100 * Robert Carr <robert.carr@canonical.com>
101 */
102
103-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
104-
105 #include "mir/input/android/android_input_lexicon.h"
106+#include "mir/events/event_private.h"
107
108 #include <androidfw/Input.h>
109
110
111=== modified file 'src/client/input/android/android_input_receiver.cpp'
112--- src/client/input/android/android_input_receiver.cpp 2015-04-01 03:19:39 +0000
113+++ src/client/input/android/android_input_receiver.cpp 2015-04-07 21:28:28 +0000
114@@ -16,14 +16,13 @@
115 * Authored by: Robert Carr <robert.carr@canonical.com>
116 */
117
118-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
119-
120 #include "android_input_receiver.h"
121
122 #include "mir/dispatch/multiplexing_dispatchable.h"
123 #include "mir/input/xkb_mapper.h"
124 #include "mir/input/input_receiver_report.h"
125 #include "mir/input/android/android_input_lexicon.h"
126+#include "mir/events/event_private.h"
127
128 #include <boost/throw_exception.hpp>
129
130
131=== modified file 'src/client/input/input_event.cpp'
132--- src/client/input/input_event.cpp 2015-03-31 02:35:42 +0000
133+++ src/client/input/input_event.cpp 2015-04-07 21:28:28 +0000
134@@ -16,11 +16,10 @@
135 * Authored by: Robert Carr <robert.carr@canonical.com>
136 */
137
138-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
139-
140 #define MIR_LOG_COMPONENT "input-event-access"
141
142 #include "mir/event_type_to_string.h"
143+#include "mir/events/event_private.h"
144 #include "mir/log.h"
145
146 #include "mir_toolkit/events/input/input_event.h"
147
148=== modified file 'src/client/input/xkb_mapper.cpp'
149--- src/client/input/xkb_mapper.cpp 2015-03-31 02:35:42 +0000
150+++ src/client/input/xkb_mapper.cpp 2015-04-07 21:28:28 +0000
151@@ -16,9 +16,8 @@
152 * Authored by: Robert Carr <robert.carr@canonical.com>
153 */
154
155-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
156-
157 #include "mir/input/xkb_mapper.h"
158+#include "mir/events/event_private.h"
159
160 #include <string.h>
161
162
163=== modified file 'src/client/mir_connection.cpp'
164--- src/client/mir_connection.cpp 2015-03-31 02:35:42 +0000
165+++ src/client/mir_connection.cpp 2015-04-07 21:28:28 +0000
166@@ -16,8 +16,6 @@
167 * Authored by: Thomas Guest <thomas.guest@canonical.com>
168 */
169
170-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
171-
172 #include "mir_connection.h"
173 #include "mir_surface.h"
174 #include "mir_prompt_session.h"
175
176=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
177--- src/client/rpc/mir_protobuf_rpc_channel.cpp 2015-03-31 02:35:42 +0000
178+++ src/client/rpc/mir_protobuf_rpc_channel.cpp 2015-04-07 21:28:28 +0000
179@@ -16,8 +16,6 @@
180 * Authored by: Alan Griffiths <alan@octopull.co.uk>
181 */
182
183-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER // Required until wire format changes
184-
185 #include "mir_protobuf_rpc_channel.h"
186 #include "rpc_report.h"
187
188@@ -28,6 +26,7 @@
189 #include "../lifecycle_control.h"
190 #include "../event_sink.h"
191 #include "mir/variable_length_array.h"
192+#include "mir/events/event_private.h"
193
194 #include "mir_protobuf.pb.h" // For Buffer frig
195 #include "mir_protobuf_wire.pb.h"
196
197=== added directory 'src/include/common/mir/events'
198=== renamed file 'include/client/mir_toolkit/events/event_deprecated.h' => 'src/include/common/mir/events/event_private.h'
199--- include/client/mir_toolkit/events/event_deprecated.h 2015-03-31 02:35:42 +0000
200+++ src/include/common/mir/events/event_private.h 2015-04-07 21:28:28 +0000
201@@ -22,11 +22,12 @@
202 //
203 // ==================================
204
205-#ifndef MIR_TOOLKIT_EVENT_DEPRECATED_H_
206-#define MIR_TOOLKIT_EVENT_DEPRECATED_H_
207+#ifndef MIR_COMMON_EVENT_PRIVATE_H_
208+#define MIR_COMMON_EVENT_PRIVATE_H_
209
210 #include <stddef.h>
211 #include <stdint.h>
212+#include "mir_toolkit/event.h"
213 #include "mir_toolkit/common.h"
214
215 #include <xkbcommon/xkbcommon.h>
216@@ -118,7 +119,7 @@
217 mir_motion_tool_type_eraser = 4
218 } MirMotionToolType;
219
220-// DEPRECATED
221+// PRIVATE
222 // Direct access to MirKeyEvent is deprecated. Please use mir_event_get_input_event
223 // and the mir_input_event* family of functions.
224 typedef struct
225@@ -158,7 +159,7 @@
226 int unused3;
227 } MirMotionPointer;
228
229-// DEPRECATED
230+// PRIVATE
231 // Direct access to MirMotionEvent is deprecated. Please use mir_event_get_input_event
232 // and the mir_input_event* family of functions.
233 typedef struct
234@@ -263,4 +264,4 @@
235 /**@}*/
236 #endif
237
238-#endif /* MIR_TOOLKIT_EVENT_DEPRECATED_H_ */
239+#endif /* MIR_COMMON_EVENT_PRIVATE_H_ */
240
241=== modified file 'src/include/common/mir/input/xkb_mapper.h'
242--- src/include/common/mir/input/xkb_mapper.h 2015-03-31 02:35:42 +0000
243+++ src/include/common/mir/input/xkb_mapper.h 2015-04-07 21:28:28 +0000
244@@ -19,8 +19,6 @@
245 #ifndef MIR_INPUT_RECEIVER_XKB_MAPPER_H_
246 #define MIR_INPUT_RECEIVER_XKB_MAPPER_H_
247
248-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
249-
250 #include "mir_toolkit/event.h"
251
252 #include <xkbcommon/xkbcommon.h>
253
254=== modified file 'src/server/display_server.cpp'
255--- src/server/display_server.cpp 2015-04-06 11:54:36 +0000
256+++ src/server/display_server.cpp 2015-04-07 21:28:28 +0000
257@@ -18,10 +18,6 @@
258 * Thomas Voss <thomas.voss@canonical.com>
259 */
260
261-// TODO: Eliminate usage of std::chrono::nanoseconds in input_dispatcher.h
262-// to remove this.
263-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
264-
265 #define MIR_LOG_COMPONENT "DisplayServer"
266 #include "mir/display_server.h"
267 #include "mir/server_configuration.h"
268
269=== modified file 'src/server/frontend/event_sender.cpp'
270--- src/server/frontend/event_sender.cpp 2015-03-31 02:35:42 +0000
271+++ src/server/frontend/event_sender.cpp 2015-04-07 21:28:28 +0000
272@@ -16,12 +16,11 @@
273 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
274 */
275
276-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
277-
278 #include "mir/frontend/client_constants.h"
279 #include "mir/graphics/display_configuration.h"
280 #include "mir/variable_length_array.h"
281 #include "event_sender.h"
282+#include "mir/events/event_private.h"
283 #include "message_sender.h"
284 #include "protobuf_buffer_packer.h"
285
286
287=== modified file 'src/server/graphics/nested/display_buffer.cpp'
288--- src/server/graphics/nested/display_buffer.cpp 2015-04-03 19:27:44 +0000
289+++ src/server/graphics/nested/display_buffer.cpp 2015-04-07 21:28:28 +0000
290@@ -16,12 +16,12 @@
291 * Authored by: Alan Griffiths <alan@octopull.co.uk>
292 */
293
294-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
295-
296 #include "display_buffer.h"
297+
298 #include "host_connection.h"
299 #include "mir/input/input_dispatcher.h"
300 #include "mir/graphics/pixel_format_utils.h"
301+#include "mir/events/event_private.h"
302
303 #include <boost/throw_exception.hpp>
304 #include <stdexcept>
305
306=== modified file 'src/server/input/android/android_input_dispatcher.cpp'
307--- src/server/input/android/android_input_dispatcher.cpp 2015-03-31 02:35:42 +0000
308+++ src/server/input/android/android_input_dispatcher.cpp 2015-04-07 21:28:28 +0000
309@@ -17,12 +17,12 @@
310 * Alan Griffiths <alan@octopull.co.uk>
311 */
312
313-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
314-
315 #include "android_input_dispatcher.h"
316 #include "android_input_constants.h"
317 #include "android_input_thread.h"
318
319+#include "mir/events/event_private.h"
320+
321 #include <InputListener.h> // NotifyArgs
322 #include <InputDispatcher.h>
323
324
325=== modified file 'src/server/input/android/android_input_manager.cpp'
326--- src/server/input/android/android_input_manager.cpp 2015-03-31 02:35:42 +0000
327+++ src/server/input/android/android_input_manager.cpp 2015-04-07 21:28:28 +0000
328@@ -17,8 +17,6 @@
329 * Daniel d'Andradra <daniel.dandrada@canonical.com>
330 */
331
332-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
333-
334 #include "mir/input/input_dispatcher.h"
335 #include "android_input_manager.h"
336 #include "android_input_constants.h"
337
338=== modified file 'src/server/input/android/event_filter_dispatcher_policy.cpp'
339--- src/server/input/android/event_filter_dispatcher_policy.cpp 2015-03-31 02:35:42 +0000
340+++ src/server/input/android/event_filter_dispatcher_policy.cpp 2015-04-07 21:28:28 +0000
341@@ -16,10 +16,9 @@
342 * Authored by: Robert Carr <robert.carr@canonical.com>
343 */
344
345-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
346-
347 #include "event_filter_dispatcher_policy.h"
348 #include "mir/input/android/android_input_lexicon.h"
349+#include "mir/events/event_private.h"
350
351 namespace mi = mir::input;
352 namespace mia = mi::android;
353
354=== modified file 'src/server/input/android/event_filter_dispatcher_policy.h'
355--- src/server/input/android/event_filter_dispatcher_policy.h 2015-03-31 02:35:42 +0000
356+++ src/server/input/android/event_filter_dispatcher_policy.h 2015-04-07 21:28:28 +0000
357@@ -15,8 +15,9 @@
358 *
359 * Authored by: Robert Carr <robert.carr@canonical.com>
360 */
361-#ifndef MIR_EVENT_FILTER_DISPATCHER_POLICY_H_
362-#define MIR_EVENT_FILTER_DISPATCHER_POLICY_H_
363+
364+#ifndef MIR_INPUT_ANDROID_EVENT_FILTER_DISPATCHER_POLICY_H_
365+#define MIR_INPUT_ANDROID_EVENT_FILTER_DISPATCHER_POLICY_H_
366
367 #include "mir/input/event_filter.h"
368
369@@ -78,4 +79,4 @@
370 }
371 }
372
373-#endif // MIR_DUMMY_INPUT_DISPATCHER_POLICY_H_
374+#endif // MIR_INPUT_ANDROID_EVENT_FILTER_DISPATCHER_POLICY_H_
375
376=== modified file 'src/server/input/android/input_sender.cpp'
377--- src/server/input/android/input_sender.cpp 2015-03-31 02:35:42 +0000
378+++ src/server/input/android/input_sender.cpp 2015-04-07 21:28:28 +0000
379@@ -16,7 +16,7 @@
380 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
381 */
382
383-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
384+#include "mir/events/event_private.h"
385
386 #include "input_sender.h"
387 #include "input_send_entry.h"
388
389=== modified file 'src/server/input/android/input_translator.cpp'
390--- src/server/input/android/input_translator.cpp 2015-03-31 02:35:42 +0000
391+++ src/server/input/android/input_translator.cpp 2015-04-07 21:28:28 +0000
392@@ -16,10 +16,10 @@
393 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
394 */
395
396-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
397-
398 #include "input_translator.h"
399
400+#include "mir/events/event_private.h"
401+
402 #include "androidfw/Input.h"
403
404 #include <unordered_set>
405
406=== modified file 'src/server/input/default_configuration.cpp'
407--- src/server/input/default_configuration.cpp 2015-04-02 10:12:31 +0000
408+++ src/server/input/default_configuration.cpp 2015-04-07 21:28:28 +0000
409@@ -16,10 +16,9 @@
410 * Authored by: Alan Griffiths <alan@octopull.co.uk>
411 */
412
413-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
414-
415 #include "mir/default_server_configuration.h"
416
417+#include "mir/events/event_private.h"
418 #include "android/android_input_dispatcher.h"
419 #include "android/android_input_targeter.h"
420 #include "android/android_input_reader_policy.h"
421
422=== modified file 'src/server/input/default_input_device_hub.cpp'
423--- src/server/input/default_input_device_hub.cpp 2015-03-30 18:41:05 +0000
424+++ src/server/input/default_input_device_hub.cpp 2015-04-07 21:28:28 +0000
425@@ -24,6 +24,7 @@
426 #include "mir/input/input_device.h"
427 #include "mir/input/input_device_info.h"
428 #include "mir/input/input_sink.h"
429+#include "mir/events/event_private.h"
430 #include "mir/dispatch/multiplexing_dispatchable.h"
431 #include "mir/server_action_queue.h"
432 #include "mir/log.h"
433
434=== modified file 'src/server/input/null_input_dispatcher.cpp'
435--- src/server/input/null_input_dispatcher.cpp 2015-03-31 02:35:42 +0000
436+++ src/server/input/null_input_dispatcher.cpp 2015-04-07 21:28:28 +0000
437@@ -16,8 +16,6 @@
438 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
439 */
440
441-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
442-
443 #include "null_input_dispatcher.h"
444
445 namespace mi = mir::input;
446
447=== modified file 'src/server/input/vt_filter.cpp'
448--- src/server/input/vt_filter.cpp 2015-03-31 02:35:42 +0000
449+++ src/server/input/vt_filter.cpp 2015-04-07 21:28:28 +0000
450@@ -16,9 +16,8 @@
451 * Authored by: Robert Ancell <robert.ancell@canonical.com>
452 */
453
454-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
455-
456 #include "mir/input/vt_filter.h"
457+#include "mir/events/event_private.h"
458
459 #include <linux/input.h>
460 #include <linux/vt.h>
461
462=== modified file 'src/server/report/lttng/message_processor_report.cpp'
463--- src/server/report/lttng/message_processor_report.cpp 2015-03-31 02:35:42 +0000
464+++ src/server/report/lttng/message_processor_report.cpp 2015-04-07 21:28:28 +0000
465@@ -16,8 +16,6 @@
466 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
467 */
468
469-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
470-
471 #include "message_processor_report.h"
472
473 #include "mir/report/lttng/mir_tracepoint.h"
474
475=== modified file 'src/server/scene/application_session.cpp'
476--- src/server/scene/application_session.cpp 2015-03-31 02:35:42 +0000
477+++ src/server/scene/application_session.cpp 2015-04-07 21:28:28 +0000
478@@ -16,8 +16,6 @@
479 * Authored by: Robert Carr <racarr@canonical.com>
480 */
481
482-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
483-
484 #include "application_session.h"
485 #include "snapshot_strategy.h"
486 #include "default_session_container.h"
487
488=== modified file 'tests/acceptance-tests/test_client_surface_events.cpp'
489--- tests/acceptance-tests/test_client_surface_events.cpp 2015-03-31 02:35:42 +0000
490+++ tests/acceptance-tests/test_client_surface_events.cpp 2015-04-07 21:28:28 +0000
491@@ -16,17 +16,14 @@
492 * Authored by: Nick Dedekind <nick.dedekind@canonical.com>
493 */
494
495-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
496-
497 #include "mir_toolkit/mir_client_library.h"
498-#include "mir_toolkit/debug/surface.h"
499
500 #include "mir/shell/shell_wrapper.h"
501-
502 #include "mir/scene/session.h"
503 #include "mir/scene/surface.h"
504 #include "mir/scene/surface_creation_parameters.h"
505
506+#include "mir_test/event_matchers.h"
507 #include "mir_test_framework/connected_client_with_a_surface.h"
508 #include "mir_test_framework/any_surface.h"
509
510@@ -38,9 +35,10 @@
511 #include <mutex>
512
513 namespace mf = mir::frontend;
514-namespace mtf = mir_test_framework;
515 namespace ms = mir::scene;
516 namespace msh = mir::shell;
517+namespace mt = mir::test;
518+namespace mtf = mir_test_framework;
519
520 using namespace testing;
521
522@@ -69,18 +67,28 @@
523 std::mutex last_event_mutex;
524 MirEventType event_filter{mir_event_type_surface};
525 std::condition_variable last_event_cv;
526- MirEvent last_event{};
527+ MirEvent const* last_event = nullptr;
528 MirSurface* last_event_surface = nullptr;
529
530 std::shared_ptr<ms::Surface> scene_surface;
531
532+ ~ClientSurfaceEvents()
533+ {
534+ if (last_event)
535+ mir_event_unref(last_event);
536+ }
537+
538 static void event_callback(MirSurface* surface, MirEvent const* event, void* ctx)
539 {
540 ClientSurfaceEvents* self = static_cast<ClientSurfaceEvents*>(ctx);
541 std::lock_guard<decltype(self->last_event_mutex)> last_event_lock{self->last_event_mutex};
542 // Don't overwrite an interesting event with an uninteresting one!
543- if (event->type != self->event_filter) return;
544- self->last_event = *event;
545+ if (mir_event_get_type(event) != self->event_filter) return;
546+
547+ if (self->last_event)
548+ mir_event_unref(self->last_event);
549+
550+ self->last_event = mir_event_ref(event);
551 self->last_event_surface = surface;
552 self->last_event_cv.notify_one();
553 }
554@@ -89,7 +97,7 @@
555 {
556 std::unique_lock<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
557 return last_event_cv.wait_for(last_event_lock, delay,
558- [&] { return last_event_surface == surface && last_event.type == event_filter; });
559+ [&] { return last_event_surface == surface && mir_event_get_type(last_event) == event_filter; });
560 }
561
562 void set_event_filter(MirEventType type)
563@@ -101,7 +109,9 @@
564 void reset_last_event()
565 {
566 std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
567- memset(&last_event, 0, sizeof last_event);
568+ if (last_event != nullptr)
569+ mir_event_unref(last_event);
570+ last_event = nullptr;
571 last_event_surface = nullptr;
572 }
573
574@@ -151,31 +161,20 @@
575
576 TEST_F(ClientSurfaceEvents, surface_receives_state_events)
577 {
578- int surface_id = mir_debug_surface_id(surface);
579-
580 {
581 mir_wait_for(mir_surface_set_state(surface, mir_surface_state_fullscreen));
582 mir_wait_for(mir_surface_set_state(other_surface, mir_surface_state_vertmaximized));
583
584 std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
585
586- EXPECT_THAT(last_event_surface, Eq(surface));
587- EXPECT_THAT(last_event.type, Eq(mir_event_type_surface));
588- EXPECT_THAT(last_event.surface.id, Eq(surface_id));
589- EXPECT_THAT(last_event.surface.attrib, Eq(mir_surface_attrib_state));
590- EXPECT_THAT(last_event.surface.value, Eq(mir_surface_state_fullscreen));
591+ EXPECT_THAT(last_event, mt::SurfaceEvent(mir_surface_attrib_state, mir_surface_state_fullscreen));
592 }
593
594 {
595 mir_wait_for(mir_surface_set_state(surface, static_cast<MirSurfaceState>(999)));
596
597 std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
598-
599- EXPECT_THAT(last_event_surface, Eq(surface));
600- EXPECT_THAT(last_event.type, Eq(mir_event_type_surface));
601- EXPECT_THAT(last_event.surface.id, Eq(surface_id));
602- EXPECT_THAT(last_event.surface.attrib, Eq(mir_surface_attrib_state));
603- EXPECT_THAT(last_event.surface.value, Eq(mir_surface_state_fullscreen));
604+ EXPECT_THAT(last_event, mt::SurfaceEvent(mir_surface_attrib_state, mir_surface_state_fullscreen));
605 }
606
607 reset_last_event();
608@@ -185,11 +184,7 @@
609
610 std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
611
612- EXPECT_THAT(last_event_surface, Eq(surface));
613- EXPECT_THAT(last_event.type, Eq(mir_event_type_surface));
614- EXPECT_THAT(last_event.surface.id, Eq(surface_id));
615- EXPECT_THAT(last_event.surface.attrib, Eq(mir_surface_attrib_state));
616- EXPECT_THAT(last_event.surface.value, Eq(mir_surface_state_vertmaximized));
617+ EXPECT_THAT(last_event, mt::SurfaceEvent(mir_surface_attrib_state, mir_surface_state_vertmaximized));
618 }
619
620 reset_last_event();
621@@ -200,11 +195,7 @@
622
623 std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
624
625- EXPECT_THAT(last_event_surface, IsNull());
626- EXPECT_THAT(last_event.type, Eq(0));
627- EXPECT_THAT(last_event.surface.id, Eq(0));
628- EXPECT_THAT(last_event.surface.attrib, Eq(0));
629- EXPECT_THAT(last_event.surface.value, Eq(0));
630+ EXPECT_EQ(nullptr, last_event);
631 }
632 }
633
634@@ -222,9 +213,7 @@
635
636 std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
637
638- EXPECT_THAT(last_event_surface, Eq(surface));
639- EXPECT_THAT(last_event.type, Eq(mir_event_type_orientation));
640- EXPECT_THAT(last_event.orientation.direction, Eq(direction));
641+ EXPECT_THAT(last_event, mt::OrientationEvent(direction));
642 }
643
644 INSTANTIATE_TEST_CASE_P(ClientSurfaceEvents,
645@@ -261,7 +250,7 @@
646 std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
647
648 EXPECT_THAT(last_event_surface, Eq(surface));
649- EXPECT_THAT(last_event.type, Eq(mir_event_type_close_surface));
650+ EXPECT_THAT(mir_event_get_type(last_event), Eq(mir_event_type_close_surface));
651 }
652
653 TEST_F(ClientSurfaceEvents, client_can_query_preferred_orientation)
654
655=== modified file 'tests/acceptance-tests/throwback/test_client_input.cpp'
656--- tests/acceptance-tests/throwback/test_client_input.cpp 2015-03-31 02:35:42 +0000
657+++ tests/acceptance-tests/throwback/test_client_input.cpp 2015-04-07 21:28:28 +0000
658@@ -18,8 +18,7 @@
659 * Alexandros Frantzis <alexandros.frantzis@canonical.com>
660 */
661
662-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
663-
664+#include "mir/events/event_private.h"
665 #include "mir/shell/shell_wrapper.h"
666 #include "mir/scene/surface_creation_parameters.h"
667 #include "mir/scene/surface.h"
668@@ -108,7 +107,7 @@
669 {
670 auto const client = static_cast<InputClient*>(context);
671
672- if (ev->type == mir_event_type_surface)
673+ if (mir_event_get_type(ev) == mir_event_type_surface)
674 return;
675
676 client->handler.handle_input(ev);
677
678=== modified file 'tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp'
679--- tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp 2015-03-31 02:35:42 +0000
680+++ tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp 2015-04-07 21:28:28 +0000
681@@ -16,8 +16,6 @@
682 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
683 */
684
685-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
686-
687 #include "mir/input/input_dispatcher.h"
688
689 #include "clients.h"
690@@ -34,6 +32,7 @@
691 #include "mir/compositor/scene.h"
692 #include "mir/shell/input_targeter.h"
693 #include "mir/scene/observer.h"
694+#include "mir/events/event_private.h"
695
696 #include "mir_toolkit/event.h"
697
698
699=== modified file 'tests/include/mir_test_doubles/mock_event_filter.h'
700--- tests/include/mir_test_doubles/mock_event_filter.h 2015-03-31 02:35:42 +0000
701+++ tests/include/mir_test_doubles/mock_event_filter.h 2015-04-07 21:28:28 +0000
702@@ -19,8 +19,6 @@
703 #ifndef MIR_TEST_DOUBLES_MOCK_EVENT_FILTER_H_
704 #define MIR_TEST_DOUBLES_MOCK_EVENT_FILTER_H_
705
706-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
707-
708 #include "mir/input/event_filter.h"
709
710 #include <gmock/gmock.h>
711
712=== modified file 'tests/integration-tests/input/android/test_android_cursor_listener.cpp'
713--- tests/integration-tests/input/android/test_android_cursor_listener.cpp 2015-03-31 02:35:42 +0000
714+++ tests/integration-tests/input/android/test_android_cursor_listener.cpp 2015-04-07 21:28:28 +0000
715@@ -17,8 +17,7 @@
716 * Daniel d'Andrada <daniel.dandrada@canonical.com>
717 */
718
719-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
720-
721+#include "mir/events/event_private.h"
722 #include "src/server/input/event_filter_chain.h"
723
724 #include "mir_test/fake_shared.h"
725
726=== modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp'
727--- tests/integration-tests/input/android/test_android_input_manager.cpp 2015-03-31 02:35:42 +0000
728+++ tests/integration-tests/input/android/test_android_input_manager.cpp 2015-04-07 21:28:28 +0000
729@@ -17,7 +17,7 @@
730 * Daniel d'Andrada <daniel.dandrada@canonical.com>
731 */
732
733-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
734+#include "mir/events/event_private.h"
735
736 #include "src/server/input/android/android_input_targeter.h"
737 #include "src/server/input/android/android_input_registrar.h"
738
739=== modified file 'tests/integration-tests/input/test_nested_input.cpp'
740--- tests/integration-tests/input/test_nested_input.cpp 2015-03-31 02:35:42 +0000
741+++ tests/integration-tests/input/test_nested_input.cpp 2015-04-07 21:28:28 +0000
742@@ -16,11 +16,10 @@
743 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
744 */
745
746-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
747-
748 #include "src/server/report/null/input_report.h"
749 #include "mir/input/input_manager.h"
750 #include "mir/input/input_dispatcher.h"
751+#include "mir/events/event_private.h"
752 #include "src/server/input/android/android_input_dispatcher.h"
753 #include "src/server/input/android/event_filter_dispatcher_policy.h"
754 #include "src/server/input/android/common_input_thread.h"
755
756=== modified file 'tests/integration-tests/test_display_server_main_loop_events.cpp'
757--- tests/integration-tests/test_display_server_main_loop_events.cpp 2015-04-06 11:54:36 +0000
758+++ tests/integration-tests/test_display_server_main_loop_events.cpp 2015-04-07 21:28:28 +0000
759@@ -16,8 +16,6 @@
760 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
761 */
762
763-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
764-
765 #include "mir/compositor/compositor.h"
766 #include "mir/frontend/connector.h"
767 #include "mir/graphics/display_configuration.h"
768@@ -25,6 +23,7 @@
769 #include "mir/server_action_queue.h"
770 #include "mir/graphics/event_handler_register.h"
771 #include "mir/server_status_listener.h"
772+#include "mir/events/event_private.h"
773
774 #include "mir_test/pipe.h"
775 #include "mir_test/wait_condition.h"
776
777=== modified file 'tests/mir_test_doubles/test_protobuf_client.cpp'
778--- tests/mir_test_doubles/test_protobuf_client.cpp 2015-03-31 02:35:42 +0000
779+++ tests/mir_test_doubles/test_protobuf_client.cpp 2015-04-07 21:28:28 +0000
780@@ -16,8 +16,6 @@
781 * Authored by: Alan Griffiths <alan@octopull.co.uk>
782 */
783
784-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
785-
786 #include "mir_test/test_protobuf_client.h"
787 #include "mir_test_doubles/mock_rpc_report.h"
788 #include "mir_test_doubles/null_client_event_sink.h"
789@@ -29,6 +27,7 @@
790 #include "src/client/rpc/mir_basic_rpc_channel.h"
791 #include "mir/dispatch/dispatchable.h"
792 #include "mir/dispatch/simple_dispatch_thread.h"
793+#include "mir/events/event_private.h"
794
795 #include <thread>
796
797
798=== modified file 'tests/mir_test_framework/stubbed_server_configuration.cpp'
799--- tests/mir_test_framework/stubbed_server_configuration.cpp 2015-03-31 02:35:42 +0000
800+++ tests/mir_test_framework/stubbed_server_configuration.cpp 2015-04-07 21:28:28 +0000
801@@ -16,8 +16,6 @@
802 * Authored by: Alan Griffiths <alan@octopull.co.uk>
803 */
804
805-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
806-
807 #include "mir_test_framework/stubbed_server_configuration.h"
808 #include "mir_test_framework/command_line_server_configuration.h"
809
810
811=== modified file 'tests/unit-tests/client/input/test_android_input_receiver.cpp'
812--- tests/unit-tests/client/input/test_android_input_receiver.cpp 2015-03-31 02:35:42 +0000
813+++ tests/unit-tests/client/input/test_android_input_receiver.cpp 2015-04-07 21:28:28 +0000
814@@ -16,11 +16,11 @@
815 * Authored by: Robert Carr <robert.carr@canonical.com>
816 */
817
818-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
819-
820 #include "src/client/input/android/android_input_receiver.h"
821 #include "mir/input/null_input_receiver_report.h"
822 #include "mir/input/xkb_mapper.h"
823+#include "mir/events/event_private.h"
824+
825 #include "mir_toolkit/event.h"
826
827 #include "mir_test/fd_utils.h"
828
829=== modified file 'tests/unit-tests/client/input/test_xkb_mapper.cpp'
830--- tests/unit-tests/client/input/test_xkb_mapper.cpp 2015-03-31 02:35:42 +0000
831+++ tests/unit-tests/client/input/test_xkb_mapper.cpp 2015-04-07 21:28:28 +0000
832@@ -17,6 +17,7 @@
833 */
834
835 #include "mir/input/xkb_mapper.h"
836+#include "mir/events/event_private.h"
837
838 #include <xkbcommon/xkbcommon-keysyms.h>
839 #include <xkbcommon/xkbcommon.h>
840
841=== modified file 'tests/unit-tests/client/test_event_distributor.cpp'
842--- tests/unit-tests/client/test_event_distributor.cpp 2015-03-31 02:35:42 +0000
843+++ tests/unit-tests/client/test_event_distributor.cpp 2015-04-07 21:28:28 +0000
844@@ -16,10 +16,10 @@
845 * Authored by: Nick Dedekind <nick.dedekind <nick.dedekind@canonical.com>
846 */
847
848-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
849-
850 #include "src/client/mir_event_distributor.h"
851
852+#include "mir/events/event_private.h"
853+
854 #include <gtest/gtest.h>
855 #include <gmock/gmock.h>
856 #include <mir_test/wait_condition.h>
857
858=== modified file 'tests/unit-tests/frontend/test_published_socket_connector.cpp'
859--- tests/unit-tests/frontend/test_published_socket_connector.cpp 2015-03-31 02:35:42 +0000
860+++ tests/unit-tests/frontend/test_published_socket_connector.cpp 2015-04-07 21:28:28 +0000
861@@ -17,9 +17,8 @@
862 * Alan Griffiths <alan@octopull.co.uk>
863 */
864
865-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
866-
867 #include "mir/frontend/connector.h"
868+#include "mir/events/event_private.h"
869
870 #include "src/server/report/null_report_factory.h"
871 #include "src/server/frontend/resource_cache.h"
872
873=== modified file 'tests/unit-tests/input/android/test_android_input_application_handle.cpp'
874--- tests/unit-tests/input/android/test_android_input_application_handle.cpp 2015-03-31 02:35:42 +0000
875+++ tests/unit-tests/input/android/test_android_input_application_handle.cpp 2015-04-07 21:28:28 +0000
876@@ -16,10 +16,9 @@
877 * Authored by: Robert Carr <robert.carr@canonical.com>
878 */
879
880-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
881-
882 #include "src/server/input/android/android_input_application_handle.h"
883
884+#include "mir/events/event_private.h"
885 #include "mir/input/input_channel.h"
886
887 #include "mir_test_doubles/mock_input_surface.h"
888
889=== modified file 'tests/unit-tests/input/android/test_android_input_dispatcher.cpp'
890--- tests/unit-tests/input/android/test_android_input_dispatcher.cpp 2015-03-31 02:35:42 +0000
891+++ tests/unit-tests/input/android/test_android_input_dispatcher.cpp 2015-04-07 21:28:28 +0000
892@@ -16,8 +16,7 @@
893 * Authored by: Robert Carr <robert.carr@canonical.com>
894 */
895
896-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
897-
898+#include "mir/events/event_private.h"
899 #include "src/server/input/android/android_input_dispatcher.h"
900 #include "src/server/input/android/android_input_thread.h"
901 #include "src/server/input/android/android_input_constants.h"
902
903=== modified file 'tests/unit-tests/input/android/test_android_input_lexicon.cpp'
904--- tests/unit-tests/input/android/test_android_input_lexicon.cpp 2015-03-31 02:35:42 +0000
905+++ tests/unit-tests/input/android/test_android_input_lexicon.cpp 2015-04-07 21:28:28 +0000
906@@ -16,10 +16,8 @@
907 * Authored by: Robert Carr <robert.carr@canonical.com>
908 */
909
910-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
911-
912 #include "mir/input/android/android_input_lexicon.h"
913-#include "mir_toolkit/event.h"
914+#include "mir/events/event_private.h"
915
916 #include <androidfw/Input.h>
917
918
919=== modified file 'tests/unit-tests/input/android/test_android_input_sender.cpp'
920--- tests/unit-tests/input/android/test_android_input_sender.cpp 2015-03-31 02:35:42 +0000
921+++ tests/unit-tests/input/android/test_android_input_sender.cpp 2015-04-07 21:28:28 +0000
922@@ -16,7 +16,7 @@
923 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
924 */
925
926-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
927+#include "mir/events/event_private.h"
928
929 #include "src/server/input/android/android_input_channel.h"
930 #include "src/server/input/android/input_sender.h"
931
932=== modified file 'tests/unit-tests/input/android/test_android_input_window_handle.cpp'
933--- tests/unit-tests/input/android/test_android_input_window_handle.cpp 2015-03-31 02:35:42 +0000
934+++ tests/unit-tests/input/android/test_android_input_window_handle.cpp 2015-04-07 21:28:28 +0000
935@@ -16,13 +16,12 @@
936 * Authored by: Robert Carr <robert.carr@canonical.com>
937 */
938
939-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
940-
941 #include "src/server/input/android/android_input_window_handle.h"
942
943 #include "mir/frontend/surface.h"
944 #include "mir/geometry/size.h"
945 #include "mir/input/input_channel.h"
946+#include "mir/events/event_private.h"
947
948 #include "mir_test/fake_shared.h"
949 #include "mir_test_doubles/mock_input_surface.h"
950
951=== modified file 'tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp'
952--- tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp 2015-03-31 02:35:42 +0000
953+++ tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp 2015-04-07 21:28:28 +0000
954@@ -16,9 +16,8 @@
955 * Authored by: Robert Carr <robert.carr@canonical.com>
956 */
957
958-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
959-
960 #include "mir/input/event_filter.h"
961+#include "mir/events/event_private.h"
962 #include "src/server/input/android/event_filter_dispatcher_policy.h"
963
964 #include "mir_test/fake_shared.h"
965
966=== modified file 'tests/unit-tests/input/android/test_input_translator.cpp'
967--- tests/unit-tests/input/android/test_input_translator.cpp 2015-03-31 02:35:42 +0000
968+++ tests/unit-tests/input/android/test_input_translator.cpp 2015-04-07 21:28:28 +0000
969@@ -16,9 +16,10 @@
970 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
971 */
972
973-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
974
975 #include "src/server/input/android/input_translator.h"
976+#include "mir/events/event_private.h"
977+
978 #include "mir_test_doubles/mock_input_dispatcher.h"
979 #include "mir_test/fake_shared.h"
980 #include "mir_test/event_matchers.h"
981
982=== modified file 'tests/unit-tests/input/test_default_input_device_hub.cpp'
983--- tests/unit-tests/input/test_default_input_device_hub.cpp 2015-03-30 18:41:05 +0000
984+++ tests/unit-tests/input/test_default_input_device_hub.cpp 2015-04-07 21:28:28 +0000
985@@ -26,6 +26,7 @@
986
987 #include "mir/input/input_device.h"
988 #include "mir/input/input_device_info.h"
989+#include "mir/events/event_private.h"
990 #include "mir/dispatch/multiplexing_dispatchable.h"
991 #include "mir/dispatch/action_queue.h"
992
993
994=== modified file 'tests/unit-tests/input/test_event_builders.cpp'
995--- tests/unit-tests/input/test_event_builders.cpp 2015-03-31 02:35:42 +0000
996+++ tests/unit-tests/input/test_event_builders.cpp 2015-04-07 21:28:28 +0000
997@@ -16,8 +16,6 @@
998 * Authored by: Robert Carr <robert.carr@canonical.com>
999 */
1000
1001-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
1002-
1003 #include "mir/events/event_builders.h"
1004
1005 #include <gtest/gtest.h>
1006
1007=== modified file 'tests/unit-tests/input/test_event_filter_chain.cpp'
1008--- tests/unit-tests/input/test_event_filter_chain.cpp 2015-03-31 02:35:42 +0000
1009+++ tests/unit-tests/input/test_event_filter_chain.cpp 2015-04-07 21:28:28 +0000
1010@@ -16,11 +16,10 @@
1011 * Authored by: Robert Carr <robert.carr@canonical.com>
1012 */
1013
1014-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
1015-
1016 #include "src/server/input/event_filter_chain.h"
1017 #include "mir_test_doubles/mock_event_filter.h"
1018 #include "mir/events/event_builders.h"
1019+#include "mir/events/event_private.h"
1020
1021 #include <androidfw/Input.h>
1022
1023
1024=== modified file 'tests/unit-tests/input/test_input_event.cpp'
1025--- tests/unit-tests/input/test_input_event.cpp 2015-03-31 02:35:42 +0000
1026+++ tests/unit-tests/input/test_input_event.cpp 2015-04-07 21:28:28 +0000
1027@@ -16,11 +16,9 @@
1028 * Authored by: Robert Carr <robert.carr@canonical.com>
1029 */
1030
1031-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
1032-
1033 #include <gtest/gtest.h>
1034
1035-#include "mir_toolkit/event.h"
1036+#include "mir/events/event_private.h"
1037 #include "mir_toolkit/events/input/input_event.h"
1038
1039 // See: https://bugs.launchpad.net/mir/+bug/1311699
1040
1041=== modified file 'tests/unit-tests/scene/test_application_session.cpp'
1042--- tests/unit-tests/scene/test_application_session.cpp 2015-03-31 02:35:42 +0000
1043+++ tests/unit-tests/scene/test_application_session.cpp 2015-04-07 21:28:28 +0000
1044@@ -16,9 +16,8 @@
1045 * Authored By: Robert Carr <racarr@canonical.com>
1046 */
1047
1048-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
1049-
1050 #include "src/server/scene/application_session.h"
1051+#include "mir/events/event_private.h"
1052 #include "mir/graphics/buffer.h"
1053 #include "mir/scene/surface_creation_parameters.h"
1054 #include "mir/scene/null_session_listener.h"
1055
1056=== modified file 'tests/unit-tests/scene/test_basic_surface.cpp'
1057--- tests/unit-tests/scene/test_basic_surface.cpp 2015-04-02 14:07:26 +0000
1058+++ tests/unit-tests/scene/test_basic_surface.cpp 2015-04-07 21:28:28 +0000
1059@@ -16,11 +16,11 @@
1060 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
1061 */
1062
1063-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
1064
1065 #include "src/server/scene/basic_surface.h"
1066 #include "src/server/scene/legacy_surface_change_notification.h"
1067
1068+#include "mir/events/event_private.h"
1069 #include "mir/frontend/event_sink.h"
1070 #include "mir/geometry/rectangle.h"
1071 #include "mir/geometry/displacement.h"
1072
1073=== modified file 'tests/unit-tests/scene/test_surface.cpp'
1074--- tests/unit-tests/scene/test_surface.cpp 2015-03-31 16:38:02 +0000
1075+++ tests/unit-tests/scene/test_surface.cpp 2015-04-07 21:28:28 +0000
1076@@ -16,8 +16,7 @@
1077 * Authored by: Thomas Voss <thomas.voss@canonical.com>
1078 */
1079
1080-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
1081-
1082+#include "mir/events/event_private.h"
1083 #include "src/server/scene/basic_surface.h"
1084 #include "src/server/scene/legacy_surface_change_notification.h"
1085 #include "src/server/report/null_report_factory.h"
1086
1087=== modified file 'tests/unit-tests/scene/test_surface_impl.cpp'
1088--- tests/unit-tests/scene/test_surface_impl.cpp 2015-03-31 02:35:42 +0000
1089+++ tests/unit-tests/scene/test_surface_impl.cpp 2015-04-07 21:28:28 +0000
1090@@ -16,8 +16,7 @@
1091 * Authored by: Alan Griffiths <alan@octopull.co.uk>
1092 */
1093
1094-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
1095-
1096+#include "mir/events/event_private.h"
1097 #include "src/server/scene/basic_surface.h"
1098 #include "mir/scene/surface_observer.h"
1099 #include "mir/scene/surface_event_source.h"

Subscribers

People subscribed via source and target branches