/*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: John Ellis
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gdk/gdkkeysyms.h> /* for keyboard values */
#include "exif.h"
#include "histogram.h"
#include "pixbuf_util.h"
+#include "glua.h"
#ifdef HAVE_CLUTTER
#include <clutter-gtk/clutter-gtk.h>
delta = 8;
}
- *x = *x * delta;
- *y = *y * delta;
+ *x = *x * delta * options->keyboard_scroll_step;
+ *y = *y * delta * options->keyboard_scroll_step;
}
path_parsed = g_strdup(dir);
parse_out_relatives(path_parsed);
dir_fd = file_data_new_dir(path_parsed);
-
+
if (filelist_read(dir_fd, &files, NULL))
{
GList *remote_errors = NULL;
gboolean remote_do = FALSE;
gchar *first_dir = NULL;
-
+
command_line = g_new0(CommandLine, 1);
-
+
command_line->argc = argc;
command_line->argv = argv;
+ command_line->regexp = NULL;
if (argc > 1)
{
remote_list = remote_build_list(remote_list, argc - i, &argv[i], &remote_errors);
}
}
+ else if ((strcmp(cmd_line, "+w") == 0) ||
+ strcmp(cmd_line, "--show-log-window") == 0)
+ {
+ command_line->log_window_show = TRUE;
+ }
+ else if (strncmp(cmd_line, "-o:", 3) == 0)
+ {
+ command_line->log_file = g_strdup(cmd_line + 3);
+ }
+ else if (strncmp(cmd_line, "--log-file:", 11) == 0)
+ {
+ command_line->log_file = g_strdup(cmd_line + 11);
+ }
+ else if (strncmp(cmd_line, "-g:", 3) == 0)
+ {
+ set_regexp(g_strdup(cmd_line+3));
+ }
+ else if (strncmp(cmd_line, "-grep:", 6) == 0)
+ {
+ set_regexp(g_strdup(cmd_line+3));
+ }
else if (strcmp(cmd_line, "-rh") == 0 ||
strcmp(cmd_line, "--remote-help") == 0)
{
printf_term("%s %s\n", GQ_APPNAME, VERSION);
printf_term(_("Usage: %s [options] [path]\n\n"), GQ_APPNAME_LC);
print_term(_("valid options are:\n"));
- print_term(_(" +t, --with-tools force show of tools\n"));
- print_term(_(" -t, --without-tools force hide of tools\n"));
- print_term(_(" -f, --fullscreen start in full screen mode\n"));
- print_term(_(" -s, --slideshow start in slideshow mode\n"));
- print_term(_(" -l, --list open collection window for command line\n"));
- print_term(_(" --geometry=GEOMETRY set main window location\n"));
- print_term(_(" -r, --remote send following commands to open window\n"));
- print_term(_(" -rh,--remote-help print remote command list\n"));
+ print_term(_(" +t, --with-tools force show of tools\n"));
+ print_term(_(" -t, --without-tools force hide of tools\n"));
+ print_term(_(" -f, --fullscreen start in full screen mode\n"));
+ print_term(_(" -s, --slideshow start in slideshow mode\n"));
+ print_term(_(" -l, --list [files] [collections] open collection window for command line\n"));
+ print_term(_(" --blank start with blank file list\n"));
+ print_term(_(" --geometry=XxY+XOFF+YOFF set main window location\n"));
+ print_term(_(" -r, --remote send following commands to open window\n"));
+ print_term(_(" -rh,--remote-help print remote command list\n"));
#ifdef DEBUG
- print_term(_(" --debug[=level] turn on debug output\n"));
+ print_term(_(" --debug[=level] turn on debug output\n"));
+ print_term(_(" -g:<regexp>, --grep:<regexp> filter debug output\n"));
#endif
- print_term(_(" -v, --version print version info\n"));
- print_term(_(" -h, --help show this message\n\n"));
+ print_term(_(" +w, --show-log-window show log window\n"));
+ print_term(_(" -o:<file>, --log-file:<file> save log data to file\n"));
+ print_term(_(" -v, --version print version info\n"));
+ print_term(_(" -h, --help show this message\n\n"));
#if 0
/* these options are not officially supported!
print_term( " --alternate use alternate similarity algorithm\n");
#endif
+
exit(0);
}
else if (!remote_do)
if (remote_errors)
{
GList *work = remote_errors;
-
+
printf_term(_("Invalid or ignored remote options: "));
while (work)
{
gchar *opt = work->data;
-
+
printf_term("%s%s", (work == remote_errors) ? "" : ", ", opt);
work = work->next;
}
log_printf(_("error saving file: %s\n"), path);
return FALSE;
}
-
+
gstring = g_string_new("; ");
if (g_get_prgname())
g_string_append(gstring, g_get_prgname());
layout_free(lw);
}
+ secure_close(command_line->ssi);
+
gtk_main_quit();
}
exit_program_final();
}
-/* 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,
CollectionData *cd = NULL;
#ifdef HAVE_GTHREAD
+#if !GLIB_CHECK_VERSION(2,32,0)
g_thread_init(NULL);
+#endif
gdk_threads_init();
gdk_threads_enter();
#endif
-
+
/* init execution time counter (debug only) */
init_exec_time();
#endif
exif_init();
-
+
+#ifdef HAVE_LUA
+ lua_init();
+#endif
+
/* setup random seed for random slideshow */
srand(time(NULL));
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());
+ DEBUG_1("%s main: gtk_init", get_exec_time());
#ifdef HAVE_CLUTTER
if (gtk_clutter_init(&argc, &argv) != CLUTTER_INIT_SUCCESS)
{
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());
+ 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());
+ 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());
+ 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());
+ 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());
/* restore session from the config file */
- DEBUG_1("%s main: load_options", get_exec_time());
+ 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();
+ 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);
}
}
+ if (command_line->log_file)
+ {
+ gchar *pathl;
+ gchar *path = g_strdup(command_line->log_file);
+
+ pathl = path_from_utf8(path);
+ command_line->ssi = secure_open(pathl);
+ }
+
if (command_line->cmd_list ||
(command_line->startup_command_line_collection && command_line->collection_list))
{
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());
+
+ DEBUG_1("%s main: gtk_main", get_exec_time());
gtk_main();
#ifdef HAVE_GTHREAD
gdk_threads_leave();
projects / geeqie.git / blobdiff