rg_gui+rg_surface: Added rg_margins_t

Author: ducalex

components/retro-go/rg_display.h

@@ -74,13 +74,15 @@ typedef struct
     // bool (*write)(int left, int top, int width, int height, int pitch, const uint16_t data);
 } rg_display_driver_t;
 
+#include "rg_surface.h"
+
 typedef struct
 {
     struct
     {
         int real_width, real_height; // Real physical resolution
         int width, height; // Visible resolution (minus margins)
-        struct {int left, top, right, bottom;} margins;
+        rg_margins_t margins;
         int format;
     } screen;
     struct
@@ -97,8 +99,6 @@ typedef struct
     bool changed;
 } rg_display_t;
 
-#include "rg_surface.h"
-
 void rg_display_init(void);
 void rg_display_deinit(void);
 void rg_display_write_rect(int left, int top, int width, int height, int stride, const uint16_t *buffer, uint32_t flags);

components/retro-go/rg_gui.c

@@ -16,7 +16,7 @@ static struct
     uint16_t *screen_buffer, *draw_buffer;
     size_t draw_buffer_size;
     int screen_width, screen_height;
-    struct {int left, top, right, bottom;} margins;
+    rg_margins_t margins;
     struct
     {
         rg_color_t box_background;
@@ -106,7 +106,7 @@ void rg_gui_init(void)
     gui.screen_height = rg_display_get_height();
     // FIXME: RG_SCREEN_SAFE_AREA being added on top of RG_SCREEN_VISIBLE_AREA might not be super intuitive
     //        because of how this is defined in config.h. It should be documented somewhere...
-    gui.margins = (__typeof__(gui.margins))RG_SCREEN_SAFE_AREA;
+    gui.margins = (rg_margins_t)RG_SCREEN_SAFE_AREA;
     gui.draw_buffer = get_draw_buffer(gui.screen_width, 18, C_BLACK);
     gui.show_clock = rg_settings_get_boolean(NS_GLOBAL, SETTING_CLOCK, false);
     if (!rg_gui_set_language_id(rg_settings_get_number(NS_GLOBAL, SETTING_LANGUAGE, RG_LANG_DEFAULT)))
@@ -239,6 +239,11 @@ void rg_gui_set_surface(rg_surface_t *surface)
     gui.screen_buffer = surface ? surface->data : NULL;
 }
 
+rg_margins_t rg_gui_get_safe_area(void)
+{
+    return gui.margins;
+}
+
 void rg_gui_copy_buffer(int left, int top, int width, int height, int stride, const uint16_t *buffer, bool transparency)
 {
     left = get_horizontal_position(left, width);

components/retro-go/rg_gui.h

@@ -119,6 +119,7 @@ bool rg_gui_set_theme(const char *name);
 const char *rg_gui_get_theme_name(void);
 rg_image_t *rg_gui_get_theme_image(const char *name);
 rg_color_t rg_gui_get_theme_color(const char *section, const char *key, rg_color_t default_value);
+rg_margins_t rg_gui_get_safe_area(void);
 void rg_gui_copy_buffer(int left, int top, int width, int height, int stride, const uint16_t *buffer, bool transparency);
 
 rg_rect_t rg_gui_draw_text(int x_pos, int y_pos, int width, const char *text, // const rg_font_t *font,

components/retro-go/rg_surface.h

@@ -30,6 +30,12 @@ typedef struct
     int width, height;
 } rg_rect_t;
 
+typedef struct
+{
+    int left, top;
+    int right, bottom;
+} rg_margins_t;
+
 typedef struct
 {
     int width, height;