rg_display: Added rg_display_get_width/height

ducalex · ducalex · commit f87bdce6acde · 2025-01-08T14:01:22.000-05:00
diff --git a/components/retro-go/drivers/display/sdl2.h b/components/retro-go/drivers/display/sdl2.h
@@ -9,7 +9,7 @@ static void lcd_init(void)
 {
     window = SDL_CreateWindow("Retro-Go", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, RG_SCREEN_WIDTH, RG_SCREEN_HEIGHT, 0);
     surface = SDL_GetWindowSurface(window);
-    canvas = SDL_CreateRGBSurfaceWithFormat(0, display.screen.width, display.screen.height, 16, SDL_PIXELFORMAT_RGB565);
+    canvas = SDL_CreateRGBSurfaceWithFormat(0, RG_SCREEN_WIDTH, RG_SCREEN_HEIGHT, 16, SDL_PIXELFORMAT_RGB565);
 }
 
 static void lcd_deinit(void)
diff --git a/components/retro-go/rg_display.c b/components/retro-go/rg_display.c
@@ -211,7 +211,7 @@ static inline void write_update(const rg_surface_t *update)
         // for both virtual keyboard and info labels. Maybe make it configurable later...
     }
 
-    if (lines_updated > display.screen.height * 0.80f)
+    if (lines_updated > draw_height * 0.80f)
         counters.fullFrames++;
     else
         counters.partFrames++;
@@ -220,23 +220,25 @@ static inline void write_update(const rg_surface_t *update)
 
 static void update_viewport_scaling(void)
 {
+    int screen_width = display.screen.width;
+    int screen_height = display.screen.height;
     int src_width = display.source.width;
     int src_height = display.source.height;
     int new_width = src_width;
     int new_height = src_height;
 
     if (config.scaling == RG_DISPLAY_SCALING_FULL)
     {
-        new_width = display.screen.width;
-        new_height = display.screen.height;
+        new_width = screen_width;
+        new_height = screen_height;
     }
     else if (config.scaling == RG_DISPLAY_SCALING_FIT)
     {
-        new_width = FLOAT_TO_INT(display.screen.height * ((float)src_width / src_height));
-        new_height = display.screen.height;
-        if (new_width > display.screen.width) {
-            new_width = display.screen.width;
-            new_height = FLOAT_TO_INT(display.screen.width * ((float)src_height / src_width));
+        new_width = FLOAT_TO_INT(screen_height * ((float)src_width / src_height));
+        new_height = screen_height;
+        if (new_width > screen_width) {
+            new_width = screen_width;
+            new_height = FLOAT_TO_INT(screen_width * ((float)src_height / src_width));
         }
     }
     else if (config.scaling == RG_DISPLAY_SCALING_ZOOM)
@@ -249,8 +251,8 @@ static void update_viewport_scaling(void)
     new_width &= ~1;
     new_height &= ~1;
 
-    display.viewport.left = (display.screen.width - new_width) / 2;
-    display.viewport.top = (display.screen.height - new_height) / 2;
+    display.viewport.left = (screen_width - new_width) / 2;
+    display.viewport.top = (screen_height - new_height) / 2;
     display.viewport.width = new_width;
     display.viewport.height = new_height;
 
@@ -264,9 +266,9 @@ static void update_viewport_scaling(void)
 
     memset(screen_line_checksum, 0, sizeof(screen_line_checksum));
 
-    for (int x = 0; x < display.screen.width; ++x)
+    for (int x = 0; x < screen_width; ++x)
         map_viewport_to_source_x[x] = FLOAT_TO_INT(x * display.viewport.step_x);
-    for (int y = 0; y < display.screen.height; ++y)
+    for (int y = 0; y < screen_height; ++y)
         map_viewport_to_source_y[y] = FLOAT_TO_INT(y * display.viewport.step_y);
 
     RG_LOGI("%dx%d@%.3f => %dx%d@%.3f left:%d top:%d step_x:%.2f step_y:%.2f", src_width, src_height,
@@ -283,9 +285,9 @@ static bool load_border_file(const char *filename)
 
     if (filename && (border = rg_surface_load_image_file(filename, 0)))
     {
-        if (border->width != display.screen.width || border->height != display.screen.height)
+        if (border->width != rg_display_get_width() || border->height != rg_display_get_height())
         {
-            rg_surface_t *resized = rg_surface_resize(border, display.screen.width, display.screen.height);
+            rg_surface_t *resized = rg_surface_resize(border, rg_display_get_width(), rg_display_get_height());
             if (resized)
             {
                 rg_surface_free(border);
@@ -348,6 +350,16 @@ rg_display_counters_t rg_display_get_counters(void)
     return counters;
 }
 
+int rg_display_get_width(void)
+{
+    return display.screen.width;
+}
+
+int rg_display_get_height(void)
+{
+    return display.screen.height;
+}
+
 void rg_display_set_scaling(display_scaling_t scaling)
 {
     config.scaling = RG_MIN(RG_MAX(0, scaling), RG_DISPLAY_SCALING_COUNT - 1);
diff --git a/components/retro-go/rg_display.h b/components/retro-go/rg_display.h
@@ -111,6 +111,8 @@ void rg_display_submit(const rg_surface_t *update, uint32_t flags);
 
 rg_display_counters_t rg_display_get_counters(void);
 const rg_display_t *rg_display_get_info(void);
+int rg_display_get_width(void);
+int rg_display_get_height(void);
 
 void rg_display_set_scaling(display_scaling_t scaling);
 display_scaling_t rg_display_get_scaling(void);
diff --git a/components/retro-go/rg_gui.c b/components/retro-go/rg_gui.c
@@ -16,6 +16,7 @@ static struct
     uint16_t *screen_buffer, *draw_buffer;
     size_t draw_buffer_size;
     int screen_width, screen_height;
+    int screen_safezone; // rg_rect_t
     struct
     {
         const rg_font_t *font;
@@ -102,8 +103,13 @@ static int get_vertical_position(int y_pos, int height)
 
 void rg_gui_init(void)
 {
-    gui.screen_width = rg_display_get_info()->screen.width;
-    gui.screen_height = rg_display_get_info()->screen.height;
+    gui.screen_width = rg_display_get_width();
+    gui.screen_height = rg_display_get_height();
+    #ifdef RG_SCREEN_HAS_ROUND_CORNERS
+    gui.screen_safezone = 20;
+    #else
+    gui.screen_safezone = 0;
+    #endif
     gui.draw_buffer = get_draw_buffer(gui.screen_width, 18, C_BLACK);
     rg_gui_set_language_id(rg_settings_get_number(NS_GLOBAL, SETTING_LANGUAGE, RG_LANG_EN));
     rg_gui_set_font(rg_settings_get_number(NS_GLOBAL, SETTING_FONTTYPE, RG_FONT_VERA_12));
@@ -534,15 +540,11 @@ void rg_gui_draw_icons(void)
     int bar_height = txt.height;
     int icon_height = RG_MAX(8, bar_height - 4);
     int icon_top = RG_MAX(0, (bar_height - icon_height - 1) / 2);
-    int right = 0;
+    int right = gui.screen_safezone;
 
     if (battery.present)
     {
-        #ifdef RG_SCREEN_HAS_ROUND_CORNERS
-        right += 42; // This is to shift the battery icon a bit on the left
-        #else
-        right += 22; // Regular rectangle screen
-        #endif
+        right += 22;
 
         int width = 16;
         int height = icon_height;
@@ -600,8 +602,9 @@ void rg_gui_draw_icons(void)
 
 void rg_gui_draw_hourglass(void)
 {
-    rg_display_write_rect((gui.screen_width / 2) - (image_hourglass.width / 2),
-        (gui.screen_height / 2) - (image_hourglass.height / 2),
+    rg_display_write_rect(
+        get_horizontal_position(RG_GUI_CENTER, image_hourglass.width),
+        get_vertical_position(RG_GUI_CENTER, image_hourglass.height),
         image_hourglass.width,
         image_hourglass.height,
         image_hourglass.width * 2,
@@ -633,6 +636,7 @@ void rg_gui_draw_status_bars(void)
     else
         snprintf(footer, max_len, "Retro-Go %s", app->version);
 
+    // FIXME: Respect gui.safezone (draw black background full screen_width, but pad the text if needed)
     rg_gui_draw_text(0, RG_GUI_TOP, gui.screen_width, header, C_WHITE, C_BLACK, 0);
     rg_gui_draw_text(0, RG_GUI_BOTTOM, gui.screen_width, footer, C_WHITE, C_BLACK, 0);
 
diff --git a/components/retro-go/rg_system.c b/components/retro-go/rg_system.c
@@ -1294,7 +1294,7 @@ bool rg_emu_save_state(uint8_t slot)
     {
         // Save succeeded, let's take a pretty screenshot for the launcher!
         char *filename = rg_emu_get_path(RG_PATH_SCREENSHOT + slot, app.romPath);
-        rg_emu_screenshot(filename, rg_display_get_info()->screen.width / 2, 0);
+        rg_emu_screenshot(filename, rg_display_get_width() / 2, 0);
         free(filename);
         emu_update_save_slot(slot);
     }
diff --git a/components/retro-go/targets/mrgc-gbm/config.h b/components/retro-go/targets/mrgc-gbm/config.h
@@ -22,6 +22,7 @@
 #define RG_SCREEN_HEIGHT            240
 #define RG_SCREEN_ROTATE            0
 #define RG_SCREEN_MARGIN_TOP        38
+#define RG_SCREEN_MARGIN_BOTTOM     0
 #define RG_SCREEN_MARGIN_LEFT       0
 #define RG_SCREEN_MARGIN_RIGHT      0
 #define RG_SCREEN_INIT()                                                                                   \
diff --git a/launcher/main/gui.c b/launcher/main/gui.c
@@ -38,8 +38,8 @@ void gui_init(bool cold_boot)
         .start_screen = rg_settings_get_number(NS_APP, SETTING_START_SCREEN, START_SCREEN_AUTO),
         .show_preview = rg_settings_get_number(NS_APP, SETTING_SHOW_PREVIEW, PREVIEW_MODE_SAVE_COVER),
         .scroll_mode  = rg_settings_get_number(NS_APP, SETTING_SCROLL_MODE, SCROLL_MODE_CENTER),
-        .width        = rg_display_get_info()->screen.width,
-        .height       = rg_display_get_info()->screen.height,
+        .width        = rg_display_get_width(),
+        .height       = rg_display_get_height(),
     };
     // Auto: Show carousel on cold boot, browser on warm boot (after cleanly exiting an emulator)
     gui.browse = gui.start_screen == START_SCREEN_BROWSER || (gui.start_screen == START_SCREEN_AUTO && !cold_boot);
diff --git a/prboom-go/main/main.c b/prboom-go/main/main.c
@@ -544,9 +544,8 @@ void app_main()
     app = rg_system_init(AUDIO_SAMPLE_RATE, &handlers, NULL);
     rg_system_set_tick_rate(TICRATE);
 
-    const rg_display_t *display = rg_display_get_info();
-    SCREENWIDTH = RG_MIN(display->screen.width, MAX_SCREENWIDTH);
-    SCREENHEIGHT = RG_MIN(display->screen.height, MAX_SCREENHEIGHT);
+    SCREENWIDTH = RG_MIN(rg_display_get_width(), MAX_SCREENWIDTH);
+    SCREENHEIGHT = RG_MIN(rg_display_get_height(), MAX_SCREENHEIGHT);
 
     update = rg_surface_create(SCREENWIDTH, SCREENHEIGHT, RG_PIXEL_PAL565_BE, MEM_FAST);
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ static void lcd_init(void)`
`9`	`9`	`{`
`10`	`10`	`window = SDL_CreateWindow("Retro-Go", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, RG_SCREEN_WIDTH, RG_SCREEN_HEIGHT, 0);`
`11`	`11`	`surface = SDL_GetWindowSurface(window);`
`12`		`- canvas = SDL_CreateRGBSurfaceWithFormat(0, display.screen.width, display.screen.height, 16, SDL_PIXELFORMAT_RGB565);`
	`12`	`+ canvas = SDL_CreateRGBSurfaceWithFormat(0, RG_SCREEN_WIDTH, RG_SCREEN_HEIGHT, 16, SDL_PIXELFORMAT_RGB565);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`static void lcd_deinit(void)`
Original file line number	Diff line number	Diff line change
`@@ -1294,7 +1294,7 @@ bool rg_emu_save_state(uint8_t slot)`
`1294`	`1294`	`{`
`1295`	`1295`	`// Save succeeded, let's take a pretty screenshot for the launcher!`
`1296`	`1296`	`char *filename = rg_emu_get_path(RG_PATH_SCREENSHOT + slot, app.romPath);`
`1297`		`- rg_emu_screenshot(filename, rg_display_get_info()->screen.width / 2, 0);`
	`1297`	`+ rg_emu_screenshot(filename, rg_display_get_width() / 2, 0);`
`1298`	`1298`	`free(filename);`
`1299`	`1299`	`emu_update_save_slot(slot);`
`1300`	`1300`	`}`