 2d09b8e318
			
		
	
	
		2d09b8e318
		
			
		
	
	
	
	
		
			
			* Input: refactoring, platform agnostic key configuration, update usage across project. Minor queue usage fixes and tick timings. * Gui: lighter and more efficient input and draw call dispatching, ViewPort rearranging API. View: conditional model updates, API usage update. * BT: smaller update delay * GUI: ViewPort visibility check
		
			
				
	
	
		
			306 lines
		
	
	
		
			8.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			306 lines
		
	
	
		
			8.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "gui_i.h"
 | |
| 
 | |
| ViewPort* gui_view_port_find_enabled(ViewPortArray_t array) {
 | |
|     // Iterating backward
 | |
|     ViewPortArray_it_t it;
 | |
|     ViewPortArray_it_last(it, array);
 | |
|     while(!ViewPortArray_end_p(it)) {
 | |
|         ViewPort* view_port = *ViewPortArray_ref(it);
 | |
|         if(view_port_is_enabled(view_port)) {
 | |
|             return view_port;
 | |
|         }
 | |
|         ViewPortArray_previous(it);
 | |
|     }
 | |
|     return NULL;
 | |
| }
 | |
| 
 | |
| void gui_update(Gui* gui, ViewPort* view_port) {
 | |
|     furi_assert(gui);
 | |
|     if(view_port) {
 | |
|         // Visibility check
 | |
|         gui_lock(gui);
 | |
|         for(size_t i = 0; i < GuiLayerMAX; i++) {
 | |
|             if(gui_view_port_find_enabled(gui->layers[i]) == view_port) {
 | |
|                 osThreadFlagsSet(gui->thread, GUI_THREAD_FLAG_DRAW);
 | |
|                 break;
 | |
|             }
 | |
|         }
 | |
|         gui_unlock(gui);
 | |
|     } else {
 | |
|         osThreadFlagsSet(gui->thread, GUI_THREAD_FLAG_DRAW);
 | |
|     }
 | |
| }
 | |
| 
 | |
| void gui_input_events_callback(const void* value, void* ctx) {
 | |
|     furi_assert(value);
 | |
|     furi_assert(ctx);
 | |
| 
 | |
|     Gui* gui = ctx;
 | |
| 
 | |
|     osMessageQueuePut(gui->input_queue, value, 0, osWaitForever);
 | |
|     osThreadFlagsSet(gui->thread, GUI_THREAD_FLAG_INPUT);
 | |
| }
 | |
| 
 | |
| bool gui_redraw_fs(Gui* gui) {
 | |
|     canvas_frame_set(gui->canvas, 0, 0, GUI_DISPLAY_WIDTH, GUI_DISPLAY_HEIGHT);
 | |
|     ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerFullscreen]);
 | |
|     if(view_port) {
 | |
|         view_port_draw(view_port, gui->canvas);
 | |
|         return true;
 | |
|     } else {
 | |
|         return false;
 | |
|     }
 | |
| }
 | |
| 
 | |
| void gui_redraw_status_bar(Gui* gui) {
 | |
|     ViewPortArray_it_t it;
 | |
|     uint8_t x;
 | |
|     uint8_t x_used = 0;
 | |
|     uint8_t width;
 | |
|     ViewPort* view_port;
 | |
|     // Right side
 | |
|     x = 128;
 | |
|     ViewPortArray_it(it, gui->layers[GuiLayerStatusBarRight]);
 | |
|     while(!ViewPortArray_end_p(it) && x_used < GUI_STATUS_BAR_WIDTH) {
 | |
|         // Render view_port;
 | |
|         view_port = *ViewPortArray_ref(it);
 | |
|         if(view_port_is_enabled(view_port)) {
 | |
|             width = view_port_get_width(view_port);
 | |
|             if(!width) width = 8;
 | |
|             x_used += width;
 | |
|             x -= (width + 2);
 | |
|             canvas_frame_set(gui->canvas, x, GUI_STATUS_BAR_Y, width, GUI_STATUS_BAR_HEIGHT);
 | |
|             view_port_draw(view_port, gui->canvas);
 | |
|         }
 | |
|         ViewPortArray_next(it);
 | |
|     }
 | |
|     // Left side
 | |
|     x = 0;
 | |
|     ViewPortArray_it(it, gui->layers[GuiLayerStatusBarLeft]);
 | |
|     while(!ViewPortArray_end_p(it) && x_used < GUI_STATUS_BAR_WIDTH) {
 | |
|         // Render view_port;
 | |
|         view_port = *ViewPortArray_ref(it);
 | |
|         if(view_port_is_enabled(view_port)) {
 | |
|             width = view_port_get_width(view_port);
 | |
|             if(!width) width = 8;
 | |
|             x_used += width;
 | |
|             canvas_frame_set(gui->canvas, x, GUI_STATUS_BAR_Y, width, GUI_STATUS_BAR_HEIGHT);
 | |
|             view_port_draw(view_port, gui->canvas);
 | |
|             x += (width + 2);
 | |
|         }
 | |
|         ViewPortArray_next(it);
 | |
|     }
 | |
| }
 | |
| 
 | |
| bool gui_redraw_normal(Gui* gui) {
 | |
|     canvas_frame_set(gui->canvas, GUI_MAIN_X, GUI_MAIN_Y, GUI_MAIN_WIDTH, GUI_MAIN_HEIGHT);
 | |
|     ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerMain]);
 | |
|     if(view_port) {
 | |
|         view_port_draw(view_port, gui->canvas);
 | |
|         return true;
 | |
|     }
 | |
|     return false;
 | |
| }
 | |
| 
 | |
| bool gui_redraw_none(Gui* gui) {
 | |
|     canvas_frame_set(gui->canvas, GUI_MAIN_X, GUI_MAIN_Y, GUI_MAIN_WIDTH, GUI_MAIN_HEIGHT);
 | |
|     ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerNone]);
 | |
|     if(view_port) {
 | |
|         view_port_draw(view_port, gui->canvas);
 | |
|         return true;
 | |
|     }
 | |
| 
 | |
|     return false;
 | |
| }
 | |
| 
 | |
| void gui_redraw(Gui* gui) {
 | |
|     furi_assert(gui);
 | |
|     gui_lock(gui);
 | |
| 
 | |
|     canvas_reset(gui->canvas);
 | |
| 
 | |
|     if(!gui_redraw_fs(gui)) {
 | |
|         if(!gui_redraw_normal(gui)) {
 | |
|             gui_redraw_none(gui);
 | |
|         }
 | |
|         gui_redraw_status_bar(gui);
 | |
|     }
 | |
| 
 | |
|     canvas_commit(gui->canvas);
 | |
|     gui_unlock(gui);
 | |
| }
 | |
| 
 | |
| void gui_input(Gui* gui, InputEvent* input_event) {
 | |
|     furi_assert(gui);
 | |
|     furi_assert(input_event);
 | |
| 
 | |
|     gui_lock(gui);
 | |
| 
 | |
|     ViewPort* view_port;
 | |
| 
 | |
|     view_port = gui_view_port_find_enabled(gui->layers[GuiLayerFullscreen]);
 | |
|     if(!view_port) view_port = gui_view_port_find_enabled(gui->layers[GuiLayerMain]);
 | |
|     if(!view_port) view_port = gui_view_port_find_enabled(gui->layers[GuiLayerNone]);
 | |
| 
 | |
|     if(view_port) {
 | |
|         view_port_input(view_port, input_event);
 | |
|     }
 | |
| 
 | |
|     gui_unlock(gui);
 | |
| }
 | |
| 
 | |
| void gui_lock(Gui* gui) {
 | |
|     furi_assert(gui);
 | |
|     furi_check(osMutexAcquire(gui->mutex, osWaitForever) == osOK);
 | |
| }
 | |
| 
 | |
| void gui_unlock(Gui* gui) {
 | |
|     furi_assert(gui);
 | |
|     furi_check(osMutexRelease(gui->mutex) == osOK);
 | |
| }
 | |
| 
 | |
| void gui_add_view_port(Gui* gui, ViewPort* view_port, GuiLayer layer) {
 | |
|     furi_assert(gui);
 | |
|     furi_assert(view_port);
 | |
|     furi_check(layer < GuiLayerMAX);
 | |
| 
 | |
|     gui_lock(gui);
 | |
|     // Verify that view port is not yet added
 | |
|     ViewPortArray_it_t it;
 | |
|     for(size_t i = 0; i < GuiLayerMAX; i++) {
 | |
|         ViewPortArray_it(it, gui->layers[i]);
 | |
|         while(!ViewPortArray_end_p(it)) {
 | |
|             furi_assert(*ViewPortArray_ref(it) != view_port);
 | |
|             ViewPortArray_next(it);
 | |
|         }
 | |
|     }
 | |
|     // Add view port and link with gui
 | |
|     ViewPortArray_push_back(gui->layers[layer], view_port);
 | |
|     view_port_gui_set(view_port, gui);
 | |
|     gui_unlock(gui);
 | |
| 
 | |
|     gui_update(gui, NULL);
 | |
| }
 | |
| 
 | |
| void gui_remove_view_port(Gui* gui, ViewPort* view_port) {
 | |
|     furi_assert(gui);
 | |
|     furi_assert(view_port);
 | |
| 
 | |
|     gui_lock(gui);
 | |
| 
 | |
|     view_port_gui_set(view_port, NULL);
 | |
|     ViewPortArray_it_t it;
 | |
|     for(size_t i = 0; i < GuiLayerMAX; i++) {
 | |
|         ViewPortArray_it(it, gui->layers[i]);
 | |
|         while(!ViewPortArray_end_p(it)) {
 | |
|             if(*ViewPortArray_ref(it) == view_port) {
 | |
|                 ViewPortArray_remove(gui->layers[i], it);
 | |
|             } else {
 | |
|                 ViewPortArray_next(it);
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     gui_unlock(gui);
 | |
| }
 | |
| 
 | |
| void gui_send_view_port_front(Gui* gui, ViewPort* view_port) {
 | |
|     furi_assert(gui);
 | |
|     furi_assert(view_port);
 | |
| 
 | |
|     gui_lock(gui);
 | |
|     // Remove
 | |
|     GuiLayer layer = GuiLayerMAX;
 | |
|     ViewPortArray_it_t it;
 | |
|     for(size_t i = 0; i < GuiLayerMAX; i++) {
 | |
|         ViewPortArray_it(it, gui->layers[i]);
 | |
|         while(!ViewPortArray_end_p(it)) {
 | |
|             if(*ViewPortArray_ref(it) == view_port) {
 | |
|                 ViewPortArray_remove(gui->layers[i], it);
 | |
|                 furi_assert(layer == GuiLayerMAX);
 | |
|                 layer = i;
 | |
|             } else {
 | |
|                 ViewPortArray_next(it);
 | |
|             }
 | |
|         }
 | |
|     }
 | |
|     furi_assert(layer != GuiLayerMAX);
 | |
|     // Return to the top
 | |
|     ViewPortArray_push_back(gui->layers[layer], view_port);
 | |
|     gui_unlock(gui);
 | |
| }
 | |
| 
 | |
| void gui_send_view_port_back(Gui* gui, ViewPort* view_port) {
 | |
|     furi_assert(gui);
 | |
|     furi_assert(view_port);
 | |
| 
 | |
|     gui_lock(gui);
 | |
|     // Remove
 | |
|     GuiLayer layer = GuiLayerMAX;
 | |
|     ViewPortArray_it_t it;
 | |
|     for(size_t i = 0; i < GuiLayerMAX; i++) {
 | |
|         ViewPortArray_it(it, gui->layers[i]);
 | |
|         while(!ViewPortArray_end_p(it)) {
 | |
|             if(*ViewPortArray_ref(it) == view_port) {
 | |
|                 ViewPortArray_remove(gui->layers[i], it);
 | |
|                 furi_assert(layer == GuiLayerMAX);
 | |
|                 layer = i;
 | |
|             } else {
 | |
|                 ViewPortArray_next(it);
 | |
|             }
 | |
|         }
 | |
|     }
 | |
|     furi_assert(layer != GuiLayerMAX);
 | |
|     // Return to the top
 | |
|     ViewPortArray_push_at(gui->layers[layer], 0, view_port);
 | |
|     gui_unlock(gui);
 | |
| }
 | |
| 
 | |
| Gui* gui_alloc() {
 | |
|     Gui* gui = furi_alloc(sizeof(Gui));
 | |
|     // Thread ID
 | |
|     gui->thread = osThreadGetId();
 | |
|     gui->mutex_attr.name = "mtx_gui";
 | |
|     gui->mutex_attr.attr_bits |= osMutexRecursive;
 | |
|     // Allocate mutex
 | |
|     gui->mutex = osMutexNew(&gui->mutex_attr);
 | |
|     furi_check(gui->mutex);
 | |
|     // Layers
 | |
|     for(size_t i = 0; i < GuiLayerMAX; i++) {
 | |
|         ViewPortArray_init(gui->layers[i]);
 | |
|     }
 | |
|     // Drawing canvas
 | |
|     gui->canvas = canvas_init();
 | |
|     // Input
 | |
|     gui->input_queue = osMessageQueueNew(8, sizeof(InputEvent), NULL);
 | |
|     gui->input_events = furi_record_open("input_events");
 | |
|     furi_check(gui->input_events);
 | |
|     subscribe_pubsub(gui->input_events, gui_input_events_callback, gui);
 | |
| 
 | |
|     return gui;
 | |
| }
 | |
| 
 | |
| void gui_task(void* p) {
 | |
|     Gui* gui = gui_alloc();
 | |
| 
 | |
|     furi_record_create("gui", gui);
 | |
| 
 | |
|     while(1) {
 | |
|         uint32_t flags = osThreadFlagsWait(GUI_THREAD_FLAG_ALL, osFlagsWaitAny, osWaitForever);
 | |
|         // Process and dispatch input
 | |
|         if(flags & GUI_THREAD_FLAG_INPUT) {
 | |
|             // Process till queue become empty
 | |
|             InputEvent input_event;
 | |
|             while(osMessageQueueGet(gui->input_queue, &input_event, NULL, 0) == osOK) {
 | |
|                 gui_input(gui, &input_event);
 | |
|             }
 | |
|         }
 | |
|         // Process and dispatch draw call
 | |
|         if(flags & GUI_THREAD_FLAG_DRAW) {
 | |
|             // Clear flags that arrived on input step
 | |
|             osThreadFlagsClear(GUI_THREAD_FLAG_DRAW);
 | |
|             gui_redraw(gui);
 | |
|         }
 | |
|     }
 | |
| }
 |