Merge lp:~vanvugt/mir/privatize-input into lp:mir

[Daniel van Vugt]

Privatize as many input classes and headers as possible. Hide those not
presently used by unity-mir or unity-system-compositor from the server SDK.

No ABIs affected.
No APIs affected (I think).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1111
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/86/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2228/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/85/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/86/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

/mir/tests/integration-tests/graphics/android/test_internal_client.cpp:29:40: fatal error: mir/surfaces/surface_stack.h: No such file or directory
 #include "mir/surfaces/surface_stack.h"

[Alexandros Frantzis (afrantzis)]

See https://code.launchpad.net/~vanvugt/mir/privatize-input-Surface/+merge/189036/comments/432885 for my take on the approach in general.

[Daniel d'Andrada (dandrader)]

Makes sense to me.
Alexandros has a point but traditionally the project/include subdir is used to define the public headers. And defining the public headers, IMHO, is more important than cross-component inclusions. Which is not a hard boundary as the public API is.

review: Approve

[Alan Griffiths (alan-griffiths)]

FTBFS

Most of the remaining mess comes from splitting the input component across src/input, src/input/android and bzr merge lp:~vanvugt/mir/privatize-input (which is pre-existing). OTOH I'd prefer to put src/server/input into the search path as opposed to making it easy to include private parts of other components.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> FTBFS
>
> Most of the remaining mess comes from splitting the input component across
> src/input, src/input/android and bzr merge lp:~vanvugt/mir/privatize-input

That should be "3rd_party/android-input/..."

> (which is pre-existing). OTOH I'd prefer to put src/server/input into the
> search path as opposed to making it easy to include private parts of other
> components.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1113
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/118/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/mir-android-saucy-i386-build/2267
    SUCCESS: http://10.97.0.26:8080/job/mir-clang-saucy-amd64-build/2152
    SUCCESS: http://10.97.0.26:8080/job/mir-team-mir-development-branch-saucy-amd64-ci/115
        deb: http://10.97.0.26:8080/job/mir-team-mir-development-branch-saucy-amd64-ci/115/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/118/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

There's no "Work in progress" going on or planned as yet. Although I fully expect it to be deferred to next cycle now. So more realistically you could say "Resubmit" post-saucy.

[Robert Carr (robertcarr)]

I share some concern with this approach. Notably I think currently we have this hierarchy:

Public headers
Component public
Component private

We currently express public headers and component public in the same way (set in include/).

This approach collapses the notion of component public/private and I think we lose some ability to express organization with this approach.

On the other hand, I think these headers will have to move again as part of the big ABI rework, and not installing them for now certainly seems an improvement.

review: Approve

Unmerged revisions

1113. By Daniel van Vugt on 2013-10-07

Fix Android build failure.

1112. By Daniel van Vugt on 2013-10-07

Merge latest parent (and dev) branch. Resolve a conflict.

1111. By Daniel van Vugt on 2013-10-03

Resolve spurious conflict status.

1110. By Daniel van Vugt on 2013-10-03

Privatize additional headers and classes which include the now privatized
input headers.

1109. By Daniel van Vugt on 2013-10-03

Privatize as much input headers as possible (those not used by shells).

1108. By Daniel van Vugt on 2013-10-03

Privatize input::Surface. It's not used in any shells right now, and
seemingly shouldn't be.

=== modified file '3rd_party/android-input/android/CMakeLists.txt'
--- 3rd_party/android-input/android/CMakeLists.txt	2013-05-30 19:24:29 +0000
+++ 3rd_party/android-input/android/CMakeLists.txt	2013-10-07 04:07:10 +0000
@@ -7,6 +7,7 @@
   system/extras/ext4_utils
 
   ${PROJECT_SOURCE_DIR}/include/server
+  ${PROJECT_SOURCE_DIR}/src/server
 )
 
 add_definitions(
 
=== modified file '3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp	2013-10-03 05:12:59 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp	2013-10-07 04:07:10 +0000
@@ -23,7 +23,7 @@
 #define acquire_wake_lock(lock, id) {}
 #define release_wake_lock(id) {}
 
-#include "mir/input/input_report.h"
+#include "input/input_report.h"
 
 #include <cutils/properties.h>
 #include <std/Log.h>
 
=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2013-08-28 03:41:48 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2013-10-07 04:07:10 +0000
@@ -45,7 +45,7 @@
 
 #include "InputDispatcher.h"
 
-#include "mir/input/input_report.h"
+#include "input/input_report.h"
 
 #include <cutils/log.h>
 #include <android/keycodes.h>
 
=== removed directory 'include/server/mir/input/android'
=== modified file 'include/test/mir_test/fake_event_hub_input_configuration.h'
--- include/test/mir_test/fake_event_hub_input_configuration.h	2013-08-30 07:47:16 +0000
+++ include/test/mir_test/fake_event_hub_input_configuration.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_FAKE_EVENT_HUB_INPUT_CONFIGURATION_H_
 #define MIR_TEST_DOUBLES_FAKE_EVENT_HUB_INPUT_CONFIGURATION_H_
 
-#include "mir/input/android/default_android_input_configuration.h"
+#include "input/android/default_android_input_configuration.h"
 
 #include <utils/StrongPointer.h>
 
 
=== modified file 'include/test/mir_test_doubles/mock_input_manager.h'
--- include/test/mir_test_doubles/mock_input_manager.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/mock_input_manager.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_INPUT_MANAGER_H_
 #define MIR_TEST_DOUBLES_MOCK_INPUT_MANAGER_H_
 
-#include "mir/input/input_manager.h"
+#include "input/input_manager.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
=== modified file 'include/test/mir_test_doubles/mock_input_region.h'
--- include/test/mir_test_doubles/mock_input_region.h	2013-07-19 14:12:57 +0000
+++ include/test/mir_test_doubles/mock_input_region.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_INPUT_REGION_H_
 #define MIR_TEST_DOUBLES_MOCK_INPUT_REGION_H_
 
-#include "mir/input/input_region.h"
+#include "input/input_region.h"
 #include "mir/geometry/point.h"
 #include "mir/geometry/rectangle.h"
 
 
=== modified file 'include/test/mir_test_doubles/stub_input_channel.h'
--- include/test/mir_test_doubles/stub_input_channel.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/stub_input_channel.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_STUB_INPUT_CHANNEL_H_
 #define MIR_TEST_DOUBLES_STUB_INPUT_CHANNEL_H_
 
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 
 namespace mir
 {
 
=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-10-05 05:16:50 +0000
+++ src/server/default_server_configuration.cpp	2013-10-07 04:07:10 +0000
@@ -59,29 +59,29 @@
 #include "mir/graphics/display_buffer.h"
 #include "mir/graphics/default_display_configuration_policy.h"
 #include "mir/input/cursor_listener.h"
-#include "mir/input/nested_input_configuration.h"
-#include "mir/input/null_input_configuration.h"
-#include "mir/input/null_input_report.h"
-#include "mir/input/display_input_region.h"
-#include "mir/input/event_filter_chain.h"
-#include "mir/input/nested_input_relay.h"
-#include "mir/input/vt_filter.h"
-#include "mir/input/android/default_android_input_configuration.h"
-#include "mir/input/input_manager.h"
+#include "input/nested_input_configuration.h"
+#include "input/null_input_configuration.h"
+#include "input/null_input_report.h"
+#include "input/display_input_region.h"
+#include "input/event_filter_chain.h"
+#include "input/nested_input_relay.h"
+#include "input/vt_filter.h"
+#include "input/android/default_android_input_configuration.h"
+#include "input/input_manager.h"
 #include "mir/logging/connector_report.h"
 #include "mir/logging/logger.h"
-#include "mir/logging/input_report.h"
+#include "logging/input_report.h"
 #include "mir/logging/dumb_console_logger.h"
 #include "mir/logging/glog_logger.h"
 #include "mir/logging/session_mediator_report.h"
 #include "mir/logging/message_processor_report.h"
 #include "mir/logging/display_report.h"
 #include "mir/lttng/message_processor_report.h"
-#include "mir/lttng/input_report.h"
+#include "lttng/input_report.h"
 #include "mir/shell/surface_source.h"
 #include "mir/shell/mediating_display_changer.h"
 #include "mir/surfaces/surface_allocator.h"
-#include "mir/surfaces/surface_stack.h"
+#include "surfaces/surface_stack.h"
 #include "mir/surfaces/surface_controller.h"
 #include "mir/time/high_resolution_clock.h"
 #include "mir/geometry/rectangles.h"
 
=== modified file 'src/server/display_server.cpp'
--- src/server/display_server.cpp	2013-09-24 11:43:27 +0000
+++ src/server/display_server.cpp	2013-10-07 04:07:10 +0000
@@ -27,7 +27,7 @@
 #include "mir/compositor/compositor.h"
 #include "mir/frontend/connector.h"
 #include "mir/graphics/display.h"
-#include "mir/input/input_manager.h"
+#include "input/input_manager.h"
 
 #include <stdexcept>
 
 
=== modified file 'src/server/input/android/android_input_application_handle.cpp'
--- src/server/input/android/android_input_application_handle.cpp	2013-10-07 04:07:09 +0000
+++ src/server/input/android/android_input_application_handle.cpp	2013-10-07 04:07:10 +0000
@@ -18,7 +18,7 @@
 
 #include "android_input_application_handle.h"
 
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 #include "input/surface.h"
 
 #include <limits.h>
 
=== modified file 'src/server/input/android/android_input_channel.h'
--- src/server/input/android/android_input_channel.h	2013-08-28 03:41:48 +0000
+++ src/server/input/android/android_input_channel.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_INPUT_ANDROID_INPUT_CHANNEL_H_
 #define MIR_INPUT_ANDROID_INPUT_CHANNEL_H_
 
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 
 #include <utils/StrongPointer.h>
 
 
=== modified file 'src/server/input/android/android_input_reader_policy.cpp'
--- src/server/input/android/android_input_reader_policy.cpp	2013-08-28 03:41:48 +0000
+++ src/server/input/android/android_input_reader_policy.cpp	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #include "android_input_reader_policy.h"
 #include "android_pointer_controller.h"
 
-#include "mir/input/input_region.h"
+#include "input/input_region.h"
 #include "mir/geometry/rectangle.h"
 
 namespace mi = mir::input;
 
=== modified file 'src/server/input/android/android_input_target_enumerator.cpp'
--- src/server/input/android/android_input_target_enumerator.cpp	2013-08-28 03:41:48 +0000
+++ src/server/input/android/android_input_target_enumerator.cpp	2013-10-07 04:07:10 +0000
@@ -20,7 +20,7 @@
 
 #include "android_window_handle_repository.h"
 
-#include "mir/input/input_targets.h"
+#include "input/input_targets.h"
 
 #include <InputWindow.h>
 
 
=== modified file 'src/server/input/android/android_input_window_handle.cpp'
--- src/server/input/android/android_input_window_handle.cpp	2013-10-07 04:07:09 +0000
+++ src/server/input/android/android_input_window_handle.cpp	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #include "android_input_window_handle.h"
 #include "android_input_application_handle.h"
 
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 #include "input/surface.h"
 
 #include <androidfw/InputTransport.h>
 
=== modified file 'src/server/input/android/android_pointer_controller.cpp'
--- src/server/input/android/android_pointer_controller.cpp	2013-08-28 03:41:48 +0000
+++ src/server/input/android/android_pointer_controller.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "mir/input/input_region.h"
+#include "input/input_region.h"
 #include "mir/geometry/rectangle.h"
 #include "mir/geometry/point.h"
 
 
=== modified file 'src/server/input/android/default_android_input_configuration.cpp'
--- src/server/input/android/default_android_input_configuration.cpp	2013-09-10 16:42:04 +0000
+++ src/server/input/android/default_android_input_configuration.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "mir/input/android/default_android_input_configuration.h"
+#include "input/android/default_android_input_configuration.h"
 #include "event_filter_dispatcher_policy.h"
 #include "android_input_reader_policy.h"
 #include "android_input_thread.h"
 
=== renamed file 'include/server/mir/input/android/default_android_input_configuration.h' => 'src/server/input/android/default_android_input_configuration.h'
--- include/server/mir/input/android/default_android_input_configuration.h	2013-09-10 16:42:04 +0000
+++ src/server/input/android/default_android_input_configuration.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_INPUT_ANDROID_DEFAULT_ANDROID_INPUT_CONFIGURATION_H_
 #define MIR_INPUT_ANDROID_DEFAULT_ANDROID_INPUT_CONFIGURATION_H_
 
-#include "mir/input/android/dispatcher_input_configuration.h"
+#include "input/android/dispatcher_input_configuration.h"
 
 namespace mir
 {
 
=== modified file 'src/server/input/android/dispatcher_input_configuration.cpp'
--- src/server/input/android/dispatcher_input_configuration.cpp	2013-09-10 16:42:04 +0000
+++ src/server/input/android/dispatcher_input_configuration.cpp	2013-10-07 04:07:10 +0000
@@ -17,7 +17,7 @@
  */
 
 
-#include "mir/input/android/dispatcher_input_configuration.h"
+#include "input/android/dispatcher_input_configuration.h"
 #include "event_filter_dispatcher_policy.h"
 #include "android_input_thread.h"
 #include "android_input_registrar.h"
 
=== renamed file 'include/server/mir/input/android/dispatcher_input_configuration.h' => 'src/server/input/android/dispatcher_input_configuration.h'
--- include/server/mir/input/android/dispatcher_input_configuration.h	2013-09-10 16:42:04 +0000
+++ src/server/input/android/dispatcher_input_configuration.h	2013-10-07 04:07:10 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_INPUT_ANDROID_DISPATCHER_INPUT_CONFIGURATION_H_
 #define MIR_INPUT_ANDROID_DISPATCHER_INPUT_CONFIGURATION_H_
 
-#include "mir/input/input_configuration.h"
+#include "input/input_configuration.h"
 
 #include "mir/cached_ptr.h"
 
 
=== modified file 'src/server/input/android/input_dispatcher_manager.h'
--- src/server/input/android/input_dispatcher_manager.h	2013-09-06 10:06:15 +0000
+++ src/server/input/android/input_dispatcher_manager.h	2013-10-07 04:07:10 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_INPUT_ANDROID_INPUT_DISPATCHER_MANAGER_H_
 #define MIR_INPUT_ANDROID_INPUT_DISPATCHER_MANAGER_H_
 
-#include "mir/input/input_manager.h"
+#include "input/input_manager.h"
 
 #include <utils/StrongPointer.h>
 
 
=== modified file 'src/server/input/display_input_region.cpp'
--- src/server/input/display_input_region.cpp	2013-07-19 14:12:57 +0000
+++ src/server/input/display_input_region.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "mir/input/display_input_region.h"
+#include "input/display_input_region.h"
 #include "mir/graphics/display.h"
 #include "mir/graphics/display_buffer.h"
 
 
=== renamed file 'include/server/mir/input/display_input_region.h' => 'src/server/input/display_input_region.h'
--- include/server/mir/input/display_input_region.h	2013-07-19 14:12:57 +0000
+++ src/server/input/display_input_region.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_INPUT_DISPLAY_INPUT_REGION_H_
 #define MIR_INPUT_DISPLAY_INPUT_REGION_H_
 
-#include "mir/input/input_region.h"
+#include "input/input_region.h"
 
 #include <memory>
 
 
=== modified file 'src/server/input/event_filter_chain.cpp'
--- src/server/input/event_filter_chain.cpp	2013-08-28 03:41:48 +0000
+++ src/server/input/event_filter_chain.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "mir/input/event_filter_chain.h"
+#include "input/event_filter_chain.h"
 
 namespace mi = mir::input;
 
 
=== renamed file 'include/server/mir/input/event_filter_chain.h' => 'src/server/input/event_filter_chain.h'
=== renamed file 'include/server/mir/input/input_channel.h' => 'src/server/input/input_channel.h'
=== renamed file 'include/server/mir/input/input_channel_factory.h' => 'src/server/input/input_channel_factory.h'
=== renamed file 'include/server/mir/input/input_configuration.h' => 'src/server/input/input_configuration.h'
=== renamed file 'include/server/mir/input/input_manager.h' => 'src/server/input/input_manager.h'
--- include/server/mir/input/input_manager.h	2013-08-28 03:41:48 +0000
+++ src/server/input/input_manager.h	2013-10-07 04:07:10 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_INPUT_INPUT_MANAGER_H_
 #define MIR_INPUT_INPUT_MANAGER_H_
 
-#include "mir/input/input_channel_factory.h"
+#include "input/input_channel_factory.h"
 
 #include <memory>
 
 
=== renamed file 'include/server/mir/input/input_region.h' => 'src/server/input/input_region.h'
=== renamed file 'include/server/mir/input/input_report.h' => 'src/server/input/input_report.h'
=== renamed file 'include/server/mir/input/input_targets.h' => 'src/server/input/input_targets.h'
--- include/server/mir/input/input_targets.h	2013-08-28 03:41:48 +0000
+++ src/server/input/input_targets.h	2013-10-07 04:07:10 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_INPUT_INPUT_TARGETS_H_
 #define MIR_INPUT_INPUT_TARGETS_H_
 
-#include "mir/input/input_channel_factory.h"
+#include "input/input_channel_factory.h"
 
 #include <memory>
 
 
=== modified file 'src/server/input/nested_input_configuration.cpp'
--- src/server/input/nested_input_configuration.cpp	2013-09-10 16:42:04 +0000
+++ src/server/input/nested_input_configuration.cpp	2013-10-07 04:07:10 +0000
@@ -16,8 +16,8 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/input/nested_input_configuration.h"
-#include "mir/input/nested_input_relay.h"
+#include "input/nested_input_configuration.h"
+#include "input/nested_input_relay.h"
 
 #include <InputDispatcher.h>
 
 
=== renamed file 'include/server/mir/input/nested_input_configuration.h' => 'src/server/input/nested_input_configuration.h'
--- include/server/mir/input/nested_input_configuration.h	2013-09-10 16:42:04 +0000
+++ src/server/input/nested_input_configuration.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_INPUT_NESTED_INPUT_CONFIGURATION_H_
 #define MIR_INPUT_NESTED_INPUT_CONFIGURATION_H_
 
-#include "mir/input/android/dispatcher_input_configuration.h"
+#include "input/android/dispatcher_input_configuration.h"
 
 namespace mir
 {
 
=== modified file 'src/server/input/nested_input_relay.cpp'
--- src/server/input/nested_input_relay.cpp	2013-09-10 11:30:22 +0000
+++ src/server/input/nested_input_relay.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/input/nested_input_relay.h"
+#include "input/nested_input_relay.h"
 
 #include <InputDispatcher.h>
 
 
=== renamed file 'include/server/mir/input/nested_input_relay.h' => 'src/server/input/nested_input_relay.h'
=== modified file 'src/server/input/null_input_configuration.cpp'
--- src/server/input/null_input_configuration.cpp	2013-08-28 03:41:48 +0000
+++ src/server/input/null_input_configuration.cpp	2013-10-07 04:07:10 +0000
@@ -16,11 +16,11 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "mir/input/null_input_configuration.h"
+#include "input/null_input_configuration.h"
 
 #include "mir/surfaces/input_registrar.h"
 #include "mir/shell/input_targeter.h"
-#include "mir/input/input_manager.h"
+#include "input/input_manager.h"
 
 namespace mi = mir::input;
 namespace ms = mir::surfaces;
 
=== renamed file 'include/server/mir/input/null_input_configuration.h' => 'src/server/input/null_input_configuration.h'
--- include/server/mir/input/null_input_configuration.h	2013-05-28 13:31:27 +0000
+++ src/server/input/null_input_configuration.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_INPUT_NULL_INPUT_CONFIGURATION_H_
 #define MIR_INPUT_NULL_INPUT_CONFIGURATION_H_
 
-#include "mir/input/input_configuration.h"
+#include "input/input_configuration.h"
 
 namespace mir
 {
 
=== modified file 'src/server/input/null_input_report.cpp'
--- src/server/input/null_input_report.cpp	2013-05-28 17:15:21 +0000
+++ src/server/input/null_input_report.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "mir/input/null_input_report.h"
+#include "input/null_input_report.h"
 
 namespace mi = mir::input;
 
 
=== renamed file 'include/server/mir/input/null_input_report.h' => 'src/server/input/null_input_report.h'
--- include/server/mir/input/null_input_report.h	2013-05-29 14:11:56 +0000
+++ src/server/input/null_input_report.h	2013-10-07 04:07:10 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_INPUT_NULL_INPUT_REPORT_H_
 #define MIR_INPUT_NULL_INPUT_REPORT_H_
 
-#include "mir/input/input_report.h"
+#include "input/input_report.h"
 
 namespace mir
 {
 
=== modified file 'src/server/input/vt_filter.cpp'
--- src/server/input/vt_filter.cpp	2013-08-30 07:47:16 +0000
+++ src/server/input/vt_filter.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Ancell <[e-mail]>
  */
 
-#include "mir/input/vt_filter.h"
+#include "input/vt_filter.h"
 
 #include <linux/input.h>
 #include <linux/vt.h>
 
=== renamed file 'include/server/mir/input/vt_filter.h' => 'src/server/input/vt_filter.h'
=== modified file 'src/server/logging/input_report.cpp'
--- src/server/logging/input_report.cpp	2013-05-28 17:55:26 +0000
+++ src/server/logging/input_report.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/logging/input_report.h"
+#include "logging/input_report.h"
 #include "mir/logging/logger.h"
 
 #include "std/MirLog.h"
 
=== renamed file 'include/server/mir/logging/input_report.h' => 'src/server/logging/input_report.h'
--- include/server/mir/logging/input_report.h	2013-05-29 14:11:56 +0000
+++ src/server/logging/input_report.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_LOGGING_INPUT_REPORT_H_
 #define MIR_LOGGING_INPUT_REPORT_H_
 
-#include "mir/input/input_report.h"
+#include "input/input_report.h"
 
 #include <memory>
 
 
=== modified file 'src/server/lttng/input_report.cpp'
--- src/server/lttng/input_report.cpp	2013-06-03 12:15:44 +0000
+++ src/server/lttng/input_report.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/lttng/input_report.h"
+#include "lttng/input_report.h"
 #include "mir/lttng/mir_tracepoint.h"
 
 #define TRACEPOINT_DEFINE
 
=== renamed file 'include/server/mir/lttng/input_report.h' => 'src/server/lttng/input_report.h'
--- include/server/mir/lttng/input_report.h	2013-06-03 12:15:44 +0000
+++ src/server/lttng/input_report.h	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_LTTNG_INPUT_REPORT_H_
 #define MIR_LTTNG_INPUT_REPORT_H_
 
-#include "mir/input/input_report.h"
+#include "input/input_report.h"
 #include "mir/lttng/server_tracepoint_provider.h"
 
 namespace mir
 
=== modified file 'src/server/shell/surface.cpp'
--- src/server/shell/surface.cpp	2013-08-28 03:41:48 +0000
+++ src/server/shell/surface.cpp	2013-10-07 04:07:10 +0000
@@ -21,7 +21,7 @@
 #include "mir/shell/surface_configurator.h"
 #include "mir/shell/surface_controller.h"
 #include "mir/shell/input_targeter.h"
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 #include "mir/frontend/event_sink.h"
 
 #include "mir_toolkit/event.h"
 
=== modified file 'src/server/shell/surface_source.cpp'
--- src/server/shell/surface_source.cpp	2013-08-28 03:41:48 +0000
+++ src/server/shell/surface_source.cpp	2013-10-07 04:07:10 +0000
@@ -20,7 +20,7 @@
 #include "mir/shell/surface_builder.h"
 #include "mir/shell/surface.h"
 #include "mir/frontend/surface.h"
-#include "mir/input/input_channel_factory.h"
+#include "input/input_channel_factory.h"
 
 #include <cassert>
 
 
=== modified file 'src/server/surfaces/surface.cpp'
--- src/server/surfaces/surface.cpp	2013-10-03 06:01:11 +0000
+++ src/server/surfaces/surface.cpp	2013-10-07 04:07:10 +0000
@@ -21,7 +21,7 @@
 #include "mir/surfaces/surface.h"
 #include "surface_state.h"
 #include "mir/surfaces/buffer_stream.h"
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 #include "mir/graphics/buffer.h"
 
 #include <boost/throw_exception.hpp>
 
=== modified file 'src/server/surfaces/surface_allocator.cpp'
--- src/server/surfaces/surface_allocator.cpp	2013-10-03 03:44:08 +0000
+++ src/server/surfaces/surface_allocator.cpp	2013-10-07 04:07:10 +0000
@@ -19,7 +19,7 @@
 #include "mir/surfaces/surface_allocator.h"
 #include "mir/surfaces/buffer_stream_factory.h"
 #include "mir/surfaces/buffer_stream.h"
-#include "mir/input/input_channel_factory.h"
+#include "input/input_channel_factory.h"
 #include "surface_data.h"
 #include "mir/surfaces/surface.h"
 
 
=== modified file 'src/server/surfaces/surface_stack.cpp'
--- src/server/surfaces/surface_stack.cpp	2013-10-03 06:01:11 +0000
+++ src/server/surfaces/surface_stack.cpp	2013-10-07 04:07:10 +0000
@@ -23,11 +23,11 @@
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/surfaces/surface.h"
 #include "surface_state.h"
-#include "mir/surfaces/surface_stack.h"
+#include "surface_stack.h"
 #include "mir/surfaces/surface_factory.h"
 #include "mir/surfaces/buffer_stream.h"
 #include "mir/surfaces/input_registrar.h"
-#include "mir/input/input_channel_factory.h"
+#include "input/input_channel.h"
 
 #include <boost/throw_exception.hpp>
 
 
=== renamed file 'include/server/mir/surfaces/surface_stack.h' => 'src/server/surfaces/surface_stack.h'
--- include/server/mir/surfaces/surface_stack.h	2013-08-28 03:41:48 +0000
+++ src/server/surfaces/surface_stack.h	2013-10-07 04:07:10 +0000
@@ -19,11 +19,11 @@
 #ifndef MIR_SURFACES_SURFACESTACK_H_
 #define MIR_SURFACES_SURFACESTACK_H_
 
-#include "surface_stack_model.h"
+#include "mir/surfaces/surface_stack_model.h"
 
 #include "mir/compositor/scene.h"
 #include "mir/surfaces/depth_id.h"
-#include "mir/input/input_targets.h"
+#include "input/input_targets.h"
 
 #include <memory>
 #include <vector>
 
=== modified file 'tests/integration-tests/graphics/android/test_internal_client.cpp'
--- tests/integration-tests/graphics/android/test_internal_client.cpp	2013-08-28 03:41:48 +0000
+++ tests/integration-tests/graphics/android/test_internal_client.cpp	2013-10-07 04:07:10 +0000
@@ -26,14 +26,14 @@
 #include "mir/graphics/platform.h"
 #include "mir/graphics/internal_client.h"
 #include "mir/graphics/internal_surface.h"
-#include "mir/surfaces/surface_stack.h"
+#include "surfaces/surface_stack.h"
 #include "mir/surfaces/surface_controller.h"
 #include "mir/surfaces/surface_allocator.h"
 #include "mir/shell/surface_source.h"
 #include "mir/shell/surface.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/frontend/surface_id.h"
-#include "mir/input/input_channel_factory.h"
+#include "input/input_channel_factory.h"
 #include "mir/options/program_option.h"
 
 #include "mir_test_doubles/stub_input_registrar.h"
 
=== modified file 'tests/integration-tests/input/android/test_android_cursor_listener.cpp'
--- tests/integration-tests/input/android/test_android_cursor_listener.cpp	2013-08-30 07:47:16 +0000
+++ tests/integration-tests/input/android/test_android_cursor_listener.cpp	2013-10-07 04:07:10 +0000
@@ -18,12 +18,12 @@
  */
 
 #include "src/server/input/android/android_input_manager.h"
-#include "mir/input/android/default_android_input_configuration.h"
+#include "input/android/default_android_input_configuration.h"
 #include "mir/input/event_filter.h"
 #include "mir/input/cursor_listener.h"
-#include "mir/input/input_targets.h"
-#include "mir/input/null_input_report.h"
-#include "mir/input/input_region.h"
+#include "input/input_targets.h"
+#include "input/null_input_report.h"
+#include "input/input_region.h"
 #include "mir/geometry/rectangle.h"
 
 #include "mir_test/fake_shared.h"
 
=== modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp'
--- tests/integration-tests/input/android/test_android_input_manager.cpp	2013-08-28 03:41:48 +0000
+++ tests/integration-tests/input/android/test_android_input_manager.cpp	2013-10-07 04:07:10 +0000
@@ -18,10 +18,10 @@
  */
 
 #include "mir/input/event_filter.h"
-#include "mir/input/input_targets.h"
-#include "mir/input/input_region.h"
+#include "input/input_targets.h"
+#include "input/input_region.h"
 #include "mir/shell/surface_creation_parameters.h"
-#include "mir/input/null_input_report.h"
+#include "input/null_input_report.h"
 #include "mir/geometry/point.h"
 #include "mir/geometry/rectangle.h"
 
 
=== modified file 'tests/integration-tests/shell/test_session.cpp'
--- tests/integration-tests/shell/test_session.cpp	2013-09-24 16:22:46 +0000
+++ tests/integration-tests/shell/test_session.cpp	2013-10-07 04:07:10 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "mir/default_server_configuration.h"
-#include "mir/input/null_input_configuration.h"
+#include "input/null_input_configuration.h"
 #include "mir/graphics/graphic_buffer_allocator.h"
 #include "mir/compositor/compositor.h"
 #include "mir/shell/application_session.h"
 
=== modified file 'tests/mir_test_framework/input_testing_server_options.cpp'
--- tests/mir_test_framework/input_testing_server_options.cpp	2013-10-07 04:07:09 +0000
+++ tests/mir_test_framework/input_testing_server_options.cpp	2013-10-07 04:07:10 +0000
@@ -18,7 +18,7 @@
 
 #include "mir_test_framework/input_testing_server_configuration.h"
 
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 #include "mir/surfaces/input_registrar.h"
 #include "input/surface.h"
 #include "mir/shell/surface_creation_parameters.h"
 
=== modified file 'tests/mir_test_framework/testing_server_options.cpp'
--- tests/mir_test_framework/testing_server_options.cpp	2013-09-24 10:25:41 +0000
+++ tests/mir_test_framework/testing_server_options.cpp	2013-10-07 04:07:10 +0000
@@ -25,9 +25,9 @@
 #include "mir/graphics/buffer_properties.h"
 #include "mir/graphics/buffer_ipc_packer.h"
 #include "mir/graphics/graphic_buffer_allocator.h"
-#include "mir/input/input_channel.h"
-#include "mir/input/input_manager.h"
-#include "mir/input/null_input_configuration.h"
+#include "input/input_channel.h"
+#include "input/input_manager.h"
+#include "input/null_input_configuration.h"
 
 #include "mir_test_doubles/stub_buffer.h"
 #include "mir_test_doubles/stub_surface_builder.h"
 
=== modified file 'tests/unit-tests/android_input/input_reader.cpp'
--- tests/unit-tests/android_input/input_reader.cpp	2013-10-01 17:29:49 +0000
+++ tests/unit-tests/android_input/input_reader.cpp	2013-10-07 04:07:10 +0000
@@ -25,7 +25,7 @@
 #include <math.h>
 
 #include <mir/logging/logger.h>
-#include <mir/logging/input_report.h>
+#include <logging/input_report.h>
 #include <mir_test/fake_event_hub.h>
 
 namespace ml  = mir::logging;
 
=== modified file 'tests/unit-tests/input/android/test_android_input_application_handle.cpp'
--- tests/unit-tests/input/android/test_android_input_application_handle.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/input/android/test_android_input_application_handle.cpp	2013-10-07 04:07:10 +0000
@@ -18,7 +18,7 @@
 
 #include "src/server/input/android/android_input_application_handle.h"
 
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 
 #include "mir_test_doubles/mock_input_surface.h"
 
 
=== modified file 'tests/unit-tests/input/android/test_android_input_manager.cpp'
--- tests/unit-tests/input/android/test_android_input_manager.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/input/android/test_android_input_manager.cpp	2013-10-07 04:07:10 +0000
@@ -20,7 +20,7 @@
 #include "src/server/input/android/android_input_thread.h"
 #include "src/server/input/android/android_input_constants.h"
 
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 
 #include "mir_test/fake_shared.h"
 #include "mir_test_doubles/mock_input_dispatcher.h"
 
=== modified file 'tests/unit-tests/input/android/test_android_input_target_enumerator.cpp'
--- tests/unit-tests/input/android/test_android_input_target_enumerator.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/input/android/test_android_input_target_enumerator.cpp	2013-10-07 04:07:10 +0000
@@ -18,8 +18,8 @@
 
 #include "src/server/input/android/android_input_target_enumerator.h"
 
-#include "mir/input/input_channel.h"
-#include "mir/input/input_targets.h"
+#include "input/input_channel.h"
+#include "input/input_targets.h"
 
 #include "mir_test/fake_shared.h"
 #include "mir_test_doubles/stub_input_channel.h"
 
=== modified file 'tests/unit-tests/input/android/test_android_input_targeter.cpp'
--- tests/unit-tests/input/android/test_android_input_targeter.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/input/android/test_android_input_targeter.cpp	2013-10-07 04:07:10 +0000
@@ -20,7 +20,7 @@
 #include "src/server/input/android/android_input_registrar.h"
 #include "src/server/input/android/android_window_handle_repository.h"
 
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 
 #include "mir_test_doubles/mock_input_dispatcher.h"
 #include "mir_test_doubles/stub_input_channel.h"
 
=== modified file 'tests/unit-tests/input/android/test_android_input_window_handle.cpp'
--- tests/unit-tests/input/android/test_android_input_window_handle.cpp	2013-09-24 19:37:42 +0000
+++ tests/unit-tests/input/android/test_android_input_window_handle.cpp	2013-10-07 04:07:10 +0000
@@ -20,7 +20,7 @@
 
 #include "mir/frontend/surface.h"
 #include "mir/geometry/size.h"
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 
 #include "mir_test/fake_shared.h"
 #include "mir_test_doubles/mock_input_surface.h"
 
=== modified file 'tests/unit-tests/input/test_display_input_region.cpp'
--- tests/unit-tests/input/test_display_input_region.cpp	2013-07-19 14:12:57 +0000
+++ tests/unit-tests/input/test_display_input_region.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "mir/input/display_input_region.h"
+#include "input/display_input_region.h"
 
 #include "mir_test_doubles/null_display.h"
 #include "mir_test_doubles/stub_display_buffer.h"
 
=== modified file 'tests/unit-tests/input/test_event_filter_chain.cpp'
--- tests/unit-tests/input/test_event_filter_chain.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/input/test_event_filter_chain.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "mir/input/event_filter_chain.h"
+#include "input/event_filter_chain.h"
 #include "mir_test_doubles/mock_event_filter.h"
 
 #include <androidfw/Input.h>
 
=== modified file 'tests/unit-tests/logging/test_legacy_input_report.cpp'
--- tests/unit-tests/logging/test_legacy_input_report.cpp	2013-09-24 19:24:35 +0000
+++ tests/unit-tests/logging/test_legacy_input_report.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/logging/input_report.h"
+#include "logging/input_report.h"
 #include "mir/logging/logger.h"
 
 #include <std/Log.h>
 
=== modified file 'tests/unit-tests/surfaces/test_surface.cpp'
--- tests/unit-tests/surfaces/test_surface.cpp	2013-08-29 09:20:06 +0000
+++ tests/unit-tests/surfaces/test_surface.cpp	2013-10-07 04:07:10 +0000
@@ -18,7 +18,7 @@
 
 #include "mir/surfaces/surface.h"
 #include "mir/shell/surface_creation_parameters.h"
-#include "mir/input/input_channel.h"
+#include "input/input_channel.h"
 
 #include "mir_test_doubles/mock_buffer_stream.h"
 #include "mir_test_doubles/mock_surface_state.h"
 
=== modified file 'tests/unit-tests/surfaces/test_surface_stack.cpp'
--- tests/unit-tests/surfaces/test_surface_stack.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/surfaces/test_surface_stack.cpp	2013-10-07 04:07:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Thomas Voss <[e-mail]>
  */
 
-#include "mir/surfaces/surface_stack.h"
+#include "surfaces/surface_stack.h"
 #include "mir/surfaces/surface_factory.h"
 #include "mir/compositor/buffer_stream_surfaces.h"
 #include "mir/surfaces/buffer_stream_factory.h"
@@ -25,12 +25,11 @@
 #include "mir/compositor/scene.h"
 #include "mir/geometry/rectangle.h"
 #include "mir/shell/surface_creation_parameters.h"
-#include "mir/surfaces/surface_stack.h"
 #include "mir/compositor/renderer.h"
 #include "mir/compositor/compositing_criteria.h"
 #include "mir/surfaces/surface.h"
-#include "mir/input/input_channel_factory.h"
-#include "mir/input/input_channel.h"
+#include "input/input_channel_factory.h"
+#include "input/input_channel.h"
 #include "mir_test_doubles/mock_surface_renderer.h"
 #include "mir_test_doubles/mock_buffer_stream.h"
 #include "mir_test_doubles/stub_input_registrar.h"