mirror of
				https://git.suyu.dev/suyu/suyu.git
				synced 2025-10-31 06:46:40 +08:00 
			
		
		
		
	am/applets: Add connector between frontend and AM applet classes
Provides a middleman between the Frontend provider class and the expected AM::Applets::Applet class needed by ILibraryAppletAccessor
This commit is contained in:
		
							parent
							
								
									ae53b84efd
								
							
						
					
					
						commit
						de16c1e453
					
				| @ -154,6 +154,8 @@ add_library(core STATIC | ||||
|     hle/service/am/applet_oe.h | ||||
|     hle/service/am/applets/applets.cpp | ||||
|     hle/service/am/applets/applets.h | ||||
|     hle/service/am/applets/software_keyboard.cpp | ||||
|     hle/service/am/applets/software_keyboard.h | ||||
|     hle/service/am/idle.cpp | ||||
|     hle/service/am/idle.h | ||||
|     hle/service/am/omm.cpp | ||||
|  | ||||
							
								
								
									
										71
									
								
								src/core/hle/service/am/applets/software_keyboard.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										71
									
								
								src/core/hle/service/am/applets/software_keyboard.cpp
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,71 @@ | ||||
| // Copyright 2018 yuzu emulator team
 | ||||
| // Licensed under GPLv2 or any later version
 | ||||
| // Refer to the license.txt file included.
 | ||||
| 
 | ||||
| #include "common/assert.h" | ||||
| #include "common/string_util.h" | ||||
| #include "core/frontend/applets/software_keyboard.h" | ||||
| #include "core/hle/service/am/am.h" | ||||
| #include "core/hle/service/am/applets/software_keyboard.h" | ||||
| 
 | ||||
| namespace Service::AM::Applets { | ||||
| 
 | ||||
| constexpr std::size_t SWKBD_OUTPUT_BUFFER_SIZE = 0x7D8; | ||||
| constexpr std::size_t DEFAULT_MAX_LENGTH = 500; | ||||
| 
 | ||||
| static Frontend::SoftwareKeyboardApplet::Parameters ConvertToFrontendParameters( | ||||
|     KeyboardConfig config, std::u16string initial_text) { | ||||
|     Frontend::SoftwareKeyboardApplet::Parameters 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 = 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; | ||||
| } | ||||
| 
 | ||||
| void SoftwareKeyboard::Initialize(std::vector<std::shared_ptr<IStorage>> storage_) { | ||||
|     Applet::Initialize(std::move(storage_)); | ||||
| 
 | ||||
|     ASSERT(storage_stack.size() >= 2); | ||||
|     const auto& keyboard_config = storage_stack[1]->GetData(); | ||||
|     ASSERT(keyboard_config.size() >= sizeof(KeyboardConfig)); | ||||
|     std::memcpy(&config, keyboard_config.data(), sizeof(KeyboardConfig)); | ||||
| 
 | ||||
|     ASSERT_MSG(config.text_check == 0, "Text check software keyboard mode is not implemented!"); | ||||
| 
 | ||||
|     const auto& work_buffer = storage_stack[2]->GetData(); | ||||
|     std::memcpy(initial_text.data(), work_buffer.data() + config.initial_string_offset, | ||||
|                 config.initial_string_size); | ||||
| } | ||||
| 
 | ||||
| IStorage SoftwareKeyboard::Execute() { | ||||
|     const auto frontend{GetSoftwareKeyboard()}; | ||||
|     ASSERT(frontend != nullptr); | ||||
| 
 | ||||
|     const auto parameters = ConvertToFrontendParameters(config, initial_text); | ||||
| 
 | ||||
|     std::u16string text; | ||||
|     const auto success = frontend->GetText(parameters, text); | ||||
| 
 | ||||
|     std::vector<u8> output(SWKBD_OUTPUT_BUFFER_SIZE); | ||||
| 
 | ||||
|     if (success) { | ||||
|         output[0] = 1; | ||||
|         std::memcpy(output.data() + 4, text.data(), | ||||
|                     std::min<std::size_t>(text.size() * 2, SWKBD_OUTPUT_BUFFER_SIZE - 4)); | ||||
|     } | ||||
| 
 | ||||
|     return IStorage{output}; | ||||
| } | ||||
| } // namespace Service::AM::Applets
 | ||||
							
								
								
									
										57
									
								
								src/core/hle/service/am/applets/software_keyboard.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										57
									
								
								src/core/hle/service/am/applets/software_keyboard.h
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,57 @@ | ||||
| // Copyright 2018 yuzu emulator team
 | ||||
| // Licensed under GPLv2 or any later version
 | ||||
| // Refer to the license.txt file included.
 | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include "common/common_funcs.h" | ||||
| #include "core/hle/service/am/applets/applets.h" | ||||
| 
 | ||||
| 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(6); | ||||
|     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: | ||||
|     void Initialize(std::vector<std::shared_ptr<IStorage>> storage) override; | ||||
| 
 | ||||
|     IStorage Execute() override; | ||||
| 
 | ||||
| private: | ||||
|     KeyboardConfig config; | ||||
|     std::u16string initial_text; | ||||
| }; | ||||
| 
 | ||||
| } // namespace Service::AM::Applets
 | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user