RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-12-06 07:12:28 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into windows-clang

Browse source
This commit is contained in:
qurious-pixel 2025-10-17 06:05:20 -07:00 committed by GitHub
parent 97a1a50bd2 2fcd542b0b
commit 42a8f7dadf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 153 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Audio/audio_utils.cpp
View file

@ -52,6 +52,6 @@ namespace audio
g_cfg.audio.volume.set(std::clamp<s32>(new_volume, g_cfg.audio.volume.min, g_cfg.audio.volume.max));
Emu.GetCallbacks().update_emu_settings();
rsx::overlays::queue_message(get_localized_string(localized_string_id::AUDIO_CHANGED, fmt::format("%d%%", g_cfg.audio.volume.get()).c_str()), 3'000'000);
rsx::overlays::queue_message(localized_string(localized_string_id::AUDIO_CHANGED, "%d%%", g_cfg.audio.volume.get()), 3'000'000, {}, rsx::overlays::message_pin_location::top_left, {}, true, true);
}
} // namespace audio

18
rpcs3/Emu/Cell/Modules/cellGame.cpp
View file

@ -550,7 +550,7 @@ error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName
case CELL_HDDGAME_CBRESULT_ERR_NOSPACE:
cellGame.error("cellHddGameCheck(): callback returned CELL_HDDGAME_CBRESULT_ERR_NOSPACE. Space Needed: %d KB", result->errNeedSizeKB);
error_msg = get_localized_string(localized_string_id::CELL_HDD_GAME_CHECK_NOSPACE, fmt::format("%d", result->errNeedSizeKB).c_str());
error_msg = get_localized_string(localized_string_id::CELL_HDD_GAME_CHECK_NOSPACE, "%d", result->errNeedSizeKB);
break;
case CELL_HDDGAME_CBRESULT_ERR_BROKEN:
@ -565,12 +565,12 @@ error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName
case CELL_HDDGAME_CBRESULT_ERR_INVALID:
cellGame.error("cellHddGameCheck(): callback returned CELL_HDDGAME_CBRESULT_ERR_INVALID. Error message: %s", result->invalidMsg);
error_msg = get_localized_string(localized_string_id::CELL_HDD_GAME_CHECK_INVALID, fmt::format("%s", result->invalidMsg).c_str());
error_msg = get_localized_string(localized_string_id::CELL_HDD_GAME_CHECK_INVALID, "%s", result->invalidMsg);
break;
default:
cellGame.error("cellHddGameCheck(): callback returned unknown error (code=0x%x). Error message: %s", result->invalidMsg);
error_msg = get_localized_string(localized_string_id::CELL_HDD_GAME_CHECK_INVALID, fmt::format("%s", result->invalidMsg).c_str());
error_msg = get_localized_string(localized_string_id::CELL_HDD_GAME_CHECK_INVALID, "%s", result->invalidMsg);
break;
}
@ -1169,7 +1169,7 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
}
case CELL_GAMEDATA_CBRESULT_ERR_NOSPACE:
cellGame.error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_NOSPACE. Space Needed: %d KB", cbResult->errNeedSizeKB);
error_msg = get_localized_string(localized_string_id::CELL_GAMEDATA_CHECK_NOSPACE, fmt::format("%d", cbResult->errNeedSizeKB).c_str());
error_msg = get_localized_string(localized_string_id::CELL_GAMEDATA_CHECK_NOSPACE, "%d", cbResult->errNeedSizeKB);
break;
case CELL_GAMEDATA_CBRESULT_ERR_BROKEN:
@ -1184,12 +1184,12 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
case CELL_GAMEDATA_CBRESULT_ERR_INVALID:
cellGame.error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_INVALID. Error message: %s", cbResult->invalidMsg);
error_msg = get_localized_string(localized_string_id::CELL_GAMEDATA_CHECK_INVALID, fmt::format("%s", cbResult->invalidMsg).c_str());
error_msg = get_localized_string(localized_string_id::CELL_GAMEDATA_CHECK_INVALID, "%s", cbResult->invalidMsg);
break;
default:
cellGame.error("cellGameDataCheckCreate2(): callback returned unknown error (code=0x%x). Error message: %s", cbResult->invalidMsg);
error_msg = get_localized_string(localized_string_id::CELL_GAMEDATA_CHECK_INVALID, fmt::format("%s", cbResult->invalidMsg).c_str());
error_msg = get_localized_string(localized_string_id::CELL_GAMEDATA_CHECK_INVALID, "%s", cbResult->invalidMsg);
break;
}
@ -1686,7 +1686,7 @@ error_code cellGameContentErrorDialog(s32 type, s32 errNeedSizeKB, vm::cptr<char
break;
case CELL_GAME_ERRDIALOG_NOSPACE:
// Not enough available space. The application will continue.
error_msg = get_localized_string(localized_string_id::CELL_GAME_ERROR_NOSPACE, fmt::format("%d", errNeedSizeKB).c_str());
error_msg = get_localized_string(localized_string_id::CELL_GAME_ERROR_NOSPACE, "%d", errNeedSizeKB);
break;
case CELL_GAME_ERRDIALOG_BROKEN_EXIT_GAMEDATA:
// Game data is corrupted. The application will be terminated.
@ -1698,7 +1698,7 @@ error_code cellGameContentErrorDialog(s32 type, s32 errNeedSizeKB, vm::cptr<char
break;
case CELL_GAME_ERRDIALOG_NOSPACE_EXIT:
// Not enough available space. The application will be terminated.
error_msg = get_localized_string(localized_string_id::CELL_GAME_ERROR_NOSPACE_EXIT, fmt::format("%d", errNeedSizeKB).c_str());
error_msg = get_localized_string(localized_string_id::CELL_GAME_ERROR_NOSPACE_EXIT, "%d", errNeedSizeKB);
break;
default:
return CELL_GAME_ERROR_PARAM;
@ -1712,7 +1712,7 @@ error_code cellGameContentErrorDialog(s32 type, s32 errNeedSizeKB, vm::cptr<char
}
error_msg += '\n';
error_msg += get_localized_string(localized_string_id::CELL_GAME_ERROR_DIR_NAME, fmt::format("%s", dirName).c_str());
error_msg += get_localized_string(localized_string_id::CELL_GAME_ERROR_DIR_NAME, "%s", dirName);
}
return open_exit_dialog(error_msg, type > CELL_GAME_ERRDIALOG_NOSPACE, msg_dialog_source::_cellGame);

2
rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
View file

@ -506,7 +506,7 @@ error_code cellMsgDialogOpenErrorCode(u32 errorCode, vm::ptr<CellMsgDialogCallba
default: string_id = localized_string_id::CELL_MSG_DIALOG_ERROR_DEFAULT; break; // An error has occurred.
}
const std::string error = get_localized_string(string_id, fmt::format("%08x", errorCode).c_str());
const std::string error = get_localized_string(string_id, "%08x", errorCode);
return cellMsgDialogOpen2(CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK, vm::make_str(error), callback, userData, extParam);
}

2
rpcs3/Emu/Cell/Modules/cellSaveData.cpp
View file

@ -396,7 +396,7 @@ static error_code display_callback_result_error_message(ppu_thread& ppu, const C
switch (result.result)
{
case CELL_SAVEDATA_CBRESULT_ERR_NOSPACE:
msg = get_localized_string(localized_string_id::CELL_SAVEDATA_CB_NO_SPACE, fmt::format("%d", result.errNeedSizeKB).c_str());
msg = get_localized_string(localized_string_id::CELL_SAVEDATA_CB_NO_SPACE, "%d", result.errNeedSizeKB);
break;
case CELL_SAVEDATA_CBRESULT_ERR_FAILURE:
msg = get_localized_string(localized_string_id::CELL_SAVEDATA_CB_FAILURE);

2
rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp
View file

@ -421,7 +421,7 @@ namespace rsx
m_list->select_entry(selected_index);
}
m_description->set_text(get_localized_string(localized_string_id::HOME_MENU_TROPHY_LIST_TITLE, fmt::format("%d%% (%d/%d)", percentage, unlocked_trophies, all_trophies).c_str()));
m_description->set_text(get_localized_string(localized_string_id::HOME_MENU_TROPHY_LIST_TITLE, "%d%% (%d/%d)", percentage, unlocked_trophies, all_trophies));
m_description->auto_resize();
}
} // namespace overlays

5
rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
View file

@ -402,6 +402,11 @@ namespace rsx
set_unicode_text(get_localized_u32string(id));
}
void overlay_element::set_text(const localized_string& container)
{
set_text(container.str);
}
void overlay_element::set_font(const char* font_name, u16 font_size)
{
font_ref = fontmgr::get(font_name, font_size);

1
rpcs3/Emu/RSX/Overlays/overlay_controls.h
View file

@ -206,6 +206,7 @@ namespace rsx
virtual void set_text(const std::string& text);
virtual void set_unicode_text(const std::u32string& text);
void set_text(localized_string_id id);
void set_text(const localized_string& container);
virtual void set_font(const char* font_name, u16 font_size);
virtual void align_text(text_align align);
virtual void set_wrap_text(bool state);

123
rpcs3/Emu/RSX/Overlays/overlay_message.cpp
View file

@ -19,6 +19,15 @@ namespace rsx
template <typename T>
message_item::message_item(const T& msg_id, u64 expiration, std::shared_ptr<atomic_t<u32>> refs, std::shared_ptr<overlay_element> icon)
{
if constexpr (std::is_same_v<T, localized_string_id>)
{
m_loc_id = msg_id;
}
else if constexpr (std::is_same_v<T, localized_string>)
{
m_loc_id = msg_id.id;
}
m_visible_duration = expiration;
m_refs = std::move(refs);
@ -54,6 +63,7 @@ namespace rsx
}
template message_item::message_item(const std::string& msg_id, u64, std::shared_ptr<atomic_t<u32>>, std::shared_ptr<overlay_element>);
template message_item::message_item(const localized_string_id& msg_id, u64, std::shared_ptr<atomic_t<u32>>, std::shared_ptr<overlay_element>);
template message_item::message_item(const localized_string& msg_id, u64, std::shared_ptr<atomic_t<u32>>, std::shared_ptr<overlay_element>);
void message_item::reset_expiration()
{
@ -75,11 +85,22 @@ namespace rsx
}
}
bool message_item::id_matches(localized_string_id id) const
{
return m_loc_id == id;
}
bool message_item::text_matches(const std::u32string& text) const
{
return m_text.text == text;
}
void message_item::set_label_text(const std::string& text)
{
m_text.set_text(text);
m_is_compiled = false;
}
void message_item::set_pos(s16 _x, s16 _y)
{
rounded_rect::set_pos(_x, _y);
@ -277,33 +298,9 @@ namespace rsx
return cr;
}
bool message::message_exists(message_pin_location location, localized_string_id id, bool allow_refresh)
bool message::check_lists(message_pin_location location, std::function<bool(std::deque<message_item>& list)> check_list)
{
return message_exists(location, get_localized_u32string(id), allow_refresh);
}
bool message::message_exists(message_pin_location location, const std::string& msg, bool allow_refresh)
{
return message_exists(location, utf8_to_u32string(msg), allow_refresh);
}
bool message::message_exists(message_pin_location location, const std::u32string& msg, bool allow_refresh)
{
auto check_list = [&](std::deque<message_item>& list)
{
return std::any_of(list.begin(), list.end(), [&](message_item& item)
{
if (item.text_matches(msg))
{
if (allow_refresh)
{
item.reset_expiration();
}
return true;
}
return false;
});
};
if (!check_list) return false;
switch (location)
{
@ -320,6 +317,80 @@ namespace rsx
return false;
}
bool message::message_exists(message_pin_location location, localized_string_id id, bool allow_refresh, bool /*compare_id*/)
{
const auto check_list = [&](std::deque<message_item>& list)
{
return std::any_of(list.begin(), list.end(), [&](message_item& item)
{
if (item.id_matches(id))
{
if (allow_refresh)
{
item.reset_expiration();
}
return true;
}
return false;
});
};
return check_lists(location, check_list);
}
bool message::message_exists(message_pin_location location, const std::string& msg, bool allow_refresh, bool compare_id)
{
return message_exists(location, utf8_to_u32string(msg), allow_refresh, compare_id);
}
bool message::message_exists(message_pin_location location, const std::u32string& msg, bool allow_refresh, bool /*compare_id*/)
{
const auto check_list = [&](std::deque<message_item>& list)
{
return std::any_of(list.begin(), list.end(), [&](message_item& item)
{
if (item.text_matches(msg))
{
if (allow_refresh)
{
item.reset_expiration();
}
return true;
}
return false;
});
};
return check_lists(location, check_list);
}
bool message::message_exists(message_pin_location location, const localized_string& container, bool allow_refresh, bool compare_id)
{
if (compare_id)
{
const auto check_list = [&](std::deque<message_item>& list)
{
return std::any_of(list.begin(), list.end(), [&](message_item& item)
{
if (item.id_matches(container.id))
{
if (allow_refresh)
{
item.set_label_text(container.str);
item.reset_expiration();
}
return true;
}
return false;
});
};
return check_lists(location, check_list);
}
return message_exists(location, utf8_to_u32string(container.str), allow_refresh, compare_id);
}
void refresh_message_queue()
{
if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())

24
rpcs3/Emu/RSX/Overlays/overlay_message.h
View file

@ -30,9 +30,13 @@ namespace rsx
void ensure_expired();
compiled_resource& get_compiled() override;
bool id_matches(localized_string_id id) const;
bool text_matches(const std::u32string& text) const;
void set_label_text(const std::string& text);
private:
localized_string_id m_loc_id = localized_string_id::INVALID;
label m_text{};
std::shared_ptr<overlay_element> m_icon{};
animation_color_interpolate m_fade_in_animation;
@ -59,7 +63,8 @@ namespace rsx
std::shared_ptr<atomic_t<u32>> refs,
message_pin_location location = message_pin_location::top_left,
std::shared_ptr<overlay_element> icon = {},
bool allow_refresh = false)
bool allow_refresh = false,
bool compare_id = false)
{
std::lock_guard lock(m_mutex_queue);
@ -85,13 +90,13 @@ namespace rsx
{
for (auto id : msg_id)
{
if (!message_exists(location, id, allow_refresh))
if (!message_exists(location, id, allow_refresh, compare_id))
{
queue->emplace_back(id, expiration, refs, icon);
}
}
}
else if (!message_exists(location, msg_id, allow_refresh))
else if (!message_exists(location, msg_id, allow_refresh, compare_id))
{
queue->emplace_back(msg_id, expiration, std::move(refs), icon);
}
@ -119,9 +124,11 @@ namespace rsx
void update_queue(std::deque<message_item>& vis_set, std::deque<message_item>& ready_set, message_pin_location origin);
// Stacking. Extends the lifetime of a message instead of inserting a duplicate
bool message_exists(message_pin_location location, localized_string_id id, bool allow_refresh);
bool message_exists(message_pin_location location, const std::string& msg, bool allow_refresh);
bool message_exists(message_pin_location location, const std::u32string& msg, bool allow_refresh);
bool check_lists(message_pin_location location, std::function<bool(std::deque<message_item>& list)> check_list);
bool message_exists(message_pin_location location, localized_string_id id, bool allow_refresh, bool compare_id);
bool message_exists(message_pin_location location, const std::string& msg, bool allow_refresh, bool compare_id);
bool message_exists(message_pin_location location, const std::u32string& msg, bool allow_refresh, bool compare_id);
bool message_exists(message_pin_location location, const localized_string& container, bool allow_refresh, bool compare_id);
};
template <typename T>
@ -131,7 +138,8 @@ namespace rsx
std::shared_ptr<atomic_t<u32>> refs = {},
message_pin_location location = message_pin_location::top_left,
std::shared_ptr<overlay_element> icon = {},
bool allow_refresh = false)
bool allow_refresh = false,
bool compare_id = false)
{
if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
{
@ -141,7 +149,7 @@ namespace rsx
msg_overlay = std::make_shared<rsx::overlays::message>();
msg_overlay = manager->add(msg_overlay);
}
msg_overlay->queue_message(msg_id, expiration, std::move(refs), location, std::move(icon), allow_refresh);
msg_overlay->queue_message(msg_id, expiration, std::move(refs), location, std::move(icon), allow_refresh, compare_id);
}
}

22
rpcs3/Emu/localized_string.h
View file

@ -1,7 +1,27 @@
#pragma once
#include <string>
#include "localized_string_id.h"
#include "Utilities/StrFmt.h"
std::string get_localized_string(localized_string_id id, const char* args = "");
std::u32string get_localized_u32string(localized_string_id id, const char* args = "");
template <typename CharT, usz N, typename... Args>
requires (sizeof...(Args) > 0)
std::string get_localized_string(localized_string_id id, const CharT(&fmt)[N], const Args&... args)
{
return get_localized_string(id, fmt::format(fmt, args...).c_str());
}
struct localized_string
{
template <typename CharT, usz N, typename... Args>
requires (sizeof...(Args) > 0)
localized_string(localized_string_id _id, const CharT(&fmt)[N], const Args&... args)
: id(_id), str(get_localized_string(id, fmt, args...))
{
}
localized_string_id id = localized_string_id::INVALID;
std::string str;
};