686f7cce83
FreeRTOS handles were stored plainly and they were deleted in the destructor of classes. This meant that if a class were to be copied, the destructor would be called twice on the same handles and lead to double-free. Seha on Discord suggested to fix this by using `std::unique_ptr` with a custom deletion function. The changes affect: - Thread - Semaphore - Mutex - StreamBuffer - Timer - MessageQueue - EventFlag Thread changes: - Removal of the hack with the `Data` struct - Thread's main body is now just a private static function inside the class. - The C functions were relocated to static class members PubSub changes: - Refactored pubsub into class - Renamed files to `PubSub` instead of `Pubsub` - `PubSubSubscription` is now a private inner struct and `PubSub` only exposes `SubscriptionHandle` Lockable, ScopedLockable, Mutex: - Added `lock()` method that locks indefinitely - Remove deprecated `acquire()` and `release()` methods - Removed `TtWaitForever` in favour of `portMAX_DELAY`
45 lines
1005 B
C++
45 lines
1005 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);
|
|
PubSub::SubscriptionHandle 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
|