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

Moved applet notification-msg handling code into new funcs appletGetMessage and appletProcessMessage (with some improvements), which appletMainLoop now calls.

Browse Source
This commit is contained in:
yellows8 2019-02-27 19:03:35 -05:00
parent eb750b641b
commit 6dea82a668
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nx/include/switch/services/applet.h
View File

@ -459,8 +459,21 @@ Result appletStorageGetHandle(AppletStorage *s, s64 *out, Handle *handle);
*/ */
Result appletStorageMap(AppletStorage *s, void** addr, size_t *size); Result appletStorageMap(AppletStorage *s, void** addr, size_t *size);
/**
* @brief Gets a notification message.
*/
Result appletGetMessage(u32 *msg);
/**
* @brief Processes the current applet status using the specified msg.
* @param msg Notification message, normally from \ref appletGetMessage.
* @return Whether the application should continue running.
*/
bool appletProcessMessage(u32 msg);
/** /**
* @brief Processes the current applet status. Generally used within a main loop. * @brief Processes the current applet status. Generally used within a main loop.
* @note Uses \ref appletGetMessage and \ref appletProcessMessage internally.
* @return Whether the application should continue running. * @return Whether the application should continue running.
*/ */
bool appletMainLoop(void); bool appletMainLoop(void);

36
nx/source/services/applet.c
View File

@ -2292,23 +2292,29 @@ AppletFocusState appletGetFocusState(void) {
return (AppletFocusState)g_appletFocusState; return (AppletFocusState)g_appletFocusState;
} }
bool appletMainLoop(void) { Result appletGetMessage(u32 *msg) {
Result rc; Result rc=0;
u32 msg = 0; if (msg==NULL) return MAKERESULT(Module_Libnx, LibnxError_BadInput);
if (R_FAILED(eventWait(&g_appletMessageEvent, 0)))
return true;
rc = _appletReceiveMessage(&msg);
rc = eventWait(&g_appletMessageEvent, 0);
if (R_FAILED(rc)) if (R_FAILED(rc))
{ return rc;
if ((rc & 0x3fffff) == 0x680)
return true; rc = _appletReceiveMessage(msg);
if (R_FAILED(rc)) {
if (R_VALUE(rc) == MAKERESULT(128, 3))
return rc;
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_BadAppletReceiveMessage)); fatalSimple(MAKERESULT(Module_Libnx, LibnxError_BadAppletReceiveMessage));
} }
return 0;
}
bool appletProcessMessage(u32 msg) {
Result rc;
switch(msg) { switch(msg) {
case 0x4: case 0x4:
appletCallHook(AppletHookType_OnExitRequest); appletCallHook(AppletHookType_OnExitRequest);
@ -2342,3 +2348,11 @@ bool appletMainLoop(void) {
return true; return true;
} }
bool appletMainLoop(void) {
u32 msg = 0;
if (R_FAILED(appletGetMessage(&msg))) return true;
return appletProcessMessage(msg);
}