diff --git a/config.def.h b/config.def.h index 8e9b81e0f1..94d8f39691 100644 --- a/config.def.h +++ b/config.def.h @@ -123,7 +123,7 @@ enum MENU_RGUI, MENU_RMENU, - MENU_RMENU_XUI, + MENU_XUI, MENU_MATERIALUI, MENU_XMB, @@ -319,8 +319,8 @@ enum #define OSK_DEFAULT_DRIVER OSK_NULL #endif -#if defined(HAVE_RMENU_XUI) -#define MENU_DEFAULT_DRIVER MENU_RMENU_XUI +#if defined(HAVE_XUI) +#define MENU_DEFAULT_DRIVER MENU_XUI #elif defined(IOS) || defined(ANDROID) #define MENU_DEFAULT_DRIVER MENU_MATERIALUI #elif defined(MAC_OS_X_VERSION_10_6) || defined(__CELLOS_LV2__) diff --git a/configuration.c b/configuration.c index d5a78d20c5..16f2120f67 100644 --- a/configuration.c +++ b/configuration.c @@ -363,8 +363,8 @@ const char *config_get_default_menu(void) return "rgui"; case MENU_RMENU: return "rmenu"; - case MENU_RMENU_XUI: - return "rmenu_xui"; + case MENU_XUI: + return "xui"; case MENU_MATERIALUI: return "glui"; case MENU_XMB: diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index fab35d4f47..bbc54891f3 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -55,8 +55,8 @@ UI COMMON CONTEXT /*============================================================ MENU ============================================================ */ -#ifdef HAVE_RMENU_XUI -#include "../menu/drivers/rmenu_xui.cpp" +#ifdef HAVE_XUI +#include "../menu/drivers/xui.cpp" #endif #if defined(HAVE_D3D) diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/xui.cpp similarity index 91% rename from menu/drivers/rmenu_xui.cpp rename to menu/drivers/xui.cpp index 692df6ffe5..cefa39a7d2 100644 --- a/menu/drivers/rmenu_xui.cpp +++ b/menu/drivers/xui.cpp @@ -266,7 +266,7 @@ cleanup: return hr; } -static void* rmenu_xui_init(void **userdata) +static void* xui_init(void **userdata) { HRESULT hr; d3d_video_t *d3d = NULL; @@ -351,7 +351,7 @@ error: return NULL; } -static void rmenu_xui_free(void *data) +static void xui_free(void *data) { (void)data; app.Uninit(); @@ -398,7 +398,7 @@ end: string_list_free(list); } -static void rmenu_xui_frame(void *data) +static void xui_frame(void *data) { XUIMessage msg; XUIMessageRender msgRender; @@ -449,7 +449,7 @@ static void blit_line(int x, int y, const char *message, bool green) { } -static void rmenu_xui_render_background(void) +static void xui_render_background(void) { bool libretro_running = menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO_RUNNING, NULL); @@ -459,13 +459,13 @@ static void rmenu_xui_render_background(void) XuiElementSetShow(m_background, TRUE); } -static void rmenu_xui_render_messagebox(void *data, const char *message) +static void xui_render_messagebox(void *data, const char *message) { msg_queue_clear(xui_msg_queue); msg_queue_push(xui_msg_queue, message, 2, 1); } -static void rmenu_xui_set_list_text(int index, const wchar_t* leftText, +static void xui_set_list_text(int index, const wchar_t* leftText, const wchar_t* rightText) { LPCWSTR currText; @@ -522,7 +522,7 @@ static void rmenu_xui_set_list_text(int index, const wchar_t* leftText, } } -static void rmenu_xui_render(void *data) +static void xui_render(void *data) { uint64_t *frame_count; bool display_kb, msg_force; @@ -548,7 +548,7 @@ static void rmenu_xui_render(void *data) menu_display_ctl(MENU_DISPLAY_CTL_UNSET_FRAMEBUFFER_DIRTY_FLAG, NULL); menu_animation_ctl(MENU_ANIMATION_CTL_CLEAR_ACTIVE, NULL); - rmenu_xui_render_background(); + xui_render_background(); if (XuiHandleIsValid(m_menutitle)) { @@ -581,7 +581,7 @@ static void rmenu_xui_render(void *data) mbstowcs(msg_left, entry_path, sizeof(msg_left) / sizeof(wchar_t)); mbstowcs(msg_right, entry_value, sizeof(msg_right) / sizeof(wchar_t)); - rmenu_xui_set_list_text(i, msg_left, msg_right); + xui_set_list_text(i, msg_left, msg_right); } if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) return; @@ -599,11 +599,11 @@ static void rmenu_xui_render(void *data) if (!str) str = ""; snprintf(msg, sizeof(msg), "%s\n%s", label, str); - rmenu_xui_render_messagebox(msg); + xui_render_messagebox(msg); } } -static void rmenu_xui_populate_entries(const char *path, +static void xui_populate_entries(const char *path, const char *label, unsigned i) { size_t selection; @@ -616,7 +616,7 @@ static void rmenu_xui_populate_entries(const char *path, XuiListSetCurSelVisible(m_menulist, selection); } -static void rmenu_xui_navigation_clear(void *data, bool pending_push) +static void xui_navigation_clear(void *data, bool pending_push) { size_t selection; if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) @@ -625,7 +625,7 @@ static void rmenu_xui_navigation_clear(void *data, bool pending_push) XuiListSetCurSelVisible(m_menulist, selection); } -static void rmenu_xui_navigation_set_visible(void *data) +static void xui_navigation_set_visible(void *data) { size_t selection; if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) @@ -634,12 +634,12 @@ static void rmenu_xui_navigation_set_visible(void *data) XuiListSetCurSelVisible(m_menulist, selection); } -static void rmenu_xui_navigation_alphabet(void *data, size_t *ptr_out) +static void xui_navigation_alphabet(void *data, size_t *ptr_out) { XuiListSetCurSelVisible(m_menulist, *ptr_out); } -static void rmenu_xui_list_insert(void *data, +static void xui_list_insert(void *data, file_list_t *list, const char *path, const char *, size_t list_size) { @@ -650,7 +650,7 @@ static void rmenu_xui_list_insert(void *data, XuiListSetText(m_menulist, list_size, buf); } -static void rmenu_xui_list_free(file_list_t *list, size_t idx, +static void xui_list_free(file_list_t *list, size_t idx, size_t list_size) { int x = XuiListGetItemCount( m_menulist ); @@ -663,18 +663,18 @@ static void rmenu_xui_list_free(file_list_t *list, size_t idx, XuiListDeleteItems(m_menulist, 0, list_size); } -static void rmenu_xui_list_clear(file_list_t *list) +static void xui_list_clear(file_list_t *list) { XuiListDeleteItems(m_menulist, 0, XuiListGetItemCount(m_menulist)); } -static void rmenu_xui_list_set_selection(void *data, file_list_t *list) +static void xui_list_set_selection(void *data, file_list_t *list) { if (list) XuiListSetCurSel(m_menulist, file_list_get_directory_ptr(list)); } -static int rmenu_xui_environ(menu_environ_cb_t type, void *data) +static int xui_environ(menu_environ_cb_t type, void *data) { switch (type) { @@ -686,38 +686,38 @@ static int rmenu_xui_environ(menu_environ_cb_t type, void *data) return 0; } -menu_ctx_driver_t menu_ctx_rmenu_xui = { +menu_ctx_driver_t menu_ctx_xui = { NULL, - rmenu_xui_render_messagebox, + xui_render_messagebox, generic_menu_iterate, - rmenu_xui_render, - rmenu_xui_frame, - rmenu_xui_init, - rmenu_xui_free, + xui_render, + xui_frame, + xui_init, + xui_free, NULL, NULL, - rmenu_xui_populate_entries, + xui_populate_entries, NULL, - rmenu_xui_navigation_clear, - rmenu_xui_navigation_set_visible, - rmenu_xui_navigation_set_visible, - rmenu_xui_navigation_clear, - rmenu_xui_navigation_set_visible, - rmenu_xui_navigation_alphabet, - rmenu_xui_navigation_alphabet, + xui_navigation_clear, + xui_navigation_set_visible, + xui_navigation_set_visible, + xui_navigation_clear, + xui_navigation_set_visible, + xui_navigation_alphabet, + xui_navigation_alphabet, generic_menu_init_list, - rmenu_xui_list_insert, - rmenu_xui_list_free, - rmenu_xui_list_clear, + xui_list_insert, + xui_list_free, + xui_list_clear, NULL, NULL, NULL, NULL, NULL, - rmenu_xui_list_set_selection, + xui_list_set_selection, NULL, NULL, - "rmenu_xui", - rmenu_xui_environ, + "xui", + xui_environ, NULL, }; diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 4984d7a07d..d7f567ab5c 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -35,8 +35,8 @@ #include "../verbosity.h" static const menu_ctx_driver_t *menu_ctx_drivers[] = { -#if defined(HAVE_RMENU_XUI) - &menu_ctx_rmenu_xui, +#if defined(HAVE_XUI) + &menu_ctx_xui, #endif #if defined(HAVE_MATERIALUI) &menu_ctx_mui, diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 502d11c895..623e979ddc 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -309,7 +309,7 @@ typedef struct menu_ctx_driver menu_entry_t *entry, unsigned action); } menu_ctx_driver_t; -extern menu_ctx_driver_t menu_ctx_rmenu_xui; +extern menu_ctx_driver_t menu_ctx_xui; extern menu_ctx_driver_t menu_ctx_rgui; extern menu_ctx_driver_t menu_ctx_mui; extern menu_ctx_driver_t menu_ctx_xmb; diff --git a/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj b/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj index 699033b74c..8bb00cd409 100644 --- a/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj +++ b/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj @@ -113,7 +113,7 @@ true false MultiThreadedDebug - _DEBUG;_XBOX;DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + _DEBUG;_XBOX;DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN Callcap $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -152,7 +152,7 @@ AnalyzeOnly false MultiThreadedDebug - _DEBUG;_XBOX;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + _DEBUG;_XBOX;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN Callcap $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -192,7 +192,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN Callcap $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -237,7 +237,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -279,7 +279,7 @@ false false MultiThreaded - NDEBUG;_XBOX;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -321,7 +321,7 @@ false false MultiThreaded - NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)