Compare commits
5 Commits
af5410c39a
...
75ce22a0f6
| Author | SHA1 | Date |
|---|---|---|
Maschell
|
75ce22a0f6 | |
|
Maschell
|
71e6149b30 | |
|
Maschell
|
38e02d706a | |
|
Maschell
|
a8d4290981 | |
|
Maschell
|
7a4a73be67 |
|
|
@ -17,7 +17,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v4
|
||||
- name: Extract Docker metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@v4
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM ghcr.io/wiiu-env/devkitppc:20230621
|
||||
FROM ghcr.io/wiiu-env/devkitppc:20240423
|
||||
|
||||
WORKDIR tmp_build
|
||||
COPY . .
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
FROM ghcr.io/wiiu-env/devkitppc:20230621
|
||||
FROM ghcr.io/wiiu-env/devkitppc:20240423
|
||||
|
||||
WORKDIR project
|
||||
|
|
@ -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_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_KEEP_UNTIL_SHOWN, /* Keeps the notification in memory until it was actually shown */
|
||||
} NotificationModuleNotificationOption;
|
||||
|
|
|
|||
|
|
@ -94,6 +94,7 @@ NotificationModuleStatus NotificationModule_SetDefaultValue(NotificationModuleNo
|
|||
* @param backgroundColor Background color of the Notification
|
||||
* @param callback Function that will be called then the Notification fades out.
|
||||
* @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>
|
||||
* 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>
|
||||
|
|
@ -106,7 +107,8 @@ NotificationModuleStatus NotificationModule_AddInfoNotificationEx(const char *te
|
|||
NMColor textColor,
|
||||
NMColor backgroundColor,
|
||||
NotificationModuleNotificationFinishedCallback callback,
|
||||
void *callbackContext);
|
||||
void *callbackContext,
|
||||
bool keepUntilShown);
|
||||
|
||||
/**
|
||||
* 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 callback Function that will be called then the Notification fades out.
|
||||
* @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>
|
||||
* 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>
|
||||
|
|
@ -174,7 +177,8 @@ NotificationModuleStatus NotificationModule_AddErrorNotificationEx(const char *t
|
|||
NMColor textColor,
|
||||
NMColor backgroundColor,
|
||||
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>
|
||||
|
|
@ -227,6 +231,7 @@ NotificationModuleStatus NotificationModule_AddErrorNotificationWithCallback(con
|
|||
* @param backgroundColor Background color of the notification
|
||||
* @param callback Function that will be called then the Notification fades out.
|
||||
* @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>
|
||||
* 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>
|
||||
|
|
@ -239,7 +244,8 @@ NotificationModuleStatus NotificationModule_AddDynamicNotificationEx(const char
|
|||
NMColor textColor,
|
||||
NMColor backgroundColor,
|
||||
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>
|
||||
|
|
|
|||
|
|
@ -9,4 +9,5 @@ struct NMDefaultValueStore {
|
|||
NMColor textColor = {255, 255, 255, 255};
|
||||
void (*finishFunc)(NotificationModuleHandle, void *context) = nullptr;
|
||||
void *finishFuncContext = nullptr;
|
||||
bool keepUntilShown = false;
|
||||
};
|
||||
147
source/utils.cpp
147
source/utils.cpp
|
|
@ -16,14 +16,33 @@ static NotificationModuleStatus (*sNMAddStaticNotification)(const char *,
|
|||
float,
|
||||
NMColor,
|
||||
NMColor,
|
||||
void (*)(void *context),
|
||||
void (*)(NotificationModuleHandle, void *),
|
||||
void *) = nullptr;
|
||||
|
||||
static NotificationModuleStatus (*sNMAddDynamicNotification)(const char *,
|
||||
NMColor,
|
||||
NMColor,
|
||||
void (*)(void *context),
|
||||
void *) = nullptr;
|
||||
void (*)(NotificationModuleHandle, void *),
|
||||
void *,
|
||||
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,
|
||||
const char *) = nullptr;
|
||||
|
|
@ -104,27 +123,36 @@ NotificationModuleStatus NotificationModule_InitLibrary() {
|
|||
}
|
||||
if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMAddDynamicNotification", (void **) &sNMAddDynamicNotification) != OS_DYNLOAD_OK) {
|
||||
DEBUG_FUNCTION_LINE_ERR("FindExport NMAddDynamicNotification failed.");
|
||||
sNMAddStaticNotification = nullptr;
|
||||
sNMAddDynamicNotification = nullptr;
|
||||
}
|
||||
|
||||
if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMUpdateDynamicNotificationText", (void **) &sNMUpdateDynamicNotificationText) != OS_DYNLOAD_OK) {
|
||||
DEBUG_FUNCTION_LINE_ERR("FindExport NMUpdateDynamicNotificationText failed.");
|
||||
sNMAddStaticNotification = nullptr;
|
||||
sNMUpdateDynamicNotificationText = nullptr;
|
||||
}
|
||||
|
||||
if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMUpdateDynamicNotificationBackgroundColor", (void **) &sNMUpdateDynamicNotificationBackgroundColor) != OS_DYNLOAD_OK) {
|
||||
DEBUG_FUNCTION_LINE_ERR("FindExport NMUpdateDynamicNotificationBackgroundColor failed.");
|
||||
sNMAddStaticNotification = nullptr;
|
||||
sNMUpdateDynamicNotificationBackgroundColor = nullptr;
|
||||
}
|
||||
|
||||
if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMUpdateDynamicNotificationTextColor", (void **) &sNMUpdateDynamicNotificationTextColor) != OS_DYNLOAD_OK) {
|
||||
DEBUG_FUNCTION_LINE_ERR("FindExport NMUpdateDynamicNotificationTextColor failed.");
|
||||
sNMAddStaticNotification = nullptr;
|
||||
sNMUpdateDynamicNotificationTextColor = nullptr;
|
||||
}
|
||||
|
||||
if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMFinishDynamicNotification", (void **) &sNMFinishDynamicNotification) != OS_DYNLOAD_OK) {
|
||||
DEBUG_FUNCTION_LINE_ERR("FindExport NMFinishDynamicNotification failed.");
|
||||
sNMAddStaticNotification = 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();
|
||||
|
|
@ -180,19 +208,13 @@ NotificationModuleStatus NotificationModule_IsOverlayReady(bool *outIsReady) {
|
|||
return reinterpret_cast<decltype(&NotificationModule_IsOverlayReady)>(sNMIsOverlayReady)(outIsReady);
|
||||
}
|
||||
|
||||
NotificationModuleStatus NotificationModule_AddDynamicNotificationExDeclare(const char *text,
|
||||
NMColor textColor,
|
||||
NMColor backgroundColor,
|
||||
NotificationModuleNotificationFinishedCallback callback,
|
||||
void *callbackContext,
|
||||
NotificationModuleHandle *outHandle);
|
||||
|
||||
NotificationModuleStatus NotificationModule_AddDynamicNotificationEx(const char *text,
|
||||
NotificationModuleHandle *outHandle,
|
||||
NMColor textColor,
|
||||
NMColor backgroundColor,
|
||||
void (*finishFunc)(NotificationModuleHandle, void *context),
|
||||
void *context) {
|
||||
void *context,
|
||||
bool keepUntilShown) {
|
||||
if (sNotificationModuleVersion == NOTIFICATION_MODULE_API_VERSION_ERROR) {
|
||||
return NOTIFICATION_MODULE_RESULT_LIB_UNINITIALIZED;
|
||||
}
|
||||
|
|
@ -204,12 +226,25 @@ NotificationModuleStatus NotificationModule_AddDynamicNotificationEx(const char
|
|||
return NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT;
|
||||
}
|
||||
|
||||
return reinterpret_cast<decltype(&NotificationModule_AddDynamicNotificationExDeclare)>(sNMAddDynamicNotification)(text,
|
||||
textColor,
|
||||
backgroundColor,
|
||||
finishFunc,
|
||||
context,
|
||||
outHandle);
|
||||
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,
|
||||
textColor,
|
||||
backgroundColor,
|
||||
finishFunc,
|
||||
context,
|
||||
outHandle);
|
||||
}
|
||||
|
||||
NotificationModuleStatus NotificationModule_AddDynamicNotification(const char *text, NotificationModuleHandle *outHandle) {
|
||||
|
|
@ -219,7 +254,8 @@ NotificationModuleStatus NotificationModule_AddDynamicNotification(const char *t
|
|||
cur.textColor,
|
||||
cur.backgroundColor,
|
||||
cur.finishFunc,
|
||||
cur.finishFuncContext);
|
||||
cur.finishFuncContext,
|
||||
cur.keepUntilShown);
|
||||
}
|
||||
|
||||
NotificationModuleStatus NotificationModule_AddDynamicNotificationWithCallback(const char *text,
|
||||
|
|
@ -232,7 +268,8 @@ NotificationModuleStatus NotificationModule_AddDynamicNotificationWithCallback(c
|
|||
cur.textColor,
|
||||
cur.backgroundColor,
|
||||
callback,
|
||||
callbackContext);
|
||||
callbackContext,
|
||||
cur.keepUntilShown);
|
||||
}
|
||||
|
||||
static NotificationModuleStatus NotificationModule_AddStaticNotification(const char *text,
|
||||
|
|
@ -242,7 +279,8 @@ static NotificationModuleStatus NotificationModule_AddStaticNotification(const c
|
|||
NMColor textColor,
|
||||
NMColor backgroundColor,
|
||||
NotificationModuleNotificationFinishedCallback callback,
|
||||
void *callbackContext) {
|
||||
void *callbackContext,
|
||||
bool keepUntilShown) {
|
||||
if (sNotificationModuleVersion == NOTIFICATION_MODULE_API_VERSION_ERROR) {
|
||||
return NOTIFICATION_MODULE_RESULT_LIB_UNINITIALIZED;
|
||||
}
|
||||
|
|
@ -254,14 +292,28 @@ static NotificationModuleStatus NotificationModule_AddStaticNotification(const c
|
|||
return NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT;
|
||||
}
|
||||
|
||||
return reinterpret_cast<decltype(&NotificationModule_AddStaticNotification)>(sNMAddStaticNotification)(text,
|
||||
type,
|
||||
durationBeforeFadeOutInSeconds,
|
||||
shakeDurationInSeconds,
|
||||
textColor,
|
||||
backgroundColor,
|
||||
callback,
|
||||
callbackContext);
|
||||
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,
|
||||
type,
|
||||
durationBeforeFadeOutInSeconds,
|
||||
shakeDurationInSeconds,
|
||||
textColor,
|
||||
backgroundColor,
|
||||
callback,
|
||||
callbackContext);
|
||||
}
|
||||
|
||||
#undef NotificationModule_SetDefaultValue
|
||||
|
|
@ -306,6 +358,11 @@ NotificationModuleStatus NotificationModule_SetDefaultValue(NotificationModuleNo
|
|||
cur.finishFuncContext = arg;
|
||||
break;
|
||||
}
|
||||
case NOTIFICATION_MODULE_DEFAULT_OPTION_KEEP_UNTIL_SHOWN: {
|
||||
auto arg = va_arg(va, int);
|
||||
cur.keepUntilShown = (bool) arg;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
res = NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT;
|
||||
break;
|
||||
|
|
@ -321,7 +378,8 @@ NotificationModuleStatus NotificationModule_AddInfoNotificationEx(const char *te
|
|||
NMColor textColor,
|
||||
NMColor backgroundColor,
|
||||
NotificationModuleNotificationFinishedCallback callback,
|
||||
void *callbackContext) {
|
||||
void *callbackContext,
|
||||
bool keepUntilShown) {
|
||||
return NotificationModule_AddStaticNotification(text,
|
||||
NOTIFICATION_MODULE_NOTIFICATION_TYPE_INFO,
|
||||
durationBeforeFadeOutInSeconds,
|
||||
|
|
@ -329,7 +387,8 @@ NotificationModuleStatus NotificationModule_AddInfoNotificationEx(const char *te
|
|||
textColor,
|
||||
backgroundColor,
|
||||
callback,
|
||||
callbackContext);
|
||||
callbackContext,
|
||||
keepUntilShown);
|
||||
}
|
||||
|
||||
NotificationModuleStatus NotificationModule_AddInfoNotification(const char *text) {
|
||||
|
|
@ -339,7 +398,8 @@ NotificationModuleStatus NotificationModule_AddInfoNotification(const char *text
|
|||
cur.textColor,
|
||||
cur.backgroundColor,
|
||||
cur.finishFunc,
|
||||
cur.finishFuncContext);
|
||||
cur.finishFuncContext,
|
||||
cur.keepUntilShown);
|
||||
}
|
||||
NotificationModuleStatus NotificationModule_AddInfoNotificationWithCallback(const char *text,
|
||||
NotificationModuleNotificationFinishedCallback callback,
|
||||
|
|
@ -350,7 +410,8 @@ NotificationModuleStatus NotificationModule_AddInfoNotificationWithCallback(cons
|
|||
cur.textColor,
|
||||
cur.backgroundColor,
|
||||
callback,
|
||||
callbackContext);
|
||||
callbackContext,
|
||||
cur.keepUntilShown);
|
||||
}
|
||||
|
||||
NotificationModuleStatus NotificationModule_AddErrorNotificationEx(const char *text,
|
||||
|
|
@ -359,7 +420,8 @@ NotificationModuleStatus NotificationModule_AddErrorNotificationEx(const char *t
|
|||
NMColor textColor,
|
||||
NMColor backgroundColor,
|
||||
NotificationModuleNotificationFinishedCallback callback,
|
||||
void *callbackContext) {
|
||||
void *callbackContext,
|
||||
bool keepUntilShown) {
|
||||
return NotificationModule_AddStaticNotification(text,
|
||||
NOTIFICATION_MODULE_NOTIFICATION_TYPE_ERROR,
|
||||
durationBeforeFadeOutInSeconds,
|
||||
|
|
@ -367,7 +429,8 @@ NotificationModuleStatus NotificationModule_AddErrorNotificationEx(const char *t
|
|||
textColor,
|
||||
backgroundColor,
|
||||
callback,
|
||||
callbackContext);
|
||||
callbackContext,
|
||||
keepUntilShown);
|
||||
}
|
||||
|
||||
NotificationModuleStatus NotificationModule_AddErrorNotification(const char *text) {
|
||||
|
|
@ -382,7 +445,8 @@ NotificationModuleStatus NotificationModule_AddErrorNotification(const char *tex
|
|||
cur.textColor,
|
||||
cur.backgroundColor,
|
||||
cur.finishFunc,
|
||||
cur.finishFuncContext);
|
||||
cur.finishFuncContext,
|
||||
cur.keepUntilShown);
|
||||
}
|
||||
|
||||
NotificationModuleStatus NotificationModule_AddErrorNotificationWithCallback(const char *text,
|
||||
|
|
@ -399,7 +463,8 @@ NotificationModuleStatus NotificationModule_AddErrorNotificationWithCallback(con
|
|||
cur.textColor,
|
||||
cur.backgroundColor,
|
||||
callback,
|
||||
callbackContext);
|
||||
callbackContext,
|
||||
cur.keepUntilShown);
|
||||
}
|
||||
|
||||
NotificationModuleStatus NotificationModule_UpdateDynamicNotificationText(NotificationModuleHandle handle,
|
||||
|
|
|
|||
Loading…
Reference in New Issue