mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 21:02:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle the output swkbd storage.

Browse Source
This commit is contained in:
yellows8 2018-12-20 20:48:36 -05:00
parent 32f93bef5d
commit 58cbacc76f
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nx/include/switch/applets/swkbd.h
View File

@ -25,6 +25,8 @@ void swkbdCreate(SwkbdConfig* c);
/**
* @brief Launch swkbd with the specified config. This will return once swkbd is finished running.
* @param c SwkbdConfig struct.
* @param out_string UTF-8 Output string buffer.
* @param out_string_size UTF-8 Output string buffer size, including NUL-terminator.
*/
Result swkbdShow(SwkbdConfig* c);
Result swkbdShow(SwkbdConfig* c, char* out_string, size_t out_string_size);

43
nx/source/applets/swkbd.c
View File

@ -1,15 +1,54 @@
#include <string.h>
#include <malloc.h>
#include "types.h"
#include "result.h"
#include "services/applet.h"
#include "applets/libapplet.h"
#include "applets/swkbd.h"
#include "runtime/util/utf.h"
//TODO: InlineKeyboard currently isn't supported.
void swkbdCreate(SwkbdConfig* c) {
memset(c, 0, sizeof(SwkbdConfig));
}
Result swkbdShow(SwkbdConfig* c) {
static void _swkbdConvertToUTF8(char* out, const u16* in, size_t max) {
out[0] = 0;
if (out==NULL || in==NULL) return;
ssize_t units = utf16_to_utf8((uint8_t*)out, in, max);
if (units < 0) return;
out[units] = 0;
}
static Result _swkbdProcessOutput(AppletHolder* h, char* out_string, size_t out_string_size) {
Result rc=0;
AppletStorage outstorage;
u32 CloseResult=0;
uint16_t* strbuf = NULL;
size_t strbuf_size = 0x7D4;
rc = appletHolderPopOutData(h, &outstorage);
if (R_FAILED(rc)) return rc;
strbuf = (u16*)malloc(strbuf_size+2);
if (strbuf==NULL) rc = MAKERESULT(Module_Libnx, LibnxError_OutOfMemory);
if (strbuf) memset(strbuf, 0, strbuf_size+2);
if (R_SUCCEEDED(rc)) rc = appletStorageRead(&outstorage, 0, &CloseResult, sizeof(CloseResult));
if (R_SUCCEEDED(rc) && CloseResult!=0) rc = 0x29f;//TODO: See below.
if (R_SUCCEEDED(rc)) rc = appletStorageRead(&outstorage, sizeof(CloseResult), strbuf, strbuf_size);
if (R_SUCCEEDED(rc)) _swkbdConvertToUTF8(out_string, strbuf, out_string_size-1);
free(strbuf);
appletStorageClose(&outstorage);
return rc;
}
Result swkbdShow(SwkbdConfig* c, char* out_string, size_t out_string_size) {
Result rc=0;
AppletHolder holder;
AppletStorage storage;
@ -53,7 +92,7 @@ Result swkbdShow(SwkbdConfig* c) {
return -1;
}
else { //success
//TODO: Process the output storage here. When the output CloseResult indicates failure, official sw returns same error as above.
rc = _swkbdProcessOutput(&holder, out_string, out_string_size);
}
}