mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-14 03:08:36 -07:00
[FL-3841] FuriEventLoop Pt.2 (#3703)
* Abstract primitive type from main logic in FuriEventLoop * Remove message_queue_i.h * Add stream buffer support for event loop * Add semaphore support for event loop * Add temporary unit test workaround * Make the linter happy * Add mutex support for event loop * Implement event subscription and unsubscription while the event loop is running * Implement edge events * Fix leftover logical errors * Add event loop timer example application * Implement flag-based edge trigger and one-shot mode * Add event loop mutex example application * Only notify the event loop if stream buffer is at or above its trigger level * Reformat comments * Add event loop stream buffer example application * Add event loop multiple elements example application * Improve event loop flag names * Remove redundant signal handler as it is already handled by the event loop * Refactor Power service, improve ViewHolder * Use ViewHolder instead of ViewDispatcher in About app * Enable ViewDispatcher queue on construction, deprecate view_dispatcher_enable_queue() * Remove all invocations of view_dispatcher_enable_queue() * Remove app-scened-template * Remove missing library from target.json * Port Accessor app to ViewHolder * Make the linter happy * Add example_view_holder application, update ViewHolder docs * Add example_view_dispatcher application, update ViewDispatcher docs * Replace FuriSemaphore with FuriApiLock, remove workaround delay * Fix logical error * Fix another logical error * Use the sources directive to speed up compilation * Use constant define macro * Improve FuriEventLoop documentation * Improve FuriEventLoop documentation once more * Bump API Version * Gui: remove redundant checks from ViewDispatcher * Gui: remove dead ifs from ViewDispatcher Co-authored-by: Silent <CookiePLMonster@users.noreply.github.com> Co-authored-by: hedger <hedger@users.noreply.github.com> Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
@@ -32,7 +32,8 @@ ViewHolder* view_holder_alloc(void) {
|
||||
}
|
||||
|
||||
void view_holder_free(ViewHolder* view_holder) {
|
||||
furi_assert(view_holder);
|
||||
furi_check(view_holder);
|
||||
furi_check(view_holder->view == NULL);
|
||||
|
||||
if(view_holder->gui) {
|
||||
gui_remove_view_port(view_holder->gui, view_holder->view_port);
|
||||
@@ -48,12 +49,14 @@ void view_holder_free(ViewHolder* view_holder) {
|
||||
}
|
||||
|
||||
void view_holder_set_view(ViewHolder* view_holder, View* view) {
|
||||
furi_assert(view_holder);
|
||||
furi_check(view_holder);
|
||||
|
||||
if(view_holder->view) {
|
||||
if(view_holder->view->exit_callback) {
|
||||
view_holder->view->exit_callback(view_holder->view->context);
|
||||
while(view_holder->ongoing_input) {
|
||||
furi_delay_tick(1);
|
||||
}
|
||||
|
||||
view_exit(view_holder->view);
|
||||
view_set_update_callback(view_holder->view, NULL);
|
||||
view_set_update_callback_context(view_holder->view, NULL);
|
||||
}
|
||||
@@ -61,12 +64,23 @@ void view_holder_set_view(ViewHolder* view_holder, View* view) {
|
||||
view_holder->view = view;
|
||||
|
||||
if(view_holder->view) {
|
||||
const ViewPortOrientation orientation = (ViewPortOrientation)view->orientation;
|
||||
furi_assert(orientation < ViewPortOrientationMAX);
|
||||
if(view_port_get_orientation(view_holder->view_port) != orientation) {
|
||||
view_port_set_orientation(view_holder->view_port, orientation);
|
||||
// we just rotated input keys, now it's time to sacrifice some input
|
||||
view_holder->ongoing_input = 0;
|
||||
}
|
||||
|
||||
view_set_update_callback(view_holder->view, view_holder_update);
|
||||
view_set_update_callback_context(view_holder->view, view_holder);
|
||||
|
||||
if(view_holder->view->enter_callback) {
|
||||
view_holder->view->enter_callback(view_holder->view->context);
|
||||
}
|
||||
view_enter(view_holder->view);
|
||||
view_port_enabled_set(view_holder->view_port, true);
|
||||
view_port_update(view_holder->view_port);
|
||||
|
||||
} else {
|
||||
view_port_enabled_set(view_holder->view_port, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,7 +88,7 @@ void view_holder_set_free_callback(
|
||||
ViewHolder* view_holder,
|
||||
FreeCallback free_callback,
|
||||
void* free_context) {
|
||||
furi_assert(view_holder);
|
||||
furi_check(view_holder);
|
||||
view_holder->free_callback = free_callback;
|
||||
view_holder->free_context = free_context;
|
||||
}
|
||||
@@ -87,31 +101,22 @@ void view_holder_set_back_callback(
|
||||
ViewHolder* view_holder,
|
||||
BackCallback back_callback,
|
||||
void* back_context) {
|
||||
furi_assert(view_holder);
|
||||
furi_check(view_holder);
|
||||
view_holder->back_callback = back_callback;
|
||||
view_holder->back_context = back_context;
|
||||
}
|
||||
|
||||
void view_holder_attach_to_gui(ViewHolder* view_holder, Gui* gui) {
|
||||
furi_assert(gui);
|
||||
furi_assert(view_holder);
|
||||
view_holder->gui = gui;
|
||||
furi_check(view_holder);
|
||||
furi_check(view_holder->gui == NULL);
|
||||
furi_check(gui);
|
||||
gui_add_view_port(gui, view_holder->view_port, GuiLayerFullscreen);
|
||||
}
|
||||
|
||||
void view_holder_start(ViewHolder* view_holder) {
|
||||
view_port_enabled_set(view_holder->view_port, true);
|
||||
}
|
||||
|
||||
void view_holder_stop(ViewHolder* view_holder) {
|
||||
while(view_holder->ongoing_input)
|
||||
furi_delay_tick(1);
|
||||
view_port_enabled_set(view_holder->view_port, false);
|
||||
view_holder->gui = gui;
|
||||
}
|
||||
|
||||
void view_holder_update(View* view, void* context) {
|
||||
furi_assert(view);
|
||||
furi_assert(context);
|
||||
furi_check(view);
|
||||
furi_check(context);
|
||||
|
||||
ViewHolder* view_holder = context;
|
||||
if(view == view_holder->view) {
|
||||
@@ -119,6 +124,18 @@ void view_holder_update(View* view, void* context) {
|
||||
}
|
||||
}
|
||||
|
||||
void view_holder_send_to_front(ViewHolder* view_holder) {
|
||||
furi_check(view_holder);
|
||||
furi_check(view_holder->gui);
|
||||
gui_view_port_send_to_front(view_holder->gui, view_holder->view_port);
|
||||
}
|
||||
|
||||
void view_holder_send_to_back(ViewHolder* view_holder) {
|
||||
furi_check(view_holder);
|
||||
furi_check(view_holder->gui);
|
||||
gui_view_port_send_to_back(view_holder->gui, view_holder->view_port);
|
||||
}
|
||||
|
||||
static void view_holder_draw_callback(Canvas* canvas, void* context) {
|
||||
ViewHolder* view_holder = context;
|
||||
if(view_holder->view) {
|
||||
|
||||
Reference in New Issue
Block a user