Validating input in the activation method rather than the commit, and…

… making sure that tokens are invalidated if a keyboard event comes in

src/server/frontend_wayland/wayland_connector.cpp

@@ -330,7 +330,8 @@ mf::WaylandConnector::WaylandConnector(
         desktop_file_manager,
         session_lock_,
         decoration_strategy,
-        focus_controller});
+        focus_controller,
+        keyboard_observer_registrar});
 
     shm_global = std::make_unique<WlShm>(display.get(), executor);
 

src/server/frontend_wayland/wayland_connector.h

@@ -115,6 +115,7 @@ class WaylandExtensions
         std::shared_ptr<scene::SessionLock> session_lock;
         std::shared_ptr<mir::DecorationStrategy> decoration_strategy;
         std::shared_ptr<shell::FocusController> focus_controller;
+        std::shared_ptr<ObserverRegistrar<input::KeyboardObserver>> keyboard_observer_registrar;
     };
 
     WaylandExtensions() = default;

src/server/frontend_wayland/wayland_default_configuration.cpp

@@ -229,7 +229,13 @@ std::vector<ExtensionBuilder> const internal_extension_builders = {
         }),
     make_extension_builder<mw::XdgActivationV1>([](auto const& ctx)
         {
-            return mf::create_xdg_activation_v1(ctx.display, ctx.shell, ctx.focus_controller, ctx.main_loop);
+            return mf::create_xdg_activation_v1(
+                ctx.display,
+                ctx.shell,
+                ctx.focus_controller,
+                ctx.main_loop,
+                ctx.keyboard_observer_registrar,
+                *ctx.wayland_executor);
         }),
 };