Merge lp:~mir-team/mir/privatize-event into lp:mir
- privatize-event
- 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Halse Rogers | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Alan Griffiths | Approve | ||
|
Review via email:
|
|||
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 : | # |
Revision history for this message
| Robert Carr (robertcarr) wrote : | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2424
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
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://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
600 - EXPECT_
601 - EXPECT_
602 - EXPECT_
603 - EXPECT_
604 - EXPECT_
605 - }
606 -
607 - reset_last_event();
608 -
609 - {
610 - mir_wait_
611 - mir_wait_
612 -
613 - std::lock_
614 -
615 - EXPECT_
616 - EXPECT_
617 - EXPECT_
618 - EXPECT_
619 - EXPECT_
620 + EXPECT_
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://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2427
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2428
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:2429
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
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 | 120 | # consume CPU time... | 120 | # consume CPU time... |
| 6 | 121 | add_definitions(-DLOG_NDEBUG=1) | 121 | add_definitions(-DLOG_NDEBUG=1) |
| 7 | 122 | 122 | ||
| 8 | 123 | add_definitions(-DMIR_REQUIRE_DEPRECATED_EVENT_OPT_IN=1) | ||
| 9 | 124 | |||
| 10 | 125 | enable_testing() | 123 | enable_testing() |
| 11 | 126 | 124 | ||
| 12 | 127 | include_directories(include/common) | 125 | include_directories(include/common) |
| 13 | 128 | 126 | ||
| 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 | 16 | * Author: Robert Carr <robert.carr@canonical.com> | 16 | * Author: Robert Carr <robert.carr@canonical.com> |
| 19 | 17 | */ | 17 | */ |
| 20 | 18 | 18 | ||
| 21 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 22 | 20 | |||
| 23 | 21 | #ifndef MIR_EVENT_BUILDERS_H_ | 19 | #ifndef MIR_EVENT_BUILDERS_H_ |
| 24 | 22 | #define MIR_EVENT_BUILDERS_H_ | 20 | #define MIR_EVENT_BUILDERS_H_ |
| 25 | 23 | 21 | ||
| 26 | 24 | 22 | ||
| 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 | 61 | /**@}*/ | 61 | /**@}*/ |
| 32 | 62 | #endif | 62 | #endif |
| 33 | 63 | 63 | ||
| 34 | 64 | #ifdef MIR_REQUIRE_DEPRECATED_EVENT_OPT_IN | ||
| 35 | 65 | #ifdef MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 36 | 66 | #include "mir_toolkit/events/event_deprecated.h" | ||
| 37 | 67 | #endif // MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 38 | 68 | #else | ||
| 39 | 69 | #include "mir_toolkit/events/event_deprecated.h" | ||
| 40 | 70 | #endif // MIR_REQUIRE_DEPRECATED_EVENT_OPT_IN | ||
| 41 | 71 | |||
| 42 | 72 | |||
| 43 | 73 | #include "mir_toolkit/events/input/input_event.h" | 64 | #include "mir_toolkit/events/input/input_event.h" |
| 44 | 74 | #include "mir_toolkit/events/resize_event.h" | 65 | #include "mir_toolkit/events/resize_event.h" |
| 45 | 75 | #include "mir_toolkit/events/surface_event.h" | 66 | #include "mir_toolkit/events/surface_event.h" |
| 46 | 76 | 67 | ||
| 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 | 17 | * Daniel van Vugt <daniel.van.vugt@canonical.com> | 17 | * Daniel van Vugt <daniel.van.vugt@canonical.com> |
| 52 | 18 | */ | 18 | */ |
| 53 | 19 | 19 | ||
| 54 | 20 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 55 | 21 | |||
| 56 | 22 | #include "window_manager.h" | 20 | #include "window_manager.h" |
| 57 | 23 | #include "demo_compositor.h" | 21 | #include "demo_compositor.h" |
| 58 | 24 | 22 | ||
| 59 | @@ -28,6 +26,7 @@ | |||
| 60 | 28 | #include "mir/graphics/display.h" | 26 | #include "mir/graphics/display.h" |
| 61 | 29 | #include "mir/graphics/display_configuration.h" | 27 | #include "mir/graphics/display_configuration.h" |
| 62 | 30 | #include "mir/compositor/compositor.h" | 28 | #include "mir/compositor/compositor.h" |
| 63 | 29 | #include "mir/events/event_private.h" | ||
| 64 | 31 | 30 | ||
| 65 | 32 | #include <linux/input.h> | 31 | #include <linux/input.h> |
| 66 | 33 | 32 | ||
| 67 | 34 | 33 | ||
| 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 | 22 | #include "mir/log.h" | 22 | #include "mir/log.h" |
| 73 | 23 | 23 | ||
| 74 | 24 | #include "mir_toolkit/events/event.h" | 24 | #include "mir_toolkit/events/event.h" |
| 76 | 25 | #include "mir_toolkit/events/event_deprecated.h" | 25 | #include "mir/events/event_private.h" |
| 77 | 26 | 26 | ||
| 78 | 27 | #include "mir_toolkit/events/surface_event.h" | 27 | #include "mir_toolkit/events/surface_event.h" |
| 79 | 28 | #include "mir_toolkit/events/resize_event.h" | 28 | #include "mir_toolkit/events/resize_event.h" |
| 80 | 29 | 29 | ||
| 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 | 16 | * Author: Robert Carr <robert.carr@canonical.com> | 16 | * Author: Robert Carr <robert.carr@canonical.com> |
| 86 | 17 | */ | 17 | */ |
| 87 | 18 | 18 | ||
| 88 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 89 | 20 | |||
| 90 | 21 | #include "mir/events/event_builders.h" | 19 | #include "mir/events/event_builders.h" |
| 91 | 20 | #include "mir/events/event_private.h" | ||
| 92 | 22 | 21 | ||
| 93 | 23 | #include <string.h> | 22 | #include <string.h> |
| 94 | 24 | 23 | ||
| 95 | 25 | 24 | ||
| 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 | 17 | * Robert Carr <robert.carr@canonical.com> | 17 | * Robert Carr <robert.carr@canonical.com> |
| 101 | 18 | */ | 18 | */ |
| 102 | 19 | 19 | ||
| 103 | 20 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 104 | 21 | |||
| 105 | 22 | #include "mir/input/android/android_input_lexicon.h" | 20 | #include "mir/input/android/android_input_lexicon.h" |
| 106 | 21 | #include "mir/events/event_private.h" | ||
| 107 | 23 | 22 | ||
| 108 | 24 | #include <androidfw/Input.h> | 23 | #include <androidfw/Input.h> |
| 109 | 25 | 24 | ||
| 110 | 26 | 25 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 116 | 17 | */ | 17 | */ |
| 117 | 18 | 18 | ||
| 118 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 119 | 20 | |||
| 120 | 21 | #include "android_input_receiver.h" | 19 | #include "android_input_receiver.h" |
| 121 | 22 | 20 | ||
| 122 | 23 | #include "mir/dispatch/multiplexing_dispatchable.h" | 21 | #include "mir/dispatch/multiplexing_dispatchable.h" |
| 123 | 24 | #include "mir/input/xkb_mapper.h" | 22 | #include "mir/input/xkb_mapper.h" |
| 124 | 25 | #include "mir/input/input_receiver_report.h" | 23 | #include "mir/input/input_receiver_report.h" |
| 125 | 26 | #include "mir/input/android/android_input_lexicon.h" | 24 | #include "mir/input/android/android_input_lexicon.h" |
| 126 | 25 | #include "mir/events/event_private.h" | ||
| 127 | 27 | 26 | ||
| 128 | 28 | #include <boost/throw_exception.hpp> | 27 | #include <boost/throw_exception.hpp> |
| 129 | 29 | 28 | ||
| 130 | 30 | 29 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 136 | 17 | */ | 17 | */ |
| 137 | 18 | 18 | ||
| 138 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 139 | 20 | |||
| 140 | 21 | #define MIR_LOG_COMPONENT "input-event-access" | 19 | #define MIR_LOG_COMPONENT "input-event-access" |
| 141 | 22 | 20 | ||
| 142 | 23 | #include "mir/event_type_to_string.h" | 21 | #include "mir/event_type_to_string.h" |
| 143 | 22 | #include "mir/events/event_private.h" | ||
| 144 | 24 | #include "mir/log.h" | 23 | #include "mir/log.h" |
| 145 | 25 | 24 | ||
| 146 | 26 | #include "mir_toolkit/events/input/input_event.h" | 25 | #include "mir_toolkit/events/input/input_event.h" |
| 147 | 27 | 26 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 153 | 17 | */ | 17 | */ |
| 154 | 18 | 18 | ||
| 155 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 156 | 20 | |||
| 157 | 21 | #include "mir/input/xkb_mapper.h" | 19 | #include "mir/input/xkb_mapper.h" |
| 158 | 20 | #include "mir/events/event_private.h" | ||
| 159 | 22 | 21 | ||
| 160 | 23 | #include <string.h> | 22 | #include <string.h> |
| 161 | 24 | 23 | ||
| 162 | 25 | 24 | ||
| 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 | 16 | * Authored by: Thomas Guest <thomas.guest@canonical.com> | 16 | * Authored by: Thomas Guest <thomas.guest@canonical.com> |
| 168 | 17 | */ | 17 | */ |
| 169 | 18 | 18 | ||
| 170 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 171 | 20 | |||
| 172 | 21 | #include "mir_connection.h" | 19 | #include "mir_connection.h" |
| 173 | 22 | #include "mir_surface.h" | 20 | #include "mir_surface.h" |
| 174 | 23 | #include "mir_prompt_session.h" | 21 | #include "mir_prompt_session.h" |
| 175 | 24 | 22 | ||
| 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 | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> |
| 181 | 17 | */ | 17 | */ |
| 182 | 18 | 18 | ||
| 183 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER // Required until wire format changes | ||
| 184 | 20 | |||
| 185 | 21 | #include "mir_protobuf_rpc_channel.h" | 19 | #include "mir_protobuf_rpc_channel.h" |
| 186 | 22 | #include "rpc_report.h" | 20 | #include "rpc_report.h" |
| 187 | 23 | 21 | ||
| 188 | @@ -28,6 +26,7 @@ | |||
| 189 | 28 | #include "../lifecycle_control.h" | 26 | #include "../lifecycle_control.h" |
| 190 | 29 | #include "../event_sink.h" | 27 | #include "../event_sink.h" |
| 191 | 30 | #include "mir/variable_length_array.h" | 28 | #include "mir/variable_length_array.h" |
| 192 | 29 | #include "mir/events/event_private.h" | ||
| 193 | 31 | 30 | ||
| 194 | 32 | #include "mir_protobuf.pb.h" // For Buffer frig | 31 | #include "mir_protobuf.pb.h" // For Buffer frig |
| 195 | 33 | #include "mir_protobuf_wire.pb.h" | 32 | #include "mir_protobuf_wire.pb.h" |
| 196 | 34 | 33 | ||
| 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 | 22 | // | 22 | // |
| 203 | 23 | // ================================== | 23 | // ================================== |
| 204 | 24 | 24 | ||
| 207 | 25 | #ifndef MIR_TOOLKIT_EVENT_DEPRECATED_H_ | 25 | #ifndef MIR_COMMON_EVENT_PRIVATE_H_ |
| 208 | 26 | #define MIR_TOOLKIT_EVENT_DEPRECATED_H_ | 26 | #define MIR_COMMON_EVENT_PRIVATE_H_ |
| 209 | 27 | 27 | ||
| 210 | 28 | #include <stddef.h> | 28 | #include <stddef.h> |
| 211 | 29 | #include <stdint.h> | 29 | #include <stdint.h> |
| 212 | 30 | #include "mir_toolkit/event.h" | ||
| 213 | 30 | #include "mir_toolkit/common.h" | 31 | #include "mir_toolkit/common.h" |
| 214 | 31 | 32 | ||
| 215 | 32 | #include <xkbcommon/xkbcommon.h> | 33 | #include <xkbcommon/xkbcommon.h> |
| 216 | @@ -118,7 +119,7 @@ | |||
| 217 | 118 | mir_motion_tool_type_eraser = 4 | 119 | mir_motion_tool_type_eraser = 4 |
| 218 | 119 | } MirMotionToolType; | 120 | } MirMotionToolType; |
| 219 | 120 | 121 | ||
| 221 | 121 | // DEPRECATED | 122 | // PRIVATE |
| 222 | 122 | // Direct access to MirKeyEvent is deprecated. Please use mir_event_get_input_event | 123 | // Direct access to MirKeyEvent is deprecated. Please use mir_event_get_input_event |
| 223 | 123 | // and the mir_input_event* family of functions. | 124 | // and the mir_input_event* family of functions. |
| 224 | 124 | typedef struct | 125 | typedef struct |
| 225 | @@ -158,7 +159,7 @@ | |||
| 226 | 158 | int unused3; | 159 | int unused3; |
| 227 | 159 | } MirMotionPointer; | 160 | } MirMotionPointer; |
| 228 | 160 | 161 | ||
| 230 | 161 | // DEPRECATED | 162 | // PRIVATE |
| 231 | 162 | // Direct access to MirMotionEvent is deprecated. Please use mir_event_get_input_event | 163 | // Direct access to MirMotionEvent is deprecated. Please use mir_event_get_input_event |
| 232 | 163 | // and the mir_input_event* family of functions. | 164 | // and the mir_input_event* family of functions. |
| 233 | 164 | typedef struct | 165 | typedef struct |
| 234 | @@ -263,4 +264,4 @@ | |||
| 235 | 263 | /**@}*/ | 264 | /**@}*/ |
| 236 | 264 | #endif | 265 | #endif |
| 237 | 265 | 266 | ||
| 239 | 266 | #endif /* MIR_TOOLKIT_EVENT_DEPRECATED_H_ */ | 267 | #endif /* MIR_COMMON_EVENT_PRIVATE_H_ */ |
| 240 | 267 | 268 | ||
| 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 | 19 | #ifndef MIR_INPUT_RECEIVER_XKB_MAPPER_H_ | 19 | #ifndef MIR_INPUT_RECEIVER_XKB_MAPPER_H_ |
| 246 | 20 | #define MIR_INPUT_RECEIVER_XKB_MAPPER_H_ | 20 | #define MIR_INPUT_RECEIVER_XKB_MAPPER_H_ |
| 247 | 21 | 21 | ||
| 248 | 22 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 249 | 23 | |||
| 250 | 24 | #include "mir_toolkit/event.h" | 22 | #include "mir_toolkit/event.h" |
| 251 | 25 | 23 | ||
| 252 | 26 | #include <xkbcommon/xkbcommon.h> | 24 | #include <xkbcommon/xkbcommon.h> |
| 253 | 27 | 25 | ||
| 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 | 18 | * Thomas Voss <thomas.voss@canonical.com> | 18 | * Thomas Voss <thomas.voss@canonical.com> |
| 259 | 19 | */ | 19 | */ |
| 260 | 20 | 20 | ||
| 261 | 21 | // TODO: Eliminate usage of std::chrono::nanoseconds in input_dispatcher.h | ||
| 262 | 22 | // to remove this. | ||
| 263 | 23 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 264 | 24 | |||
| 265 | 25 | #define MIR_LOG_COMPONENT "DisplayServer" | 21 | #define MIR_LOG_COMPONENT "DisplayServer" |
| 266 | 26 | #include "mir/display_server.h" | 22 | #include "mir/display_server.h" |
| 267 | 27 | #include "mir/server_configuration.h" | 23 | #include "mir/server_configuration.h" |
| 268 | 28 | 24 | ||
| 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 | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> |
| 274 | 17 | */ | 17 | */ |
| 275 | 18 | 18 | ||
| 276 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 277 | 20 | |||
| 278 | 21 | #include "mir/frontend/client_constants.h" | 19 | #include "mir/frontend/client_constants.h" |
| 279 | 22 | #include "mir/graphics/display_configuration.h" | 20 | #include "mir/graphics/display_configuration.h" |
| 280 | 23 | #include "mir/variable_length_array.h" | 21 | #include "mir/variable_length_array.h" |
| 281 | 24 | #include "event_sender.h" | 22 | #include "event_sender.h" |
| 282 | 23 | #include "mir/events/event_private.h" | ||
| 283 | 25 | #include "message_sender.h" | 24 | #include "message_sender.h" |
| 284 | 26 | #include "protobuf_buffer_packer.h" | 25 | #include "protobuf_buffer_packer.h" |
| 285 | 27 | 26 | ||
| 286 | 28 | 27 | ||
| 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 | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> |
| 292 | 17 | */ | 17 | */ |
| 293 | 18 | 18 | ||
| 294 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 295 | 20 | |||
| 296 | 21 | #include "display_buffer.h" | 19 | #include "display_buffer.h" |
| 297 | 20 | |||
| 298 | 22 | #include "host_connection.h" | 21 | #include "host_connection.h" |
| 299 | 23 | #include "mir/input/input_dispatcher.h" | 22 | #include "mir/input/input_dispatcher.h" |
| 300 | 24 | #include "mir/graphics/pixel_format_utils.h" | 23 | #include "mir/graphics/pixel_format_utils.h" |
| 301 | 24 | #include "mir/events/event_private.h" | ||
| 302 | 25 | 25 | ||
| 303 | 26 | #include <boost/throw_exception.hpp> | 26 | #include <boost/throw_exception.hpp> |
| 304 | 27 | #include <stdexcept> | 27 | #include <stdexcept> |
| 305 | 28 | 28 | ||
| 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 | 17 | * Alan Griffiths <alan@octopull.co.uk> | 17 | * Alan Griffiths <alan@octopull.co.uk> |
| 311 | 18 | */ | 18 | */ |
| 312 | 19 | 19 | ||
| 313 | 20 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 314 | 21 | |||
| 315 | 22 | #include "android_input_dispatcher.h" | 20 | #include "android_input_dispatcher.h" |
| 316 | 23 | #include "android_input_constants.h" | 21 | #include "android_input_constants.h" |
| 317 | 24 | #include "android_input_thread.h" | 22 | #include "android_input_thread.h" |
| 318 | 25 | 23 | ||
| 319 | 24 | #include "mir/events/event_private.h" | ||
| 320 | 25 | |||
| 321 | 26 | #include <InputListener.h> // NotifyArgs | 26 | #include <InputListener.h> // NotifyArgs |
| 322 | 27 | #include <InputDispatcher.h> | 27 | #include <InputDispatcher.h> |
| 323 | 28 | 28 | ||
| 324 | 29 | 29 | ||
| 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 | 17 | * Daniel d'Andradra <daniel.dandrada@canonical.com> | 17 | * Daniel d'Andradra <daniel.dandrada@canonical.com> |
| 330 | 18 | */ | 18 | */ |
| 331 | 19 | 19 | ||
| 332 | 20 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 333 | 21 | |||
| 334 | 22 | #include "mir/input/input_dispatcher.h" | 20 | #include "mir/input/input_dispatcher.h" |
| 335 | 23 | #include "android_input_manager.h" | 21 | #include "android_input_manager.h" |
| 336 | 24 | #include "android_input_constants.h" | 22 | #include "android_input_constants.h" |
| 337 | 25 | 23 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 343 | 17 | */ | 17 | */ |
| 344 | 18 | 18 | ||
| 345 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 346 | 20 | |||
| 347 | 21 | #include "event_filter_dispatcher_policy.h" | 19 | #include "event_filter_dispatcher_policy.h" |
| 348 | 22 | #include "mir/input/android/android_input_lexicon.h" | 20 | #include "mir/input/android/android_input_lexicon.h" |
| 349 | 21 | #include "mir/events/event_private.h" | ||
| 350 | 23 | 22 | ||
| 351 | 24 | namespace mi = mir::input; | 23 | namespace mi = mir::input; |
| 352 | 25 | namespace mia = mi::android; | 24 | namespace mia = mi::android; |
| 353 | 26 | 25 | ||
| 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 | 15 | * | 15 | * |
| 359 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 360 | 17 | */ | 17 | */ |
| 363 | 18 | #ifndef MIR_EVENT_FILTER_DISPATCHER_POLICY_H_ | 18 | |
| 364 | 19 | #define MIR_EVENT_FILTER_DISPATCHER_POLICY_H_ | 19 | #ifndef MIR_INPUT_ANDROID_EVENT_FILTER_DISPATCHER_POLICY_H_ |
| 365 | 20 | #define MIR_INPUT_ANDROID_EVENT_FILTER_DISPATCHER_POLICY_H_ | ||
| 366 | 20 | 21 | ||
| 367 | 21 | #include "mir/input/event_filter.h" | 22 | #include "mir/input/event_filter.h" |
| 368 | 22 | 23 | ||
| 369 | @@ -78,4 +79,4 @@ | |||
| 370 | 78 | } | 79 | } |
| 371 | 79 | } | 80 | } |
| 372 | 80 | 81 | ||
| 374 | 81 | #endif // MIR_DUMMY_INPUT_DISPATCHER_POLICY_H_ | 82 | #endif // MIR_INPUT_ANDROID_EVENT_FILTER_DISPATCHER_POLICY_H_ |
| 375 | 82 | 83 | ||
| 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 | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> |
| 381 | 17 | */ | 17 | */ |
| 382 | 18 | 18 | ||
| 384 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | 19 | #include "mir/events/event_private.h" |
| 385 | 20 | 20 | ||
| 386 | 21 | #include "input_sender.h" | 21 | #include "input_sender.h" |
| 387 | 22 | #include "input_send_entry.h" | 22 | #include "input_send_entry.h" |
| 388 | 23 | 23 | ||
| 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 | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> |
| 394 | 17 | */ | 17 | */ |
| 395 | 18 | 18 | ||
| 396 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 397 | 20 | |||
| 398 | 21 | #include "input_translator.h" | 19 | #include "input_translator.h" |
| 399 | 22 | 20 | ||
| 400 | 21 | #include "mir/events/event_private.h" | ||
| 401 | 22 | |||
| 402 | 23 | #include "androidfw/Input.h" | 23 | #include "androidfw/Input.h" |
| 403 | 24 | 24 | ||
| 404 | 25 | #include <unordered_set> | 25 | #include <unordered_set> |
| 405 | 26 | 26 | ||
| 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 | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> |
| 411 | 17 | */ | 17 | */ |
| 412 | 18 | 18 | ||
| 413 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 414 | 20 | |||
| 415 | 21 | #include "mir/default_server_configuration.h" | 19 | #include "mir/default_server_configuration.h" |
| 416 | 22 | 20 | ||
| 417 | 21 | #include "mir/events/event_private.h" | ||
| 418 | 23 | #include "android/android_input_dispatcher.h" | 22 | #include "android/android_input_dispatcher.h" |
| 419 | 24 | #include "android/android_input_targeter.h" | 23 | #include "android/android_input_targeter.h" |
| 420 | 25 | #include "android/android_input_reader_policy.h" | 24 | #include "android/android_input_reader_policy.h" |
| 421 | 26 | 25 | ||
| 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 | 24 | #include "mir/input/input_device.h" | 24 | #include "mir/input/input_device.h" |
| 427 | 25 | #include "mir/input/input_device_info.h" | 25 | #include "mir/input/input_device_info.h" |
| 428 | 26 | #include "mir/input/input_sink.h" | 26 | #include "mir/input/input_sink.h" |
| 429 | 27 | #include "mir/events/event_private.h" | ||
| 430 | 27 | #include "mir/dispatch/multiplexing_dispatchable.h" | 28 | #include "mir/dispatch/multiplexing_dispatchable.h" |
| 431 | 28 | #include "mir/server_action_queue.h" | 29 | #include "mir/server_action_queue.h" |
| 432 | 29 | #include "mir/log.h" | 30 | #include "mir/log.h" |
| 433 | 30 | 31 | ||
| 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 | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> |
| 439 | 17 | */ | 17 | */ |
| 440 | 18 | 18 | ||
| 441 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 442 | 20 | |||
| 443 | 21 | #include "null_input_dispatcher.h" | 19 | #include "null_input_dispatcher.h" |
| 444 | 22 | 20 | ||
| 445 | 23 | namespace mi = mir::input; | 21 | namespace mi = mir::input; |
| 446 | 24 | 22 | ||
| 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 | 16 | * Authored by: Robert Ancell <robert.ancell@canonical.com> | 16 | * Authored by: Robert Ancell <robert.ancell@canonical.com> |
| 452 | 17 | */ | 17 | */ |
| 453 | 18 | 18 | ||
| 454 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 455 | 20 | |||
| 456 | 21 | #include "mir/input/vt_filter.h" | 19 | #include "mir/input/vt_filter.h" |
| 457 | 20 | #include "mir/events/event_private.h" | ||
| 458 | 22 | 21 | ||
| 459 | 23 | #include <linux/input.h> | 22 | #include <linux/input.h> |
| 460 | 24 | #include <linux/vt.h> | 23 | #include <linux/vt.h> |
| 461 | 25 | 24 | ||
| 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 | 16 | * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com> | 16 | * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com> |
| 467 | 17 | */ | 17 | */ |
| 468 | 18 | 18 | ||
| 469 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 470 | 20 | |||
| 471 | 21 | #include "message_processor_report.h" | 19 | #include "message_processor_report.h" |
| 472 | 22 | 20 | ||
| 473 | 23 | #include "mir/report/lttng/mir_tracepoint.h" | 21 | #include "mir/report/lttng/mir_tracepoint.h" |
| 474 | 24 | 22 | ||
| 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 | 16 | * Authored by: Robert Carr <racarr@canonical.com> | 16 | * Authored by: Robert Carr <racarr@canonical.com> |
| 480 | 17 | */ | 17 | */ |
| 481 | 18 | 18 | ||
| 482 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 483 | 20 | |||
| 484 | 21 | #include "application_session.h" | 19 | #include "application_session.h" |
| 485 | 22 | #include "snapshot_strategy.h" | 20 | #include "snapshot_strategy.h" |
| 486 | 23 | #include "default_session_container.h" | 21 | #include "default_session_container.h" |
| 487 | 24 | 22 | ||
| 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 | 16 | * Authored by: Nick Dedekind <nick.dedekind@canonical.com> | 16 | * Authored by: Nick Dedekind <nick.dedekind@canonical.com> |
| 493 | 17 | */ | 17 | */ |
| 494 | 18 | 18 | ||
| 495 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 496 | 20 | |||
| 497 | 21 | #include "mir_toolkit/mir_client_library.h" | 19 | #include "mir_toolkit/mir_client_library.h" |
| 498 | 22 | #include "mir_toolkit/debug/surface.h" | ||
| 499 | 23 | 20 | ||
| 500 | 24 | #include "mir/shell/shell_wrapper.h" | 21 | #include "mir/shell/shell_wrapper.h" |
| 501 | 25 | |||
| 502 | 26 | #include "mir/scene/session.h" | 22 | #include "mir/scene/session.h" |
| 503 | 27 | #include "mir/scene/surface.h" | 23 | #include "mir/scene/surface.h" |
| 504 | 28 | #include "mir/scene/surface_creation_parameters.h" | 24 | #include "mir/scene/surface_creation_parameters.h" |
| 505 | 29 | 25 | ||
| 506 | 26 | #include "mir_test/event_matchers.h" | ||
| 507 | 30 | #include "mir_test_framework/connected_client_with_a_surface.h" | 27 | #include "mir_test_framework/connected_client_with_a_surface.h" |
| 508 | 31 | #include "mir_test_framework/any_surface.h" | 28 | #include "mir_test_framework/any_surface.h" |
| 509 | 32 | 29 | ||
| 510 | @@ -38,9 +35,10 @@ | |||
| 511 | 38 | #include <mutex> | 35 | #include <mutex> |
| 512 | 39 | 36 | ||
| 513 | 40 | namespace mf = mir::frontend; | 37 | namespace mf = mir::frontend; |
| 514 | 41 | namespace mtf = mir_test_framework; | ||
| 515 | 42 | namespace ms = mir::scene; | 38 | namespace ms = mir::scene; |
| 516 | 43 | namespace msh = mir::shell; | 39 | namespace msh = mir::shell; |
| 517 | 40 | namespace mt = mir::test; | ||
| 518 | 41 | namespace mtf = mir_test_framework; | ||
| 519 | 44 | 42 | ||
| 520 | 45 | using namespace testing; | 43 | using namespace testing; |
| 521 | 46 | 44 | ||
| 522 | @@ -69,18 +67,28 @@ | |||
| 523 | 69 | std::mutex last_event_mutex; | 67 | std::mutex last_event_mutex; |
| 524 | 70 | MirEventType event_filter{mir_event_type_surface}; | 68 | MirEventType event_filter{mir_event_type_surface}; |
| 525 | 71 | std::condition_variable last_event_cv; | 69 | std::condition_variable last_event_cv; |
| 527 | 72 | MirEvent last_event{}; | 70 | MirEvent const* last_event = nullptr; |
| 528 | 73 | MirSurface* last_event_surface = nullptr; | 71 | MirSurface* last_event_surface = nullptr; |
| 529 | 74 | 72 | ||
| 530 | 75 | std::shared_ptr<ms::Surface> scene_surface; | 73 | std::shared_ptr<ms::Surface> scene_surface; |
| 531 | 76 | 74 | ||
| 532 | 75 | ~ClientSurfaceEvents() | ||
| 533 | 76 | { | ||
| 534 | 77 | if (last_event) | ||
| 535 | 78 | mir_event_unref(last_event); | ||
| 536 | 79 | } | ||
| 537 | 80 | |||
| 538 | 77 | static void event_callback(MirSurface* surface, MirEvent const* event, void* ctx) | 81 | static void event_callback(MirSurface* surface, MirEvent const* event, void* ctx) |
| 539 | 78 | { | 82 | { |
| 540 | 79 | ClientSurfaceEvents* self = static_cast<ClientSurfaceEvents*>(ctx); | 83 | ClientSurfaceEvents* self = static_cast<ClientSurfaceEvents*>(ctx); |
| 541 | 80 | std::lock_guard<decltype(self->last_event_mutex)> last_event_lock{self->last_event_mutex}; | 84 | std::lock_guard<decltype(self->last_event_mutex)> last_event_lock{self->last_event_mutex}; |
| 542 | 81 | // Don't overwrite an interesting event with an uninteresting one! | 85 | // Don't overwrite an interesting event with an uninteresting one! |
| 545 | 82 | if (event->type != self->event_filter) return; | 86 | if (mir_event_get_type(event) != self->event_filter) return; |
| 546 | 83 | self->last_event = *event; | 87 | |
| 547 | 88 | if (self->last_event) | ||
| 548 | 89 | mir_event_unref(self->last_event); | ||
| 549 | 90 | |||
| 550 | 91 | self->last_event = mir_event_ref(event); | ||
| 551 | 84 | self->last_event_surface = surface; | 92 | self->last_event_surface = surface; |
| 552 | 85 | self->last_event_cv.notify_one(); | 93 | self->last_event_cv.notify_one(); |
| 553 | 86 | } | 94 | } |
| 554 | @@ -89,7 +97,7 @@ | |||
| 555 | 89 | { | 97 | { |
| 556 | 90 | std::unique_lock<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; | 98 | std::unique_lock<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; |
| 557 | 91 | return last_event_cv.wait_for(last_event_lock, delay, | 99 | return last_event_cv.wait_for(last_event_lock, delay, |
| 559 | 92 | [&] { return last_event_surface == surface && last_event.type == event_filter; }); | 100 | [&] { return last_event_surface == surface && mir_event_get_type(last_event) == event_filter; }); |
| 560 | 93 | } | 101 | } |
| 561 | 94 | 102 | ||
| 562 | 95 | void set_event_filter(MirEventType type) | 103 | void set_event_filter(MirEventType type) |
| 563 | @@ -101,7 +109,9 @@ | |||
| 564 | 101 | void reset_last_event() | 109 | void reset_last_event() |
| 565 | 102 | { | 110 | { |
| 566 | 103 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; | 111 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; |
| 568 | 104 | memset(&last_event, 0, sizeof last_event); | 112 | if (last_event != nullptr) |
| 569 | 113 | mir_event_unref(last_event); | ||
| 570 | 114 | last_event = nullptr; | ||
| 571 | 105 | last_event_surface = nullptr; | 115 | last_event_surface = nullptr; |
| 572 | 106 | } | 116 | } |
| 573 | 107 | 117 | ||
| 574 | @@ -151,31 +161,20 @@ | |||
| 575 | 151 | 161 | ||
| 576 | 152 | TEST_F(ClientSurfaceEvents, surface_receives_state_events) | 162 | TEST_F(ClientSurfaceEvents, surface_receives_state_events) |
| 577 | 153 | { | 163 | { |
| 578 | 154 | int surface_id = mir_debug_surface_id(surface); | ||
| 579 | 155 | |||
| 580 | 156 | { | 164 | { |
| 581 | 157 | mir_wait_for(mir_surface_set_state(surface, mir_surface_state_fullscreen)); | 165 | mir_wait_for(mir_surface_set_state(surface, mir_surface_state_fullscreen)); |
| 582 | 158 | mir_wait_for(mir_surface_set_state(other_surface, mir_surface_state_vertmaximized)); | 166 | mir_wait_for(mir_surface_set_state(other_surface, mir_surface_state_vertmaximized)); |
| 583 | 159 | 167 | ||
| 584 | 160 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; | 168 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; |
| 585 | 161 | 169 | ||
| 591 | 162 | EXPECT_THAT(last_event_surface, Eq(surface)); | 170 | EXPECT_THAT(last_event, mt::SurfaceEvent(mir_surface_attrib_state, mir_surface_state_fullscreen)); |
| 587 | 163 | EXPECT_THAT(last_event.type, Eq(mir_event_type_surface)); | ||
| 588 | 164 | EXPECT_THAT(last_event.surface.id, Eq(surface_id)); | ||
| 589 | 165 | EXPECT_THAT(last_event.surface.attrib, Eq(mir_surface_attrib_state)); | ||
| 590 | 166 | EXPECT_THAT(last_event.surface.value, Eq(mir_surface_state_fullscreen)); | ||
| 592 | 167 | } | 171 | } |
| 593 | 168 | 172 | ||
| 594 | 169 | { | 173 | { |
| 595 | 170 | mir_wait_for(mir_surface_set_state(surface, static_cast<MirSurfaceState>(999))); | 174 | mir_wait_for(mir_surface_set_state(surface, static_cast<MirSurfaceState>(999))); |
| 596 | 171 | 175 | ||
| 597 | 172 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; | 176 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; |
| 604 | 173 | 177 | EXPECT_THAT(last_event, mt::SurfaceEvent(mir_surface_attrib_state, mir_surface_state_fullscreen)); | |
| 599 | 174 | EXPECT_THAT(last_event_surface, Eq(surface)); | ||
| 600 | 175 | EXPECT_THAT(last_event.type, Eq(mir_event_type_surface)); | ||
| 601 | 176 | EXPECT_THAT(last_event.surface.id, Eq(surface_id)); | ||
| 602 | 177 | EXPECT_THAT(last_event.surface.attrib, Eq(mir_surface_attrib_state)); | ||
| 603 | 178 | EXPECT_THAT(last_event.surface.value, Eq(mir_surface_state_fullscreen)); | ||
| 605 | 179 | } | 178 | } |
| 606 | 180 | 179 | ||
| 607 | 181 | reset_last_event(); | 180 | reset_last_event(); |
| 608 | @@ -185,11 +184,7 @@ | |||
| 609 | 185 | 184 | ||
| 610 | 186 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; | 185 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; |
| 611 | 187 | 186 | ||
| 617 | 188 | EXPECT_THAT(last_event_surface, Eq(surface)); | 187 | EXPECT_THAT(last_event, mt::SurfaceEvent(mir_surface_attrib_state, mir_surface_state_vertmaximized)); |
| 613 | 189 | EXPECT_THAT(last_event.type, Eq(mir_event_type_surface)); | ||
| 614 | 190 | EXPECT_THAT(last_event.surface.id, Eq(surface_id)); | ||
| 615 | 191 | EXPECT_THAT(last_event.surface.attrib, Eq(mir_surface_attrib_state)); | ||
| 616 | 192 | EXPECT_THAT(last_event.surface.value, Eq(mir_surface_state_vertmaximized)); | ||
| 618 | 193 | } | 188 | } |
| 619 | 194 | 189 | ||
| 620 | 195 | reset_last_event(); | 190 | reset_last_event(); |
| 621 | @@ -200,11 +195,7 @@ | |||
| 622 | 200 | 195 | ||
| 623 | 201 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; | 196 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; |
| 624 | 202 | 197 | ||
| 630 | 203 | EXPECT_THAT(last_event_surface, IsNull()); | 198 | EXPECT_EQ(nullptr, last_event); |
| 626 | 204 | EXPECT_THAT(last_event.type, Eq(0)); | ||
| 627 | 205 | EXPECT_THAT(last_event.surface.id, Eq(0)); | ||
| 628 | 206 | EXPECT_THAT(last_event.surface.attrib, Eq(0)); | ||
| 629 | 207 | EXPECT_THAT(last_event.surface.value, Eq(0)); | ||
| 631 | 208 | } | 199 | } |
| 632 | 209 | } | 200 | } |
| 633 | 210 | 201 | ||
| 634 | @@ -222,9 +213,7 @@ | |||
| 635 | 222 | 213 | ||
| 636 | 223 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; | 214 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; |
| 637 | 224 | 215 | ||
| 641 | 225 | EXPECT_THAT(last_event_surface, Eq(surface)); | 216 | EXPECT_THAT(last_event, mt::OrientationEvent(direction)); |
| 639 | 226 | EXPECT_THAT(last_event.type, Eq(mir_event_type_orientation)); | ||
| 640 | 227 | EXPECT_THAT(last_event.orientation.direction, Eq(direction)); | ||
| 642 | 228 | } | 217 | } |
| 643 | 229 | 218 | ||
| 644 | 230 | INSTANTIATE_TEST_CASE_P(ClientSurfaceEvents, | 219 | INSTANTIATE_TEST_CASE_P(ClientSurfaceEvents, |
| 645 | @@ -261,7 +250,7 @@ | |||
| 646 | 261 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; | 250 | std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex}; |
| 647 | 262 | 251 | ||
| 648 | 263 | EXPECT_THAT(last_event_surface, Eq(surface)); | 252 | EXPECT_THAT(last_event_surface, Eq(surface)); |
| 650 | 264 | EXPECT_THAT(last_event.type, Eq(mir_event_type_close_surface)); | 253 | EXPECT_THAT(mir_event_get_type(last_event), Eq(mir_event_type_close_surface)); |
| 651 | 265 | } | 254 | } |
| 652 | 266 | 255 | ||
| 653 | 267 | TEST_F(ClientSurfaceEvents, client_can_query_preferred_orientation) | 256 | TEST_F(ClientSurfaceEvents, client_can_query_preferred_orientation) |
| 654 | 268 | 257 | ||
| 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 | 18 | * Alexandros Frantzis <alexandros.frantzis@canonical.com> | 18 | * Alexandros Frantzis <alexandros.frantzis@canonical.com> |
| 660 | 19 | */ | 19 | */ |
| 661 | 20 | 20 | ||
| 664 | 21 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | 21 | #include "mir/events/event_private.h" |
| 663 | 22 | |||
| 665 | 23 | #include "mir/shell/shell_wrapper.h" | 22 | #include "mir/shell/shell_wrapper.h" |
| 666 | 24 | #include "mir/scene/surface_creation_parameters.h" | 23 | #include "mir/scene/surface_creation_parameters.h" |
| 667 | 25 | #include "mir/scene/surface.h" | 24 | #include "mir/scene/surface.h" |
| 668 | @@ -108,7 +107,7 @@ | |||
| 669 | 108 | { | 107 | { |
| 670 | 109 | auto const client = static_cast<InputClient*>(context); | 108 | auto const client = static_cast<InputClient*>(context); |
| 671 | 110 | 109 | ||
| 673 | 111 | if (ev->type == mir_event_type_surface) | 110 | if (mir_event_get_type(ev) == mir_event_type_surface) |
| 674 | 112 | return; | 111 | return; |
| 675 | 113 | 112 | ||
| 676 | 114 | client->handler.handle_input(ev); | 113 | client->handler.handle_input(ev); |
| 677 | 115 | 114 | ||
| 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 | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> |
| 683 | 17 | */ | 17 | */ |
| 684 | 18 | 18 | ||
| 685 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 686 | 20 | |||
| 687 | 21 | #include "mir/input/input_dispatcher.h" | 19 | #include "mir/input/input_dispatcher.h" |
| 688 | 22 | 20 | ||
| 689 | 23 | #include "clients.h" | 21 | #include "clients.h" |
| 690 | @@ -34,6 +32,7 @@ | |||
| 691 | 34 | #include "mir/compositor/scene.h" | 32 | #include "mir/compositor/scene.h" |
| 692 | 35 | #include "mir/shell/input_targeter.h" | 33 | #include "mir/shell/input_targeter.h" |
| 693 | 36 | #include "mir/scene/observer.h" | 34 | #include "mir/scene/observer.h" |
| 694 | 35 | #include "mir/events/event_private.h" | ||
| 695 | 37 | 36 | ||
| 696 | 38 | #include "mir_toolkit/event.h" | 37 | #include "mir_toolkit/event.h" |
| 697 | 39 | 38 | ||
| 698 | 40 | 39 | ||
| 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 | 19 | #ifndef MIR_TEST_DOUBLES_MOCK_EVENT_FILTER_H_ | 19 | #ifndef MIR_TEST_DOUBLES_MOCK_EVENT_FILTER_H_ |
| 704 | 20 | #define MIR_TEST_DOUBLES_MOCK_EVENT_FILTER_H_ | 20 | #define MIR_TEST_DOUBLES_MOCK_EVENT_FILTER_H_ |
| 705 | 21 | 21 | ||
| 706 | 22 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 707 | 23 | |||
| 708 | 24 | #include "mir/input/event_filter.h" | 22 | #include "mir/input/event_filter.h" |
| 709 | 25 | 23 | ||
| 710 | 26 | #include <gmock/gmock.h> | 24 | #include <gmock/gmock.h> |
| 711 | 27 | 25 | ||
| 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 | 17 | * Daniel d'Andrada <daniel.dandrada@canonical.com> | 17 | * Daniel d'Andrada <daniel.dandrada@canonical.com> |
| 717 | 18 | */ | 18 | */ |
| 718 | 19 | 19 | ||
| 721 | 20 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | 20 | #include "mir/events/event_private.h" |
| 720 | 21 | |||
| 722 | 22 | #include "src/server/input/event_filter_chain.h" | 21 | #include "src/server/input/event_filter_chain.h" |
| 723 | 23 | 22 | ||
| 724 | 24 | #include "mir_test/fake_shared.h" | 23 | #include "mir_test/fake_shared.h" |
| 725 | 25 | 24 | ||
| 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 | 17 | * Daniel d'Andrada <daniel.dandrada@canonical.com> | 17 | * Daniel d'Andrada <daniel.dandrada@canonical.com> |
| 731 | 18 | */ | 18 | */ |
| 732 | 19 | 19 | ||
| 734 | 20 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | 20 | #include "mir/events/event_private.h" |
| 735 | 21 | 21 | ||
| 736 | 22 | #include "src/server/input/android/android_input_targeter.h" | 22 | #include "src/server/input/android/android_input_targeter.h" |
| 737 | 23 | #include "src/server/input/android/android_input_registrar.h" | 23 | #include "src/server/input/android/android_input_registrar.h" |
| 738 | 24 | 24 | ||
| 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 | 16 | * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com> | 16 | * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com> |
| 744 | 17 | */ | 17 | */ |
| 745 | 18 | 18 | ||
| 746 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 747 | 20 | |||
| 748 | 21 | #include "src/server/report/null/input_report.h" | 19 | #include "src/server/report/null/input_report.h" |
| 749 | 22 | #include "mir/input/input_manager.h" | 20 | #include "mir/input/input_manager.h" |
| 750 | 23 | #include "mir/input/input_dispatcher.h" | 21 | #include "mir/input/input_dispatcher.h" |
| 751 | 22 | #include "mir/events/event_private.h" | ||
| 752 | 24 | #include "src/server/input/android/android_input_dispatcher.h" | 23 | #include "src/server/input/android/android_input_dispatcher.h" |
| 753 | 25 | #include "src/server/input/android/event_filter_dispatcher_policy.h" | 24 | #include "src/server/input/android/event_filter_dispatcher_policy.h" |
| 754 | 26 | #include "src/server/input/android/common_input_thread.h" | 25 | #include "src/server/input/android/common_input_thread.h" |
| 755 | 27 | 26 | ||
| 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 | 16 | * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com> | 16 | * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com> |
| 761 | 17 | */ | 17 | */ |
| 762 | 18 | 18 | ||
| 763 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 764 | 20 | |||
| 765 | 21 | #include "mir/compositor/compositor.h" | 19 | #include "mir/compositor/compositor.h" |
| 766 | 22 | #include "mir/frontend/connector.h" | 20 | #include "mir/frontend/connector.h" |
| 767 | 23 | #include "mir/graphics/display_configuration.h" | 21 | #include "mir/graphics/display_configuration.h" |
| 768 | @@ -25,6 +23,7 @@ | |||
| 769 | 25 | #include "mir/server_action_queue.h" | 23 | #include "mir/server_action_queue.h" |
| 770 | 26 | #include "mir/graphics/event_handler_register.h" | 24 | #include "mir/graphics/event_handler_register.h" |
| 771 | 27 | #include "mir/server_status_listener.h" | 25 | #include "mir/server_status_listener.h" |
| 772 | 26 | #include "mir/events/event_private.h" | ||
| 773 | 28 | 27 | ||
| 774 | 29 | #include "mir_test/pipe.h" | 28 | #include "mir_test/pipe.h" |
| 775 | 30 | #include "mir_test/wait_condition.h" | 29 | #include "mir_test/wait_condition.h" |
| 776 | 31 | 30 | ||
| 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 | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> |
| 782 | 17 | */ | 17 | */ |
| 783 | 18 | 18 | ||
| 784 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 785 | 20 | |||
| 786 | 21 | #include "mir_test/test_protobuf_client.h" | 19 | #include "mir_test/test_protobuf_client.h" |
| 787 | 22 | #include "mir_test_doubles/mock_rpc_report.h" | 20 | #include "mir_test_doubles/mock_rpc_report.h" |
| 788 | 23 | #include "mir_test_doubles/null_client_event_sink.h" | 21 | #include "mir_test_doubles/null_client_event_sink.h" |
| 789 | @@ -29,6 +27,7 @@ | |||
| 790 | 29 | #include "src/client/rpc/mir_basic_rpc_channel.h" | 27 | #include "src/client/rpc/mir_basic_rpc_channel.h" |
| 791 | 30 | #include "mir/dispatch/dispatchable.h" | 28 | #include "mir/dispatch/dispatchable.h" |
| 792 | 31 | #include "mir/dispatch/simple_dispatch_thread.h" | 29 | #include "mir/dispatch/simple_dispatch_thread.h" |
| 793 | 30 | #include "mir/events/event_private.h" | ||
| 794 | 32 | 31 | ||
| 795 | 33 | #include <thread> | 32 | #include <thread> |
| 796 | 34 | 33 | ||
| 797 | 35 | 34 | ||
| 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 | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> |
| 803 | 17 | */ | 17 | */ |
| 804 | 18 | 18 | ||
| 805 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 806 | 20 | |||
| 807 | 21 | #include "mir_test_framework/stubbed_server_configuration.h" | 19 | #include "mir_test_framework/stubbed_server_configuration.h" |
| 808 | 22 | #include "mir_test_framework/command_line_server_configuration.h" | 20 | #include "mir_test_framework/command_line_server_configuration.h" |
| 809 | 23 | 21 | ||
| 810 | 24 | 22 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 816 | 17 | */ | 17 | */ |
| 817 | 18 | 18 | ||
| 818 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 819 | 20 | |||
| 820 | 21 | #include "src/client/input/android/android_input_receiver.h" | 19 | #include "src/client/input/android/android_input_receiver.h" |
| 821 | 22 | #include "mir/input/null_input_receiver_report.h" | 20 | #include "mir/input/null_input_receiver_report.h" |
| 822 | 23 | #include "mir/input/xkb_mapper.h" | 21 | #include "mir/input/xkb_mapper.h" |
| 823 | 22 | #include "mir/events/event_private.h" | ||
| 824 | 23 | |||
| 825 | 24 | #include "mir_toolkit/event.h" | 24 | #include "mir_toolkit/event.h" |
| 826 | 25 | 25 | ||
| 827 | 26 | #include "mir_test/fd_utils.h" | 26 | #include "mir_test/fd_utils.h" |
| 828 | 27 | 27 | ||
| 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 | 17 | */ | 17 | */ |
| 834 | 18 | 18 | ||
| 835 | 19 | #include "mir/input/xkb_mapper.h" | 19 | #include "mir/input/xkb_mapper.h" |
| 836 | 20 | #include "mir/events/event_private.h" | ||
| 837 | 20 | 21 | ||
| 838 | 21 | #include <xkbcommon/xkbcommon-keysyms.h> | 22 | #include <xkbcommon/xkbcommon-keysyms.h> |
| 839 | 22 | #include <xkbcommon/xkbcommon.h> | 23 | #include <xkbcommon/xkbcommon.h> |
| 840 | 23 | 24 | ||
| 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 | 16 | * Authored by: Nick Dedekind <nick.dedekind <nick.dedekind@canonical.com> | 16 | * Authored by: Nick Dedekind <nick.dedekind <nick.dedekind@canonical.com> |
| 846 | 17 | */ | 17 | */ |
| 847 | 18 | 18 | ||
| 848 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 849 | 20 | |||
| 850 | 21 | #include "src/client/mir_event_distributor.h" | 19 | #include "src/client/mir_event_distributor.h" |
| 851 | 22 | 20 | ||
| 852 | 21 | #include "mir/events/event_private.h" | ||
| 853 | 22 | |||
| 854 | 23 | #include <gtest/gtest.h> | 23 | #include <gtest/gtest.h> |
| 855 | 24 | #include <gmock/gmock.h> | 24 | #include <gmock/gmock.h> |
| 856 | 25 | #include <mir_test/wait_condition.h> | 25 | #include <mir_test/wait_condition.h> |
| 857 | 26 | 26 | ||
| 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 | 17 | * Alan Griffiths <alan@octopull.co.uk> | 17 | * Alan Griffiths <alan@octopull.co.uk> |
| 863 | 18 | */ | 18 | */ |
| 864 | 19 | 19 | ||
| 865 | 20 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 866 | 21 | |||
| 867 | 22 | #include "mir/frontend/connector.h" | 20 | #include "mir/frontend/connector.h" |
| 868 | 21 | #include "mir/events/event_private.h" | ||
| 869 | 23 | 22 | ||
| 870 | 24 | #include "src/server/report/null_report_factory.h" | 23 | #include "src/server/report/null_report_factory.h" |
| 871 | 25 | #include "src/server/frontend/resource_cache.h" | 24 | #include "src/server/frontend/resource_cache.h" |
| 872 | 26 | 25 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 878 | 17 | */ | 17 | */ |
| 879 | 18 | 18 | ||
| 880 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 881 | 20 | |||
| 882 | 21 | #include "src/server/input/android/android_input_application_handle.h" | 19 | #include "src/server/input/android/android_input_application_handle.h" |
| 883 | 22 | 20 | ||
| 884 | 21 | #include "mir/events/event_private.h" | ||
| 885 | 23 | #include "mir/input/input_channel.h" | 22 | #include "mir/input/input_channel.h" |
| 886 | 24 | 23 | ||
| 887 | 25 | #include "mir_test_doubles/mock_input_surface.h" | 24 | #include "mir_test_doubles/mock_input_surface.h" |
| 888 | 26 | 25 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 894 | 17 | */ | 17 | */ |
| 895 | 18 | 18 | ||
| 898 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | 19 | #include "mir/events/event_private.h" |
| 897 | 20 | |||
| 899 | 21 | #include "src/server/input/android/android_input_dispatcher.h" | 20 | #include "src/server/input/android/android_input_dispatcher.h" |
| 900 | 22 | #include "src/server/input/android/android_input_thread.h" | 21 | #include "src/server/input/android/android_input_thread.h" |
| 901 | 23 | #include "src/server/input/android/android_input_constants.h" | 22 | #include "src/server/input/android/android_input_constants.h" |
| 902 | 24 | 23 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 908 | 17 | */ | 17 | */ |
| 909 | 18 | 18 | ||
| 910 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 911 | 20 | |||
| 912 | 21 | #include "mir/input/android/android_input_lexicon.h" | 19 | #include "mir/input/android/android_input_lexicon.h" |
| 914 | 22 | #include "mir_toolkit/event.h" | 20 | #include "mir/events/event_private.h" |
| 915 | 23 | 21 | ||
| 916 | 24 | #include <androidfw/Input.h> | 22 | #include <androidfw/Input.h> |
| 917 | 25 | 23 | ||
| 918 | 26 | 24 | ||
| 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 | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> |
| 924 | 17 | */ | 17 | */ |
| 925 | 18 | 18 | ||
| 927 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | 19 | #include "mir/events/event_private.h" |
| 928 | 20 | 20 | ||
| 929 | 21 | #include "src/server/input/android/android_input_channel.h" | 21 | #include "src/server/input/android/android_input_channel.h" |
| 930 | 22 | #include "src/server/input/android/input_sender.h" | 22 | #include "src/server/input/android/input_sender.h" |
| 931 | 23 | 23 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 937 | 17 | */ | 17 | */ |
| 938 | 18 | 18 | ||
| 939 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 940 | 20 | |||
| 941 | 21 | #include "src/server/input/android/android_input_window_handle.h" | 19 | #include "src/server/input/android/android_input_window_handle.h" |
| 942 | 22 | 20 | ||
| 943 | 23 | #include "mir/frontend/surface.h" | 21 | #include "mir/frontend/surface.h" |
| 944 | 24 | #include "mir/geometry/size.h" | 22 | #include "mir/geometry/size.h" |
| 945 | 25 | #include "mir/input/input_channel.h" | 23 | #include "mir/input/input_channel.h" |
| 946 | 24 | #include "mir/events/event_private.h" | ||
| 947 | 26 | 25 | ||
| 948 | 27 | #include "mir_test/fake_shared.h" | 26 | #include "mir_test/fake_shared.h" |
| 949 | 28 | #include "mir_test_doubles/mock_input_surface.h" | 27 | #include "mir_test_doubles/mock_input_surface.h" |
| 950 | 29 | 28 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 956 | 17 | */ | 17 | */ |
| 957 | 18 | 18 | ||
| 958 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 959 | 20 | |||
| 960 | 21 | #include "mir/input/event_filter.h" | 19 | #include "mir/input/event_filter.h" |
| 961 | 20 | #include "mir/events/event_private.h" | ||
| 962 | 22 | #include "src/server/input/android/event_filter_dispatcher_policy.h" | 21 | #include "src/server/input/android/event_filter_dispatcher_policy.h" |
| 963 | 23 | 22 | ||
| 964 | 24 | #include "mir_test/fake_shared.h" | 23 | #include "mir_test/fake_shared.h" |
| 965 | 25 | 24 | ||
| 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 | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> | 16 | * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com> |
| 971 | 17 | */ | 17 | */ |
| 972 | 18 | 18 | ||
| 973 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 974 | 20 | 19 | ||
| 975 | 21 | #include "src/server/input/android/input_translator.h" | 20 | #include "src/server/input/android/input_translator.h" |
| 976 | 21 | #include "mir/events/event_private.h" | ||
| 977 | 22 | |||
| 978 | 22 | #include "mir_test_doubles/mock_input_dispatcher.h" | 23 | #include "mir_test_doubles/mock_input_dispatcher.h" |
| 979 | 23 | #include "mir_test/fake_shared.h" | 24 | #include "mir_test/fake_shared.h" |
| 980 | 24 | #include "mir_test/event_matchers.h" | 25 | #include "mir_test/event_matchers.h" |
| 981 | 25 | 26 | ||
| 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 | 26 | 26 | ||
| 987 | 27 | #include "mir/input/input_device.h" | 27 | #include "mir/input/input_device.h" |
| 988 | 28 | #include "mir/input/input_device_info.h" | 28 | #include "mir/input/input_device_info.h" |
| 989 | 29 | #include "mir/events/event_private.h" | ||
| 990 | 29 | #include "mir/dispatch/multiplexing_dispatchable.h" | 30 | #include "mir/dispatch/multiplexing_dispatchable.h" |
| 991 | 30 | #include "mir/dispatch/action_queue.h" | 31 | #include "mir/dispatch/action_queue.h" |
| 992 | 31 | 32 | ||
| 993 | 32 | 33 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 999 | 17 | */ | 17 | */ |
| 1000 | 18 | 18 | ||
| 1001 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 1002 | 20 | |||
| 1003 | 21 | #include "mir/events/event_builders.h" | 19 | #include "mir/events/event_builders.h" |
| 1004 | 22 | 20 | ||
| 1005 | 23 | #include <gtest/gtest.h> | 21 | #include <gtest/gtest.h> |
| 1006 | 24 | 22 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 1012 | 17 | */ | 17 | */ |
| 1013 | 18 | 18 | ||
| 1014 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 1015 | 20 | |||
| 1016 | 21 | #include "src/server/input/event_filter_chain.h" | 19 | #include "src/server/input/event_filter_chain.h" |
| 1017 | 22 | #include "mir_test_doubles/mock_event_filter.h" | 20 | #include "mir_test_doubles/mock_event_filter.h" |
| 1018 | 23 | #include "mir/events/event_builders.h" | 21 | #include "mir/events/event_builders.h" |
| 1019 | 22 | #include "mir/events/event_private.h" | ||
| 1020 | 24 | 23 | ||
| 1021 | 25 | #include <androidfw/Input.h> | 24 | #include <androidfw/Input.h> |
| 1022 | 26 | 25 | ||
| 1023 | 27 | 26 | ||
| 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 | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> | 16 | * Authored by: Robert Carr <robert.carr@canonical.com> |
| 1029 | 17 | */ | 17 | */ |
| 1030 | 18 | 18 | ||
| 1031 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 1032 | 20 | |||
| 1033 | 21 | #include <gtest/gtest.h> | 19 | #include <gtest/gtest.h> |
| 1034 | 22 | 20 | ||
| 1036 | 23 | #include "mir_toolkit/event.h" | 21 | #include "mir/events/event_private.h" |
| 1037 | 24 | #include "mir_toolkit/events/input/input_event.h" | 22 | #include "mir_toolkit/events/input/input_event.h" |
| 1038 | 25 | 23 | ||
| 1039 | 26 | // See: https://bugs.launchpad.net/mir/+bug/1311699 | 24 | // See: https://bugs.launchpad.net/mir/+bug/1311699 |
| 1040 | 27 | 25 | ||
| 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 | 16 | * Authored By: Robert Carr <racarr@canonical.com> | 16 | * Authored By: Robert Carr <racarr@canonical.com> |
| 1046 | 17 | */ | 17 | */ |
| 1047 | 18 | 18 | ||
| 1048 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 1049 | 20 | |||
| 1050 | 21 | #include "src/server/scene/application_session.h" | 19 | #include "src/server/scene/application_session.h" |
| 1051 | 20 | #include "mir/events/event_private.h" | ||
| 1052 | 22 | #include "mir/graphics/buffer.h" | 21 | #include "mir/graphics/buffer.h" |
| 1053 | 23 | #include "mir/scene/surface_creation_parameters.h" | 22 | #include "mir/scene/surface_creation_parameters.h" |
| 1054 | 24 | #include "mir/scene/null_session_listener.h" | 23 | #include "mir/scene/null_session_listener.h" |
| 1055 | 25 | 24 | ||
| 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 | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> |
| 1061 | 17 | */ | 17 | */ |
| 1062 | 18 | 18 | ||
| 1063 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | ||
| 1064 | 20 | 19 | ||
| 1065 | 21 | #include "src/server/scene/basic_surface.h" | 20 | #include "src/server/scene/basic_surface.h" |
| 1066 | 22 | #include "src/server/scene/legacy_surface_change_notification.h" | 21 | #include "src/server/scene/legacy_surface_change_notification.h" |
| 1067 | 23 | 22 | ||
| 1068 | 23 | #include "mir/events/event_private.h" | ||
| 1069 | 24 | #include "mir/frontend/event_sink.h" | 24 | #include "mir/frontend/event_sink.h" |
| 1070 | 25 | #include "mir/geometry/rectangle.h" | 25 | #include "mir/geometry/rectangle.h" |
| 1071 | 26 | #include "mir/geometry/displacement.h" | 26 | #include "mir/geometry/displacement.h" |
| 1072 | 27 | 27 | ||
| 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 | 16 | * Authored by: Thomas Voss <thomas.voss@canonical.com> | 16 | * Authored by: Thomas Voss <thomas.voss@canonical.com> |
| 1078 | 17 | */ | 17 | */ |
| 1079 | 18 | 18 | ||
| 1082 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | 19 | #include "mir/events/event_private.h" |
| 1081 | 20 | |||
| 1083 | 21 | #include "src/server/scene/basic_surface.h" | 20 | #include "src/server/scene/basic_surface.h" |
| 1084 | 22 | #include "src/server/scene/legacy_surface_change_notification.h" | 21 | #include "src/server/scene/legacy_surface_change_notification.h" |
| 1085 | 23 | #include "src/server/report/null_report_factory.h" | 22 | #include "src/server/report/null_report_factory.h" |
| 1086 | 24 | 23 | ||
| 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 | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> | 16 | * Authored by: Alan Griffiths <alan@octopull.co.uk> |
| 1092 | 17 | */ | 17 | */ |
| 1093 | 18 | 18 | ||
| 1096 | 19 | #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER | 19 | #include "mir/events/event_private.h" |
| 1095 | 20 | |||
| 1097 | 21 | #include "src/server/scene/basic_surface.h" | 20 | #include "src/server/scene/basic_surface.h" |
| 1098 | 22 | #include "mir/scene/surface_observer.h" | 21 | #include "mir/scene/surface_observer.h" |
| 1099 | 23 | #include "mir/scene/surface_event_source.h" | 22 | #include "mir/scene/surface_event_source.h" |
https:/