move ui to its own folder

CMakeLists.txt

@@ -734,7 +734,7 @@ if(USE_DISCORD AND NOT LIBRETRO)
 	target_include_directories(${PROJECT_NAME} PRIVATE core/deps/discord-rpc/include)
 	target_link_libraries(${PROJECT_NAME} PRIVATE discord-rpc)
 	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_DISCORD)
-	target_sources(${PROJECT_NAME} PRIVATE core/rend/discord.cpp)
+	target_sources(${PROJECT_NAME} PRIVATE core/ui/discord.cpp)
 endif()
 
 cmrc_add_resource_library(flycast-resources ALIAS flycast::res NAMESPACE flycast)
@@ -1292,26 +1292,26 @@ target_sources(${PROJECT_NAME} PRIVATE
 		core/rend/norend/norend.cpp)
 if(NOT LIBRETRO)
 	target_sources(${PROJECT_NAME} PRIVATE
-			core/rend/game_scanner.h
-			core/rend/imgui_driver.cpp
-			core/rend/imgui_driver.h
-			core/rend/gui.cpp
-			core/rend/gui.h
-			core/rend/gui_achievements.cpp
-			core/rend/gui_android.cpp
-			core/rend/gui_android.h
-			core/rend/gui_chat.h
-			core/rend/gui_cheats.cpp
-			core/rend/gui_util.cpp
-			core/rend/gui_util.h
-			core/rend/mainui.cpp
-			core/rend/mainui.h
-			core/rend/boxart/boxart.cpp
-			core/rend/boxart/boxart.h
-			core/rend/boxart/gamesdb.cpp
-			core/rend/boxart/gamesdb.h
-			core/rend/boxart/scraper.cpp
-			core/rend/boxart/scraper.h)
+			core/ui/game_scanner.h
+			core/ui/imgui_driver.cpp
+			core/ui/imgui_driver.h
+			core/ui/gui.cpp
+			core/ui/gui.h
+			core/ui/gui_achievements.cpp
+			core/ui/gui_android.cpp
+			core/ui/gui_android.h
+			core/ui/gui_chat.h
+			core/ui/gui_cheats.cpp
+			core/ui/gui_util.cpp
+			core/ui/gui_util.h
+			core/ui/mainui.cpp
+			core/ui/mainui.h
+			core/ui/boxart/boxart.cpp
+			core/ui/boxart/boxart.h
+			core/ui/boxart/gamesdb.cpp
+			core/ui/boxart/gamesdb.h
+			core/ui/boxart/scraper.cpp
+			core/ui/boxart/scraper.h)
 endif()
 
 if(USE_VULKAN)

core/achievements/achievements.cpp

@@ -23,7 +23,7 @@
 #include "oslib/directory.h"
 #include "oslib/http_client.h"
 #include "hw/sh4/sh4_mem.h"
-#include "rend/gui_achievements.h"
+#include "ui/gui_achievements.h"
 #include "imgread/common.h"
 #include "cfg/option.h"
 #include "oslib/oslib.h"

core/emulator.cpp

@@ -37,7 +37,7 @@
 #include "network/ggpo.h"
 #include "hw/mem/mem_watch.h"
 #include "network/net_handshake.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "network/naomi_network.h"
 #include "serialize.h"
 #include "hw/pvr/pvr.h"

core/hw/maple/maple_devs.cpp

@@ -7,7 +7,7 @@
 #include "oslib/oslib.h"
 #include "hw/aica/sgc_if.h"
 #include "cfg/option.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include <zlib.h>
 #include <cerrno>
 #include <ctime>

core/hw/naomi/card_reader.cpp

@@ -21,7 +21,7 @@
 #include "hw/sh4/modules/modules.h"
 #include "hw/maple/maple_cfg.h"
 #include "hw/maple/maple_devs.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include <deque>
 #include <memory>
 #include <cerrno>

core/hw/naomi/naomi.cpp

@@ -30,7 +30,7 @@
 #include "serialize.h"
 #include "network/output.h"
 #include "hw/sh4/modules/modules.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "printer.h"
 #include "hw/flashrom/x76f100.h"
 

core/hw/naomi/naomi_m3comm.cpp

@@ -30,7 +30,7 @@
 #include "hw/sh4/sh4_mem.h"
 #include "network/naomi_network.h"
 #include "emulator.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 
 #include <chrono>
 #include <memory>

core/hw/naomi/printer.cpp

@@ -20,7 +20,7 @@
 #include "stdclass.h"
 #include "printer.h"
 #include "serialize.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include <cassert>
 #include <memory>
 #include <vector>

core/input/gamepad_device.cpp

@@ -20,7 +20,7 @@
 #include "gamepad_device.h"
 #include "cfg/cfg.h"
 #include "stdclass.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "emulator.h"
 #include "hw/maple/maple_devs.h"
 #include "mouse.h"

core/input/keyboard_device.h

@@ -20,7 +20,7 @@
 #include "types.h"
 #include "cfg/option.h"
 #include "gamepad_device.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include <memory>
 
 extern u8 kb_key[4][6];	// normal keys pressed

core/input/mouse.cpp

@@ -18,7 +18,7 @@
 */
 #include "mouse.h"
 #include "cfg/option.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 
 // Mouse buttons
 // bit 0: Button C

core/linux-dist/main.cpp

@@ -6,7 +6,7 @@
 #if defined(__unix__)
 #include "log/LogManager.h"
 #include "emulator.h"
-#include "rend/mainui.h"
+#include "ui/mainui.h"
 #include "oslib/directory.h"
 #include "oslib/oslib.h"
 #include "stdclass.h"

core/linux-dist/x11.cpp

@@ -6,7 +6,7 @@
 #include "types.h"
 #include "cfg/cfg.h"
 #include "x11.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "input/gamepad.h"
 #include "input/mouse.h"
 #include "icon.h"

core/lua/lua.cpp

@@ -21,8 +21,8 @@
 #ifdef USE_LUA
 #include <lua.hpp>
 #include <LuaBridge/LuaBridge.h>
-#include "rend/gui.h"
-#include "rend/gui_util.h"
+#include "ui/gui.h"
+#include "ui/gui_util.h"
 #include "hw/mem/addrspace.h"
 #include "cfg/option.h"
 #include "emulator.h"

core/network/ggpo.cpp

@@ -72,8 +72,8 @@ static void getLocalInput(MapleInputState inputState[4])
 #ifdef USE_GGPO
 #include "ggponet.h"
 #include "emulator.h"
-#include "rend/gui.h"
-#include "rend/gui_util.h"
+#include "ui/gui.h"
+#include "ui/gui_util.h"
 #include "hw/mem/mem_watch.h"
 #include <string.h>
 #include <chrono>

core/network/naomi_network.cpp

@@ -19,7 +19,7 @@
 #include "naomi_network.h"
 #include "hw/naomi/naomi_flashrom.h"
 #include "cfg/option.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 
 #include <chrono>
 #include <thread>

core/nullDC.cpp

@@ -5,12 +5,12 @@
 #include "cfg/cfg.h"
 #include "cfg/option.h"
 #include "log/LogManager.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "oslib/oslib.h"
 #include "oslib/directory.h"
 #include "debug/gdb_server.h"
 #include "archive/rzip.h"
-#include "rend/mainui.h"
+#include "ui/mainui.h"
 #include "input/gamepad_device.h"
 #include "lua/lua.h"
 #include "stdclass.h"

core/rend/dx11/dx11_driver.h

@@ -17,10 +17,10 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
-#include "rend/imgui_driver.h"
+#include "ui/imgui_driver.h"
 #include "imgui_impl_dx11.h"
 #include "dx11context.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include <unordered_map>
 
 class DX11Driver final : public ImGuiDriver

core/rend/dx11/dx11_renderer.cpp

@@ -20,7 +20,7 @@
 #include "dx11context.h"
 #include "hw/pvr/ta.h"
 #include "hw/pvr/pvr_mem.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "rend/tileclip.h"
 #include "rend/sorter.h"
 

core/rend/dx9/d3d_renderer.cpp

@@ -20,7 +20,7 @@
 #include "hw/pvr/ta.h"
 #include "hw/pvr/pvr_mem.h"
 #include "rend/tileclip.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "rend/sorter.h"
 
 const u32 DstBlendGL[]

core/rend/dx9/d3d_renderer.h

@@ -25,7 +25,7 @@
 #include "rend/transform_matrix.h"
 #include "d3d_texture.h"
 #include "d3d_shaders.h"
-#include "rend/imgui_driver.h"
+#include "ui/imgui_driver.h"
 
 class RenderStateCache
 {

core/rend/dx9/dx9_driver.h

@@ -17,7 +17,7 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
-#include "rend/imgui_driver.h"
+#include "ui/imgui_driver.h"
 #include "imgui_impl_dx9.h"
 #include "dxcontext.h"
 #include <unordered_map>

core/rend/gles/gles.cpp

@@ -2,7 +2,7 @@
 #include "gles.h"
 #include "hw/pvr/ta.h"
 #ifndef LIBRETRO
-#include "rend/gui.h"
+#include "ui/gui.h"
 #else
 #include "rend/gles/postprocess.h"
 #include "vmu_xhair.h"

core/rend/gles/gles.h

@@ -7,7 +7,7 @@
 #include "glcache.h"
 #include "rend/shader_util.h"
 #ifndef LIBRETRO
-#include "rend/imgui_driver.h"
+#include "ui/imgui_driver.h"
 #endif
 
 #include <unordered_map>

core/rend/gles/opengl_driver.cpp

@@ -20,8 +20,8 @@
 #include "imgui_impl_opengl3.h"
 #include "wsi/gl_context.h"
 #include "rend/osd.h"
-#include "rend/gui.h"
-#include "rend/gui_util.h"
+#include "ui/gui.h"
+#include "ui/gui_util.h"
 #include "glcache.h"
 #include "gles.h"
 

core/rend/gles/opengl_driver.h

@@ -17,7 +17,7 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
-#include "rend/imgui_driver.h"
+#include "ui/imgui_driver.h"
 #include "emulator.h"
 #include <unordered_map>
 

core/rend/vulkan/vulkan_context.cpp

@@ -22,7 +22,7 @@
 #include "vulkan_renderer.h"
 #include "imgui.h"
 #include "imgui_impl_vulkan.h"
-#include "../gui.h"
+#include "ui/gui.h"
 #ifdef USE_SDL
 #include <sdl/sdl.h>
 #include <SDL_vulkan.h>

core/rend/vulkan/vulkan_driver.h

@@ -17,7 +17,7 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
-#include "rend/imgui_driver.h"
+#include "ui/imgui_driver.h"
 #include "imgui_impl_vulkan.h"
 #include "vulkan_context.h"
 #include "texture.h"

core/rend/vulkan/vulkan_renderer.h

@@ -25,7 +25,7 @@
 #include "rend/osd.h"
 #include "rend/transform_matrix.h"
 #ifndef LIBRETRO
-#include "rend/gui.h"
+#include "ui/gui.h"
 #endif
 
 #include <memory>

core/ui/gui.cpp

@@ -17,7 +17,7 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "gui.h"
-#include "osd.h"
+#include "rend/osd.h"
 #include "cfg/cfg.h"
 #include "hw/maple/maple_if.h"
 #include "hw/maple/maple_devs.h"
@@ -35,7 +35,7 @@
 #include "imgread/common.h"
 #include "log/LogManager.h"
 #include "emulator.h"
-#include "rend/mainui.h"
+#include "mainui.h"
 #include "lua/lua.h"
 #include "gui_chat.h"
 #include "imgui_driver.h"

core/ui/imgui_driver.cpp

@@ -18,7 +18,7 @@
 */
 #include "imgui_driver.h"
 #include "gui_util.h"
-#include "osd.h"
+#include "rend/osd.h"
 #define STBI_ONLY_JPEG
 #define STBI_ONLY_PNG
 #include <stb_image.h>

core/windows/winmain.cpp

@@ -27,7 +27,7 @@
 #include <nowide/config.hpp>
 #include <nowide/convert.hpp>
 #include "cfg/option.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #endif
 #include "oslib/oslib.h"
 #include "stdclass.h"
@@ -35,7 +35,7 @@
 #include "log/LogManager.h"
 #include "sdl/sdl.h"
 #include "emulator.h"
-#include "rend/mainui.h"
+#include "ui/mainui.h"
 #include "oslib/directory.h"
 #ifdef USE_BREAKPAD
 #include "breakpad/client/windows/handler/exception_handler.h"

core/wsi/sdl.cpp

@@ -20,7 +20,7 @@
 */
 #if defined(USE_SDL)
 #include "gl_context.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "sdl/sdl.h"
 #include "cfg/option.h"
 

shell/android-studio/flycast/src/main/jni/src/Android.cpp

@@ -6,13 +6,13 @@
 #include "hw/naomi/naomi_cart.h"
 #include "audio/audiostream.h"
 #include "imgread/common.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "rend/osd.h"
 #include "cfg/cfg.h"
 #include "log/LogManager.h"
 #include "wsi/context.h"
 #include "emulator.h"
-#include "rend/mainui.h"
+#include "ui/mainui.h"
 #include "cfg/option.h"
 #include "stdclass.h"
 #include "oslib/oslib.h"

shell/apple/emulator-ios/emulator/AppDelegate.mm

@@ -28,7 +28,7 @@
 #include "emulator.h"
 #include "log/LogManager.h"
 #include "cfg/option.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 
 static bool emulatorRunning;
 

shell/apple/emulator-ios/emulator/EmulatorView.mm

@@ -20,7 +20,7 @@
 #import "EmulatorView.h"
 
 #include "types.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "ios_gamepad.h"
 
 @implementation EmulatorView {

shell/apple/emulator-ios/emulator/FlycastViewController.mm

@@ -33,7 +33,7 @@
 
 #include "types.h"
 #include "wsi/context.h"
-#include "rend/mainui.h"
+#include "ui/mainui.h"
 #include "emulator.h"
 #include "log/LogManager.h"
 #include "stdclass.h"

shell/apple/emulator-ios/emulator/ios_gamepad.h

@@ -23,7 +23,7 @@
 #include <cmath>
 #include "input/gamepad_device.h"
 #include "input/mouse.h"
-#include "rend/gui.h"
+#include "ui/gui.h"
 
 enum IOSButton {
 	IOS_BTN_A = 1,

shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.mm

@@ -9,7 +9,7 @@
 #include "emulator.h"
 #include <sys/param.h> /* for MAXPATHLEN */
 #include <unistd.h>
-#include "rend/gui.h"
+#include "ui/gui.h"
 #include "oslib/oslib.h"
 
 #ifdef USE_BREAKPAD

shell/apple/emulator-osx/emulator-osx/osx-main.mm

@@ -21,7 +21,7 @@
 #include "stdclass.h"
 #include "oslib/oslib.h"
 #include "emulator.h"
-#include "rend/mainui.h"
+#include "ui/mainui.h"
 #include <future>
 
 int darw_printf(const char* text, ...)

shell/switch/switch_main.cpp

@@ -19,7 +19,7 @@
 #include "stdclass.h"
 #include "log/LogManager.h"
 #include "emulator.h"
-#include "rend/mainui.h"
+#include "ui/mainui.h"
 #include "oslib/directory.h"
 
 int main(int argc, char *argv[])