1From 4eff59e80820a7d346f1199570e21d21b18cb030 Mon Sep 17 00:00:00 2001 2From: Jiajian Wu <jair.wu@rock-chips.com> 3Date: Wed, 21 Dec 2022 14:36:15 +0800 4Subject: [PATCH 5/6] HACK: use sdl to get display size 5 6Signed-off-by: Jiajian Wu <jair.wu@rock-chips.com> 7--- 8 lv_drv_conf.h | 4 ++-- 9 sdl/sdl_gpu.c | 22 +++++++++++++++++++--- 10 2 files changed, 21 insertions(+), 5 deletions(-) 11 12diff --git a/lv_drv_conf.h b/lv_drv_conf.h 13index 6dd6af1..345762a 100644 14--- a/lv_drv_conf.h 15+++ b/lv_drv_conf.h 16@@ -95,8 +95,8 @@ 17 #endif 18 19 #if USE_SDL || USE_SDL_GPU 20-# define SDL_HOR_RES 720 21-# define SDL_VER_RES 1280 22+//# define SDL_HOR_RES 720 23+//# define SDL_VER_RES 1280 24 25 /* Scale window by this factor (useful when simulating small screens) */ 26 # define SDL_ZOOM 1 27diff --git a/sdl/sdl_gpu.c b/sdl/sdl_gpu.c 28index 1a459f6..51ce536 100644 29--- a/sdl/sdl_gpu.c 30+++ b/sdl/sdl_gpu.c 31@@ -48,6 +48,8 @@ 32 **********************/ 33 typedef struct { 34 lv_draw_sdl_drv_param_t drv_param; 35+ lv_coord_t hor_res; 36+ lv_coord_t ver_res; 37 SDL_Window * window; 38 SDL_Texture * texture; 39 }monitor_t; 40@@ -92,7 +94,11 @@ void sdl_init(void) 41 void sdl_disp_drv_init(lv_disp_drv_t * disp_drv, lv_coord_t hor_res, lv_coord_t ver_res) 42 { 43 monitor_t *m = lv_mem_alloc(sizeof(monitor_t)); 44+ m->hor_res = hor_res; 45+ m->ver_res = ver_res; 46 window_create(m); 47+ hor_res = m->hor_res; 48+ ver_res = m->ver_res; 49 lv_disp_drv_init(disp_drv); 50 disp_drv->direct_mode = 1; 51 disp_drv->flush_cb = monitor_flush; 52@@ -244,13 +250,22 @@ static void monitor_sdl_clean_up(void) 53 static void window_create(monitor_t * m) 54 { 55 // SDL_SetHint( SDL_HINT_RENDER_SCALE_QUALITY, "1"); 56+ SDL_Rect rect; 57+ 58+ if (!m->hor_res || !m->ver_res) { 59+ SDL_GetDisplayBounds(0, &rect); 60+ m->hor_res = rect.w; 61+ m->ver_res = rect.h; 62+ } 63+ 64 m->window = SDL_CreateWindow("TFT Simulator", 65 SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 66- SDL_HOR_RES * SDL_ZOOM, SDL_VER_RES * SDL_ZOOM, SDL_WINDOW_RESIZABLE); 67+ m->hor_res * SDL_ZOOM, m->ver_res * SDL_ZOOM, 68+ SDL_WINDOW_RESIZABLE); 69 70 m->drv_param.renderer = SDL_CreateRenderer(m->window, -1, SDL_RENDERER_ACCELERATED); 71 72- m->texture = lv_draw_sdl_create_screen_texture(m->drv_param.renderer, SDL_HOR_RES, SDL_VER_RES); 73+ m->texture = lv_draw_sdl_create_screen_texture(m->drv_param.renderer, m->hor_res, m->ver_res); 74 /* For first frame */ 75 SDL_SetRenderTarget(m->drv_param.renderer, m->texture); 76 } 77@@ -258,13 +273,14 @@ static void window_create(monitor_t * m) 78 static void window_update(lv_disp_drv_t *disp_drv, void * buf) 79 { 80 SDL_Renderer *renderer = ((lv_draw_sdl_drv_param_t *) disp_drv->user_data)->renderer; 81+ monitor_t *m = (monitor_t *)disp_drv->user_data; 82 SDL_Texture *texture = buf; 83 SDL_SetRenderTarget(renderer, NULL); 84 SDL_RenderClear(renderer); 85 #if LV_COLOR_SCREEN_TRANSP 86 SDL_SetRenderDrawColor(renderer, 0xff, 0, 0, 0xff); 87 SDL_Rect r; 88- r.x = 0; r.y = 0; r.w = SDL_HOR_RES; r.h = SDL_VER_RES; 89+ r.x = 0; r.y = 0; r.w = m->hor_res; r.h = m->ver_res; 90 SDL_RenderDrawRect(renderer, &r); 91 #endif 92 93-- 942.25.1 95 96