github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gc: add undescore to roots, arranged lv_mem.c regarding gc defines. Added support to Symbols using the numstr technique of encoding the characters as a number in an enum. Globals: register them directly witout the need for constructor to access them. Updated example code. Updated lv_mpy.c

Browse Source
This commit is contained in:
Amir Gonnen
2019-01-18 01:25:21 +02:00
parent a883f0b39a
commit 1e8ea6b15b
10 changed files with 297 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lv_core/lv_obj.c
View File

@@ -62,10 +62,10 @@ static lv_res_t lv_obj_signal(lv_obj_t * obj, lv_signal_t sign, void * param);
*/
void lv_init(void)
{
LV_GC_ROOT(def_scr) = NULL;
LV_GC_ROOT(act_scr) = NULL;
LV_GC_ROOT(top_layer) = NULL;
LV_GC_ROOT(sys_layer) = NULL;
LV_GC_ROOT(_def_scr) = NULL;
LV_GC_ROOT(_act_scr) = NULL;
LV_GC_ROOT(_top_layer) = NULL;
LV_GC_ROOT(_sys_layer) = NULL;
LV_LOG_TRACE("lv_init started");
@@ -90,19 +90,19 @@ void lv_init(void)
lv_refr_init();
/*Create the default screen*/
lv_ll_init(&LV_GC_ROOT(scr_ll), sizeof(lv_obj_t));
LV_GC_ROOT(def_scr) = lv_obj_create(NULL, NULL);
lv_ll_init(&LV_GC_ROOT(_scr_ll), sizeof(lv_obj_t));
LV_GC_ROOT(_def_scr) = lv_obj_create(NULL, NULL);
LV_GC_ROOT(act_scr) = LV_GC_ROOT(def_scr);
LV_GC_ROOT(_act_scr) = LV_GC_ROOT(_def_scr);
LV_GC_ROOT(top_layer) = lv_obj_create(NULL, NULL);
lv_obj_set_style(LV_GC_ROOT(top_layer), &lv_style_transp_fit);
LV_GC_ROOT(_top_layer) = lv_obj_create(NULL, NULL);
lv_obj_set_style(LV_GC_ROOT(_top_layer), &lv_style_transp_fit);
LV_GC_ROOT(sys_layer) = lv_obj_create(NULL, NULL);
lv_obj_set_style(LV_GC_ROOT(sys_layer), &lv_style_transp_fit);
LV_GC_ROOT(_sys_layer) = lv_obj_create(NULL, NULL);
lv_obj_set_style(LV_GC_ROOT(_sys_layer), &lv_style_transp_fit);
/*Refresh the screen*/
lv_obj_invalidate(LV_GC_ROOT(act_scr));
lv_obj_invalidate(LV_GC_ROOT(_act_scr));
#if LV_INDEV_READ_PERIOD != 0
/*Init the input device handling*/
@@ -132,7 +132,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
if(parent == NULL) {
LV_LOG_TRACE("Screen create started");
new_obj = lv_ll_ins_head(&LV_GC_ROOT(scr_ll));
new_obj = lv_ll_ins_head(&LV_GC_ROOT(_scr_ll));
lv_mem_assert(new_obj);
if(new_obj == NULL) return NULL;
@@ -355,7 +355,7 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
/*Remove the object from parent's children list*/
lv_obj_t * par = lv_obj_get_parent(obj);
if(par == NULL) { /*It is a screen*/
lv_ll_rem(&LV_GC_ROOT(scr_ll), obj);
lv_ll_rem(&LV_GC_ROOT(_scr_ll), obj);
} else {
lv_ll_rem(&(par->child_ll), obj);
}
@@ -411,7 +411,7 @@ void lv_obj_invalidate(const lv_obj_t * obj)
{
if(lv_obj_get_hidden(obj)) return;
/*Invalidate the object only if it belongs to the 'LV_GC_ROOT(act_scr)'*/
/*Invalidate the object only if it belongs to the 'LV_GC_ROOT(_act_scr)'*/
lv_obj_t * obj_scr = lv_obj_get_screen(obj);
if(obj_scr == lv_scr_act() ||
obj_scr == lv_layer_top() ||
@@ -456,9 +456,9 @@ void lv_obj_invalidate(const lv_obj_t * obj)
*/
void lv_scr_load(lv_obj_t * scr)
{
LV_GC_ROOT(act_scr) = scr;
LV_GC_ROOT(_act_scr) = scr;
lv_obj_invalidate(LV_GC_ROOT(act_scr));
lv_obj_invalidate(LV_GC_ROOT(_act_scr));
}
/*--------------------
@@ -1005,7 +1005,7 @@ void lv_obj_refresh_style(lv_obj_t * obj)
void lv_obj_report_style_mod(lv_style_t * style)
{
lv_obj_t * i;
LL_READ(LV_GC_ROOT(scr_ll), i) {
LL_READ(LV_GC_ROOT(_scr_ll), i) {
if(i->style_p == style || style == NULL) {
lv_obj_refresh_style(i);
}
@@ -1302,7 +1302,7 @@ void lv_obj_animate(lv_obj_t * obj, lv_anim_builtin_t type, uint16_t time, uint1
*/
lv_obj_t * lv_scr_act(void)
{
return LV_GC_ROOT(act_scr);
return LV_GC_ROOT(_act_scr);
}
/**
@@ -1311,7 +1311,7 @@ lv_obj_t * lv_scr_act(void)
*/
lv_obj_t * lv_layer_top(void)
{
return LV_GC_ROOT(top_layer);
return LV_GC_ROOT(_top_layer);
}
/**
@@ -1321,7 +1321,7 @@ lv_obj_t * lv_layer_top(void)
*/
lv_obj_t * lv_layer_sys(void)
{
return LV_GC_ROOT(sys_layer);
return LV_GC_ROOT(_sys_layer);
}
/**