Display and UI implementation (#169)
* Menu app. Lib: add mlib submodule.
* Menu: new startup lib dependency definition
* Menu: hierarchy in menu. Cube: fix heap1/4 inconsistency, stack protection.
* GUI: rendering pipeline initial version.
* GUI: layered widget composing, FURI record. Menu: FURI record, api.
* GUI: input dispatching. Menu: switch to input from GUI.
* GUI, MENU: code style cleanup, fix type conversion warnings.
* GUI, Menu: syntax check.
* Makefile: check and reinit submodules, format.
* Menu: lock on event processing. Makefile: proper submodule initialization.
* Menu: fix stack corruption by queue.
* GUI: refactor.
* Makefile: format rule fix, st-util pid.
* GUI, Menu, FURI: format with clang-format.
* GUI, MENU: locks in critical sections, fix stack corruption, ready signaling.
* Makefile: clang format rule cleanup.
* GUI,MENU: migrate to new API.
* Applications: PRODUCTION_HW variable, skip drivers build on local target.
* refactor production build
* add git to dockerfile
* GUI: uncomment lock block
Co-authored-by: Aleksandr Kutuzov <aku@plooks.com>
2020-10-14 10:21:55 +00:00
|
|
|
#include "widget.h"
|
|
|
|
#include "widget_i.h"
|
|
|
|
|
|
|
|
#include <cmsis_os.h>
|
|
|
|
#include <flipper.h>
|
|
|
|
|
|
|
|
#include "gui.h"
|
|
|
|
#include "gui_i.h"
|
|
|
|
|
2020-10-15 15:56:47 +00:00
|
|
|
// TODO add mutex to widget ops
|
|
|
|
|
2020-10-15 15:05:28 +00:00
|
|
|
struct Widget {
|
2020-10-16 15:25:06 +00:00
|
|
|
Gui* gui;
|
2020-10-15 15:05:28 +00:00
|
|
|
bool is_enabled;
|
|
|
|
WidgetDrawCallback draw_callback;
|
|
|
|
void* draw_callback_context;
|
|
|
|
WidgetInputCallback input_callback;
|
|
|
|
void* input_callback_context;
|
2020-10-15 15:56:47 +00:00
|
|
|
};
|
2020-10-15 15:05:28 +00:00
|
|
|
|
Display and UI implementation (#169)
* Menu app. Lib: add mlib submodule.
* Menu: new startup lib dependency definition
* Menu: hierarchy in menu. Cube: fix heap1/4 inconsistency, stack protection.
* GUI: rendering pipeline initial version.
* GUI: layered widget composing, FURI record. Menu: FURI record, api.
* GUI: input dispatching. Menu: switch to input from GUI.
* GUI, MENU: code style cleanup, fix type conversion warnings.
* GUI, Menu: syntax check.
* Makefile: check and reinit submodules, format.
* Menu: lock on event processing. Makefile: proper submodule initialization.
* Menu: fix stack corruption by queue.
* GUI: refactor.
* Makefile: format rule fix, st-util pid.
* GUI, Menu, FURI: format with clang-format.
* GUI, MENU: locks in critical sections, fix stack corruption, ready signaling.
* Makefile: clang format rule cleanup.
* GUI,MENU: migrate to new API.
* Applications: PRODUCTION_HW variable, skip drivers build on local target.
* refactor production build
* add git to dockerfile
* GUI: uncomment lock block
Co-authored-by: Aleksandr Kutuzov <aku@plooks.com>
2020-10-14 10:21:55 +00:00
|
|
|
Widget* widget_alloc(WidgetDrawCallback callback, void* callback_context) {
|
|
|
|
Widget* widget = furi_alloc(sizeof(Widget));
|
|
|
|
widget->is_enabled = true;
|
|
|
|
return widget;
|
|
|
|
}
|
|
|
|
|
|
|
|
void widget_free(Widget* widget) {
|
|
|
|
assert(widget);
|
|
|
|
assert(widget->gui == NULL);
|
|
|
|
free(widget);
|
|
|
|
}
|
|
|
|
|
|
|
|
void widget_enabled_set(Widget* widget, bool enabled) {
|
|
|
|
assert(widget);
|
2020-10-26 17:00:17 +00:00
|
|
|
if(widget->is_enabled != enabled) {
|
|
|
|
widget->is_enabled = enabled;
|
|
|
|
widget_update(widget);
|
|
|
|
}
|
Display and UI implementation (#169)
* Menu app. Lib: add mlib submodule.
* Menu: new startup lib dependency definition
* Menu: hierarchy in menu. Cube: fix heap1/4 inconsistency, stack protection.
* GUI: rendering pipeline initial version.
* GUI: layered widget composing, FURI record. Menu: FURI record, api.
* GUI: input dispatching. Menu: switch to input from GUI.
* GUI, MENU: code style cleanup, fix type conversion warnings.
* GUI, Menu: syntax check.
* Makefile: check and reinit submodules, format.
* Menu: lock on event processing. Makefile: proper submodule initialization.
* Menu: fix stack corruption by queue.
* GUI: refactor.
* Makefile: format rule fix, st-util pid.
* GUI, Menu, FURI: format with clang-format.
* GUI, MENU: locks in critical sections, fix stack corruption, ready signaling.
* Makefile: clang format rule cleanup.
* GUI,MENU: migrate to new API.
* Applications: PRODUCTION_HW variable, skip drivers build on local target.
* refactor production build
* add git to dockerfile
* GUI: uncomment lock block
Co-authored-by: Aleksandr Kutuzov <aku@plooks.com>
2020-10-14 10:21:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool widget_is_enabled(Widget* widget) {
|
|
|
|
assert(widget);
|
|
|
|
return widget->is_enabled;
|
|
|
|
}
|
|
|
|
|
|
|
|
void widget_draw_callback_set(Widget* widget, WidgetDrawCallback callback, void* context) {
|
|
|
|
assert(widget);
|
|
|
|
widget->draw_callback = callback;
|
|
|
|
widget->draw_callback_context = context;
|
|
|
|
}
|
|
|
|
|
|
|
|
void widget_input_callback_set(Widget* widget, WidgetInputCallback callback, void* context) {
|
|
|
|
assert(widget);
|
|
|
|
widget->input_callback = callback;
|
|
|
|
widget->input_callback_context = context;
|
|
|
|
}
|
|
|
|
|
|
|
|
void widget_update(Widget* widget) {
|
|
|
|
assert(widget);
|
|
|
|
if(widget->gui) gui_update(widget->gui);
|
|
|
|
}
|
|
|
|
|
2020-10-15 15:13:18 +00:00
|
|
|
void widget_gui_set(Widget* widget, Gui* gui) {
|
Display and UI implementation (#169)
* Menu app. Lib: add mlib submodule.
* Menu: new startup lib dependency definition
* Menu: hierarchy in menu. Cube: fix heap1/4 inconsistency, stack protection.
* GUI: rendering pipeline initial version.
* GUI: layered widget composing, FURI record. Menu: FURI record, api.
* GUI: input dispatching. Menu: switch to input from GUI.
* GUI, MENU: code style cleanup, fix type conversion warnings.
* GUI, Menu: syntax check.
* Makefile: check and reinit submodules, format.
* Menu: lock on event processing. Makefile: proper submodule initialization.
* Menu: fix stack corruption by queue.
* GUI: refactor.
* Makefile: format rule fix, st-util pid.
* GUI, Menu, FURI: format with clang-format.
* GUI, MENU: locks in critical sections, fix stack corruption, ready signaling.
* Makefile: clang format rule cleanup.
* GUI,MENU: migrate to new API.
* Applications: PRODUCTION_HW variable, skip drivers build on local target.
* refactor production build
* add git to dockerfile
* GUI: uncomment lock block
Co-authored-by: Aleksandr Kutuzov <aku@plooks.com>
2020-10-14 10:21:55 +00:00
|
|
|
assert(widget);
|
|
|
|
assert(gui);
|
|
|
|
widget->gui = gui;
|
|
|
|
}
|
|
|
|
|
2020-10-15 15:13:18 +00:00
|
|
|
void widget_draw(Widget* widget, CanvasApi* canvas_api) {
|
Display and UI implementation (#169)
* Menu app. Lib: add mlib submodule.
* Menu: new startup lib dependency definition
* Menu: hierarchy in menu. Cube: fix heap1/4 inconsistency, stack protection.
* GUI: rendering pipeline initial version.
* GUI: layered widget composing, FURI record. Menu: FURI record, api.
* GUI: input dispatching. Menu: switch to input from GUI.
* GUI, MENU: code style cleanup, fix type conversion warnings.
* GUI, Menu: syntax check.
* Makefile: check and reinit submodules, format.
* Menu: lock on event processing. Makefile: proper submodule initialization.
* Menu: fix stack corruption by queue.
* GUI: refactor.
* Makefile: format rule fix, st-util pid.
* GUI, Menu, FURI: format with clang-format.
* GUI, MENU: locks in critical sections, fix stack corruption, ready signaling.
* Makefile: clang format rule cleanup.
* GUI,MENU: migrate to new API.
* Applications: PRODUCTION_HW variable, skip drivers build on local target.
* refactor production build
* add git to dockerfile
* GUI: uncomment lock block
Co-authored-by: Aleksandr Kutuzov <aku@plooks.com>
2020-10-14 10:21:55 +00:00
|
|
|
assert(widget);
|
2020-10-15 15:13:18 +00:00
|
|
|
assert(canvas_api);
|
Display and UI implementation (#169)
* Menu app. Lib: add mlib submodule.
* Menu: new startup lib dependency definition
* Menu: hierarchy in menu. Cube: fix heap1/4 inconsistency, stack protection.
* GUI: rendering pipeline initial version.
* GUI: layered widget composing, FURI record. Menu: FURI record, api.
* GUI: input dispatching. Menu: switch to input from GUI.
* GUI, MENU: code style cleanup, fix type conversion warnings.
* GUI, Menu: syntax check.
* Makefile: check and reinit submodules, format.
* Menu: lock on event processing. Makefile: proper submodule initialization.
* Menu: fix stack corruption by queue.
* GUI: refactor.
* Makefile: format rule fix, st-util pid.
* GUI, Menu, FURI: format with clang-format.
* GUI, MENU: locks in critical sections, fix stack corruption, ready signaling.
* Makefile: clang format rule cleanup.
* GUI,MENU: migrate to new API.
* Applications: PRODUCTION_HW variable, skip drivers build on local target.
* refactor production build
* add git to dockerfile
* GUI: uncomment lock block
Co-authored-by: Aleksandr Kutuzov <aku@plooks.com>
2020-10-14 10:21:55 +00:00
|
|
|
assert(widget->gui);
|
|
|
|
|
2020-10-15 15:05:28 +00:00
|
|
|
if(widget->draw_callback) {
|
2020-10-15 15:57:21 +00:00
|
|
|
widget->draw_callback(canvas_api, widget->draw_callback_context);
|
2020-10-15 15:05:28 +00:00
|
|
|
}
|
Display and UI implementation (#169)
* Menu app. Lib: add mlib submodule.
* Menu: new startup lib dependency definition
* Menu: hierarchy in menu. Cube: fix heap1/4 inconsistency, stack protection.
* GUI: rendering pipeline initial version.
* GUI: layered widget composing, FURI record. Menu: FURI record, api.
* GUI: input dispatching. Menu: switch to input from GUI.
* GUI, MENU: code style cleanup, fix type conversion warnings.
* GUI, Menu: syntax check.
* Makefile: check and reinit submodules, format.
* Menu: lock on event processing. Makefile: proper submodule initialization.
* Menu: fix stack corruption by queue.
* GUI: refactor.
* Makefile: format rule fix, st-util pid.
* GUI, Menu, FURI: format with clang-format.
* GUI, MENU: locks in critical sections, fix stack corruption, ready signaling.
* Makefile: clang format rule cleanup.
* GUI,MENU: migrate to new API.
* Applications: PRODUCTION_HW variable, skip drivers build on local target.
* refactor production build
* add git to dockerfile
* GUI: uncomment lock block
Co-authored-by: Aleksandr Kutuzov <aku@plooks.com>
2020-10-14 10:21:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void widget_input(Widget* widget, InputEvent* event) {
|
|
|
|
assert(widget);
|
|
|
|
assert(event);
|
|
|
|
assert(widget->gui);
|
|
|
|
|
|
|
|
if(widget->input_callback) widget->input_callback(event, widget->input_callback_context);
|
|
|
|
}
|