Rename menu_widgets to gfx_widgets

CrewMdk · Feb 17, 2020 · b229f26 · b229f26
1 parent 6b82089
commit b229f26
Show file tree

Hide file tree

Showing 22 changed files with 338 additions and 338 deletions.
diff --git a/cheevos-new/cheevos.c b/cheevos-new/cheevos.c
@@ -697,9 +697,9 @@ static void rcheevos_award(rcheevos_cheevo_t* cheevo, int mode)
    /* Show the OSD message. */
    {
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-      bool widgets_ready = menu_widgets_ready();
+      bool widgets_ready = gfx_widgets_ready();
       if (widgets_ready)
-         menu_widgets_push_achievement(cheevo->info->title, cheevo->info->badge);
+         gfx_widgets_push_achievement(cheevo->info->title, cheevo->info->badge);
       else
 #endif
       {

diff --git a/gfx/common/metal_common.m b/gfx/common/metal_common.m
@@ -335,7 +335,7 @@ - (bool)renderFrame:(const void *)data
       if (video_info->widgets_inited)
       {
          [rce pushDebugGroup:@"menu widgets"];
-         menu_widgets_frame(video_info);
+         gfx_widgets_frame(video_info);
          [rce popDebugGroup];
       }
 #endif

diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c
@@ -1507,7 +1507,7 @@ static bool d3d10_gfx_frame(
 #ifdef HAVE_MENU
 #ifdef HAVE_MENU_WIDGETS
    if (video_info->widgets_inited)
-      menu_widgets_frame(video_info);
+      gfx_widgets_frame(video_info);
 #endif
 #endif
 
@@ -1771,7 +1771,7 @@ static void d3d10_gfx_get_poke_interface(void* data, const video_poke_interface_
 }
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool d3d10_menu_widgets_enabled(void *data)
+static bool d3d10_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return true;
@@ -1804,6 +1804,6 @@ video_driver_t video_d3d10 = {
    d3d10_gfx_get_poke_interface,
    NULL, /* d3d10_wrap_type_to_enum */
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   d3d10_menu_widgets_enabled
+   d3d10_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c
@@ -1583,7 +1583,7 @@ static bool d3d11_gfx_frame(
 #ifdef HAVE_MENU
 #ifdef HAVE_MENU_WIDGETS
    if (video_info->widgets_inited)
-      menu_widgets_frame(video_info);
+      gfx_widgets_frame(video_info);
 #endif
 #endif
 
@@ -1842,7 +1842,7 @@ static void d3d11_gfx_get_poke_interface(void* data, const video_poke_interface_
 }
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool d3d11_menu_widgets_enabled(void *data)
+static bool d3d11_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return true;
@@ -1875,6 +1875,6 @@ video_driver_t video_d3d11 = {
    d3d11_gfx_get_poke_interface,
    NULL, /* d3d11_wrap_type_to_enum */
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   d3d11_menu_widgets_enabled
+   d3d11_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c
@@ -1564,7 +1564,7 @@ static bool d3d12_gfx_frame(
 #ifdef HAVE_MENU
 #ifdef HAVE_MENU_WIDGETS
    if (video_info->widgets_inited)
-      menu_widgets_frame(video_info);
+      gfx_widgets_frame(video_info);
 #endif
 #endif
 
@@ -1844,7 +1844,7 @@ static void d3d12_gfx_get_poke_interface(void* data, const video_poke_interface_
 }
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool d3d12_menu_widgets_enabled(void *data)
+static bool d3d12_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return true;
@@ -1877,6 +1877,6 @@ video_driver_t video_d3d12 = {
    d3d12_gfx_get_poke_interface,
    NULL, /* d3d12_wrap_type_to_enum */
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   d3d12_menu_widgets_enabled
+   d3d12_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c
@@ -1641,7 +1641,7 @@ static bool d3d9_frame(void *data, const void *frame,
 #ifdef HAVE_MENU
 #ifdef HAVE_MENU_WIDGETS
    if (video_info->widgets_inited)
-      menu_widgets_frame(video_info);
+      gfx_widgets_frame(video_info);
 #endif
 #endif
 
@@ -2025,7 +2025,7 @@ static bool d3d9_has_windowed(void *data)
 }
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool d3d9_menu_widgets_enabled(void *data)
+static bool d3d9_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return false; /* currently disabled due to memory issues */
@@ -2057,6 +2057,6 @@ video_driver_t video_d3d9 = {
    d3d9_get_poke_interface,
    NULL, /* wrap_type_to_enum */
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   d3d9_menu_widgets_enabled
+   d3d9_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
@@ -3063,7 +3063,7 @@ static bool gl2_frame(void *data, const void *frame,
 
 #ifdef HAVE_MENU_WIDGETS
    if (video_info->widgets_inited)
-      menu_widgets_frame(video_info);
+      gfx_widgets_frame(video_info);
 #endif
 
    if (!string_is_empty(msg))
@@ -4526,7 +4526,7 @@ static void gl2_get_poke_interface(void *data,
 }
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool gl2_menu_widgets_enabled(void *data)
+static bool gl2_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return true;
@@ -4568,6 +4568,6 @@ video_driver_t video_gl2 = {
    gl2_get_poke_interface,
    gl2_wrap_type_to_enum,
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   gl2_menu_widgets_enabled
+   gl2_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/drivers/gl1.c b/gfx/drivers/gl1.c
@@ -873,7 +873,7 @@ static bool gl1_gfx_frame(void *data, const void *frame,
 
 #ifdef HAVE_MENU_WIDGETS
    if (video_info->widgets_inited)
-      menu_widgets_frame(video_info);
+      gfx_widgets_frame(video_info);
 #endif
 #endif
 
@@ -1391,7 +1391,7 @@ static void gl1_gfx_get_poke_interface(void *data,
 }
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool gl1_menu_widgets_enabled(void *data)
+static bool gl1_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return true;
@@ -1557,6 +1557,6 @@ video_driver_t video_gl1 = {
   gl1_gfx_get_poke_interface,
   gl1_wrap_type_to_enum,
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-  gl1_menu_widgets_enabled
+  gl1_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c
@@ -1931,7 +1931,7 @@ static bool gl_core_frame(void *data, const void *frame,
 
 #ifdef HAVE_MENU_WIDGETS
    if (video_info->widgets_inited)
-      menu_widgets_frame(video_info);
+      gfx_widgets_frame(video_info);
 #endif
 
    if (!string_is_empty(msg))
@@ -2235,7 +2235,7 @@ static void gl_core_get_poke_interface(void *data,
 }
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool gl_core_menu_widgets_enabled(void *data)
+static bool gl_core_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return true;
@@ -2302,6 +2302,6 @@ video_driver_t video_gl_core = {
    gl_core_get_poke_interface,
    gl_core_wrap_type_to_enum,
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   gl_core_menu_widgets_enabled
+   gl_core_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c
@@ -1347,7 +1347,7 @@ static bool wiiu_gfx_frame(void *data, const void *frame,
 #ifdef HAVE_MENU
 #ifdef HAVE_MENU_WIDGETS
    if (video_info->widgets_inited)
-      menu_widgets_frame(video_info);
+      gfx_widgets_frame(video_info);
 #endif
 #endif
 
@@ -1735,7 +1735,7 @@ static void wiiu_gfx_get_poke_interface(void *data,
 }
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool wiiu_menu_widgets_enabled(void *data)
+static bool wiiu_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return true;
@@ -1768,6 +1768,6 @@ video_driver_t video_wiiu =
    wiiu_gfx_get_poke_interface,
    NULL, /* wrap_type_to_enum */
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   wiiu_menu_widgets_enabled
+   wiiu_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m
@@ -412,7 +412,7 @@ static void metal_get_overlay_interface(void *data,
 #endif
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool metal_menu_widgets_enabled(void *data)
+static bool metal_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return true;
@@ -444,6 +444,6 @@ static bool metal_menu_widgets_enabled(void *data)
    metal_get_poke_interface,
    NULL, /* metal_wrap_type_to_enum */
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   metal_menu_widgets_enabled
+   metal_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
@@ -259,14 +259,14 @@ static bool vita2d_gfx_frame(void *data, const void *frame,
                (const struct font_params*)&video_info->osd_stat_params, NULL);
    }
 
-   #ifdef HAVE_OVERLAY
+#ifdef HAVE_OVERLAY
    if (vita->overlay_enable)
       vita2d_render_overlay(vita);
-   #endif
+#endif
 
-   #ifdef HAVE_MENU_WIDGETS
-      menu_widgets_frame(video_info);
-   #endif
+#ifdef HAVE_MENU_WIDGETS
+   gfx_widgets_frame(video_info);
+#endif
 
    if(!string_is_empty(msg))
       font_driver_render_msg(vita, video_info, msg, NULL, NULL);
@@ -798,7 +798,7 @@ static void vita2d_gfx_get_poke_interface(void *data,
 }
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool vita2d_gfx_menu_widgets_enabled(void *data)
+static bool vita2d_gfx_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return true;
@@ -967,6 +967,6 @@ video_driver_t video_vita2d = {
    vita2d_gfx_get_poke_interface,
    NULL,
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   vita2d_gfx_menu_widgets_enabled
+   vita2d_gfx_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
@@ -1975,7 +1975,7 @@ static bool vulkan_frame(void *data, const void *frame,
 
 #ifdef HAVE_MENU_WIDGETS
       if (video_info->widgets_inited)
-         menu_widgets_frame(video_info);
+         gfx_widgets_frame(video_info);
 #endif
 
       /* End the render pass. We're done rendering to backbuffer now. */
@@ -2801,7 +2801,7 @@ static void vulkan_get_overlay_interface(void *data,
 #endif
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool vulkan_menu_widgets_enabled(void *data)
+static bool vulkan_gfx_widgets_enabled(void *data)
 {
    (void)data;
    return true;
@@ -2834,6 +2834,6 @@ video_driver_t video_vulkan = {
    vulkan_get_poke_interface,
    NULL,                         /* vulkan_wrap_type_to_enum */
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   vulkan_menu_widgets_enabled
+   vulkan_gfx_widgets_enabled
 #endif
 };
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
@@ -1284,12 +1284,12 @@ static void video_thread_get_poke_interface(
 }
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-static bool video_thread_wrapper_menu_widgets_enabled(void *data)
+static bool video_thread_wrapper_gfx_widgets_enabled(void *data)
 {
    thread_video_t *thr = (thread_video_t*)data;
 
-   if (thr && thr->driver && thr->driver->menu_widgets_enabled)
-      return thr->driver->menu_widgets_enabled(thr->driver_data);
+   if (thr && thr->driver && thr->driver->gfx_widgets_enabled)
+      return thr->driver->gfx_widgets_enabled(thr->driver_data);
 
    return false;
 }
@@ -1320,7 +1320,7 @@ static const video_driver_t video_thread = {
    video_thread_get_poke_interface,
    NULL,
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   video_thread_wrapper_menu_widgets_enabled
+   video_thread_wrapper_gfx_widgets_enabled
 #endif
 };
 

diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
@@ -4277,7 +4277,7 @@ static void *rgui_init(void **userdata, bool video_is_threaded)
     * but for extra safety we will only permit menu widget
     * additions when the current gfx driver reports that it
     * has widget support */
-   rgui->widgets_supported = menu_widgets_ready();
+   rgui->widgets_supported = gfx_widgets_ready();
 
    if (rgui->widgets_supported)
    {

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
@@ -6532,11 +6532,11 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
                            build_list[i].checked = true;
                      break;
                   case MENU_ENUM_LABEL_MENU_WIDGET_SCALE_AUTO:
-                     if (menu_widgets_ready())
+                     if (gfx_widgets_ready())
                         build_list[i].checked = true;
                      break;
                   case MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR:
-                     if (menu_widgets_ready())
+                     if (gfx_widgets_ready())
                         if (!settings->bools.menu_widget_scale_auto)
                            build_list[i].checked = true;
                      break;