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.
45 lines
998 B
C++
45 lines
998 B
C++
#pragma once
|
|
|
|
#include "MessageQueue.h"
|
|
#include "Mutex.h"
|
|
#include "Pubsub.h"
|
|
#include "service/gui/Gui.h"
|
|
#include <cstdio>
|
|
#include <lvgl.h>
|
|
|
|
namespace tt::service::gui {
|
|
|
|
#define GUI_THREAD_FLAG_DRAW (1 << 0)
|
|
#define GUI_THREAD_FLAG_INPUT (1 << 1)
|
|
#define GUI_THREAD_FLAG_EXIT (1 << 2)
|
|
#define GUI_THREAD_FLAG_ALL (GUI_THREAD_FLAG_DRAW | GUI_THREAD_FLAG_INPUT | GUI_THREAD_FLAG_EXIT)
|
|
|
|
/** Gui structure */
|
|
struct Gui {
|
|
// Thread and lock
|
|
Thread* thread = nullptr;
|
|
Mutex mutex = Mutex(Mutex::Type::Recursive);
|
|
PubSubSubscription* loader_pubsub_subscription = nullptr;
|
|
|
|
// Layers and Canvas
|
|
lv_obj_t* appRootWidget = nullptr;
|
|
lv_obj_t* statusbarWidget = nullptr;
|
|
|
|
// App-specific
|
|
std::shared_ptr<app::AppContext> appToRender = nullptr;
|
|
|
|
lv_obj_t* _Nullable keyboard = nullptr;
|
|
lv_group_t* keyboardGroup = nullptr;
|
|
};
|
|
|
|
/** Update GUI, request redraw */
|
|
void requestDraw();
|
|
|
|
/** Lock GUI */
|
|
void lock();
|
|
|
|
/** Unlock GUI */
|
|
void unlock();
|
|
|
|
} // namespace
|