#include "layout.h"
#include "layout_image.h"
#include "layout_util.h"
+#include "misc.h"
#include "options.h"
#include "remote.h"
#include "secure_save.h"
#endif
#ifdef HAVE_GTHREAD
-/* FIXME: see below */
+/** @FIXME see below */
#include <X11/Xlib.h>
#endif
gboolean thumb_format_changed = FALSE;
static RemoteConnection *remote_connection = NULL;
+gchar *gq_prefix;
+gchar *gq_localedir;
+gchar *gq_helpdir;
+gchar *gq_htmldir;
+gchar *gq_app_dir;
+gchar *gq_bin_dir;
+gchar *desktop_file_template;
+
/*
*-----------------------------------------------------------------------------
* 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_no_grouping(path_parsed));
+ *list = g_list_prepend(*list, path_parsed);
}
}
gchar *pwd;
gchar *current_dir;
gchar *geometry = NULL;
+ GtkWidget *dialog_warning;
+ GString *command_line_errors = g_string_new(NULL);
command_line = g_new0(CommandLine, 1);
else if (strcmp(cmd_line, "-v") == 0 ||
strcmp(cmd_line, "--version") == 0)
{
- printf_term(FALSE, "%s %s\n", GQ_APPNAME, VERSION);
+ printf_term(FALSE, "%s %s GTK%d\n", GQ_APPNAME, VERSION, gtk_major_version);
exit(0);
}
else if (strcmp(cmd_line, "--alternate") == 0)
}
else if (!remote_do)
{
- printf_term(TRUE, _("invalid or ignored: %s\nUse --help for options\n"), cmd_line);
+ command_line_errors = g_string_append(command_line_errors, cmd_line);
+ command_line_errors = g_string_append(command_line_errors, "\n");
}
g_free(cmd_all);
g_free(cmd_line);
i++;
}
+
+ if (command_line_errors->len > 0)
+ {
+ dialog_warning = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", "Invalid parameter(s):");
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog_warning), "%s", command_line_errors->str);
+ gtk_window_set_title(GTK_WINDOW(dialog_warning), GQ_APPNAME);
+ gtk_window_set_keep_above(GTK_WINDOW(dialog_warning), TRUE);
+ gtk_dialog_run(GTK_DIALOG(dialog_warning));
+ gtk_widget_destroy(dialog_warning);
+ g_string_free(command_line_errors, TRUE);
+
+ exit(EXIT_FAILURE);
+ }
+
g_free(base_dir);
parse_out_relatives(command_line->path);
parse_out_relatives(command_line->file);
remote_list = g_list_prepend(remote_list, geometry);
}
remote_list = g_list_prepend(remote_list, "--new-window");
- }
+ }
g_free(app_lock);
}
{
GList *work = remote_errors;
- printf_term(TRUE,_("Invalid or ignored remote options: "));
while (work)
{
gchar *opt = work->data;
- printf_term(TRUE, "%s%s", (work == remote_errors) ? "" : ", ", opt);
+ command_line_errors = g_string_append(command_line_errors, opt);
+ command_line_errors = g_string_append(command_line_errors, "\n");
work = work->next;
}
- printf_term(TRUE, _("\nUse --remote-help for valid remote options.\n"));
+ dialog_warning = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", "Invalid parameter(s):");
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog_warning), "%s", command_line_errors->str);
+ gtk_window_set_title(GTK_WINDOW(dialog_warning), GQ_APPNAME);
+ gtk_window_set_keep_above(GTK_WINDOW(dialog_warning), TRUE);
+ gtk_dialog_run(GTK_DIALOG(dialog_warning));
+ gtk_widget_destroy(dialog_warning);
+ g_string_free(command_line_errors, TRUE);
+
+ exit(EXIT_FAILURE);
}
/* prepend the current dir the remote command was made from,
remote_list = g_list_prepend(remote_list, pwd);
remote_control(argv[0], remote_list, command_line->path, list, command_line->collection_list);
+ /* There is no return to this point
+ */
g_free(pwd);
g_free(current_dir);
}
}
else
{
- filelist_free(list);
+ string_list_free(list);
command_line->cmd_list = NULL;
}
static void setup_env_path(void)
{
const gchar *old_path = g_getenv("PATH");
- gchar *path = g_strconcat(GQ_BIN_DIR, ":", old_path, NULL);
+ gchar *path = g_strconcat(gq_bin_dir, ":", old_path, NULL);
g_setenv("PATH", path, TRUE);
g_free(path);
}
* crash otherwise.
* Ideas for improvement are welcome ;)
*/
-/* FIXME: this probably needs some better ifdefs. Please report any compilation problems */
+/** @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)
#endif
}
+/**
+ * @brief Set up the application paths
+ *
+ * This function is required for use of AppImages. AppImages are
+ * relocatable, and therefore cannot use fixed paths to various components.
+ * These paths were originally #defines created during compilation.
+ * They are now variables, all defined relative to one level above the
+ * directory that the executable is run from.
+ */
+static void create_application_paths()
+{
+ gchar buf[1024];
+ gchar *dirname;
+ gchar *basename;
+ gchar *tmp;
+
+ memset(buf, 0, sizeof(buf));
+ if (readlink("/proc/self/exe", buf, sizeof(buf) - 1) < 0)
+ {
+ /* There was an error. Perhaps the path does not exist
+ * or the buffer is not big enough. */
+ log_printf("Can't get path from /proc/self/exe");
+ exit(1);
+ }
+
+ dirname = g_path_get_dirname(buf); // default is /usr/bin/
+ gq_prefix = g_path_get_dirname(dirname);
+
+ gq_localedir = g_build_filename(gq_prefix, "share", "locale", NULL);
+ tmp = g_build_filename(gq_prefix, "share", "doc", NULL);
+ gq_helpdir = g_strconcat(tmp, G_DIR_SEPARATOR_S, "geeqie-", VERSION, NULL);
+ gq_htmldir = g_build_filename(gq_helpdir, "html", NULL);
+ gq_app_dir = g_build_filename(gq_prefix, "share", "geeqie", NULL);
+ gq_bin_dir = g_build_filename(gq_prefix, "lib", "geeqie", NULL);
+ desktop_file_template = g_build_filename(gq_app_dir, "template.desktop", NULL);
+
+ g_free(tmp);
+ g_free(dirname);
+}
+
gint main(gint argc, gchar *argv[])
{
CollectionData *first_collection = NULL;
gchar *buf;
CollectionData *cd = NULL;
gboolean disable_clutter = FALSE;
+ gboolean single_dir = TRUE;
+ LayoutWindow *lw;
#ifdef HAVE_GTHREAD
#if !GLIB_CHECK_VERSION(2,32,0)
/* init execution time counter (debug only) */
init_exec_time();
+ create_application_paths();
+
/* setup locale, i18n */
setlocale(LC_ALL, "");
#ifdef ENABLE_NLS
- bindtextdomain(PACKAGE, GQ_LOCALEDIR);
+ bindtextdomain(PACKAGE, gq_localedir);
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
#endif
if (gtk_clutter_init(&argc, &argv) != CLUTTER_INIT_SUCCESS)
{
log_printf("Can't initialize clutter-gtk.\nStart Geeqie with the option \"geeqie --disable-clutter\"");
+ runcmd("zenity --error --title=\"Geeqie\" --text \"Can't initialize clutter-gtk.\n\nStart Geeqie with the option:\n geeqie --disable-clutter\" --width=300");
exit(1);
}
}
}
#ifdef HAVE_CLUTTER
-/* FIXME: For the background of this see:
+/** @FIXME For the background of this see:
* https://github.com/BestImageViewer/geeqie/issues/397
* The feature CLUTTER_FEATURE_SWAP_EVENTS indictates if the
* system is liable to exhibit this problem.
layout_editors_reload_start();
+ /* If no --list option, open a separate collection window for each
+ * .gqv file on the command line
+ */
if (command_line->collection_list && !command_line->startup_command_line_collection)
{
GList *work;
command_line->ssi = secure_open(pathl);
}
- if (command_line->cmd_list ||
- (command_line->startup_command_line_collection && command_line->collection_list))
+ /* If there is a files list on the command line and no --list option,
+ * check if they are all in the same folder
+ */
+ if (command_line->cmd_list && !(command_line->startup_command_line_collection))
{
GList *work;
+ gchar *path = NULL;
- if (command_line->startup_command_line_collection)
- {
- CollectWindow *cw;
+ work = command_line->cmd_list;
- cw = collection_window_new("");
- cd = cw->cd;
- }
- else
+ while (work && single_dir)
{
- cd = collection_new(""); /* if we pass NULL, untitled counter is falsely increm. */
+ gchar *dirname;
+
+ dirname = g_path_get_dirname(work->data);
+ if (!path)
+ {
+ path = g_strdup(dirname);
+ }
+ else
+ {
+ if (g_strcmp0(path, dirname) != 0)
+ {
+ single_dir = FALSE;
+ }
+ }
+ g_free(dirname);
+ work = work->next;
}
+ g_free(path);
+ }
+
+ /* Files from multiple folders, or --list option given
+ * then open an unnamed collection and insert all files
+ */
+ if ((command_line->cmd_list && !single_dir) || (command_line->startup_command_line_collection && command_line->cmd_list))
+ {
+ GList *work;
+ CollectWindow *cw;
- g_free(cd->path);
- cd->path = NULL;
- g_free(cd->name);
- cd->name = g_strdup(_("Command line"));
+ cw = collection_window_new(NULL);
+ cd = cw->cd;
collection_path_changed(cd);
work = command_line->cmd_list;
while (work)
{
- collection_add(cd, (FileData *)work->data, FALSE);
+ FileData *fd;
+
+ fd = file_data_new_simple(work->data);
+ collection_add(cd, fd, FALSE);
+ file_data_unref(fd);
work = work->next;
}
collection_get_first(first_collection));
}
+ /* If the files on the command line are from one folder, select those files
+ * unless it is a command line collection - then leave focus on collection window
+ */
+ lw = NULL;
+ layout_valid(&lw);
+
+ if (single_dir && command_line->cmd_list && !command_line->startup_command_line_collection)
+ {
+ GList *work;
+ GList *selected;
+ FileData *fd;
+
+ selected = NULL;
+ work = command_line->cmd_list;
+ while (work)
+ {
+ fd = file_data_new_simple((gchar *)work->data);
+ selected = g_list_append(selected, fd);
+ file_data_unref(fd);
+ work = work->next;
+ }
+ layout_select_list(lw, selected);
+ }
+
buf = g_build_filename(get_rc_dir(), ".command", NULL);
remote_connection = remote_server_init(buf, cd);
g_free(buf);
projects / geeqie.git / blobdiff