Cleaner handling of termination signals on UNIX

Author: nadiaholmquist

src/frontend/qt_sdl/Window.cpp

@@ -41,13 +41,6 @@
 #include <QVector>
 #include <QCommandLineParser>
 #include <QDesktopServices>
-#ifndef _WIN32
-#include <QGuiApplication>
-#include <QSocketNotifier>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <signal.h>
-#endif
 
 #include "main.h"
 #include "CheatsDialog.h"
@@ -213,17 +206,6 @@ static bool FileIsSupportedFiletype(const QString& filename, bool insideArchive
 }
 
 
-#ifndef _WIN32
-static int signalFd[2];
-QSocketNotifier *signalSn;
-
-static void signalHandler(int)
-{
-    char a = 1;
-    write(signalFd[0], &a, sizeof(a));
-}
-#endif
-
 
 MainWindow::MainWindow(int id, EmuInstance* inst, QWidget* parent) :
     QMainWindow(parent),
@@ -236,26 +218,6 @@ MainWindow::MainWindow(int id, EmuInstance* inst, QWidget* parent) :
     enabledSaved(false),
     focused(true)
 {
-#ifndef _WIN32
-    if (!parent)
-    {
-        if (socketpair(AF_UNIX, SOCK_STREAM, 0, signalFd))
-        {
-            qFatal("Couldn't create socketpair");
-        }
-
-        signalSn = new QSocketNotifier(signalFd[1], QSocketNotifier::Read, this);
-        connect(signalSn, SIGNAL(activated(int)), this, SLOT(onQuit()));
-
-        struct sigaction sa;
-
-        sa.sa_handler = signalHandler;
-        sigemptyset(&sa.sa_mask);
-        sa.sa_flags = 0;
-        sa.sa_flags |= SA_RESTART;
-        sigaction(SIGINT, &sa, 0);
-    }
-#endif
 
     showOSD = windowCfg.GetBool("ShowOSD");
 
@@ -1673,10 +1635,6 @@ void MainWindow::onImportSavefile()
 
 void MainWindow::onQuit()
 {
-#ifndef _WIN32
-    if (!parentWidget())
-        signalSn->setEnabled(false);
-#endif
     close();
 }
 

src/frontend/qt_sdl/main.cpp

@@ -41,7 +41,7 @@
 #include <QSocketNotifier>
 #include <unistd.h>
 #include <sys/socket.h>
-#include <signal.h>
+#include <csignal>
 #endif
 
 #include <SDL2/SDL.h>
@@ -266,6 +266,14 @@ bool MelonApplication::event(QEvent *event)
     return QApplication::event(event);
 }
 
+#ifndef _WIN32
+static void signalHandler(int signal)
+{
+    std::signal(signal, SIG_DFL);
+    qApp->quit();
+}
+#endif
+
 int main(int argc, char** argv)
 {
     sysTimer.start();
@@ -276,7 +284,7 @@ int main(int argc, char** argv)
 
     qputenv("QT_SCALE_FACTOR", "1");
 
-#ifdef _WIN32
+#if defined(_WIN32)
 #if QT_VERSION_MAJOR == 6
     // Allow using the system dark theme palette on Windows
     qputenv("QT_QPA_PLATFORM", "windows:darkmode=2");
@@ -306,6 +314,9 @@ int main(int argc, char** argv)
             freopen("NUL:", "w", stderr);
         }
     }
+#else
+    std::signal(SIGINT, signalHandler);
+    std::signal(SIGTERM, signalHandler);
 #endif
 
     printf("melonDS " MELONDS_VERSION "\n");