The-Homebrew-Cloud/libnotifications
2
0
Fork 0
mirror of https://github.com/wiiu-env/libnotifications.git synced 2024-11-21 19:09:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for API 2

Browse Source
This commit is contained in:
Maschell 2024-04-26 13:49:11 +02:00
parent 71e6149b30
commit 75ce22a0f6
4 changed files with 94 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/notifications/notification_defines.h
View File

@ -47,4 +47,5 @@ typedef enum NotificationModuleNotificationOption {
NOTIFICATION_MODULE_DEFAULT_OPTION_DURATION_BEFORE_FADE_OUT, /* Time in seconds before the Notification will fade out: Type: float. Example: 2.5f = 2.5 seconds*/ NOTIFICATION_MODULE_DEFAULT_OPTION_DURATION_BEFORE_FADE_OUT, /* Time in seconds before the Notification will fade out: Type: float. Example: 2.5f = 2.5 seconds*/
NOTIFICATION_MODULE_DEFAULT_OPTION_FINISH_FUNCTION, /* Function that will be called when the Notification starts to fade out. Type: NotificationModuleNotificationFinishedCallback*/ NOTIFICATION_MODULE_DEFAULT_OPTION_FINISH_FUNCTION, /* Function that will be called when the Notification starts to fade out. Type: NotificationModuleNotificationFinishedCallback*/
NOTIFICATION_MODULE_DEFAULT_OPTION_FINISH_FUNCTION_CONTEXT, /* Context that will be passed to the NOTIFICATION_MODULE_DEFAULT_TYPE_FINISH_FUNCTION callback. Type: void* */ NOTIFICATION_MODULE_DEFAULT_OPTION_FINISH_FUNCTION_CONTEXT, /* Context that will be passed to the NOTIFICATION_MODULE_DEFAULT_TYPE_FINISH_FUNCTION callback. Type: void* */
NOTIFICATION_MODULE_DEFAULT_OPTION_KEEP_UNTIL_SHOWN, /* Keeps the notification in memory until it was actually shown */
} NotificationModuleNotificationOption; } NotificationModuleNotificationOption;

12
include/notifications/notifications.h
View File

@ -94,6 +94,7 @@ NotificationModuleStatus NotificationModule_SetDefaultValue(NotificationModuleNo
* @param backgroundColor Background color of the Notification * @param backgroundColor Background color of the Notification
* @param callback Function that will be called then the Notification fades out. * @param callback Function that will be called then the Notification fades out.
* @param callbackContext Context that will be passed to the callback. * @param callbackContext Context that will be passed to the callback.
* @param keepUntilShown The Notification will be stored in a queue until can be shown - even accross application starts
* @return NOTIFICATION_MODULE_RESULT_SUCCESS: The default value has been set.<br> * @return NOTIFICATION_MODULE_RESULT_SUCCESS: The default value has been set.<br>
* NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT: text was NULL.<br> * NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT: text was NULL.<br>
* NOTIFICATION_MODULE_RESULT_UNSUPPORTED_COMMAND: The loaded module version doesn't not support this function.<br> * NOTIFICATION_MODULE_RESULT_UNSUPPORTED_COMMAND: The loaded module version doesn't not support this function.<br>
@ -106,7 +107,8 @@ NotificationModuleStatus NotificationModule_AddInfoNotificationEx(const char *te
NMColor textColor, NMColor textColor,
NMColor backgroundColor, NMColor backgroundColor,
NotificationModuleNotificationFinishedCallback callback, NotificationModuleNotificationFinishedCallback callback,
void *callbackContext); void *callbackContext,
bool keepUntilShown);
/** /**
* Displays a Notification that fade outs after a given time. <br> * Displays a Notification that fade outs after a given time. <br>
@ -161,6 +163,7 @@ NotificationModuleStatus NotificationModule_AddInfoNotificationWithCallback(cons
* @param backgroundColor Background color of the Notification * @param backgroundColor Background color of the Notification
* @param callback Function that will be called then the Notification fades out. * @param callback Function that will be called then the Notification fades out.
* @param callbackContext Context that will be passed to the callback. * @param callbackContext Context that will be passed to the callback.
* @param keepUntilShown The Notification will be stored in a queue until can be shown - even accross application starts
* @return NOTIFICATION_MODULE_RESULT_SUCCESS: The default value has been set.<br> * @return NOTIFICATION_MODULE_RESULT_SUCCESS: The default value has been set.<br>
* NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT: text was NULL.<br> * NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT: text was NULL.<br>
* NOTIFICATION_MODULE_RESULT_UNSUPPORTED_COMMAND: The loaded module version doesn't not support this function.<br> * NOTIFICATION_MODULE_RESULT_UNSUPPORTED_COMMAND: The loaded module version doesn't not support this function.<br>
@ -174,7 +177,8 @@ NotificationModuleStatus NotificationModule_AddErrorNotificationEx(const char *t
NMColor textColor, NMColor textColor,
NMColor backgroundColor, NMColor backgroundColor,
NotificationModuleNotificationFinishedCallback callback, NotificationModuleNotificationFinishedCallback callback,
void *callbackContext); void *callbackContext,
bool keepUntilShown);
/** /**
* Displays a (error) Notification (default background color: red) that shakes and fade outs after a given time. <br> * Displays a (error) Notification (default background color: red) that shakes and fade outs after a given time. <br>
@ -227,6 +231,7 @@ NotificationModuleStatus NotificationModule_AddErrorNotificationWithCallback(con
* @param backgroundColor Background color of the notification * @param backgroundColor Background color of the notification
* @param callback Function that will be called then the Notification fades out. * @param callback Function that will be called then the Notification fades out.
* @param callbackContext Context that will be passed to the callback. * @param callbackContext Context that will be passed to the callback.
* @param keepUntilShown The Notification will be stored in a queue until can be shown - even accross application starts
* @return NOTIFICATION_MODULE_RESULT_SUCCESS: The default value has been set.<br> * @return NOTIFICATION_MODULE_RESULT_SUCCESS: The default value has been set.<br>
* NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT: text or outHandle was NULL <br> * NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT: text or outHandle was NULL <br>
* NOTIFICATION_MODULE_RESULT_UNSUPPORTED_COMMAND: The loaded module version doesn't not support this function.<br> * NOTIFICATION_MODULE_RESULT_UNSUPPORTED_COMMAND: The loaded module version doesn't not support this function.<br>
@ -239,7 +244,8 @@ NotificationModuleStatus NotificationModule_AddDynamicNotificationEx(const char
NMColor textColor, NMColor textColor,
NMColor backgroundColor, NMColor backgroundColor,
NotificationModuleNotificationFinishedCallback callback, NotificationModuleNotificationFinishedCallback callback,
void *callbackContext); void *callbackContext,
bool keepUntilShown);
/** /**
* Displays a Notification that can be updated and stays on the screen until `NotificationModule_FinishDynamicNotification*` has been called. <br> * Displays a Notification that can be updated and stays on the screen until `NotificationModule_FinishDynamicNotification*` has been called. <br>

1
source/internal.h
View File

@ -9,4 +9,5 @@ struct NMDefaultValueStore {
NMColor textColor = {255, 255, 255, 255}; NMColor textColor = {255, 255, 255, 255};
void (*finishFunc)(NotificationModuleHandle, void *context) = nullptr; void (*finishFunc)(NotificationModuleHandle, void *context) = nullptr;
void *finishFuncContext = nullptr; void *finishFuncContext = nullptr;
bool keepUntilShown = false;
}; };

95
source/utils.cpp
View File

@ -26,6 +26,24 @@ static NotificationModuleStatus (*sNMAddDynamicNotification)(const char *,
void *, void *,
NotificationModuleHandle *) = nullptr; NotificationModuleHandle *) = nullptr;
static NotificationModuleStatus (*sNMAddStaticNotificationV2)(const char *,
NotificationModuleNotificationType,
float,
float,
NMColor,
NMColor,
void (*)(NotificationModuleHandle, void *),
void *,
bool) = nullptr;
static NotificationModuleStatus (*sNMAddDynamicNotificationV2)(const char *,
NMColor,
NMColor,
void (*)(NotificationModuleHandle, void *),
void *,
bool,
NotificationModuleHandle *) = nullptr;
static NotificationModuleStatus (*sNMUpdateDynamicNotificationText)(NotificationModuleHandle, static NotificationModuleStatus (*sNMUpdateDynamicNotificationText)(NotificationModuleHandle,
const char *) = nullptr; const char *) = nullptr;
@ -128,6 +146,15 @@ NotificationModuleStatus NotificationModule_InitLibrary() {
sNMFinishDynamicNotification = nullptr; sNMFinishDynamicNotification = nullptr;
} }
if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMAddDynamicNotificationV2", (void **) &sNMAddDynamicNotificationV2) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_ERR("FindExport NMAddDynamicNotificationV2 failed.");
sNMAddDynamicNotificationV2 = nullptr;
}
if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMAddStaticNotificationV2", (void **) &sNMAddStaticNotificationV2) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_ERR("FindExport NMAddStaticNotificationV2 failed.");
sNMAddStaticNotificationV2 = nullptr;
}
sDefaultValues.clear(); sDefaultValues.clear();
sDefaultValues[NOTIFICATION_MODULE_NOTIFICATION_TYPE_INFO]; sDefaultValues[NOTIFICATION_MODULE_NOTIFICATION_TYPE_INFO];
@ -186,7 +213,8 @@ NotificationModuleStatus NotificationModule_AddDynamicNotificationEx(const char
NMColor textColor, NMColor textColor,
NMColor backgroundColor, NMColor backgroundColor,
void (*finishFunc)(NotificationModuleHandle, void *context), void (*finishFunc)(NotificationModuleHandle, void *context),
void *context) { void *context,
bool keepUntilShown) {
if (sNotificationModuleVersion == NOTIFICATION_MODULE_API_VERSION_ERROR) { if (sNotificationModuleVersion == NOTIFICATION_MODULE_API_VERSION_ERROR) {
return NOTIFICATION_MODULE_RESULT_LIB_UNINITIALIZED; return NOTIFICATION_MODULE_RESULT_LIB_UNINITIALIZED;
} }
@ -198,6 +226,19 @@ NotificationModuleStatus NotificationModule_AddDynamicNotificationEx(const char
return NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT; return NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT;
} }
if (sNotificationModuleVersion == 2) {
if (sNMAddDynamicNotificationV2 == nullptr) {
return NOTIFICATION_MODULE_RESULT_UNSUPPORTED_COMMAND;
}
return reinterpret_cast<decltype(sNMAddDynamicNotificationV2)>(sNMAddDynamicNotificationV2)(text,
textColor,
backgroundColor,
finishFunc,
context,
keepUntilShown,
outHandle);
}
return reinterpret_cast<decltype(sNMAddDynamicNotification)>(sNMAddDynamicNotification)(text, return reinterpret_cast<decltype(sNMAddDynamicNotification)>(sNMAddDynamicNotification)(text,
textColor, textColor,
backgroundColor, backgroundColor,
@ -213,7 +254,8 @@ NotificationModuleStatus NotificationModule_AddDynamicNotification(const char *t
cur.textColor, cur.textColor,
cur.backgroundColor, cur.backgroundColor,
cur.finishFunc, cur.finishFunc,
cur.finishFuncContext); cur.finishFuncContext,
cur.keepUntilShown);
} }
NotificationModuleStatus NotificationModule_AddDynamicNotificationWithCallback(const char *text, NotificationModuleStatus NotificationModule_AddDynamicNotificationWithCallback(const char *text,
@ -226,7 +268,8 @@ NotificationModuleStatus NotificationModule_AddDynamicNotificationWithCallback(c
cur.textColor, cur.textColor,
cur.backgroundColor, cur.backgroundColor,
callback, callback,
callbackContext); callbackContext,
cur.keepUntilShown);
} }
static NotificationModuleStatus NotificationModule_AddStaticNotification(const char *text, static NotificationModuleStatus NotificationModule_AddStaticNotification(const char *text,
@ -236,7 +279,8 @@ static NotificationModuleStatus NotificationModule_AddStaticNotification(const c
NMColor textColor, NMColor textColor,
NMColor backgroundColor, NMColor backgroundColor,
NotificationModuleNotificationFinishedCallback callback, NotificationModuleNotificationFinishedCallback callback,
void *callbackContext) { void *callbackContext,
bool keepUntilShown) {
if (sNotificationModuleVersion == NOTIFICATION_MODULE_API_VERSION_ERROR) { if (sNotificationModuleVersion == NOTIFICATION_MODULE_API_VERSION_ERROR) {
return NOTIFICATION_MODULE_RESULT_LIB_UNINITIALIZED; return NOTIFICATION_MODULE_RESULT_LIB_UNINITIALIZED;
} }
@ -248,6 +292,20 @@ static NotificationModuleStatus NotificationModule_AddStaticNotification(const c
return NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT; return NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT;
} }
if (sNotificationModuleVersion == 2) {
if (sNMAddStaticNotificationV2 == nullptr) {
return NOTIFICATION_MODULE_RESULT_UNSUPPORTED_COMMAND;
}
return reinterpret_cast<decltype(sNMAddStaticNotificationV2)>(sNMAddStaticNotificationV2)(text,
type,
durationBeforeFadeOutInSeconds,
shakeDurationInSeconds,
textColor,
backgroundColor,
callback,
callbackContext,
keepUntilShown);
}
return reinterpret_cast<decltype(sNMAddStaticNotification)>(sNMAddStaticNotification)(text, return reinterpret_cast<decltype(sNMAddStaticNotification)>(sNMAddStaticNotification)(text,
type, type,
durationBeforeFadeOutInSeconds, durationBeforeFadeOutInSeconds,
@ -300,6 +358,11 @@ NotificationModuleStatus NotificationModule_SetDefaultValue(NotificationModuleNo
cur.finishFuncContext = arg; cur.finishFuncContext = arg;
break; break;
} }
case NOTIFICATION_MODULE_DEFAULT_OPTION_KEEP_UNTIL_SHOWN: {
auto arg = va_arg(va, int);
cur.keepUntilShown = (bool) arg;
break;
}
default: default:
res = NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT; res = NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT;
break; break;
@ -315,7 +378,8 @@ NotificationModuleStatus NotificationModule_AddInfoNotificationEx(const char *te
NMColor textColor, NMColor textColor,
NMColor backgroundColor, NMColor backgroundColor,
NotificationModuleNotificationFinishedCallback callback, NotificationModuleNotificationFinishedCallback callback,
void *callbackContext) { void *callbackContext,
bool keepUntilShown) {
return NotificationModule_AddStaticNotification(text, return NotificationModule_AddStaticNotification(text,
NOTIFICATION_MODULE_NOTIFICATION_TYPE_INFO, NOTIFICATION_MODULE_NOTIFICATION_TYPE_INFO,
durationBeforeFadeOutInSeconds, durationBeforeFadeOutInSeconds,
@ -323,7 +387,8 @@ NotificationModuleStatus NotificationModule_AddInfoNotificationEx(const char *te
textColor, textColor,
backgroundColor, backgroundColor,
callback, callback,
callbackContext); callbackContext,
keepUntilShown);
} }
NotificationModuleStatus NotificationModule_AddInfoNotification(const char *text) { NotificationModuleStatus NotificationModule_AddInfoNotification(const char *text) {
@ -333,7 +398,8 @@ NotificationModuleStatus NotificationModule_AddInfoNotification(const char *text
cur.textColor, cur.textColor,
cur.backgroundColor, cur.backgroundColor,
cur.finishFunc, cur.finishFunc,
cur.finishFuncContext); cur.finishFuncContext,
cur.keepUntilShown);
} }
NotificationModuleStatus NotificationModule_AddInfoNotificationWithCallback(const char *text, NotificationModuleStatus NotificationModule_AddInfoNotificationWithCallback(const char *text,
NotificationModuleNotificationFinishedCallback callback, NotificationModuleNotificationFinishedCallback callback,
@ -344,7 +410,8 @@ NotificationModuleStatus NotificationModule_AddInfoNotificationWithCallback(cons
cur.textColor, cur.textColor,
cur.backgroundColor, cur.backgroundColor,
callback, callback,
callbackContext); callbackContext,
cur.keepUntilShown);
} }
NotificationModuleStatus NotificationModule_AddErrorNotificationEx(const char *text, NotificationModuleStatus NotificationModule_AddErrorNotificationEx(const char *text,
@ -353,7 +420,8 @@ NotificationModuleStatus NotificationModule_AddErrorNotificationEx(const char *t
NMColor textColor, NMColor textColor,
NMColor backgroundColor, NMColor backgroundColor,
NotificationModuleNotificationFinishedCallback callback, NotificationModuleNotificationFinishedCallback callback,
void *callbackContext) { void *callbackContext,
bool keepUntilShown) {
return NotificationModule_AddStaticNotification(text, return NotificationModule_AddStaticNotification(text,
NOTIFICATION_MODULE_NOTIFICATION_TYPE_ERROR, NOTIFICATION_MODULE_NOTIFICATION_TYPE_ERROR,
durationBeforeFadeOutInSeconds, durationBeforeFadeOutInSeconds,
@ -361,7 +429,8 @@ NotificationModuleStatus NotificationModule_AddErrorNotificationEx(const char *t
textColor, textColor,
backgroundColor, backgroundColor,
callback, callback,
callbackContext); callbackContext,
keepUntilShown);
} }
NotificationModuleStatus NotificationModule_AddErrorNotification(const char *text) { NotificationModuleStatus NotificationModule_AddErrorNotification(const char *text) {
@ -376,7 +445,8 @@ NotificationModuleStatus NotificationModule_AddErrorNotification(const char *tex
cur.textColor, cur.textColor,
cur.backgroundColor, cur.backgroundColor,
cur.finishFunc, cur.finishFunc,
cur.finishFuncContext); cur.finishFuncContext,
cur.keepUntilShown);
} }
NotificationModuleStatus NotificationModule_AddErrorNotificationWithCallback(const char *text, NotificationModuleStatus NotificationModule_AddErrorNotificationWithCallback(const char *text,
@ -393,7 +463,8 @@ NotificationModuleStatus NotificationModule_AddErrorNotificationWithCallback(con
cur.textColor, cur.textColor,
cur.backgroundColor, cur.backgroundColor,
callback, callback,
callbackContext); callbackContext,
cur.keepUntilShown);
} }
NotificationModuleStatus NotificationModule_UpdateDynamicNotificationText(NotificationModuleHandle handle, NotificationModuleStatus NotificationModule_UpdateDynamicNotificationText(NotificationModuleHandle handle,