refactor(API): don't expose private symbols in lvgl.h. phase-out "_lv*" names (#6068)

Co-authored-by: Gabor Kiss-Vamosi <kisvegabor@gmail.com>

tests/src/lv_test_indev.c

@@ -1,3 +1,4 @@
+#include "../../src/indev/lv_indev_private.h"
 #if LV_BUILD_TEST
 #include "../lvgl.h"
 #include <stdio.h>

tests/src/test_cases/cache/test_cache.c

@@ -1,6 +1,7 @@
 #if LV_BUILD_TEST
 
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "lv_test_helpers.h"
 
 #include "unity/unity.h"

tests/src/test_cases/draw/test_clip_corner.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/draw/test_draw_blend.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "lv_test_helpers.h"
 
 #include "unity/unity.h"

tests/src/test_cases/draw/test_draw_label.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/draw/test_draw_layer.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/draw/test_draw_sw_post_process.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/draw/test_draw_vector.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "lv_test_helpers.h"
 
 #include "unity/unity.h"

tests/src/test_cases/draw/test_image_formats.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include <stdio.h>

tests/src/test_cases/draw/test_layer_transform.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/draw/test_render_to_al88.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "../demos/lv_demos.h"
 
 #include "unity/unity.h"
@@ -26,7 +27,7 @@ void test_render_to_al88(void)
     uint32_t opa;
     for(opa = 0; opa < 2; opa++) {
         uint32_t i;
-        for(i = 0; i < _LV_DEMO_RENDER_SCENE_NUM; i++) {
+        for(i = 0; i < LV_DEMO_RENDER_SCENE_NUM; i++) {
 
             /*Skip test with transformed indexed images if they are not loaded to RAM*/
             if(LV_BIN_DECODER_RAM_LOAD == 0 &&

tests/src/test_cases/draw/test_render_to_argb8888.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "../demos/lv_demos.h"
 
 #include "unity/unity.h"
@@ -23,7 +24,7 @@ void test_render_to_argb8888(void)
     uint32_t opa;
     for(opa = 0; opa < 2; opa++) {
         uint32_t i;
-        for(i = 0; i < _LV_DEMO_RENDER_SCENE_NUM; i++) {
+        for(i = 0; i < LV_DEMO_RENDER_SCENE_NUM; i++) {
 
             /*Skip test with transformed indexed images if they are not loaded to RAM*/
             if(LV_BIN_DECODER_RAM_LOAD == 0 &&

tests/src/test_cases/draw/test_render_to_i1.c

@@ -24,7 +24,7 @@ void test_render_to_i1(void)
     uint32_t opa;
     for(opa = 0; opa < 2; opa++) {
         uint32_t i;
-        for(i = 0; i < _LV_DEMO_RENDER_SCENE_NUM; i++) {
+        for(i = 0; i < LV_DEMO_RENDER_SCENE_NUM; i++) {
             lv_demo_render(i, opa_values[opa]);
 
             char buf[128];

tests/src/test_cases/draw/test_render_to_l8.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "../demos/lv_demos.h"
 
 #include "unity/unity.h"
@@ -26,7 +27,7 @@ void test_render_to_l8(void)
     uint32_t opa;
     for(opa = 0; opa < 2; opa++) {
         uint32_t i;
-        for(i = 0; i < _LV_DEMO_RENDER_SCENE_NUM; i++) {
+        for(i = 0; i < LV_DEMO_RENDER_SCENE_NUM; i++) {
             lv_demo_render(i, opa_values[opa]);
 
             /*Skip test with transformed indexed images if they are not loaded to RAM*/

tests/src/test_cases/draw/test_render_to_rgb565.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "../demos/lv_demos.h"
 
 #include "unity/unity.h"
@@ -23,7 +24,7 @@ void test_render_to_rgb565(void)
     uint32_t opa;
     for(opa = 0; opa < 2; opa++) {
         uint32_t i;
-        for(i = 0; i < _LV_DEMO_RENDER_SCENE_NUM; i++) {
+        for(i = 0; i < LV_DEMO_RENDER_SCENE_NUM; i++) {
 
             /*Skip test with transformed indexed images if they are not loaded to RAM*/
             if(LV_BIN_DECODER_RAM_LOAD == 0 &&

tests/src/test_cases/draw/test_render_to_rgb888.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "../demos/lv_demos.h"
 
 #include "unity/unity.h"
@@ -23,7 +24,7 @@ void test_render_to_rgb888(void)
     uint32_t opa;
     for(opa = 0; opa < 2; opa++) {
         uint32_t i;
-        for(i = 0; i < _LV_DEMO_RENDER_SCENE_NUM; i++) {
+        for(i = 0; i < LV_DEMO_RENDER_SCENE_NUM; i++) {
 
             /*Skip test with transformed indexed images if they are not loaded to RAM*/
             if(LV_BIN_DECODER_RAM_LOAD == 0 &&

tests/src/test_cases/draw/test_render_to_xrgb8888.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "../demos/lv_demos.h"
 
 #include "unity/unity.h"
@@ -23,7 +24,7 @@ void test_render_to_xrgb8888(void)
     uint32_t opa;
     for(opa = 0; opa < 2; opa++) {
         uint32_t i;
-        for(i = 0; i < _LV_DEMO_RENDER_SCENE_NUM; i++) {
+        for(i = 0; i < LV_DEMO_RENDER_SCENE_NUM; i++) {
 
             /*Skip test with transformed indexed images if they are not loaded to RAM*/
             if(LV_BIN_DECODER_RAM_LOAD == 0 &&

tests/src/test_cases/libs/test_barcode.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/libs/test_bin_decoder.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/libs/test_bmp.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_helpers.h"

tests/src/test_cases/libs/test_font_stress.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/libs/test_freetype.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../libs/freetype/lv_freetype_private.h"
 
 #include "unity/unity.h"
 
@@ -483,7 +484,7 @@ void test_freetype_outline_rendering_test(void)
 
     uint32_t i = 0;
     lv_freetype_outline_event_param_t * param;
-    _LV_LL_READ(outline_data, param) {
+    LV_LL_READ(outline_data, param) {
 #if OPTION_GENERATE_OUTLINE_DATA
         /*FOR Generate outline data*/
 #if OPTION_GENERATE_VECTOR_OPS_STRING
@@ -517,14 +518,14 @@ static void freetype_outline_event_cb(lv_event_t * e)
     switch(code) {
         case LV_EVENT_CREATE:
             param->outline = lv_malloc_zeroed(sizeof(lv_ll_t));
-            _lv_ll_init(param->outline, sizeof(lv_freetype_outline_event_param_t));
+            lv_ll_init(param->outline, sizeof(lv_freetype_outline_event_param_t));
             break;
         case LV_EVENT_DELETE:
-            _lv_ll_clear(param->outline);
+            lv_ll_clear(param->outline);
             lv_free(param->outline);
             break;
         case LV_EVENT_INSERT: {
-                void * entry = _lv_ll_ins_tail(param->outline);
+                void * entry = lv_ll_ins_tail(param->outline);
                 lv_memcpy(entry, param, sizeof(lv_freetype_outline_event_param_t));
                 break;
             }

tests/src/test_cases/libs/test_libjpeg_turbo.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_helpers.h"

tests/src/test_cases/libs/test_libpng.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_helpers.h"

tests/src/test_cases/libs/test_lodepng.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_helpers.h"

tests/src/test_cases/libs/test_memmove.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_helpers.h"

tests/src/test_cases/libs/test_qrcode.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/libs/test_tiny_ttf.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/libs/test_tjpgd.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_helpers.h"

tests/src/test_cases/test_align_flex.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_anim.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_helpers.h"

tests/src/test_cases/test_anim_timeline.c

@@ -1,6 +1,7 @@
 #if LV_BUILD_TEST
 
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_helpers.h"

tests/src/test_cases/test_area.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_array.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_bindings.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_indev.h"

tests/src/test_cases/test_config.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_demo_stress.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "../demos/lv_demos.h"
 
 #include "unity/unity.h"

tests/src/test_cases/test_demo_widgets.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 #include "../demos/lv_demos.h"
 
 #include "unity/unity.h"

tests/src/test_cases/test_draw_buf_stride.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_helpers.h"

tests/src/test_cases/test_event.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_indev.h"

tests/src/test_cases/test_font_loader.c

@@ -9,6 +9,7 @@
 
 #if LV_BUILD_TEST
 #include "../../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_fs.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include <string.h>

tests/src/test_cases/test_grid.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_group.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_hover.c

@@ -7,7 +7,7 @@
 
 typedef struct _test_hover_t {
     /* data */
-    uint32_t id;
+    char id[32];
     uint32_t counts;
 } test_hover_t;
 
@@ -35,8 +35,8 @@ void tearDown(void)
 
 static void hovered_event_cb(lv_event_t * e)
 {
-    test_hover_t * hover = (test_hover_t *)e->user_data;
-    lv_log("Object(ID:%d) hovered %d/%d times.\n", hover->id, hover->counts, TEST_HOVER_COUNTS);
+    test_hover_t * hover = lv_event_get_user_data(e);
+    lv_log("Object(ID:%s) hovered %u/%d times.\n", hover->id, hover->counts, TEST_HOVER_COUNTS);
 }
 
 static void test_move_mouse(lv_point_t * point, uint8_t size)
@@ -61,7 +61,7 @@ void test_hover_basic(void)
     lv_obj_set_style_text_color(label, lv_color_hex(0x5be1b6), LV_PART_MAIN | LV_STATE_HOVERED);
 
     /*Set hover callback*/
-    label_hovered.id = (lv_uintptr_t)label->id;
+    lv_obj_stringify_id(label, label_hovered.id, sizeof(label_hovered.id));
     label_hovered.counts = 0;
     lv_obj_add_event_cb(label, hovered_event_cb, LV_EVENT_HOVER_OVER, &label_hovered);
 
@@ -71,7 +71,7 @@ void test_hover_basic(void)
     lv_obj_set_style_bg_opa(btn, 128, LV_PART_MAIN | LV_STATE_HOVERED);
 
     /*Set hover callback*/
-    btn_hovered.id = (lv_uintptr_t)btn->id;
+    lv_obj_stringify_id(btn, btn_hovered.id, sizeof(btn_hovered.id));
     btn_hovered.counts = 0;
     lv_obj_add_event_cb(btn, hovered_event_cb, LV_EVENT_HOVER_OVER, &btn_hovered);
 

tests/src/test_cases/test_margin_align.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_margin_flex.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_margin_grid.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_math.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_mem.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_observer.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST == 1
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_indev.h"
@@ -260,7 +261,7 @@ void test_observer_obj_state(void)
 
     lv_obj_bind_state_if_eq(obj, &subject, LV_STATE_CHECKED, 5);
     /*Should be applied immediately*/
-    TEST_ASSERT_EQUAL(false, lv_obj_has_flag(obj, LV_STATE_CHECKED));
+    TEST_ASSERT_EQUAL(false, lv_obj_has_state(obj, LV_STATE_CHECKED));
 
     lv_obj_bind_state_if_not_eq(obj, &subject, LV_STATE_DISABLED, 10);
     /*Should be applied immediately*/

tests/src/test_cases/test_profiler.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include <string.h>

tests/src/test_cases/test_screen_load.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 

tests/src/test_cases/test_snapshot.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #if LV_USE_SNAPSHOT
 

tests/src/test_cases/test_style.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include <unistd.h>
@@ -49,13 +50,13 @@ void test_custom_prop_ids(void)
     for(uint32_t i = 0; i < max_props_to_register; i++) {
         lv_style_prop_t prop = lv_style_register_prop(fake_flag);
         /* Should have a higher index than the last built-in prop */
-        TEST_ASSERT_GREATER_THAN(_LV_STYLE_LAST_BUILT_IN_PROP, prop);
+        TEST_ASSERT_GREATER_THAN(LV_STYLE_LAST_BUILT_IN_PROP, prop);
         if(i == 0) {
             /* Should be equal to the first expected index of a custom prop */
-            TEST_ASSERT_EQUAL(_LV_STYLE_NUM_BUILT_IN_PROPS + initial_custom_props, prop);
+            TEST_ASSERT_EQUAL(LV_STYLE_NUM_BUILT_IN_PROPS + initial_custom_props, prop);
         }
         /*We should find our flags*/
-        TEST_ASSERT_EQUAL(fake_flag, _lv_style_prop_lookup_flags(prop));
+        TEST_ASSERT_EQUAL(fake_flag, lv_style_prop_lookup_flags(prop));
         if(fake_flag == 0xff)
             fake_flag = 0;
         else

tests/src/test_cases/test_txt.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "../../../src/misc/lv_text_private.h"

tests/src/test_cases/widgets/test_animimg.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_indev.h"

tests/src/test_cases/widgets/test_arc.c

@@ -1,5 +1,6 @@
 #if LV_BUILD_TEST
 #include "../lvgl.h"
+#include "../../lvgl_private.h"
 
 #include "unity/unity.h"
 #include "lv_test_indev.h"