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

…*" names (lvgl#6068)

Co-authored-by: Gabor Kiss-Vamosi <[email protected]>

Kconfig

@@ -250,7 +250,7 @@ menu "LVGL configuration"
 			bool "Enable support for I1 color format"
 			default y
 			depends on LV_USE_DRAW_SW
-				
+
 		config LV_DRAW_SW_DRAW_UNIT_CNT
 			int "Number of draw units"
 			default 1

demos/benchmark/lv_demo_benchmark.c

@@ -26,9 +26,12 @@
     #warning "It's recommended to have at least 128kB RAM for the benchmark"
 #endif
 
-#include "../../src/display/lv_display_private.h"
 #include "../../src/core/lv_global.h"
 
+#if LV_USE_PERF_MONITOR
+    #include "../../src/display/lv_display_private.h"
+#endif
+
 /**********************
  *      TYPEDEFS
  **********************/

demos/music/lv_demo_music.c

@@ -118,33 +118,33 @@ void lv_demo_music(void)
 {
     lv_obj_set_style_bg_color(lv_screen_active(), lv_color_hex(0x343247), 0);
 
-    list = _lv_demo_music_list_create(lv_screen_active());
-    ctrl = _lv_demo_music_main_create(lv_screen_active());
+    list = lv_demo_music_list_create(lv_screen_active());
+    ctrl = lv_demo_music_main_create(lv_screen_active());
 
 #if LV_DEMO_MUSIC_AUTO_PLAY
     lv_timer_create(auto_step_cb, 1000, NULL);
 #endif
 }
 
-const char * _lv_demo_music_get_title(uint32_t track_id)
+const char * lv_demo_music_get_title(uint32_t track_id)
 {
     if(track_id >= sizeof(title_list) / sizeof(title_list[0])) return NULL;
     return title_list[track_id];
 }
 
-const char * _lv_demo_music_get_artist(uint32_t track_id)
+const char * lv_demo_music_get_artist(uint32_t track_id)
 {
     if(track_id >= sizeof(artist_list) / sizeof(artist_list[0])) return NULL;
     return artist_list[track_id];
 }
 
-const char * _lv_demo_music_get_genre(uint32_t track_id)
+const char * lv_demo_music_get_genre(uint32_t track_id)
 {
     if(track_id >= sizeof(genre_list) / sizeof(genre_list[0])) return NULL;
     return genre_list[track_id];
 }
 
-uint32_t _lv_demo_music_get_track_length(uint32_t track_id)
+uint32_t lv_demo_music_get_track_length(uint32_t track_id)
 {
     if(track_id >= sizeof(time_list) / sizeof(time_list[0])) return 0;
     return time_list[track_id];
@@ -170,17 +170,17 @@ static void auto_step_cb(lv_timer_t * t)
 
     switch(state) {
         case 5:
-            _lv_demo_music_album_next(true);
+            lv_demo_music_album_next(true);
             break;
 
         case 6:
-            _lv_demo_music_album_next(true);
+            lv_demo_music_album_next(true);
             break;
         case 7:
-            _lv_demo_music_album_next(true);
+            lv_demo_music_album_next(true);
             break;
         case 8:
-            _lv_demo_music_play(0);
+            lv_demo_music_play(0);
             break;
 #if LV_DEMO_MUSIC_SQUARE || LV_DEMO_MUSIC_ROUND
         case 11:
@@ -201,7 +201,7 @@ static void auto_step_cb(lv_timer_t * t)
             lv_obj_scroll_by(list, 0, 300, LV_ANIM_ON);
             break;
         case 18:
-            _lv_demo_music_play(1);
+            lv_demo_music_play(1);
             break;
         case 19:
             lv_obj_scroll_by(ctrl, 0, LV_VER_RES, LV_ANIM_ON);
@@ -212,7 +212,7 @@ static void auto_step_cb(lv_timer_t * t)
             break;
 #endif
         case 30:
-            _lv_demo_music_play(2);
+            lv_demo_music_play(2);
             break;
         case 40: {
                 lv_obj_t * bg = lv_layer_top();
@@ -247,7 +247,7 @@ static void auto_step_cb(lv_timer_t * t)
             }
         case 41:
             lv_screen_load(lv_obj_create(NULL));
-            _lv_demo_music_pause();
+            lv_demo_music_pause();
             break;
     }
     state++;

demos/music/lv_demo_music.h

@@ -36,10 +36,10 @@ extern "C" {
  **********************/
 
 void lv_demo_music(void);
-const char * _lv_demo_music_get_title(uint32_t track_id);
-const char * _lv_demo_music_get_artist(uint32_t track_id);
-const char * _lv_demo_music_get_genre(uint32_t track_id);
-uint32_t _lv_demo_music_get_track_length(uint32_t track_id);
+const char * lv_demo_music_get_title(uint32_t track_id);
+const char * lv_demo_music_get_artist(uint32_t track_id);
+const char * lv_demo_music_get_genre(uint32_t track_id);
+uint32_t lv_demo_music_get_track_length(uint32_t track_id);
 
 /**********************
  *      MACROS

demos/music/lv_demo_music_list.c

@@ -51,7 +51,7 @@ LV_IMAGE_DECLARE(img_lv_demo_music_btn_list_pause);
  *   GLOBAL FUNCTIONS
  **********************/
 
-lv_obj_t * _lv_demo_music_list_create(lv_obj_t * parent)
+lv_obj_t * lv_demo_music_list_create(lv_obj_t * parent)
 {
     font_small = LV_FONT_DEFAULT;
     font_medium = LV_FONT_DEFAULT;
@@ -138,20 +138,20 @@ lv_obj_t * _lv_demo_music_list_create(lv_obj_t * parent)
     lv_obj_set_flex_flow(list, LV_FLEX_FLOW_COLUMN);
 
     uint32_t track_id;
-    for(track_id = 0; _lv_demo_music_get_title(track_id); track_id++) {
+    for(track_id = 0; lv_demo_music_get_title(track_id); track_id++) {
         add_list_button(list,  track_id);
     }
 
 #if LV_DEMO_MUSIC_ROUND
     lv_obj_set_scroll_snap_y(list, LV_SCROLL_SNAP_CENTER);
 #endif
 
-    _lv_demo_music_list_button_check(0, true);
+    lv_demo_music_list_button_check(0, true);
 
     return list;
 }
 
-void _lv_demo_music_list_button_check(uint32_t track_id, bool state)
+void lv_demo_music_list_button_check(uint32_t track_id, bool state)
 {
     lv_obj_t * btn = lv_obj_get_child(list, track_id);
     lv_obj_t * icon = lv_obj_get_child(btn, 0);
@@ -173,11 +173,11 @@ void _lv_demo_music_list_button_check(uint32_t track_id, bool state)
 
 static lv_obj_t * add_list_button(lv_obj_t * parent, uint32_t track_id)
 {
-    uint32_t t = _lv_demo_music_get_track_length(track_id);
+    uint32_t t = lv_demo_music_get_track_length(track_id);
     char time[32];
     lv_snprintf(time, sizeof(time), "%"LV_PRIu32":%02"LV_PRIu32, t / 60, t % 60);
-    const char * title = _lv_demo_music_get_title(track_id);
-    const char * artist = _lv_demo_music_get_artist(track_id);
+    const char * title = lv_demo_music_get_title(track_id);
+    const char * artist = lv_demo_music_get_artist(track_id);
 
     lv_obj_t * btn = lv_obj_create(parent);
     lv_obj_remove_style_all(btn);
@@ -233,7 +233,7 @@ static void btn_click_event_cb(lv_event_t * e)
 
     uint32_t idx = lv_obj_get_index(btn);
 
-    _lv_demo_music_play(idx);
+    lv_demo_music_play(idx);
 }
 
 static void list_delete_event_cb(lv_event_t * e)

demos/music/lv_demo_music_list.h

@@ -27,8 +27,8 @@ extern "C" {
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
-lv_obj_t * _lv_demo_music_list_create(lv_obj_t * parent);
-void _lv_demo_music_list_button_check(uint32_t track_id, bool state);
+lv_obj_t * lv_demo_music_list_create(lv_obj_t * parent);
+void lv_demo_music_list_button_check(uint32_t track_id, bool state);
 
 /**********************
  *      MACROS

demos/music/lv_demo_music_main.c

@@ -124,7 +124,7 @@ static void _obj_set_x_anim_cb(void * obj, int32_t x)
     lv_obj_set_x((lv_obj_t *)obj, (int32_t)x);
 }
 
-lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)
+lv_obj_t * lv_demo_music_main_create(lv_obj_t * parent)
 {
     font_small = LV_FONT_DEFAULT;
     font_large = LV_FONT_DEFAULT;
@@ -318,7 +318,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)
     return main_cont;
 }
 
-void _lv_demo_music_album_next(bool next)
+void lv_demo_music_album_next(bool next)
 {
     uint32_t id = track_id;
     if(next) {
@@ -335,21 +335,21 @@ void _lv_demo_music_album_next(bool next)
     }
 
     if(playing) {
-        _lv_demo_music_play(id);
+        lv_demo_music_play(id);
     }
     else {
         track_load(id);
     }
 }
 
-void _lv_demo_music_play(uint32_t id)
+void lv_demo_music_play(uint32_t id)
 {
     track_load(id);
 
-    _lv_demo_music_resume();
+    lv_demo_music_resume();
 }
 
-void _lv_demo_music_resume(void)
+void lv_demo_music_resume(void)
 {
     playing = true;
     spectrum_i = spectrum_i_pause;
@@ -364,13 +364,13 @@ void _lv_demo_music_resume(void)
     lv_anim_start(&a);
 
     if(sec_counter_timer) lv_timer_resume(sec_counter_timer);
-    lv_slider_set_range(slider_obj, 0, _lv_demo_music_get_track_length(track_id));
+    lv_slider_set_range(slider_obj, 0, lv_demo_music_get_track_length(track_id));
 
     lv_obj_add_state(play_obj, LV_STATE_CHECKED);
 
 }
 
-void _lv_demo_music_pause(void)
+void lv_demo_music_pause(void)
 {
     playing = false;
     spectrum_i_pause = spectrum_i;
@@ -499,18 +499,18 @@ static lv_obj_t * create_title_box(lv_obj_t * parent)
     title_label = lv_label_create(cont);
     lv_obj_set_style_text_font(title_label, font_large, 0);
     lv_obj_set_style_text_color(title_label, lv_color_hex(0x504d6d), 0);
-    lv_label_set_text(title_label, _lv_demo_music_get_title(track_id));
+    lv_label_set_text(title_label, lv_demo_music_get_title(track_id));
     lv_obj_set_height(title_label, lv_font_get_line_height(font_large) * 3 / 2);
 
     artist_label = lv_label_create(cont);
     lv_obj_set_style_text_font(artist_label, font_small, 0);
     lv_obj_set_style_text_color(artist_label, lv_color_hex(0x504d6d), 0);
-    lv_label_set_text(artist_label, _lv_demo_music_get_artist(track_id));
+    lv_label_set_text(artist_label, lv_demo_music_get_artist(track_id));
 
     genre_label = lv_label_create(cont);
     lv_obj_set_style_text_font(genre_label, font_small, 0);
     lv_obj_set_style_text_color(genre_label, lv_color_hex(0x8a86b8), 0);
-    lv_label_set_text(genre_label, _lv_demo_music_get_genre(track_id));
+    lv_label_set_text(genre_label, lv_demo_music_get_genre(track_id));
 
     return cont;
 }
@@ -685,15 +685,15 @@ static void track_load(uint32_t id)
     bool next = false;
     if((track_id + 1) % ACTIVE_TRACK_CNT == id) next = true;
 
-    _lv_demo_music_list_button_check(track_id, false);
+    lv_demo_music_list_button_check(track_id, false);
 
     track_id = id;
 
-    _lv_demo_music_list_button_check(id, true);
+    lv_demo_music_list_button_check(id, true);
 
-    lv_label_set_text(title_label, _lv_demo_music_get_title(track_id));
-    lv_label_set_text(artist_label, _lv_demo_music_get_artist(track_id));
-    lv_label_set_text(genre_label, _lv_demo_music_get_genre(track_id));
+    lv_label_set_text(title_label, lv_demo_music_get_title(track_id));
+    lv_label_set_text(artist_label, lv_demo_music_get_artist(track_id));
+    lv_label_set_text(genre_label, lv_demo_music_get_genre(track_id));
 
     lv_anim_t a;
     lv_anim_init(&a);
@@ -801,8 +801,10 @@ static void spectrum_draw_event_cb(lv_event_t * e)
         if(opa < LV_OPA_MIN) return;
 
         lv_point_t center;
-        center.x = obj->coords.x1 + lv_obj_get_width(obj) / 2;
-        center.y = obj->coords.y1 + lv_obj_get_height(obj) / 2;
+        lv_area_t obj_coords;
+        lv_obj_get_coords(obj, &obj_coords);
+        center.x = obj_coords.x1 + lv_obj_get_width(obj) / 2;
+        center.y = obj_coords.y1 + lv_obj_get_height(obj) / 2;
 
         lv_draw_triangle_dsc_t draw_dsc;
         lv_draw_triangle_dsc_init(&draw_dsc);
@@ -975,32 +977,32 @@ static void album_gesture_event_cb(lv_event_t * e)
 {
     LV_UNUSED(e);
     lv_dir_t dir = lv_indev_get_gesture_dir(lv_indev_active());
-    if(dir == LV_DIR_LEFT) _lv_demo_music_album_next(true);
-    if(dir == LV_DIR_RIGHT) _lv_demo_music_album_next(false);
+    if(dir == LV_DIR_LEFT) lv_demo_music_album_next(true);
+    if(dir == LV_DIR_RIGHT) lv_demo_music_album_next(false);
 }
 
 static void play_event_click_cb(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
     if(lv_obj_has_state(obj, LV_STATE_CHECKED)) {
-        _lv_demo_music_resume();
+        lv_demo_music_resume();
     }
     else {
-        _lv_demo_music_pause();
+        lv_demo_music_pause();
     }
 }
 
 static void prev_click_event_cb(lv_event_t * e)
 {
     LV_UNUSED(e);
-    _lv_demo_music_album_next(false);
+    lv_demo_music_album_next(false);
 }
 
 static void next_click_event_cb(lv_event_t * e)
 {
     lv_event_code_t code = lv_event_get_code(e);
     if(code == LV_EVENT_CLICKED) {
-        _lv_demo_music_album_next(true);
+        lv_demo_music_album_next(true);
     }
 }
 
@@ -1015,7 +1017,7 @@ static void timer_cb(lv_timer_t * t)
 static void spectrum_end_cb(lv_anim_t * a)
 {
     LV_UNUSED(a);
-    _lv_demo_music_album_next(true);
+    lv_demo_music_album_next(true);
 }
 
 static void stop_start_anim(lv_timer_t * t)

demos/music/lv_demo_music_main.h

@@ -32,11 +32,11 @@ extern "C" {
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
-lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent);
-void _lv_demo_music_play(uint32_t id);
-void _lv_demo_music_resume(void);
-void _lv_demo_music_pause(void);
-void _lv_demo_music_album_next(bool next);
+lv_obj_t * lv_demo_music_main_create(lv_obj_t * parent);
+void lv_demo_music_play(uint32_t id);
+void lv_demo_music_resume(void);
+void lv_demo_music_pause(void);
+void lv_demo_music_album_next(bool next);
 
 /**********************
  *      MACROS