diff --git a/CHANGELOG.md b/CHANGELOG.md index 5557eb114..189efa79b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,18 +10,23 @@ ### Detailed list of changes -* Added alternative emulators support where additional emulators can be defined in es_systems.xml and be selected system-wide or per game via the user interface +* Added alternative emulators support where additional emulators can be defined in es_systems.xml and be selected + system-wide or per game via the user interface * Added a virtual keyboard partly based on code from batocera-emulationstation -* Added the ability to make complementary game system customizations without having to replace the entire bundled es_systems.xml file +* Added the ability to make complementary game system customizations without having to replace the entire bundled + es_systems.xml file * Added a menu option to change the application exit key combination -* Expanded the themeable options for "helpsystem" to support custom button graphics, dimmed text and icon colors, upper/lower/camel case and custom spacing +* Expanded the themeable options for "helpsystem" to support custom button graphics, dimmed text and icon colors, + upper/lower/camel case and custom spacing * Added support for using the left and right trigger buttons in the help prompts * Removed the "Choose" entry from the help prompts in the gamelist view * Changed the "Toggle screensaver" help entry in the system view to simply "Screensaver" * Added support for upscaling bitmap images using linear filtering -* Changed the marquee image upscale filtering from nearest neighbor to linear for the launch screen and the gamelist views +* Changed the marquee image upscale filtering from nearest neighbor to linear for the launch screen and the gamelist + views * Moved the Media Viewer and Screensaver settings higher in the UI Settings menu -* Moved the game media directory setting to the top of the Other Settings menu, following the new Alternative Emulators entry +* Moved the game media directory setting to the top of the Other Settings menu, following the new Alternative Emulators + entry * Added a blinking cursor to TextEditComponent * Changed the filter description "Text filter (game name)" to "Game name" * Added support for a new type of "flat style" button to ButtonComponent @@ -31,7 +36,8 @@ * Replaced all built-in matrix and vector data types and functions with GLM library equivalents * Replaced some additional math functions and moved the remaining built-in functions to a math utility namespace * Added a function to generate MD5 hashes -* Moved the "complex" mode functionality from GuiComplexTextEditPopup into GuiTextEditPopup and removed the source files for the former +* Moved the "complex" mode functionality from GuiComplexTextEditPopup into GuiTextEditPopup and removed the source files + for the former * Increased the warning level for Clang/LLVM and GCC by adding -Wall, -Wpedantic and some additional flags * Fixed a lot of compiler warnings introduced by the -Wall and -Wpedantic flags * Changed the language standard from C++14 to C++17 @@ -40,23 +46,35 @@ ### Bug fixes -* When multi-scraping in interactive mode with "Auto-accept single game matches" enabled, the game name could not be refined if there were no games found -* When multi-scraping in interactive mode, the game counter was not decreased when skipping games, making it impossible to skip the final games in the queue +* When multi-scraping in interactive mode with "Auto-accept single game matches" enabled, the game name could not be + refined if there were no games found +* When multi-scraping in interactive mode, the game counter was not decreased when skipping games, making it impossible + to skip the final games in the queue * When multi-scraping in interactive mode, "No games found" results could be accepted using the "A" button -* When scraping in interactive mode, any refining done using the "Y" button shortcut would not be shown when doing another refine using the "Refine search" button -* Input consisting of only whitespace characters would get accepted by TextEditComponent which led to various strange behaviors -* Leading and trailing whitespace characters would not get trimmed from the collection name when creating a new custom collection +* When scraping in interactive mode, any refining done using the "Y" button shortcut would not be shown when doing + another refine using the "Refine search" button +* Input consisting of only whitespace characters would get accepted by TextEditComponent which led to various strange + behaviors +* Leading and trailing whitespace characters would not get trimmed from the collection name when creating a new custom + collection * Leading and trailing whitespace characters would get included in scraper search refines and TheGamesDB searches -* Game name (text) filters were matching the system names for collection systems if the "Show system names in collections" setting was enabled -* Brackets such as () and [] were filtered from game names in collection systems if the "Show system names in collections" setting was enabled +* Game name (text) filters were matching the system names for collection systems if the "Show system names in + collections" setting was enabled +* Brackets such as () and [] were filtered from game names in collection systems if the "Show system names in + collections" setting was enabled * When navigating menus, the separator lines and menu components did not align properly and moved up and down slightly -* When scrolling in menus, pressing other buttons than "Up" or "Down" did not stop the scrolling which caused all sorts of weird behavior -* With the menu scale-up effect enabled and entering a submenu before the parent menu was completely scaled up, the parent would get stuck at a semi-scaled size -* Disabling a collection while its gamelist was displayed would lead to a slide transition from a black screen if a gamelist on startup had been set -* When marking a game to not be counted in the metadata editor and the game was part of a custom collection, no collection disabling notification was displayed +* When scrolling in menus, pressing other buttons than "Up" or "Down" did not stop the scrolling which caused all sorts + of weird behavior +* With the menu scale-up effect enabled and entering a submenu before the parent menu was completely scaled up, the + parent would get stuck at a semi-scaled size +* Disabling a collection while its gamelist was displayed would lead to a slide transition from a black screen if a + gamelist on startup had been set +* When marking a game to not be counted in the metadata editor and the game was part of a custom collection, no + collection disabling notification was displayed * Horizontal sizing of the TextComponent input field was not consistent across different screen resolutions * The "sortname" window header was incorrectly spelled when editing this type of entry in the metadata editor -* When the last row of a menu had its text color changed, this color was completely desaturated when navigating to a button below the list +* When the last row of a menu had its text color changed, this color was completely desaturated when navigating to a + button below the list ## Version 1.1.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c8ff03b2..15beefa1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ set(LINUX_CPACK_GENERATOR "DEB" CACHE STRING "CPack generator, DEB or RPM") # Add local find modules to the CMake path. list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Utils - ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Packages) + ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Packages) # Define the options. option(GLES "Set to ON if targeting Embedded OpenGL" ${GLES}) @@ -36,11 +36,11 @@ option(CEC "Set to ON to enable CEC" ${CEC}) option(VLC_PLAYER "Set to ON to build the VLC-based video player" ${VLC_PLAYER}) option(CLANG_TIDY "Set to ON to build using the clang-tidy static analyzer" ${CLANG_TIDY}) -if(CLANG_TIDY) +if (CLANG_TIDY) find_program(CLANG_TIDY_BINARY NAMES clang-tidy) - if(CLANG_TIDY_BINARY STREQUAL "CLANG_TIDY_BINARY-NOTFOUND") + if (CLANG_TIDY_BINARY STREQUAL "CLANG_TIDY_BINARY-NOTFOUND") message("-- CLANG_TIDY was set but the clang-tidy binary was not found") - else() + else () message("-- Building with the clang-tidy static analyzer") set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-checks=*,\ -fuchsia-*,\ @@ -76,12 +76,12 @@ set_property(CACHE GLSYSTEM PROPERTY STRINGS "Desktop OpenGL" "Embedded OpenGL") #--------------------------------------------------------------------------------------------------- # Package dependencies. -if(GLSYSTEM MATCHES "Desktop OpenGL") +if (GLSYSTEM MATCHES "Desktop OpenGL") set(OpenGL_GL_PREFERENCE "GLVND") find_package(OpenGL REQUIRED) -else() +else () find_package(OpenGLES REQUIRED) -endif() +endif () # Skip package dependency checks if we're on Windows. if(NOT WIN32) @@ -103,73 +103,73 @@ if(CEC) endif() # Add ALSA for Linux. -if(CMAKE_SYSTEM_NAME MATCHES "Linux") +if (CMAKE_SYSTEM_NAME MATCHES "Linux") find_package(ALSA REQUIRED) -endif() +endif () #--------------------------------------------------------------------------------------------------- # Compiler and linker settings. -if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") message("-- Compiler is Clang/LLVM") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0.0) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0.0) message(SEND_ERROR "You need at least Clang 5.0.0 to compile EmulationStation-DE") - endif() -elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + endif () +elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") message("-- Compiler is GNU/GCC") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1) message(SEND_ERROR "You need at least GCC 7.1 to compile EmulationStation-DE") - endif() - if(WIN32) + endif () + if (WIN32) set(CMAKE_CXX_FLAGS "-mwindows ${CMAKE_CXX_FLAGS}") - endif() -elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + endif () +elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") message("-- Compiler is MSVC") # If using the MSVC compiler on Windows, disable the built-in min() and max() macros. add_definitions(-DNOMINMAX) -endif() +endif () -if(CMAKE_BUILD_TYPE) +if (CMAKE_BUILD_TYPE) message("-- Build type is ${CMAKE_BUILD_TYPE}") -endif() +endif () # Set up compiler and linker flags for debug, profiling or release builds. if(CMAKE_BUILD_TYPE MATCHES Debug) # Enable the C++17 standard and disable optimizations as it's a debug build. - if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Od /DEBUG:FULL") - else() + else () set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O0 -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O0") - endif() + endif () # If using Clang, then add additional debug data needed by GDB. # Comment this out if you're using LLDB for debugging as this flag makes the binary # much larger and the application much slower. On macOS this setting is never enabled # as LLDB is the default debugger on this OS. - if(NOT APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") + if (NOT APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_DEBUG") - endif() + endif () elseif(CMAKE_BUILD_TYPE MATCHES Profiling) # For the profiling build, we enable optimizations and supply the required profiler flags. - if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /O2 /DEBUG:FULL") - else() + else () set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O2 -pg -g -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2 -pg") - endif() + endif () else() # Enable the C++17 standard and enable optimizations as it's a release build. # This will also disable all assert() macros. Strip the binary too. - if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG /std:c++17 /O2 /DEBUG:NONE") - else() + else () set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O2 -DNDEBUG -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros") - if(APPLE) + if (APPLE) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2") - else() + else () set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2 -s") - endif() - endif() + endif () + endif () endif() # The following removes half of the ranlib warnings on macOS regarding no symbols for files @@ -180,26 +180,26 @@ if(APPLE) endif() if(APPLE) - if(MACOS_CODESIGN_IDENTITY) + if (MACOS_CODESIGN_IDENTITY) message("-- Code signing certificate identity: " ${MACOS_CODESIGN_IDENTITY}) - endif() - if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.14) + endif () + if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.14) message("-- macOS version 10.13 or lower has been set, so if code signing is enabled, Hardened Runtime will not be used") - endif() + endif () endif() #--------------------------------------------------------------------------------------------------- # Preprocessor directives. -if(GLSYSTEM MATCHES "Desktop OpenGL") +if (GLSYSTEM MATCHES "Desktop OpenGL") add_definitions(-DUSE_OPENGL_21) -else() +else () add_definitions(-DUSE_OPENGLES_10) -endif() +endif () -if(VLC_PLAYER) +if (VLC_PLAYER) add_definitions(-DBUILD_VLC_PLAYER) -endif() +endif () if(DEFINED BCMHOST OR RPI) add_definitions(-D_RPI_) @@ -217,13 +217,13 @@ add_definitions(-DGLM_FORCE_XYZW_ONLY) # we use /usr on Linux, /usr/pkg on NetBSD and /usr/local on FreeBSD and OpenBSD. if(NOT WIN32 AND NOT APPLE) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - if(CMAKE_SYSTEM_NAME MATCHES "Linux") + if (CMAKE_SYSTEM_NAME MATCHES "Linux") set(CMAKE_INSTALL_PREFIX "/usr" CACHE INTERNAL "CMAKE_INSTALL_PREFIX") - elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD") + elseif (CMAKE_SYSTEM_NAME MATCHES "NetBSD") set(CMAKE_INSTALL_PREFIX "/usr/pkg" CACHE INTERNAL "CMAKE_INSTALL_PREFIX") - else() + else () set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE INTERNAL "CMAKE_INSTALL_PREFIX") - endif() + endif () endif() message("-- Installation prefix is set to " ${CMAKE_INSTALL_PREFIX}) add_definitions(-DES_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}") @@ -239,16 +239,16 @@ endif() # Include files. set(COMMON_INCLUDE_DIRS ${CURL_INCLUDE_DIR} - ${FFMPEG_INCLUDE_DIRS} - ${FreeImage_INCLUDE_DIRS} - ${FREETYPE_INCLUDE_DIRS} - ${PUGIXML_INCLUDE_DIRS} - ${RAPIDJSON_INCLUDE_DIRS} - ${SDL2_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/external/CImg - ${CMAKE_CURRENT_SOURCE_DIR}/external/glm - ${CMAKE_CURRENT_SOURCE_DIR}/external/nanosvg/src - ${CMAKE_CURRENT_SOURCE_DIR}/es-core/src) + ${FFMPEG_INCLUDE_DIRS} + ${FreeImage_INCLUDE_DIRS} + ${FREETYPE_INCLUDE_DIRS} + ${PUGIXML_INCLUDE_DIRS} + ${RAPIDJSON_INCLUDE_DIRS} + ${SDL2_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/external/CImg + ${CMAKE_CURRENT_SOURCE_DIR}/external/glm + ${CMAKE_CURRENT_SOURCE_DIR}/external/nanosvg/src + ${CMAKE_CURRENT_SOURCE_DIR}/es-core/src) if(VLC_PLAYER) set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} ${VLC_INCLUDE_DIR}) endif() @@ -276,69 +276,69 @@ if(DEFINED libCEC_FOUND) endif() # For Linux, add the ALSA include directory. -if(CMAKE_SYSTEM_NAME MATCHES "Linux") +if (CMAKE_SYSTEM_NAME MATCHES "Linux") list(APPEND COMMON_INCLUDE_DIRS ${ALSA_INCLUDE_DIRS}) -endif() +endif () -if(DEFINED BCMHOST OR RPI) +if (DEFINED BCMHOST OR RPI) list(APPEND COMMON_INCLUDE_DIRS "${CMAKE_FIND_ROOT_PATH}/opt/vc/include" - "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos" - "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vmcs_host/linux" - "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos/pthreads") -endif() + "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos" + "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vmcs_host/linux" + "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos/pthreads") +endif () #--------------------------------------------------------------------------------------------------- # Dependency libraries. -if(NOT WIN32) +if (NOT WIN32) set(COMMON_LIBRARIES ${CURL_LIBRARIES} - ${FFMPEG_LIBRARIES} - ${FreeImage_LIBRARIES} - ${FREETYPE_LIBRARIES} - ${PUGIXML_LIBRARIES} - ${SDL2_LIBRARY}) - if(VLC_PLAYER) + ${FFMPEG_LIBRARIES} + ${FreeImage_LIBRARIES} + ${FREETYPE_LIBRARIES} + ${PUGIXML_LIBRARIES} + ${SDL2_LIBRARY}) + if (VLC_PLAYER) set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${VLC_LIBRARIES}) - endif() -elseif(WIN32) - if(DEFINED MSVC) + endif () +elseif (WIN32) + if (DEFINED MSVC) set(COMMON_LIBRARIES "${PROJECT_SOURCE_DIR}/avcodec.lib" - "${PROJECT_SOURCE_DIR}/avfilter.lib" - "${PROJECT_SOURCE_DIR}/avformat.lib" - "${PROJECT_SOURCE_DIR}/avutil.lib" - "${PROJECT_SOURCE_DIR}/swresample.lib" - "${PROJECT_SOURCE_DIR}/swscale.lib" - "${PROJECT_SOURCE_DIR}/FreeImage.lib" - "${PROJECT_SOURCE_DIR}/glew32.lib" - "${PROJECT_SOURCE_DIR}/libcurl-x64.lib" - "${PROJECT_SOURCE_DIR}/freetype.lib" - "${PROJECT_SOURCE_DIR}/pugixml.lib" - "${PROJECT_SOURCE_DIR}/SDL2main.lib" - "${PROJECT_SOURCE_DIR}/SDL2.lib" - "Winmm.dll") - if(VLC_PLAYER) + "${PROJECT_SOURCE_DIR}/avfilter.lib" + "${PROJECT_SOURCE_DIR}/avformat.lib" + "${PROJECT_SOURCE_DIR}/avutil.lib" + "${PROJECT_SOURCE_DIR}/swresample.lib" + "${PROJECT_SOURCE_DIR}/swscale.lib" + "${PROJECT_SOURCE_DIR}/FreeImage.lib" + "${PROJECT_SOURCE_DIR}/glew32.lib" + "${PROJECT_SOURCE_DIR}/libcurl-x64.lib" + "${PROJECT_SOURCE_DIR}/freetype.lib" + "${PROJECT_SOURCE_DIR}/pugixml.lib" + "${PROJECT_SOURCE_DIR}/SDL2main.lib" + "${PROJECT_SOURCE_DIR}/SDL2.lib" + "Winmm.dll") + if (VLC_PLAYER) set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "${PROJECT_SOURCE_DIR}/libvlc.lib") - endif() - else() + endif () + else () set(COMMON_LIBRARIES "${PROJECT_SOURCE_DIR}/avcodec-58.dll" - "${PROJECT_SOURCE_DIR}/avfilter-7.dll" - "${PROJECT_SOURCE_DIR}/avformat-58.dll" - "${PROJECT_SOURCE_DIR}/avutil-56.dll" - "${PROJECT_SOURCE_DIR}/swresample-3.dll" - "${PROJECT_SOURCE_DIR}/swscale-5.dll" - "${PROJECT_SOURCE_DIR}/FreeImage.dll" - "${PROJECT_SOURCE_DIR}/glew32.dll" - "${PROJECT_SOURCE_DIR}/libcurl-x64.dll" - "${PROJECT_SOURCE_DIR}/libfreetype.dll" - "${PROJECT_SOURCE_DIR}/libpugixml.dll" - "${PROJECT_SOURCE_DIR}/libSDL2main.a" - "${PROJECT_SOURCE_DIR}/SDL2.dll" - "mingw32" - "Winmm.dll") - if(VLC_PLAYER) + "${PROJECT_SOURCE_DIR}/avfilter-7.dll" + "${PROJECT_SOURCE_DIR}/avformat-58.dll" + "${PROJECT_SOURCE_DIR}/avutil-56.dll" + "${PROJECT_SOURCE_DIR}/swresample-3.dll" + "${PROJECT_SOURCE_DIR}/swscale-5.dll" + "${PROJECT_SOURCE_DIR}/FreeImage.dll" + "${PROJECT_SOURCE_DIR}/glew32.dll" + "${PROJECT_SOURCE_DIR}/libcurl-x64.dll" + "${PROJECT_SOURCE_DIR}/libfreetype.dll" + "${PROJECT_SOURCE_DIR}/libpugixml.dll" + "${PROJECT_SOURCE_DIR}/libSDL2main.a" + "${PROJECT_SOURCE_DIR}/SDL2.dll" + "mingw32" + "Winmm.dll") + if (VLC_PLAYER) set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "${PROJECT_SOURCE_DIR}/libvlc.dll") - endif() - endif() + endif () + endif () endif() if(APPLE) @@ -366,9 +366,9 @@ if(DEFINED libCEC_FOUND) endif() # Add ALSA for Linux libraries. -if(CMAKE_SYSTEM_NAME MATCHES "Linux") +if (CMAKE_SYSTEM_NAME MATCHES "Linux") list(APPEND COMMON_LIBRARIES ${ALSA_LIBRARY}) -endif() +endif () if(DEFINED BCMHOST) link_directories("${CMAKE_FIND_ROOT_PATH}/opt/vc/lib") @@ -378,11 +378,11 @@ elseif(RPI) list(APPEND COMMON_LIBRARIES ${OPENGLES_LIBRARIES}) endif() -if(GLSYSTEM MATCHES "Desktop OpenGL") +if (GLSYSTEM MATCHES "Desktop OpenGL") list(APPEND COMMON_LIBRARIES ${OPENGL_LIBRARIES}) -else() +else () list(APPEND COMMON_LIBRARIES EGL ${OPENGLES_LIBRARIES}) -endif() +endif () #--------------------------------------------------------------------------------------------------- # Build directories. diff --git a/CREDITS.md b/CREDITS.md index 60cac7b99..770648677 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -60,7 +60,6 @@ https://rapidjson.org SDL \ https://www.libsdl.org - # Code Some code (like the virtual keyboard) was borrowed from Batocera.linux \ @@ -72,7 +71,6 @@ https://www.bzflag.org A few of the GLSL shaders were borrowed from the RetroArch project \ https://www.retroarch.com - # Resources Akrobat font \ diff --git a/INSTALL-DEV.md b/INSTALL-DEV.md index e7db548c6..b313d020c 100644 --- a/INSTALL-DEV.md +++ b/INSTALL-DEV.md @@ -125,7 +125,9 @@ pkg_add vlc In the same manner as for FreeBSD, Clang/LLVM and cURL should already be installed by default. -RapidJSON is not part of the OpenBSD ports/package collection as of v6.8, so you need to compile it yourself. At the time of writing, the latest release v1.1.0 does not compile on OpenBSD, so you need to use the latest available code from the master branch: +RapidJSON is not part of the OpenBSD ports/package collection as of v6.8, so you need to compile it yourself. At the +time of writing, the latest release v1.1.0 does not compile on OpenBSD, so you need to use the latest available code +from the master branch: ``` git clone https://github.com/Tencent/rapidjson.git @@ -865,6 +867,7 @@ nmake ``` MinGW: + ``` cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=ON . make @@ -874,14 +877,13 @@ make For RapidJSON you don't need to compile anything, you just need the include files. -At the time of writing, the latest release v1.1.0 generates some compiler warnings on Windows, but this can be avoided by using the latest available code from the master branch: +At the time of writing, the latest release v1.1.0 generates some compiler warnings on Windows, but this can be avoided +by using the latest available code from the master branch: ``` git clone git://github.com/Tencent/rapidjson.git ``` - - **Clone the ES-DE repository:** This works the same as on Unix or macOS, just run the following: @@ -1396,24 +1398,44 @@ For the following options, the es_settings.xml file is immediately updated/saved --show-hidden-games ``` - ## es_systems.xml -The es_systems.xml file contains the game systems configuration data for ES-DE, written in XML format. This defines the system name, the full system name, the ROM path, the allowed file extensions, the launch command, the platform (for scraping) and the theme to use. +The es_systems.xml file contains the game systems configuration data for ES-DE, written in XML format. This defines the +system name, the full system name, the ROM path, the allowed file extensions, the launch command, the platform (for +scraping) and the theme to use. -ES-DE ships with a comprehensive `es_systems.xml` file and most users will probably never need to make any customizations. But there may be special circumstances such as wanting to use different emulators for some game systems or perhaps to add additional systems altogether. +ES-DE ships with a comprehensive `es_systems.xml` file and most users will probably never need to make any +customizations. But there may be special circumstances such as wanting to use different emulators for some game systems +or perhaps to add additional systems altogether. -To accomplish this, ES-DE supports customizations via a separate es_systems.xml file that is to be placed in the `custom_systems` folder in the application home directory, i.e. `~/.emulationstation/custom_systems/es_systems.xml`. (The tilde symbol `~` translates to `$HOME` on Unix and macOS, and to `%HOMEPATH%` on Windows unless overridden via the --home command line option.) +To accomplish this, ES-DE supports customizations via a separate es_systems.xml file that is to be placed in +the `custom_systems` folder in the application home directory, i.e. `~/.emulationstation/custom_systems/es_systems.xml` +. (The tilde symbol `~` translates to `$HOME` on Unix and macOS, and to `%HOMEPATH%` on Windows unless overridden via +the --home command line option.) -This custom file functionality is designed to be complementary to the bundled es_systems.xml file, meaning you should only add entries to the custom configuration file for game systems that you actually want to add or override. So to for example customize a single system, this file should only contain a single `` tag. The structure of the custom file is identical to the bundled file with the exception of an additional optional tag named ``. If this is placed in the custom es_systems.xml file, ES-DE will not load the bundled file. This is normally not recommended and should only be used for special situations. At the end of this section you can find an example of a custom es_systems.xml file. +This custom file functionality is designed to be complementary to the bundled es_systems.xml file, meaning you should +only add entries to the custom configuration file for game systems that you actually want to add or override. So to for +example customize a single system, this file should only contain a single `` tag. The structure of the custom +file is identical to the bundled file with the exception of an additional optional tag named ``. If this +is placed in the custom es_systems.xml file, ES-DE will not load the bundled file. This is normally not recommended and +should only be used for special situations. At the end of this section you can find an example of a custom +es_systems.xml file. -The bundled es_systems.xml file is located in the resources directory that is part of the application installation. For example this could be `/usr/share/emulationstation/resources/systems/unix/es_systems.xml` on Unix, `/Applications/EmulationStation Desktop Edition.app/Contents/Resources/resources/systems/macos/es_systems.xml` on macOS or `C:\Program Files\EmulationStation-DE\resources\systems\windows\es_systems.xml` on Windows. The actual location may differ from these examples of course, depending on where ES-DE has been installed. +The bundled es_systems.xml file is located in the resources directory that is part of the application installation. For +example this could be `/usr/share/emulationstation/resources/systems/unix/es_systems.xml` on +Unix, `/Applications/EmulationStation Desktop Edition.app/Contents/Resources/resources/systems/macos/es_systems.xml` on +macOS or `C:\Program Files\EmulationStation-DE\resources\systems\windows\es_systems.xml` on Windows. The actual location +may differ from these examples of course, depending on where ES-DE has been installed. -It doesn't matter in which order you define the systems as they will be sorted by the full system name inside the application, but it's still probably a good idea to add them in alphabetical order to make the file easier to maintain. +It doesn't matter in which order you define the systems as they will be sorted by the full system name inside the +application, but it's still probably a good idea to add them in alphabetical order to make the file easier to maintain. -Keep in mind that you have to set up your emulators separately from ES-DE as the es_systems.xml file assumes that your emulator environment is properly configured. +Keep in mind that you have to set up your emulators separately from ES-DE as the es_systems.xml file assumes that your +emulator environment is properly configured. -Below is an overview of the file layout with various examples. For the command tag, the newer es_find_rules.xml logic described later in this document removes the need for most of the legacy options, but they are still supported for special configurations and for backward compatibility with old configuration files. +Below is an overview of the file layout with various examples. For the command tag, the newer es_find_rules.xml logic +described later in this document removes the need for most of the legacy options, but they are still supported for +special configurations and for backward compatibility with old configuration files. ```xml @@ -1568,7 +1590,9 @@ And finally one for Windows: ``` -As well, here's an example for Unix of a custom es_systems.xml file placed in ~/.emulationstation/custom_systems/ that overrides a single game system from the bundled configuration file: +As well, here's an example for Unix of a custom es_systems.xml file placed in ~/.emulationstation/custom_systems/ that +overrides a single game system from the bundled configuration file: + ```xml @@ -1585,7 +1609,8 @@ As well, here's an example for Unix of a custom es_systems.xml file placed in ~/ ``` -If adding the `` tag to the file, the bundled es_systems.xml file will not be processed. For this example it wouldn't be a very good idea as NES would then be the only platform that could be used in ES-DE. +If adding the `` tag to the file, the bundled es_systems.xml file will not be processed. For this +example it wouldn't be a very good idea as NES would then be the only platform that could be used in ES-DE. ```xml @@ -1608,9 +1633,11 @@ If adding the `` tag to the file, the bundled es_systems.xml fil This file makes it possible to define rules for where to search for the emulator binaries and emulator cores. -The file is located in the resources directory in the same location as the es_systems.xml file, but a customized copy can be placed in ~/.emulationstation/custom_systems, which will override the bundled file. +The file is located in the resources directory in the same location as the es_systems.xml file, but a customized copy +can be placed in ~/.emulationstation/custom_systems, which will override the bundled file. Here's an example es_find_rules.xml file for Unix: + ```xml diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md index 4d75dc06b..c6ced13e0 100644 --- a/USERGUIDE-DEV.md +++ b/USERGUIDE-DEV.md @@ -73,17 +73,37 @@ There's not really much to say about these operating systems, just install ES-DE Upon first startup, ES-DE will create its `~/.emulationstation` home directory. -On Unix this means /home/\/.emulationstation/, on macOS /Users/\/.emulationstation/ and on Windows C:\Users\\\\.emulationstation\ +On Unix this means /home/\/.emulationstation/, on macOS /Users/\/.emulationstation/ and on Windows +C:\Users\\\\.emulationstation\ -**Note:** As of ES-DE v1.1 there is no internationalization support, which means that the application will always require the physical rather than the localized path to your home directory. For instance on macOS configured for the Swedish language /Users/myusername will be the physical path but /Användare/myusername is the localized path that is actually shown in the user interface. The same is true on Windows where the directories would be C:\Users\myusername and C:\Användare\myusername respectively. If attempting to enter the localized path for any directory-related setting, ES-DE will not be able to find it. But it's always possible to use the tilde `~` symbol when referring to your home directory, which ES-DE will expand to the physical location regardless of what language you have configured for your operating system. If you're using an English-localized system, this whole point is irrelevant as the physical and localized paths are then identical. +**Note:** As of ES-DE v1.1 there is no internationalization support, which means that the application will always +require the physical rather than the localized path to your home directory. For instance on macOS configured for the +Swedish language /Users/myusername will be the physical path but /Användare/myusername is the localized path that is +actually shown in the user interface. The same is true on Windows where the directories would be C:\Users\myusername and +C:\Användare\myusername respectively. If attempting to enter the localized path for any directory-related setting, ES-DE +will not be able to find it. But it's always possible to use the tilde `~` symbol when referring to your home directory, +which ES-DE will expand to the physical location regardless of what language you have configured for your operating +system. If you're using an English-localized system, this whole point is irrelevant as the physical and localized paths +are then identical. -It's possible to override the home directory path using the --home command line option, but this is normally required only for very special situations so we can safely ignore that option for now. +It's possible to override the home directory path using the --home command line option, but this is normally required +only for very special situations so we can safely ignore that option for now. -Also on first startup the configuration file `es_settings.xml` will be generated in the ES-DE home directory, containing all the application settings at their default values. Following this, a file named `es_systems.xml` will be loaded from the resources directory (which is part of the ES-DE installation). This file contains the game system definitions including which emulator to use per platform. For some systems there are also alternative emulators defined which can be applied system-wide or per game. How that works is explained later in this guide. A customized systems configuration file can also be used, as described in the next section. +Also on first startup the configuration file `es_settings.xml` will be generated in the ES-DE home directory, containing +all the application settings at their default values. Following this, a file named `es_systems.xml` will be loaded from +the resources directory (which is part of the ES-DE installation). This file contains the game system definitions +including which emulator to use per platform. For some systems there are also alternative emulators defined which can be +applied system-wide or per game. How that works is explained later in this guide. A customized systems configuration +file can also be used, as described in the next section. -There's an application log file created in the ES-DE home directory named `es_log.txt`, please refer to this in case of any issues as it should hopefully provide information on what went wrong. Starting ES-DE with the --debug flag provides even more detailed information. +There's an application log file created in the ES-DE home directory named `es_log.txt`, please refer to this in case of +any issues as it should hopefully provide information on what went wrong. Starting ES-DE with the --debug flag provides +even more detailed information. -After ES-DE finds at least one game file, it will populate that game system and the application will start. If there are no game files, a dialog will be shown explaining that you need to install your game files into your ROMs directory. You will also be given a choice to change that ROMs directory path if you don't want to use the default one. As well you have the option to generate the complete game systems directory structure based on information in es_systems.xml. +After ES-DE finds at least one game file, it will populate that game system and the application will start. If there are +no game files, a dialog will be shown explaining that you need to install your game files into your ROMs directory. You +will also be given a choice to change that ROMs directory path if you don't want to use the default one. As well you +have the option to generate the complete game systems directory structure based on information in es_systems.xml. When generating the directory structure, a file named systeminfo.txt will be created in each game system folder which will provide you with some information about the system. Here's an example for the _gc_ system as seen on macOS: ``` @@ -106,9 +126,11 @@ Theme folder: gc ``` -The primary use of this file is to see which RetroArch core the system needs, which you will have to install manually from inside the RetroArch user interface. Also the supported file extensions can be quite useful to know. +The primary use of this file is to see which RetroArch core the system needs, which you will have to install manually +from inside the RetroArch user interface. Also the supported file extensions can be quite useful to know. -In addition to this, a file named systems.txt will be created in the root of the ROMs directory which shows the mapping between the directory names and the full system names. +In addition to this, a file named systems.txt will be created in the root of the ROMs directory which shows the mapping +between the directory names and the full system names. For example: @@ -118,32 +140,59 @@ genesis: Sega Genesis gx4000: Amstrad GX4000 ``` -If a custom es_systems.xml file is present in ~/.emulationstation/custom_systems/ any entries from this file will have their names trailed by the text _(custom system)_. So if the GameCube system in the example above would be present in the custom systems configuration file, the system would be shown as `gc (custom system)` instead of simply `gc`. This is only applicable for the systems.txt and systeminfo.txt files, the trailing text is not applied or used anywhere else in the application. +If a custom es_systems.xml file is present in ~/.emulationstation/custom_systems/ any entries from this file will have +their names trailed by the text _(custom system)_. So if the GameCube system in the example above would be present in +the custom systems configuration file, the system would be shown as `gc (custom system)` instead of simply `gc`. This is +only applicable for the systems.txt and systeminfo.txt files, the trailing text is not applied or used anywhere else in +the application. -Note that neither the systeminfo.txt files or the systems.txt file are needed to run ES-DE, they're only generated as a convenience to help with the setup. +Note that neither the systeminfo.txt files or the systems.txt file are needed to run ES-DE, they're only generated as a +convenience to help with the setup. -There will be a lot of directories created if using the es_systems.xml file bundled with the installation, so it may be a good idea to remove the ones you don't need. It's recommended to move them to another location to be able to use them later if more systems should be added. For example a directory named _DISABLED could be created inside the ROMs folder (i.e. ~/ROMs/_DISABLED) and all game system directories you don't need could be moved there. Doing this reduces the application startup time as ES-DE would otherwise need to scan for game files for all these systems. +There will be a lot of directories created if using the es_systems.xml file bundled with the installation, so it may be +a good idea to remove the ones you don't need. It's recommended to move them to another location to be able to use them +later if more systems should be added. For example a directory named _DISABLED could be created inside the ROMs folder ( +i.e. ~/ROMs/_DISABLED) and all game system directories you don't need could be moved there. Doing this reduces the +application startup time as ES-DE would otherwise need to scan for game files for all these systems. ![alt text](images/es-de_ui_easy_setup.png "ES-DE Easy Setup") -_This is the dialog shown if no game files were found. It lets you configure the ROM directory if you don't want to use the default one, and you can also generate the game systems directory structure. Note that the directory is the physical path, and that your operating system may present this as a localized path if you are using a language other than English._ - +_This is the dialog shown if no game files were found. It lets you configure the ROM directory if you don't want to use +the default one, and you can also generate the game systems directory structure. Note that the directory is the physical +path, and that your operating system may present this as a localized path if you are using a language other than +English._ ## Game system customizations -The game systems configuration file `es_systems.xml` is located in the ES-DE resources directory which is part of the application installation. As such this file is not intended to be modified directly. If system customizations are required, a separate es_systems.xml file should instead be placed in the `custom_systems` folder in the ES-DE home directory, i.e. `~/.emulationstation/custom_systems/es_systems.xml`. +The game systems configuration file `es_systems.xml` is located in the ES-DE resources directory which is part of the +application installation. As such this file is not intended to be modified directly. If system customizations are +required, a separate es_systems.xml file should instead be placed in the `custom_systems` folder in the ES-DE home +directory, i.e. `~/.emulationstation/custom_systems/es_systems.xml`. -Although it's possible to make a copy of the bundled configuration file, to modify it and then place it in this directory, that is not how the system customization is designed to be done. Instead the intention is that the file in the custom_systems directory complements the bundled configuration, meaning only systems that are to be modified should be included. +Although it's possible to make a copy of the bundled configuration file, to modify it and then place it in this +directory, that is not how the system customization is designed to be done. Instead the intention is that the file in +the custom_systems directory complements the bundled configuration, meaning only systems that are to be modified should +be included. -For example you may want to replace the emulator launch command, modify the full name or change the supported file extensions for a single system. In this case it wouldn't make sense to copy the complete bundled file and just apply these minor modifications, instead an es_systems.xml file only containing the configuration for that single system should be placed in the custom_systems directory. - -The instructions for how to customize the es_systems.xml file can be found in [INSTALL-DEV.md](INSTALL-DEV.md#es_systemsxml). There you can also find an example of a custom file that you can copy into ~/.emulationstation/custom_systems/ and modify as required. +For example you may want to replace the emulator launch command, modify the full name or change the supported file +extensions for a single system. In this case it wouldn't make sense to copy the complete bundled file and just apply +these minor modifications, instead an es_systems.xml file only containing the configuration for that single system +should be placed in the custom_systems directory. +The instructions for how to customize the es_systems.xml file can be found +in [INSTALL-DEV.md](INSTALL-DEV.md#es_systemsxml). There you can also find an example of a custom file that you can copy +into ~/.emulationstation/custom_systems/ and modify as required. ## Migrating from other EmulationStation forks **IMPORTANT!!! IMPORTANT!!! IMPORTANT!!!** -ES-DE is designed to be backward compatible to a certain degree, that is, it should be able to read data from other/previous EmulationStation versions such as the RetroPie fork. But the opposite is not true and it's a one-way ticket for your gamelist.xml files and your custom collection files when migrating to ES-DE as they will be modified in ways that previous ES versions will see as data loss. For instance ES-DE does not use image tags inside the gamelist.xml files to find game media but instead matches the media to the names of the game/ROM files. So it will not save any such tags back to the gamelist files during updates, effectively removing the display of the game media if the files are opened in another ES fork. +ES-DE is designed to be backward compatible to a certain degree, that is, it should be able to read data from +other/previous EmulationStation versions such as the RetroPie fork. But the opposite is not true and it's a one-way +ticket for your gamelist.xml files and your custom collection files when migrating to ES-DE as they will be modified in +ways that previous ES versions will see as data loss. For instance ES-DE does not use image tags inside the gamelist.xml +files to find game media but instead matches the media to the names of the game/ROM files. So it will not save any such +tags back to the gamelist files during updates, effectively removing the display of the game media if the files are +opened in another ES fork. Due to this, always make backups of at least the following directories before testing ES-DE for the first time: @@ -377,7 +426,8 @@ The platform name for the Commodore 64 is `c64`, so the following structure woul ~/ROMs/c64/Multidisk/Pirates/Pirates!.m3u ``` -It's highly recommended to create `.m3u` playlist files for multi-disc images as this normally automates disk swapping in the emulator. It's then this .m3u file that should be selected for launching the game. +It's highly recommended to create `.m3u` playlist files for multi-disc images as this normally automates disk swapping +in the emulator. It's then this .m3u file that should be selected for launching the game. The .m3u file simply contains a list of the game files, for example in the case of Last Ninja 2.m3u: @@ -430,9 +480,13 @@ Apart from the potential difficulty in locating the emulator binary, there are s #### Commodore Amiga -There are multiple ways to run Amiga games, but the recommended approach is to use WHDLoad. The best way is to use hard disk images in `.hdf` or `.hdz` format, meaning there will be a single file per game. This makes it just as easy to play Amiga games as any console with game ROMs. +There are multiple ways to run Amiga games, but the recommended approach is to use WHDLoad. The best way is to use hard +disk images in `.hdf` or `.hdz` format, meaning there will be a single file per game. This makes it just as easy to play +Amiga games as any console with game ROMs. -An alternative would be to use `.adf` images as not all games may be available with WHDLoad support. For this, you can either put single-disc images in the root folder or in a dedicated adf directory, or multiple-disk games in separate folders. It's highly recommended to create `.m3u` playlist files for multi-disc images as described earlier. +An alternative would be to use `.adf` images as not all games may be available with WHDLoad support. For this, you can +either put single-disc images in the root folder or in a dedicated adf directory, or multiple-disk games in separate +folders. It's highly recommended to create `.m3u` playlist files for multi-disc images as described earlier. Here's an example of what the file structure could look like: @@ -872,7 +926,8 @@ If this setting is enabled and a folder has its flag set to be excluded from the **Scrape actual folders** _(Multi-scraper only)_ -Enabling this option causes folders themselves to be included by the scraper. This is useful for DOS games or any multi-disc games where there is a folder for each individual game. +Enabling this option causes folders themselves to be included by the scraper. This is useful for DOS games or any +multi-disc games where there is a folder for each individual game. **Auto-retry on peer verification errors** _(ScreenScraper only)_ @@ -944,27 +999,50 @@ Whether to sort your favorite games above your other games in the gamelists. **Add star markings to favorite games** -With this setting enabled, there is a star symbol added at the beginning of the game name in the gamelist views. It's strongly recommended to keep this setting enabled if the option to sort favorite games above non-favorites has been enabled. If not, favorite games would be sorted on top of the gamelist with no visual indication that they are favorites, which would be quite confusing. +With this setting enabled, there is a star symbol added at the beginning of the game name in the gamelist views. It's +strongly recommended to keep this setting enabled if the option to sort favorite games above non-favorites has been +enabled. If not, favorite games would be sorted on top of the gamelist with no visual indication that they are +favorites, which would be quite confusing. **Use plain ASCII for special gamelist characters** -There are some special characters in ES-DE such as the favorites star, the folder icon and the tickmark (seen when editing custom collections) that are displayed using symbols from the bundled Font Awesome. This normally looks perfectly fine, but on some specific theme sets with very pixelated fonts such as [es-themes-snes-mini](https://github.com/ruckage/es-theme-snes-mini) and [es-themes-workbench](https://github.com/ehettervik/es-theme-workbench) these symbols look terrible. For such themes, this option is available, which will use plain ASCII characters instead of the Font Awesome symbols. For the favorites an asterisk `*` will be used, for folders a hash sign `#` will be used and for the tickmark an exclamation mark `!` will be used. This only applies to the gamelist view, in all other places in the application the Font Awesome symbols are retained. Make sure to disable this option if not using such a pixelated theme as it looks equally terrible to enable this option on themes where it's not supposed to be used. +There are some special characters in ES-DE such as the favorites star, the folder icon and the tickmark (seen when +editing custom collections) that are displayed using symbols from the bundled Font Awesome. This normally looks +perfectly fine, but on some specific theme sets with very pixelated fonts such +as [es-themes-snes-mini](https://github.com/ruckage/es-theme-snes-mini) +and [es-themes-workbench](https://github.com/ehettervik/es-theme-workbench) these symbols look terrible. For such +themes, this option is available, which will use plain ASCII characters instead of the Font Awesome symbols. For the +favorites an asterisk `*` will be used, for folders a hash sign `#` will be used and for the tickmark an exclamation +mark `!` will be used. This only applies to the gamelist view, in all other places in the application the Font Awesome +symbols are retained. Make sure to disable this option if not using such a pixelated theme as it looks equally terrible +to enable this option on themes where it's not supposed to be used. **Enable quick list scrolling overlay** -With this option enabled, there will be an overlay displayed when scrolling the gamelists quickly, i.e. when holding down the _Up_, _Down_, _Left shoulder_ or _Right shoulder_ buttons for some time. The overlay will darken the background slightly and display the first two characters of the game names. If the game is a favorite and the setting to sort favorites above non-favorites has been enabled, a star will be shown instead. +With this option enabled, there will be an overlay displayed when scrolling the gamelists quickly, i.e. when holding +down the _Up_, _Down_, _Left shoulder_ or _Right shoulder_ buttons for some time. The overlay will darken the background +slightly and display the first two characters of the game names. If the game is a favorite and the setting to sort +favorites above non-favorites has been enabled, a star will be shown instead. **Enable virtual keyboard** -This enables a virtual (on-screen) keyboard that can be used at various places throughout the application to input text and numbers using a controller. The Shift and Alt keys can be toggled individually or combined together to access many special characters. The general use of the virtual keyboard should hopefully be self-explanatory. +This enables a virtual (on-screen) keyboard that can be used at various places throughout the application to input text +and numbers using a controller. The Shift and Alt keys can be toggled individually or combined together to access many +special characters. The general use of the virtual keyboard should hopefully be self-explanatory. **Enable toggle favorites button** -This setting enables the _Y_ button for quickly toggling a game as favorite. Although this may be convenient at times, it's also quite easy to accidentally remove a favorite tagging of a game when using the application more casually. As such it could sometimes make sense to disable this functionality. It's of course still possible to mark a game as favorite using the metadata editor when this setting is disabled. The option does not affect the use of the _Y_ button to add or remove games when editing custom collections. +This setting enables the _Y_ button for quickly toggling a game as favorite. Although this may be convenient at times, +it's also quite easy to accidentally remove a favorite tagging of a game when using the application more casually. As +such it could sometimes make sense to disable this functionality. It's of course still possible to mark a game as +favorite using the metadata editor when this setting is disabled. The option does not affect the use of the _Y_ button +to add or remove games when editing custom collections. **Enable random system or game button** -This enables or disables the ability to jump to a random system or game. It's mapped to the thumbstick click button, either the left or right thumbstick will work. The help prompts will also visually indicate whether this option is enabled or not. +This enables or disables the ability to jump to a random system or game. It's mapped to the thumbstick click button, +either the left or right thumbstick will work. The help prompts will also visually indicate whether this option is +enabled or not. **Enable gamelist filters** @@ -1242,7 +1320,11 @@ If this option is disabled, hidden files and folders within the ROMs directory t **Show hidden games (requires restart)** -You can mark games as hidden in the metadata editor, which is useful for instance for DOS games where you may not want to see some batch files and executables inside ES-DE, or for multi-disc games where you may only want to show the .m3u playlists and not the individual game files. By disabling this option these files will not be processed at all when ES-DE starts up. If you enable the option you will see the files, but their name entries will be almost transparent in the gamelist view to visually indicate that they are hidden. +You can mark games as hidden in the metadata editor, which is useful for instance for DOS games where you may not want +to see some batch files and executables inside ES-DE, or for multi-disc games where you may only want to show the .m3u +playlists and not the individual game files. By disabling this option these files will not be processed at all when +ES-DE starts up. If you enable the option you will see the files, but their name entries will be almost transparent in +the gamelist view to visually indicate that they are hidden. **Enable custom event scripts** @@ -1350,9 +1432,14 @@ The following filters can be applied: **Hidden** -With the exception of the game name text filter, all available filter values are assembled from metadata from the actual gamelist, so if there for instance are no games marked as completed, the Completed filter will only have the selectable option False, i.e. True will be missing. +With the exception of the game name text filter, all available filter values are assembled from metadata from the actual +gamelist, so if there for instance are no games marked as completed, the Completed filter will only have the selectable +option False, i.e. True will be missing. -Be aware that although folders can have most of the metadata values set, the filters are only applied to files (this is also true for the game name text filter). So if you for example set a filter to only display your favorite games, any folder that contains a favorite game will be displayed, and other folders which are themselves marked as favorites but that do not contain any favorite games will be hidden. +Be aware that although folders can have most of the metadata values set, the filters are only applied to files (this is +also true for the game name text filter). So if you for example set a filter to only display your favorite games, any +folder that contains a favorite game will be displayed, and other folders which are themselves marked as favorites but +that do not contain any favorite games will be hidden. The filters are always applied for the complete game system, including all folder content. @@ -1430,7 +1517,11 @@ A flag to mark whether the game is suitable for children. This will be applied a **Hidden** -A flag to indicate that the game is hidden. If the corresponding option has been set in the main menu, the game will not be shown. Useful for example for DOS games to hide batch scripts and unnecessary binaries or to hide the actual game files for multi-disc games. If a file or folder is flagged as hidden but the corresponding option to hide hidden games has not been enabled, then the opacity of the text will be lowered significantly to make it clear that it's a hidden entry. +A flag to indicate that the game is hidden. If the corresponding option has been set in the main menu, the game will not +be shown. Useful for example for DOS games to hide batch scripts and unnecessary binaries or to hide the actual game +files for multi-disc games. If a file or folder is flagged as hidden but the corresponding option to hide hidden games +has not been enabled, then the opacity of the text will be lowered significantly to make it clear that it's a hidden +entry. **Broken/not working** @@ -1438,15 +1529,27 @@ A flag to indicate whether the game is broken. Useful for MAME games for instanc **Exclude from game counter** _(files only)_ -A flag to indicate whether the game should be excluded from being counted. If this is set for a game, it will not be included in the game counter shown per system on the system view, and it will not be included in the system information field in the gamelist view. As well, it will be excluded from all automatic and custom collections. This option is quite useful for multi-file games such as multi-disc Amiga or Commodore 64 games, or for DOS games where you want to exclude setup programs and similar but still need them available in ES-DE and therefore can't hide them. Files that have this flag set will have a lower opacity in the gamelists, making them easy to spot. +A flag to indicate whether the game should be excluded from being counted. If this is set for a game, it will not be +included in the game counter shown per system on the system view, and it will not be included in the system information +field in the gamelist view. As well, it will be excluded from all automatic and custom collections. This option is quite +useful for multi-file games such as multi-disc Amiga or Commodore 64 games, or for DOS games where you want to exclude +setup programs and similar but still need them available in ES-DE and therefore can't hide them. Files that have this +flag set will have a lower opacity in the gamelists, making them easy to spot. **Exclude from multi-scraper** -Whether to exclude the file from the multi-scraper. This is quite useful in order to avoid scraping all the disks for multi-disc games for example. There is an option in the scraper settings to ignore this flag, but by default the multi-scraper will respect it. +Whether to exclude the file from the multi-scraper. This is quite useful in order to avoid scraping all the disks for +multi-disc games for example. There is an option in the scraper settings to ignore this flag, but by default the +multi-scraper will respect it. **Hide metadata fields** -This option will hide most metadata fields in the gamelist view. The intention is to be able to hide the fields for situations such as general folders (Multi-disc, Cartridges etc.) and for setup programs and similar (e.g. SETUP.EXE or INSTALL.BAT for DOS games). It could also be used on the game files for multi-disc games where perhaps only the .m3u playlist should have any metadata values. The only fields shown with this option enabled are the game name and description. Using the description it's possible to write some comments regarding the file or folder, should you want to. It's also possible to display game images and videos with this setting enabled. +This option will hide most metadata fields in the gamelist view. The intention is to be able to hide the fields for +situations such as general folders (Multi-disc, Cartridges etc.) and for setup programs and similar (e.g. SETUP.EXE or +INSTALL.BAT for DOS games). It could also be used on the game files for multi-disc games where perhaps only the .m3u +playlist should have any metadata values. The only fields shown with this option enabled are the game name and +description. Using the description it's possible to write some comments regarding the file or folder, should you want +to. It's also possible to display game images and videos with this setting enabled. **Times played** _(files only)_ @@ -1632,35 +1735,82 @@ Refer to the [INSTALL-DEV.md](INSTALL-DEV.md#command-line-options) document for ## Supported game systems -**Note:** The following list is what the default es_systems.xml files and the rbsimple-DE theme supports. This theme set is very comprehensive, so if you're using another theme, it may be that some or many of these systems are not supported. ES-DE will still work but the game system will unthemed which looks very ugly. +**Note:** The following list is what the default es_systems.xml files and the rbsimple-DE theme supports. This theme set +is very comprehensive, so if you're using another theme, it may be that some or many of these systems are not supported. +ES-DE will still work but the game system will unthemed which looks very ugly. -Note as well that the list and corresponding es_systems.xml templates may not reflect what is readily available for all supported operating system. This is especially true on Unix/Linux if installing RetroArch via the OS repository instead of using the Snap or Flatpak distributions (or compiling from source code) as the repository versions are normally quite crippled. +Note as well that the list and corresponding es_systems.xml templates may not reflect what is readily available for all +supported operating system. This is especially true on Unix/Linux if installing RetroArch via the OS repository instead +of using the Snap or Flatpak distributions (or compiling from source code) as the repository versions are normally quite +crippled. -The column **System name** corresponds to the directory where you should put your game files, e.g. `~/ROMs/c64` or `~/ROMs/megadrive`. +The column **System name** corresponds to the directory where you should put your game files, e.g. `~/ROMs/c64` +or `~/ROMs/megadrive`. -Regional differences are handled by simply using the game system name corresponding to your region. For example for Sega Mega Drive, _megadrive_ would be used by most people in the world, although persons from North America would use _genesis_ instead. The same is true for _pcengine_ vs _tg16_ etc. This only affects the theme selection and the corresponding theme graphics, the same emulator and scraper settings are still used for the regional variants although that can of course be customized in the es_systems.xml file if you wish. +Regional differences are handled by simply using the game system name corresponding to your region. For example for Sega +Mega Drive, _megadrive_ would be used by most people in the world, although persons from North America would use _ +genesis_ instead. The same is true for _pcengine_ vs _tg16_ etc. This only affects the theme selection and the +corresponding theme graphics, the same emulator and scraper settings are still used for the regional variants although +that can of course be customized in the es_systems.xml file if you wish. -Sometimes the name of the console is (more or less) the same for multiple regions, and in those cases the region has been added as a suffix to the game system name. For instance `na` for North America has been added to `snes` (Super Nintendo) giving the system name `snesna`. The same goes for Japan, as in `megacd` and `megacdjp`. Again, this only affects the theme and theme graphics. +Sometimes the name of the console is (more or less) the same for multiple regions, and in those cases the region has +been added as a suffix to the game system name. For instance `na` for North America has been added to `snes` (Super +Nintendo) giving the system name `snesna`. The same goes for Japan, as in `megacd` and `megacdjp`. Again, this only +affects the theme and theme graphics. For the **Full name** column, text inside square brackets [] are comments and not part of the actual system name. -The **Default emulator** column lists the primary emulator as configured in es_systems.xml. If this differs between Unix, macOS and Windows then it's specified in square brackets, such as [UW] for Unix and Windows and [M] for macOS. If not all of the three platforms are specified it means that the system is not available on the missing platforms. For example Lutris which is only avaialable on Unix is marked with only a _[U]_. Unless explicitly marked as **(Standalone)**, each emulator is a RetroArch core. +The **Default emulator** column lists the primary emulator as configured in es_systems.xml. If this differs between +Unix, macOS and Windows then it's specified in square brackets, such as [UW] for Unix and Windows and [M] for macOS. If +not all of the three platforms are specified it means that the system is not available on the missing platforms. For +example Lutris which is only avaialable on Unix is marked with only a _[U]_. Unless explicitly marked as **( +Standalone)**, each emulator is a RetroArch core. -The **Alternative emulators** column lists additional emulators configured in es_systems.xml that can be selected per system and per game, as explained earlier in this guide. This does not necessarily include everything in existence, as for some platforms there are a lot of emulators to choose from. In those cases the included emulators is a curated selection. In the same manner as the _Default emulator_ column, differences between Unix, macOS and Windows are marked using square brackets. Unless explicitly marked as **(Standalone)**, echo emulator is a RetroArch core. +The **Alternative emulators** column lists additional emulators configured in es_systems.xml that can be selected per +system and per game, as explained earlier in this guide. This does not necessarily include everything in existence, as +for some platforms there are a lot of emulators to choose from. In those cases the included emulators is a curated +selection. In the same manner as the _Default emulator_ column, differences between Unix, macOS and Windows are marked +using square brackets. Unless explicitly marked as **(Standalone)**, echo emulator is a RetroArch core. -The **Needs BIOS** column indicates if additional BIOS/system ROMs are required, as should be explained by the emulator documentation. Good starting points for such documentation are [https://docs.libretro.com](https://docs.libretro.com) and [https://docs.libretro.com/library/bios](https://docs.libretro.com/library/bios) +The **Needs BIOS** column indicates if additional BIOS/system ROMs are required, as should be explained by the emulator +documentation. Good starting points for such documentation are [https://docs.libretro.com](https://docs.libretro.com) +and [https://docs.libretro.com/library/bios](https://docs.libretro.com/library/bios) -For additional details regarding which game file extensions are supported per system, refer to the es_systems.xml files [unix/es_systems.xml](resources/systems/unix/es_systems.xml), [macos/es_systems.xml](resources/systems/macos/es_systems.xml) and [windows/es_systems.xml](resources/systems/windows/es_systems.xml). Normally the extensions setup in these files should cover everything that the emulators support. Note that for systems that have alternative emulators defined, the list of extensions is a combination of what is supported by all the emulators. This approach is necessary as you want to be able to see all games for each system while potentially testing and switching between different emulators, either system-wide or on a per game basis. +For additional details regarding which game file extensions are supported per system, refer to the es_systems.xml +files [unix/es_systems.xml](resources/systems/unix/es_systems.xml) +, [macos/es_systems.xml](resources/systems/macos/es_systems.xml) +and [windows/es_systems.xml](resources/systems/windows/es_systems.xml). Normally the extensions setup in these files +should cover everything that the emulators support. Note that for systems that have alternative emulators defined, the +list of extensions is a combination of what is supported by all the emulators. This approach is necessary as you want to +be able to see all games for each system while potentially testing and switching between different emulators, either +system-wide or on a per game basis. -If you generated the ROMs directory structure when first starting ES-DE, the systeminfo.txt files located in each game system directory will also contain the information about the emulator core and supported file extensions. +If you generated the ROMs directory structure when first starting ES-DE, the systeminfo.txt files located in each game +system directory will also contain the information about the emulator core and supported file extensions. -For CD-based systems it's generally recommended to use CHD files (extension .chd) as this saves space due to compression compared to BIN/CUE, IMG, ISO etc. The CHD format is also supported by most emulators. You can convert to CHD from various formats using the MAME `chdman` utility, for example `chdman createcd -i mygame.iso -o mygame.chd`. Sometimes chdman has issues converting from the IMG and BIN formats, and in this case it's possible to first convert to ISO using `ccd2iso`, such as `ccd2iso mygame.img mygame.iso`. +For CD-based systems it's generally recommended to use CHD files (extension .chd) as this saves space due to compression +compared to BIN/CUE, IMG, ISO etc. The CHD format is also supported by most emulators. You can convert to CHD from +various formats using the MAME `chdman` utility, for example `chdman createcd -i mygame.iso -o mygame.chd`. Sometimes +chdman has issues converting from the IMG and BIN formats, and in this case it's possible to first convert to ISO +using `ccd2iso`, such as `ccd2iso mygame.img mygame.iso`. -MAME emulation is a bit special as the choice of emulator depends on which ROM set you're using. It's recommended to go for the latest available set, as MAME is constantly improved with more complete and accurate emulation. Therefore the `arcade` system is configured to use _MAME - Current_ by default, which as the name implies will be the latest available MAME version. But if you have a really slow computer you may want to use another ROM set such as the popular 0.78. In this case, you can either select _MAME 2003-Plus_ as an alternative emulator, or you can use the `mame` system which comes configured with this emulator as the default. There are more MAME versions available as alternative emulators, as you can see in the table below. +MAME emulation is a bit special as the choice of emulator depends on which ROM set you're using. It's recommended to go +for the latest available set, as MAME is constantly improved with more complete and accurate emulation. Therefore +the `arcade` system is configured to use _MAME - Current_ by default, which as the name implies will be the latest +available MAME version. But if you have a really slow computer you may want to use another ROM set such as the popular +0.78. In this case, you can either select _MAME 2003-Plus_ as an alternative emulator, or you can use the `mame` system +which comes configured with this emulator as the default. There are more MAME versions available as alternative +emulators, as you can see in the table below. -There are also other MAME forks and derivates available such as MAME4ALL, AdvanceMAME, FinalBurn Alpha and FinalBurn Neo but it's beyond the scope of this document to describe those in detail. For more information, refer to the [RetroPie arcade documentation](https://retropie.org.uk/docs/Arcade) which has a good overview of the various MAME alternatives. +There are also other MAME forks and derivates available such as MAME4ALL, AdvanceMAME, FinalBurn Alpha and FinalBurn Neo +but it's beyond the scope of this document to describe those in detail. For more information, refer to +the [RetroPie arcade documentation](https://retropie.org.uk/docs/Arcade) which has a good overview of the various MAME +alternatives. -In general .zip or .7z files are recommended for smaller-sized games like those from older systems (assuming the emulator supports it). But for CD-based systems it's not a good approach as uncompressing the larger CD images takes quite some time, leading to slow game launches. As explained above, converting CD images to CHD files is a better solution for achieving file compression while still enjoying fast game launches. +In general .zip or .7z files are recommended for smaller-sized games like those from older systems (assuming the +emulator supports it). But for CD-based systems it's not a good approach as uncompressing the larger CD images takes +quite some time, leading to slow game launches. As explained above, converting CD images to CHD files is a better +solution for achieving file compression while still enjoying fast game launches. Consider the table below a work in progress as it's obvioulsy not fully populated yet! @@ -1721,7 +1871,8 @@ All emulators are RetroArch cores unless marked as **(Standalone**) | gx4000 | Amstrad GX4000 | | | | | | intellivision | Mattel Electronics Intellivision | FreeIntv | | | | | kodi | Kodi home theatre software | N/A | | No | | -| lutris | Lutris open gaming platform | Lutris application **(Standalone)** [U] | | No | Shell script in root folder | +| lutris | Lutris open gaming platform | Lutris application **( +Standalone)** [U] | | No | Shell script in root folder | | lutro | Lutro game engine | Lutro | | | | | macintosh | Apple Macintosh | | | | | | mame | Multiple Arcade Machine Emulator | MAME 2003-Plus | MAME 2000,
MAME 2010,
MAME - Current,
FinalBurn Neo,
FB Alpha 2012 | Depends | Single archive file following MAME name standard in root folder | @@ -1783,11 +1934,13 @@ All emulators are RetroArch cores unless marked as **(Standalone**) | snesna | Nintendo SNES (Super Nintendo) [North America] | Snes9x - Current | Snes9x 2010,
bsnes,
bsnes-mercury Accuracy,
Beetle Supafaust [UW],
Mesen-S | No | Single archive or ROM file in root folder | | solarus | Solarus game engine | | | | | | spectravideo | Spectravideo | blueMSX | | | | -| steam | Valve Steam | Steam application **(Standalone)** | | No | Shell script/batch file in root folder | +| steam | Valve Steam | Steam application **( +Standalone)** | | No | Shell script/batch file in root folder | | stratagus | Stratagus game engine | | | | | | sufami | Bandai SuFami Turbo | Snes9x - Current | | | | | supergrafx | NEC SuperGrafx | Beetle SuperGrafx | Beetle PCE | | | -| switch | Nintendo Switch | Yuzu **(Standalone)** [UW] | | Yes | | +| switch | Nintendo Switch | Yuzu **( +Standalone)** [UW] | | Yes | | | tanodragon | Tano Dragon | | | | | | tg16 | NEC TurboGrafx-16 | Beetle PCE | Beetle PCE FAST | No | Single archive or ROM file in root folder | | tg-cd | NEC TurboGrafx-CD | Beetle PCE | Beetle PCE FAST | Yes | | diff --git a/USERGUIDE.md b/USERGUIDE.md index 81eada3a2..0599b0741 100644 --- a/USERGUIDE.md +++ b/USERGUIDE.md @@ -364,7 +364,8 @@ The platform name for the Commodore 64 is `c64`, so the following structure woul ~/ROMs/c64/Multidisk/Pirates/Pirates!.m3u ``` -It's highly recommended to create `.m3u` playlist files for multi-disc images as this normally automates disk swapping in the emulator. It's then this .m3u file that should be selected for launching the game. +It's highly recommended to create `.m3u` playlist files for multi-disc images as this normally automates disk swapping +in the emulator. It's then this .m3u file that should be selected for launching the game. The .m3u file simply contains a list of the game files, for example in the case of Last Ninja 2.m3u: @@ -417,9 +418,13 @@ Apart from the potential difficulty in locating the emulator binary, there are s #### Commodore Amiga -There are multiple ways to run Amiga games, but the recommended approach is to use WHDLoad. The best way is to use hard disk images in `.hdf` or `.hdz` format, meaning there will be a single file per game. This makes it just as easy to play Amiga games as any console with game ROMs. +There are multiple ways to run Amiga games, but the recommended approach is to use WHDLoad. The best way is to use hard +disk images in `.hdf` or `.hdz` format, meaning there will be a single file per game. This makes it just as easy to play +Amiga games as any console with game ROMs. -An alternative would be to use `.adf` images as not all games may be available with WHDLoad support. For this, you can either put single-disk images in the root folder or in a dedicated adf directory, or multiple-disk games in separate folders. It's highly recommended to create `.m3u` playlist files for multi-disc images as described earlier. +An alternative would be to use `.adf` images as not all games may be available with WHDLoad support. For this, you can +either put single-disk images in the root folder or in a dedicated adf directory, or multiple-disk games in separate +folders. It's highly recommended to create `.m3u` playlist files for multi-disc images as described earlier. Here's an example of what the file structure could look like: @@ -859,7 +864,8 @@ If this setting is enabled and a folder has its flag set to be excluded from the **Scrape actual folders** _(Multi-scraper only)_ -Enabling this option causes folders themselves to be included by the scraper. This is useful for DOS games or any multi-disc games where there is a folder for each individual game. +Enabling this option causes folders themselves to be included by the scraper. This is useful for DOS games or any +multi-disc games where there is a folder for each individual game. **Auto-retry on peer verification errors** _(ScreenScraper only)_ @@ -1206,7 +1212,11 @@ If this option is disabled, hidden files and folders within the ROMs directory t **Show hidden games (requires restart)** -You can mark games as hidden in the metadata editor, which is useful for instance for DOS games where you may not want to see some batch files and executables inside ES-DE, or for multi-disc games where you may only want to show the .m3u playlists and not the individual game files. By disabling this option these files will not be processed at all when ES-DE starts up. If you enable the option you will see the files, but their name entries will be almost transparent in the gamelist view to visually indicate that they are hidden. +You can mark games as hidden in the metadata editor, which is useful for instance for DOS games where you may not want +to see some batch files and executables inside ES-DE, or for multi-disc games where you may only want to show the .m3u +playlists and not the individual game files. By disabling this option these files will not be processed at all when +ES-DE starts up. If you enable the option you will see the files, but their name entries will be almost transparent in +the gamelist view to visually indicate that they are hidden. **Enable custom event scripts** @@ -1394,7 +1404,11 @@ A flag to mark whether the game is suitable for children. This will be applied a **Hidden** -A flag to indicate that the game is hidden. If the corresponding option has been set in the main menu, the game will not be shown. Useful for example for DOS games to hide batch scripts and unnecessary binaries or to hide the actual game files for multi-disc games. If a file or folder is flagged as hidden but the corresponding option to hide hidden games has not been enabled, then the opacity of the text will be lowered significantly to make it clear that it's a hidden entry. +A flag to indicate that the game is hidden. If the corresponding option has been set in the main menu, the game will not +be shown. Useful for example for DOS games to hide batch scripts and unnecessary binaries or to hide the actual game +files for multi-disc games. If a file or folder is flagged as hidden but the corresponding option to hide hidden games +has not been enabled, then the opacity of the text will be lowered significantly to make it clear that it's a hidden +entry. **Broken/not working** @@ -1402,15 +1416,27 @@ A flag to indicate whether the game is broken. Useful for MAME games for instanc **Exclude from game counter** _(files only)_ -A flag to indicate whether the game should be excluded from being counted. If this is set for a game, it will not be included in the game counter shown per system on the system view, and it will not be included in the system information field in the gamelist view. As well, it will be excluded from all automatic and custom collections. This option is quite useful for multi-file games such as multi-disc Amiga or Commodore 64 games, or for DOS games where you want to exclude setup programs and similar but still need them available in ES-DE and therefore can't hide them. Files that have this flag set will have a lower opacity in the gamelists, making them easy to spot. +A flag to indicate whether the game should be excluded from being counted. If this is set for a game, it will not be +included in the game counter shown per system on the system view, and it will not be included in the system information +field in the gamelist view. As well, it will be excluded from all automatic and custom collections. This option is quite +useful for multi-file games such as multi-disc Amiga or Commodore 64 games, or for DOS games where you want to exclude +setup programs and similar but still need them available in ES-DE and therefore can't hide them. Files that have this +flag set will have a lower opacity in the gamelists, making them easy to spot. **Exclude from multi-scraper** -Whether to exclude the file from the multi-scraper. This is quite useful in order to avoid scraping all the disks for multi-disc games for example. There is an option in the scraper settings to ignore this flag, but by default the multi-scraper will respect it. +Whether to exclude the file from the multi-scraper. This is quite useful in order to avoid scraping all the disks for +multi-disc games for example. There is an option in the scraper settings to ignore this flag, but by default the +multi-scraper will respect it. **Hide metadata fields** -This option will hide most metadata fields in the gamelist view. The intention is to be able to hide the fields for situations such as general folders (Multi-disc, Cartridges etc.) and for setup programs and similar (e.g. SETUP.EXE or INSTALL.BAT for DOS games). It could also be used on the game files for multi-disc games where perhaps only the .m3u playlist should have any metadata values. The only fields shown with this option enabled are the game name and description. Using the description it's possible to write some comments regarding the file or folder, should you want to. It's also possible to display game images and videos with this setting enabled. +This option will hide most metadata fields in the gamelist view. The intention is to be able to hide the fields for +situations such as general folders (Multi-disc, Cartridges etc.) and for setup programs and similar (e.g. SETUP.EXE or +INSTALL.BAT for DOS games). It could also be used on the game files for multi-disc games where perhaps only the .m3u +playlist should have any metadata values. The only fields shown with this option enabled are the game name and +description. Using the description it's possible to write some comments regarding the file or folder, should you want +to. It's also possible to display game images and videos with this setting enabled. **Launch command** _(files only)_ diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 9f4dbe7e1..9dbb9681e 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -10,106 +10,106 @@ project("emulationstation-de") set(ES_HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemsManager.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/EmulationStation.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/MediaViewer.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/MiximageGenerator.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreensaver.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemsManager.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/EmulationStation.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/MediaViewer.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/MiximageGenerator.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreensaver.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.h - # GUIs - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiAlternativeEmulators.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiCollectionSystemsOptions.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistFilter.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiLaunchScreen.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMediaViewerOptions.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiOfflineGenerator.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMenu.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMulti.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperSearch.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScreensaverOptions.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.h + # GUIs + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiAlternativeEmulators.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiCollectionSystemsOptions.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistFilter.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiLaunchScreen.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMediaViewerOptions.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiOfflineGenerator.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMenu.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMulti.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperSearch.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScreensaverOptions.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.h - # Scrapers - ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraper.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraperResources.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/Scraper.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/ScreenScraper.h + # Scrapers + ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraper.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraperResources.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/Scraper.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/ScreenScraper.h - # Views - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/BasicGameListView.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/DetailedGameListView.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/GridGameListView.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/IGameListView.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/ISimpleGameListView.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/VideoGameListView.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.h -) + # Views + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/BasicGameListView.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/DetailedGameListView.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/GridGameListView.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/IGameListView.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/ISimpleGameListView.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/VideoGameListView.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.h + ) set(ES_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemsManager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/MediaViewer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/MiximageGenerator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreensaver.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemsManager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/MediaViewer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/MiximageGenerator.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreensaver.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.cpp - # GUIs - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiAlternativeEmulators.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiCollectionSystemsOptions.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistFilter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiLaunchScreen.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMediaViewerOptions.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiOfflineGenerator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMenu.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMulti.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperSearch.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScreensaverOptions.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.cpp + # GUIs + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiAlternativeEmulators.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiCollectionSystemsOptions.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistFilter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiLaunchScreen.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMediaViewerOptions.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiOfflineGenerator.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMenu.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMulti.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperSearch.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScreensaverOptions.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.cpp - # Scrapers - ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraperResources.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/Scraper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/ScreenScraper.cpp + # Scrapers + ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraperResources.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/Scraper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/ScreenScraper.cpp - # Views - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/BasicGameListView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/DetailedGameListView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/GridGameListView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/IGameListView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/ISimpleGameListView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/VideoGameListView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.cpp -) + # Views + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/BasicGameListView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/DetailedGameListView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/GridGameListView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/IGameListView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/ISimpleGameListView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/VideoGameListView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.cpp + ) if(WIN32) LIST(APPEND ES_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation.rc) @@ -134,55 +134,55 @@ endif() # Setup for installation and package generation. if(WIN32) install(TARGETS EmulationStation RUNTIME DESTINATION .) - if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") install(FILES ../avcodec-58.dll - ../avfilter-7.dll - ../avformat-58.dll - ../avutil-56.dll - ../postproc-55.dll - ../swresample-3.dll - ../swscale-5.dll - ../FreeImage.dll - ../freetype.dll - ../glew32.dll - ../libcrypto-1_1-x64.dll - ../libcurl-x64.dll - ../libssl-1_1-x64.dll - ../MSVCP140.dll - ../pugixml.dll - ../SDL2.dll - ../VCOMP140.DLL - ../VCRUNTIME140.dll - ../VCRUNTIME140_1.dll - DESTINATION .) - if(VLC_PLAYER) + ../avfilter-7.dll + ../avformat-58.dll + ../avutil-56.dll + ../postproc-55.dll + ../swresample-3.dll + ../swscale-5.dll + ../FreeImage.dll + ../freetype.dll + ../glew32.dll + ../libcrypto-1_1-x64.dll + ../libcurl-x64.dll + ../libssl-1_1-x64.dll + ../MSVCP140.dll + ../pugixml.dll + ../SDL2.dll + ../VCOMP140.DLL + ../VCRUNTIME140.dll + ../VCRUNTIME140_1.dll + DESTINATION .) + if (VLC_PLAYER) install(FILES ../libvlc.dll ../libvlccore.dll DESTINATION .) - endif() - else() + endif () + else () install(FILES ../avcodec-58.dll - ../avfilter-7.dll - ../avformat-58.dll - ../avutil-56.dll - ../postproc-55.dll - ../swresample-3.dll - ../swscale-5.dll - ../FreeImage.dll - ../glew32.dll - ../libcrypto-1_1-x64.dll - ../libcurl-x64.dll - ../libfreetype.dll - ../libpugixml.dll - ../libssl-1_1-x64.dll - ../SDL2.dll - ../vcomp140.dll - DESTINATION .) - if(VLC_PLAYER) + ../avfilter-7.dll + ../avformat-58.dll + ../avutil-56.dll + ../postproc-55.dll + ../swresample-3.dll + ../swscale-5.dll + ../FreeImage.dll + ../glew32.dll + ../libcrypto-1_1-x64.dll + ../libcurl-x64.dll + ../libfreetype.dll + ../libpugixml.dll + ../libssl-1_1-x64.dll + ../SDL2.dll + ../vcomp140.dll + DESTINATION .) + if (VLC_PLAYER) install(FILES ../libvlc.dll ../libvlccore.dll DESTINATION .) - endif() - endif() - if(VLC_PLAYER) + endif () + endif () + if (VLC_PLAYER) install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins DESTINATION .) - endif() + endif () install(FILES ../LICENSE DESTINATION .) install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION .) install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION .) @@ -206,81 +206,81 @@ elseif(APPLE) # on your system (e.g. if using libSDL2-2.1.0.dylib instead of libSDL2-2.0.0.dylib). # This problem definitely needs to be resolved properly at a later date. add_custom_command(TARGET EmulationStation POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} - -change /usr/local/lib/libavcodec.58.dylib @rpath/libavcodec.58.dylib - -change /usr/local/lib/libavfilter.7.dylib @rpath/libavfilter.7.dylib - -change /usr/local/lib/libavformat.58.dylib @rpath/libavformat.58.dylib - -change /usr/local/lib/libavutil.56.dylib @rpath/libavutil.56.dylib - -change /usr/local/lib/libswresample.3.dylib @rpath/libswresample.3.dylib - -change /usr/local/lib/libswscale.5.dylib @rpath/libswscale.5.dylib - -change /usr/local/opt/freeimage/lib/libfreeimage.dylib @rpath/libfreeimage.dylib - -change /usr/local/opt/freetype/lib/libfreetype.6.dylib @rpath/libfreetype.6.dylib - -change /usr/local/opt/libpng/lib/libpng16.16.dylib @rpath/libpng16.16.dylib - -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @rpath/libSDL2-2.0.0.dylib - $) + -change /usr/local/lib/libavcodec.58.dylib @rpath/libavcodec.58.dylib + -change /usr/local/lib/libavfilter.7.dylib @rpath/libavfilter.7.dylib + -change /usr/local/lib/libavformat.58.dylib @rpath/libavformat.58.dylib + -change /usr/local/lib/libavutil.56.dylib @rpath/libavutil.56.dylib + -change /usr/local/lib/libswresample.3.dylib @rpath/libswresample.3.dylib + -change /usr/local/lib/libswscale.5.dylib @rpath/libswscale.5.dylib + -change /usr/local/opt/freeimage/lib/libfreeimage.dylib @rpath/libfreeimage.dylib + -change /usr/local/opt/freetype/lib/libfreetype.6.dylib @rpath/libfreetype.6.dylib + -change /usr/local/opt/libpng/lib/libpng16.16.dylib @rpath/libpng16.16.dylib + -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @rpath/libSDL2-2.0.0.dylib + $) set(APPLE_DYLIB_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) install(FILES ${CMAKE_SOURCE_DIR}/libavcodec.58.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libavfilter.7.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libavformat.58.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libavutil.56.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libpostproc.55.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libswresample.3.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libswscale.5.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libfdk-aac.2.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libfreeimage.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libfreetype.6.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libpng16.16.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libSDL2-2.0.0.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - if(VLC_PLAYER) + if (VLC_PLAYER) install(FILES ${CMAKE_SOURCE_DIR}/libvlc.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libvlccore.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) + PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins - DESTINATION ../MacOS) - endif() + DESTINATION ../MacOS) + endif () install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ../Resources) install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources DESTINATION ../Resources) install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION ../Resources) install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION ../Resources) -else() +else () install(TARGETS emulationstation RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) - if(CMAKE_SYSTEM_NAME MATCHES "Linux") + if (CMAKE_SYSTEM_NAME MATCHES "Linux") install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.6.gz - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) - else() + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) + else () install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.6.gz - DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6) - endif() + DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6) + endif () install(FILES ${CMAKE_SOURCE_DIR}/LICENSE - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.desktop - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.svg - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) endif() include(InstallRequiredSystemLibraries) @@ -317,13 +317,13 @@ endif() # Settings per operating system and generator type. if(APPLE) set(CPACK_GENERATOR "Bundle") - if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.14) + if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.14) set(CPACK_PACKAGE_FILE_NAME "EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}_legacy") set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}_legacy") - else() + else () set(CPACK_PACKAGE_FILE_NAME "EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}") set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}") - endif() + endif () set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE.icns") set(CPACK_DMG_DS_STORE "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_DS_Store") set(CPACK_BUNDLE_NAME "EmulationStation Desktop Edition") @@ -331,9 +331,9 @@ if(APPLE) set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_Info.plist") if(MACOS_CODESIGN_IDENTITY) set(CPACK_BUNDLE_APPLE_CERT_APP "Developer ID Application: ${MACOS_CODESIGN_IDENTITY}") - if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.13) + if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.13) set(CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER "--deep --force --options runtime") - endif() + endif () endif() elseif(WIN32) set(CPACK_GENERATOR "NSIS") @@ -354,9 +354,9 @@ elseif(WIN32) else() set(CPACK_PACKAGE_INSTALL_DIRECTORY "emulationstation_${CMAKE_PACKAGE_VERSION}") set(CPACK_PACKAGE_EXECUTABLES "emulationstation" "emulationstation") - if(LINUX_CPACK_GENERATOR STREQUAL "DEB") + if (LINUX_CPACK_GENERATOR STREQUAL "DEB") set(CPACK_GENERATOR "DEB") - endif() + endif () set(CPACK_DEBIAN_FILE_NAME "emulationstation-de-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}.deb") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Leon Styhre ") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://es-de.org") @@ -366,9 +366,9 @@ else() set(CPACK_DEBIAN_PACKAGE_DEPENDS "vlc") endif() set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) - if(LINUX_CPACK_GENERATOR STREQUAL "RPM") + if (LINUX_CPACK_GENERATOR STREQUAL "RPM") set(CPACK_GENERATOR "RPM") - endif() + endif () set(CPACK_RPM_FILE_NAME "emulationstation-de-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}.rpm") set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION}) set(CPACK_RPM_PACKAGE_LICENSE "MIT") diff --git a/es-app/src/CollectionSystemsManager.cpp b/es-app/src/CollectionSystemsManager.cpp index 282b880a2..f4b7823d4 100644 --- a/es-app/src/CollectionSystemsManager.cpp +++ b/es-app/src/CollectionSystemsManager.cpp @@ -377,21 +377,21 @@ void CollectionSystemsManager::updateCollectionSystem(FileData* file, Collection // If the countasgame flag has been set to false, then remove the game. if (curSys->isGroupedCustomCollection()) { ViewController::get() - ->getGameListView(curSys->getRootFolder()->getParent()->getSystem()) - .get() - ->remove(collectionEntry, false); - FileData* parentRootFolder = - rootFolder->getParent()->getSystem()->getRootFolder(); + ->getGameListView(curSys->getRootFolder()->getParent()->getSystem()) + .get() + ->remove(collectionEntry, false); + FileData *parentRootFolder = + rootFolder->getParent()->getSystem()->getRootFolder(); parentRootFolder->sort(parentRootFolder->getSortTypeFromString( - parentRootFolder->getSortTypeString()), + parentRootFolder->getSortTypeString()), mFavoritesSorting); - GuiInfoPopup* s = new GuiInfoPopup( - mWindow, - "DISABLED '" + + GuiInfoPopup *s = new GuiInfoPopup( + mWindow, + "DISABLED '" + Utils::String::toUpper( - Utils::String::removeParenthesis(file->getName())) + + Utils::String::removeParenthesis(file->getName())) + "' IN '" + Utils::String::toUpper(sysData.system->getName()) + "'", - 4000); + 4000); mWindow->setInfoPopup(s); } else { @@ -550,28 +550,26 @@ bool CollectionSystemsManager::isThemeCustomCollectionCompatible( return true; } -std::string CollectionSystemsManager::getValidNewCollectionName(std::string inName, int index) -{ +std::string CollectionSystemsManager::getValidNewCollectionName(std::string inName, int index) { std::string name = inName; // Trim leading and trailing whitespaces. name.erase(name.begin(), std::find_if(name.begin(), name.end(), [](char c) { - return !std::isspace(static_cast(c)); - })); + return !std::isspace(static_cast(c)); + })); name.erase(std::find_if(name.rbegin(), name.rend(), [](char c) { return !std::isspace(static_cast(c)); }) - .base(), + .base(), name.end()); if (index == 0) { size_t remove = std::string::npos; // Get valid name. while ((remove = name.find_first_not_of( - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-[]()' ")) != + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-[]()' ")) != std::string::npos) name.erase(remove, 1); - } - else { + } else { name += " (" + std::to_string(index) + ")"; } @@ -1333,8 +1331,7 @@ void CollectionSystemsManager::addEnabledCollectionsToDisplayedSystems( } } -std::vector CollectionSystemsManager::getSystemsFromConfig() -{ +std::vector CollectionSystemsManager::getSystemsFromConfig() { std::vector systems; std::vector configPaths = SystemData::getConfigPath(false); @@ -1342,7 +1339,7 @@ std::vector CollectionSystemsManager::getSystemsFromConfig() // file under ~/.emulationstation/custom_systems as we really want to include all the themes // supported by ES-DE. Otherwise a user may accidentally create a custom collection that // corresponds to a supported theme. - for (auto path : configPaths) { + for (auto path: configPaths) { if (!Utils::FileSystem::exists(path)) return systems; diff --git a/es-app/src/FileData.cpp b/es-app/src/FileData.cpp index 8b441da80..c3fdf9103 100644 --- a/es-app/src/FileData.cpp +++ b/es-app/src/FileData.cpp @@ -30,18 +30,11 @@ #include FileData::FileData(FileType type, - const std::string& path, - SystemEnvironmentData* envData, - SystemData* system) - : metadata(type == GAME ? GAME_METADATA : FOLDER_METADATA) - , mSourceFileData(nullptr) - , mParent(nullptr) - , mType(type) - , mPath(path) - , mEnvData(envData) - , mSystem(system) - , mOnlyFolders(false) - , mDeletionFlag(false) + const std::string &path, + SystemEnvironmentData *envData, + SystemData *system) + : metadata(type == GAME ? GAME_METADATA : FOLDER_METADATA), mSourceFileData(nullptr), mParent(nullptr), + mType(type), mPath(path), mEnvData(envData), mSystem(system), mOnlyFolders(false), mDeletionFlag(false) { // Metadata needs at least a name field (since that's what getName() will return). if (metadata.get("name").empty()) { @@ -742,11 +735,10 @@ FileData::SortType FileData::getSortTypeFromString(std::string desc) return FileSorts::SortTypes.at(0); } -void FileData::launchGame(Window* window) -{ +void FileData::launchGame(Window *window) { LOG(LogInfo) << "Launching game \"" << this->metadata.get("name") << "\"..."; - SystemData* gameSystem = nullptr; + SystemData *gameSystem = nullptr; std::string command = ""; std::string alternativeEmulator; @@ -1355,8 +1347,8 @@ const std::string& CollectionFileData::getName() if (mDirty) { mCollectionFileName = mSourceFileData->metadata.get("name"); mCollectionFileName.append(" [") - .append(Utils::String::toUpper(mSourceFileData->getSystem()->getName())) - .append("]"); + .append(Utils::String::toUpper(mSourceFileData->getSystem()->getName())) + .append("]"); mDirty = false; } diff --git a/es-app/src/FileFilterIndex.cpp b/es-app/src/FileFilterIndex.cpp index 75daf387f..4e464b020 100644 --- a/es-app/src/FileFilterIndex.cpp +++ b/es-app/src/FileFilterIndex.cpp @@ -20,23 +20,15 @@ #define INCLUDE_UNKNOWN false; FileFilterIndex::FileFilterIndex() - : mFilterByText(false) - , mTextRemoveSystem(false) - , mFilterByFavorites(false) - , mFilterByGenre(false) - , mFilterByPlayers(false) - , mFilterByPubDev(false) - , mFilterByRatings(false) - , mFilterByKidGame(false) - , mFilterByCompleted(false) - , mFilterByBroken(false) - , mFilterByHidden(false) + : mFilterByText(false), mTextRemoveSystem(false), mFilterByFavorites(false), mFilterByGenre(false), + mFilterByPlayers(false), mFilterByPubDev(false), mFilterByRatings(false), mFilterByKidGame(false), + mFilterByCompleted(false), mFilterByBroken(false), mFilterByHidden(false) { clearAllFilters(); // clang-format off FilterDataDecl filterDecls[] = { - //type //allKeys //filteredBy //filteredKeys //primaryKey //hasSecondaryKey //secondaryKey //menuLabel + //type //allKeys //filteredBy //filteredKeys //primaryKey //hasSecondaryKey //secondaryKey //menuLabel {FAVORITES_FILTER, &mFavoritesIndexAllKeys, &mFilterByFavorites, &mFavoritesIndexFilteredKeys, "favorite", false, "", "FAVORITES"}, {GENRE_FILTER, &mGenreIndexAllKeys, &mFilterByGenre, &mGenreIndexFilteredKeys, "genre", true, "genre", "GENRE"}, {PLAYER_FILTER, &mPlayersIndexAllKeys, &mFilterByPlayers, &mPlayersIndexFilteredKeys, "players", false, "", "PLAYERS"}, @@ -365,11 +357,10 @@ bool FileFilterIndex::showFile(FileData* game) // in [] from the search string. if (mTextFilter != "" && mTextRemoveSystem && !(Utils::String::toUpper(game->getName().substr(0, game->getName().find_last_of("["))) - .find(mTextFilter) != std::string::npos)) { + .find(mTextFilter) != std::string::npos)) { return false; - } - else if (mTextFilter != "" && - !(Utils::String::toUpper(game->getName()).find(mTextFilter) != std::string::npos)) { + } else if (mTextFilter != "" && + !(Utils::String::toUpper(game->getName()).find(mTextFilter) != std::string::npos)) { return false; } @@ -381,8 +372,7 @@ bool FileFilterIndex::showFile(FileData* game) FilterDataDecl filterData = (*it); if (filterData.primaryKey == "kidgame" && UIModeController::getInstance()->isUIModeKid()) { return (getIndexableKey(game, filterData.type, false) != "FALSE"); - } - else if (*(filterData.filteredByRef)) { + } else if (*(filterData.filteredByRef)) { // Try to find a match. std::string key = getIndexableKey(game, filterData.type, false); keepGoing = isKeyBeingFilteredBy(key, filterData.type); diff --git a/es-app/src/FileFilterIndex.h b/es-app/src/FileFilterIndex.h index 18cbf4469..3e2af831e 100644 --- a/es-app/src/FileFilterIndex.h +++ b/es-app/src/FileFilterIndex.h @@ -48,22 +48,37 @@ class FileFilterIndex public: FileFilterIndex(); ~FileFilterIndex(); - void addToIndex(FileData* game); - void removeFromIndex(FileData* game); - void setFilter(FilterIndexType type, std::vector* values); + + void addToIndex(FileData *game); + + void removeFromIndex(FileData *game); + + void setFilter(FilterIndexType type, std::vector *values); + void setTextFilter(std::string textFilter); + std::string getTextFilter() { return mTextFilter; } + void clearAllFilters(); + void debugPrintIndexes(); - bool showFile(FileData* game); + + bool showFile(FileData *game); + bool isFiltered(); + bool isKeyBeingFilteredBy(std::string key, FilterIndexType type); - std::vector& getFilterDataDecls() { return filterDataDecl; } + + std::vector &getFilterDataDecls() { return filterDataDecl; } + void setTextRemoveSystem(bool status) { mTextRemoveSystem = status; } - void importIndex(FileFilterIndex* indexToImport); + void importIndex(FileFilterIndex *indexToImport); + void resetIndex(); + void resetFilters(); + void setKidModeFilters(); private: diff --git a/es-app/src/FileSorts.cpp b/es-app/src/FileSorts.cpp index 916ecd819..196244391 100644 --- a/es-app/src/FileSorts.cpp +++ b/es-app/src/FileSorts.cpp @@ -227,8 +227,7 @@ namespace FileSorts return system1.compare(system2) < 0; } - bool compareSystemDescending(const FileData* file1, const FileData* file2) - { + bool compareSystemDescending(const FileData *file1, const FileData *file2) { std::string system1 = Utils::String::toUpper(file1->getSystemName()); std::string system2 = Utils::String::toUpper(file2->getSystemName()); return system1.compare(system2) > 0; diff --git a/es-app/src/FileSorts.h b/es-app/src/FileSorts.h index e7f84346d..950878c27 100644 --- a/es-app/src/FileSorts.h +++ b/es-app/src/FileSorts.h @@ -18,24 +18,42 @@ namespace FileSorts { bool compareName(const FileData* file1, const FileData* file2); bool compareNameDescending(const FileData* file1, const FileData* file2); - bool compareRating(const FileData* file1, const FileData* file2); - bool compareRatingDescending(const FileData* file1, const FileData* file2); - bool compareReleaseDate(const FileData* file1, const FileData* file2); - bool compareReleaseDateDescending(const FileData* file1, const FileData* file2); - bool compareDeveloper(const FileData* file1, const FileData* file2); - bool compareDeveloperDescending(const FileData* file1, const FileData* file2); - bool comparePublisher(const FileData* file1, const FileData* file2); - bool comparePublisherDescending(const FileData* file1, const FileData* file2); - bool compareGenre(const FileData* file1, const FileData* file2); - bool compareGenreDescending(const FileData* file1, const FileData* file2); - bool compareNumPlayers(const FileData* file1, const FileData* file2); - bool compareNumPlayersDescending(const FileData* file1, const FileData* file2); - bool compareLastPlayed(const FileData* file1, const FileData* file2); - bool compareLastPlayedDescending(const FileData* file1, const FileData* file2); - bool compareTimesPlayed(const FileData* file1, const FileData* fil2); - bool compareTimesPlayedDescending(const FileData* file1, const FileData* fil2); - bool compareSystem(const FileData* file1, const FileData* file2); - bool compareSystemDescending(const FileData* file1, const FileData* file2); + + bool compareRating(const FileData *file1, const FileData *file2); + + bool compareRatingDescending(const FileData *file1, const FileData *file2); + + bool compareReleaseDate(const FileData *file1, const FileData *file2); + + bool compareReleaseDateDescending(const FileData *file1, const FileData *file2); + + bool compareDeveloper(const FileData *file1, const FileData *file2); + + bool compareDeveloperDescending(const FileData *file1, const FileData *file2); + + bool comparePublisher(const FileData *file1, const FileData *file2); + + bool comparePublisherDescending(const FileData *file1, const FileData *file2); + + bool compareGenre(const FileData *file1, const FileData *file2); + + bool compareGenreDescending(const FileData *file1, const FileData *file2); + + bool compareNumPlayers(const FileData *file1, const FileData *file2); + + bool compareNumPlayersDescending(const FileData *file1, const FileData *file2); + + bool compareLastPlayed(const FileData *file1, const FileData *file2); + + bool compareLastPlayedDescending(const FileData *file1, const FileData *file2); + + bool compareTimesPlayed(const FileData *file1, const FileData *fil2); + + bool compareTimesPlayedDescending(const FileData *file1, const FileData *fil2); + + bool compareSystem(const FileData *file1, const FileData *file2); + + bool compareSystemDescending(const FileData *file1, const FileData *file2); extern const std::vector SortTypes; } // namespace FileSorts diff --git a/es-app/src/guis/GuiCollectionSystemsOptions.cpp b/es-app/src/guis/GuiCollectionSystemsOptions.cpp index 59cc0052e..cf4298c2d 100644 --- a/es-app/src/guis/GuiCollectionSystemsOptions.cpp +++ b/es-app/src/guis/GuiCollectionSystemsOptions.cpp @@ -200,12 +200,12 @@ GuiCollectionSystemsOptions::GuiCollectionSystemsOptions(Window* window, std::st glm::vec2{0.0f, Font::get(FONT_SIZE_MEDIUM)->getLetterHeight()}); row.addElement(newCollection, true); row.addElement(bracketNewCollection, false); - auto createCollectionCall = [this](const std::string& newVal) { + auto createCollectionCall = [this](const std::string &newVal) { std::string name = newVal; // We need to store the first GUI and remove it, as it'll be deleted // by the actual GUI. - Window* window = mWindow; - GuiComponent* topGui = window->peekGui(); + Window *window = mWindow; + GuiComponent *topGui = window->peekGui(); window->removeGui(topGui); createCustomCollection(name); }; @@ -213,11 +213,10 @@ GuiCollectionSystemsOptions::GuiCollectionSystemsOptions(Window* window, std::st if (Settings::getInstance()->getBool("VirtualKeyboard")) { row.makeAcceptInputHandler([this, createCollectionCall] { mWindow->pushGui(new GuiTextEditKeyboardPopup( - mWindow, getHelpStyle(), "New Collection Name", "", createCollectionCall, false, - "CREATE", "CREATE COLLECTION?")); + mWindow, getHelpStyle(), "New Collection Name", "", createCollectionCall, false, + "CREATE", "CREATE COLLECTION?")); }); - } - else { + } else { row.makeAcceptInputHandler([this, createCollectionCall] { mWindow->pushGui(new GuiTextEditPopup(mWindow, getHelpStyle(), "New Collection Name", "", createCollectionCall, false, "CREATE", @@ -229,11 +228,11 @@ GuiCollectionSystemsOptions::GuiCollectionSystemsOptions(Window* window, std::st // Delete custom collection. row.elements.clear(); auto deleteCollection = std::make_shared( - mWindow, "DELETE CUSTOM COLLECTION", Font::get(FONT_SIZE_MEDIUM), 0x777777FF); + mWindow, "DELETE CUSTOM COLLECTION", Font::get(FONT_SIZE_MEDIUM), 0x777777FF); auto bracketDeleteCollection = std::make_shared(mWindow); bracketDeleteCollection->setImage(":/graphics/arrow.svg"); bracketDeleteCollection->setResize( - glm::vec2{0.0f, Font::get(FONT_SIZE_MEDIUM)->getLetterHeight()}); + glm::vec2{0.0f, Font::get(FONT_SIZE_MEDIUM)->getLetterHeight()}); row.addElement(deleteCollection, true); row.addElement(bracketDeleteCollection, false); row.makeAcceptInputHandler([this, customSystems] { diff --git a/es-app/src/guis/GuiGameScraper.cpp b/es-app/src/guis/GuiGameScraper.cpp index 9ddc85caa..3f65554fa 100644 --- a/es-app/src/guis/GuiGameScraper.cpp +++ b/es-app/src/guis/GuiGameScraper.cpp @@ -18,14 +18,11 @@ #include "components/TextComponent.h" #include "views/ViewController.h" -GuiGameScraper::GuiGameScraper(Window* window, +GuiGameScraper::GuiGameScraper(Window *window, ScraperSearchParams params, - std::function doneFunc) - : GuiComponent(window) - , mClose(false) - , mGrid(window, glm::ivec2{1, 7}) - , mBox(window, ":/graphics/frame.svg") - , mSearchParams(params) + std::function doneFunc) + : GuiComponent(window), mClose(false), mGrid(window, glm::ivec2{1, 7}), mBox(window, ":/graphics/frame.svg"), + mSearchParams(params) { addChild(&mBox); addChild(&mGrid); diff --git a/es-app/src/guis/GuiGamelistFilter.cpp b/es-app/src/guis/GuiGamelistFilter.cpp index 679e785cb..8330b4424 100644 --- a/es-app/src/guis/GuiGamelistFilter.cpp +++ b/es-app/src/guis/GuiGamelistFilter.cpp @@ -29,8 +29,7 @@ GuiGamelistFilter::GuiGamelistFilter(Window* window, initializeMenu(); } -void GuiGamelistFilter::initializeMenu() -{ +void GuiGamelistFilter::initializeMenu() { addChild(&mMenu); // Get filters from system. @@ -94,13 +93,12 @@ void GuiGamelistFilter::resetAllFilters() GuiGamelistFilter::~GuiGamelistFilter() { mFilterOptions.clear(); } -void GuiGamelistFilter::addFiltersToMenu() -{ +void GuiGamelistFilter::addFiltersToMenu() { ComponentListRow row; auto lbl = std::make_shared( - mWindow, Utils::String::toUpper(ViewController::KEYBOARD_CHAR + " GAME NAME"), - Font::get(FONT_SIZE_MEDIUM), 0x777777FF); + mWindow, Utils::String::toUpper(ViewController::KEYBOARD_CHAR + " GAME NAME"), + Font::get(FONT_SIZE_MEDIUM), 0x777777FF); mTextFilterField = std::make_shared(mWindow, "", Font::get(FONT_SIZE_MEDIUM), 0x777777FF, ALIGN_RIGHT); @@ -123,7 +121,7 @@ void GuiGamelistFilter::addFiltersToMenu() } // Callback function. - auto updateVal = [this](const std::string& newVal) { + auto updateVal = [this](const std::string &newVal) { mTextFilterField->setValue(Utils::String::toUpper(newVal)); mFilterIndex->setTextFilter(Utils::String::toUpper(newVal)); }; @@ -134,8 +132,7 @@ void GuiGamelistFilter::addFiltersToMenu() mTextFilterField->getValue(), updateVal, false, "OK", "APPLY CHANGES?")); }); - } - else { + } else { row.makeAcceptInputHandler([this, updateVal] { mWindow->pushGui(new GuiTextEditPopup(mWindow, getHelpStyle(), "GAME NAME", mTextFilterField->getValue(), updateVal, false, diff --git a/es-app/src/guis/GuiGamelistOptions.cpp b/es-app/src/guis/GuiGamelistOptions.cpp index b7cbbd1cb..c63e38da0 100644 --- a/es-app/src/guis/GuiGamelistOptions.cpp +++ b/es-app/src/guis/GuiGamelistOptions.cpp @@ -25,15 +25,9 @@ #include "views/ViewController.h" #include "views/gamelist/IGameListView.h" -GuiGamelistOptions::GuiGamelistOptions(Window* window, SystemData* system) - : GuiComponent(window) - , mMenu(window, "OPTIONS") - , mSystem(system) - , mFiltersChanged(false) - , mCancelled(false) - , mIsCustomCollection(false) - , mIsCustomCollectionGroup(false) - , mCustomCollectionSystem(nullptr) +GuiGamelistOptions::GuiGamelistOptions(Window *window, SystemData *system) + : GuiComponent(window), mMenu(window, "OPTIONS"), mSystem(system), mFiltersChanged(false), mCancelled(false), + mIsCustomCollection(false), mIsCustomCollectionGroup(false), mCustomCollectionSystem(nullptr) { addChild(&mMenu); diff --git a/es-app/src/guis/GuiLaunchScreen.cpp b/es-app/src/guis/GuiLaunchScreen.cpp index bffcefb71..ce347b85f 100644 --- a/es-app/src/guis/GuiLaunchScreen.cpp +++ b/es-app/src/guis/GuiLaunchScreen.cpp @@ -14,12 +14,9 @@ #include "components/TextComponent.h" #include "utils/StringUtil.h" -GuiLaunchScreen::GuiLaunchScreen(Window* window) - : GuiComponent(window) - , mWindow(window) - , mBackground(window, ":/graphics/frame.svg") - , mGrid(nullptr) - , mMarquee(nullptr) +GuiLaunchScreen::GuiLaunchScreen(Window *window) + : GuiComponent(window), mWindow(window), mBackground(window, ":/graphics/frame.svg"), mGrid(nullptr), + mMarquee(nullptr) { addChild(&mBackground); mWindow->setLaunchScreen(this); @@ -220,8 +217,7 @@ void GuiLaunchScreen::update(int deltaTime) mScaleUp = glm::clamp(mScaleUp + 0.07f, 0.0f, 1.0f); } -void GuiLaunchScreen::render(const glm::mat4& /*parentTrans*/) -{ +void GuiLaunchScreen::render(const glm::mat4 & /*parentTrans*/) { // Scale up animation. if (mScaleUp < 1.0f) setScale(mScaleUp); diff --git a/es-app/src/guis/GuiLaunchScreen.h b/es-app/src/guis/GuiLaunchScreen.h index c40d3c220..352bfa711 100644 --- a/es-app/src/guis/GuiLaunchScreen.h +++ b/es-app/src/guis/GuiLaunchScreen.h @@ -21,21 +21,24 @@ class FileData; class GuiLaunchScreen : public Window::GuiLaunchScreen, GuiComponent { public: - GuiLaunchScreen(Window* window); + GuiLaunchScreen(Window *window); + virtual ~GuiLaunchScreen(); - virtual void displayLaunchScreen(FileData* game) override; + virtual void displayLaunchScreen(FileData *game) override; + virtual void closeLaunchScreen() override; void onSizeChanged() override; virtual void update(int deltaTime) override; - virtual void render(const glm::mat4& parentTrans) override; + + virtual void render(const glm::mat4 &parentTrans) override; private: - Window* mWindow; + Window *mWindow; NinePatchComponent mBackground; - ComponentGrid* mGrid; + ComponentGrid *mGrid; std::shared_ptr mTitle; std::shared_ptr mGameName; diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index 63090620b..23b17a8eb 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -36,10 +36,8 @@ #include #include -GuiMenu::GuiMenu(Window* window) - : GuiComponent(window) - , mMenu(window, "MAIN MENU") - , mVersion(window) +GuiMenu::GuiMenu(Window *window) + : GuiComponent(window), mMenu(window, "MAIN MENU"), mVersion(window) { bool isFullUI = UIModeController::getInstance()->isUIModeFull(); @@ -824,17 +822,16 @@ void GuiMenu::openOtherOptions() multiLineMediaDir] { if (Settings::getInstance()->getBool("VirtualKeyboard")) { mWindow->pushGui(new GuiTextEditKeyboardPopup( - mWindow, getHelpStyle(), titleMediaDir, - Settings::getInstance()->getString("MediaDirectory"), updateValMediaDir, - multiLineMediaDir, "SAVE", "SAVE CHANGES?", mediaDirectoryStaticText, - defaultDirectoryText, "load default directory")); - } - else { + mWindow, getHelpStyle(), titleMediaDir, + Settings::getInstance()->getString("MediaDirectory"), updateValMediaDir, + multiLineMediaDir, "SAVE", "SAVE CHANGES?", mediaDirectoryStaticText, + defaultDirectoryText, "load default directory")); + } else { mWindow->pushGui(new GuiTextEditPopup( - mWindow, getHelpStyle(), titleMediaDir, - Settings::getInstance()->getString("MediaDirectory"), updateValMediaDir, - multiLineMediaDir, "SAVE", "SAVE CHANGES?", mediaDirectoryStaticText, - defaultDirectoryText, "load default directory")); + mWindow, getHelpStyle(), titleMediaDir, + Settings::getInstance()->getString("MediaDirectory"), updateValMediaDir, + multiLineMediaDir, "SAVE", "SAVE CHANGES?", mediaDirectoryStaticText, + defaultDirectoryText, "load default directory")); } }); s->addRow(rowMediaDir); diff --git a/es-app/src/guis/GuiMetaDataEd.cpp b/es-app/src/guis/GuiMetaDataEd.cpp index 1c73698ab..2aa7a5213 100644 --- a/es-app/src/guis/GuiMetaDataEd.cpp +++ b/es-app/src/guis/GuiMetaDataEd.cpp @@ -31,25 +31,18 @@ #include "utils/StringUtil.h" #include "views/ViewController.h" -GuiMetaDataEd::GuiMetaDataEd(Window* window, - MetaDataList* md, - const std::vector& mdd, +GuiMetaDataEd::GuiMetaDataEd(Window *window, + MetaDataList *md, + const std::vector &mdd, ScraperSearchParams scraperParams, - const std::string& /*header*/, + const std::string & /*header*/, std::function saveCallback, std::function clearGameFunc, std::function deleteGameFunc) - : GuiComponent(window) - , mBackground(window, ":/graphics/frame.svg") - , mGrid(window, glm::ivec2{1, 3}) - , mScraperParams(scraperParams) - , mMetaDataDecl(mdd) - , mMetaData(md) - , mSavedCallback(saveCallback) - , mClearGameFunc(clearGameFunc) - , mDeleteGameFunc(deleteGameFunc) - , mMediaFilesUpdated(false) - , mInvalidEmulatorEntry(false) + : GuiComponent(window), mBackground(window, ":/graphics/frame.svg"), mGrid(window, glm::ivec2{1, 3}), + mScraperParams(scraperParams), mMetaDataDecl(mdd), mMetaData(md), mSavedCallback(saveCallback), + mClearGameFunc(clearGameFunc), mDeleteGameFunc(deleteGameFunc), mMediaFilesUpdated(false), + mInvalidEmulatorEntry(false) { addChild(&mBackground); addChild(&mGrid); @@ -218,11 +211,11 @@ GuiMetaDataEd::GuiMetaDataEd(Window* window, if (mInvalidEmulatorEntry || scraperParams.system->getSystemEnvData()->mLaunchCommands.size() > 1) { row.makeAcceptInputHandler([this, title, scraperParams, ed, updateVal, - originalValue] { - GuiSettings* s = nullptr; + originalValue] { + GuiSettings *s = nullptr; bool singleEntry = - scraperParams.system->getSystemEnvData()->mLaunchCommands.size() == 1; + scraperParams.system->getSystemEnvData()->mLaunchCommands.size() == 1; if (mInvalidEmulatorEntry && singleEntry) s = new GuiSettings(mWindow, "CLEAR INVALID ENTRY"); @@ -233,16 +226,16 @@ GuiMetaDataEd::GuiMetaDataEd(Window* window, return; std::vector> launchCommands = - scraperParams.system->getSystemEnvData()->mLaunchCommands; + scraperParams.system->getSystemEnvData()->mLaunchCommands; if (ed->getValue() != "" && mInvalidEmulatorEntry && singleEntry) launchCommands.push_back(std::make_pair( - "", ViewController::EXCLAMATION_CHAR + " " + originalValue)); + "", ViewController::EXCLAMATION_CHAR + " " + originalValue)); else if (ed->getValue() != "") launchCommands.push_back(std::make_pair( - "", ViewController::CROSSEDCIRCLE_CHAR + " CLEAR ENTRY")); + "", ViewController::CROSSEDCIRCLE_CHAR + " CLEAR ENTRY")); - for (auto entry : launchCommands) { + for (auto entry: launchCommands) { std::string selectedLabel = ed->getValue(); std::string label; ComponentListRow row; @@ -363,8 +356,7 @@ GuiMetaDataEd::GuiMetaDataEd(Window* window, ed->setColor(DEFAULT_TEXTCOLOR); else ed->setColor(TEXTCOLOR_USERMARKED); - } - else { + } else { ed->setValue(newVal); if (newVal == originalValue) ed->setColor(DEFAULT_TEXTCOLOR); @@ -376,11 +368,10 @@ GuiMetaDataEd::GuiMetaDataEd(Window* window, if (Settings::getInstance()->getBool("VirtualKeyboard")) { row.makeAcceptInputHandler([this, title, ed, updateVal, multiLine] { mWindow->pushGui(new GuiTextEditKeyboardPopup( - mWindow, getHelpStyle(), title, ed->getValue(), updateVal, multiLine, - "apply", "APPLY CHANGES?", "", "")); + mWindow, getHelpStyle(), title, ed->getValue(), updateVal, multiLine, + "apply", "APPLY CHANGES?", "", "")); }); - } - else { + } else { row.makeAcceptInputHandler([this, title, ed, updateVal, multiLine] { mWindow->pushGui(new GuiTextEditPopup(mWindow, getHelpStyle(), title, ed->getValue(), updateVal, multiLine, diff --git a/es-app/src/guis/GuiOfflineGenerator.cpp b/es-app/src/guis/GuiOfflineGenerator.cpp index d88e67932..2f214f987 100644 --- a/es-app/src/guis/GuiOfflineGenerator.cpp +++ b/es-app/src/guis/GuiOfflineGenerator.cpp @@ -13,11 +13,9 @@ #include "components/MenuComponent.h" #include "views/ViewController.h" -GuiOfflineGenerator::GuiOfflineGenerator(Window* window, const std::queue& gameQueue) - : GuiComponent(window) - , mGameQueue(gameQueue) - , mBackground(window, ":/graphics/frame.svg") - , mGrid(window, glm::ivec2{6, 13}) +GuiOfflineGenerator::GuiOfflineGenerator(Window *window, const std::queue &gameQueue) + : GuiComponent(window), mGameQueue(gameQueue), mBackground(window, ":/graphics/frame.svg"), + mGrid(window, glm::ivec2{6, 13}) { addChild(&mBackground); addChild(&mGrid); diff --git a/es-app/src/guis/GuiScraperMulti.cpp b/es-app/src/guis/GuiScraperMulti.cpp index 067352199..6f7ec1923 100644 --- a/es-app/src/guis/GuiScraperMulti.cpp +++ b/es-app/src/guis/GuiScraperMulti.cpp @@ -86,19 +86,19 @@ GuiScraperMulti::GuiScraperMulti(Window* window, // Previously refined. if (mSearchComp->getRefinedSearch()) allowRefine = true; - // Interactive mode and "Auto-accept single game matches" not enabled. + // Interactive mode and "Auto-accept single game matches" not enabled. else if (mSearchComp->getSearchType() != GuiScraperSearch::ACCEPT_SINGLE_MATCHES) allowRefine = true; - // Interactive mode with "Auto-accept single game matches" enabled and more - // than one result. + // Interactive mode with "Auto-accept single game matches" enabled and more + // than one result. else if (mSearchComp->getSearchType() == - GuiScraperSearch::ACCEPT_SINGLE_MATCHES && + GuiScraperSearch::ACCEPT_SINGLE_MATCHES && mSearchComp->getScraperResultsSize() > 1) allowRefine = true; - // Dito but there were no games found, or the search has not been completed. + // Dito but there were no games found, or the search has not been completed. else if (mSearchComp->getSearchType() == - GuiScraperSearch::ACCEPT_SINGLE_MATCHES && + GuiScraperSearch::ACCEPT_SINGLE_MATCHES && !mSearchComp->getFoundGame()) allowRefine = true; diff --git a/es-app/src/guis/GuiScraperSearch.cpp b/es-app/src/guis/GuiScraperSearch.cpp index d749c1302..1f5b9a1c9 100644 --- a/es-app/src/guis/GuiScraperSearch.cpp +++ b/es-app/src/guis/GuiScraperSearch.cpp @@ -37,15 +37,9 @@ #define FAILED_VERIFICATION_RETRIES 8 -GuiScraperSearch::GuiScraperSearch(Window* window, SearchType type, unsigned int scrapeCount) - : GuiComponent(window) - , mGrid(window, glm::ivec2{4, 3}) - , mSearchType(type) - , mScrapeCount(scrapeCount) - , mRefinedSearch(false) - , mFoundGame(false) - , mScrapeRatings(false) - , mBusyAnim(window) +GuiScraperSearch::GuiScraperSearch(Window *window, SearchType type, unsigned int scrapeCount) + : GuiComponent(window), mGrid(window, glm::ivec2{4, 3}), mSearchType(type), mScrapeCount(scrapeCount), + mRefinedSearch(false), mFoundGame(false), mScrapeRatings(false), mBusyAnim(window) { addChild(&mGrid); @@ -473,14 +467,14 @@ void GuiScraperSearch::updateInfoPane() i = 0; if (i != -1 && static_cast(mScraperResults.size()) > i) { - ScraperSearchResult& res = mScraperResults.at(i); + ScraperSearchResult &res = mScraperResults.at(i); mResultName->setText(Utils::String::toUpper(res.mdl.get("name"))); mResultDesc->setText(Utils::String::toUpper(res.mdl.get("desc"))); mDescContainer->reset(); mResultThumbnail->setImage(""); - const std::string& thumb = res.screenshotUrl.empty() ? res.coverUrl : res.screenshotUrl; + const std::string &thumb = res.screenshotUrl.empty() ? res.coverUrl : res.screenshotUrl; mScraperResults[i].thumbnailImageUrl = thumb; // Cache the thumbnail image in mScraperResults so that we don't need to download @@ -553,13 +547,13 @@ bool GuiScraperSearch::input(InputConfig* config, Input input) // Previously refined. if (mRefinedSearch) allowRefine = true; - // Interactive mode and "Auto-accept single game matches" not enabled. + // Interactive mode and "Auto-accept single game matches" not enabled. else if (mSearchType != ACCEPT_SINGLE_MATCHES) allowRefine = true; - // Interactive mode with "Auto-accept single game matches" enabled and more than one result. + // Interactive mode with "Auto-accept single game matches" enabled and more than one result. else if (mSearchType == ACCEPT_SINGLE_MATCHES && mScraperResults.size() > 1) allowRefine = true; - // Dito but there were no games found, or the search has not been completed. + // Dito but there were no games found, or the search has not been completed. else if (mSearchType == ACCEPT_SINGLE_MATCHES && !mFoundGame) allowRefine = true; @@ -790,16 +784,15 @@ void GuiScraperSearch::updateThumbnail() } } -void GuiScraperSearch::openInputScreen(ScraperSearchParams& params) -{ +void GuiScraperSearch::openInputScreen(ScraperSearchParams ¶ms) { auto searchForFunc = [&](std::string name) { // Trim leading and trailing whitespaces. name.erase(name.begin(), std::find_if(name.begin(), name.end(), [](char c) { - return !std::isspace(static_cast(c)); - })); + return !std::isspace(static_cast(c)); + })); name.erase(std::find_if(name.rbegin(), name.rend(), [](char c) { return !std::isspace(static_cast(c)); }) - .base(), + .base(), name.end()); stop(); @@ -817,8 +810,7 @@ void GuiScraperSearch::openInputScreen(ScraperSearchParams& params) // regardless of whether the entry is an arcade game and TheGamesDB is used. if (Settings::getInstance()->getBool("ScraperSearchMetadataName")) { searchString = Utils::String::removeParenthesis(params.game->metadata.get("name")); - } - else { + } else { // If searching based on the actual file name, then expand to the full game name // in case the scraper is set to TheGamesDB and it's an arcade game. This is // required as TheGamesDB does not support searches using the short MAME names. @@ -828,8 +820,7 @@ void GuiScraperSearch::openInputScreen(ScraperSearchParams& params) else searchString = params.game->getCleanName(); } - } - else { + } else { searchString = params.nameOverride; } @@ -837,8 +828,7 @@ void GuiScraperSearch::openInputScreen(ScraperSearchParams& params) mWindow->pushGui(new GuiTextEditKeyboardPopup(mWindow, getHelpStyle(), "REFINE SEARCH", searchString, searchForFunc, false, "SEARCH", "SEARCH USING REFINED NAME?")); - } - else { + } else { mWindow->pushGui(new GuiTextEditPopup(mWindow, getHelpStyle(), "REFINE SEARCH", searchString, searchForFunc, false, "SEARCH", "SEARCH USING REFINED NAME?")); @@ -928,8 +918,7 @@ bool GuiScraperSearch::saveMetadata(const ScraperSearchResult& result, return metadataUpdated; } -std::vector GuiScraperSearch::getHelpPrompts() -{ +std::vector GuiScraperSearch::getHelpPrompts() { std::vector prompts; prompts.push_back(HelpPrompt("y", "refine search")); diff --git a/es-app/src/guis/GuiScraperSearch.h b/es-app/src/guis/GuiScraperSearch.h index 449124ba0..0cf1dfd3b 100644 --- a/es-app/src/guis/GuiScraperSearch.h +++ b/es-app/src/guis/GuiScraperSearch.h @@ -63,39 +63,51 @@ public: { mAcceptCallback = acceptCallback; } - void setSkipCallback(const std::function& skipCallback) - { + + void setSkipCallback(const std::function &skipCallback) { mSkipCallback = skipCallback; } - void setCancelCallback(const std::function& cancelCallback) - { + + void setCancelCallback(const std::function &cancelCallback) { mCancelCallback = cancelCallback; } - bool input(InputConfig* config, Input input) override; + bool input(InputConfig *config, Input input) override; + void update(int deltaTime) override; - void render(const glm::mat4& parentTrans) override; + + void render(const glm::mat4 &parentTrans) override; + std::vector getHelpPrompts() override; + HelpStyle getHelpStyle() override; + void onSizeChanged() override; - void decreaseScrapeCount() - { + void decreaseScrapeCount() { if (mScrapeCount > 0) mScrapeCount--; } + void unsetRefinedSearch() { mRefinedSearch = false; } + bool getRefinedSearch() { return mRefinedSearch; } + bool getFoundGame() { return mFoundGame; } - const std::string& getNameOverride() { return mLastSearch.nameOverride; } + + const std::string &getNameOverride() { return mLastSearch.nameOverride; } void onFocusGained() override { mGrid.onFocusGained(); } + void onFocusLost() override { mGrid.onFocusLost(); } private: void updateViewStyle(); + void updateThumbnail(); + void updateInfoPane(); + void resizeMetadata(); void onSearchError(const std::string& error, diff --git a/es-app/src/guis/GuiSettings.cpp b/es-app/src/guis/GuiSettings.cpp index 6cd181dc8..cbfbd2197 100644 --- a/es-app/src/guis/GuiSettings.cpp +++ b/es-app/src/guis/GuiSettings.cpp @@ -21,21 +21,11 @@ #include "views/ViewController.h" #include "views/gamelist/IGameListView.h" -GuiSettings::GuiSettings(Window* window, std::string title) - : GuiComponent(window) - , mMenu(window, title) - , mGoToSystem(nullptr) - , mNeedsSaving(false) - , mNeedsReloadHelpPrompts(false) - , mNeedsCollectionsUpdate(false) - , mNeedsSorting(false) - , mNeedsSortingCollections(false) - , mNeedsResetFilters(false) - , mNeedsReloading(false) - , mNeedsGoToStart(false) - , mNeedsGoToSystem(false) - , mNeedsGoToGroupedCollections(false) - , mInvalidateCachedBackground(false) +GuiSettings::GuiSettings(Window *window, std::string title) + : GuiComponent(window), mMenu(window, title), mGoToSystem(nullptr), mNeedsSaving(false), + mNeedsReloadHelpPrompts(false), mNeedsCollectionsUpdate(false), mNeedsSorting(false), + mNeedsSortingCollections(false), mNeedsResetFilters(false), mNeedsReloading(false), mNeedsGoToStart(false), + mNeedsGoToSystem(false), mNeedsGoToGroupedCollections(false), mInvalidateCachedBackground(false) { addChild(&mMenu); mMenu.addButton("BACK", "back", [this] { delete this; }); @@ -184,12 +174,10 @@ void GuiSettings::addEditableTextComponent(const std::string label, else if (isPassword && newVal == "") { ed->setValue(""); ed->setHiddenValue(""); - } - else if (isPassword) { + } else if (isPassword) { ed->setValue("********"); ed->setHiddenValue(newVal); - } - else { + } else { ed->setValue(newVal); } }; @@ -199,14 +187,13 @@ void GuiSettings::addEditableTextComponent(const std::string label, // Never display the value if it's a password, instead set it to blank. if (isPassword) mWindow->pushGui(new GuiTextEditKeyboardPopup( - mWindow, getHelpStyle(), label, "", updateVal, false, "SAVE", "SAVE CHANGES?")); + mWindow, getHelpStyle(), label, "", updateVal, false, "SAVE", "SAVE CHANGES?")); else mWindow->pushGui(new GuiTextEditKeyboardPopup(mWindow, getHelpStyle(), label, ed->getValue(), updateVal, false, "SAVE", "SAVE CHANGES?")); }); - } - else { + } else { row.makeAcceptInputHandler([this, label, ed, updateVal, isPassword] { if (isPassword) mWindow->pushGui(new GuiTextEditPopup(mWindow, getHelpStyle(), label, "", updateVal, diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index 4c015d38c..87dedbac7 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -147,8 +147,7 @@ void thegamesdb_generate_json_scraper_requests( // using this regardless of whether the entry is an arcade game. if (Settings::getInstance()->getBool("ScraperSearchMetadataName")) { cleanName = Utils::String::removeParenthesis(params.game->metadata.get("name")); - } - else { + } else { // If not searching based on the metadata name, then check whether it's an // arcade game and if so expand to the full game name. This is required as // TheGamesDB has issues with searching using the short MAME names. @@ -165,10 +164,10 @@ void thegamesdb_generate_json_scraper_requests( return !std::isspace(static_cast(c)); })); cleanName.erase( - std::find_if(cleanName.rbegin(), cleanName.rend(), - [](char c) { return !std::isspace(static_cast(c)); }) - .base(), - cleanName.end()); + std::find_if(cleanName.rbegin(), cleanName.rend(), + [](char c) { return !std::isspace(static_cast(c)); }) + .base(), + cleanName.end()); path += "/Games/ByGameName?" + apiKey + "&fields=players,publishers,genres,overview,last_updated,rating," @@ -457,7 +456,7 @@ void TheGamesDBJSONRequest::process(const std::unique_ptr& req, if (doc.HasMember("remaining_monthly_allowance") && doc.HasMember("extra_allowance")) { for (size_t i = 0; i < results.size(); i++) { results[i].scraperRequestAllowance = - doc["remaining_monthly_allowance"].GetInt() + doc["extra_allowance"].GetInt(); + doc["remaining_monthly_allowance"].GetInt() + doc["extra_allowance"].GetInt(); } LOG(LogDebug) << "TheGamesDBJSONRequest::process(): " "Remaining monthly scraping allowance: " diff --git a/es-app/src/views/gamelist/DetailedGameListView.cpp b/es-app/src/views/gamelist/DetailedGameListView.cpp index 5ca9befec..f2aac8148 100644 --- a/es-app/src/views/gamelist/DetailedGameListView.cpp +++ b/es-app/src/views/gamelist/DetailedGameListView.cpp @@ -17,32 +17,12 @@ #define FADE_IN_TIME 650 DetailedGameListView::DetailedGameListView(Window* window, FileData* root) - : BasicGameListView(window, root) - , mThumbnail(window) - , mMarquee(window) - , mImage(window) - , mLblRating(window) - , mLblReleaseDate(window) - , mLblDeveloper(window) - , mLblPublisher(window) - , mLblGenre(window) - , mLblPlayers(window) - , mLblLastPlayed(window) - , mLblPlayCount(window) - , mBadges(window) - , mRating(window) - , mReleaseDate(window) - , mDeveloper(window) - , mPublisher(window) - , mGenre(window) - , mPlayers(window) - , mLastPlayed(window) - , mPlayCount(window) - , mName(window) - , mDescContainer(window) - , mDescription(window) - , mGamelistInfo(window) - , mLastUpdated(nullptr) + : BasicGameListView(window, root), mThumbnail(window), mMarquee(window), mImage(window), mLblRating(window), + mLblReleaseDate(window), mLblDeveloper(window), mLblPublisher(window), mLblGenre(window), mLblPlayers(window), + mLblLastPlayed(window), mLblPlayCount(window), mBadges(window), mRating(window), mReleaseDate(window), + mDeveloper(window), + mPublisher(window), mGenre(window), mPlayers(window), mLastPlayed(window), mPlayCount(window), mName(window), + mDescContainer(window), mDescription(window), mGamelistInfo(window), mLastUpdated(nullptr) { const float padding = 0.01f; diff --git a/es-app/src/views/gamelist/GridGameListView.cpp b/es-app/src/views/gamelist/GridGameListView.cpp index 4f9491f8a..319029bce 100644 --- a/es-app/src/views/gamelist/GridGameListView.cpp +++ b/es-app/src/views/gamelist/GridGameListView.cpp @@ -20,31 +20,12 @@ #define FADE_IN_TIME 650 GridGameListView::GridGameListView(Window* window, FileData* root) - : ISimpleGameListView(window, root) - , mGrid(window) - , mMarquee(window) - , mImage(window) - , mLblRating(window) - , mLblReleaseDate(window) - , mLblDeveloper(window) - , mLblPublisher(window) - , mLblGenre(window) - , mLblPlayers(window) - , mLblLastPlayed(window) - , mLblPlayCount(window) - , mBadges(window) - , mRating(window) - , mReleaseDate(window) - , mDeveloper(window) - , mPublisher(window) - , mGenre(window) - , mPlayers(window) - , mLastPlayed(window) - , mPlayCount(window) - , mName(window) - , mDescContainer(window) - , mDescription(window) - , mGamelistInfo(window) + : ISimpleGameListView(window, root), mGrid(window), mMarquee(window), mImage(window), mLblRating(window), + mLblReleaseDate(window), mLblDeveloper(window), mLblPublisher(window), mLblGenre(window), mLblPlayers(window), + mLblLastPlayed(window), mLblPlayCount(window), mBadges(window), mRating(window), mReleaseDate(window), + mDeveloper(window), + mPublisher(window), mGenre(window), mPlayers(window), mLastPlayed(window), mPlayCount(window), mName(window), + mDescContainer(window), mDescription(window), mGamelistInfo(window) { const float padding = 0.01f; diff --git a/es-core/src/GuiComponent.cpp b/es-core/src/GuiComponent.cpp index 5075fc311..5790a3cb0 100644 --- a/es-core/src/GuiComponent.cpp +++ b/es-core/src/GuiComponent.cpp @@ -16,22 +16,11 @@ #include -GuiComponent::GuiComponent(Window* window) - : mWindow(window) - , mParent(nullptr) - , mOpacity(255) - , mColor(0) - , mSaturation(1.0f) - , mColorShift(0) - , mColorShiftEnd(0) - , mPosition({}) - , mOrigin({}) - , mRotationOrigin(0.5f, 0.5f) - , mSize({}) - , mIsProcessing(false) - , mVisible(true) - , mEnabled(true) - , mTransform(Renderer::getIdentity()) +GuiComponent::GuiComponent(Window *window) + : mWindow(window), mParent(nullptr), mOpacity(255), mColor(0), mSaturation(1.0f), mColorShift(0), + mColorShiftEnd(0), + mPosition({}), mOrigin({}), mRotationOrigin(0.5f, 0.5f), mSize({}), mIsProcessing(false), mVisible(true), + mEnabled(true), mTransform(Renderer::getIdentity()) { for (unsigned char i = 0; i < MAX_ANIMATIONS; i++) mAnimationMap[i] = nullptr; diff --git a/es-core/src/GuiComponent.h b/es-core/src/GuiComponent.h index 322efab40..386b78ef0 100644 --- a/es-core/src/GuiComponent.h +++ b/es-core/src/GuiComponent.h @@ -230,14 +230,15 @@ public: const static unsigned char MAX_ANIMATIONS = 4; protected: - void renderChildren(const glm::mat4& transform) const; + void renderChildren(const glm::mat4 &transform) const; + void updateSelf(int deltaTime); // Updates animations. void updateChildren(int deltaTime); // Updates animations. - Window* mWindow; + Window *mWindow; - GuiComponent* mParent; - std::vector mChildren; + GuiComponent *mParent; + std::vector mChildren; unsigned char mOpacity; unsigned int mColor; diff --git a/es-core/src/HttpReq.h b/es-core/src/HttpReq.h index d0b9f38ee..78feb529a 100644 --- a/es-core/src/HttpReq.h +++ b/es-core/src/HttpReq.h @@ -80,7 +80,7 @@ private: static CURLM* s_multi_handle; Status mStatus; - CURL* mHandle; + CURL *mHandle; std::stringstream mContent; std::string mErrorMsg; diff --git a/es-core/src/components/ButtonComponent.cpp b/es-core/src/components/ButtonComponent.cpp index 3143f52a9..94734a0b7 100644 --- a/es-core/src/components/ButtonComponent.cpp +++ b/es-core/src/components/ButtonComponent.cpp @@ -12,25 +12,15 @@ #include "resources/Font.h" #include "utils/StringUtil.h" -ButtonComponent::ButtonComponent(Window* window, - const std::string& text, - const std::string& helpText, - const std::function& func, +ButtonComponent::ButtonComponent(Window *window, + const std::string &text, + const std::string &helpText, + const std::function &func, bool upperCase, bool flatStyle) - : GuiComponent{window} - , mBox{window, ":/graphics/button.svg"} - , mFont{Font::get(FONT_SIZE_MEDIUM)} - , mPadding{{}} - , mFocused{false} - , mEnabled{true} - , mFlatStyle{flatStyle} - , mTextColorFocused{0xFFFFFFFF} - , mTextColorUnfocused{0x777777FF} - , mFlatColorFocused{0x878787FF} - , mFlatColorUnfocused{0x60606025} - -{ + : GuiComponent{window}, mBox{window, ":/graphics/button.svg"}, mFont{Font::get(FONT_SIZE_MEDIUM)}, mPadding{{}}, + mFocused{false}, mEnabled{true}, mFlatStyle{flatStyle}, mTextColorFocused{0xFFFFFFFF}, + mTextColorUnfocused{0x777777FF}, mFlatColorFocused{0x878787FF}, mFlatColorUnfocused{0x60606025} { setPressedFunc(func); setText(text, helpText, upperCase); @@ -38,8 +28,7 @@ ButtonComponent::ButtonComponent(Window* window, updateImage(); } -void ButtonComponent::onSizeChanged() -{ +void ButtonComponent::onSizeChanged() { if (mFlatStyle) return; @@ -50,27 +39,24 @@ void ButtonComponent::onSizeChanged() glm::vec2{-cornerSize.x * 2.0f, -cornerSize.y * 2.0f}); } -void ButtonComponent::onFocusGained() -{ +void ButtonComponent::onFocusGained() { mFocused = true; if (!mFlatStyle) updateImage(); } -void ButtonComponent::onFocusLost() -{ +void ButtonComponent::onFocusLost() { mFocused = false; if (!mFlatStyle) updateImage(); } -void ButtonComponent::setText(const std::string& text, const std::string& helpText, bool upperCase) -{ +void ButtonComponent::setText(const std::string &text, const std::string &helpText, bool upperCase) { mText = upperCase ? Utils::String::toUpper(text) : text; mHelpText = helpText; mTextCache = - std::unique_ptr(mFont->buildTextCache(mText, 0.0f, 0.0f, getCurTextColor())); + std::unique_ptr(mFont->buildTextCache(mText, 0.0f, 0.0f, getCurTextColor())); float minWidth = mFont->sizeText("DELETE").x + (12.0f * Renderer::getScreenWidthModifier()); setSize(std::max(mTextCache->metrics.size.x + (12.0f * Renderer::getScreenWidthModifier()), @@ -80,15 +66,13 @@ void ButtonComponent::setText(const std::string& text, const std::string& helpTe updateHelpPrompts(); } -void ButtonComponent::setEnabled(bool state) -{ +void ButtonComponent::setEnabled(bool state) { mEnabled = state; if (!mFlatStyle) updateImage(); } -void ButtonComponent::setPadding(const glm::vec4 padding) -{ +void ButtonComponent::setPadding(const glm::vec4 padding) { if (mPadding == padding) return; @@ -96,8 +80,7 @@ void ButtonComponent::setPadding(const glm::vec4 padding) onSizeChanged(); } -bool ButtonComponent::input(InputConfig* config, Input input) -{ +bool ButtonComponent::input(InputConfig *config, Input input) { if (config->isMappedTo("a", input) && input.value != 0) { if (mPressedFunc && mEnabled) mPressedFunc(); @@ -107,8 +90,7 @@ bool ButtonComponent::input(InputConfig* config, Input input) return GuiComponent::input(config, input); } -void ButtonComponent::render(const glm::mat4& parentTrans) -{ +void ButtonComponent::render(const glm::mat4 &parentTrans) { glm::mat4 trans{parentTrans * getTransform()}; if (mFlatStyle) { @@ -117,15 +99,13 @@ void ButtonComponent::render(const glm::mat4& parentTrans) Renderer::drawRect(mPadding.x, mPadding.y, mSize.x - mPadding.x - mPadding.z, mSize.y - mPadding.y - mPadding.w, mFlatColorFocused, mFlatColorFocused); - } - else { + } else { Renderer::setMatrix(trans); Renderer::drawRect(mPadding.x, mPadding.y, mSize.x - mPadding.x - mPadding.z, mSize.y - mPadding.y - mPadding.w, mFlatColorUnfocused, mFlatColorUnfocused); } - } - else { + } else { mBox.render(trans); } @@ -151,23 +131,20 @@ void ButtonComponent::render(const glm::mat4& parentTrans) renderChildren(trans); } -std::vector ButtonComponent::getHelpPrompts() -{ +std::vector ButtonComponent::getHelpPrompts() { std::vector prompts; prompts.push_back(HelpPrompt("a", mHelpText.empty() ? mText.c_str() : mHelpText.c_str())); return prompts; } -unsigned int ButtonComponent::getCurTextColor() const -{ +unsigned int ButtonComponent::getCurTextColor() const { if (!mFocused) return mTextColorUnfocused; else return mTextColorFocused; } -void ButtonComponent::updateImage() -{ +void ButtonComponent::updateImage() { if (!mEnabled || !mPressedFunc) { mBox.setImagePath(":/graphics/button_filled.svg"); mBox.setCenterColor(0x770000FF); diff --git a/es-core/src/components/ButtonComponent.h b/es-core/src/components/ButtonComponent.h index 55ad497db..7b1dad9a3 100644 --- a/es-core/src/components/ButtonComponent.h +++ b/es-core/src/components/ButtonComponent.h @@ -14,41 +14,48 @@ class TextCache; -class ButtonComponent : public GuiComponent -{ +class ButtonComponent : public GuiComponent { public: - ButtonComponent(Window* window, - const std::string& text = "", - const std::string& helpText = "", - const std::function& func = nullptr, + ButtonComponent(Window *window, + const std::string &text = "", + const std::string &helpText = "", + const std::function &func = nullptr, bool upperCase = true, bool flatStyle = false); void onSizeChanged() override; + void onFocusGained() override; + void onFocusLost() override; - void setText(const std::string& text, const std::string& helpText, bool upperCase = true); - const std::string& getText() const { return mText; } + void setText(const std::string &text, const std::string &helpText, bool upperCase = true); + + const std::string &getText() const { return mText; } void setPressedFunc(std::function f) { mPressedFunc = f; } + void setEnabled(bool state) override; void setPadding(const glm::vec4 padding); + glm::vec4 getPadding() { return mPadding; } void setFlatColorFocused(unsigned int color) { mFlatColorFocused = color; } + void setFlatColorUnfocused(unsigned int color) { mFlatColorUnfocused = color; } - const std::function& getPressedFunc() const { return mPressedFunc; } + const std::function &getPressedFunc() const { return mPressedFunc; } - bool input(InputConfig* config, Input input) override; - void render(const glm::mat4& parentTrans) override; + bool input(InputConfig *config, Input input) override; + + void render(const glm::mat4 &parentTrans) override; virtual std::vector getHelpPrompts() override; private: unsigned int getCurTextColor() const; + void updateImage(); NinePatchComponent mBox; diff --git a/es-core/src/components/ComponentGrid.cpp b/es-core/src/components/ComponentGrid.cpp index bd6012d12..3f73e93c0 100644 --- a/es-core/src/components/ComponentGrid.cpp +++ b/es-core/src/components/ComponentGrid.cpp @@ -245,7 +245,7 @@ const ComponentGrid::GridEntry* ComponentGrid::getCellAt(int x, int y) const bool ComponentGrid::input(InputConfig* config, Input input) { - const GridEntry* cursorEntry = getCellAt(mCursor); + const GridEntry *cursorEntry = getCellAt(mCursor); if (cursorEntry && cursorEntry->component->input(config, input)) return true; @@ -287,12 +287,11 @@ void ComponentGrid::resetCursor() } } -bool ComponentGrid::moveCursor(glm::ivec2 dir) -{ +bool ComponentGrid::moveCursor(glm::ivec2 dir) { assert(dir.x || dir.y); const glm::ivec2 origCursor{mCursor}; - const GridEntry* currentCursorEntry = getCellAt(mCursor); + const GridEntry *currentCursorEntry = getCellAt(mCursor); glm::ivec2 searchAxis(dir.x == 0, dir.y == 0); // Logic to handle entries that span several cells. @@ -326,7 +325,7 @@ bool ComponentGrid::moveCursor(glm::ivec2 dir) while (mCursor.x >= 0 && mCursor.y >= 0 && mCursor.x < mGridSize.x && mCursor.y < mGridSize.y) { mCursor = mCursor + dir; glm::ivec2 curDirPos{mCursor}; - const GridEntry* cursorEntry; + const GridEntry *cursorEntry; // Spread out on search axis+ while (mCursor.x < mGridSize.x && mCursor.y < mGridSize.y && mCursor.x >= 0 && @@ -368,8 +367,7 @@ bool ComponentGrid::moveCursor(glm::ivec2 dir) return false; } -void ComponentGrid::moveCursorTo(int xPos, int yPos, bool selectLeftCell) -{ +void ComponentGrid::moveCursorTo(int xPos, int yPos, bool selectLeftCell) { const glm::ivec2 origCursor{mCursor}; if (xPos != -1) @@ -377,7 +375,7 @@ void ComponentGrid::moveCursorTo(int xPos, int yPos, bool selectLeftCell) if (yPos != -1) mCursor.y = yPos; - const GridEntry* currentCursorEntry = getCellAt(mCursor); + const GridEntry *currentCursorEntry = getCellAt(mCursor); // If requested, select the leftmost cell of entries wider than 1 cell. if (selectLeftCell && mCursor.x > currentCursorEntry->pos.x) @@ -386,16 +384,14 @@ void ComponentGrid::moveCursorTo(int xPos, int yPos, bool selectLeftCell) onCursorMoved(origCursor, mCursor); } -void ComponentGrid::onFocusLost() -{ - const GridEntry* cursorEntry = getCellAt(mCursor); +void ComponentGrid::onFocusLost() { + const GridEntry *cursorEntry = getCellAt(mCursor); if (cursorEntry) cursorEntry->component->onFocusLost(); } -void ComponentGrid::onFocusGained() -{ - const GridEntry* cursorEntry = getCellAt(mCursor); +void ComponentGrid::onFocusGained() { + const GridEntry *cursorEntry = getCellAt(mCursor); if (cursorEntry) cursorEntry->component->onFocusGained(); } diff --git a/es-core/src/components/ComponentGrid.h b/es-core/src/components/ComponentGrid.h index fc1145108..59f1ca852 100644 --- a/es-core/src/components/ComponentGrid.h +++ b/es-core/src/components/ComponentGrid.h @@ -30,53 +30,60 @@ namespace GridFlags } // namespace GridFlags // Provides basic layout of components in an X*Y grid. -class ComponentGrid : public GuiComponent -{ +class ComponentGrid : public GuiComponent { public: - ComponentGrid(Window* window, const glm::ivec2& gridDimensions); + ComponentGrid(Window *window, const glm::ivec2 &gridDimensions); + virtual ~ComponentGrid(); - bool removeEntry(const std::shared_ptr& comp); + bool removeEntry(const std::shared_ptr &comp); - void setEntry(const std::shared_ptr& comp, - const glm::ivec2& pos, + void setEntry(const std::shared_ptr &comp, + const glm::ivec2 &pos, bool canFocus, bool resize = true, - const glm::ivec2& size = glm::ivec2{1, 1}, + const glm::ivec2 &size = glm::ivec2{1, 1}, unsigned int border = GridFlags::BORDER_NONE, GridFlags::UpdateType updateType = GridFlags::UPDATE_ALWAYS); - void setPastBoundaryCallback(const std::function& func) - { + void setPastBoundaryCallback(const std::function &func) { mPastBoundaryCallback = func; } - void textInput(const std::string& text) override; - bool input(InputConfig* config, Input input) override; + void textInput(const std::string &text) override; + + bool input(InputConfig *config, Input input) override; + void update(int deltaTime) override; - void render(const glm::mat4& parentTrans) override; + + void render(const glm::mat4 &parentTrans) override; + void onSizeChanged() override; void resetCursor(); + bool cursorValid(); float getColWidth(int col); + float getRowHeight(int row); // If update is false, will not call an onSizeChanged() which triggers // a (potentially costly) repositioning + resizing of every element. void setColWidthPerc(int col, float width, bool update = true); + // Dito. void setRowHeightPerc(int row, float height, bool update = true); bool moveCursor(glm::ivec2 dir); + // Pass -1 for xPos or yPos to keep its axis cursor position. void moveCursorTo(int xPos, int yPos, bool selectLeftCell = false); - void setCursorTo(const std::shared_ptr& comp); - std::shared_ptr getSelectedComponent() - { - const GridEntry* e = getCellAt(mCursor); + void setCursorTo(const std::shared_ptr &comp); + + std::shared_ptr getSelectedComponent() { + const GridEntry *e = getCellAt(mCursor); if (e) return e->component; else @@ -84,6 +91,7 @@ public: } void onFocusLost() override; + void onFocusGained() override; virtual std::vector getHelpPrompts() override; @@ -121,22 +129,25 @@ private: }; // Update position and size. - void updateCellComponent(const GridEntry& cell); + void updateCellComponent(const GridEntry &cell); + void updateSeparators(); void onCursorMoved(glm::ivec2 from, glm::ivec2 to); - const GridEntry* getCellAt(int x, int y) const; - const GridEntry* getCellAt(const glm::ivec2& pos) const { return getCellAt(pos.x, pos.y); } + + const GridEntry *getCellAt(int x, int y) const; + + const GridEntry *getCellAt(const glm::ivec2 &pos) const { return getCellAt(pos.x, pos.y); } std::vector> mSeparators; glm::ivec2 mGridSize; std::vector mCells; glm::ivec2 mCursor; - std::function mPastBoundaryCallback; + std::function mPastBoundaryCallback; - float* mRowHeights; - float* mColWidths; + float *mRowHeights; + float *mColWidths; }; #endif // ES_CORE_COMPONENTS_COMPONENT_GRID_H diff --git a/es-core/src/components/ComponentList.cpp b/es-core/src/components/ComponentList.cpp index db6e65fff..230e66500 100644 --- a/es-core/src/components/ComponentList.cpp +++ b/es-core/src/components/ComponentList.cpp @@ -71,11 +71,10 @@ bool ComponentList::input(InputConfig* config, Input input) if (mEntries.at(mCursor).data.input_handler) { if (mEntries.at(mCursor).data.input_handler(config, input)) return true; - } - else { + } else { // No input handler assigned, do the default, which is to give it // to the rightmost element in the row. - auto& row = mEntries.at(mCursor).data; + auto &row = mEntries.at(mCursor).data; if (row.elements.size()) { if (row.elements.back().component->input(config, input)) return true; @@ -197,7 +196,7 @@ void ComponentList::render(const glm::mat4& parentTrans) std::vector drawAfterCursor; bool drawAll; for (size_t i = 0; i < mEntries.size(); i++) { - auto& entry = mEntries.at(i); + auto &entry = mEntries.at(i); drawAll = !mFocused || i != static_cast(mCursor); for (auto it = entry.data.elements.cbegin(); it != entry.data.elements.cend(); it++) { if (drawAll || it->invert_when_selected) { diff --git a/es-core/src/components/DateTimeEditComponent.cpp b/es-core/src/components/DateTimeEditComponent.cpp index 23b900aae..b1d6b3664 100644 --- a/es-core/src/components/DateTimeEditComponent.cpp +++ b/es-core/src/components/DateTimeEditComponent.cpp @@ -12,17 +12,10 @@ #include "resources/Font.h" #include "utils/StringUtil.h" -DateTimeEditComponent::DateTimeEditComponent(Window* window, bool alignRight, DisplayMode dispMode) - : GuiComponent(window) - , mEditing(false) - , mEditIndex(0) - , mDisplayMode(dispMode) - , mRelativeUpdateAccumulator(0) - , mColor(0x777777FF) - , mFont(Font::get(FONT_SIZE_SMALL, FONT_PATH_LIGHT)) - , mAlignRight(alignRight) - , mUppercase(false) - , mAutoSize(true) +DateTimeEditComponent::DateTimeEditComponent(Window *window, bool alignRight, DisplayMode dispMode) + : GuiComponent(window), mEditing(false), mEditIndex(0), mDisplayMode(dispMode), mRelativeUpdateAccumulator(0), + mColor(0x777777FF), mFont(Font::get(FONT_SIZE_SMALL, FONT_PATH_LIGHT)), mAlignRight(alignRight), + mUppercase(false), mAutoSize(true) { updateTextCache(); } diff --git a/es-core/src/components/FlexboxComponent.cpp b/es-core/src/components/FlexboxComponent.cpp index 2daa686df..37e26a952 100644 --- a/es-core/src/components/FlexboxComponent.cpp +++ b/es-core/src/components/FlexboxComponent.cpp @@ -24,43 +24,45 @@ FlexboxComponent::FlexboxComponent(Window* window) // Initialize item margins. mItemMargin = glm::vec2{DEFAULT_MARGIN_X, DEFAULT_MARGIN_Y}; - // Calculate flexbox layout. - computeLayout(); + // Layout validity + mLayoutValid = false; } // Getters/Setters for rendering options. void FlexboxComponent::setDirection(std::string value) { mDirection = value; - computeLayout(); + mLayoutValid = false; } std::string FlexboxComponent::getDirection() { return mDirection; } void FlexboxComponent::setAlign(std::string value) { mAlign = value; - computeLayout(); + mLayoutValid = false; } std::string FlexboxComponent::getAlign() { return mAlign; } void FlexboxComponent::setItemsPerLine(unsigned int value) { mItemsPerLine = value; - computeLayout(); + mLayoutValid = false; } unsigned int FlexboxComponent::getItemsPerLine() { return mItemsPerLine; } void FlexboxComponent::setItemMargin(glm::vec2 value) { mItemMargin = value; - computeLayout(); + mLayoutValid = false; } glm::vec2 FlexboxComponent::getItemMargin() { return mItemMargin; } void FlexboxComponent::setItemWidth(float value) { mItemWidth = value; - computeLayout(); + mLayoutValid = false; } float FlexboxComponent::getItemWidth() { return mItemWidth; } -void FlexboxComponent::onSizeChanged() { computeLayout(); } +void FlexboxComponent::onSizeChanged() { + mLayoutValid = false; +} void FlexboxComponent::computeLayout() { @@ -139,20 +141,23 @@ void FlexboxComponent::computeLayout() if (directionRow.x == 0) { anchorY += lineWidth * directionRow.y; anchorX = anchorXStart; - } - else { + } else { anchorX += lineWidth * directionRow.x; anchorY = anchorYStart; } } } + + mLayoutValid = true; } -void FlexboxComponent::render(const glm::mat4& parentTrans) -{ +void FlexboxComponent::render(const glm::mat4& parentTrans) { if (!isVisible()) return; + if (!mLayoutValid) + computeLayout(); + renderChildren(parentTrans); } @@ -189,8 +194,8 @@ void FlexboxComponent::applyTheme(const std::shared_ptr& theme, GuiComponent::applyTheme(theme, view, element, properties); - // Trigger layout computation. - onSizeChanged(); + // Layout no longer valid. + mLayoutValid = false; } std::vector FlexboxComponent::getHelpPrompts() diff --git a/es-core/src/components/FlexboxComponent.h b/es-core/src/components/FlexboxComponent.h index 45c82637c..731a00c8e 100644 --- a/es-core/src/components/FlexboxComponent.h +++ b/es-core/src/components/FlexboxComponent.h @@ -66,6 +66,7 @@ private: unsigned int mItemsPerLine; glm::vec2 mItemMargin; float mItemWidth; + bool mLayoutValid; }; #endif // ES_APP_COMPONENTS_FLEXBOX_COMPONENT_H diff --git a/es-core/src/components/HelpComponent.cpp b/es-core/src/components/HelpComponent.cpp index 69c1ae32c..3729f5a32 100644 --- a/es-core/src/components/HelpComponent.cpp +++ b/es-core/src/components/HelpComponent.cpp @@ -37,36 +37,36 @@ void HelpComponent::assignIcons() ":/help/dpad_updown.svg" : mStyle.mCustomButtons.dpad_updown; sIconPathMap["left/right"] = mStyle.mCustomButtons.dpad_leftright.empty() ? - ":/help/dpad_leftright.svg" : - mStyle.mCustomButtons.dpad_leftright; + ":/help/dpad_leftright.svg" : + mStyle.mCustomButtons.dpad_leftright; sIconPathMap["up/down/left/right"] = mStyle.mCustomButtons.dpad_all.empty() ? - ":/help/dpad_all.svg" : - mStyle.mCustomButtons.dpad_all; + ":/help/dpad_all.svg" : + mStyle.mCustomButtons.dpad_all; sIconPathMap["thumbstickclick"] = mStyle.mCustomButtons.thumbstick_click.empty() ? - ":/help/thumbstick_click.svg" : - mStyle.mCustomButtons.thumbstick_click; + ":/help/thumbstick_click.svg" : + mStyle.mCustomButtons.thumbstick_click; sIconPathMap["l"] = mStyle.mCustomButtons.button_l.empty() ? ":/help/button_l.svg" : - mStyle.mCustomButtons.button_l; + mStyle.mCustomButtons.button_l; sIconPathMap["r"] = mStyle.mCustomButtons.button_r.empty() ? ":/help/button_r.svg" : - mStyle.mCustomButtons.button_r; + mStyle.mCustomButtons.button_r; sIconPathMap["lr"] = mStyle.mCustomButtons.button_lr.empty() ? ":/help/button_lr.svg" : - mStyle.mCustomButtons.button_lr; + mStyle.mCustomButtons.button_lr; sIconPathMap["lt"] = mStyle.mCustomButtons.button_lt.empty() ? ":/help/button_lt.svg" : - mStyle.mCustomButtons.button_lt; + mStyle.mCustomButtons.button_lt; sIconPathMap["rt"] = mStyle.mCustomButtons.button_rt.empty() ? ":/help/button_rt.svg" : - mStyle.mCustomButtons.button_rt; + mStyle.mCustomButtons.button_rt; // These graphics files are custom per controller type. if (controllerType == "snes") { sIconPathMap["a"] = mStyle.mCustomButtons.button_a_SNES.empty() ? - ":/help/button_a_SNES.svg" : - mStyle.mCustomButtons.button_a_SNES; + ":/help/button_a_SNES.svg" : + mStyle.mCustomButtons.button_a_SNES; sIconPathMap["b"] = mStyle.mCustomButtons.button_b_SNES.empty() ? - ":/help/button_b_SNES.svg" : - mStyle.mCustomButtons.button_b_SNES; + ":/help/button_b_SNES.svg" : + mStyle.mCustomButtons.button_b_SNES; sIconPathMap["x"] = mStyle.mCustomButtons.button_x_SNES.empty() ? - ":/help/button_x_SNES.svg" : - mStyle.mCustomButtons.button_x_SNES; + ":/help/button_x_SNES.svg" : + mStyle.mCustomButtons.button_x_SNES; sIconPathMap["y"] = mStyle.mCustomButtons.button_y_SNES.empty() ? ":/help/button_y_SNES.svg" : mStyle.mCustomButtons.button_y_SNES; diff --git a/es-core/src/components/ImageComponent.cpp b/es-core/src/components/ImageComponent.cpp index 600af7c22..5891074d1 100644 --- a/es-core/src/components/ImageComponent.cpp +++ b/es-core/src/components/ImageComponent.cpp @@ -27,23 +27,11 @@ glm::vec2 ImageComponent::getSize() const return GuiComponent::getSize() * (mBottomRightCrop - mTopLeftCrop); } -ImageComponent::ImageComponent(Window* window, bool forceLoad, bool dynamic) - : GuiComponent(window) - , mTargetSize({}) - , mFlipX(false) - , mFlipY(false) - , mTargetIsMax(false) - , mTargetIsMin(false) - , mColorShift(0xFFFFFFFF) - , mColorShiftEnd(0xFFFFFFFF) - , mColorGradientHorizontal(true) - , mFadeOpacity(0) - , mFading(false) - , mForceLoad(forceLoad) - , mDynamic(dynamic) - , mRotateByTargetSize(false) - , mTopLeftCrop({}) - , mBottomRightCrop(1.0f, 1.0f) +ImageComponent::ImageComponent(Window *window, bool forceLoad, bool dynamic) + : GuiComponent(window), mTargetSize({}), mFlipX(false), mFlipY(false), mTargetIsMax(false), mTargetIsMin(false), + mColorShift(0xFFFFFFFF), mColorShiftEnd(0xFFFFFFFF), mColorGradientHorizontal(true), mFadeOpacity(0), + mFading(false), mForceLoad(forceLoad), mDynamic(dynamic), mRotateByTargetSize(false), mTopLeftCrop({}), + mBottomRightCrop(1.0f, 1.0f) { updateColors(); } diff --git a/es-core/src/guis/GuiInputConfig.cpp b/es-core/src/guis/GuiInputConfig.cpp index 516d17c6e..aa9767459 100644 --- a/es-core/src/guis/GuiInputConfig.cpp +++ b/es-core/src/guis/GuiInputConfig.cpp @@ -181,7 +181,7 @@ GuiInputConfig::GuiInputConfig(Window* window, }; buttons.push_back( - std::make_shared(mWindow, "OK", "ok", [okFunction] { okFunction(); })); + std::make_shared(mWindow, "OK", "ok", [okFunction] { okFunction(); })); mButtonGrid = makeButtonGrid(mWindow, buttons); mGrid.setEntry(mButtonGrid, glm::ivec2{0, 6}, true, false); diff --git a/es-core/src/guis/GuiMsgBox.cpp b/es-core/src/guis/GuiMsgBox.cpp index 0e0a7fcb2..5e648eb26 100644 --- a/es-core/src/guis/GuiMsgBox.cpp +++ b/es-core/src/guis/GuiMsgBox.cpp @@ -15,22 +15,18 @@ #define HORIZONTAL_PADDING_PX 20.0f GuiMsgBox::GuiMsgBox(Window* window, - const HelpStyle& helpstyle, - const std::string& text, - const std::string& name1, - const std::function& func1, - const std::string& name2, - const std::function& func2, - const std::string& name3, - const std::function& func3, + const HelpStyle &helpstyle, + const std::string &text, + const std::string &name1, + const std::function &func1, + const std::string &name2, + const std::function &func2, + const std::string &name3, + const std::function &func3, bool disableBackButton, bool deleteOnButtonPress) - : GuiComponent(window) - , mBackground(window, ":/graphics/frame.svg") - , mGrid(window, glm::ivec2{1, 2}) - , mHelpStyle(helpstyle) - , mDisableBackButton(disableBackButton) - , mDeleteOnButtonPress(deleteOnButtonPress) + : GuiComponent(window), mBackground(window, ":/graphics/frame.svg"), mGrid(window, glm::ivec2{1, 2}), + mHelpStyle(helpstyle), mDisableBackButton(disableBackButton), mDeleteOnButtonPress(deleteOnButtonPress) { // Adjust the width relative to the aspect ratio of the screen to make the GUI look coherent // regardless of screen type. The 1.778 aspect ratio value is the 16:9 reference. diff --git a/es-core/src/guis/GuiTextEditKeyboardPopup.cpp b/es-core/src/guis/GuiTextEditKeyboardPopup.cpp index b3f46a3d3..4edd8d95b 100644 --- a/es-core/src/guis/GuiTextEditKeyboardPopup.cpp +++ b/es-core/src/guis/GuiTextEditKeyboardPopup.cpp @@ -39,82 +39,68 @@ #include "utils/StringUtil.h" // clang-format off -std::vector> kbBaseUS{ - {"1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "DEL"}, - {"!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "+", "DEL"}, - {"¡", "²", "³", "¤", "€", "¼", "½", "¾", "‘", "’", "¥", "×", "DEL"}, - {"¹", "", "", "£", "", "", "", "", "", "", "", "÷", "DEL"}, +std::vector> kbBaseUS{ + {"1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "DEL"}, + {"!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "+", "DEL"}, + {"¡", "²", "³", "¤", "€", "¼", "½", "¾", "‘", "’", "¥", "×", "DEL"}, + {"¹", "", "", "£", "", "", "", "", "", "", "", "÷", "DEL"}, - {"q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "OK"}, - {"Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "{", "}", "OK"}, - {"ä", "å", "é", "®", "þ", "ü", "ú", "í", "ó", "ö", "«", "»", "OK"}, - {"Ä", "Å", "É", "", "Þ", "Ü", "Ú", "Í", "Ó", "Ö", "", "", "OK"}, + {"q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "OK"}, + {"Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "{", "}", "OK"}, + {"ä", "å", "é", "®", "þ", "ü", "ú", "í", "ó", "ö", "«", "»", "OK"}, + {"Ä", "Å", "É", "", "Þ", "Ü", "Ú", "Í", "Ó", "Ö", "", "", "OK"}, - {"a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "\\", "-rowspan-"}, - {"A", "S", "D", "F", "G", "H", "J", "K", "L", ":", "\"", "|", "-rowspan-"}, - {"á", "ß", "ð", "", "", "", "", "", "ø", "¶", "´", "¬", "-rowspan-"}, - {"Á", "§", "Ð", "", "", "", "", "", "Ø", "°", "¨", "¦", "-rowspan-"}, + {"a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "\\", "-rowspan-"}, + {"A", "S", "D", "F", "G", "H", "J", "K", "L", ":", "\"", "|", "-rowspan-"}, + {"á", "ß", "ð", "", "", "", "", "", "ø", "¶", "´", "¬", "-rowspan-"}, + {"Á", "§", "Ð", "", "", "", "", "", "Ø", "°", "¨", "¦", "-rowspan-"}, - {"`", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "ALT", "-colspan-"}, - {"~", "Z", "X", "C", "V", "B", "N", "M", "<", ">", "?", "ALT", "-colspan-"}, - {"", "æ", "", "©", "", "", "ñ", "µ", "ç", "", "¿", "ALT", "-colspan-"}, - {"", "Æ", "", "¢", "", "", "Ñ", "Μ", "Ç", "", "", "ALT", "-colspan-"}}; + {"`", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "ALT", "-colspan-"}, + {"~", "Z", "X", "C", "V", "B", "N", "M", "<", ">", "?", "ALT", "-colspan-"}, + {"", "æ", "", "©", "", "", "ñ", "µ", "ç", "", "¿", "ALT", "-colspan-"}, + {"", "Æ", "", "¢", "", "", "Ñ", "Μ", "Ç", "", "", "ALT", "-colspan-"}}; -std::vector> kbLastRowNormal{ - {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, - {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, - {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, - {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}}; +std::vector> kbLastRowNormal{ + {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, + {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, + {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, + {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}}; -std::vector> kbLastRowLoad{ - {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "LOAD", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, - {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "LOAD", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, - {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "LOAD", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, - {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "LOAD", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}}; +std::vector> kbLastRowLoad{ + {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "LOAD", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, + {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "LOAD", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, + {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "LOAD", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}, + {"SHIFT", "-colspan-", "SPACE", "-colspan-", "-colspan-", "-colspan-", "-colspan-", "LOAD", "-colspan-", "CLEAR", "-colspan-", "CANCEL", "-colspan-"}}; // clang-format on GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup( - Window* window, - const HelpStyle& helpstyle, - const std::string& title, - const std::string& initValue, - const std::function& okCallback, - bool multiLine, - const std::string& acceptBtnHelpText, - const std::string& saveConfirmationText, - const std::string& infoString, - const std::string& defaultValue, - const std::string& loadBtnHelpText, - const std::string& clearBtnHelpText, - const std::string& cancelBtnHelpText) - : GuiComponent{window} - , mBackground{window, ":/graphics/frame.svg"} - , mGrid{window, glm::ivec2{1, (infoString != "" && defaultValue != "" ? 8 : 6)}} - , mHelpStyle{helpstyle} - , mInitValue{initValue} - , mAcceptBtnHelpText{acceptBtnHelpText} - , mSaveConfirmationText{saveConfirmationText} - , mLoadBtnHelpText{loadBtnHelpText} - , mClearBtnHelpText{clearBtnHelpText} - , mCancelBtnHelpText{cancelBtnHelpText} - , mOkCallback{okCallback} - , mMultiLine{multiLine} - , mComplexMode{(infoString != "" && defaultValue != "")} - , mDeleteRepeat{false} - , mShift{false} - , mAlt{false} - , mDeleteRepeatTimer{0} - , mNavigationRepeatTimer{0} - , mNavigationRepeatDirX{0} - , mNavigationRepeatDirY{0} -{ + Window *window, + const HelpStyle &helpstyle, + const std::string &title, + const std::string &initValue, + const std::function &okCallback, + bool multiLine, + const std::string &acceptBtnHelpText, + const std::string &saveConfirmationText, + const std::string &infoString, + const std::string &defaultValue, + const std::string &loadBtnHelpText, + const std::string &clearBtnHelpText, + const std::string &cancelBtnHelpText) + : GuiComponent{window}, mBackground{window, ":/graphics/frame.svg"}, + mGrid{window, glm::ivec2{1, (infoString != "" && defaultValue != "" ? 8 : 6)}}, mHelpStyle{helpstyle}, + mInitValue{initValue}, mAcceptBtnHelpText{acceptBtnHelpText}, mSaveConfirmationText{saveConfirmationText}, + mLoadBtnHelpText{loadBtnHelpText}, mClearBtnHelpText{clearBtnHelpText}, mCancelBtnHelpText{cancelBtnHelpText}, + mOkCallback{okCallback}, mMultiLine{multiLine}, mComplexMode{(infoString != "" && defaultValue != "")}, + mDeleteRepeat{false}, mShift{false}, mAlt{false}, mDeleteRepeatTimer{0}, mNavigationRepeatTimer{0}, + mNavigationRepeatDirX{0}, mNavigationRepeatDirY{0} { addChild(&mBackground); addChild(&mGrid); mTitle = std::make_shared(mWindow, Utils::String::toUpper(title), Font::get(FONT_SIZE_LARGE), 0x555555FF, ALIGN_CENTER); - std::vector> kbLayout; + std::vector> kbLayout; // At the moment there is only the US keyboard layout available. kbLayout.insert(kbLayout.cend(), kbBaseUS.cbegin(), kbBaseUS.cend()); @@ -128,7 +114,7 @@ GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup( mHorizontalKeyCount = static_cast(kbLayout[0].size()); mKeyboardGrid = std::make_shared( - mWindow, glm::ivec2(mHorizontalKeyCount, static_cast(kbLayout.size()) / 3)); + mWindow, glm::ivec2(mHorizontalKeyCount, static_cast(kbLayout.size()) / 3)); mText = std::make_shared(mWindow); mText->setValue(initValue); @@ -143,11 +129,11 @@ GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup( if (mComplexMode) { mInfoString = std::make_shared( - mWindow, infoString, Font::get(FONT_SIZE_MEDIUM), 0x555555FF, ALIGN_CENTER); + mWindow, infoString, Font::get(FONT_SIZE_MEDIUM), 0x555555FF, ALIGN_CENTER); mGrid.setEntry(mInfoString, glm::ivec2{0, yPos}, false, true); mDefaultValue = std::make_shared( - mWindow, defaultValue, Font::get(FONT_SIZE_SMALL), 0x555555FF, ALIGN_CENTER); + mWindow, defaultValue, Font::get(FONT_SIZE_SMALL), 0x555555FF, ALIGN_CENTER); mGrid.setEntry(mDefaultValue, glm::ivec2{0, yPos + 1}, false, true); yPos += 2; } @@ -178,20 +164,17 @@ GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup( upper = DELETE_SYMBOL; alted = DELETE_SYMBOL; altshifted = DELETE_SYMBOL; - } - else if (lower == "OK") { + } else if (lower == "OK") { lower = OK_SYMBOL; upper = OK_SYMBOL; alted = OK_SYMBOL; altshifted = OK_SYMBOL; - } - else if (lower == "SPACE") { + } else if (lower == "SPACE") { lower = " "; upper = " "; alted = " "; altshifted = " "; - } - else if (lower != "SHIFT" && lower.length() > 1) { + } else if (lower != "SHIFT" && lower.length() > 1) { lower = (lower.c_str()); upper = (upper.c_str()); alted = (alted.c_str()); @@ -200,21 +183,19 @@ GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup( if (lower == "SHIFT") { mShiftButton = std::make_shared( - mWindow, (SHIFT_SYMBOL), ("SHIFT"), [this] { shiftKeys(); }, false, true); + mWindow, (SHIFT_SYMBOL), ("SHIFT"), [this] { shiftKeys(); }, false, true); button = mShiftButton; - } - else if (lower == "ALT") { + } else if (lower == "ALT") { mAltButton = std::make_shared( - mWindow, (ALT_SYMBOL), ("ALT"), [this] { altKeys(); }, false, true); + mWindow, (ALT_SYMBOL), ("ALT"), [this] { altKeys(); }, false, true); button = mAltButton; - } - else { + } else { button = makeButton(lower, upper, alted, altshifted); } button->setPadding( - glm::vec4(BUTTON_GRID_HORIZ_PADDING / 4.0f, BUTTON_GRID_HORIZ_PADDING / 4.0f, - BUTTON_GRID_HORIZ_PADDING / 4.0f, BUTTON_GRID_HORIZ_PADDING / 4.0f)); + glm::vec4(BUTTON_GRID_HORIZ_PADDING / 4.0f, BUTTON_GRID_HORIZ_PADDING / 4.0f, + BUTTON_GRID_HORIZ_PADDING / 4.0f, BUTTON_GRID_HORIZ_PADDING / 4.0f)); buttons.push_back(button); int colSpan = 1; @@ -252,14 +233,13 @@ GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup( mText->setSize(0.0f, textHeight); // If attempting to navigate beyond the edge of the keyboard grid, then wrap around. - mGrid.setPastBoundaryCallback([this, kbLayout](InputConfig* config, Input input) -> bool { + mGrid.setPastBoundaryCallback([this, kbLayout](InputConfig *config, Input input) -> bool { if (config->isMappedLike("left", input)) { if (mGrid.getSelectedComponent() == mKeyboardGrid) { mKeyboardGrid->moveCursorTo(mHorizontalKeyCount - 1, -1, true); return true; } - } - else if (config->isMappedLike("right", input)) { + } else if (config->isMappedLike("right", input)) { if (mGrid.getSelectedComponent() == mKeyboardGrid) { mKeyboardGrid->moveCursorTo(0, -1); return true; @@ -279,8 +259,7 @@ GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup( setPosition((static_cast(Renderer::getScreenWidth()) - mSize.x) / 2.0f, (static_cast(Renderer::getScreenHeight()) - mSize.y) / 2.0f); - } - else { + } else { if (mComplexMode) setSize(width, KEYBOARD_HEIGHT + mDefaultValue->getSize().y * 3.0f); else @@ -291,8 +270,7 @@ GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup( } } -void GuiTextEditKeyboardPopup::onSizeChanged() -{ +void GuiTextEditKeyboardPopup::onSizeChanged() { mBackground.fitTo(mSize, glm::vec3{}, glm::vec2{-32.0f, -32.0f}); mText->setSize(mSize.x - KEYBOARD_PADDINGX - KEYBOARD_PADDINGX, mText->getSize().y); @@ -303,8 +281,7 @@ void GuiTextEditKeyboardPopup::onSizeChanged() mGrid.setRowHeightPerc(1, (mInfoString->getSize().y * 0.6f) / mSize.y); mGrid.setRowHeightPerc(2, (mDefaultValue->getSize().y * 1.6f) / mSize.y); mGrid.setRowHeightPerc(1, (mText->getSize().y * 1.0f) / mSize.y); - } - else if (mMultiLine) { + } else if (mMultiLine) { mGrid.setRowHeightPerc(1, (mText->getSize().y * 1.15f) / mSize.y); } @@ -319,8 +296,7 @@ void GuiTextEditKeyboardPopup::onSizeChanged() mKeyboardGrid->setPosition(KEYBOARD_PADDINGX, pos.y); } -bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input) -{ +bool GuiTextEditKeyboardPopup::input(InputConfig *config, Input input) { // Enter/return key or numpad enter key accepts the changes. if (config->getDeviceId() == DEVICE_KEYBOARD && mText->isEditing() && !mMultiLine && input.value && (input.id == SDLK_RETURN || input.id == SDLK_KP_ENTER)) { @@ -328,7 +304,7 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input) delete this; return true; } - // Dito for the A button if using a controller. + // Dito for the A button if using a controller. else if (config->getDeviceId() != DEVICE_KEYBOARD && mText->isEditing() && config->isMappedTo("a", input) && input.value) { this->mOkCallback(mText->getValue()); @@ -354,19 +330,18 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input) if (mText->getValue() != mInitValue) { // Changes were made, ask if the user wants to save them. mWindow->pushGui(new GuiMsgBox( - mWindow, mHelpStyle, mSaveConfirmationText, "YES", - [this] { - this->mOkCallback(mText->getValue()); - delete this; - return true; - }, - "NO", - [this] { - delete this; - return true; - })); - } - else { + mWindow, mHelpStyle, mSaveConfirmationText, "YES", + [this] { + this->mOkCallback(mText->getValue()); + delete this; + return true; + }, + "NO", + [this] { + delete this; + return true; + })); + } else { delete this; return true; } @@ -399,8 +374,7 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input) if (!editing) mText->stopEditing(); - } - else { + } else { mDeleteRepeat = false; } return true; @@ -426,8 +400,7 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input) if (input.value) { mNavigationRepeatDirX = -1; mNavigationRepeatTimer = -(NAVIGATION_REPEAT_START_DELAY - NAVIGATION_REPEAT_SPEED); - } - else { + } else { mNavigationRepeatDirX = 0; } } @@ -436,8 +409,7 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input) if (input.value) { mNavigationRepeatDirX = 1; mNavigationRepeatTimer = -(NAVIGATION_REPEAT_START_DELAY - NAVIGATION_REPEAT_SPEED); - } - else { + } else { mNavigationRepeatDirX = 0; } } @@ -446,8 +418,7 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input) if (input.value) { mNavigationRepeatDirY = -1; mNavigationRepeatTimer = -(NAVIGATION_REPEAT_START_DELAY - NAVIGATION_REPEAT_SPEED); - } - else { + } else { mNavigationRepeatDirY = 0; } } @@ -456,8 +427,7 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input) if (input.value) { mNavigationRepeatDirY = 1; mNavigationRepeatTimer = -(NAVIGATION_REPEAT_START_DELAY - NAVIGATION_REPEAT_SPEED); - } - else { + } else { mNavigationRepeatDirY = 0; } } @@ -468,22 +438,19 @@ bool GuiTextEditKeyboardPopup::input(InputConfig* config, Input input) return false; } -void GuiTextEditKeyboardPopup::update(int deltaTime) -{ +void GuiTextEditKeyboardPopup::update(int deltaTime) { updateNavigationRepeat(deltaTime); updateDeleteRepeat(deltaTime); GuiComponent::update(deltaTime); } -std::vector GuiTextEditKeyboardPopup::getHelpPrompts() -{ +std::vector GuiTextEditKeyboardPopup::getHelpPrompts() { std::vector prompts = mGrid.getHelpPrompts(); if (!mText->isEditing()) { prompts.push_back(HelpPrompt("lt", "shift")); prompts.push_back(HelpPrompt("rt", "alt")); - } - else { + } else { prompts.push_back(HelpPrompt("a", mAcceptBtnHelpText)); } @@ -513,8 +480,7 @@ std::vector GuiTextEditKeyboardPopup::getHelpPrompts() return prompts; } -void GuiTextEditKeyboardPopup::updateDeleteRepeat(int deltaTime) -{ +void GuiTextEditKeyboardPopup::updateDeleteRepeat(int deltaTime) { if (!mDeleteRepeat) return; @@ -534,8 +500,7 @@ void GuiTextEditKeyboardPopup::updateDeleteRepeat(int deltaTime) } } -void GuiTextEditKeyboardPopup::updateNavigationRepeat(int deltaTime) -{ +void GuiTextEditKeyboardPopup::updateNavigationRepeat(int deltaTime) { if (mNavigationRepeatDirX == 0 && mNavigationRepeatDirY == 0) return; @@ -562,15 +527,13 @@ void GuiTextEditKeyboardPopup::updateNavigationRepeat(int deltaTime) } } -void GuiTextEditKeyboardPopup::shiftKeys() -{ +void GuiTextEditKeyboardPopup::shiftKeys() { mShift = !mShift; if (mShift) { mShiftButton->setFlatColorFocused(0xFF2222FF); mShiftButton->setFlatColorUnfocused(0xFF2222FF); - } - else { + } else { mShiftButton->setFlatColorFocused(0x878787FF); mShiftButton->setFlatColorUnfocused(0x60606025); } @@ -584,10 +547,9 @@ void GuiTextEditKeyboardPopup::shiftKeys() if (mAlt) { altKeys(); altKeys(); - } - else { - for (auto& kb : mKeyboardButtons) { - const std::string& text = mShift ? kb.shiftedKey : kb.key; + } else { + for (auto &kb: mKeyboardButtons) { + const std::string &text = mShift ? kb.shiftedKey : kb.key; auto sz = kb.button->getSize(); kb.button->setText(text, text, false); kb.button->setSize(sz); @@ -595,15 +557,13 @@ void GuiTextEditKeyboardPopup::shiftKeys() } } -void GuiTextEditKeyboardPopup::altKeys() -{ +void GuiTextEditKeyboardPopup::altKeys() { mAlt = !mAlt; if (mAlt) { mAltButton->setFlatColorFocused(0xFF2222FF); mAltButton->setFlatColorUnfocused(0xFF2222FF); - } - else { + } else { mAltButton->setFlatColorFocused(0x878787FF); mAltButton->setFlatColorUnfocused(0x60606025); } @@ -617,10 +577,9 @@ void GuiTextEditKeyboardPopup::altKeys() if (mShift) { shiftKeys(); shiftKeys(); - } - else { - for (auto& kb : mKeyboardButtons) { - const std::string& text = mAlt ? kb.altedKey : kb.key; + } else { + for (auto &kb: mKeyboardButtons) { + const std::string &text = mAlt ? kb.altedKey : kb.key; auto sz = kb.button->getSize(); kb.button->setText(text, text, false); kb.button->setSize(sz); @@ -628,10 +587,9 @@ void GuiTextEditKeyboardPopup::altKeys() } } -void GuiTextEditKeyboardPopup::altShiftKeys() -{ - for (auto& kb : mKeyboardButtons) { - const std::string& text = kb.altshiftedKey; +void GuiTextEditKeyboardPopup::altShiftKeys() { + for (auto &kb: mKeyboardButtons) { + const std::string &text = kb.altshiftedKey; auto sz = kb.button->getSize(); kb.button->setText(text, text, false); kb.button->setSize(sz); @@ -639,62 +597,56 @@ void GuiTextEditKeyboardPopup::altShiftKeys() } std::shared_ptr GuiTextEditKeyboardPopup::makeButton( - const std::string& key, - const std::string& shiftedKey, - const std::string& altedKey, - const std::string& altshiftedKey) -{ + const std::string &key, + const std::string &shiftedKey, + const std::string &altedKey, + const std::string &altshiftedKey) { std::shared_ptr button = std::make_shared( - mWindow, key, key, - [this, key, shiftedKey, altedKey, altshiftedKey] { - if (key == (OK_SYMBOL) || key.find("OK") != std::string::npos) { - mOkCallback(mText->getValue()); - delete this; - return; - } - else if (key == (DELETE_SYMBOL) || key == "DEL") { + mWindow, key, key, + [this, key, shiftedKey, altedKey, altshiftedKey] { + if (key == (OK_SYMBOL) || key.find("OK") != std::string::npos) { + mOkCallback(mText->getValue()); + delete this; + return; + } else if (key == (DELETE_SYMBOL) || key == "DEL") { + mText->startEditing(); + mText->textInput("\b"); + mText->stopEditing(); + return; + } else if (key == "SPACE" || key == " ") { + mText->startEditing(); + mText->textInput(" "); + mText->stopEditing(); + return; + } else if (key == "LOAD") { + mText->setValue(mDefaultValue->getValue()); + mText->setCursor(mDefaultValue->getValue().size()); + return; + } else if (key == "CLEAR") { + mText->setValue(""); + return; + } else if (key == "CANCEL") { + delete this; + return; + } + + if (mAlt && altedKey.empty()) + return; + mText->startEditing(); - mText->textInput("\b"); + + if (mShift && mAlt) + mText->textInput(altshiftedKey.c_str()); + else if (mAlt) + mText->textInput(altedKey.c_str()); + else if (mShift) + mText->textInput(shiftedKey.c_str()); + else + mText->textInput(key.c_str()); + mText->stopEditing(); - return; - } - else if (key == "SPACE" || key == " ") { - mText->startEditing(); - mText->textInput(" "); - mText->stopEditing(); - return; - } - else if (key == "LOAD") { - mText->setValue(mDefaultValue->getValue()); - mText->setCursor(mDefaultValue->getValue().size()); - return; - } - else if (key == "CLEAR") { - mText->setValue(""); - return; - } - else if (key == "CANCEL") { - delete this; - return; - } - - if (mAlt && altedKey.empty()) - return; - - mText->startEditing(); - - if (mShift && mAlt) - mText->textInput(altshiftedKey.c_str()); - else if (mAlt) - mText->textInput(altedKey.c_str()); - else if (mShift) - mText->textInput(shiftedKey.c_str()); - else - mText->textInput(key.c_str()); - - mText->stopEditing(); - }, - false, true); + }, + false, true); KeyboardButton kb(button, key, shiftedKey, altedKey, altshiftedKey); mKeyboardButtons.push_back(kb); diff --git a/es-core/src/guis/GuiTextEditKeyboardPopup.h b/es-core/src/guis/GuiTextEditKeyboardPopup.h index b8660fdf0..4104cb6cb 100644 --- a/es-core/src/guis/GuiTextEditKeyboardPopup.h +++ b/es-core/src/guis/GuiTextEditKeyboardPopup.h @@ -15,62 +15,64 @@ #include "components/ComponentGrid.h" #include "components/TextEditComponent.h" -class GuiTextEditKeyboardPopup : public GuiComponent -{ +class GuiTextEditKeyboardPopup : public GuiComponent { public: - GuiTextEditKeyboardPopup(Window* window, - const HelpStyle& helpstyle, - const std::string& title, - const std::string& initValue, - const std::function& okCallback, + GuiTextEditKeyboardPopup(Window *window, + const HelpStyle &helpstyle, + const std::string &title, + const std::string &initValue, + const std::function &okCallback, bool multiLine, - const std::string& acceptBtnHelpText = "OK", - const std::string& saveConfirmationText = "SAVE CHANGES?", - const std::string& infoString = "", - const std::string& defaultValue = "", - const std::string& loadBtnHelpText = "LOAD DEFAULT", - const std::string& clearBtnHelpText = "CLEAR", - const std::string& cancelBtnHelpText = "DISCARD CHANGES"); + const std::string &acceptBtnHelpText = "OK", + const std::string &saveConfirmationText = "SAVE CHANGES?", + const std::string &infoString = "", + const std::string &defaultValue = "", + const std::string &loadBtnHelpText = "LOAD DEFAULT", + const std::string &clearBtnHelpText = "CLEAR", + const std::string &cancelBtnHelpText = "DISCARD CHANGES"); void onSizeChanged() override; - bool input(InputConfig* config, Input input) override; + + bool input(InputConfig *config, Input input) override; + void update(int deltaTime) override; std::vector getHelpPrompts() override; + HelpStyle getHelpStyle() override { return mHelpStyle; } private: - class KeyboardButton - { + class KeyboardButton { public: std::shared_ptr button; const std::string key; const std::string shiftedKey; const std::string altedKey; const std::string altshiftedKey; + KeyboardButton(const std::shared_ptr b, - const std::string& k, - const std::string& sk, - const std::string& ak, - const std::string& ask) - : button{b} - , key{k} - , shiftedKey{sk} - , altedKey{ak} - , altshiftedKey{ask} {}; + const std::string &k, + const std::string &sk, + const std::string &ak, + const std::string &ask) + : button{b}, key{k}, shiftedKey{sk}, altedKey{ak}, altshiftedKey{ask} {}; }; void updateDeleteRepeat(int deltaTime); + void updateNavigationRepeat(int deltaTime); void shiftKeys(); + void altKeys(); + void altShiftKeys(); - std::shared_ptr makeButton(const std::string& key, - const std::string& shiftedKey, - const std::string& altedKey, - const std::string& altshiftedKey); + std::shared_ptr makeButton(const std::string &key, + const std::string &shiftedKey, + const std::string &altedKey, + const std::string &altshiftedKey); + std::vector mKeyboardButtons; std::shared_ptr mShiftButton; @@ -93,7 +95,7 @@ private: std::string mClearBtnHelpText; std::string mCancelBtnHelpText; - std::function mOkCallback; + std::function mOkCallback; bool mMultiLine; bool mComplexMode; diff --git a/es-core/src/guis/GuiTextEditPopup.cpp b/es-core/src/guis/GuiTextEditPopup.cpp index 132d81056..898f4a4a6 100644 --- a/es-core/src/guis/GuiTextEditPopup.cpp +++ b/es-core/src/guis/GuiTextEditPopup.cpp @@ -15,35 +15,25 @@ #include "components/MenuComponent.h" #include "guis/GuiMsgBox.h" -GuiTextEditPopup::GuiTextEditPopup(Window* window, - const HelpStyle& helpstyle, - const std::string& title, - const std::string& initValue, - const std::function& okCallback, +GuiTextEditPopup::GuiTextEditPopup(Window *window, + const HelpStyle &helpstyle, + const std::string &title, + const std::string &initValue, + const std::function &okCallback, bool multiLine, - const std::string& acceptBtnText, - const std::string& saveConfirmationText, - const std::string& infoString, - const std::string& defaultValue, - const std::string& loadBtnHelpText, - const std::string& clearBtnHelpText, - const std::string& cancelBtnHelpText) - : GuiComponent{window} - , mBackground{window, ":/graphics/frame.svg"} - , mGrid{window, glm::ivec2{1, (infoString != "" && defaultValue != "" ? 5 : 3)}} - , mHelpStyle{helpstyle} - , mInitValue{initValue} - , mAcceptBtnText{acceptBtnText} - , mSaveConfirmationText{saveConfirmationText} - , mLoadBtnHelpText{loadBtnHelpText} - , mClearBtnHelpText{clearBtnHelpText} - , mCancelBtnHelpText{cancelBtnHelpText} - , mOkCallback{okCallback} - , mMultiLine{multiLine} - , mComplexMode{(infoString != "" && defaultValue != "")} - , mDeleteRepeat{false} - , mDeleteRepeatTimer{0} -{ + const std::string &acceptBtnText, + const std::string &saveConfirmationText, + const std::string &infoString, + const std::string &defaultValue, + const std::string &loadBtnHelpText, + const std::string &clearBtnHelpText, + const std::string &cancelBtnHelpText) + : GuiComponent{window}, mBackground{window, ":/graphics/frame.svg"}, + mGrid{window, glm::ivec2{1, (infoString != "" && defaultValue != "" ? 5 : 3)}}, mHelpStyle{helpstyle}, + mInitValue{initValue}, mAcceptBtnText{acceptBtnText}, mSaveConfirmationText{saveConfirmationText}, + mLoadBtnHelpText{loadBtnHelpText}, mClearBtnHelpText{clearBtnHelpText}, mCancelBtnHelpText{cancelBtnHelpText}, + mOkCallback{okCallback}, mMultiLine{multiLine}, mComplexMode{(infoString != "" && defaultValue != "")}, + mDeleteRepeat{false}, mDeleteRepeatTimer{0} { addChild(&mBackground); addChild(&mGrid); @@ -52,9 +42,9 @@ GuiTextEditPopup::GuiTextEditPopup(Window* window, if (mComplexMode) { mInfoString = std::make_shared( - mWindow, infoString, Font::get(FONT_SIZE_SMALL), 0x555555FF, ALIGN_CENTER); + mWindow, infoString, Font::get(FONT_SIZE_SMALL), 0x555555FF, ALIGN_CENTER); mDefaultValue = std::make_shared( - mWindow, defaultValue, Font::get(FONT_SIZE_SMALL), 0x555555FF, ALIGN_CENTER); + mWindow, defaultValue, Font::get(FONT_SIZE_SMALL), 0x555555FF, ALIGN_CENTER); } mText = std::make_shared(mWindow); @@ -68,11 +58,11 @@ GuiTextEditPopup::GuiTextEditPopup(Window* window, })); if (mComplexMode) { buttons.push_back(std::make_shared( - mWindow, "load", loadBtnHelpText, [this, defaultValue] { - mText->setValue(defaultValue); - mText->setCursor(0); - mText->setCursor(defaultValue.size()); - })); + mWindow, "load", loadBtnHelpText, [this, defaultValue] { + mText->setValue(defaultValue); + mText->setCursor(0); + mText->setCursor(defaultValue.size()); + })); } buttons.push_back(std::make_shared(mWindow, "clear", clearBtnHelpText, @@ -109,22 +99,21 @@ GuiTextEditPopup::GuiTextEditPopup(Window* window, if (mComplexMode) { float infoWidth = - glm::clamp(0.70f * aspectValue, 0.34f, 0.85f) * Renderer::getScreenWidth(); + glm::clamp(0.70f * aspectValue, 0.34f, 0.85f) * Renderer::getScreenWidth(); float windowWidth = - glm::clamp(0.75f * aspectValue, 0.40f, 0.90f) * Renderer::getScreenWidth(); + glm::clamp(0.75f * aspectValue, 0.40f, 0.90f) * Renderer::getScreenWidth(); mDefaultValue->setSize(infoWidth, mDefaultValue->getFont()->getHeight()); setSize(windowWidth, mTitle->getFont()->getHeight() + textHeight + - mButtonGrid->getSize().y + mButtonGrid->getSize().y * 1.85f); + mButtonGrid->getSize().y + mButtonGrid->getSize().y * 1.85f); setPosition((Renderer::getScreenWidth() - mSize.x) / 2.0f, (Renderer::getScreenHeight() - mSize.y) / 2.0f); - } - else { + } else { float width = glm::clamp(0.54f * aspectValue, 0.20f, 0.70f) * Renderer::getScreenWidth(); setSize(width, mTitle->getFont()->getHeight() + textHeight + mButtonGrid->getSize().y + - mButtonGrid->getSize().y / 2.0f); + mButtonGrid->getSize().y / 2.0f); setPosition((Renderer::getScreenWidth() - mSize.x) / 2.0f, (Renderer::getScreenHeight() - mSize.y) / 2.0f); } @@ -135,8 +124,7 @@ GuiTextEditPopup::GuiTextEditPopup(Window* window, mText->startEditing(); } -void GuiTextEditPopup::onSizeChanged() -{ +void GuiTextEditPopup::onSizeChanged() { mBackground.fitTo(mSize, glm::vec3{}, glm::vec2{-32.0f, -32.0f}); mText->setSize(mSize.x - 40.0f * Renderer::getScreenHeightModifier(), mText->getSize().y); @@ -150,8 +138,7 @@ void GuiTextEditPopup::onSizeChanged() mGrid.setSize(mSize); } -bool GuiTextEditPopup::input(InputConfig* config, Input input) -{ +bool GuiTextEditPopup::input(InputConfig *config, Input input) { // Enter key (main key or via numpad) accepts the changes. if (config->getDeviceId() == DEVICE_KEYBOARD && mText->isEditing() && !mMultiLine && input.value && (input.id == SDLK_RETURN || input.id == SDLK_KP_ENTER)) { @@ -159,7 +146,7 @@ bool GuiTextEditPopup::input(InputConfig* config, Input input) delete this; return true; } - // Dito for the A button if using a controller. + // Dito for the A button if using a controller. else if (config->getDeviceId() != DEVICE_KEYBOARD && mText->isEditing() && config->isMappedTo("a", input) && input.value) { this->mOkCallback(mText->getValue()); @@ -179,19 +166,18 @@ bool GuiTextEditPopup::input(InputConfig* config, Input input) if (mText->getValue() != mInitValue) { // Changes were made, ask if the user wants to save them. mWindow->pushGui(new GuiMsgBox( - mWindow, mHelpStyle, mSaveConfirmationText, "YES", - [this] { - this->mOkCallback(mText->getValue()); - delete this; - return true; - }, - "NO", - [this] { - delete this; - return true; - })); - } - else { + mWindow, mHelpStyle, mSaveConfirmationText, "YES", + [this] { + this->mOkCallback(mText->getValue()); + delete this; + return true; + }, + "NO", + [this] { + delete this; + return true; + })); + } else { delete this; return true; } @@ -216,8 +202,7 @@ bool GuiTextEditPopup::input(InputConfig* config, Input input) if (!editing) mText->stopEditing(); - } - else { + } else { mDeleteRepeat = false; } return true; @@ -243,14 +228,12 @@ bool GuiTextEditPopup::input(InputConfig* config, Input input) return false; } -void GuiTextEditPopup::update(int deltaTime) -{ +void GuiTextEditPopup::update(int deltaTime) { updateDeleteRepeat(deltaTime); GuiComponent::update(deltaTime); } -std::vector GuiTextEditPopup::getHelpPrompts() -{ +std::vector GuiTextEditPopup::getHelpPrompts() { std::vector prompts = mGrid.getHelpPrompts(); if (mText->isEditing()) @@ -262,8 +245,7 @@ std::vector GuiTextEditPopup::getHelpPrompts() return prompts; } -void GuiTextEditPopup::updateDeleteRepeat(int deltaTime) -{ +void GuiTextEditPopup::updateDeleteRepeat(int deltaTime) { if (!mDeleteRepeat) return; diff --git a/es-core/src/guis/GuiTextEditPopup.h b/es-core/src/guis/GuiTextEditPopup.h index a77623704..4784cecf7 100644 --- a/es-core/src/guis/GuiTextEditPopup.h +++ b/es-core/src/guis/GuiTextEditPopup.h @@ -15,28 +15,30 @@ #include "components/ComponentGrid.h" #include "components/TextEditComponent.h" -class GuiTextEditPopup : public GuiComponent -{ +class GuiTextEditPopup : public GuiComponent { public: - GuiTextEditPopup(Window* window, - const HelpStyle& helpstyle, - const std::string& title, - const std::string& initValue, - const std::function& okCallback, + GuiTextEditPopup(Window *window, + const HelpStyle &helpstyle, + const std::string &title, + const std::string &initValue, + const std::function &okCallback, bool multiLine, - const std::string& acceptBtnText = "OK", - const std::string& saveConfirmationText = "SAVE CHANGES?", - const std::string& infoString = "", - const std::string& defaultValue = "", - const std::string& loadBtnHelpText = "LOAD DEFAULT", - const std::string& clearBtnHelpText = "CLEAR", - const std::string& cancelBtnHelpText = "DISCARD CHANGES"); + const std::string &acceptBtnText = "OK", + const std::string &saveConfirmationText = "SAVE CHANGES?", + const std::string &infoString = "", + const std::string &defaultValue = "", + const std::string &loadBtnHelpText = "LOAD DEFAULT", + const std::string &clearBtnHelpText = "CLEAR", + const std::string &cancelBtnHelpText = "DISCARD CHANGES"); void onSizeChanged() override; - bool input(InputConfig* config, Input input) override; + + bool input(InputConfig *config, Input input) override; + void update(int deltaTime) override; std::vector getHelpPrompts() override; + HelpStyle getHelpStyle() override { return mHelpStyle; } private: @@ -59,7 +61,7 @@ private: std::string mClearBtnHelpText; std::string mCancelBtnHelpText; - std::function mOkCallback; + std::function mOkCallback; bool mMultiLine; bool mComplexMode; diff --git a/es-core/src/resources/Font.cpp b/es-core/src/resources/Font.cpp index 5cdb52e53..21c15346f 100644 --- a/es-core/src/resources/Font.cpp +++ b/es-core/src/resources/Font.cpp @@ -562,18 +562,18 @@ float Font::getNewlineStartOffset(const std::string& text, endChar = static_cast(text.find('\n', charStart)); return (xLen - sizeText(text.substr(charStart, static_cast(endChar) != std::string::npos ? - endChar - charStart : - endChar)) - .x) / + endChar - charStart : + endChar)) + .x) / 2.0f; } case ALIGN_RIGHT: { int endChar = static_cast(text.find('\n', charStart)); return xLen - (sizeText(text.substr(charStart, static_cast(endChar) != std::string::npos ? - endChar - charStart : - endChar)) - .x); + endChar - charStart : + endChar)) + .x); } default: return 0; diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml index 0457f49ff..2d6da89f1 100644 --- a/resources/systems/macos/es_systems.xml +++ b/resources/systems/macos/es_systems.xml @@ -98,10 +98,12 @@ .cmd .CMD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.dylib %ROM% + arcade arcade @@ -218,10 +220,15 @@ c64 Commodore 64 %ROMPATH%/c64 - .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.dylib %ROM% + .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 + .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ + .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xscpu64_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xscpu64_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x128_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/frodo_libretro.dylib %ROM% c64 @@ -354,11 +361,20 @@ FinalBurn Alpha %ROMPATH%/fba .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_neogeo_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps1_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps3_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.dylib %ROM% + + %EMULATOR_RETROARCH% -L + %CORE_RETROARCH%/fbalpha2012_neogeo_libretro.dylib %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps1_libretro.dylib + %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.dylib + %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps3_libretro.dylib + %ROM% + arcade fba @@ -438,9 +454,14 @@ genesis Sega Genesis %ROMPATH%/genesis - .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.dylib %ROM% + .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx + .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM% + + %EMULATOR_RETROARCH% -L + %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.dylib %ROM% genesis @@ -505,12 +526,14 @@ Multiple Arcade Machine Emulator %ROMPATH%/mame .cmd .CMD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.dylib %ROM% + arcade mame @@ -536,9 +559,14 @@ mastersystem Sega Master System %ROMPATH%/mastersystem - .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .rom .ROM .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.dylib %ROM% + .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md + .MD .mdx .MDX .rom .ROM .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM% + + %EMULATOR_RETROARCH% -L + %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.dylib %ROM% @@ -567,9 +595,14 @@ megadrive Sega Mega Drive %ROMPATH%/megadrive - .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.dylib %ROM% + .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx + .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM% + + %EMULATOR_RETROARCH% -L + %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.dylib %ROM% megadrive @@ -818,9 +851,13 @@ pcengine NEC PC Engine %ROMPATH%/pcengine - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.dylib + %ROM% + pcengine pcengine @@ -828,9 +865,13 @@ pcenginecd NEC PC Engine CD %ROMPATH%/pcenginecd - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.dylib + %ROM% + pcenginecd pcenginecd @@ -910,10 +951,14 @@ psx Sony PlayStation %ROMPATH%/psx - .bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP + .bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U + .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.dylib %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/duckstation_libretro.dylib %ROM% psx psx @@ -1021,11 +1066,15 @@ snes Nintendo SNES (Super Nintendo) %ROMPATH%/snes - .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC + .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L + %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.dylib %ROM% snes snes @@ -1034,11 +1083,15 @@ snesna Nintendo SNES (Super Nintendo) %ROMPATH%/snesna - .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC + .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L + %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.dylib %ROM% snes snesna @@ -1093,7 +1146,9 @@ NEC SuperGrafx %ROMPATH%/supergrafx .pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.dylib + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.dylib %ROM% supergrafx supergrafx @@ -1120,9 +1175,13 @@ tg16 NEC TurboGrafx-16 %ROMPATH%/tg16 - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.dylib + %ROM% + pcengine tg16 @@ -1130,9 +1189,13 @@ tg-cd NEC TurboGrafx-CD %ROMPATH%/tg-cd - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.dylib %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.dylib + %ROM% + tg-cd diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml index 83c0f653a..2b894b01c 100644 --- a/resources/systems/unix/es_systems.xml +++ b/resources/systems/unix/es_systems.xml @@ -15,7 +15,8 @@ Nintendo 64DD %ROMPATH%/64dd .n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM% n64 64dd @@ -99,7 +100,8 @@ .cmd .CMD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% @@ -219,10 +221,15 @@ c64 Commodore 64 %ROMPATH%/c64 - .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.so %ROM% + .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 + .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ + .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xscpu64_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xscpu64_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x128_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/frodo_libretro.so %ROM% c64 @@ -356,10 +363,18 @@ %ROMPATH%/fba .iso .ISO .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_neogeo_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps1_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps3_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_neogeo_libretro.so + %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps1_libretro.so + %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.so + %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps3_libretro.so + %ROM% + arcade fba @@ -439,9 +454,14 @@ genesis Sega Genesis %ROMPATH%/genesis - .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM% + .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx + .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.so %ROM% genesis @@ -506,7 +526,8 @@ Multiple Arcade Machine Emulator %ROMPATH%/mame .cmd .CMD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% @@ -537,9 +558,14 @@ mastersystem Sega Master System %ROMPATH%/mastersystem - .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .rom .ROM .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM% + .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md + .MD .mdx .MDX .rom .ROM .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% @@ -568,9 +594,14 @@ megadrive Sega Mega Drive %ROMPATH%/megadrive - .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM% + .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx + .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.so %ROM% megadrive @@ -662,7 +693,8 @@ Nintendo 64 %ROMPATH%/n64 .n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM% n64 n64 @@ -820,9 +852,12 @@ pcengine NEC PC Engine %ROMPATH%/pcengine - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcengine pcengine @@ -830,9 +865,12 @@ pcenginecd NEC PC Engine CD %ROMPATH%/pcenginecd - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcenginecd pcenginecd @@ -912,9 +950,12 @@ psx Sony PlayStation %ROMPATH%/psx - .bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP + .bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U + .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/duckstation_libretro.so %ROM% psx @@ -1023,12 +1064,18 @@ snes Nintendo SNES (Super Nintendo) %ROMPATH%/snes - .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC + .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% + %EMULATOR_RETROARCH% -L + %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% snes snes @@ -1037,12 +1084,18 @@ snesna Nintendo SNES (Super Nintendo) %ROMPATH%/snesna - .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC + .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% + %EMULATOR_RETROARCH% -L + %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% snes snesna @@ -1097,7 +1150,9 @@ NEC SuperGrafx %ROMPATH%/supergrafx .pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.so + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% supergrafx supergrafx @@ -1124,9 +1179,12 @@ tg16 NEC TurboGrafx-16 %ROMPATH%/tg16 - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcengine tg16 @@ -1134,9 +1192,12 @@ tg-cd NEC TurboGrafx-CD %ROMPATH%/tg-cd - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcenginecd tg-cd diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml index 62843d550..6ed187456 100644 --- a/resources/systems/windows/es_systems.xml +++ b/resources/systems/windows/es_systems.xml @@ -15,7 +15,8 @@ Nintendo 64DD %ROMPATH%\64dd .n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mupen64plus_next_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mupen64plus_next_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\parallel_n64_libretro.dll %ROM% n64 64dd @@ -99,7 +100,8 @@ .cmd .CMD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame2000_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame2003_plus_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame2003_plus_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame2010_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbneo_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_libretro.dll %ROM% @@ -219,10 +221,15 @@ c64 Commodore 64 %ROMPATH%\c64 - .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_x64sc_libretro.dll %ROM% + .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 + .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ + .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_x64sc_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_x64_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_xscpu64_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_xscpu64_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_x128_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\frodo_libretro.dll %ROM% c64 @@ -356,10 +363,18 @@ %ROMPATH%\fba .iso .ISO .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_neogeo_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_cps1_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_cps2_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_cps3_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_neogeo_libretro.dll + %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_cps1_libretro.dll + %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_cps2_libretro.dll + %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_cps3_libretro.dll + %ROM% + arcade fba @@ -439,9 +454,14 @@ genesis Sega Genesis %ROMPATH%\genesis - .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_wide_libretro.dll %ROM% + .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx + .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_wide_libretro.dll + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\picodrive_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\blastem_libretro.dll %ROM% genesis @@ -506,7 +526,8 @@ Multiple Arcade Machine Emulator %ROMPATH%\mame .cmd .CMD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame2003_plus_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame2003_plus_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame2000_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame2010_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame_libretro.dll %ROM% @@ -537,9 +558,14 @@ mastersystem Sega Master System %ROMPATH%\mastersystem - .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .rom .ROM .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_wide_libretro.dll %ROM% + .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md + .MD .mdx .MDX .rom .ROM .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_wide_libretro.dll + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\smsplus_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\gearsystem_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\picodrive_libretro.dll %ROM% @@ -568,9 +594,14 @@ megadrive Sega Mega Drive %ROMPATH%\megadrive - .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_wide_libretro.dll %ROM% + .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx + .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_wide_libretro.dll + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\picodrive_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\blastem_libretro.dll %ROM% megadrive @@ -662,7 +693,8 @@ Nintendo 64 %ROMPATH%\n64 .n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mupen64plus_next_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mupen64plus_next_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\parallel_n64_libretro.dll %ROM% n64 n64 @@ -820,9 +852,12 @@ pcengine NEC PC Engine %ROMPATH%\pcengine - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM% + pcengine pcengine @@ -830,9 +865,12 @@ pcenginecd NEC PC Engine CD %ROMPATH%\pcenginecd - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM% + pcenginecd pcenginecd @@ -912,9 +950,12 @@ psx Sony PlayStation %ROMPATH%\psx - .bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP + .bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U + .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_psx_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_psx_hw_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_psx_hw_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\pcsx_rearmed_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\duckstation_libretro.dll %ROM% psx @@ -1023,12 +1064,18 @@ snes Nintendo SNES (Super Nintendo) %ROMPATH%\snes - .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC + .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\snes9x_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\snes9x2010_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bsnes_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bsnes_mercury_accuracy_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_supafaust_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L + %CORE_RETROARCH%\bsnes_mercury_accuracy_libretro.dll %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_supafaust_libretro.dll + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM% snes snes @@ -1037,12 +1084,18 @@ snesna Nintendo SNES (Super Nintendo) %ROMPATH%\snesna - .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC + .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\snes9x_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\snes9x2010_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bsnes_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bsnes_mercury_accuracy_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_supafaust_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L + %CORE_RETROARCH%\bsnes_mercury_accuracy_libretro.dll %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_supafaust_libretro.dll + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM% snes snesna @@ -1097,7 +1150,9 @@ NEC SuperGrafx %ROMPATH%\supergrafx .pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_supergrafx_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_supergrafx_libretro.dll + %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM% supergrafx supergrafx @@ -1124,9 +1179,12 @@ tg16 NEC TurboGrafx-16 %ROMPATH%\tg16 - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM% + pcengine tg16 @@ -1134,9 +1192,12 @@ tg-cd NEC TurboGrafx-CD %ROMPATH%\tg-cd - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM% + pcenginecd tg-cd diff --git a/themes/rbsimple-DE/theme.xml b/themes/rbsimple-DE/theme.xml index a0fc8861a..00c48fb13 100644 --- a/themes/rbsimple-DE/theme.xml +++ b/themes/rbsimple-DE/theme.xml @@ -238,7 +238,7 @@ based on: 'recalbox-multi' by the Recalbox community 0.8125 0.65 - 0 0 + 0.5 0.5 row