sneedmca/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2025-01-09 16:03:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wip: when exiting applet, track the calling applet

Browse source
This commit is contained in:
Exverge 2024-03-24 14:25:39 -04:00
parent 0a3143399a
commit b5fb367c2e
No known key found for this signature in database
GPG key ID: 19AAFC0AC6A9B35A
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/hle/service/am/applet_manager.cpp
View file

@ -1,4 +1,5 @@
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
// SPDX-FileCopyrightText: Copyright 2024 suyu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include "common/settings.h" #include "common/settings.h"
@ -335,4 +336,8 @@ void AppletManager::SetWindowSystem(WindowSystem* window_system) {
applet->process->Run(); applet->process->Run();
} }
void AppletManager::RequestAppletVisibilityState(std::shared_ptr<Applet> applet, bool visible) {
m_window_system->RequestAppletVisibilityState(applet.operator*(), visible);
}
} // namespace Service::AM } // namespace Service::AM

2
src/core/hle/service/am/applet_manager.h
View file

@ -1,4 +1,5 @@
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
// SPDX-FileCopyrightText: Copyright 2024 suyu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
@ -46,6 +47,7 @@ public:
public: public:
void SetWindowSystem(WindowSystem* window_system); void SetWindowSystem(WindowSystem* window_system);
void RequestAppletVisibilityState(std::shared_ptr<Applet> applet, bool visible);
private: private:
Core::System& m_system; Core::System& m_system;

10
src/core/hle/service/am/service/library_applet_self_accessor.cpp
View file

@ -1,4 +1,5 @@
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
// SPDX-FileCopyrightText: Copyright 2024 suyu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include "core/core_timing.h" #include "core/core_timing.h"
@ -17,6 +18,7 @@
#include "core/hle/service/ns/application_manager_interface.h" #include "core/hle/service/ns/application_manager_interface.h"
#include "core/hle/service/ns/service_getter_interface.h" #include "core/hle/service/ns/service_getter_interface.h"
#include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/sm.h"
#include "core/hle/service/am/am_results.h"
namespace Service::AM { namespace Service::AM {
@ -176,7 +178,12 @@ Result ILibraryAppletSelfAccessor::GetMainAppletStorageId(Out<FileSys::StorageId
Result ILibraryAppletSelfAccessor::ExitProcessAndReturn() { Result ILibraryAppletSelfAccessor::ExitProcessAndReturn() {
LOG_INFO(Service_AM, "called"); LOG_INFO(Service_AM, "called");
std::shared_ptr<Applet> applet = m_applet->caller_applet.lock();
LOG_INFO(Service_AM, "unlocking caller applet");
system.GetAppletManager().RequestAppletVisibilityState(applet, true);
applet->SetInteractibleLocked(true);
m_applet->process->Terminate(); m_applet->process->Terminate();
m_applet->terminate_result = AM::ResultLibraryAppletTerminated;
R_SUCCEED(); R_SUCCEED();
} }
@ -278,8 +285,7 @@ Result ILibraryAppletSelfAccessor::GetMainAppletApplicationDesiredLanguage(
Result ILibraryAppletSelfAccessor::GetCurrentApplicationId(Out<u64> out_application_id) { Result ILibraryAppletSelfAccessor::GetCurrentApplicationId(Out<u64> out_application_id) {
LOG_WARNING(Service_AM, "(STUBBED) called"); LOG_WARNING(Service_AM, "(STUBBED) called");
// TODO: this should be the main applet, not the caller applet const AppletIdentityInfo main_applet = GetCallerIdentity(*m_applet->caller_applet);
const auto main_applet = GetCallerIdentity(*m_applet);
*out_application_id = main_applet.application_id; *out_application_id = main_applet.application_id;
R_SUCCEED(); R_SUCCEED();