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

In webConfigSetBootAsMediaPlayer with News on 3.0.0+, set WebArgType_BootAsMediaPlayerInverted. Added _webTLVRead/_webConfigGet*. Improved web docs.

Browse Source
This commit is contained in:
yellows8 2019-03-01 16:33:13 -05:00
parent ff3a4f9844
commit 6211510b21
2 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ typedef enum {
WebArgType_LeftStickMode = 0x1B, ///< [1.0.0+] u32 enum *LeftStickMode
WebArgType_KeyRepeatFrame0 = 0x1C, ///< [1.0.0+] s32 KeyRepeatFrame, first param
WebArgType_KeyRepeatFrame1 = 0x1D, ///< [1.0.0+] s32 KeyRepeatFrame, second param
WebArgType_BootAsMediaPlayerInverted = 0x1E, ///< [1.0.0+] u8 bool. With News this is set after BootAsMediaPlayer with the value inverted.
WebArgType_BootAsMediaPlayerInverted = 0x1E, ///< [1.0.0+] u8 bool. With News on [3.0.0+] this is set after BootAsMediaPlayer with the value inverted.
WebArgType_DisplayUrlKind = 0x1F, ///< [1.0.0+] u8 bool, DisplayUrlKind (value = (input_enumval==0x1)).
WebArgType_BootAsMediaPlayer = 0x21, ///< [2.0.0+] u8 bool
WebArgType_ShopJump = 0x22, ///< [2.0.0+] u8 bool
@ -290,6 +290,7 @@ Result webConfigSetDisplayUrlKind(WebCommonConfig* config, bool kind);
/**
* @brief Sets the BootAsMediaPlayer flag.
* @note Only available with config created by \ref webPageCreate or with Offline-applet, on [2.0.0+].
* @note With config created by \ref webNewsCreate on [3.0.0+], this also sets WebArgType_BootAsMediaPlayerInverted to !flag.
* @param config WebCommonConfig object.
* @param flag Flag. true = BootAsMediaPlayer, false = BootAsWebPage.
*/

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

@ -141,10 +141,51 @@ static Result _webTLVWrite(WebCommonTLVStorage *storage, u16 type, const void* a
return 0;
}
static Result _webTLVRead(WebCommonTLVStorage *storage, u16 type, void* argdata, u16 argdata_size) {
Result rc = MAKERESULT(Module_Libnx, LibnxError_BadInput);
size_t i, count, offset;
u8 *dataptr = storage->data;
WebArgHeader *hdr = (WebArgHeader*)dataptr;
WebArgTLV *tlv;
size_t size = sizeof(storage->data);
offset = sizeof(WebArgHeader);
if (size < offset) return rc;
count = hdr->total_entries;
tlv = (WebArgTLV*)&dataptr[offset];
for (i=0; i<count; i++) {
if (size < offset + sizeof(WebArgTLV)) return rc;
tlv = (WebArgTLV*)&dataptr[offset];
if (tlv->type == type) {
if (tlv->size != argdata_size) return rc;
break;
}
offset+= sizeof(WebArgTLV) + tlv->size;
if (size < offset) return rc;
}
if (i==count) return MAKERESULT(Module_Libnx, LibnxError_NotFound);
if (size < offset + sizeof(WebArgTLV) + argdata_size) return rc;
offset+= sizeof(WebArgTLV);
memcpy(argdata, &dataptr[offset], argdata_size);
return 0;
}
static Result _webTLVSet(WebCommonConfig* config, u16 type, const void* argdata, u16 argdata_size) {
return _webTLVWrite(&config->arg, type, argdata, argdata_size, argdata_size);
}
static Result _webConfigGet(WebCommonConfig* config, u16 type, void* argdata, u16 argdata_size) {
return _webTLVRead(&config->arg, type, argdata, argdata_size);
}
static Result _webConfigSetU8(WebCommonConfig* config, u16 type, u8 arg) {
return _webTLVSet(config, type, &arg, sizeof(arg));
}
@ -168,6 +209,17 @@ static Result _webConfigSetUrl(WebCommonConfig* config, const char* url) {
return _webConfigSetString(config, WebArgType_Url, url, 0xc00);
}
static Result _webConfigGetU8(WebCommonConfig* config, u16 type, u8 *arg) {
return _webConfigGet(config, type, arg, sizeof(*arg));
}
static Result _webConfigGetFlag(WebCommonConfig* config, u16 type, bool *arg) {
u8 tmpdata=0;
Result rc = _webConfigGetU8(config, type, &tmpdata);
*arg = tmpdata!=0;
return rc;
}
Result webPageCreate(WebCommonConfig* config, const char* url) {
Result rc=0;
_webArgInitialize(config, AppletId_web, WebShimKind_Web);
@ -306,11 +358,19 @@ Result webConfigSetDisplayUrlKind(WebCommonConfig* config, bool kind) {
}
Result webConfigSetBootAsMediaPlayer(WebCommonConfig* config, bool flag) {
Result rc=0;
WebShimKind shim = _webGetShimKind(config);
if (shim != WebShimKind_Offline && shim != WebShimKind_Web) return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
if (hosversionBefore(2,0,0)) return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
return _webConfigSetFlag(config, WebArgType_BootAsMediaPlayer, flag);
//TODO: Need to check for News somehow and set WebArgType_BootAsMediaPlayerInverted.
rc = _webConfigSetFlag(config, WebArgType_BootAsMediaPlayer, flag);
if (R_SUCCEEDED(rc) && config->version >= 0x30000) {//Check if the NewsFlag is set on [3.0.0+], and set WebArgType_BootAsMediaPlayerInverted if so.
bool tmpval=false;
Result tmprc = _webConfigGetFlag(config, WebArgType_NewsFlag, &tmpval);
if (R_SUCCEEDED(tmprc) && tmpval) rc = _webConfigSetFlag(config, WebArgType_BootAsMediaPlayerInverted, !flag);
}
return rc;
}
Result webConfigSetShopJump(WebCommonConfig* config, bool flag) {