From 2afa70b8172339266feabbb9a93f2f165521f7d8 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Sun, 17 May 2020 02:37:23 +0200
Subject: miserable little attempt at adding a dialog

---
 src/frontend/qt_sdl/EmuSettingsDialog.h | 38 +++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/frontend/qt_sdl/EmuSettingsDialog.h

(limited to 'src/frontend/qt_sdl/EmuSettingsDialog.h')

diff --git a/src/frontend/qt_sdl/EmuSettingsDialog.h b/src/frontend/qt_sdl/EmuSettingsDialog.h
new file mode 100644
index 0000000..eb21aaa
--- /dev/null
+++ b/src/frontend/qt_sdl/EmuSettingsDialog.h
@@ -0,0 +1,38 @@
+/*
+    Copyright 2016-2020 Arisotura
+
+    This file is part of melonDS.
+
+    melonDS is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    melonDS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with melonDS. If not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef EMUSETTINGSDIALOG_H
+#define EMUSETTINGSDIALOG_H
+
+#include <QDialog>
+
+namespace Ui { class EmuSettingsDialog; }
+
+class EmuSettingsDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit EmuSettingsDialog(QWidget* parent);
+    ~EmuSettingsDialog();
+
+private:
+    Ui::EmuSettingsDialog* ui;
+};
+
+#endif // EMUSETTINGSDIALOG_H
-- 
cgit v1.2.3


From 60ba163f08e0af4272c8de6141583238eb283fe8 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Sun, 17 May 2020 04:02:16 +0200
Subject: take this somewhere

---
 src/frontend/qt_sdl/EmuSettingsDialog.cpp | 70 +++++++++++++++++++++++++++++++
 src/frontend/qt_sdl/EmuSettingsDialog.h   | 26 ++++++++++++
 src/frontend/qt_sdl/main.cpp              |  4 +-
 3 files changed, 97 insertions(+), 3 deletions(-)

(limited to 'src/frontend/qt_sdl/EmuSettingsDialog.h')

diff --git a/src/frontend/qt_sdl/EmuSettingsDialog.cpp b/src/frontend/qt_sdl/EmuSettingsDialog.cpp
index c64f192..34cafb5 100644
--- a/src/frontend/qt_sdl/EmuSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/EmuSettingsDialog.cpp
@@ -16,16 +16,86 @@
     with melonDS. If not, see http://www.gnu.org/licenses/.
 */
 
+#include <QFileDialog>
+
+#include "types.h"
+#include "Config.h"
+#include "PlatformConfig.h"
+
 #include "EmuSettingsDialog.h"
 #include "ui_EmuSettingsDialog.h"
 
 
+EmuSettingsDialog* EmuSettingsDialog::currentDlg = nullptr;
+
+extern char* EmuDirectory;
+
+
 EmuSettingsDialog::EmuSettingsDialog(QWidget* parent) : QDialog(parent), ui(new Ui::EmuSettingsDialog)
 {
     ui->setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+
+    ui->txtBIOS9Path->setText(Config::BIOS9Path);
+    ui->txtBIOS7Path->setText(Config::BIOS7Path);
+    ui->txtFirmwarePath->setText(Config::FirmwarePath);
+    ui->chkDirectBoot->setChecked(Config::DirectBoot != 0);
 }
 
 EmuSettingsDialog::~EmuSettingsDialog()
 {
     delete ui;
 }
+
+void EmuSettingsDialog::on_EmuSettingsDialog_accepted()
+{
+    strncpy(Config::BIOS9Path, ui->txtBIOS9Path->text().toStdString().c_str(), 1023); Config::BIOS9Path[1023] = '\0';
+    strncpy(Config::BIOS7Path, ui->txtBIOS7Path->text().toStdString().c_str(), 1023); Config::BIOS7Path[1023] = '\0';
+    strncpy(Config::FirmwarePath, ui->txtFirmwarePath->text().toStdString().c_str(), 1023); Config::FirmwarePath[1023] = '\0';
+    Config::DirectBoot = ui->chkDirectBoot->isChecked() ? 1:0;
+
+    closeDlg();
+}
+
+void EmuSettingsDialog::on_EmuSettingsDialog_rejected()
+{
+    closeDlg();
+}
+
+void EmuSettingsDialog::on_btnBIOS9Browse_clicked()
+{
+    QString file = QFileDialog::getOpenFileName(this,
+                                                "Select DS-mode ARM9 BIOS...",
+                                                EmuDirectory,
+                                                "BIOS files (*.bin *.rom);;Any file (*.*)");
+
+    if (file.isEmpty()) return;
+
+    ui->txtBIOS9Path->setText(file);
+}
+
+void EmuSettingsDialog::on_btnBIOS7Browse_clicked()
+{
+    QString file = QFileDialog::getOpenFileName(this,
+                                                "Select DS-mode ARM7 BIOS...",
+                                                EmuDirectory,
+                                                "BIOS files (*.bin *.rom);;Any file (*.*)");
+
+    if (file.isEmpty()) return;
+
+    ui->txtBIOS7Path->setText(file);
+}
+
+void EmuSettingsDialog::on_btnFirmwareBrowse_clicked()
+{
+    QString file = QFileDialog::getOpenFileName(this,
+                                                "Select DS-mode firmware...",
+                                                EmuDirectory,
+                                                "Firmware files (*.bin *.rom);;Any file (*.*)");
+
+    if (file.isEmpty()) return;
+
+    // TODO: check for shitty hacked firmware here?
+
+    ui->txtFirmwarePath->setText(file);
+}
diff --git a/src/frontend/qt_sdl/EmuSettingsDialog.h b/src/frontend/qt_sdl/EmuSettingsDialog.h
index eb21aaa..471e0fb 100644
--- a/src/frontend/qt_sdl/EmuSettingsDialog.h
+++ b/src/frontend/qt_sdl/EmuSettingsDialog.h
@@ -22,6 +22,7 @@
 #include <QDialog>
 
 namespace Ui { class EmuSettingsDialog; }
+class EmuSettingsDialog;
 
 class EmuSettingsDialog : public QDialog
 {
@@ -31,6 +32,31 @@ public:
     explicit EmuSettingsDialog(QWidget* parent);
     ~EmuSettingsDialog();
 
+    static EmuSettingsDialog* currentDlg;
+    static void openDlg(QWidget* parent)
+    {
+        if (currentDlg)
+        {
+            currentDlg->activateWindow();
+            return;
+        }
+
+        currentDlg = new EmuSettingsDialog(parent);
+        currentDlg->show();
+    }
+    static void closeDlg()
+    {
+        currentDlg = nullptr;
+    }
+
+private slots:
+    void on_EmuSettingsDialog_accepted();
+    void on_EmuSettingsDialog_rejected();
+
+    void on_btnBIOS9Browse_clicked();
+    void on_btnBIOS7Browse_clicked();
+    void on_btnFirmwareBrowse_clicked();
+
 private:
     Ui::EmuSettingsDialog* ui;
 };
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 3986876..8b97320 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -820,9 +820,7 @@ void MainWindow::onEmuUnpause()
 
 void MainWindow::onOpenEmuSettings()
 {
-    // TODO keep track of this pointer!!
-    EmuSettingsDialog* dlg = new EmuSettingsDialog(this);
-    dlg->show();
+    EmuSettingsDialog::openDlg(this);
 }
 
 
-- 
cgit v1.2.3


From 17d30e91f01ea015caf5e28afe8ddca4aede45b1 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Sun, 17 May 2020 04:37:44 +0200
Subject: actually hook this up

---
 src/Config.cpp                            |  8 +++++
 src/Config.h                              |  4 +++
 src/NDS.cpp                               |  4 +--
 src/SPI.cpp                               | 16 +++++++---
 src/frontend/qt_sdl/EmuSettingsDialog.cpp | 49 +++++++++++++++++++++++++++++--
 src/frontend/qt_sdl/EmuSettingsDialog.h   |  2 ++
 src/frontend/qt_sdl/PlatformConfig.cpp    |  8 -----
 src/frontend/qt_sdl/PlatformConfig.h      |  4 ---
 8 files changed, 75 insertions(+), 20 deletions(-)

(limited to 'src/frontend/qt_sdl/EmuSettingsDialog.h')

diff --git a/src/Config.cpp b/src/Config.cpp
index f558ef6..7604785 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -28,6 +28,10 @@ namespace Config
 
 const char* kConfigFile = "melonDS.ini";
 
+char BIOS9Path[1024];
+char BIOS7Path[1024];
+char FirmwarePath[1024];
+
 int _3DRenderer;
 int Threaded3D;
 
@@ -36,6 +40,10 @@ int GL_Antialias;
 
 ConfigEntry ConfigFile[] =
 {
+    {"BIOS9Path", 1, BIOS9Path, 0, "", 1023},
+    {"BIOS7Path", 1, BIOS7Path, 0, "", 1023},
+    {"FirmwarePath", 1, FirmwarePath, 0, "", 1023},
+
     {"3DRenderer", 0, &_3DRenderer, 1, NULL, 0},
     {"Threaded3D", 0, &Threaded3D, 1, NULL, 0},
 
diff --git a/src/Config.h b/src/Config.h
index 0aeab85..05b9b8b 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -42,6 +42,10 @@ bool HasConfigFile(const char* fileName);
 void Load();
 void Save();
 
+extern char BIOS9Path[1024];
+extern char BIOS7Path[1024];
+extern char FirmwarePath[1024];
+
 extern int _3DRenderer;
 extern int Threaded3D;
 
diff --git a/src/NDS.cpp b/src/NDS.cpp
index a2ab6ce..1d425a8 100644
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@@ -416,7 +416,7 @@ void Reset()
     RunningGame = false;
     LastSysClockCycles = 0;
 
-    f = Platform::OpenLocalFile("bios9.bin", "rb");
+    f = Platform::OpenLocalFile(Config::BIOS9Path, "rb");
     if (!f)
     {
         printf("ARM9 BIOS not found\n");
@@ -433,7 +433,7 @@ void Reset()
         fclose(f);
     }
 
-    f = Platform::OpenLocalFile("bios7.bin", "rb");
+    f = Platform::OpenLocalFile(Config::BIOS7Path, "rb");
     if (!f)
     {
         printf("ARM7 BIOS not found\n");
diff --git a/src/SPI.cpp b/src/SPI.cpp
index 1a5873e..056e8d5 100644
--- a/src/SPI.cpp
+++ b/src/SPI.cpp
@@ -28,6 +28,7 @@
 namespace SPI_Firmware
 {
 
+char FirmwarePath[1024];
 u8* Firmware;
 u32 FirmwareLength;
 u32 FirmwareMask;
@@ -76,6 +77,7 @@ bool VerifyCRC16(u32 start, u32 offset, u32 len, u32 crcoffset)
 
 bool Init()
 {
+    memset(FirmwarePath, 0, sizeof(FirmwarePath));
     Firmware = NULL;
     return true;
 }
@@ -90,10 +92,12 @@ void Reset()
     if (Firmware) delete[] Firmware;
     Firmware = NULL;
 
-    FILE* f = Platform::OpenLocalFile("firmware.bin", "rb");
+    strncpy(FirmwarePath, Config::FirmwarePath, 1023);
+
+    FILE* f = Platform::OpenLocalFile(FirmwarePath, "rb");
     if (!f)
     {
-        printf("firmware.bin not found\n");
+        printf("Firmware not found\n");
 
         // TODO: generate default firmware
         return;
@@ -129,7 +133,11 @@ void Reset()
     fclose(f);
 
     // take a backup
-    const char* firmbkp = "firmware.bin.bak";
+    char firmbkp[1028];
+    int fplen = strlen(FirmwarePath);
+    strncpy(&firmbkp[0], FirmwarePath, fplen);
+    strncpy(&firmbkp[fplen], ".bak", 1028-fplen);
+    firmbkp[fplen+4] = '\0';
     f = Platform::OpenLocalFile(firmbkp, "rb");
     if (f) fclose(f);
     else
@@ -325,7 +333,7 @@ void Write(u8 val, u32 hold)
 
     if (!hold && (CurCmd == 0x02 || CurCmd == 0x0A))
     {
-        FILE* f = Platform::OpenLocalFile("firmware.bin", "r+b");
+        FILE* f = Platform::OpenLocalFile(FirmwarePath, "r+b");
         if (f)
         {
             u32 cutoff = 0x7FA00 & FirmwareMask;
diff --git a/src/frontend/qt_sdl/EmuSettingsDialog.cpp b/src/frontend/qt_sdl/EmuSettingsDialog.cpp
index 34cafb5..bce5513 100644
--- a/src/frontend/qt_sdl/EmuSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/EmuSettingsDialog.cpp
@@ -16,9 +16,12 @@
     with melonDS. If not, see http://www.gnu.org/licenses/.
 */
 
+#include <stdio.h>
 #include <QFileDialog>
+#include <QMessageBox>
 
 #include "types.h"
+#include "Platform.h"
 #include "Config.h"
 #include "PlatformConfig.h"
 
@@ -47,8 +50,52 @@ EmuSettingsDialog::~EmuSettingsDialog()
     delete ui;
 }
 
+void EmuSettingsDialog::verifyFirmware()
+{
+    // verify the firmware
+    //
+    // there are dumps of an old hacked firmware floating around on the internet
+    // and those are problematic
+    // the hack predates WFC, and, due to this, any game that alters the WFC
+    // access point data will brick that firmware due to it having critical
+    // data in the same area. it has the same problem on hardware.
+    //
+    // but this should help stop users from reporting that issue over and over
+    // again, when the issue is not from melonDS but from their firmware dump.
+    //
+    // I don't know about all the firmware hacks in existence, but the one I
+    // looked at has 0x180 bytes from the header repeated at 0x3FC80, but
+    // bytes 0x0C-0x14 are different.
+
+    char filename[1024];
+    strncpy(filename, ui->txtFirmwarePath->text().toStdString().c_str(), 1023); filename[1023] = '\0';
+    FILE* f = Platform::OpenLocalFile(filename, "rb");
+    u8 chk1[0x180], chk2[0x180];
+
+    fseek(f, 0, SEEK_SET);
+    fread(chk1, 1, 0x180, f);
+    fseek(f, -0x380, SEEK_END);
+    fread(chk2, 1, 0x180, f);
+
+    memset(&chk1[0x0C], 0, 8);
+    memset(&chk2[0x0C], 0, 8);
+
+    fclose(f);
+
+    if (!memcmp(chk1, chk2, 0x180))
+    {
+        QMessageBox::warning(this,
+                      "Problematic firmware dump",
+                      "You are using an old hacked firmware dump.\n"
+                      "Firmware boot will stop working if you run any game that alters WFC settings.\n\n"
+                      "Note that the issue is not from melonDS, it would also happen on an actual DS.");
+    }
+}
+
 void EmuSettingsDialog::on_EmuSettingsDialog_accepted()
 {
+    verifyFirmware();
+
     strncpy(Config::BIOS9Path, ui->txtBIOS9Path->text().toStdString().c_str(), 1023); Config::BIOS9Path[1023] = '\0';
     strncpy(Config::BIOS7Path, ui->txtBIOS7Path->text().toStdString().c_str(), 1023); Config::BIOS7Path[1023] = '\0';
     strncpy(Config::FirmwarePath, ui->txtFirmwarePath->text().toStdString().c_str(), 1023); Config::FirmwarePath[1023] = '\0';
@@ -95,7 +142,5 @@ void EmuSettingsDialog::on_btnFirmwareBrowse_clicked()
 
     if (file.isEmpty()) return;
 
-    // TODO: check for shitty hacked firmware here?
-
     ui->txtFirmwarePath->setText(file);
 }
diff --git a/src/frontend/qt_sdl/EmuSettingsDialog.h b/src/frontend/qt_sdl/EmuSettingsDialog.h
index 471e0fb..ce64145 100644
--- a/src/frontend/qt_sdl/EmuSettingsDialog.h
+++ b/src/frontend/qt_sdl/EmuSettingsDialog.h
@@ -58,6 +58,8 @@ private slots:
     void on_btnFirmwareBrowse_clicked();
 
 private:
+    void verifyFirmware();
+
     Ui::EmuSettingsDialog* ui;
 };
 
diff --git a/src/frontend/qt_sdl/PlatformConfig.cpp b/src/frontend/qt_sdl/PlatformConfig.cpp
index fba649c..1f6a873 100644
--- a/src/frontend/qt_sdl/PlatformConfig.cpp
+++ b/src/frontend/qt_sdl/PlatformConfig.cpp
@@ -64,10 +64,6 @@ char MicWavPath[1024];
 
 char LastROMFolder[1024];
 
-char BIOS9Path[1024];
-char BIOS7Path[1024];
-char FirmwarePath[1024];
-
 
 ConfigEntry PlatformConfigFile[] =
 {
@@ -149,10 +145,6 @@ ConfigEntry PlatformConfigFile[] =
 
     {"LastROMFolder", 1, LastROMFolder, 0, "", 1023},
 
-    {"BIOS9Path", 1, BIOS9Path, 0, "", 1023},
-    {"BIOS7Path", 1, BIOS7Path, 0, "", 1023},
-    {"FirmwarePath", 1, FirmwarePath, 0, "", 1023},
-
     {"", -1, NULL, 0, NULL, 0}
 };
 
diff --git a/src/frontend/qt_sdl/PlatformConfig.h b/src/frontend/qt_sdl/PlatformConfig.h
index e104015..3704d14 100644
--- a/src/frontend/qt_sdl/PlatformConfig.h
+++ b/src/frontend/qt_sdl/PlatformConfig.h
@@ -77,10 +77,6 @@ extern char MicWavPath[1024];
 
 extern char LastROMFolder[1024];
 
-extern char BIOS9Path[1024];
-extern char BIOS7Path[1024];
-extern char FirmwarePath[1024];
-
 }
 
 #endif // PLATFORMCONFIG_H
-- 
cgit v1.2.3


From 19566178ba7ee1fcd4207139286707cc3896493a Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Sun, 17 May 2020 18:33:03 +0200
Subject: begin adding input dialog

---
 src/frontend/qt_sdl/CMakeLists.txt        |   1 +
 src/frontend/qt_sdl/EmuSettingsDialog.h   |   5 +-
 src/frontend/qt_sdl/InputConfigDialog.cpp |  53 +++++++++++++
 src/frontend/qt_sdl/InputConfigDialog.h   |  63 +++++++++++++++
 src/frontend/qt_sdl/InputConfigDialog.ui  | 126 ++++++++++++++++++++++++++++++
 src/frontend/qt_sdl/main.cpp              |  21 ++++-
 src/frontend/qt_sdl/main.h                |   3 +
 7 files changed, 268 insertions(+), 4 deletions(-)
 create mode 100644 src/frontend/qt_sdl/InputConfigDialog.cpp
 create mode 100644 src/frontend/qt_sdl/InputConfigDialog.h
 create mode 100644 src/frontend/qt_sdl/InputConfigDialog.ui

(limited to 'src/frontend/qt_sdl/EmuSettingsDialog.h')

diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
index a6aeb0e..da3bb1d 100644
--- a/src/frontend/qt_sdl/CMakeLists.txt
+++ b/src/frontend/qt_sdl/CMakeLists.txt
@@ -3,6 +3,7 @@ project(qt_sdl)
 SET(SOURCES_QT_SDL
 	main.cpp
 	EmuSettingsDialog.cpp
+	InputConfigDialog.cpp
 	Platform.cpp
 	PlatformConfig.cpp
 	
diff --git a/src/frontend/qt_sdl/EmuSettingsDialog.h b/src/frontend/qt_sdl/EmuSettingsDialog.h
index ce64145..7378641 100644
--- a/src/frontend/qt_sdl/EmuSettingsDialog.h
+++ b/src/frontend/qt_sdl/EmuSettingsDialog.h
@@ -33,16 +33,17 @@ public:
     ~EmuSettingsDialog();
 
     static EmuSettingsDialog* currentDlg;
-    static void openDlg(QWidget* parent)
+    static EmuSettingsDialog* openDlg(QWidget* parent)
     {
         if (currentDlg)
         {
             currentDlg->activateWindow();
-            return;
+            return currentDlg;
         }
 
         currentDlg = new EmuSettingsDialog(parent);
         currentDlg->show();
+        return currentDlg;
     }
     static void closeDlg()
     {
diff --git a/src/frontend/qt_sdl/InputConfigDialog.cpp b/src/frontend/qt_sdl/InputConfigDialog.cpp
new file mode 100644
index 0000000..f7c0ab2
--- /dev/null
+++ b/src/frontend/qt_sdl/InputConfigDialog.cpp
@@ -0,0 +1,53 @@
+/*
+    Copyright 2016-2020 Arisotura
+
+    This file is part of melonDS.
+
+    melonDS is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    melonDS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with melonDS. If not, see http://www.gnu.org/licenses/.
+*/
+
+//
+
+#include "types.h"
+#include "Config.h"
+#include "PlatformConfig.h"
+
+#include "InputConfigDialog.h"
+#include "ui_InputConfigDialog.h"
+
+
+InputConfigDialog* InputConfigDialog::currentDlg = nullptr;
+
+
+InputConfigDialog::InputConfigDialog(QWidget* parent) : QDialog(parent), ui(new Ui::InputConfigDialog)
+{
+    ui->setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+
+    //
+}
+
+InputConfigDialog::~InputConfigDialog()
+{
+    delete ui;
+}
+
+void InputConfigDialog::on_InputConfigDialog_accepted()
+{
+    closeDlg();
+}
+
+void InputConfigDialog::on_InputConfigDialog_rejected()
+{
+    closeDlg();
+}
diff --git a/src/frontend/qt_sdl/InputConfigDialog.h b/src/frontend/qt_sdl/InputConfigDialog.h
new file mode 100644
index 0000000..2af73db
--- /dev/null
+++ b/src/frontend/qt_sdl/InputConfigDialog.h
@@ -0,0 +1,63 @@
+/*
+    Copyright 2016-2020 Arisotura
+
+    This file is part of melonDS.
+
+    melonDS is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    melonDS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with melonDS. If not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef INPUTCONFIGDIALOG_H
+#define INPUTCONFIGDIALOG_H
+
+#include <QDialog>
+
+namespace Ui { class InputConfigDialog; }
+class InputConfigDialog;
+
+class InputConfigDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit InputConfigDialog(QWidget* parent);
+    ~InputConfigDialog();
+
+    static InputConfigDialog* currentDlg;
+    static InputConfigDialog* openDlg(QWidget* parent)
+    {
+        if (currentDlg)
+        {
+            currentDlg->activateWindow();
+            return currentDlg;
+        }
+
+        currentDlg = new InputConfigDialog(parent);
+        currentDlg->open();
+        return currentDlg;
+    }
+    static void closeDlg()
+    {
+        currentDlg = nullptr;
+    }
+
+private slots:
+    void on_InputConfigDialog_accepted();
+    void on_InputConfigDialog_rejected();
+
+    //
+
+private:
+    Ui::InputConfigDialog* ui;
+};
+
+#endif // INPUTCONFIGDIALOG_H
diff --git a/src/frontend/qt_sdl/InputConfigDialog.ui b/src/frontend/qt_sdl/InputConfigDialog.ui
new file mode 100644
index 0000000..c1422e9
--- /dev/null
+++ b/src/frontend/qt_sdl/InputConfigDialog.ui
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>InputConfigDialog</class>
+ <widget class="QDialog" name="InputConfigDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>488</width>
+    <height>365</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>TDAH</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetFixedSize</enum>
+   </property>
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>1</number>
+     </property>
+     <widget class="QWidget" name="tabInput">
+      <attribute name="title">
+       <string>DS input</string>
+      </attribute>
+     </widget>
+     <widget class="QWidget" name="tabHotkeysGeneral">
+      <attribute name="title">
+       <string>General hotkeys</string>
+      </attribute>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Joystick:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="cbxJoystick">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="whatsThis">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selects which joystick will be used for joystick input, if any is present.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>InputConfigDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>InputConfigDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index a7388a0..cd7849d 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -32,6 +32,7 @@
 
 #include "main.h"
 #include "EmuSettingsDialog.h"
+#include "InputConfigDialog.h"
 
 #include "types.h"
 #include "version.h"
@@ -551,6 +552,9 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
 
         actEmuSettings = menu->addAction("Emu settings");
         connect(actEmuSettings, &QAction::triggered, this, &MainWindow::onOpenEmuSettings);
+
+        actInputConfig = menu->addAction("Input and hotkeys");
+        connect(actInputConfig, &QAction::triggered, this, &MainWindow::onOpenInputConfig);
     }
     setMenuBar(menubar);
 
@@ -850,6 +854,19 @@ void MainWindow::onOpenEmuSettings()
     EmuSettingsDialog::openDlg(this);
 }
 
+void MainWindow::onOpenInputConfig()
+{
+    emuThread->emuPause(true);
+
+    InputConfigDialog* dlg = InputConfigDialog::openDlg(this);
+    connect(dlg, &InputConfigDialog::finished, this, &MainWindow::onInputConfigFinished);
+}
+
+void MainWindow::onInputConfigFinished()
+{printf("FARTO\n");
+    emuThread->emuUnpause();
+}
+
 
 int main(int argc, char** argv)
 {
@@ -915,8 +932,8 @@ int main(int argc, char** argv)
 
     Config::Load();
 
-    //if      (Config::AudioVolume < 0)   Config::AudioVolume = 0;
-    //else if (Config::AudioVolume > 256) Config::AudioVolume = 256;
+    if      (Config::AudioVolume < 0)   Config::AudioVolume = 0;
+    else if (Config::AudioVolume > 256) Config::AudioVolume = 256;
 
     // TODO: this should be checked before running anything
 #if 0
diff --git a/src/frontend/qt_sdl/main.h b/src/frontend/qt_sdl/main.h
index ee0094f..0324ecf 100644
--- a/src/frontend/qt_sdl/main.h
+++ b/src/frontend/qt_sdl/main.h
@@ -108,6 +108,8 @@ private slots:
     void onEmuUnpause();
 
     void onOpenEmuSettings();
+    void onOpenInputConfig();
+    void onInputConfigFinished();
 
 private:
     QString loadErrorStr(int error);
@@ -126,6 +128,7 @@ private:
     QAction* actStop;
 
     QAction* actEmuSettings;
+    QAction* actInputConfig;
 };
 
 #endif // MAIN_H
-- 
cgit v1.2.3