Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

software_keyboard: Make GetText asynchronous

Browse source 
a
This commit is contained in:
Zach Hilman 2018-11-12 11:08:09 -05:00
parent 7cfb29de23
commit 8b433beff3
9 changed files with 64 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/hle/service/am/am.cpp
View file

@ -718,7 +718,7 @@ void IStorageAccessor::Write(Kernel::HLERequestContext& ctx) {
const u64 offset{rp.Pop<u64>()};
const std::vector<u8> data{ctx.ReadBuffer()};
const auto size = std::min(data.size(), backing.buffer.size() - offset);
const auto size = std::min<std::size_t>(data.size(), backing.buffer.size() - offset);
std::memcpy(&backing.buffer[offset], data.data(), size);

19
src/core/hle/service/am/applets/software_keyboard.cpp
View file

@ -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});

5
src/core/hle/service/am/applets/software_keyboard.h
View file

@ -57,11 +57,16 @@ public:
void Execute(AppletStorageProxyFunction out_data,
AppletStorageProxyFunction out_interactive_data) override;
void WriteText(std::optional<std::u16string> text);
private:
KeyboardConfig config;
std::u16string initial_text;
bool complete = false;
std::vector<u8> final_data;
AppletStorageProxyFunction out_data;
AppletStorageProxyFunction out_interactive_data;
};
} // namespace Service::AM::Applets