/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
* This software comes with no warranty of any kind, use at your own risk!
*/
+#include <gdk/gdkkeysyms.h> /* for keyboard values */
+
+#include <signal.h>
+#include <sys/mman.h>
+
+#include <math.h>
+#ifdef G_OS_UNIX
+#include <pwd.h>
+#endif
+#include <locale.h>
#include "main.h"
#include "image-overlay.h"
#include "layout.h"
#include "layout_image.h"
+#include "layout_util.h"
#include "options.h"
#include "remote.h"
#include "secure_save.h"
#include "histogram.h"
#include "pixbuf_util.h"
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
-#include <signal.h>
-#include <sys/mman.h>
-
-#include <math.h>
-#ifdef G_OS_UNIX
-#include <pwd.h>
+#ifdef HAVE_CLUTTER
+#include <clutter-gtk/clutter-gtk.h>
#endif
+gboolean thumb_format_changed = FALSE;
static RemoteConnection *remote_connection = NULL;
-
/*
*-----------------------------------------------------------------------------
* keyboard functions
{
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))
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,
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))
}
g_free(cmd_all);
+ g_free(cmd_line);
i++;
}
g_free(base_dir);
#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;
{
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();
{
layout_image_full_screen_stop(NULL);
- if (metadata_write_queue_confirm(exit_program_write_metadata_cb, NULL)) return;
+ if (metadata_write_queue_confirm(FALSE, exit_program_write_metadata_cb, NULL)) return;
if (exit_confirm_dlg()) return;
exit_program_final();
}
-void init_after_global_options(void)
-{
- filter_add_defaults();
- filter_rebuild();
-
- editor_load_descriptions();
-}
-
-
-/* This code is supposed to handle situation when a file mmaped by image_loader
+/* 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,
*/
/* FIXME: this probably needs some better ifdefs. Please report any compilation problems */
-#ifdef SIGBUS
+#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);
static void setup_sigbus_handler(void)
{
-#ifdef SIGBUS
+#if defined(SIGBUS) && defined(SA_SIGINFO)
struct sigaction sigbus_action;
sigfillset(&sigbus_action.sa_mask);
sigbus_action.sa_sigaction = sigbus_handler_cb;
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);
/* 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(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);
+
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) )
log_printf("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME);
}
+ DEBUG_1("%s main: pixbuf_inline_register_stock_icons", get_exec_time());
pixbuf_inline_register_stock_icons();
- parse_command_line_for_debug_option(argc, argv);
+ 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();
accel_map_load();
/* restore session from the config file */
- options = init_options(NULL);
- setup_default_options(options);
- /* load_options calls init_after_global_options() after it parses global options, we have to call it here if it fails*/
- if (!load_options(options)) init_after_global_options();
+ DEBUG_1("%s main: load_options", get_exec_time());
+ if (!load_options(options))
+ {
+ /* load_options calls these functions after it parses global options, we have to call it here if it fails */
+ filter_add_defaults();
+ filter_rebuild();
+ }
/* handle missing config file and commandline additions*/
- if (!layout_window_list)
+ if (!layout_window_list)
{
/* broken or no config file */
layout_new_from_config(NULL, NULL, TRUE);
}
+ layout_editors_reload_start();
+
if (command_line->collection_list && !command_line->startup_command_line_collection)
{
GList *work;
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;
}
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();
projects / geeqie.git / blobdiff