From 182137a9a4b09c8188d2cbffa312550c5dc83641 Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Tue, 2 Jan 2024 18:29:03 -0500
Subject: am: migrate global state to per-applet state structure

---
 src/core/hle/service/am/frontend/applets.cpp | 20 +++-----------------
 src/core/hle/service/am/frontend/applets.h   |  1 -
 2 files changed, 3 insertions(+), 18 deletions(-)

(limited to 'src/core/hle/service/am/frontend')

diff --git a/src/core/hle/service/am/frontend/applets.cpp b/src/core/hle/service/am/frontend/applets.cpp
index 4e8f806d7..38495ee19 100644
--- a/src/core/hle/service/am/frontend/applets.cpp
+++ b/src/core/hle/service/am/frontend/applets.cpp
@@ -16,6 +16,7 @@
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/applet_ae.h"
+#include "core/hle/service/am/applet_manager.h"
 #include "core/hle/service/am/applet_message_queue.h"
 #include "core/hle/service/am/applet_oe.h"
 #include "core/hle/service/am/frontend/applet_cabinet.h"
@@ -122,21 +123,11 @@ void AppletDataBroker::PushInteractiveDataFromApplet(std::shared_ptr<IStorage>&&
 void AppletDataBroker::SignalStateChanged() {
     state_changed_event->Signal();
 
+    // TODO proper window management
     switch (applet_mode) {
     case LibraryAppletMode::AllForeground:
     case LibraryAppletMode::AllForegroundInitiallyHidden: {
-        auto applet_oe = system.ServiceManager().GetService<AppletOE>("appletOE");
-        auto applet_ae = system.ServiceManager().GetService<AppletAE>("appletAE");
-
-        if (applet_oe) {
-            applet_oe->GetMessageQueue()->FocusStateChanged();
-            break;
-        }
-
-        if (applet_ae) {
-            applet_ae->GetMessageQueue()->FocusStateChanged();
-            break;
-        }
+        system.GetAppletManager().FocusStateChanged();
         break;
     }
     default:
@@ -255,11 +246,6 @@ void FrontendAppletHolder::SetCurrentAppletId(AppletId applet_id) {
     current_applet_id = applet_id;
 }
 
-void FrontendAppletHolder::SetDefaultAppletFrontendSet() {
-    ClearAll();
-    SetDefaultAppletsIfMissing();
-}
-
 void FrontendAppletHolder::SetDefaultAppletsIfMissing() {
     if (frontend.cabinet == nullptr) {
         frontend.cabinet = std::make_unique<Core::Frontend::DefaultCabinetApplet>();
diff --git a/src/core/hle/service/am/frontend/applets.h b/src/core/hle/service/am/frontend/applets.h
index f58147955..dec1d63b2 100644
--- a/src/core/hle/service/am/frontend/applets.h
+++ b/src/core/hle/service/am/frontend/applets.h
@@ -188,7 +188,6 @@ public:
     void SetFrontendAppletSet(FrontendAppletSet set);
     void SetCabinetMode(NFP::CabinetMode mode);
     void SetCurrentAppletId(AppletId applet_id);
-    void SetDefaultAppletFrontendSet();
     void SetDefaultAppletsIfMissing();
     void ClearAll();
 
-- 
cgit v1.2.3