use WM for unfocusing

Author: collinalexbell

include/wayland_app.h

@@ -105,7 +105,7 @@ class WaylandApp : public AppSurface {
   bool isSelected() override { return selected; }
 
   void focus(unsigned long /*matrix*/) override { focused = true; }
-  void unfocus(unsigned long /*matrix*/) override { focused = false; }
+  void unfocus(unsigned long /*matrix*/) override;
   void takeInputFocus() override;
   void requestSize(int width, int height);
   void setSeat(wlr_seat* seat, wlr_surface* surface)

src/WindowManager/WindowManager.cpp

@@ -994,19 +994,6 @@ void WindowManager::focusApp(entt::entity appEntity) {
 
 void WindowManager::unfocusApp() {
   pruneInvalidFocus();
-  if (waylandMode) {
-    auto ent = currentlyFocusedApp.has_value() ? (int)entt::to_integral(*currentlyFocusedApp)
-                                               : -1;
-    size_t wlCount = 0;
-    if (registry) {
-      auto view = registry->view<WaylandApp::Component>();
-      view.each([&](auto /*e*/, auto& /*comp*/) { ++wlCount; });
-    }
-    WL_WM_LOG("WM: unfocusApp (wayland) ent=%d wlCount=%zu\n", ent, wlCount);
-    currentlyFocusedApp = std::nullopt;
-    pendingFocusedApp = std::nullopt;
-    return;
-  }
   logger->debug("unfocusing app");
   if (!currentlyFocusedApp.has_value()) {
     return;
@@ -1016,8 +1003,8 @@ void WindowManager::unfocusApp() {
     currentlyFocusedApp = std::nullopt;
     return;
   }
-  auto& app = registry->get<X11App>(ent);
-  app.unfocus(matrix);
+  auto& appComponent = registry->get<WaylandApp::Component>(ent);
+  appComponent.app->unfocus(matrix);
   currentlyFocusedApp = std::nullopt;
   pendingFocusedApp = std::nullopt;
   WL_WM_LOG("WM: unfocusApp (x11) ent=%d\n", (int)entt::to_integral(ent));

src/controls.cpp

@@ -489,6 +489,8 @@ void Controls::pollPressedKeys() {
   }
 }
 
+
+// called by the wayland server when input is detected
 ControlResponse
 Controls::handleKeySym(xkb_keysym_t sym,
                        bool is_pressed,

src/wayland/WaylandApp.cpp

@@ -173,6 +173,12 @@ WaylandApp::~WaylandApp()
   }
 }
 
+void WaylandApp::unfocus(unsigned long /*matrix*/) { 
+    focused = false; 
+    wlr_seat_keyboard_notify_clear_focus(seat);
+    wlr_seat_pointer_notify_clear_focus(seat);
+}
+
 void
 WaylandApp::handle_destroy()
 {

src/wayland/wlr_compositor.cpp

@@ -108,20 +108,6 @@ currentTimeSeconds()
   return elapsed.count();
 }
 
-static void
-clear_input_forces(WlrServer* server)
-{
-  if (!server) {
-    return;
-  }
-  server->input.forward = false;
-  server->input.back = false;
-  server->input.left = false;
-  server->input.right = false;
-  server->input.delta_x = 0.0;
-  server->input.delta_y = 0.0;
-}
-
 static size_t
 wayland_app_count(WlrServer* server)
 {
@@ -860,24 +846,12 @@ process_key_sym(WlrServer* server,
   if (server->engine) {
     Controls* controls = server->engine->getControls();
     uint32_t mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
-    bool modifierHeld =
-      (mods & server->hotkeyModifierMask) || server->replayModifierActive;
+    bool modifierHeld = (mods & server->hotkeyModifierMask);
     bool shiftHeld = (mods & WLR_MODIFIER_SHIFT) || server->pendingReplayShift ||
                      server->replayShiftHeld > 0;
     if (controls) {
       auto resp =
         controls->handleKeySym(sym, pressed, modifierHeld, shiftHeld, waylandFocusActive);
-      bool handled = resp.consumed || resp.blockClientDelivery || resp.requestQuit ||
-                     resp.clearInputForces || resp.clearSeatFocus;
-      
-      if (resp.clearInputForces) {
-        clear_input_forces(server);
-      }
-      if (resp.clearSeatFocus && server->seat) {
-        wlr_seat_keyboard_notify_clear_focus(server->seat);
-        wlr_seat_pointer_notify_clear_focus(server->seat);
-        server->replayModifierActive = false;
-      }
       if (resp.requestQuit) {
         wl_display_terminate(server->display);
         return;
@@ -934,7 +908,6 @@ process_key_sym(WlrServer* server,
               if (auto* controls = server->engine->getControls()) {
                 controls->clearMovementInput();
               }
-              clear_input_forces(server);
             }
           }
         }