diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-11-12 17:08:09 +0100 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-11-18 16:53:47 +0100 |
commit | 8b433beff34c382e50334bb59c4f71394845558c (patch) | |
tree | f52f432b2ee5f4ef3917c1c0e2fa052930d68f3a /src/core/hle/service/am/applets/software_keyboard.cpp | |
parent | am: Allow applets to push multiple and different channels of data (diff) | |
download | yuzu-8b433beff34c382e50334bb59c4f71394845558c.tar yuzu-8b433beff34c382e50334bb59c4f71394845558c.tar.gz yuzu-8b433beff34c382e50334bb59c4f71394845558c.tar.bz2 yuzu-8b433beff34c382e50334bb59c4f71394845558c.tar.lz yuzu-8b433beff34c382e50334bb59c4f71394845558c.tar.xz yuzu-8b433beff34c382e50334bb59c4f71394845558c.tar.zst yuzu-8b433beff34c382e50334bb59c4f71394845558c.zip |
Diffstat (limited to 'src/core/hle/service/am/applets/software_keyboard.cpp')
-rw-r--r-- | src/core/hle/service/am/applets/software_keyboard.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp index 7352f3bdf..66b34d5ac 100644 --- a/src/core/hle/service/am/applets/software_keyboard.cpp +++ b/src/core/hle/service/am/applets/software_keyboard.cpp @@ -43,6 +43,10 @@ SoftwareKeyboard::SoftwareKeyboard() = default; SoftwareKeyboard::~SoftwareKeyboard() = default; void SoftwareKeyboard::Initialize(std::vector<std::shared_ptr<IStorage>> storage_) { + complete = false; + initial_text.clear(); + final_data.clear(); + Applet::Initialize(std::move(storage_)); ASSERT(storage_stack.size() >= 2); @@ -96,20 +100,25 @@ void SoftwareKeyboard::Execute(AppletStorageProxyFunction out_data, const auto parameters = ConvertToFrontendParameters(config, initial_text); - const auto res = frontend.GetText(parameters); + this->out_data = out_data; + this->out_interactive_data = out_interactive_data; + frontend.RequestText([this](std::optional<std::u16string> text) { WriteText(text); }, + parameters); +} +void SoftwareKeyboard::WriteText(std::optional<std::u16string> text) { std::vector<u8> output(SWKBD_OUTPUT_BUFFER_SIZE); - if (res.has_value()) { + if (text.has_value()) { if (config.text_check) { - const auto size = static_cast<u32>(res->size() * 2 + 4); + const auto size = static_cast<u32>(text->size() * 2 + 4); std::memcpy(output.data(), &size, sizeof(u32)); } else { output[0] = 1; } - std::memcpy(output.data() + 4, res->data(), - std::min(res->size() * 2, SWKBD_OUTPUT_BUFFER_SIZE - 4)); + std::memcpy(output.data() + 4, text->data(), + std::min(text->size() * 2, SWKBD_OUTPUT_BUFFER_SIZE - 4)); } else { complete = true; out_data(IStorage{output}); |