Merge pull request #3924 from ogniK5377/GetKeyCodeMap
Implement GetKeyCodeMap & GetKeyCodeMap2
This commit is contained in:
commit
8a1cfcc8b7
|
@ -3,6 +3,7 @@
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <array>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "core/hle/ipc_helpers.h"
|
#include "core/hle/ipc_helpers.h"
|
||||||
|
@ -31,6 +32,44 @@ constexpr std::array<LanguageCode, 17> available_language_codes = {{
|
||||||
LanguageCode::ZH_HANT,
|
LanguageCode::ZH_HANT,
|
||||||
}};
|
}};
|
||||||
|
|
||||||
|
enum class KeyboardLayout : u64 {
|
||||||
|
Japanese = 0,
|
||||||
|
EnglishUs = 1,
|
||||||
|
EnglishUsInternational = 2,
|
||||||
|
EnglishUk = 3,
|
||||||
|
French = 4,
|
||||||
|
FrenchCa = 5,
|
||||||
|
Spanish = 6,
|
||||||
|
SpanishLatin = 7,
|
||||||
|
German = 8,
|
||||||
|
Italian = 9,
|
||||||
|
Portuguese = 10,
|
||||||
|
Russian = 11,
|
||||||
|
Korean = 12,
|
||||||
|
ChineseSimplified = 13,
|
||||||
|
ChineseTraditional = 14,
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr std::array<std::pair<LanguageCode, KeyboardLayout>, 17> language_to_layout{{
|
||||||
|
{LanguageCode::JA, KeyboardLayout::Japanese},
|
||||||
|
{LanguageCode::EN_US, KeyboardLayout::EnglishUs},
|
||||||
|
{LanguageCode::FR, KeyboardLayout::French},
|
||||||
|
{LanguageCode::DE, KeyboardLayout::German},
|
||||||
|
{LanguageCode::IT, KeyboardLayout::Italian},
|
||||||
|
{LanguageCode::ES, KeyboardLayout::Spanish},
|
||||||
|
{LanguageCode::ZH_CN, KeyboardLayout::ChineseSimplified},
|
||||||
|
{LanguageCode::KO, KeyboardLayout::Korean},
|
||||||
|
{LanguageCode::NL, KeyboardLayout::EnglishUsInternational},
|
||||||
|
{LanguageCode::PT, KeyboardLayout::Portuguese},
|
||||||
|
{LanguageCode::RU, KeyboardLayout::Russian},
|
||||||
|
{LanguageCode::ZH_TW, KeyboardLayout::ChineseTraditional},
|
||||||
|
{LanguageCode::EN_GB, KeyboardLayout::EnglishUk},
|
||||||
|
{LanguageCode::FR_CA, KeyboardLayout::FrenchCa},
|
||||||
|
{LanguageCode::ES_419, KeyboardLayout::SpanishLatin},
|
||||||
|
{LanguageCode::ZH_HANS, KeyboardLayout::ChineseSimplified},
|
||||||
|
{LanguageCode::ZH_HANT, KeyboardLayout::ChineseTraditional},
|
||||||
|
}};
|
||||||
|
|
||||||
constexpr std::size_t pre4_0_0_max_entries = 15;
|
constexpr std::size_t pre4_0_0_max_entries = 15;
|
||||||
constexpr std::size_t post4_0_0_max_entries = 17;
|
constexpr std::size_t post4_0_0_max_entries = 17;
|
||||||
|
|
||||||
|
@ -50,6 +89,25 @@ void GetAvailableLanguageCodesImpl(Kernel::HLERequestContext& ctx, std::size_t m
|
||||||
ctx.WriteBuffer(available_language_codes.data(), copy_size);
|
ctx.WriteBuffer(available_language_codes.data(), copy_size);
|
||||||
PushResponseLanguageCode(ctx, copy_amount);
|
PushResponseLanguageCode(ctx, copy_amount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GetKeyCodeMapImpl(Kernel::HLERequestContext& ctx) {
|
||||||
|
const auto language_code = available_language_codes[Settings::values.language_index];
|
||||||
|
const auto key_code =
|
||||||
|
std::find_if(language_to_layout.cbegin(), language_to_layout.cend(),
|
||||||
|
[=](const auto& element) { return element.first == language_code; });
|
||||||
|
KeyboardLayout layout = KeyboardLayout::EnglishUs;
|
||||||
|
if (key_code == language_to_layout.cend()) {
|
||||||
|
LOG_ERROR(Service_SET,
|
||||||
|
"Could not find keyboard layout for language index {}, defaulting to English us",
|
||||||
|
Settings::values.language_index);
|
||||||
|
} else {
|
||||||
|
layout = key_code->second;
|
||||||
|
}
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
ctx.WriteBuffer(&layout, sizeof(KeyboardLayout));
|
||||||
|
}
|
||||||
} // Anonymous namespace
|
} // Anonymous namespace
|
||||||
|
|
||||||
LanguageCode GetLanguageCodeFromIndex(std::size_t index) {
|
LanguageCode GetLanguageCodeFromIndex(std::size_t index) {
|
||||||
|
@ -120,6 +178,16 @@ void SET::GetRegionCode(Kernel::HLERequestContext& ctx) {
|
||||||
rb.Push(Settings::values.region_index);
|
rb.Push(Settings::values.region_index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SET::GetKeyCodeMap(Kernel::HLERequestContext& ctx) {
|
||||||
|
LOG_DEBUG(Service_SET, "Called {}", ctx.Description());
|
||||||
|
GetKeyCodeMapImpl(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SET::GetKeyCodeMap2(Kernel::HLERequestContext& ctx) {
|
||||||
|
LOG_DEBUG(Service_SET, "Called {}", ctx.Description());
|
||||||
|
GetKeyCodeMapImpl(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
SET::SET() : ServiceFramework("set") {
|
SET::SET() : ServiceFramework("set") {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
|
@ -130,9 +198,9 @@ SET::SET() : ServiceFramework("set") {
|
||||||
{4, &SET::GetRegionCode, "GetRegionCode"},
|
{4, &SET::GetRegionCode, "GetRegionCode"},
|
||||||
{5, &SET::GetAvailableLanguageCodes2, "GetAvailableLanguageCodes2"},
|
{5, &SET::GetAvailableLanguageCodes2, "GetAvailableLanguageCodes2"},
|
||||||
{6, &SET::GetAvailableLanguageCodeCount2, "GetAvailableLanguageCodeCount2"},
|
{6, &SET::GetAvailableLanguageCodeCount2, "GetAvailableLanguageCodeCount2"},
|
||||||
{7, nullptr, "GetKeyCodeMap"},
|
{7, &SET::GetKeyCodeMap, "GetKeyCodeMap"},
|
||||||
{8, &SET::GetQuestFlag, "GetQuestFlag"},
|
{8, &SET::GetQuestFlag, "GetQuestFlag"},
|
||||||
{9, nullptr, "GetKeyCodeMap2"},
|
{9, &SET::GetKeyCodeMap2, "GetKeyCodeMap2"},
|
||||||
{10, nullptr, "GetFirmwareVersionForDebug"},
|
{10, nullptr, "GetFirmwareVersionForDebug"},
|
||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
|
@ -44,6 +44,8 @@ private:
|
||||||
void GetAvailableLanguageCodeCount2(Kernel::HLERequestContext& ctx);
|
void GetAvailableLanguageCodeCount2(Kernel::HLERequestContext& ctx);
|
||||||
void GetQuestFlag(Kernel::HLERequestContext& ctx);
|
void GetQuestFlag(Kernel::HLERequestContext& ctx);
|
||||||
void GetRegionCode(Kernel::HLERequestContext& ctx);
|
void GetRegionCode(Kernel::HLERequestContext& ctx);
|
||||||
|
void GetKeyCodeMap(Kernel::HLERequestContext& ctx);
|
||||||
|
void GetKeyCodeMap2(Kernel::HLERequestContext& ctx);
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Service::Set
|
} // namespace Service::Set
|
||||||
|
|
Reference in New Issue