mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-08-07 00:29:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added SwkbdType. Specifically set the type to SwkbdType_Normal in the Preset funcs which use it. Set type properly on 5.0.0+ for swkbdConfigMakePresetDownloadCode. Improved swkbd docs, including documenting what fields are set by the Preset funcs.

Browse Source
This commit is contained in:
yellows8 2018-12-23 01:23:47 -05:00
parent 56b767efbf
commit 477058d28a
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ typedef SwkbdTextCheckResult (*SwkbdTextCheckCb)(char* tmp_string, size_t tmp_st
/// Base swkbd arg struct.
typedef struct {
u32 unk_x0;
u32 type; ///< See \ref SwkbdType.
u16 okButtonText[18/2];
u16 leftButtonText;
u16 rightButtonText;
@ -67,6 +67,12 @@ typedef struct {
u8 unk_x0[0x64];
} SwkbdDictWord;
typedef enum {
SwkbdType_Normal = 0, ///< Normal keyboard.
SwkbdType_NumPad = 1, ///< Number pad. The buttons at the bottom left/right are only available when they're set by \ref swkbdConfigSetLeftOptionalSymbolKey / \ref swkbdConfigSetRightOptionalSymbolKey.
SwkbdType_QWERTY = 2, ///< QWERTY (and variants) keyboard only.
} SwkbdType;
/**
* @brief Creates a SwkbdConfig struct.
* @param c SwkbdConfig struct.
@ -83,6 +89,7 @@ void swkbdClose(SwkbdConfig* c);
/**
* @brief Clears the args in the SwkbdConfig struct and initializes it with the Default Preset.
* @note Do not use this before \ref swkbdCreate.
* @note Sets the following fields: type = \ref SwkbdType_QWERTY, initialCursorPos = 1, returnButtonFlag = 1, blurBackground = 1. Pre-5.0.0: unk_x3b8 = 1.
* @param c SwkbdConfig struct.
*/
void swkbdConfigMakePresetDefault(SwkbdConfig* c);
@ -90,6 +97,7 @@ void swkbdConfigMakePresetDefault(SwkbdConfig* c);
/**
* @brief Clears the args in the SwkbdConfig struct and initializes it with the Password Preset.
* @note Do not use this before \ref swkbdCreate.
* @note Sets the following fields: type = \ref SwkbdType_QWERTY, initialCursorPos = 1, passwordFlag = 1, blurBackground = 1.
* @param c SwkbdConfig struct.
*/
void swkbdConfigMakePresetPassword(SwkbdConfig* c);
@ -97,6 +105,7 @@ void swkbdConfigMakePresetPassword(SwkbdConfig* c);
/**
* @brief Clears the args in the SwkbdConfig struct and initializes it with the UserName Preset.
* @note Do not use this before \ref swkbdCreate.
* @note Sets the following fields: type = \ref SwkbdType_Normal, keySetDisableBitmask = 0x100, initialCursorPos = 1, blurBackground = 1.
* @param c SwkbdConfig struct.
*/
void swkbdConfigMakePresetUserName(SwkbdConfig* c);
@ -104,6 +113,7 @@ void swkbdConfigMakePresetUserName(SwkbdConfig* c);
/**
* @brief Clears the args in the SwkbdConfig struct and initializes it with the DownloadCode Preset.
* @note Do not use this before \ref swkbdCreate.
* @note Sets the following fields: type = \ref SwkbdType_Normal (\ref SwkbdType_QWERTY on 5.0.0+), keySetDisableBitmask = 0x80, initialCursorPos = 1, blurBackground = 1. 5.0.0+: stringLenMax = 16, stringLenMaxExt = 1, unk_x3b8 = 2. unk_x3e0[0-2] = 0x3, 0x7, and 0xb.
* @param c SwkbdConfig struct.
*/
void swkbdConfigMakePresetDownloadCode(SwkbdConfig* c);
@ -116,16 +126,14 @@ void swkbdConfigMakePresetDownloadCode(SwkbdConfig* c);
void swkbdConfigSetOkButtonText(SwkbdConfig* c, const char* str);
/**
* @brief Sets the LeftOptionalSymbolKey. The default is "".
* @note The swkbd applet currently doesn't display this, unknown why.
* @brief Sets the LeftOptionalSymbolKey, for \ref SwkbdType_NumPad. The default is "".
* @param c SwkbdConfig struct.
* @param str UTF-8 input string.
*/
void swkbdConfigSetLeftOptionalSymbolKey(SwkbdConfig* c, const char* str);
/**
* @brief Sets the RightOptionalSymbolKey. The default is "".
* @note The swkbd applet currently doesn't display this, unknown why.
* @brief Sets the RightOptionalSymbolKey, for \ref SwkbdType_NumPad. The default is "".
* @param c SwkbdConfig struct.
* @param str UTF-8 input string.
*/

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

@ -82,7 +82,7 @@ void swkbdClose(SwkbdConfig* c) {
void swkbdConfigMakePresetDefault(SwkbdConfig* c) {
_swkbdConfigClear(c);
c->arg.arg.unk_x0 = 2;
c->arg.arg.type = SwkbdType_QWERTY;
c->arg.arg.initialCursorPos = 1;
if (c->version < 0x50009) c->arg.arg.unk_x3b8 = 1;//removed with 5.x
c->arg.arg.returnButtonFlag = 1;
@ -92,7 +92,7 @@ void swkbdConfigMakePresetDefault(SwkbdConfig* c) {
void swkbdConfigMakePresetPassword(SwkbdConfig* c) {
_swkbdConfigClear(c);
c->arg.arg.unk_x0 = 2;
c->arg.arg.type = SwkbdType_QWERTY;
c->arg.arg.initialCursorPos = 1;
c->arg.arg.passwordFlag = 1;
c->arg.arg.blurBackground = 1;
@ -101,6 +101,7 @@ void swkbdConfigMakePresetPassword(SwkbdConfig* c) {
void swkbdConfigMakePresetUserName(SwkbdConfig* c) {
_swkbdConfigClear(c);
c->arg.arg.type = SwkbdType_Normal;
c->arg.arg.keySetDisableBitmask = 0x100;
c->arg.arg.initialCursorPos = 1;
c->arg.arg.blurBackground = 1;
@ -109,10 +110,13 @@ void swkbdConfigMakePresetUserName(SwkbdConfig* c) {
void swkbdConfigMakePresetDownloadCode(SwkbdConfig* c) {
_swkbdConfigClear(c);
c->arg.arg.type = SwkbdType_Normal;
c->arg.arg.keySetDisableBitmask = 0x80;
c->arg.arg.initialCursorPos = 1;
if (c->version >= 0x50009) {//5.x
c->arg.arg.type = SwkbdType_QWERTY;
c->arg.arg.stringLenMax = 16;
c->arg.arg.stringLenMaxExt = 1;
c->arg.arg.unk_x3b8 = 2;