applets: Remove the previous software keyboard applet implementation

4 files changed, 7 insertions, 280 deletions

diff --git a/src/core/frontend/applets/software_keyboard.cpp b/src/core/frontend/applets/software_keyboard.cpp
index 856ed33da..73e7a89b9 100644
--- a/src/core/frontend/applets/software_keyboard.cpp
+++ b/src/core/frontend/applets/software_keyboard.cpp
@@ -2,28 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/logging/backend.h"
-#include "common/string_util.h"
 #include "core/frontend/applets/software_keyboard.h"
 
 namespace Core::Frontend {
-SoftwareKeyboardApplet::~SoftwareKeyboardApplet() = default;
-
-void DefaultSoftwareKeyboardApplet::RequestText(
-    std::function<void(std::optional<std::u16string>)> out,
-    SoftwareKeyboardParameters parameters) const {
-    if (parameters.initial_text.empty())
-        out(u"yuzu");
 
-    out(parameters.initial_text);
-}
+SoftwareKeyboardApplet::~SoftwareKeyboardApplet() = default;
 
-void DefaultSoftwareKeyboardApplet::SendTextCheckDialog(
-    std::u16string error_message, std::function<void()> finished_check) const {
-    LOG_WARNING(Service_AM,
-                "(STUBBED) called - Default fallback software keyboard does not support text "
-                "check! (error_message={})",
-                Common::UTF16ToUTF8(error_message));
-    finished_check();
-}
 } // namespace Core::Frontend
diff --git a/src/core/frontend/applets/software_keyboard.h b/src/core/frontend/applets/software_keyboard.h
index f9b202664..54528837e 100644
--- a/src/core/frontend/applets/software_keyboard.h
+++ b/src/core/frontend/applets/software_keyboard.h
@@ -4,51 +4,17 @@
 
 #pragma once
 
-#include <functional>
-#include <optional>
-#include <string>
-#include "common/bit_field.h"
 #include "common/common_types.h"
 
 namespace Core::Frontend {
-struct SoftwareKeyboardParameters {
-    std::u16string submit_text;
-    std::u16string header_text;
-    std::u16string sub_text;
-    std::u16string guide_text;
-    std::u16string initial_text;
-    std::size_t max_length;
-    bool password;
-    bool cursor_at_beginning;
-
-    union {
-        u8 value;
-
-        BitField<1, 1, u8> disable_space;
-        BitField<2, 1, u8> disable_address;
-        BitField<3, 1, u8> disable_percent;
-        BitField<4, 1, u8> disable_slash;
-        BitField<6, 1, u8> disable_number;
-        BitField<7, 1, u8> disable_download_code;
-    };
-};
 
 class SoftwareKeyboardApplet {
 public:
     virtual ~SoftwareKeyboardApplet();
-
-    virtual void RequestText(std::function<void(std::optional<std::u16string>)> out,
-                             SoftwareKeyboardParameters parameters) const = 0;
-    virtual void SendTextCheckDialog(std::u16string error_message,
-                                     std::function<void()> finished_check) const = 0;
 };
 
 class DefaultSoftwareKeyboardApplet final : public SoftwareKeyboardApplet {
 public:
-    void RequestText(std::function<void(std::optional<std::u16string>)> out,
-                     SoftwareKeyboardParameters parameters) const override;
-    void SendTextCheckDialog(std::u16string error_message,
-                             std::function<void()> finished_check) const override;
 };
 
 } // namespace Core::Frontend
diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp
index 79b209c6b..f966cf67b 100644
--- a/src/core/hle/service/am/applets/software_keyboard.cpp
+++ b/src/core/hle/service/am/applets/software_keyboard.cpp
@@ -2,199 +2,27 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cstring>
-#include "common/assert.h"
-#include "common/string_util.h"
 #include "core/core.h"
 #include "core/frontend/applets/software_keyboard.h"
-#include "core/hle/result.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/applets/software_keyboard.h"
 
 namespace Service::AM::Applets {
 
-namespace {
-enum class Request : u32 {
-    Finalize = 0x4,
-    SetUserWordInfo = 0x6,
-    SetCustomizeDic = 0x7,
-    Calc = 0xa,
-    SetCustomizedDictionaries = 0xb,
-    UnsetCustomizedDictionaries = 0xc,
-    UnknownD = 0xd,
-    UnknownE = 0xe,
-};
-constexpr std::size_t SWKBD_INLINE_INIT_SIZE = 0x8;
-constexpr std::size_t SWKBD_OUTPUT_BUFFER_SIZE = 0x7D8;
-constexpr std::size_t SWKBD_OUTPUT_INTERACTIVE_BUFFER_SIZE = 0x7D4;
-constexpr std::size_t DEFAULT_MAX_LENGTH = 500;
-constexpr bool INTERACTIVE_STATUS_OK = false;
-} // Anonymous namespace
-static Core::Frontend::SoftwareKeyboardParameters ConvertToFrontendParameters(
-    KeyboardConfig config, std::u16string initial_text) {
-    Core::Frontend::SoftwareKeyboardParameters params{};
-
-    params.submit_text = Common::UTF16StringFromFixedZeroTerminatedBuffer(
-        config.submit_text.data(), config.submit_text.size());
-    params.header_text = Common::UTF16StringFromFixedZeroTerminatedBuffer(
-        config.header_text.data(), config.header_text.size());
-    params.sub_text = Common::UTF16StringFromFixedZeroTerminatedBuffer(config.sub_text.data(),
-                                                                       config.sub_text.size());
-    params.guide_text = Common::UTF16StringFromFixedZeroTerminatedBuffer(config.guide_text.data(),
-                                                                         config.guide_text.size());
-    params.initial_text = std::move(initial_text);
-    params.max_length = config.length_limit == 0 ? DEFAULT_MAX_LENGTH : config.length_limit;
-    params.password = static_cast<bool>(config.is_password);
-    params.cursor_at_beginning = static_cast<bool>(config.initial_cursor_position);
-    params.value = static_cast<u8>(config.keyset_disable_bitmask);
-
-    return params;
-}
-
 SoftwareKeyboard::SoftwareKeyboard(Core::System& system_,
                                    const Core::Frontend::SoftwareKeyboardApplet& frontend_)
     : Applet{system_.Kernel()}, frontend{frontend_}, system{system_} {}
 
 SoftwareKeyboard::~SoftwareKeyboard() = default;
 
-void SoftwareKeyboard::Initialize() {
-    complete = false;
-    is_inline = false;
-    initial_text.clear();
-    final_data.clear();
-
-    Applet::Initialize();
-
-    const auto keyboard_config_storage = broker.PopNormalDataToApplet();
-    ASSERT(keyboard_config_storage != nullptr);
-    const auto& keyboard_config = keyboard_config_storage->GetData();
-
-    if (keyboard_config.size() == SWKBD_INLINE_INIT_SIZE) {
-        is_inline = true;
-        return;
-    }
-
-    ASSERT(keyboard_config.size() >= sizeof(KeyboardConfig));
-    std::memcpy(&config, keyboard_config.data(), sizeof(KeyboardConfig));
-
-    const auto work_buffer_storage = broker.PopNormalDataToApplet();
-    ASSERT_OR_EXECUTE(work_buffer_storage != nullptr, { return; });
-    const auto& work_buffer = work_buffer_storage->GetData();
-
-    if (config.initial_string_size == 0)
-        return;
-
-    std::vector<char16_t> string(config.initial_string_size);
-    std::memcpy(string.data(), work_buffer.data() + config.initial_string_offset,
-                string.size() * 2);
-    initial_text = Common::UTF16StringFromFixedZeroTerminatedBuffer(string.data(), string.size());
-}
-
-bool SoftwareKeyboard::TransactionComplete() const {
-    return complete;
-}
-
-ResultCode SoftwareKeyboard::GetStatus() const {
-    return RESULT_SUCCESS;
-}
-
-void SoftwareKeyboard::ExecuteInteractive() {
-    if (complete)
-        return;
-
-    const auto storage = broker.PopInteractiveDataToApplet();
-    ASSERT(storage != nullptr);
-    const auto data = storage->GetData();
-    if (!is_inline) {
-        const auto status = static_cast<bool>(data[0]);
-        if (status == INTERACTIVE_STATUS_OK) {
-            complete = true;
-        } else {
-            std::array<char16_t, SWKBD_OUTPUT_INTERACTIVE_BUFFER_SIZE / 2 - 2> string;
-            std::memcpy(string.data(), data.data() + 4, string.size() * 2);
-            frontend.SendTextCheckDialog(
-                Common::UTF16StringFromFixedZeroTerminatedBuffer(string.data(), string.size()),
-                [this] { broker.SignalStateChanged(); });
-        }
-    } else {
-        Request request{};
-        std::memcpy(&request, data.data(), sizeof(Request));
-
-        switch (request) {
-        case Request::Finalize:
-            complete = true;
-            broker.SignalStateChanged();
-            break;
-        case Request::Calc: {
-            broker.PushNormalDataFromApplet(std::make_shared<IStorage>(system, std::vector<u8>{1}));
-            broker.SignalStateChanged();
-            break;
-        }
-        default:
-            UNIMPLEMENTED_MSG("Request {:X} is not implemented", request);
-            break;
-        }
-    }
-}
-
-void SoftwareKeyboard::Execute() {
-    if (complete) {
-        broker.PushNormalDataFromApplet(std::make_shared<IStorage>(system, std::move(final_data)));
-        broker.SignalStateChanged();
-        return;
-    }
-
-    const auto parameters = ConvertToFrontendParameters(config, initial_text);
-    if (!is_inline) {
-        frontend.RequestText(
-            [this](std::optional<std::u16string> text) { WriteText(std::move(text)); }, parameters);
-    }
-}
-
-void SoftwareKeyboard::WriteText(std::optional<std::u16string> text) {
-    std::vector<u8> output_main(SWKBD_OUTPUT_BUFFER_SIZE);
-
-    if (text.has_value()) {
-        std::vector<u8> output_sub(SWKBD_OUTPUT_BUFFER_SIZE);
-
-        if (config.utf_8) {
-            const u64 size = text->size() + sizeof(u64);
-            const auto new_text = Common::UTF16ToUTF8(*text);
+void SoftwareKeyboard::Initialize() {}
 
-            std::memcpy(output_sub.data(), &size, sizeof(u64));
-            std::memcpy(output_sub.data() + 8, new_text.data(),
-                        std::min(new_text.size(), SWKBD_OUTPUT_BUFFER_SIZE - 8));
+bool SoftwareKeyboard::TransactionComplete() const {}
 
-            output_main[0] = INTERACTIVE_STATUS_OK;
-            std::memcpy(output_main.data() + 4, new_text.data(),
-                        std::min(new_text.size(), SWKBD_OUTPUT_BUFFER_SIZE - 4));
-        } else {
-            const u64 size = text->size() * 2 + sizeof(u64);
-            std::memcpy(output_sub.data(), &size, sizeof(u64));
-            std::memcpy(output_sub.data() + 8, text->data(),
-                        std::min(text->size() * 2, SWKBD_OUTPUT_BUFFER_SIZE - 8));
+ResultCode SoftwareKeyboard::GetStatus() const {}
 
-            output_main[0] = INTERACTIVE_STATUS_OK;
-            std::memcpy(output_main.data() + 4, text->data(),
-                        std::min(text->size() * 2, SWKBD_OUTPUT_BUFFER_SIZE - 4));
-        }
+void SoftwareKeyboard::ExecuteInteractive() {}
 
-        complete = !config.text_check;
-        final_data = output_main;
+void SoftwareKeyboard::Execute() {}
 
-        if (complete) {
-            broker.PushNormalDataFromApplet(
-                std::make_shared<IStorage>(system, std::move(output_main)));
-            broker.SignalStateChanged();
-        } else {
-            broker.PushInteractiveDataFromApplet(
-                std::make_shared<IStorage>(system, std::move(output_sub)));
-        }
-    } else {
-        output_main[0] = 1;
-        complete = true;
-        broker.PushNormalDataFromApplet(std::make_shared<IStorage>(system, std::move(output_main)));
-        broker.SignalStateChanged();
-    }
-}
 } // namespace Service::AM::Applets
diff --git a/src/core/hle/service/am/applets/software_keyboard.h b/src/core/hle/service/am/applets/software_keyboard.h
index 1d260fef8..c161ec9ac 100644
--- a/src/core/hle/service/am/applets/software_keyboard.h
+++ b/src/core/hle/service/am/applets/software_keyboard.h
@@ -4,59 +4,17 @@
 
 #pragma once
 
-#include <array>
-#include <string>
-#include <vector>
-
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "common/swap.h"
-#include "core/hle/service/am/am.h"
+#include "core/hle/result.h"
 #include "core/hle/service/am/applets/applets.h"
 
-union ResultCode;
-
 namespace Core {
 class System;
 }
 
 namespace Service::AM::Applets {
 
-enum class KeysetDisable : u32 {
-    Space = 0x02,
-    Address = 0x04,
-    Percent = 0x08,
-    Slashes = 0x10,
-    Numbers = 0x40,
-    DownloadCode = 0x80,
-};
-
-struct KeyboardConfig {
-    INSERT_PADDING_BYTES(4);
-    std::array<char16_t, 9> submit_text;
-    u16_le left_symbol_key;
-    u16_le right_symbol_key;
-    INSERT_PADDING_BYTES(1);
-    KeysetDisable keyset_disable_bitmask;
-    u32_le initial_cursor_position;
-    std::array<char16_t, 65> header_text;
-    std::array<char16_t, 129> sub_text;
-    std::array<char16_t, 257> guide_text;
-    u32_le length_limit;
-    INSERT_PADDING_BYTES(4);
-    u32_le is_password;
-    INSERT_PADDING_BYTES(5);
-    bool utf_8;
-    bool draw_background;
-    u32_le initial_string_offset;
-    u32_le initial_string_size;
-    u32_le user_dictionary_offset;
-    u32_le user_dictionary_size;
-    bool text_check;
-    u64_le text_check_callback;
-};
-static_assert(sizeof(KeyboardConfig) == 0x3E0, "KeyboardConfig has incorrect size.");
-
 class SoftwareKeyboard final : public Applet {
 public:
     explicit SoftwareKeyboard(Core::System& system_,
@@ -70,16 +28,9 @@ public:
     void ExecuteInteractive() override;
     void Execute() override;
 
-    void WriteText(std::optional<std::u16string> text);
-
 private:
     const Core::Frontend::SoftwareKeyboardApplet& frontend;
 
-    KeyboardConfig config;
-    std::u16string initial_text;
-    bool complete = false;
-    bool is_inline = false;
-    std::vector<u8> final_data;
     Core::System& system;
 };