Mir

Merge lp:~robertcarr/mir/reorganize-shared-input-code into lp:~mir-team/mir/trunk

  1. reorganize-shared-input-code
  2. Merge into trunk
Proposed by Robert Carr
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 575
Proposed branch: lp:~robertcarr/mir/reorganize-shared-input-code
Merge into: lp:~mir-team/mir/trunk
Diff against target: 186 lines (+17/-19)
10 files modified
include/shared/mir/input/android/android_input_lexicon.h (+0/-3)
src/client/CMakeLists.txt (+1/-1)
src/client/input/android_input_receiver.cpp (+2/-2)
src/server/CMakeLists.txt (+1/-1)
src/server/input/android/CMakeLists.txt (+0/-1)
src/server/input/android/event_filter_dispatcher_policy.cpp (+1/-2)
src/shared/CMakeLists.txt (+3/-0)
src/shared/input/CMakeLists.txt (+4/-4)
src/shared/input/android_input_lexicon.cpp (+2/-2)
tests/unit-tests/input/android/test_android_input_lexicon.cpp (+3/-3)
To merge this branch: bzr merge lp:~robertcarr/mir/reorganize-shared-input-code
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alan Griffiths Approve
Alexandros Frantzis (community) Approve
Daniel van Vugt Approve
Kevin DuBois (community) Approve
Review via email: mp+157702@code.launchpad.net

Commit message

Reorganize shared input code by removing mirinputandroidtransport library and using mirsharedinput library.

Description of the change

Reorganize shared input code by removing mirinputandroidtransport library and using mirsharedinput library (following the idiom set by graphics and protobuf).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:572
http://jenkins.qa.ubuntu.com/job/mir-ci/331/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/336
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/336/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/143/console

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

review: Approve (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

seems ok

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Looks sane. And doesn't change any shared library dependencies. "shared" in the below context is all about static libraries...

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/130/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/194
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-autolanding/131/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-autolanding-build/./distribution=precise,flavor=amd64/26

review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good. The failure above seems to be a jenkins issue, not related to the code.

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

LGTM

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/shared/mir/input/android/android_input_lexicon.h'
2--- include/shared/mir/input/android/android_input_lexicon.h 2013-04-05 08:53:56 +0000
3+++ include/shared/mir/input/android/android_input_lexicon.h 2013-04-08 17:18:30 +0000
4@@ -35,8 +35,6 @@
5 {
6 namespace android
7 {
8-namespace transport
9-{
10
11 /// The Lexicon translates droidinput event types to MirEvent types prior to
12 /// shell or client handling.
13@@ -49,6 +47,5 @@
14 }
15 }
16 }
17-}
18
19 #endif // MIR_INPUT_ANDROID_INPUT_LEXICON_H_
20
21=== modified file 'src/client/CMakeLists.txt'
22--- src/client/CMakeLists.txt 2013-04-08 02:55:16 +0000
23+++ src/client/CMakeLists.txt 2013-04-08 17:18:30 +0000
24@@ -91,7 +91,7 @@
25 ${PROTOBUF_LIBRARIES}
26
27 mirprotobuf
28- mirinputandroidtransport
29+ mirsharedinput
30
31 ${DRM_LIBRARIES}
32 ${MIR_COMMON_PLATFORM_LIBRARIES}
33
34=== modified file 'src/client/input/android_input_receiver.cpp'
35--- src/client/input/android_input_receiver.cpp 2013-04-03 18:41:09 +0000
36+++ src/client/input/android_input_receiver.cpp 2013-04-08 17:18:30 +0000
37@@ -23,7 +23,7 @@
38 #include <utils/Looper.h>
39
40 namespace mclia = mir::client::input::android;
41-namespace miat = mir::input::android::transport;
42+namespace mia = mir::input::android;
43
44 mclia::InputReceiver::InputReceiver(droidinput::sp<droidinput::InputChannel> const& input_channel)
45 : input_channel(input_channel),
46@@ -74,7 +74,7 @@
47 if(input_consumer->consume(&event_factory, true,
48 -1, &event_sequence_id, &android_event) != droidinput::WOULD_BLOCK)
49 {
50- miat::Lexicon::translate(android_event, ev);
51+ mia::Lexicon::translate(android_event, ev);
52 input_consumer->sendFinishedSignal(event_sequence_id, true);
53 handled_event = true;
54 }
55
56=== modified file 'src/server/CMakeLists.txt'
57--- src/server/CMakeLists.txt 2013-04-08 02:55:16 +0000
58+++ src/server/CMakeLists.txt 2013-04-08 17:18:30 +0000
59@@ -48,7 +48,7 @@
60 mirfrontend
61 mirgraphics
62 mirinput
63- mirinputandroidtransport
64+ mirsharedinput
65 mirsurfaces
66 mirtime
67 )
68
69=== modified file 'src/server/input/android/CMakeLists.txt'
70--- src/server/input/android/CMakeLists.txt 2013-03-25 18:55:29 +0000
71+++ src/server/input/android/CMakeLists.txt 2013-04-08 17:18:30 +0000
72@@ -17,4 +17,3 @@
73 PARENT_SCOPE
74 )
75
76-add_subdirectory(transport)
77
78=== modified file 'src/server/input/android/event_filter_dispatcher_policy.cpp'
79--- src/server/input/android/event_filter_dispatcher_policy.cpp 2013-03-25 18:40:44 +0000
80+++ src/server/input/android/event_filter_dispatcher_policy.cpp 2013-04-08 17:18:30 +0000
81@@ -20,7 +20,6 @@
82
83 namespace mi = mir::input;
84 namespace mia = mi::android;
85-namespace miat = mia::transport;
86
87 mia::EventFilterDispatcherPolicy::EventFilterDispatcherPolicy(std::shared_ptr<mi::EventFilter> const& event_filter) :
88 event_filter(event_filter)
89@@ -30,7 +29,7 @@
90 bool mia::EventFilterDispatcherPolicy::filterInputEvent(const droidinput::InputEvent* input_event, uint32_t /*policy_flags*/)
91 {
92 MirEvent mir_ev;
93- miat::Lexicon::translate(input_event, mir_ev);
94+ mia::Lexicon::translate(input_event, mir_ev);
95
96 if (event_filter->handles(mir_ev))
97 return false; /* Do not pass the event on */
98
99=== removed directory 'src/server/input/android/transport'
100=== modified file 'src/shared/CMakeLists.txt'
101--- src/shared/CMakeLists.txt 2013-03-29 22:30:35 +0000
102+++ src/shared/CMakeLists.txt 2013-04-08 17:18:30 +0000
103@@ -5,6 +5,9 @@
104 if (MIR_PLATFORM STREQUAL "android")
105 add_subdirectory(graphics/android)
106 endif()
107+
108+add_subdirectory(input)
109+
110 set(
111 MIR_COMMON_PLATFORM_LIBRARIES
112 ${MIR_COMMON_PLATFORM_LIBRARIES}
113
114=== added directory 'src/shared/input'
115=== renamed file 'src/server/input/android/transport/CMakeLists.txt' => 'src/shared/input/CMakeLists.txt'
116--- src/server/input/android/transport/CMakeLists.txt 2013-03-25 17:42:27 +0000
117+++ src/shared/input/CMakeLists.txt 2013-04-08 17:18:30 +0000
118@@ -15,17 +15,17 @@
119 # Authored by: Thomas Voss <thomas.voss@canonical.com>
120
121 set(
122- ANDROID_TRANSPORT_SOURCES
123+ ANDROID_SHARED_INPUT_SOURCES
124 ${CMAKE_CURRENT_SOURCE_DIR}/android_input_lexicon.cpp
125 )
126
127 add_library(
128- mirinputandroidtransport STATIC
129- ${ANDROID_TRANSPORT_SOURCES}
130+ mirsharedinput STATIC
131+ ${ANDROID_SHARED_INPUT_SOURCES}
132 )
133
134 target_link_libraries(
135- mirinputandroidtransport
136+ mirsharedinput
137
138 android-input
139 )
140
141=== renamed file 'src/server/input/android/transport/android_input_lexicon.cpp' => 'src/shared/input/android_input_lexicon.cpp'
142--- src/server/input/android/transport/android_input_lexicon.cpp 2013-04-05 09:00:46 +0000
143+++ src/shared/input/android_input_lexicon.cpp 2013-04-08 17:18:30 +0000
144@@ -21,9 +21,9 @@
145
146 #include <androidfw/Input.h>
147
148-namespace miat = mir::input::android::transport;
149+namespace mia = mir::input::android;
150
151-void miat::Lexicon::translate(const droidinput::InputEvent *android_event, MirEvent &mir_event)
152+void mia::Lexicon::translate(const droidinput::InputEvent *android_event, MirEvent &mir_event)
153 {
154 switch(android_event->getType())
155 {
156
157=== modified file 'tests/unit-tests/input/android/test_android_input_lexicon.cpp'
158--- tests/unit-tests/input/android/test_android_input_lexicon.cpp 2013-04-05 09:00:46 +0000
159+++ tests/unit-tests/input/android/test_android_input_lexicon.cpp 2013-04-08 17:18:30 +0000
160@@ -25,7 +25,7 @@
161 #include <gmock/gmock.h>
162
163 namespace mi = mir::input;
164-namespace miat = mir::input::android::transport;
165+namespace mia = mir::input::android;
166
167 TEST(AndroidInputLexicon, translates_key_events)
168 {
169@@ -48,7 +48,7 @@
170 down_time, event_time);
171
172 MirEvent mir_ev;
173- miat::Lexicon::translate(android_key_ev, mir_ev);
174+ mia::Lexicon::translate(android_key_ev, mir_ev);
175
176 // Common event properties
177 EXPECT_EQ(device_id, mir_ev.device_id);
178@@ -121,7 +121,7 @@
179 event_time, pointer_count, &pointer_properties, &pointer_coords);
180
181 MirEvent mir_ev;
182- miat::Lexicon::translate(android_motion_ev, mir_ev);
183+ mia::Lexicon::translate(android_motion_ev, mir_ev);
184
185 // Common event properties
186 EXPECT_EQ(device_id, mir_ev.device_id);

Subscribers

People subscribed via source and target branches