Remove NFDE in favor of SDL_NFD.

Arignir · Arignir · commit 2afb9f6a9c93 · 2026-01-18T19:34:03.000-05:00
diff --git a/.github/workflows/accuracy.yml b/.github/workflows/accuracy.yml
@@ -46,7 +46,6 @@ jobs:
             meson \
             ninja-build \
             libglew-dev \
-            libgtk-3-dev \
             libreadline-dev \
             libedit-dev \
             libcapstone-dev \
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -193,7 +193,6 @@ jobs:
             ninja-build \
             libfuse2 \
             libglew-dev \
-            libgtk-3-dev \
             libarchive-dev \
             libudev-dev \
             libpipewire-0.3-dev
@@ -273,7 +272,6 @@ jobs:
             meson \
             ninja-build \
             libglew-dev \
-            libgtk-3-dev \
             libarchive-dev \
             libudev-dev \
             libpipewire-0.3-dev
@@ -321,7 +319,7 @@ jobs:
           maintainer: The Hades Authors
           version: 1.0.0
           arch: 'amd64'
-          depends: 'libarchive13, libgtk-3-0, libglew2.2'
+          depends: 'libarchive13, libglew2.2, libdecor-0-0'
           desc: 'A Nintendo Game Boy Advance Emulator.'
       - name: Test Hades
         run: |
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "external/stb"]
 	path = external/stb
 	url = https://github.com/nothings/stb.git
-[submodule "external/nfde"]
-	path = external/nfde
-	url = https://github.com/btzy/nativefiledialog-extended.git
 [submodule "external/mjson"]
 	path = external/mjson
 	url = https://github.com/cesanta/mjson.git
diff --git a/README.md b/README.md
@@ -51,19 +51,18 @@ To build Hades, you first need to install those dependencies:
   - `SDL3`
   - `OpenGL`
   - `glew`
-  - `gtk3`
   - `libarchive`
 
 On the latest Ubuntu, you can install all those dependencies with:
 
 ```bash
-$ apt install meson ninja-build gcc libsdl3-dev libglew-dev libgtk-3-dev libarchive-dev
+$ apt install meson ninja-build gcc libsdl3-dev libglew-dev libarchive-dev
 ```
 
 On Fedora, you can install all those dependencies with:
 
 ```bash
-$ dnf install meson ninja-build gcc SDL3-devel glew-devel gtk3-devel libarchive-devel
+$ dnf install meson ninja-build gcc SDL3-devel glew-devel libarchive-devel
 ```
 
 Finally, to build Hades, run:
diff --git a/external/meson.build b/external/meson.build
@@ -90,39 +90,3 @@ mjson = static_library(
 stb_inc = include_directories(
     'stb/'
 )
-
-###############################
-##            NFDe           ##
-###############################
-
-nfde_inc = include_directories(
-    'nfde/src/include/'
-)
-
-nfde_src = []
-nfde_dep = []
-
-if host_machine.system() == 'windows'
-    nfde_src += ['nfde/src/nfd_win.cpp']
-elif host_machine.system() == 'darwin'
-    add_languages('objc')
-    nfde_src += ['nfde/src/nfd_cocoa.m']
-    nfde_dep += [
-        dependency('appleframeworks', required: true, modules: ['AppKit', 'UniformTypeIdentifiers']),
-    ]
-else
-    nfde_src += ['nfde/src/nfd_gtk.cpp']
-    nfde_dep += [
-        dependency('gtk+-3.0', required: true, static: static_dependencies),
-    ]
-endif
-
-nfde = static_library(
-    'nfde',
-    nfde_src,
-    include_directories: nfde_inc,
-    dependencies: nfde_dep,
-    c_args: cflags,
-    cpp_args: cflags,
-    link_args: ldflags,
-)
diff --git a/external/nfde b/external/nfde
diff --git a/include/app/app.h b/include/app/app.h
@@ -13,10 +13,11 @@
 #include <capstone/capstone.h>
 #endif
 
-#include <stdatomic.h>
-#include <GL/glew.h>
 #include <SDL3/SDL.h>
+#include <SDL3/SDL_dialog.h>
+#include <GL/glew.h>
 #include <cimgui.h>
+#include <stdatomic.h>
 #include "gba/gba.h"
 
 #define GLSL(src)                   "#version 330 core\n" #src
@@ -142,13 +143,26 @@ enum bind_actions {
 
 extern char const * const binds_pretty_name[];
 extern char const * const binds_slug[];
+extern SDL_DialogFileFilter const sdl_nfd_bios_filters[];
+extern SDL_DialogFileFilter const sdl_nfd_rom_filters[];
+extern SDL_DialogFileFilter const sdl_nfd_save_filters[];
 
 enum app_notification_kind {
     UI_NOTIFICATION_INFO,
     UI_NOTIFICATION_SUCCESS,
     UI_NOTIFICATION_ERROR,
 };
 
+enum nfd_event_kind {
+    NFD_BIOS_PATH,
+    NFD_ROM_PATH,
+    NFD_EXPORT_SAVE,
+    NFD_IMPORT_SAVE,
+    NFD_SAVE_DIR,
+    NFD_QUICKSAVE_DIR,
+    NFD_SCREENSHOT_DIR,
+};
+
 enum menu_kind {
     MENU_GENERAL,
     MENU_EMULATION,
@@ -167,6 +181,14 @@ struct app_notification {
     struct app_notification *next;
 };
 
+struct nfd_event {
+    enum nfd_event_kind kind;
+    struct app *app;
+    char *path;
+
+    struct nfd_event *next;
+};
+
 struct keyboard_binding {
     SDL_Keycode key;
 
@@ -400,6 +422,12 @@ struct app {
                 bool left;
             } joystick;
         } gamepad;
+
+        struct {
+            pthread_mutex_t lock;
+
+            struct nfd_event *head;
+        } nfd;
     } sdl;
 
     struct {
@@ -652,6 +680,9 @@ void app_emulator_set_watchpoints_list(struct app *app, struct watchpoint *watch
 /* event.c */
 void app_sdl_handle_events(struct app *app, SDL_Event *event);
 void app_sdl_set_rumble(struct app const *app, bool enable);
+void app_nfd_process_events(struct app *app);
+void app_nfd_update_path(void *raw_event, const char * const *filelist, int filter);
+struct nfd_event *app_nfd_create_event(struct app *app, enum nfd_event_kind kind);
 
 /* path.c */
 void app_paths_update(struct app *app);
diff --git a/resource/linux/AppImageBuilder.yml b/resource/linux/AppImageBuilder.yml
@@ -32,8 +32,6 @@ AppDir:
       - sourceline: deb http://security.ubuntu.com/ubuntu/ jammy-security multiverse
     include:
       - libarchive13
-      - libgtk-3-0
-      - libgtk-3-common
       - libglew2.2
       - librsvg2-common  # See https://github.com/hades-emu/Hades/issues/102
     exclude:
diff --git a/source/app/audio.c b/source/app/audio.c
@@ -28,7 +28,7 @@ app_sdl_audio_callback(
     len = additional_amount / sizeof(int16_t);
 
     if (len <= 0) {
-        return ;
+        return;
     }
 
     if (len > array_length(app->audio.buffer)) {
diff --git a/source/app/event.c b/source/app/event.c
@@ -260,7 +260,7 @@ app_sdl_set_rumble(
     bool enable
 ) {
     if (!app->sdl.gamepad.ptr || !app->sdl.gamepad.can_rumble) {
-        return ;
+        return;
     }
 
     // Rumble for 0.25s
diff --git a/source/app/main.c b/source/app/main.c
@@ -154,6 +154,7 @@ SDL_AppIterate(
     app->sdl.counters[1] = SDL_GetPerformanceCounter();
     elapsed_ms = ((float)(app->sdl.counters[1] - app->sdl.counters[0]) / (float)SDL_GetPerformanceFrequency()) * 1000.f;
 
+    app_nfd_process_events(app);
     app_emulator_process_all_notifs(app);
 
 #if WITH_DEBUGGER
diff --git a/source/app/meson.build b/source/app/meson.build
@@ -29,6 +29,7 @@ libapp_sources = [
     'emulator.c',
     'event.c',
     'main.c',
+    'nfd.c',
     'path.c',
     'video.c',
 ]
@@ -69,8 +70,8 @@ libapp = static_library(
         dependency('threads', required: true, static: static_dependencies),
         dependency('libarchive', version: '>=3.0', required: true, static: static_dependencies or get_option('static_libarchive')),
     ] + imgui_dep,
-    link_with: [libgba, imgui, nfde, mjson] + libapp_extra_deps,
-    include_directories: [incdir, imgui_inc, nfde_inc, mjson_inc, stb_inc],
+    link_with: [libgba, imgui, mjson] + libapp_extra_deps,
+    include_directories: [incdir, imgui_inc, mjson_inc, stb_inc],
     c_args: cflags + libapp_extra_cflags,
     link_args: ldflags,
 )
@@ -85,8 +86,8 @@ if get_option('with_debugger')
             dependency('libedit', required: true, static: static_dependencies),
             dependency('capstone', required: true, static: static_dependencies),
         ] + imgui_dep,
-        link_with: [libgba_dbg, imgui, nfde, mjson] + libapp_extra_deps,
-        include_directories: [incdir, imgui_inc, nfde_inc, mjson_inc, stb_inc],
+        link_with: [libgba_dbg, imgui, mjson] + libapp_extra_deps,
+        include_directories: [incdir, imgui_inc, mjson_inc, stb_inc],
         c_args: cflags + libapp_extra_cflags + debugger_cflags,
         link_args: ldflags + debugger_ldflags,
     )
diff --git a/source/app/nfd.c b/source/app/nfd.c
@@ -0,0 +1,116 @@
+/******************************************************************************\
+**
+**  This file is part of the Hades GBA Emulator, and is made available under
+**  the terms of the GNU General Public License version 2.
+**
+**  Copyright (C) 2021-2024 - The Hades Authors
+**
+\******************************************************************************/
+
+#include "hades.h"
+#include "app/app.h"
+
+void
+app_nfd_process_events(
+    struct app *app
+) {
+    struct nfd_event *event;
+    struct nfd_event *next;
+
+    pthread_mutex_lock(&app->sdl.nfd.lock);
+
+    event = app->sdl.nfd.head;
+
+    while (event) {
+        switch (event->kind) {
+            case NFD_BIOS_PATH: {
+                free(app->settings.emulation.bios_path);
+                app->settings.emulation.bios_path = event->path;
+                logln(HS_INFO, "BIOS updated to \"%s%s%s\".", g_light_green, app->settings.emulation.bios_path, g_reset);
+                break;
+            };
+            case NFD_ROM_PATH: {
+                app_emulator_configure_and_run(app, event->path, NULL);
+                free(event->path);
+                break;
+            };
+            case NFD_EXPORT_SAVE: {
+                app_emulator_export_save_to_path(app, event->path);
+                free(event->path);
+                break;
+            };
+            case NFD_IMPORT_SAVE: {
+                char *game_path;
+
+                game_path = strdup(app->emulation.game_path);
+                app_emulator_configure_and_run(app, game_path, event->path);
+                free(game_path);
+                free(event->path);
+                break;
+            };
+            case NFD_SAVE_DIR: {
+                free(app->settings.general.directories.backup.path);
+                app->settings.general.directories.backup.path = event->path;
+                break;
+            }
+            case NFD_QUICKSAVE_DIR: {
+                free(app->settings.general.directories.quicksave.path);
+                app->settings.general.directories.quicksave.path = event->path;
+                break;
+            }
+            case NFD_SCREENSHOT_DIR: {
+                free(app->settings.general.directories.screenshot.path);
+                app->settings.general.directories.screenshot.path = event->path;
+                break;
+            }
+        }
+
+        next = event->next;
+        free(event);
+        event = next;
+    }
+
+    app->sdl.nfd.head = NULL;
+
+    pthread_mutex_unlock(&app->sdl.nfd.lock);
+}
+
+struct nfd_event *
+app_nfd_create_event(
+    struct app *app,
+    enum nfd_event_kind kind
+) {
+    struct nfd_event *nfd_event;
+
+    nfd_event = calloc(1, sizeof(struct nfd_event));
+    hs_assert(nfd_event);
+
+    nfd_event->app = app;
+    nfd_event->kind = kind;
+
+    return nfd_event;
+}
+
+void
+app_nfd_update_path(
+    void *raw_event,
+    const char * const *filelist,
+    int filter __unused
+) {
+    struct nfd_event *event;
+    struct app *app;
+
+    event = raw_event;
+    app = event->app;
+
+    if (!filelist || !*filelist) {
+        free(event);
+        return;
+    }
+
+    pthread_mutex_lock(&app->sdl.nfd.lock);
+    event->next = app->sdl.nfd.head;
+    event->path = strdup(filelist[0]);
+    app->sdl.nfd.head = event;
+    pthread_mutex_unlock(&app->sdl.nfd.lock);
+}
diff --git a/source/app/video.c b/source/app/video.c
@@ -10,7 +10,6 @@
 #include <GL/glew.h>
 #include <cimgui.h>
 #include <cimgui_impl.h>
-#include <nfd.h>
 #include <math.h>
 
 #include "hades.h"
@@ -167,9 +166,6 @@ app_sdl_video_init(
     app->sdl.gamepad.connected = false;
     app->sdl.gamepad.joystick.idx = -1;
 
-    // Setup the Native File Dialog extension
-    NFD_Init();
-
     // Now that initialization is finished, we can render a fake, invisible frame.
     // This will be used to have an accurate size for the menubar if it's pinned.
     if (app->settings.video.menubar_mode == MENUBAR_MODE_PINNED) {
@@ -397,9 +393,6 @@ void
 app_sdl_video_cleanup(
     struct app *app
 ) {
-    /* Cleanup the Native File Dialog extension */
-    NFD_Quit();
-
     // Shutdown ImGui
     ImGui_ImplOpenGL3_Shutdown();
     ImGui_ImplSDL3_Shutdown();
diff --git a/source/app/windows/menubar.c b/source/app/windows/menubar.c
diff --git a/source/app/windows/settings.c b/source/app/windows/settings.c
diff --git a/source/gba/memory/bus.c b/source/gba/memory/bus.c

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ app_sdl_audio_callback(`
`28`	`28`	`len = additional_amount / sizeof(int16_t);`
`29`	`29`
`30`	`30`	`if (len <= 0) {`
`31`		`- return ;`
	`31`	`+ return;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if (len > array_length(app->audio.buffer)) {`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ app_sdl_set_rumble(`
`260`	`260`	`bool enable`
`261`	`261`	`) {`
`262`	`262`	`if (!app->sdl.gamepad.ptr \|\| !app->sdl.gamepad.can_rumble) {`
`263`		`- return ;`
	`263`	`+ return;`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`// Rumble for 0.25s`