X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=571a910cd469d359e681cd6a2af6a8e5670bd5fa;hb=686b5bed543c5abd0310eff74d3d8083ab1ff01c;hp=45504f11f0ffd7209a68877096796406f9cefd0d;hpb=b8ea5645e91e203e09389311c412a0873e0343fc;p=geeqie.git diff --git a/src/main.c b/src/main.c index 45504f11..571a910c 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ /* * Geeqie * (C) 2006 John Ellis - * Copyright (C) 2008 The Geeqie Team + * Copyright (C) 2008 - 2012 The Geeqie Team * * Author: John Ellis * @@ -10,6 +10,16 @@ * This software comes with no warranty of any kind, use at your own risk! */ +#include /* for keyboard values */ + +#include +#include + +#include +#ifdef G_OS_UNIX +#include +#endif +#include #include "main.h" @@ -22,131 +32,29 @@ #include "image-overlay.h" #include "layout.h" #include "layout_image.h" -#include "rcfile.h" +#include "layout_util.h" +#include "options.h" #include "remote.h" +#include "secure_save.h" #include "similar.h" #include "ui_fileops.h" #include "ui_utildlg.h" #include "cache_maint.h" #include "thumb.h" - -#include /* for keyboard values */ - - -#include -#ifdef G_OS_UNIX -#include +#include "metadata.h" +#include "editors.h" +#include "exif.h" +#include "histogram.h" +#include "pixbuf_util.h" + +#ifdef HAVE_CLUTTER +#include #endif +gboolean thumb_format_changed = FALSE; static RemoteConnection *remote_connection = NULL; - -/* - *----------------------------------------------------------------------------- - * misc (public) - *----------------------------------------------------------------------------- - */ - - -gdouble get_zoom_increment(void) -{ - return ((options->image.zoom_increment != 0) ? (gdouble)options->image.zoom_increment / 10.0 : 1.0); -} - -gchar *utf8_validate_or_convert(const gchar *text) -{ - gint len; - - if (!text) return NULL; - - len = strlen(text); - if (!g_utf8_validate(text, len, NULL)) - return g_convert(text, len, "UTF-8", "ISO-8859-1", NULL, NULL, NULL); - - return g_strdup(text); -} - -gint utf8_compare(const gchar *s1, const gchar *s2, gboolean case_sensitive) -{ - gchar *s1_key, *s2_key; - gchar *s1_t, *s2_t; - gint ret; - - g_assert(g_utf8_validate(s1, -1, NULL)); - g_assert(g_utf8_validate(s2, -1, NULL)); - - if (!case_sensitive) - { - s1_t = g_utf8_casefold(s1, -1); - s2_t = g_utf8_casefold(s2, -1); - } - - s1_key = g_utf8_collate_key(s1_t, -1); - s2_key = g_utf8_collate_key(s2_t, -1); - - ret = strcmp(s1_key, s2_key); - - g_free(s1_key); - g_free(s2_key); - - if (!case_sensitive) - { - g_free(s1_t); - g_free(s2_t); - } - - return ret; -} - -/* Borrowed from gtkfilesystemunix.c */ -gchar *expand_tilde(const gchar *filename) -{ -#ifndef G_OS_UNIX - return g_strdup(filename); -#else - const char *notilde; - const char *slash; - const char *home; - - if (filename[0] != '~') - return g_strdup(filename); - - notilde = filename + 1; - slash = strchr(notilde, G_DIR_SEPARATOR); - if (slash == notilde || !*notilde) - { - home = g_get_home_dir(); - if (!home) - return g_strdup(filename); - } - else - { - gchar *username; - struct passwd *passwd; - - if (slash) - username = g_strndup(notilde, slash - notilde); - else - username = g_strdup(notilde); - - passwd = getpwnam(username); - g_free(username); - - if (!passwd) - return g_strdup(filename); - - home = passwd->pw_dir; - } - - if (slash) - return g_build_filename(home, G_DIR_SEPARATOR_S, slash + 1, NULL); - else - return g_build_filename(home, G_DIR_SEPARATOR_S, NULL); -#endif -} - - /* *----------------------------------------------------------------------------- * keyboard functions @@ -200,12 +108,6 @@ void keyboard_scroll_calc(gint *x, gint *y, GdkEventKey *event) *----------------------------------------------------------------------------- */ -static gint startup_blank = FALSE; -static gint startup_full_screen = FALSE; -static gint startup_in_slideshow = FALSE; -static gint startup_command_line_collection = FALSE; - - static void parse_command_line_add_file(const gchar *file_path, gchar **path, gchar **file, GList **list, GList **collection_list) { @@ -222,20 +124,23 @@ static void parse_command_line_add_file(const gchar *file_path, gchar **path, gc { if (!*path) *path = remove_level_from_path(path_parsed); if (!*file) *file = g_strdup(path_parsed); - *list = g_list_prepend(*list, file_data_new_simple(path_parsed)); + *list = g_list_prepend(*list, file_data_new_group(path_parsed)); } } static void parse_command_line_add_dir(const gchar *dir, gchar **path, gchar **file, GList **list) { +#if 0 + /* This is broken because file filter is not initialized yet. + */ GList *files; gchar *path_parsed; FileData *dir_fd; path_parsed = g_strdup(dir); parse_out_relatives(path_parsed); - dir_fd = file_data_new_simple(path_parsed); + dir_fd = file_data_new_dir(path_parsed); if (filelist_read(dir_fd, &files, NULL)) @@ -261,6 +166,9 @@ static void parse_command_line_add_dir(const gchar *dir, gchar **path, gchar **f g_free(path_parsed); file_data_unref(dir_fd); +#else + DEBUG_1("multiple directories specified, ignoring: %s", dir); +#endif } static void parse_command_line_process_dir(const gchar *dir, gchar **path, gchar **file, @@ -296,15 +204,18 @@ static void parse_command_line_process_file(const gchar *file_path, gchar **path parse_command_line_add_file(file_path, path, file, list, collection_list); } -static void parse_command_line(int argc, char *argv[], gchar **path, gchar **file, - GList **cmd_list, GList **collection_list, - gchar **geometry) +static void parse_command_line(gint argc, gchar *argv[]) { GList *list = NULL; GList *remote_list = NULL; GList *remote_errors = NULL; - gint remote_do = FALSE; + gboolean remote_do = FALSE; gchar *first_dir = NULL; + + command_line = g_new0(CommandLine, 1); + + command_line->argc = argc; + command_line->argv = argv; if (argc > 1) { @@ -313,26 +224,26 @@ static void parse_command_line(int argc, char *argv[], gchar **path, gchar **fil i = 1; while (i < argc) { - const gchar *cmd_line = argv[i]; + gchar *cmd_line = path_to_utf8(argv[i]); gchar *cmd_all = g_build_filename(base_dir, cmd_line, NULL); if (cmd_line[0] == G_DIR_SEPARATOR && isdir(cmd_line)) { - parse_command_line_process_dir(cmd_line, path, file, &list, &first_dir); + parse_command_line_process_dir(cmd_line, &command_line->path, &command_line->file, &list, &first_dir); } else if (isdir(cmd_all)) { - parse_command_line_process_dir(cmd_all, path, file, &list, &first_dir); + parse_command_line_process_dir(cmd_all, &command_line->path, &command_line->file, &list, &first_dir); } else if (cmd_line[0] == G_DIR_SEPARATOR && isfile(cmd_line)) { - parse_command_line_process_file(cmd_line, path, file, - &list, collection_list, &first_dir); + parse_command_line_process_file(cmd_line, &command_line->path, &command_line->file, + &list, &command_line->collection_list, &first_dir); } else if (isfile(cmd_all)) { - parse_command_line_process_file(cmd_all, path, file, - &list, collection_list, &first_dir); + parse_command_line_process_file(cmd_all, &command_line->path, &command_line->file, + &list, &command_line->collection_list, &first_dir); } else if (strncmp(cmd_line, "--debug", 7) == 0 && (cmd_line[7] == '\0' || cmd_line[7] == '=')) { @@ -341,36 +252,35 @@ static void parse_command_line(int argc, char *argv[], gchar **path, gchar **fil else if (strcmp(cmd_line, "+t") == 0 || strcmp(cmd_line, "--with-tools") == 0) { - options->layout.tools_float = FALSE; - options->layout.tools_hidden = FALSE; + command_line->tools_show = TRUE; remote_list = g_list_append(remote_list, "+t"); } else if (strcmp(cmd_line, "-t") == 0 || strcmp(cmd_line, "--without-tools") == 0) { - options->layout.tools_hidden = TRUE; + command_line->tools_hide = TRUE; remote_list = g_list_append(remote_list, "-t"); } else if (strcmp(cmd_line, "-f") == 0 || strcmp(cmd_line, "--fullscreen") == 0) { - startup_full_screen = TRUE; + command_line->startup_full_screen = TRUE; } else if (strcmp(cmd_line, "-s") == 0 || strcmp(cmd_line, "--slideshow") == 0) { - startup_in_slideshow = TRUE; + command_line->startup_in_slideshow = TRUE; } else if (strcmp(cmd_line, "-l") == 0 || strcmp(cmd_line, "--list") == 0) { - startup_command_line_collection = TRUE; + command_line->startup_command_line_collection = TRUE; } else if (strncmp(cmd_line, "--geometry=", 11) == 0) { - if (!*geometry) *geometry = g_strdup(cmd_line + 11); + if (!command_line->geometry) command_line->geometry = g_strdup(cmd_line + 11); } else if (strcmp(cmd_line, "-r") == 0 || strcmp(cmd_line, "--remote") == 0) @@ -389,7 +299,7 @@ static void parse_command_line(int argc, char *argv[], gchar **path, gchar **fil } else if (strcmp(cmd_line, "--blank") == 0) { - startup_blank = TRUE; + command_line->startup_blank = TRUE; } else if (strcmp(cmd_line, "-v") == 0 || strcmp(cmd_line, "--version") == 0) @@ -437,21 +347,22 @@ static void parse_command_line(int argc, char *argv[], gchar **path, gchar **fil } g_free(cmd_all); + g_free(cmd_line); i++; } g_free(base_dir); - parse_out_relatives(*path); - parse_out_relatives(*file); + parse_out_relatives(command_line->path); + parse_out_relatives(command_line->file); } list = g_list_reverse(list); - if (!*path && first_dir) + if (!command_line->path && first_dir) { - *path = first_dir; + command_line->path = first_dir; first_dir = NULL; - parse_out_relatives(*path); + parse_out_relatives(command_line->path); } g_free(first_dir); @@ -473,22 +384,34 @@ static void parse_command_line(int argc, char *argv[], gchar **path, gchar **fil printf_term(_("\nUse --remote-help for valid remote options.\n")); } - remote_control(argv[0], remote_list, *path, list, *collection_list); + remote_control(argv[0], remote_list, command_line->path, list, command_line->collection_list); } g_list_free(remote_list); if (list && list->next) { - *cmd_list = list; + command_line->cmd_list = list; } else { filelist_free(list); - *cmd_list = NULL; + command_line->cmd_list = NULL; + } + + if (command_line->startup_blank) + { + g_free(command_line->path); + command_line->path = NULL; + g_free(command_line->file); + command_line->file = NULL; + filelist_free(command_line->cmd_list); + command_line->cmd_list = NULL; + string_list_free(command_line->collection_list); + command_line->collection_list = NULL; } } -static void parse_command_line_for_debug_option(int argc, char *argv[]) +static void parse_command_line_for_debug_option(gint argc, gchar *argv[]) { #ifdef DEBUG const gchar *debug_option = "--debug"; @@ -530,11 +453,19 @@ static void parse_command_line_for_debug_option(int argc, char *argv[]) #define RC_HISTORY_NAME "history" +static void setup_env_path(void) +{ + const gchar *old_path = g_getenv("PATH"); + gchar *path = g_strconcat(GQ_BIN_DIR, ":", old_path, NULL); + g_setenv("PATH", path, TRUE); + g_free(path); +} + static void keys_load(void) { gchar *path; - path = g_build_filename(homedir(), GQ_RC_DIR, RC_HISTORY_NAME, NULL); + path = g_build_filename(get_rc_dir(), RC_HISTORY_NAME, NULL); history_list_load(path); g_free(path); } @@ -543,48 +474,153 @@ static void keys_save(void) { gchar *path; - path = g_build_filename(homedir(), GQ_RC_DIR, RC_HISTORY_NAME, NULL); + path = g_build_filename(get_rc_dir(), RC_HISTORY_NAME, NULL); history_list_save(path); g_free(path); } -static void check_for_home_path(gchar *path) +static void mkdir_if_not_exists(const gchar *path) { - gchar *buf; + if (isdir(path)) return; - buf = g_build_filename(homedir(), path, NULL); - if (!isdir(buf)) + log_printf(_("Creating %s dir:%s\n"), GQ_APPNAME, path); + + if (!recursive_mkdir_if_not_exists(path, 0755)) { - log_printf(_("Creating %s dir:%s\n"), GQ_APPNAME, buf); + log_printf(_("Could not create dir:%s\n"), path); + } +} - if (!mkdir_utf8(buf, 0755)) - { - log_printf(_("Could not create dir:%s\n"), buf); - } + +/* We add to duplicate and modify gtk_accel_map_print() and gtk_accel_map_save() + * to improve the reliability in special cases (especially when disk is full) + * These functions are now using secure saving stuff. + */ +static void gq_accel_map_print( + gpointer data, + const gchar *accel_path, + guint accel_key, + GdkModifierType accel_mods, + gboolean changed) +{ + GString *gstring = g_string_new(changed ? NULL : "; "); + SecureSaveInfo *ssi = data; + gchar *tmp, *name; + + g_string_append(gstring, "(gtk_accel_path \""); + + tmp = g_strescape(accel_path, NULL); + g_string_append(gstring, tmp); + g_free(tmp); + + g_string_append(gstring, "\" \""); + + name = gtk_accelerator_name(accel_key, accel_mods); + tmp = g_strescape(name, NULL); + g_free(name); + g_string_append(gstring, tmp); + g_free(tmp); + + g_string_append(gstring, "\")\n"); + + secure_fwrite(gstring->str, sizeof(*gstring->str), gstring->len, ssi); + + g_string_free(gstring, TRUE); +} + +static gboolean gq_accel_map_save(const gchar *path) +{ + gchar *pathl; + SecureSaveInfo *ssi; + GString *gstring; + + pathl = path_from_utf8(path); + ssi = secure_open(pathl); + g_free(pathl); + if (!ssi) + { + log_printf(_("error saving file: %s\n"), path); + return FALSE; } - g_free(buf); + + gstring = g_string_new("; "); + if (g_get_prgname()) + g_string_append(gstring, g_get_prgname()); + g_string_append(gstring, " GtkAccelMap rc-file -*- scheme -*-\n"); + g_string_append(gstring, "; this file is an automated accelerator map dump\n"); + g_string_append(gstring, ";\n"); + + secure_fwrite(gstring->str, sizeof(*gstring->str), gstring->len, ssi); + + g_string_free(gstring, TRUE); + + gtk_accel_map_foreach((gpointer) ssi, gq_accel_map_print); + + if (secure_close(ssi)) + { + log_printf(_("error saving file: %s\nerror: %s\n"), path, + secsave_strerror(secsave_errno)); + return FALSE; + } + + return TRUE; } +static gchar *accep_map_filename(void) +{ + return g_build_filename(get_rc_dir(), "accels", NULL); +} -static void exit_program_final(void) +static void accel_map_save(void) +{ + gchar *path; + + path = accep_map_filename(); + gq_accel_map_save(path); + g_free(path); +} + +static void accel_map_load(void) { gchar *path; gchar *pathl; + + path = accep_map_filename(); + pathl = path_from_utf8(path); + gtk_accel_map_load(pathl); + g_free(pathl); + g_free(path); +} + +static void gtkrc_load(void) +{ + gchar *path; + gchar *pathl; + + /* If a gtkrc file exists in the rc directory, add it to the + * list of files to be parsed at the end of gtk_init() */ + path = g_build_filename(get_rc_dir(), "gtkrc", NULL); + pathl = path_from_utf8(path); + if (access(pathl, R_OK) == 0) + gtk_rc_add_default_file(pathl); + g_free(pathl); + g_free(path); +} + +static void exit_program_final(void) +{ LayoutWindow *lw = NULL; + /* make sure that external editors are loaded, we would save incomplete configuration otherwise */ + layout_editors_reload_finish(); + remote_close(remote_connection); collect_manager_flush(); - sync_options_with_current_state(options); save_options(options); keys_save(); - - path = g_build_filename(homedir(), GQ_RC_DIR, "accels", NULL); - pathl = path_from_utf8(path); - gtk_accel_map_save(pathl); - g_free(pathl); - g_free(path); + accel_map_save(); if (layout_valid(&lw)) { @@ -632,7 +668,7 @@ static gint exit_confirm_dlg(void) msg = g_strdup_printf("%s - %s", GQ_APPNAME, _("exit")); exit_dialog = generic_dialog_new(msg, - GQ_WMCLASS, "exit", parent, FALSE, + "exit", parent, FALSE, exit_confirm_cancel_cb, NULL); g_free(msg); msg = g_strdup_printf(_("Quit %s"), GQ_APPNAME); @@ -646,71 +682,106 @@ static gint exit_confirm_dlg(void) return TRUE; } +static void exit_program_write_metadata_cb(gint success, const gchar *dest_path, gpointer data) +{ + if (success) exit_program(); +} + void exit_program(void) { layout_image_full_screen_stop(NULL); + if (metadata_write_queue_confirm(FALSE, exit_program_write_metadata_cb, NULL)) return; + if (exit_confirm_dlg()) return; exit_program_final(); } -int main(int argc, char *argv[]) +/* This code is supposed to handle situation when a file mmaped by image_loader + * or by exif loader is truncated by some other process. + * This is probably not completely correct according to posix, because + * mmap is not in the list of calls that can be used safely in signal handler, + * but anyway, the handler is called in situation when the application would + * crash otherwise. + * Ideas for improvement are welcome ;) + */ +/* FIXME: this probably needs some better ifdefs. Please report any compilation problems */ + +#if defined(SIGBUS) && defined(SA_SIGINFO) +static void sigbus_handler_cb(int signum, siginfo_t *info, void *context) +{ + unsigned long pagesize = sysconf(_SC_PAGE_SIZE); + DEBUG_1("SIGBUS %p", info->si_addr); + mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); +} +#endif + +static void setup_sigbus_handler(void) +{ +#if defined(SIGBUS) && defined(SA_SIGINFO) + struct sigaction sigbus_action; + sigfillset(&sigbus_action.sa_mask); + sigbus_action.sa_sigaction = sigbus_handler_cb; + sigbus_action.sa_flags = SA_SIGINFO; + + sigaction(SIGBUS, &sigbus_action, NULL); +#endif +} + +gint main(gint argc, gchar *argv[]) { - LayoutWindow *lw; - gchar *path = NULL; - gchar *cmd_path = NULL; - gchar *cmd_file = NULL; - GList *cmd_list = NULL; - GList *collection_list = NULL; CollectionData *first_collection = NULL; - gchar *geometry = NULL; gchar *buf; - gchar *bufl; CollectionData *cd = NULL; +#ifdef HAVE_GTHREAD + g_thread_init(NULL); + gdk_threads_init(); + gdk_threads_enter(); + +#endif + /* init execution time counter (debug only) */ init_exec_time(); /* setup locale, i18n */ - gtk_set_locale(); + setlocale(LC_ALL, ""); #ifdef ENABLE_NLS bindtextdomain(PACKAGE, GQ_LOCALEDIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); textdomain(PACKAGE); #endif - + + exif_init(); + /* setup random seed for random slideshow */ srand(time(NULL)); -#if 1 - log_printf("%s %s, This is an alpha release.\n", GQ_APPNAME, VERSION); -#endif + setup_sigbus_handler(); /* register global notify functions */ file_data_register_notify_func(cache_notify_cb, NULL, NOTIFY_PRIORITY_HIGH); file_data_register_notify_func(thumb_notify_cb, NULL, NOTIFY_PRIORITY_HIGH); + file_data_register_notify_func(histogram_notify_cb, NULL, NOTIFY_PRIORITY_HIGH); file_data_register_notify_func(collect_manager_notify_cb, NULL, NOTIFY_PRIORITY_LOW); + file_data_register_notify_func(metadata_notify_cb, NULL, NOTIFY_PRIORITY_LOW); + - parse_command_line_for_debug_option(argc, argv); - - options = init_options(NULL); - setup_default_options(options); - load_options(options); - - parse_command_line(argc, argv, &cmd_path, &cmd_file, &cmd_list, &collection_list, &geometry); - - /* If a gtkrc file exists in the rc directory, add it to the - * list of files to be parsed at the end of gtk_init() */ - buf = g_build_filename(homedir(), GQ_RC_DIR, "gtkrc", NULL); - bufl = path_from_utf8(buf); - if (access(bufl, R_OK) == 0) - gtk_rc_add_default_file(bufl); - g_free(bufl); - g_free(buf); + gtkrc_load(); + parse_command_line_for_debug_option(argc, argv); + DEBUG_1("%s main: gtk_init", get_exec_time()); +#ifdef HAVE_CLUTTER + if (gtk_clutter_init(&argc, &argv) != CLUTTER_INIT_SUCCESS) + { + log_printf("Can't initialize clutter-gtk.\n"); + exit(1); + } +#else gtk_init(&argc, &argv); +#endif if (gtk_major_version < GTK_MAJOR_VERSION || (gtk_major_version == GTK_MAJOR_VERSION && gtk_minor_version < GTK_MINOR_VERSION) ) @@ -722,55 +793,53 @@ int main(int argc, char *argv[]) log_printf("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME); } - check_for_home_path(GQ_RC_DIR); - check_for_home_path(GQ_RC_DIR_COLLECTIONS); - check_for_home_path(GQ_CACHE_RC_THUMB); - check_for_home_path(GQ_CACHE_RC_METADATA); + DEBUG_1("%s main: pixbuf_inline_register_stock_icons", get_exec_time()); + pixbuf_inline_register_stock_icons(); + + DEBUG_1("%s main: setting default options before commandline handling", get_exec_time()); + options = init_options(NULL); + setup_default_options(options); + + DEBUG_1("%s main: parse_command_line", get_exec_time()); + parse_command_line(argc, argv); + + DEBUG_1("%s main: mkdir_if_not_exists", get_exec_time()); + /* these functions don't depend on config file */ + mkdir_if_not_exists(get_rc_dir()); + mkdir_if_not_exists(get_collections_dir()); + mkdir_if_not_exists(get_thumbnails_cache_dir()); + mkdir_if_not_exists(get_metadata_cache_dir()); + + setup_env_path(); keys_load(); - filter_add_defaults(); - filter_rebuild(); + accel_map_load(); - buf = g_build_filename(homedir(), GQ_RC_DIR, "accels", NULL); - bufl = path_from_utf8(buf); - gtk_accel_map_load(bufl); - g_free(bufl); - g_free(buf); + /* restore session from the config file */ - if (startup_blank) - { - g_free(cmd_path); - cmd_path = NULL; - g_free(cmd_file); - cmd_file = NULL; - filelist_free(cmd_list); - cmd_list = NULL; - string_list_free(collection_list); - collection_list = NULL; - - path = NULL; - } - else if (cmd_path) - { - path = g_strdup(cmd_path); - } - else if (options->startup.restore_path && options->startup.path && isdir(options->startup.path)) + + DEBUG_1("%s main: load_options", get_exec_time()); + if (!load_options(options)) { - path = g_strdup(options->startup.path); + /* load_options calls these functions after it parses global options, we have to call it here if it fails */ + filter_add_defaults(); + filter_rebuild(); } - else + + /* handle missing config file and commandline additions*/ + if (!layout_window_list) { - path = get_current_dir(); + /* broken or no config file */ + layout_new_from_config(NULL, NULL, TRUE); } - lw = layout_new_with_geometry(NULL, options->layout.tools_float, options->layout.tools_hidden, geometry); - layout_sort_set(lw, options->file_sort.method, options->file_sort.ascending); + layout_editors_reload_start(); - if (collection_list && !startup_command_line_collection) + if (command_line->collection_list && !command_line->startup_command_line_collection) { GList *work; - work = collection_list; + work = command_line->collection_list; while (work) { CollectWindow *cw; @@ -784,12 +853,12 @@ int main(int argc, char *argv[]) } } - if (cmd_list || - (startup_command_line_collection && collection_list)) + if (command_line->cmd_list || + (command_line->startup_command_line_collection && command_line->collection_list)) { GList *work; - if (startup_command_line_collection) + if (command_line->startup_command_line_collection) { CollectWindow *cw; @@ -808,22 +877,21 @@ int main(int argc, char *argv[]) collection_path_changed(cd); - work = cmd_list; + work = command_line->cmd_list; while (work) { - collection_add(cd, file_data_new_simple((gchar *)work->data), FALSE); + collection_add(cd, (FileData *)work->data, FALSE); work = work->next; } - work = collection_list; + work = command_line->collection_list; while (work) { collection_load(cd, (gchar *)work->data, COLLECTION_LOAD_APPEND); work = work->next; } - layout_set_path(lw, path); - if (cd->list) layout_image_set_collection(lw, cd, cd->list->data); + if (cd->list) layout_image_set_collection(NULL, cd, cd->list->data); /* mem leak, we never unref this collection when !startup_command_line_collection * (the image view of the main window does not hold a ref to the collection) @@ -834,36 +902,21 @@ int main(int argc, char *argv[]) */ } - else if (cmd_file) + else if (first_collection) { - layout_set_path(lw, cmd_file); + layout_image_set_collection(NULL, first_collection, + collection_get_first(first_collection)); } - else - { - layout_set_path(lw, path); - if (first_collection) - { - layout_image_set_collection(lw, first_collection, - collection_get_first(first_collection)); - } - } - - image_osd_set(lw->image, options->image_overlay.common.state | (options->image_overlay.common.show_at_startup ? OSD_SHOW_INFO : OSD_SHOW_NOTHING)); - g_free(geometry); - g_free(cmd_path); - g_free(cmd_file); - filelist_free(cmd_list); - string_list_free(collection_list); - g_free(path); - - if (startup_full_screen) layout_image_full_screen_start(lw); - if (startup_in_slideshow) layout_image_slideshow_start(lw); - - buf = g_build_filename(homedir(), GQ_RC_DIR, ".command", NULL); + buf = g_build_filename(get_rc_dir(), ".command", NULL); remote_connection = remote_server_init(buf, cd); g_free(buf); - + + DEBUG_1("%s main: gtk_main", get_exec_time()); gtk_main(); +#ifdef HAVE_GTHREAD + gdk_threads_leave(); +#endif return 0; } +/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */