/*
- * 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 */
delta = 8;
}
- *x = *x * delta;
- *y = *y * delta;
+ *x = *x * delta * options->keyboard_scroll_step;
+ *y = *y * delta * options->keyboard_scroll_step;
}
GList *remote_errors = NULL;
gboolean remote_do = FALSE;
gchar *first_dir = NULL;
+ gchar *app_lock;
+ gchar *pwd;
+ gchar *current_dir;
+ gchar *geometry = NULL;
command_line = g_new0(CommandLine, 1);
command_line->argc = argc;
command_line->argv = argv;
+ command_line->regexp = NULL;
if (argc > 1)
{
parse_command_line_process_file(cmd_all, &command_line->path, &command_line->file,
&list, &command_line->collection_list, &first_dir);
}
+ else if (download_web_file(cmd_line, FALSE, NULL))
+ {
+ }
+ else if (is_collection(cmd_line))
+ {
+ gchar *path = NULL;
+
+ path = collection_path(cmd_line);
+ parse_command_line_process_file(path, &command_line->path, &command_line->file,
+ &list, &command_line->collection_list, &first_dir);
+ g_free(path);
+ }
else if (strncmp(cmd_line, "--debug", 7) == 0 && (cmd_line[7] == '\0' || cmd_line[7] == '='))
{
/* do nothing but do not produce warnings */
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 (strncmp(cmd_line, "-n", 2) == 0)
+ {
+ command_line->new_instance = TRUE;
+ }
+ else if (strncmp(cmd_line, "--new-instance", 14) == 0)
+ {
+ command_line->new_instance = TRUE;
+ }
else if (strcmp(cmd_line, "-rh") == 0 ||
strcmp(cmd_line, "--remote-help") == 0)
{
else if (strcmp(cmd_line, "-v") == 0 ||
strcmp(cmd_line, "--version") == 0)
{
- printf_term("%s %s\n", GQ_APPNAME, VERSION);
+ printf_term(FALSE, "%s %s\n", GQ_APPNAME, VERSION);
exit(0);
}
else if (strcmp(cmd_line, "--alternate") == 0)
else if (strcmp(cmd_line, "-h") == 0 ||
strcmp(cmd_line, "--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"));
+ printf_term(FALSE, "%s %s\n", GQ_APPNAME, VERSION);
+ printf_term(FALSE, _("Usage: %s [options] [path]\n\n"), GQ_APPNAME_LC);
+ print_term(FALSE, _("valid options are:\n"));
+ print_term(FALSE, _(" +t, --with-tools force show of tools\n"));
+ print_term(FALSE, _(" -t, --without-tools force hide of tools\n"));
+ print_term(FALSE, _(" -f, --fullscreen start in full screen mode\n"));
+ print_term(FALSE, _(" -s, --slideshow start in slideshow mode\n"));
+ print_term(FALSE, _(" -l, --list [files] [collections] open collection window for command line\n"));
+ print_term(FALSE, _(" --blank start with blank file list\n"));
+ print_term(FALSE, _(" --geometry=XxY+XOFF+YOFF set main window location\n"));
+ print_term(FALSE, _(" -n, --new-instance open a new instance of Geeqie\n"));
+ print_term(FALSE, _(" -r, --remote send following commands to open window\n"));
+ print_term(FALSE, _(" -rh,--remote-help print remote command list\n"));
#ifdef DEBUG
- print_term(_(" --debug[=level] turn on debug output\n"));
+ print_term(FALSE, _(" --debug[=level] turn on debug output\n"));
+ print_term(FALSE, _(" -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(FALSE, _(" +w, --show-log-window show log window\n"));
+ print_term(FALSE, _(" -o:<file>, --log-file:<file> save log data to file\n"));
+ print_term(FALSE, _(" -v, --version print version info\n"));
+ print_term(FALSE, _(" -h, --help show this message\n\n"));
#if 0
/* these options are not officially supported!
* only for testing new features, no need to translate them */
- print_term( " --alternate use alternate similarity algorithm\n");
+ print_term(FALSE, " --alternate use alternate similarity algorithm\n");
#endif
+
exit(0);
}
else if (!remote_do)
{
- printf_term(_("invalid or ignored: %s\nUse --help for options\n"), cmd_line);
+ printf_term(TRUE, _("invalid or ignored: %s\nUse --help for options\n"), cmd_line);
}
g_free(cmd_all);
}
g_free(first_dir);
+ if (!command_line->new_instance)
+ {
+ /* If Geeqie is already running, prevent a second instance
+ * from being started. Open a new window instead.
+ */
+ app_lock = g_build_filename(get_rc_dir(), ".command", NULL);
+ if (remote_server_exists(app_lock) && !remote_do)
+ {
+ remote_do = TRUE;
+ if (command_line->geometry)
+ {
+ geometry = g_strdup_printf("--geometry=%s", command_line->geometry);
+ remote_list = g_list_prepend(remote_list, geometry);
+ }
+ remote_list = g_list_prepend(remote_list, "--new-window");
+ }
+ g_free(app_lock);
+ }
+
if (remote_do)
{
if (remote_errors)
{
GList *work = remote_errors;
- printf_term(_("Invalid or ignored remote options: "));
+ printf_term(TRUE,_("Invalid or ignored remote options: "));
while (work)
{
gchar *opt = work->data;
- printf_term("%s%s", (work == remote_errors) ? "" : ", ", opt);
+ printf_term(TRUE, "%s%s", (work == remote_errors) ? "" : ", ", opt);
work = work->next;
}
- printf_term(_("\nUse --remote-help for valid remote options.\n"));
+ printf_term(TRUE, _("\nUse --remote-help for valid remote options.\n"));
}
+ /* prepend the current dir the remote command was made from,
+ * for use by any remote command that needs it
+ */
+ current_dir = g_get_current_dir();
+ pwd = g_strconcat("--PWD:", current_dir, NULL);
+ remote_list = g_list_prepend(remote_list, pwd);
+
remote_control(argv[0], remote_list, command_line->path, list, command_line->collection_list);
+ g_free(pwd);
+ g_free(current_dir);
}
+ g_free(geometry);
g_list_free(remote_list);
if (list && list->next)
*/
#define RC_HISTORY_NAME "history"
+#define RC_MARKS_NAME "marks"
static void setup_env_path(void)
{
g_free(path);
}
+static void marks_load(void)
+{
+ gchar *path;
+
+ path = g_build_filename(get_rc_dir(), RC_MARKS_NAME, NULL);
+ marks_list_load(path);
+ g_free(path);
+}
+
+static void marks_save(gboolean save)
+{
+ gchar *path;
+
+ path = g_build_filename(get_rc_dir(), RC_MARKS_NAME, NULL);
+ marks_list_save(path, save);
+ g_free(path);
+}
+
static void mkdir_if_not_exists(const gchar *path)
{
if (isdir(path)) return;
layout_free(lw);
}
+ secure_close(command_line->ssi);
+
gtk_main_quit();
}
g_free(msg);
msg = g_strdup_printf(_("Quit %s"), GQ_APPNAME);
generic_dialog_add_message(exit_dialog, GTK_STOCK_DIALOG_QUESTION,
- msg, _("Collections have been modified. Quit anyway?"));
+ msg, _("Collections have been modified. Quit anyway?"), TRUE);
g_free(msg);
generic_dialog_add_button(exit_dialog, GTK_STOCK_QUIT, NULL, exit_confirm_exit_cb, TRUE);
if (metadata_write_queue_confirm(FALSE, exit_program_write_metadata_cb, NULL)) return;
+ options->marks_save ? marks_save(TRUE) : marks_save(FALSE);
+
if (exit_confirm_dlg()) return;
exit_program_final();
CollectionData *cd = NULL;
#ifdef HAVE_GTHREAD
-#if !GTK_CHECK_VERSION(2,32,0)
+#if !GLIB_CHECK_VERSION(2,32,0)
g_thread_init(NULL);
#endif
gdk_threads_init();
mkdir_if_not_exists(get_collections_dir());
mkdir_if_not_exists(get_thumbnails_cache_dir());
mkdir_if_not_exists(get_metadata_cache_dir());
+ mkdir_if_not_exists(get_window_layouts_dir());
setup_env_path();
}
}
+ 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))
{
remote_connection = remote_server_init(buf, cd);
g_free(buf);
+ marks_load();
+
DEBUG_1("%s main: gtk_main", get_exec_time());
gtk_main();
#ifdef HAVE_GTHREAD
projects / geeqie.git / blobdiff