c3bcf93698
- Refactor the way apps work: Instead of a C interface, they are now C++ classes. The main reasoning is that attaching data to an app was cumbersome. Having different implementations for different kinds of apps was cumbersome too. (3 or 4 layers of manifest nesting for the TactilityC project) - External apps are still written in C, but they get a createData/destroyData in their manifest, so: - External apps now have their own manifest. - All functions in the original AppManifest are removed and replaced by a single `createApp` function - External apps now automatically register (each app individually!) when they run the first time. As a side-effect they become visible in the `AppList` app! - Adapted all apps for the new interface. - Adapted all internal logic for these changes (Gui, ViewPort, Loader, AppContext, AppInstance, etc.) - Rewrote parts of Loader to use std::shared_ptr to make the code much safer. - Added a refcount check for the `AppInstance` and `App` at the end of their lifecycle. Show warning if refcount is too high.
110 lines
2.9 KiB
C++
110 lines
2.9 KiB
C++
#pragma once
|
|
|
|
#include "./App.h"
|
|
#include "./AppManifest.h"
|
|
|
|
namespace tt::app {
|
|
|
|
typedef void* (*CreateData)();
|
|
typedef void (*DestroyData)(void* data);
|
|
typedef void (*OnStart)(AppContext& app, void* _Nullable data);
|
|
typedef void (*OnStop)(AppContext& app, void* _Nullable data);
|
|
typedef void (*OnShow)(AppContext& app, void* _Nullable data, lv_obj_t* parent);
|
|
typedef void (*OnHide)(AppContext& app, void* _Nullable data);
|
|
typedef void (*OnResult)(AppContext& app, void* _Nullable data, Result result, std::unique_ptr<Bundle> resultData);
|
|
|
|
class AppCompatC : public App {
|
|
|
|
private:
|
|
|
|
CreateData _Nullable createData;
|
|
DestroyData _Nullable destroyData;
|
|
OnStart _Nullable onStartCallback;
|
|
OnStop _Nullable onStopCallback;
|
|
OnShow _Nullable onShowCallback;
|
|
OnHide _Nullable onHideCallback;
|
|
OnResult _Nullable onResultCallback;
|
|
|
|
void* data = nullptr;
|
|
|
|
public:
|
|
|
|
AppCompatC(
|
|
CreateData _Nullable createData,
|
|
DestroyData _Nullable destroyData,
|
|
OnStart _Nullable onStart,
|
|
OnStop _Nullable onStop,
|
|
OnShow _Nullable onShow,
|
|
OnHide _Nullable onHide,
|
|
OnResult _Nullable onResult
|
|
) : createData(createData),
|
|
destroyData(destroyData),
|
|
onStartCallback(onStart),
|
|
onStopCallback(onStop),
|
|
onShowCallback(onShow),
|
|
onHideCallback(onHide),
|
|
onResultCallback(onResult)
|
|
{}
|
|
|
|
void onStart(AppContext& appContext) override {
|
|
if (createData != nullptr) {
|
|
data = createData();
|
|
}
|
|
|
|
if (onStartCallback != nullptr) {
|
|
onStartCallback(appContext, data);
|
|
}
|
|
}
|
|
|
|
void onStop(AppContext& appContext) override {
|
|
if (onStopCallback != nullptr) {
|
|
onStopCallback(appContext, data);
|
|
}
|
|
|
|
if (destroyData != nullptr && data != nullptr) {
|
|
destroyData(data);
|
|
}
|
|
}
|
|
|
|
void onShow(AppContext& appContext, lv_obj_t* parent) override {
|
|
if (onShowCallback != nullptr) {
|
|
onShowCallback(appContext, data, parent);
|
|
}
|
|
}
|
|
|
|
void onHide(AppContext& appContext) override {
|
|
if (onHideCallback != nullptr) {
|
|
onHideCallback(appContext, data);
|
|
}
|
|
}
|
|
|
|
void onResult(AppContext& appContext, Result result, std::unique_ptr<Bundle> _Nullable resultData) override {
|
|
if (onResultCallback != nullptr) {
|
|
onResultCallback(appContext, data, result, std::move(resultData));
|
|
}
|
|
}
|
|
};
|
|
|
|
template<typename T>
|
|
App* createC(
|
|
CreateData _Nullable createData,
|
|
DestroyData _Nullable destroyData,
|
|
OnStart _Nullable onStartCallback,
|
|
OnStop _Nullable onStopCallback,
|
|
OnShow _Nullable onShowCallback,
|
|
OnHide _Nullable onHideCallback,
|
|
OnResult _Nullable onResultCallback
|
|
) {
|
|
return new AppCompatC(
|
|
createData,
|
|
destroyData,
|
|
onStartCallback,
|
|
onStopCallback,
|
|
onShowCallback,
|
|
onHideCallback,
|
|
onResultCallback
|
|
);
|
|
}
|
|
|
|
}
|