Backport LAN (#2131)

backport the old LAN feature to the modern melonDS codebase.

.github/workflows/build-ubuntu.yml

@@ -20,7 +20,7 @@ jobs:
       run: |
         sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list
         sudo apt update
-        sudo apt install --allow-downgrades cmake ninja-build extra-cmake-modules libpcap0.8-dev libsdl2-dev \
+        sudo apt install --allow-downgrades cmake ninja-build extra-cmake-modules libpcap0.8-dev libsdl2-dev libenet-dev \
           qt6-{base,base-private,multimedia}-dev libarchive-dev libzstd-dev libfuse2
     - name: Configure
       run: cmake -B build -G Ninja -DUSE_QT6=ON -DCMAKE_INSTALL_PREFIX=/usr
@@ -63,7 +63,7 @@ jobs:
           apt update
           apt -y full-upgrade
           apt -y install git {gcc-12,g++-12}-aarch64-linux-gnu cmake ninja-build extra-cmake-modules \
-            {libsdl2,qt6-{base,base-private,multimedia},libarchive,libzstd}-dev:arm64 \
+            {libsdl2,qt6-{base,base-private,multimedia},libarchive,libzstd,libenet}-dev:arm64 \
             pkg-config dpkg-dev
       - name: Check out source
         uses: actions/checkout@v4

cmake/FindENet.cmake

@@ -0,0 +1,48 @@
+# - Try to find enet
+# Once done this will define
+#
+#  ENET_FOUND - system has enet
+#  ENET_INCLUDE_DIRS - the enet include directory
+#  ENET_LIBRARIES - the libraries needed to use enet
+#
+# $ENETDIR is an environment variable used for finding enet.
+#
+#  Borrowed from The Mana World
+#  http://themanaworld.org/
+#
+# Several changes and additions by Fabian 'x3n' Landau
+# Lots of simplifications by Adrian Friedli
+#                 > www.orxonox.net <
+
+FIND_PATH(ENET_INCLUDE_DIRS enet/enet.h
+    PATHS
+    $ENV{ENETDIR}
+    /usr/local
+    /usr
+    PATH_SUFFIXES include
+)
+
+FIND_LIBRARY(ENET_LIBRARY
+    NAMES enet
+    PATHS
+    $ENV{ENETDIR}
+    /usr/local
+    /usr
+    PATH_SUFFIXES lib
+)
+
+# handle the QUIETLY and REQUIRED arguments and set ENET_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ENet DEFAULT_MSG ENET_LIBRARY ENET_INCLUDE_DIRS)
+
+IF (ENET_FOUND)
+    IF(WIN32)
+        SET(WINDOWS_ENET_DEPENDENCIES "ws2_32;winmm")
+        SET(ENET_LIBRARIES ${ENET_LIBRARY} ${WINDOWS_ENET_DEPENDENCIES})
+    ELSE(WIN32)
+        SET(ENET_LIBRARIES ${ENET_LIBRARY})
+    ENDIF(WIN32)
+ENDIF (ENET_FOUND)
+
+MARK_AS_ADVANCED(ENET_LIBRARY ENET_LIBRARIES ENET_INCLUDE_DIRS)

flake.nix

@@ -37,6 +37,7 @@
           libarchive
           libGL
           libslirp
+          enet
         ]) ++ optionals isLinux [
           pkgs.wayland
           pkgs.kdePackages.qtwayland

src/Platform.h

@@ -270,6 +270,9 @@ bool Mutex_TryLock(Mutex* mutex);
 
 void Sleep(u64 usecs);
 
+u64 GetMSCount();
+u64 GetUSCount();
+
 
 // functions called when the NDS or GBA save files need to be written back to storage
 // savedata and savelen are always the entire save memory buffer and its full length

src/frontend/qt_sdl/CMakeLists.txt

@@ -51,6 +51,9 @@ set(SOURCES_QT_SDL
 
     CLI.h
     CLI.cpp
+
+    LANDialog.cpp
+    NetplayDialog.cpp
 )
 
 if (APPLE)

src/frontend/qt_sdl/EmuInstance.cpp

@@ -39,7 +39,7 @@
 #include "Config.h"
 #include "Platform.h"
 #include "Net.h"
-#include "LocalMP.h"
+#include "MPInterface.h"
 
 #include "NDS.h"
 #include "DSi.h"
@@ -62,11 +62,11 @@ using namespace melonDS::Platform;
 MainWindow* topWindow = nullptr;
 
 const string kWifiSettingsPath = "wfcsettings.bin";
-extern LocalMP localMp;
 extern Net net;
 
 
-EmuInstance::EmuInstance(int inst) : instanceID(inst),
+EmuInstance::EmuInstance(int inst) : deleting(false),
+    instanceID(inst),
     globalCfg(Config::GetGlobalTable()),
     localCfg(Config::GetLocalTable(inst))
 {
@@ -117,8 +117,10 @@ EmuInstance::EmuInstance(int inst) : instanceID(inst),
 
 EmuInstance::~EmuInstance()
 {
-    // TODO window cleanup and shit?
-    localMp.End(instanceID);
+    deleting = true;
+    deleteAllWindows();
+
+    MPInterface::Get().End(instanceID);
 
     emuThread->emuExit();
     emuThread->wait();
@@ -168,6 +170,44 @@ void EmuInstance::createWindow()
     emuThread->attachWindow(win);
 }
 
+void EmuInstance::deleteWindow(int id, bool close)
+{
+    if (id >= kMaxWindows) return;
+
+    MainWindow* win = windowList[id];
+    if (!win) return;
+
+    if (win->hasOpenGL() && win == mainWindow)
+    {
+        // we intentionally don't unpause here
+        emuThread->emuPause();
+        emuThread->deinitContext();
+    }
+
+    emuThread->detachWindow(win);
+
+    windowList[id] = nullptr;
+    numWindows--;
+
+    if (topWindow == win) topWindow = nullptr;
+    if (mainWindow == win) mainWindow = nullptr;
+
+    if (close)
+        win->close();
+
+    if ((!mainWindow) && (!deleting))
+    {
+        // if we closed this instance's main window, delete the instance
+        deleteEmuInstance(instanceID);
+    }
+}
+
+void EmuInstance::deleteAllWindows()
+{
+    for (int i = kMaxWindows-1; i >= 0; i--)
+        deleteWindow(i, true);
+}
+
 
 void EmuInstance::osdAddMessage(unsigned int color, const char* fmt, ...)
 {

src/frontend/qt_sdl/EmuInstance.h

@@ -91,6 +91,8 @@ class EmuInstance
     std::string instanceFileSuffix();
 
     void createWindow();
+    void deleteWindow(int id, bool close);
+    void deleteAllWindows();
 
     void osdAddMessage(unsigned int color, const char* fmt, ...);
 
@@ -217,6 +219,8 @@ class EmuInstance
     bool hotkeyPressed(int id)  { return hotkeyPress   & (1<<id); }
     bool hotkeyReleased(int id) { return hotkeyRelease & (1<<id); }
 
+    bool deleting;
+
     int instanceID;
 
     EmuThread* emuThread;

src/frontend/qt_sdl/EmuThread.cpp

@@ -151,6 +151,7 @@ void EmuThread::run()
 
     while (emuStatus != emuStatus_Exit)
     {
+        MPInterface::Get().Process();
         emuInstance->inputProcess();
 
         if (emuInstance->hotkeyPressed(HK_FastForwardToggle)) emit windowLimitFPSChange();