Rename menu_widgets to gfx_widgets

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
       {

gfx/common/metal_common.m

@@ -335,7 +335,7 @@
       if (video_info->widgets_inited)
       {
          [rce pushDebugGroup:@"menu widgets"];
-         menu_widgets_frame(video_info);
+         gfx_widgets_frame(video_info);
          [rce popDebugGroup];
       }
 #endif

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
 };

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
 };

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
 };

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
 };

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
 };

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
 };

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
 };

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
 };

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 @@ video_driver_t video_metal = {
    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
 };

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
+#ifdef HAVE_MENU_WIDGETS
-      menu_widgets_frame(video_info);
+   gfx_widgets_frame(video_info);
-   #endif
+#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
 };

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
 };

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)
+   if (thr && thr->driver && thr->driver->gfx_widgets_enabled)
-      return thr->driver->menu_widgets_enabled(thr->driver_data);
+      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
 };
 

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)
    {

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;

menu/widgets/menu_widgets.h

@@ -13,8 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MENU_WIDGETS_H
+#ifndef _GFX_WIDGETS_H
-#define _MENU_WIDGETS_H
+#define _GFX_WIDGETS_H
 
 #include <formats/image.h>
 #include <queues/task_queue.h>
@@ -36,11 +36,11 @@
 #define HOURGLASS_DURATION                1000
 #define GENERIC_MESSAGE_DURATION          3000
 
-bool menu_widgets_init(bool video_is_threaded);
+bool gfx_widgets_init(bool video_is_threaded);
 
-void menu_widgets_free(void);
+void gfx_widgets_free(void);
 
-void menu_widgets_msg_queue_push(
+void gfx_widgets_msg_queue_push(
       retro_task_t *task, const char *msg,
       unsigned duration,
       char *title,
@@ -48,51 +48,51 @@ void menu_widgets_msg_queue_push(
       enum message_queue_category category,
       unsigned prio, bool flush);
 
-void menu_widgets_volume_update_and_show(float new_volume,
+void gfx_widgets_volume_update_and_show(float new_volume,
       bool mute);
 
-void menu_widgets_iterate(
+void gfx_widgets_iterate(
       unsigned width, unsigned height,
       const char *dir_assets, char *font_path,
       bool is_threaded);
 
-void menu_widgets_screenshot_taken(const char *shotname, const char *filename);
+void gfx_widgets_screenshot_taken(const char *shotname, const char *filename);
 
 /* AI Service functions */
-int menu_widgets_ai_service_overlay_get_state(void);
+int gfx_widgets_ai_service_overlay_get_state(void);
-bool menu_widgets_ai_service_overlay_set_state(int state);
+bool gfx_widgets_ai_service_overlay_set_state(int state);
 
-bool menu_widgets_ai_service_overlay_load(
+bool gfx_widgets_ai_service_overlay_load(
         char* buffer, unsigned buffer_len,
         enum image_type_enum image_type);
 
-void menu_widgets_ai_service_overlay_unload(void);
+void gfx_widgets_ai_service_overlay_unload(void);
 
-void menu_widgets_start_load_content_animation(
+void gfx_widgets_start_load_content_animation(
       const char *content_name, bool remove_extension);
 
-void menu_widgets_cleanup_load_content_animation(void);
+void gfx_widgets_cleanup_load_content_animation(void);
 
-void menu_widgets_context_reset(bool is_threaded,
+void gfx_widgets_context_reset(bool is_threaded,
       unsigned width, unsigned height,
       const char *dir_assets, char *font_path);
 
-void menu_widgets_context_destroy(void);
+void gfx_widgets_context_destroy(void);
 
-void menu_widgets_push_achievement(const char *title, const char *badge);
+void gfx_widgets_push_achievement(const char *title, const char *badge);
 
 /* Warning: not thread safe! */
-void menu_widgets_set_message(char *message);
+void gfx_widgets_set_message(char *message);
 
 /* Warning: not thread safe! */
-void menu_widgets_set_libretro_message(const char *message, unsigned duration);
+void gfx_widgets_set_libretro_message(const char *message, unsigned duration);
 
 /* All the functions below should be called in
  * the video driver - once they are all added, set
  * enable_menu_widgets to true for that driver */
-void menu_widgets_frame(void *data);
+void gfx_widgets_frame(void *data);
 
-bool menu_widgets_set_fps_text(const char *new_fps_text);
+bool gfx_widgets_set_fps_text(const char *new_fps_text);
 
 enum menu_driver_id_type menu_driver_ident_id(void);
 

retroarch.c

@@ -2638,19 +2638,19 @@ extern void libnx_apply_overclock(void);
 #endif
 
 #ifdef HAVE_MENU_WIDGETS
-static bool menu_widgets_inited                 = false;
+static bool gfx_widgets_inited                 = false;
-gfx_animation_ctx_tag menu_widgets_generic_tag = (uintptr_t) &menu_widgets_inited;
+gfx_animation_ctx_tag gfx_widgets_generic_tag = (uintptr_t) &gfx_widgets_inited;
 
 /* Status icons */
-static bool menu_widgets_paused              = false;
+static bool gfx_widgets_paused              = false;
-static bool menu_widgets_fast_forward        = false;
+static bool gfx_widgets_fast_forward        = false;
-static bool menu_widgets_rewinding           = false;
+static bool gfx_widgets_rewinding           = false;
 #endif
 
-bool menu_widgets_ready(void)
+bool gfx_widgets_ready(void)
 {
 #ifdef HAVE_MENU_WIDGETS
-   return menu_widgets_inited;
+   return gfx_widgets_inited;
 #else
    return false;
 #endif
@@ -3991,8 +3991,8 @@ bool retroarch_apply_shader(enum rarch_shader_type type, const char *preset_path
                preset_file ? "Shader: \"%s\"" : "Shader: %s",
                preset_file ? preset_file : "None");
 #ifdef HAVE_MENU_WIDGETS
-         if (menu_widgets_inited)
+         if (gfx_widgets_inited)
-            menu_widgets_set_message(msg);
+            gfx_widgets_set_message(msg);
          else
 #endif
             runloop_msg_queue_push(msg, 1, 120, true, NULL,
@@ -4561,10 +4561,10 @@ static void handle_translation_cb(
 
       strlcpy(text_string, error_string, 15);
 #ifdef HAVE_MENU_WIDGETS
-      if (menu_widgets_paused)
+      if (gfx_widgets_paused)
       {
          /* In this case we have to unpause and then repause for a frame */
-         menu_widgets_ai_service_overlay_set_state(2);
+         gfx_widgets_ai_service_overlay_set_state(2);
          command_event(CMD_EVENT_UNPAUSE, NULL);
       }
 #endif
@@ -4608,7 +4608,7 @@ static void handle_translation_cb(
             goto finish;
          }
 
-         ai_res = menu_widgets_ai_service_overlay_load(
+         ai_res = gfx_widgets_ai_service_overlay_load(
                      raw_image_file_data, (unsigned) new_image_size,
                      image_type);
 
@@ -4621,10 +4621,10 @@ static void handle_translation_cb(
                1, 180, true,
                NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          }
-         else if (menu_widgets_paused)
+         else if (gfx_widgets_paused)
          {
             /* In this case we have to unpause and then repause for a frame */
-            menu_widgets_ai_service_overlay_set_state(2);/* Unpausing state */
+            gfx_widgets_ai_service_overlay_set_state(2);/* Unpausing state */
             command_event(CMD_EVENT_UNPAUSE, NULL);
          }
       }
@@ -5054,10 +5054,10 @@ static bool run_translation_service(void)
    core_info_t *core_info                = NULL;
 
 #ifdef HAVE_MENU_WIDGETS
-   if (menu_widgets_ai_service_overlay_get_state() != 0)
+   if (gfx_widgets_ai_service_overlay_get_state() != 0)
    {
       /* For the case when ai service pause is disabled. */
-      menu_widgets_ai_service_overlay_unload();
+      gfx_widgets_ai_service_overlay_unload();
       goto finish;
    }
 #else
@@ -5427,8 +5427,8 @@ static void command_event_set_volume(float gain)
          new_volume);
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   if (menu_widgets_inited)
+   if (gfx_widgets_inited)
-      menu_widgets_volume_update_and_show(settings->floats.audio_volume,
+      gfx_widgets_volume_update_and_show(settings->floats.audio_volume,
             audio_driver_mute_enable
             );
    else
@@ -6397,8 +6397,8 @@ static void retroarch_pause_checks(void)
       RARCH_LOG("%s\n", msg_hash_to_str(MSG_PAUSED));
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-      if (menu_widgets_inited)
+      if (gfx_widgets_inited)
-         menu_widgets_paused = is_paused;
+         gfx_widgets_paused = is_paused;
       else
 #endif
          runloop_msg_queue_push(msg_hash_to_str(MSG_PAUSED), 1,
@@ -6417,16 +6417,16 @@ static void retroarch_pause_checks(void)
    else
    {
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-      if (menu_widgets_inited)
+      if (gfx_widgets_inited)
-         menu_widgets_paused = is_paused;
+         gfx_widgets_paused = is_paused;
 #endif
       RARCH_LOG("%s\n", msg_hash_to_str(MSG_UNPAUSED));
 
    }
 
 #ifdef HAVE_MENU_WIDGETS
-   if (menu_widgets_ai_service_overlay_get_state() == 1)
+   if (gfx_widgets_ai_service_overlay_get_state() == 1)
-      menu_widgets_ai_service_overlay_unload();
+      gfx_widgets_ai_service_overlay_unload();
 #endif
 }
 
@@ -6514,11 +6514,11 @@ bool command_event(enum event_command cmd, void *data)
          retroarch_overlay_deinit();
 #endif
 #ifdef HAVE_MENU_WIDGETS
-         if (menu_widgets_ai_service_overlay_get_state() != 0)
+         if (gfx_widgets_ai_service_overlay_get_state() != 0)
          {
             /* Because the overlay is a menu widget, it's going to be written
              * over the menu, so we unset it here. */
-            menu_widgets_ai_service_overlay_unload();
+            gfx_widgets_ai_service_overlay_unload();
          }
 #endif
          break;
@@ -6913,8 +6913,8 @@ TODO: Add a setting for these tweaks */
             audio_driver_mute_enable  = !audio_driver_mute_enable;
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-            if (menu_widgets_inited)
+            if (gfx_widgets_inited)
-               menu_widgets_volume_update_and_show(
+               gfx_widgets_volume_update_and_show(
                      configuration_settings->floats.audio_volume,
                      audio_driver_mute_enable);
             else
@@ -9523,8 +9523,8 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
          const struct retro_message *msg = (const struct retro_message*)data;
          RARCH_LOG("[Environ]: SET_MESSAGE: %s\n", msg->msg);
 #ifdef HAVE_MENU_WIDGETS
-         if (menu_widgets_inited)
+         if (gfx_widgets_inited)
-            menu_widgets_set_libretro_message(msg->msg,
+            gfx_widgets_set_libretro_message(msg->msg,
                   roundf((float)msg->frames / 60.0f * 1000.0f));
          else
 #endif
@@ -22009,8 +22009,8 @@ static void video_driver_frame(const void *data, unsigned width,
          )
    {
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-      if (menu_widgets_inited)
+      if (gfx_widgets_inited)
-         menu_widgets_set_fps_text(video_info.fps_text);
+         gfx_widgets_set_fps_text(video_info.fps_text);
       else
 #endif
       {
@@ -22185,10 +22185,10 @@ void video_driver_build_info(video_frame_info_t *video_info)
    video_info->fps_text[0]           = '\0';
 
 #ifdef HAVE_MENU_WIDGETS
-   video_info->widgets_inited             = menu_widgets_inited;
+   video_info->widgets_inited             = gfx_widgets_inited;
-   video_info->widgets_is_paused          = menu_widgets_paused;
+   video_info->widgets_is_paused          = gfx_widgets_paused;
-   video_info->widgets_is_fast_forwarding = menu_widgets_fast_forward;
+   video_info->widgets_is_fast_forwarding = gfx_widgets_fast_forward;
-   video_info->widgets_is_rewinding       = menu_widgets_rewinding;
+   video_info->widgets_is_rewinding       = gfx_widgets_rewinding;
 #else
    video_info->widgets_inited             = false;
    video_info->widgets_is_paused          = false;
@@ -22780,8 +22780,8 @@ float video_driver_get_refresh_rate(void)
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
 static bool video_driver_has_widgets(void)
 {
-   return current_video && current_video->menu_widgets_enabled
+   return current_video && current_video->gfx_widgets_enabled
-      && current_video->menu_widgets_enabled(video_driver_data);
+      && current_video->gfx_widgets_enabled(video_driver_data);
 }
 #endif
 
@@ -23485,11 +23485,11 @@ static void drivers_init(int flags)
    if (settings->bools.menu_enable_widgets
       && video_driver_has_widgets())
    {
-      if (!menu_widgets_inited)
+      if (!gfx_widgets_inited)
-         menu_widgets_inited = menu_widgets_init(video_is_threaded);
+         gfx_widgets_inited = gfx_widgets_init(video_is_threaded);
 
-      if (menu_widgets_inited)
+      if (gfx_widgets_inited)
-         menu_widgets_context_reset(video_is_threaded,
+         gfx_widgets_context_reset(video_is_threaded,
                video_driver_width, video_driver_height,
                settings->paths.directory_assets,
                settings->paths.path_font);
@@ -23566,11 +23566,11 @@ static void driver_uninit(int flags)
       /* This absolutely has to be done before video_driver_free()
        * is called/completes, otherwise certain menu drivers
        * (e.g. Vulkan) will segfault */
-      if (menu_widgets_inited)
+      if (gfx_widgets_inited)
       {
-         menu_widgets_context_destroy();
+         gfx_widgets_context_destroy();
-         menu_widgets_free();
+         gfx_widgets_free();
-         menu_widgets_inited = false;
+         gfx_widgets_inited = false;
       }
 #endif
       menu_driver_ctl(RARCH_MENU_CTL_DEINIT, NULL);
@@ -23635,11 +23635,11 @@ static void retroarch_deinit_drivers(void)
     * in case the handle is lost in the threaded
     * video driver in the meantime
     * (breaking video_driver_has_widgets) */
-   if (menu_widgets_inited)
+   if (gfx_widgets_inited)
    {
-      menu_widgets_context_destroy();
+      gfx_widgets_context_destroy();
-      menu_widgets_free();
+      gfx_widgets_free();
-      menu_widgets_inited = false;
+      gfx_widgets_inited = false;
    }
 #endif
 
@@ -25953,12 +25953,12 @@ static void runloop_task_msg_queue_push(
       bool flush)
 {
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   if (menu_widgets_inited && task->title && !task->mute)
+   if (gfx_widgets_inited && task->title && !task->mute)
    {
       runloop_msg_queue_lock();
       ui_companion_driver_msg_queue_push(msg,
             prio, task ? duration : duration * 60 / 1000, flush);
-      menu_widgets_msg_queue_push(task, msg, duration, NULL, (enum message_queue_icon)MESSAGE_QUEUE_CATEGORY_INFO, (enum message_queue_category)MESSAGE_QUEUE_ICON_DEFAULT, prio, flush);
+      gfx_widgets_msg_queue_push(task, msg, duration, NULL, (enum message_queue_icon)MESSAGE_QUEUE_CATEGORY_INFO, (enum message_queue_category)MESSAGE_QUEUE_ICON_DEFAULT, prio, flush);
       runloop_msg_queue_unlock();
    }
    else
@@ -26826,9 +26826,9 @@ void runloop_msg_queue_push(const char *msg,
       accessibility_speak_priority((char*) msg, 0);
 #endif
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   if (menu_widgets_inited)
+   if (gfx_widgets_inited)
    {
-      menu_widgets_msg_queue_push(NULL, msg,
+      gfx_widgets_msg_queue_push(NULL, msg,
             roundf((float)duration / 60.0f * 1000.0f),
             title, icon, category, prio, flush);
       duration = duration * 60 / 1000;
@@ -27060,16 +27060,16 @@ static void update_fastforwarding_state(void)
    if (runloop_fastmotion)
    {
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-      if (menu_widgets_inited)
+      if (gfx_widgets_inited)
-         menu_widgets_fast_forward = true;
+         gfx_widgets_fast_forward = true;
 #endif
    }
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
    else
    {
-      if (menu_widgets_inited)
+      if (gfx_widgets_inited)
       {
-         menu_widgets_fast_forward = false;
+         gfx_widgets_fast_forward = false;
          {
             settings_t *settings   = configuration_settings;
             if (settings->bools.frame_time_counter_reset_after_fastforwarding)
@@ -27103,10 +27103,10 @@ static enum runloop_state runloop_check_state(void)
 #endif
 
 #ifdef HAVE_MENU_WIDGETS
-   if (menu_widgets_ai_service_overlay_get_state() == 3)
+   if (gfx_widgets_ai_service_overlay_get_state() == 3)
    {
       command_event(CMD_EVENT_PAUSE, NULL);
-      menu_widgets_ai_service_overlay_set_state(1);
+      gfx_widgets_ai_service_overlay_set_state(1);
    }
 #endif
 
@@ -27327,10 +27327,10 @@ static enum runloop_state runloop_check_state(void)
          video_driver_width, video_driver_height);
 
 #ifdef HAVE_MENU_WIDGETS
-   if (menu_widgets_inited)
+   if (gfx_widgets_inited)
    {
       runloop_msg_queue_lock();
-      menu_widgets_iterate(
+      gfx_widgets_iterate(
             video_driver_width, video_driver_height,
             settings->paths.directory_assets,
             settings->paths.path_font,
@@ -27654,7 +27654,7 @@ static enum runloop_state runloop_check_state(void)
 
       /* Show the fast-forward OSD for 1 frame every frame if menu widgets are disabled */
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-      if (!menu_widgets_inited && runloop_fastmotion)
+      if (!gfx_widgets_inited && runloop_fastmotion)
 #else
       if (runloop_fastmotion)
 #endif
@@ -27726,8 +27726,8 @@ static enum runloop_state runloop_check_state(void)
             settings->uints.rewind_granularity, runloop_paused, s, sizeof(s), &t);
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-      if (menu_widgets_inited)
+      if (gfx_widgets_inited)
-         menu_widgets_rewinding = rewinding;
+         gfx_widgets_rewinding = rewinding;
       else
 #endif
       {
@@ -27761,7 +27761,7 @@ static enum runloop_state runloop_check_state(void)
                video_driver_cached_frame();
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-         if (!menu_widgets_inited)
+         if (!gfx_widgets_inited)
 #endif
          {
             if (state_manager_frame_is_reversed())

retroarch.h

@@ -1505,7 +1505,7 @@ typedef struct video_driver
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
    /* if set to true, will use menu widgets when applicable
     * if set to false, will use OSD as a fallback */
-   bool (*menu_widgets_enabled)(void *data);
+   bool (*gfx_widgets_enabled)(void *data);
 #endif
 } video_driver_t;
 
@@ -1998,7 +1998,7 @@ bool menu_driver_is_alive(void);
 
 void menu_driver_set_binding_state(bool on);
 
-bool menu_widgets_ready(void);
+bool gfx_widgets_ready(void);
 
 unsigned int retroarch_get_rotation(void);
 

tasks/task_screenshot.c

@@ -209,7 +209,7 @@ static void task_screenshot_callback(retro_task_t *task,
       return;
 
    if (state && !state->silence && state->widgets_ready)
-      menu_widgets_screenshot_taken(state->shotname, state->filename);
+      gfx_widgets_screenshot_taken(state->shotname, state->filename);
 
    free(state);
 }
@@ -255,7 +255,7 @@ static bool screenshot_dump(
    state->frame                  = frame;
    state->userbuf                = userbuf;
 #ifdef HAVE_MENU_WIDGETS
-   state->widgets_ready          = menu_widgets_ready();
+   state->widgets_ready          = gfx_widgets_ready();
 #else
    state->widgets_ready          = false;
 #endif

wifi/drivers/connmanctl.c

@@ -120,7 +120,7 @@ static void connmanctl_tether_toggle(bool switch_on, char* apname, char* passkey
             output);
 
 #ifdef HAVE_MENU_WIDGETS
-      if (!menu_widgets_ready())
+      if (!gfx_widgets_ready())
 #endif
          runloop_msg_queue_push(output, 1, 180, true,
                NULL, MESSAGE_QUEUE_ICON_DEFAULT,
@@ -332,7 +332,7 @@ static bool connmanctl_connect_ssid(unsigned i, const char* passphrase)
    while (fgets (ln, sizeof(ln), command_file) != NULL)
    {
 #ifdef HAVE_MENU_WIDGETS
-      if (!menu_widgets_ready())
+      if (!gfx_widgets_ready())
 #endif
          runloop_msg_queue_push(ln, 1, 180, true,
                NULL, MESSAGE_QUEUE_ICON_DEFAULT,
@@ -637,7 +637,7 @@ static void connmanctl_tether_start_stop(bool start, char* configfile)
                      ln);
 
 #ifdef HAVE_MENU_WIDGETS
-               if (!menu_widgets_ready())
+               if (!gfx_widgets_ready())
 #endif
                   runloop_msg_queue_push(ln, 1, 180, true,
                         NULL, MESSAGE_QUEUE_ICON_DEFAULT,