Skip to content

WIP: Stop using gtk_main() and related APIs #19563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

WIP: Stop using gtk_main() and related APIs #19563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06fb9bd
add: Add .idea to .gitignore
Mike-Solar Oct 20, 2025
a9f1b79
change: use GApplication instead of gtk_main
Mike-Solar Oct 23, 2025
96a6490
Merge branch 'darktable-org:master' into master
Mike-Solar Oct 23, 2025
6f258d9
Merge remote-tracking branch 'origin/master' into gdkevent
Mike-Solar Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ output*png
Brewfile.lock.json
CMakeLists.txt.user
workspace/
.idea
cmake-build-debug/
.idea/
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ FILE(GLOB SOURCE_FILES
"common/curve_tools.c"
"common/custom_primaries.c"
"common/darktable.c"
"common/darktable_application.c"
"common/database.c"
"common/datetime.c"
"common/dbus.c"
Expand Down
41 changes: 17 additions & 24 deletions src/common/darktable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@

darktable_t darktable;

static int usage(const char *argv0)
int usage(const char *argv0)
{
#ifdef _WIN32
char *logfile = g_build_filename(g_get_home_dir(), "Documents", "Darktable", "darktable-log.txt", NULL);
Expand Down Expand Up @@ -752,7 +752,7 @@ void dt_stop_backthumbs_crawler(const gboolean wait)
}
}

static char *_get_version_string(void)
char *_get_version_string(void)
{
const char *exiv2_version = EXV_PACKAGE_VERSION "\n";

Expand Down Expand Up @@ -946,15 +946,7 @@ int dt_init(int argc, char *argv[], const gboolean init_gui, const gboolean load
dt_pthread_mutex_init(&darktable.metadata_threadsafe, NULL);
darktable.control = calloc(1, sizeof(dt_control_t));

// database
char *dbfilename_from_command = NULL;
char *noiseprofiles_from_command = NULL;
char *datadir_from_command = NULL;
char *moduledir_from_command = NULL;
char *localedir_from_command = NULL;
char *tmpdir_from_command = NULL;
char *configdir_from_command = NULL;
char *cachedir_from_command = NULL;


darktable.dump_pfm_module = NULL;
darktable.dump_pfm_pipe = NULL;
Expand All @@ -976,11 +968,11 @@ int dt_init(int argc, char *argv[], const gboolean init_gui, const gboolean load
darktable.num_openmp_threads = dt_get_num_procs();
darktable.pipe_cache = TRUE;
darktable.unmuted = 0;
GSList *config_override = NULL;

// keep a copy of argv array for possibly reporting later
gchar **myoptions = init_gui && argc > 1 ? g_strdupv(argv) : NULL;

/*
for(int k = 1; k < argc; k++)
{
#ifdef _WIN32
Expand Down Expand Up @@ -1361,6 +1353,7 @@ int dt_init(int argc, char *argv[], const gboolean init_gui, const gboolean load
argc -= k;
}
}
*/

/* We now have all command line options ready and check for gimp API questions.
Return right now if we
Expand Down Expand Up @@ -1407,12 +1400,12 @@ int dt_init(int argc, char *argv[], const gboolean init_gui, const gboolean load
// Set directories as requested or default.
// Set a result flag so if we can't create certain directories, we can
// later, after initializing the GUI, show the user a message and exit.
const uint8_t user_dir_failed = dt_loc_init(datadir_from_command,
moduledir_from_command,
localedir_from_command,
configdir_from_command,
cachedir_from_command,
tmpdir_from_command);
const uint8_t user_dir_failed = dt_loc_init(configs_from_command.datadir_from_command,
configs_from_command.moduledir_from_command,
configs_from_command.localedir_from_command,
configs_from_command.configdir_from_command,
configs_from_command.cachedir_from_command,
configs_from_command.tmpdir_from_command);

dt_print_mem_usage("at startup");

Expand Down Expand Up @@ -1515,9 +1508,9 @@ int dt_init(int argc, char *argv[], const gboolean init_gui, const gboolean load
dt_confgen_init();

// read actual configuration, needs confgen above for sanitizing values
dt_conf_init(darktable.conf, darktablerc, config_override);
dt_conf_init(darktable.conf, darktablerc, configs_from_command.config_override);

g_slist_free_full(config_override, g_free);
g_slist_free_full(configs_from_command.config_override, g_free);

const int last_configure_version =
dt_conf_get_int("performance_configuration_version_completed");
Expand Down Expand Up @@ -1584,7 +1577,7 @@ int dt_init(int argc, char *argv[], const gboolean init_gui, const gboolean load

// initialize the database
darktable_splash_screen_set_progress(_("opening image library"));
darktable.db = dt_database_init(dbfilename_from_command, load_data, init_gui);
darktable.db = dt_database_init(configs_from_command.dbfilename_from_command, load_data, init_gui);
if(darktable.db == NULL)
{
dt_print(DT_DEBUG_ALWAYS, "ERROR : cannot open database");
Expand Down Expand Up @@ -1645,7 +1638,7 @@ int dt_init(int argc, char *argv[], const gboolean init_gui, const gboolean load
}
else
{
if(dbfilename_from_command && !strcmp(dbfilename_from_command, ":memory:"))
if(configs_from_command.dbfilename_from_command && !strcmp(configs_from_command.dbfilename_from_command, ":memory:"))
dt_gui_presets_init(); // init preset db schema.
}

Expand Down Expand Up @@ -1788,7 +1781,7 @@ int dt_init(int argc, char *argv[], const gboolean init_gui, const gboolean load
dt_wb_presets_init(NULL);

darktable_splash_screen_set_progress(_("loading noise profiles"));
darktable.noiseprofile_parser = dt_noiseprofile_init(noiseprofiles_from_command);
darktable.noiseprofile_parser = dt_noiseprofile_init(configs_from_command.noiseprofiles_from_command);

// must come before mipmap_cache, because that one will need to access
// image dimensions stored in here:
Expand Down Expand Up @@ -1834,7 +1827,7 @@ int dt_init(int argc, char *argv[], const gboolean init_gui, const gboolean load
darktable.backthumbs.capable =
!dt_gimpmode()
&& dt_get_num_threads() >= 4
&& !(dbfilename_from_command && !strcmp(dbfilename_from_command, ":memory:"));
&& !(configs_from_command.dbfilename_from_command && !strcmp(configs_from_command.dbfilename_from_command, ":memory:"));
}
else
darktable.gui = NULL;
Expand Down
18 changes: 17 additions & 1 deletion src/common/darktable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,23 @@ static inline gboolean dt_check_gimpmode_ok(const char *mode)
{
return darktable.gimp.mode ? !darktable.gimp.error && strcmp(darktable.gimp.mode, mode) == 0 : FALSE;
}

struct configs_from_command
{
// database
char *dbfilename_from_command;
char *datadir_from_command;
char *moduledir_from_command;
char *localedir_from_command;
char *tmpdir_from_command;
char *configdir_from_command;
char *cachedir_from_command;
GSList *config_override;
char *noiseprofiles_from_command;
char *lua_command;
int exclude_opencl;

};
extern struct configs_from_command configs_from_command;
G_END_DECLS

// clang-format off
Expand Down
Loading