Clean up symbols

Move `enable_mouse_keys_opt` to the 2.20 stanza
Move `AccessibilityManager::*` and related symbols to the 2.20 stanza
Add symbols for `InputEventTransformer`

src/platform/symbols.map

@@ -123,7 +123,6 @@ MIR_PLATFORM_2.19 {
     mir::options::drop_wayland_extensions_opt;
     mir::options::enable_input_opt*;
     mir::options::enable_key_repeat_opt*;
-    mir::options::enable_mouse_keys_opt*;
     mir::options::fatal_except_opt*;
     mir::options::idle_timeout_opt;
     mir::options::idle_timeout_when_locked_opt;
@@ -204,3 +203,11 @@ MIR_PLATFORM_2.19 {
  };
  local: *;
 };
+
+MIR_PLATFORM_2.20 {
+ global:
+  extern "C++" {
+    mir::options::enable_mouse_keys_opt*;
+ };
+ local: *;
+} MIR_PLATFORM_2.19 ;

src/server/symbols.map

@@ -19,7 +19,6 @@ global:
     mir::DefaultServerConfiguration::set_enabled_wayland_extensions*;
     mir::DefaultServerConfiguration::set_the_decoration_strategy*;
     mir::DefaultServerConfiguration::set_wayland_extension_filter*;
-    mir::DefaultServerConfiguration::the_accessibility_manager*;
     mir::DefaultServerConfiguration::the_application_not_responding_detector*;
     mir::DefaultServerConfiguration::the_buffer_allocator*;
     mir::DefaultServerConfiguration::the_clock*;
@@ -191,7 +190,6 @@ global:
     mir::Server::set_wayland_extension_filter*;
     mir::Server::stop*;
     mir::Server::supported_pixel_formats*;
-    mir::Server::the_accessibility_manager*;
     mir::Server::the_application_not_responding_detector*;
     mir::Server::the_composite_event_filter*;
     mir::Server::the_compositor*;
@@ -623,10 +621,6 @@ global:
     mir::shell::AbstractShell::surface_at*;
     mir::shell::AbstractShell::surface_ready*;
     mir::shell::AbstractShell::swap_z_order*;
-    mir::shell::AccessibilityManager::notify_helpers*;
-    mir::shell::AccessibilityManager::register_keyboard_helper*;
-    mir::shell::AccessibilityManager::repeat_delay*;
-    mir::shell::AccessibilityManager::repeat_rate*;
     mir::shell::DefaultWindowManager::handle_keyboard_event*;
     mir::shell::DisplayConfigurationController::?DisplayConfigurationController*;
     mir::shell::DisplayConfigurationController::DisplayConfigurationController*;
@@ -716,7 +710,6 @@ global:
     non-virtual?thunk?to?mir::DefaultServerConfiguration::set_enabled_wayland_extensions*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::set_the_decoration_strategy*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::set_wayland_extension_filter*;
-    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_accessibility_manager*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_application_not_responding_detector*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_buffer_allocator*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_clock*;
@@ -1201,7 +1194,6 @@ global:
     typeinfo?for?mir::scene::TextInputState;
     typeinfo?for?mir::scene::TextInputStateObserver;
     typeinfo?for?mir::shell::AbstractShell;
-    typeinfo?for?mir::shell::AccessibilityManager;
     typeinfo?for?mir::shell::DefaultWindowManager;
     typeinfo?for?mir::shell::DisplayConfigurationController;
     typeinfo?for?mir::shell::DisplayLayout;
@@ -1415,18 +1407,27 @@ local: *;
 MIR_SERVER_INTERNAL_2.20 {
 global:
   extern "C++" {
+    mir::DefaultServerConfiguration::the_accessibility_manager*;
     mir::DefaultServerConfiguration::the_input_event_transformer*;
     mir::DefaultServerConfiguration::the_token_authority*;
     mir::Server::get_activation_token*;
+    mir::Server::the_accessibility_manager*;
     mir::Server::the_token_authority*;
     mir::input::InputEventTransformer::?InputEventTransformer*;
+    mir::input::InputEventTransformer::EventDispatcher::EventDispatcher*;
+    mir::input::InputEventTransformer::EventDispatcher::dispatch_key_event*;
+    mir::input::InputEventTransformer::EventDispatcher::dispatch_pointer_event*;
     mir::input::InputEventTransformer::InputEventTransformer*;
     mir::input::InputEventTransformer::Transformer::?Transformer*;
     mir::input::InputEventTransformer::append*;
     mir::input::InputEventTransformer::handle*;
     mir::input::InputEventTransformer::prepend*;
     mir::shell::AbstractShell::is_above*;
     mir::shell::AccessibilityManager::AccessibilityManager*;
+    mir::shell::AccessibilityManager::notify_helpers*;
+    mir::shell::AccessibilityManager::register_keyboard_helper*;
+    mir::shell::AccessibilityManager::repeat_delay*;
+    mir::shell::AccessibilityManager::repeat_rate*;
     mir::shell::ShellWrapper::is_above*;
     mir::shell::SurfaceStackWrapper::is_above*;
     mir::shell::TokenAuthority::Token::operator*;
@@ -1436,6 +1437,7 @@ global:
     mir::shell::TokenAuthority::issue_token*;
     mir::shell::TokenAuthority::revoke_all_tokens*;
     mir::shell::TokenAuthority::revoke_token*;
+    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_accessibility_manager*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_event_transformer*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_token_authority*;
     non-virtual?thunk?to?mir::input::InputEventTransformer::?InputEventTransformer*;
@@ -1444,13 +1446,16 @@ global:
     non-virtual?thunk?to?mir::shell::AbstractShell::is_above*;
     non-virtual?thunk?to?mir::shell::ShellWrapper::is_above*;
     non-virtual?thunk?to?mir::shell::SurfaceStackWrapper::is_above*;
+    typeinfo?for?mir::input::InputEventTransformer::EventDispatcher;
     typeinfo?for?mir::input::InputEventTransformer::Transformer;
     typeinfo?for?mir::input::InputEventTransformer;
+    typeinfo?for?mir::shell::AccessibilityManager;
     typeinfo?for?mir::shell::TokenAuthority::Token;
     typeinfo?for?mir::shell::TokenAuthority;
     virtual?thunk?to?mir::DefaultServerConfiguration::the_token_authority*;
     virtual?thunk?to?mir::shell::AbstractShell::is_above*;
     virtual?thunk?to?mir::shell::ShellWrapper::is_above*;
+    vtable?for?mir::input::InputEventTransformer::EventDispatcher;
     vtable?for?mir::input::InputEventTransformer::Transformer;
     vtable?for?mir::input::InputEventTransformer;
   };