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

Added webConfigSetDisplayUrlKind. Added more _webConfigSet* funcs.

Browse Source
This commit is contained in:
yellows8 2019-02-25 21:23:53 -05:00
parent 708ad83ead
commit 91bf06653e
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nx/include/switch/applets/web.h
View File

@ -98,6 +98,13 @@ void webPageCreate(WebCommonConfig* config, const char* url);
*/ */
void webConfigSetWhitelist(WebCommonConfig* config, const char* whitelist); void webConfigSetWhitelist(WebCommonConfig* config, const char* whitelist);
/**
* @brief Sets the DisplayUrlKind.
* @param config WebCommonConfig object.
* @param kind Kind
*/
void webConfigSetDisplayUrlKind(WebCommonConfig* config, bool kind);
/** /**
* @brief Launches the {web applet} with the specified config and waits for it to exit. * @brief Launches the {web applet} with the specified config and waits for it to exit.
* @param config WebCommonConfig object. * @param config WebCommonConfig object.

21
nx/source/applets/web.c
View File

@ -126,6 +126,18 @@ static void _webTLVSet(WebCommonTLVStorage *storage, u16 type, const void* argda
_webTLVWrite(storage, type, argdata, argdata_size, argdata_size); _webTLVWrite(storage, type, argdata, argdata_size, argdata_size);
} }
static void _webConfigSetU8(WebCommonConfig* config, u16 type, u8 arg) {
_webTLVSet(&config->arg, type, &arg, sizeof(arg));
}
static void _webConfigSetFlag(WebCommonConfig* config, u16 type, bool arg) {
_webConfigSetU8(config, type, arg!=0);
}
/*static void _webConfigSetU32(WebCommonConfig* config, u16 type, u32 arg) {
_webTLVSet(&config->arg, type, &arg, sizeof(arg));
}*/
static void _webConfigSetString(WebCommonConfig* config, u16 type, const char* str, u16 argdata_size_total) { static void _webConfigSetString(WebCommonConfig* config, u16 type, const char* str, u16 argdata_size_total) {
u16 arglen = strlen(str); u16 arglen = strlen(str);
if (arglen >= argdata_size_total) arglen = argdata_size_total-1; //The string must be NUL-terminated. if (arglen >= argdata_size_total) arglen = argdata_size_total-1; //The string must be NUL-terminated.
@ -156,9 +168,8 @@ Result webWifiShow(WebWifiConfig* config, WebWifiReturnValue *out) {
void webPageCreate(WebCommonConfig* config, const char* url) { void webPageCreate(WebCommonConfig* config, const char* url) {
_webArgInitialize(config, AppletId_web, WebShimKind_Web); _webArgInitialize(config, AppletId_web, WebShimKind_Web);
u8 tmpval=1; _webConfigSetU8(config, 0xD, 1);
_webTLVSet(&config->arg, 0xD, &tmpval, sizeof(tmpval)); if (config->version < 0x30000) _webConfigSetU8(config, 0x12, 1); // Removed from user-process init with [3.0.0+].
if (config->version < 0x30000) _webTLVSet(&config->arg, 0x12, &tmpval, sizeof(tmpval)); // Removed from user-process init with [3.0.0+].
_webConfigSetUrl(config, url); _webConfigSetUrl(config, url);
} }
@ -168,6 +179,10 @@ void webConfigSetWhitelist(WebCommonConfig* config, const char* whitelist) {
_webConfigSetString(config, 0xA, whitelist, 0x1000); _webConfigSetString(config, 0xA, whitelist, 0x1000);
} }
void webConfigSetDisplayUrlKind(WebCommonConfig* config, bool kind) {
_webConfigSetFlag(config, 0x1F, kind);
}
Result webConfigShow(WebCommonConfig* config, WebCommonReturnValue *out) { Result webConfigShow(WebCommonConfig* config, WebCommonReturnValue *out) {
return _webShow(config->appletid, config->version, &config->arg, sizeof(config->arg), out, sizeof(*out)); return _webShow(config->appletid, config->version, &config->arg, sizeof(config->arg), out, sizeof(*out));
} }