Added AppletNotificationMessage enum and improved docs. Added support for appletSetRestartMessageEnabled, appletSetRequiresCaptureButtonShortPressedMessage, and appletSetAlbumImageTakenNotificationEnabled. Renamed appletSetScreenShotImageOrientation to appletSetAlbumImageOrientation.

nx/include/switch/services/applet.h

@@ -13,6 +13,7 @@
 #include "../kernel/tmem.h"
 #include "../kernel/event.h"
 
+/// AppletType
 typedef enum {
     AppletType_None = -2,
     AppletType_Default = -1,
@@ -23,6 +24,7 @@ typedef enum {
     AppletType_SystemApplication = 4,
 } AppletType;
 
+/// OperationMode
 typedef enum {
     AppletOperationMode_Handheld = 0,
     AppletOperationMode_Docked = 1,
@@ -30,20 +32,36 @@ typedef enum {
 
 /// applet hook types.
 typedef enum {
-    AppletHookType_OnFocusState = 0,  ///< FocusState changed.
+    AppletHookType_OnFocusState = 0,                    ///< ::AppletNotificationMessage_FocusStateChanged
-    AppletHookType_OnOperationMode,   ///< OperationMode changed.
+    AppletHookType_OnOperationMode,                     ///< ::AppletNotificationMessage_OperationModeChanged
-    AppletHookType_OnPerformanceMode, ///< PerformanceMode changed.
+    AppletHookType_OnPerformanceMode,                   ///< ::AppletNotificationMessage_PerformanceModeChanged
-    AppletHookType_OnExitRequest,     ///< Exit requested.
+    AppletHookType_OnExitRequest,                       ///< ::AppletNotificationMessage_ExitRequested
+    AppletHookType_OnRestart,                           ///< ::AppletNotificationMessage_Restart
+    AppletHookType_OnCaptureButtonShortPressed,         ///< ::AppletNotificationMessage_CaptureButtonShortPressed
+    AppletHookType_OnAlbumImageTaken,                   ///< ::AppletNotificationMessage_AlbumImageTaken
 
-    AppletHookType_Max,               ///< Number of applet hook types.
+    AppletHookType_Max,                                 ///< Number of applet hook types.
 } AppletHookType;
 
+/// NotificationMessage, for \ref appletGetMessage. See also \ref AppletHookType.
+typedef enum {
+    AppletNotificationMessage_ExitRequested             = 0x4,    ///< Exit requested.
+    AppletNotificationMessage_FocusStateChanged         = 0xF,    ///< FocusState changed.
+    AppletNotificationMessage_Restart                   = 0x10,   ///< Current applet execution was resumed.
+    AppletNotificationMessage_OperationModeChanged      = 0x1E,   ///< OperationMode changed.
+    AppletNotificationMessage_PerformanceModeChanged    = 0x1F,   ///< PerformanceMode changed.
+    AppletNotificationMessage_CaptureButtonShortPressed = 0x5A,   ///< Capture button was short-pressed.
+    AppletNotificationMessage_AlbumImageTaken           = 0x5C,   ///< Screenshot was taken.
+} AppletNotificationMessage;
+
+/// FocusState
 typedef enum {
     AppletFocusState_Focused = 1,                   ///< Applet is focused.
     AppletFocusState_NotFocusedLibraryApplet = 2,   ///< Out of focus - LibraryApplet open.
     AppletFocusState_NotFocusedHomeSleep = 3        ///< Out of focus - HOME menu open / console is sleeping.
 } AppletFocusState;
 
+/// FocusHandlingMode
 typedef enum {
   AppletFocusHandlingMode_SuspendHomeSleep = 0,       ///< Suspend only when HOME menu is open / console is sleeping (default).
   AppletFocusHandlingMode_NoSuspend,                  ///< Don't suspend when out of focus.
@@ -53,12 +71,14 @@ typedef enum {
   AppletFocusHandlingMode_Max,                        ///< Number of focus handling modes.
 } AppletFocusHandlingMode;
 
+/// LaunchParameterKind
 typedef enum {
     AppletLaunchParameterKind_Application     = 1, ///< Application-specific LaunchParameter
     AppletLaunchParameterKind_PreselectedUser = 2, ///< account PreselectedUser
     AppletLaunchParameterKind_Unknown         = 3, ///< Unknown if used by anything?
 } AppletLaunchParameterKind;
 
+/// AppletId
 typedef enum {
     AppletId_overlayDisp = 0x02,    ///< 010000000000100C "overlayDisp"
     AppletId_qlaunch = 0x03,        ///< 0100000000001000 "qlaunch" (SystemAppletMenu)
@@ -364,7 +384,25 @@ Result appletLeaveFatalSection(void);
  */
 Result appletSetScreenShotPermission(AppletScreenShotPermission permission);
 
-Result appletSetScreenShotImageOrientation(s32 val);
+/**
+ * @brief Sets whether ::AppletNotificationMessage_Restart is enabled.
+ * @param[in] flag Whether to enable the notification.
+ */
+Result appletSetRestartMessageEnabled(bool flag);
+
+/**
+ * @brief Sets whether ::AppletNotificationMessage_CaptureButtonShortPressed is enabled.
+ * @note Only available with [3.0.0+].
+ * @note When enabled with a non-Overlay applet, Overlay applet will not be notified of capture button short-presses for screenshots.
+ * @param[in] flag Whether to enable the notification.
+ */
+Result appletSetRequiresCaptureButtonShortPressedMessage(bool flag);
+
+/**
+ * @brief Sets the Album screenshot ImageOrientation.
+ * @param[in] val Input value.
+ */
+Result appletSetAlbumImageOrientation(s32 val);
 
 Result appletCreateManagedDisplayLayer(u64 *out);
 
@@ -390,6 +428,13 @@ Result appletIsIlluminanceAvailable(bool *out);
  */
 Result appletGetCurrentIlluminanceEx(bool *bOverLimit, float *fLux);
 
+/**
+ * @brief Sets whether ::AppletNotificationMessage_AlbumImageTaken is enabled.
+ * @note Only available with [7.0.0+].
+ * @param[in] flag Whether to enable the notification.
+ */
+Result appletSetAlbumImageTakenNotificationEnabled(bool flag);
+
 /**
  * @brief Sets the Application AlbumUserData.
  * @note Only available with [8.0.0+].

nx/source/services/applet.c

@@ -2155,11 +2155,22 @@ static Result _appletSetFocusHandlingMode(bool inval0, bool inval1, bool inval2)
     return rc;
 }
 
+Result appletSetRestartMessageEnabled(bool flag) {
+    return _appletCmdInBool(&g_appletISelfController, flag, 14);
+}
+
 static Result _appletSetOutOfFocusSuspendingEnabled(bool flag) {
     return _appletCmdInBool(&g_appletISelfController, flag, 16);
 }
 
-Result appletSetScreenShotImageOrientation(s32 val) {
+Result appletSetRequiresCaptureButtonShortPressedMessage(bool flag) {
+    if (hosversionBefore(3,0,0))
+        return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
+
+    return _appletCmdInBool(&g_appletISelfController, flag, 18);
+}
+
+Result appletSetAlbumImageOrientation(s32 val) {
     if (hosversionBefore(3,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
     return _appletCmdInU32(&g_appletISelfController, val, 19);
@@ -2254,6 +2265,13 @@ Result appletGetCurrentIlluminanceEx(bool *bOverLimit, float *fLux) {
     return rc;
 }
 
+Result appletSetAlbumImageTakenNotificationEnabled(bool flag) {
+    if (hosversionBefore(7,0,0))
+        return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
+
+    return _appletCmdInBool(&g_appletISelfController, flag, 100);
+}
+
 Result appletSetApplicationAlbumUserData(const void* buffer, size_t size) {
     if (hosversionBefore(8,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
@@ -2820,12 +2838,12 @@ bool appletProcessMessage(u32 msg) {
     Result rc;
 
     switch(msg) {
-        case 0x4:
+        case AppletNotificationMessage_ExitRequested:
             appletCallHook(AppletHookType_OnExitRequest);
             return false;
         break;
 
-        case 0xF:
+        case AppletNotificationMessage_FocusStateChanged:
             rc = _appletGetCurrentFocusState(&g_appletFocusState);
             if (R_FAILED(rc))
                 fatalSimple(MAKERESULT(Module_Libnx, LibnxError_BadAppletGetCurrentFocusState));
@@ -2833,7 +2851,11 @@ bool appletProcessMessage(u32 msg) {
             appletCallHook(AppletHookType_OnFocusState);
         break;
 
-        case 0x1E:
+        case AppletNotificationMessage_Restart:
+            appletCallHook(AppletHookType_OnRestart);
+        break;
+
+        case AppletNotificationMessage_OperationModeChanged:
             rc = _appletGetOperationMode(&g_appletOperationMode);
             if (R_FAILED(rc))
                 fatalSimple(MAKERESULT(Module_Libnx, LibnxError_BadAppletGetOperationMode));
@@ -2841,13 +2863,21 @@ bool appletProcessMessage(u32 msg) {
             appletCallHook(AppletHookType_OnOperationMode);
         break;
 
-        case 0x1F:
+        case AppletNotificationMessage_PerformanceModeChanged:
             rc = _appletGetPerformanceMode(&g_appletPerformanceMode);
             if (R_FAILED(rc))
                 fatalSimple(MAKERESULT(Module_Libnx, LibnxError_BadAppletGetPerformanceMode));
 
             appletCallHook(AppletHookType_OnPerformanceMode);
         break;
+
+        case AppletNotificationMessage_CaptureButtonShortPressed:
+            appletCallHook(AppletHookType_OnCaptureButtonShortPressed);
+        break;
+
+        case AppletNotificationMessage_AlbumImageTaken:
+            appletCallHook(AppletHookType_OnAlbumImageTaken);
+        break;
     }
 
     return true;