#include "cache.h"
#include "collect.h"
#include "collect-io.h"
-#include "dnd.h"
-#include "editors.h"
-#include "filelist.h"
-#include "fullscreen.h"
+#include "filedata.h"
+#include "filefilter.h"
#include "image-overlay.h"
-#include "img-view.h"
#include "layout.h"
#include "layout_image.h"
-#include "menu.h"
-#include "pixbuf_util.h"
-#include "preferences.h"
#include "rcfile.h"
#include "remote.h"
#include "similar.h"
-#include "slideshow.h"
-#include "utilops.h"
#include "ui_bookmark.h"
-#include "ui_help.h"
#include "ui_fileops.h"
-#include "ui_tabcomp.h"
#include "ui_utildlg.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
#include <math.h>
+#ifdef G_OS_UNIX
+#include <pwd.h>
+#endif
static RemoteConnection *remote_connection = NULL;
-static CollectionData *command_collection = NULL;
/*
*-----------------------------------------------------------------------------
*/
-GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
- const gchar *icon_file, const gchar *subtitle)
-{
- gchar *title;
- GtkWidget *window;
-
- window = gtk_window_new(type);
- if (!window) return NULL;
-
- if (subtitle)
- {
- title = g_strdup_printf("%s - %s", subtitle, GQ_APPNAME);
- }
- else
- {
- title = g_strdup_printf("%s", GQ_APPNAME);
- }
-
- gtk_window_set_title(GTK_WINDOW(window), title);
- g_free(title);
-
- window_set_icon(window, icon, icon_file);
- gtk_window_set_role(GTK_WINDOW(window), name);
- gtk_window_set_wmclass(GTK_WINDOW(window), name, GQ_WMCLASS);
-
- return window;
-}
-
-void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file)
-{
- if (!icon && !file) icon = PIXBUF_INLINE_ICON;
-
- if (icon)
- {
- GdkPixbuf *pixbuf;
-
- pixbuf = pixbuf_inline(icon);
- if (pixbuf)
- {
- gtk_window_set_icon(GTK_WINDOW(window), pixbuf);
- g_object_unref(pixbuf);
- }
- }
- else
- {
- gtk_window_set_icon_from_file(GTK_WINDOW(window), file, NULL);
- }
-}
-
-gint window_maximized(GtkWidget *window)
-{
- GdkWindowState state;
-
- if (!window || !window->window) return FALSE;
-
- state = gdk_window_get_state(window->window);
- return (state & GDK_WINDOW_STATE_MAXIMIZED);
-}
gdouble get_zoom_increment(void)
{
return ((options->image.zoom_increment != 0) ? (gdouble)options->image.zoom_increment / 10.0 : 1.0);
}
-static gint timeval_delta(struct timeval *result, struct timeval *x, struct timeval *y)
+gchar *utf8_validate_or_convert(const gchar *text)
{
- if (x->tv_usec < y->tv_usec)
- {
- gint nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
- y->tv_usec -= 1000000 * nsec;
- y->tv_sec += nsec;
- }
-
- if (x->tv_usec - y->tv_usec > 1000000)
- {
- gint nsec = (x->tv_usec - y->tv_usec) / 1000000;
- y->tv_usec += 1000000 * nsec;
- y->tv_sec -= nsec;
- }
+ gint len;
- result->tv_sec = x->tv_sec - y->tv_sec;
- result->tv_usec = x->tv_usec - y->tv_usec;
+ 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 x->tv_sec < y->tv_sec;
+ return g_strdup(text);
}
-const gchar *get_exec_time()
+/* Borrowed from gtkfilesystemunix.c */
+gchar *expand_tilde(const gchar *filename)
{
- static gchar timestr[30];
- static struct timeval start_tv = {0, 0};
- static struct timeval previous = {0, 0};
- static gint started = 0;
+#ifndef G_OS_UNIX
+ return g_strdup(filename);
+#else
+ const char *notilde;
+ const char *slash;
+ const char *home;
- struct timeval tv = {0, 0};
- static struct timeval delta = {0, 0};
+ if (filename[0] != '~')
+ return g_strdup(filename);
- gettimeofday(&tv, NULL);
-
- if (start_tv.tv_sec == 0) start_tv = tv;
-
- tv.tv_sec -= start_tv.tv_sec;
- if (tv.tv_usec >= start_tv.tv_usec)
- tv.tv_usec -= start_tv.tv_usec;
- else
+ notilde = filename + 1;
+ slash = strchr(notilde, G_DIR_SEPARATOR);
+ if (slash == notilde || !*notilde)
{
- tv.tv_usec += 1000000 - start_tv.tv_usec;
- tv.tv_sec -= 1;
- }
-
- if (started) timeval_delta(&delta, &tv, &previous);
-
- previous = tv;
- started = 1;
-
- g_snprintf(timestr, sizeof(timestr), "%5d.%06d (+%05d.%06d)", (int)tv.tv_sec, (int)tv.tv_usec, (int)delta.tv_sec, (int)delta.tv_usec);
-
- return timestr;
-}
-
-/*
- *-----------------------------------------------------------------------------
- * Open browser with the help Documentation
- *-----------------------------------------------------------------------------
- */
-
-static gchar *command_result(const gchar *binary, const gchar *command)
-{
- gchar *result = NULL;
- FILE *f;
- char buf[2048];
- int l;
-
- if (!binary) return NULL;
- if (!file_in_path(binary)) return NULL;
-
- if (!command) return g_strdup(binary);
- if (command[0] == '!') return g_strdup(command + 1);
-
- f = popen(command, "r");
- if (!f) return NULL;
-
- while ((l = fread(buf, sizeof(char), sizeof(buf), f)) > 0)
- {
- if (!result)
- {
- int n = 0;
-
- while (n < l && buf[n] != '\n' && buf[n] != '\r') n++;
- if (n > 0) result = g_strndup(buf, n);
- }
- }
-
- pclose(f);
-
- return result;
-}
-
-static void help_browser_command(const gchar *command, const gchar *path)
-{
- gchar *result;
- gchar *buf;
- gchar *begin;
- gchar *end;
-
- if (!command || !path) return;
-
- DEBUG_1("Help command pre \"%s\", \"%s\"\n", command, path);
-
- buf = g_strdup(command);
- begin = strstr(buf, "%s");
- if (begin)
- {
- *begin = '\0';
- end = begin + 2;
- begin = buf;
-
- result = g_strdup_printf("%s%s%s &", begin, path, end);
- }
- else
- {
- result = g_strdup_printf("%s \"%s\" &", command, path);
- }
- g_free(buf);
-
- DEBUG_1("Help command post [%s]\n", result);
-
- system(result);
-
- g_free(result);
-}
-
-/*
- * each set of 2 strings is one browser:
- * the 1st is the binary to look for in the path
- * the 2nd has 3 capabilities:
- * NULL exec binary with html file path as command line
- * string exec string and use results for command line
- * !string use text following ! as command line, replacing optional %s with html file path
-*/
-static gchar *html_browsers[] =
-{
- /* Redhat has a nifty htmlview script to start the user's preferred browser */
- "htmlview", NULL,
- /* GNOME 2 */
- "gconftool-2", "gconftool-2 -g /desktop/gnome/url-handlers/http/command",
- /* KDE */
- "kfmclient", "!kfmclient exec \"%s\"",
- /* use fallbacks */
- "firefox", NULL,
- "mozilla", NULL,
- "konqueror", NULL,
- "netscape", NULL,
- NULL, NULL
-};
-
-static void help_browser_run(void)
-{
- gchar *result = NULL;
- gint i;
-
- i = 0;
- while (!result && html_browsers[i])
- {
- result = command_result(html_browsers[i], html_browsers[i+1]);
- i += 2;
- }
-
- if (!result)
+ home = g_get_home_dir();
+ if (!home)
+ return g_strdup(filename);
+ }
+ else
{
- printf("Unable to detect an installed browser.\n");
- return;
- }
-
- help_browser_command(result, GQ_HTMLDIR "/index.html");
-
- g_free(result);
-}
-
-/*
- *-----------------------------------------------------------------------------
- * help window
- *-----------------------------------------------------------------------------
- */
+ gchar *username;
+ struct passwd *passwd;
-static GtkWidget *help_window = NULL;
+ if (slash)
+ username = g_strndup(notilde, slash - notilde);
+ else
+ username = g_strdup(notilde);
-static void help_window_destroy_cb(GtkWidget *window, gpointer data)
-{
- help_window = NULL;
-}
+ passwd = getpwnam(username);
+ g_free(username);
-void help_window_show(const gchar *key)
-{
- if (key && strcmp(key, "html_contents") == 0)
- {
- help_browser_run();
- return;
- }
+ if (!passwd)
+ return g_strdup(filename);
- if (help_window)
- {
- gtk_window_present(GTK_WINDOW(help_window));
- if (key) help_window_set_key(help_window, key);
- return;
+ home = passwd->pw_dir;
}
- {
- gchar *title = g_strdup_printf("%s - %s", _("Help"), GQ_APPNAME);
- help_window = help_window_new(title, GQ_WMCLASS, "help",
- GQ_HELPDIR "/README", key);
- g_free(title);
- }
- g_signal_connect(G_OBJECT(help_window), "destroy",
- G_CALLBACK(help_window_destroy_cb), NULL);
+ 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
}
}
-/*
- *-----------------------------------------------------------------------------
- * remote functions
- *-----------------------------------------------------------------------------
- */
-
-static void gr_image_next(const gchar *text, gpointer data)
-{
- layout_image_next(NULL);
-}
-
-static void gr_image_prev(const gchar *text, gpointer data)
-{
- layout_image_prev(NULL);
-}
-
-static void gr_image_first(const gchar *text, gpointer data)
-{
- layout_image_first(NULL);
-}
-
-static void gr_image_last(const gchar *text, gpointer data)
-{
- layout_image_last(NULL);
-}
-
-static void gr_fullscreen_toggle(const gchar *text, gpointer data)
-{
- layout_image_full_screen_toggle(NULL);
-}
-
-static void gr_fullscreen_start(const gchar *text, gpointer data)
-{
- layout_image_full_screen_start(NULL);
-}
-
-static void gr_fullscreen_stop(const gchar *text, gpointer data)
-{
- layout_image_full_screen_stop(NULL);
-}
-
-static void gr_slideshow_start_rec(const gchar *text, gpointer data)
-{
- GList *list;
-
- list = path_list_recursive(text);
- if (!list) return;
-//printf("length: %d\n", g_list_length(list));
- layout_image_slideshow_stop(NULL);
- layout_image_slideshow_start_from_list(NULL, list);
-}
-
-static void gr_slideshow_toggle(const gchar *text, gpointer data)
-{
- layout_image_slideshow_toggle(NULL);
-}
-
-static void gr_slideshow_start(const gchar *text, gpointer data)
-{
- layout_image_slideshow_start(NULL);
-}
-
-static void gr_slideshow_stop(const gchar *text, gpointer data)
-{
- layout_image_slideshow_stop(NULL);
-}
-
-static void gr_slideshow_delay(const gchar *text, gpointer data)
-{
- gdouble n;
-
- n = strtod(text, NULL);
- if (n < SLIDESHOW_MIN_SECONDS || n > SLIDESHOW_MAX_SECONDS)
- {
- printf_term("Remote slideshow delay out of range (%.1f to %.1f)\n",
- SLIDESHOW_MIN_SECONDS, SLIDESHOW_MAX_SECONDS);
- return;
- }
- options->slideshow.delay = (gint)(n * 10.0 + 0.01);
-}
-
-static void gr_tools_show(const gchar *text, gpointer data)
-{
- gint popped;
- gint hidden;
-
- if (layout_tools_float_get(NULL, &popped, &hidden) && hidden)
- {
- layout_tools_float_set(NULL, popped, FALSE);
- }
-}
-
-static void gr_tools_hide(const gchar *text, gpointer data)
-{
- gint popped;
- gint hidden;
-
- if (layout_tools_float_get(NULL, &popped, &hidden) && !hidden)
- {
- layout_tools_float_set(NULL, popped, TRUE);
- }
-}
-
-static gint gr_quit_idle_cb(gpointer data)
-{
- exit_program();
-
- return FALSE;
-}
-
-static void gr_quit(const gchar *text, gpointer data)
-{
- /* schedule exit when idle, if done from within a
- * remote handler remote_close will crash
- */
- g_idle_add(gr_quit_idle_cb, NULL);
-}
-
-static void gr_file_load(const gchar *text, gpointer data)
-{
- if (isfile(text))
- {
- if (file_extension_match(text, ".gqv"))
- {
- collection_window_new(text);
- }
- else
- {
- layout_set_path(NULL, text);
- }
- }
- else if (isdir(text))
- {
- layout_set_path(NULL, text);
- }
- else
- {
- printf("remote sent filename that does not exist:\"%s\"\n", text);
- }
-}
-
-static void gr_file_view(const gchar *text, gpointer data)
-{
- view_window_new(file_data_new_simple(text));
-}
-
-static void gr_list_clear(const gchar *text, gpointer data)
-{
- if (command_collection) collection_unref(command_collection);
- command_collection = NULL;
-}
-
-static void gr_list_add(const gchar *text, gpointer data)
-{
- gint new = TRUE;
-
- if (!command_collection)
- {
- CollectionData *cd;
-
- cd = collection_new("");
-
- g_free(cd->path);
- cd->path = NULL;
- g_free(cd->name);
- cd->name = g_strdup(_("Command line"));
-
- command_collection = cd;
- }
- else
- {
- new = (!collection_get_first(command_collection));
- }
-
- if (collection_add(command_collection, file_data_new_simple(text), FALSE) && new)
- {
- layout_image_set_collection(NULL, command_collection,
- collection_get_first(command_collection));
- }
-}
-
-static void gr_raise(const gchar *text, gpointer data)
-{
- LayoutWindow *lw = NULL;
-
- if (layout_valid(&lw))
- {
- gtk_window_present(GTK_WINDOW(lw->window));
- }
-}
-
-typedef struct _RemoteCommandEntry RemoteCommandEntry;
-struct _RemoteCommandEntry {
- gchar *opt_s;
- gchar *opt_l;
- void (*func)(const gchar *text, gpointer data);
- gint needs_extra;
- gint prefer_command_line;
- gchar *description;
-};
-
-static RemoteCommandEntry remote_commands[] = {
- /* short, long callback, extra, prefer,description */
- { "-n", "--next", gr_image_next, FALSE, FALSE, N_("next image") },
- { "-b", "--back", gr_image_prev, FALSE, FALSE, N_("previous image") },
- { NULL, "--first", gr_image_first, FALSE, FALSE, N_("first image") },
- { NULL, "--last", gr_image_last, FALSE, FALSE, N_("last image") },
- { "-f", "--fullscreen", gr_fullscreen_toggle, FALSE, TRUE, N_("toggle full screen") },
- { "-fs","--fullscreen-start", gr_fullscreen_start, FALSE, FALSE, N_("start full screen") },
- { "-fS","--fullscreen-stop", gr_fullscreen_stop, FALSE, FALSE, N_("stop full screen") },
- { "-s", "--slideshow", gr_slideshow_toggle, FALSE, TRUE, N_("toggle slide show") },
- { "-ss","--slideshow-start", gr_slideshow_start, FALSE, FALSE, N_("start slide show") },
- { "-sS","--slideshow-stop", gr_slideshow_stop, FALSE, FALSE, N_("stop slide show") },
- { "-sr","--slideshow-recurse", gr_slideshow_start_rec, TRUE, FALSE, N_("start recursive slide show") },
- { "-d", "--delay=", gr_slideshow_delay, TRUE, FALSE, N_("set slide show delay in seconds") },
- { "+t", "--tools-show", gr_tools_show, FALSE, TRUE, N_("show tools") },
- { "-t", "--tools-hide", gr_tools_hide, FALSE, TRUE, N_("hide tools") },
- { "-q", "--quit", gr_quit, FALSE, FALSE, N_("quit") },
- { NULL, "file:", gr_file_load, TRUE, FALSE, N_("open file") },
- { NULL, "view:", gr_file_view, TRUE, FALSE, N_("open file in new window") },
- { NULL, "--list-clear", gr_list_clear, FALSE, FALSE, NULL },
- { NULL, "--list-add:", gr_list_add, TRUE, FALSE, NULL },
- { NULL, "raise", gr_raise, FALSE, FALSE, NULL },
- { NULL, NULL, NULL, FALSE, FALSE, NULL }
-};
-
-static RemoteCommandEntry *remote_command_find(const gchar *text, const gchar **offset)
-{
- gint match = FALSE;
- gint i;
-
- i = 0;
- while (!match && remote_commands[i].func != NULL)
- {
- if (remote_commands[i].needs_extra)
- {
- if (remote_commands[i].opt_s &&
- strncmp(remote_commands[i].opt_s, text, strlen(remote_commands[i].opt_s)) == 0)
- {
- if (offset) *offset = text + strlen(remote_commands[i].opt_s);
- return &remote_commands[i];
- }
- else if (remote_commands[i].opt_l &&
- strncmp(remote_commands[i].opt_l, text, strlen(remote_commands[i].opt_l)) == 0)
- {
- if (offset) *offset = text + strlen(remote_commands[i].opt_l);
- return &remote_commands[i];
- }
- }
- else
- {
- if ((remote_commands[i].opt_s && strcmp(remote_commands[i].opt_s, text) == 0) ||
- (remote_commands[i].opt_l && strcmp(remote_commands[i].opt_l, text) == 0))
- {
- if (offset) *offset = text;
- return &remote_commands[i];
- }
- }
-
- i++;
- }
-
- return NULL;
-}
-
-static void remote_cb(RemoteConnection *rc, const gchar *text, gpointer data)
-{
- RemoteCommandEntry *entry;
- const gchar *offset;
-
- entry = remote_command_find(text, &offset);
- if (entry && entry->func)
- {
- entry->func(offset, data);
- }
- else
- {
- printf("unknown remote command:%s\n", text);
- }
-}
-
-static void remote_help(void)
-{
- gint i;
-
- print_term(_("Remote command list:\n"));
-
- i = 0;
- while (remote_commands[i].func != NULL)
- {
- if (remote_commands[i].description)
- {
- printf_term(" %-3s%s %-20s %s\n",
- (remote_commands[i].opt_s) ? remote_commands[i].opt_s : "",
- (remote_commands[i].opt_s && remote_commands[i].opt_l) ? "," : " ",
- (remote_commands[i].opt_l) ? remote_commands[i].opt_l : "",
- _(remote_commands[i].description));
- }
- i++;
- }
-}
-
-static GList *remote_build_list(GList *list, int argc, char *argv[])
-{
- gint i;
-
- i = 1;
- while (i < argc)
- {
- RemoteCommandEntry *entry;
-
- entry = remote_command_find(argv[i], NULL);
- if (entry)
- {
- list = g_list_append(list, argv[i]);
- }
- i++;
- }
-
- return list;
-}
-
-static void remote_control(const gchar *arg_exec, GList *remote_list, const gchar *path,
- GList *cmd_list, GList *collection_list)
-{
- RemoteConnection *rc;
- gint started = FALSE;
- gchar *buf;
-
- buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/.command", NULL);
- rc = remote_client_open(buf);
- if (!rc)
- {
- GString *command;
- GList *work;
- gint retry_count = 12;
- gint blank = FALSE;
-
- printf_term(_("Remote %s not running, starting..."), GQ_APPNAME);
-
- command = g_string_new(arg_exec);
-
- work = remote_list;
- while (work)
- {
- gchar *text;
- RemoteCommandEntry *entry;
-
- text = work->data;
- work = work->next;
-
- entry = remote_command_find(text, NULL);
- if (entry)
- {
- if (entry->prefer_command_line)
- {
- remote_list = g_list_remove(remote_list, text);
- g_string_append(command, " ");
- g_string_append(command, text);
- }
- if (entry->opt_l && strcmp(entry->opt_l, "file:") == 0)
- {
- blank = TRUE;
- }
- }
- }
-
- if (blank || cmd_list || path) g_string_append(command, " --blank");
- if (debug) g_string_append(command, " --debug");
-
- g_string_append(command, " &");
- system(command->str);
- g_string_free(command, TRUE);
-
- while (!rc && retry_count > 0)
- {
- usleep((retry_count > 10) ? 500000 : 1000000);
- rc = remote_client_open(buf);
- if (!rc) print_term(".");
- retry_count--;
- }
-
- print_term("\n");
-
- started = TRUE;
- }
- g_free(buf);
-
- if (rc)
- {
- GList *work;
- const gchar *prefix;
- gint use_path = TRUE;
- gint sent = FALSE;
-
- work = remote_list;
- while (work)
- {
- gchar *text;
- RemoteCommandEntry *entry;
-
- text = work->data;
- work = work->next;
-
- entry = remote_command_find(text, NULL);
- if (entry &&
- entry->opt_l &&
- strcmp(entry->opt_l, "file:") == 0) use_path = FALSE;
-
- remote_client_send(rc, text);
-
- sent = TRUE;
- }
-
- if (cmd_list && cmd_list->next)
- {
- prefix = "--list-add:";
- remote_client_send(rc, "--list-clear");
- }
- else
- {
- prefix = "file:";
- }
-
- work = cmd_list;
- while (work)
- {
- const gchar *name;
- gchar *text;
-
- name = work->data;
- work = work->next;
-
- text = g_strconcat(prefix, name, NULL);
- remote_client_send(rc, text);
- g_free(text);
-
- sent = TRUE;
- }
-
- if (path && !cmd_list && use_path)
- {
- gchar *text;
-
- text = g_strdup_printf("file:%s", path);
- remote_client_send(rc, text);
- g_free(text);
-
- sent = TRUE;
- }
-
- work = collection_list;
- while (work)
- {
- const gchar *name;
- gchar *text;
-
- name = work->data;
- work = work->next;
-
- text = g_strdup_printf("file:%s", name);
- remote_client_send(rc, text);
- g_free(text);
-
- sent = TRUE;
- }
-
- if (!started && !sent)
- {
- remote_client_send(rc, "raise");
- }
- }
- else
- {
- print_term(_("Remote not available\n"));
- }
-
- _exit(0);
-}
/*
*-----------------------------------------------------------------------------
{
if (!*path) *path = remove_level_from_path(path_parsed);
if (!*file) *file = g_strdup(path_parsed);
- *list = g_list_prepend(*list, path_parsed);
+ *list = g_list_prepend(*list, file_data_new_simple(path_parsed));
}
}
static void parse_command_line_add_dir(const gchar *dir, gchar **path, gchar **file,
GList **list)
{
- GList *files = NULL;
+ GList *files;
gchar *path_parsed;
path_parsed = g_strdup(dir);
parse_out_relatives(path_parsed);
- if (path_list(path_parsed, &files, NULL))
+ if (filelist_read(path_parsed, &files, NULL))
{
GList *work;
- files = path_list_filter(files, FALSE);
- files = path_list_sort(files);
+ files = filelist_filter(files, FALSE);
+ files = filelist_sort_path(files);
work = files;
while (work)
{
- gchar *p;
-
- p = work->data;
- if (!*path) *path = remove_level_from_path(p);
- if (!*file) *file = g_strdup(p);
- *list = g_list_prepend(*list, p);
+ FileData *fd = work->data;
+ if (!*path) *path = remove_level_from_path(fd->path);
+ if (!*file) *file = g_strdup(fd->path);
+ *list = g_list_prepend(*list, fd);
work = work->next;
}
{
GList *list = NULL;
GList *remote_list = NULL;
+ GList *remote_errors = NULL;
gint remote_do = FALSE;
gchar *first_dir = NULL;
while (i < argc)
{
const gchar *cmd_line = argv[i];
- gchar *cmd_all = concat_dir_and_file(base_dir, cmd_line);
+ gchar *cmd_all = g_build_filename(base_dir, cmd_line, NULL);
- if (cmd_line[0] == '/' && isdir(cmd_line))
+ 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_all, path, file, &list, &first_dir);
}
- else if (cmd_line[0] == '/' && isfile(cmd_line))
+ 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);
if (!remote_do)
{
remote_do = TRUE;
- remote_list = remote_build_list(remote_list, argc, argv);
+ remote_list = remote_build_list(remote_list, argc - i, &argv[i], &remote_errors);
}
}
else if (strcmp(cmd_line, "-rh") == 0 ||
strcmp(cmd_line, "--remote-help") == 0)
{
remote_help();
- exit (0);
+ exit(0);
}
else if (strcmp(cmd_line, "--blank") == 0)
{
else if (strcmp(cmd_line, "-v") == 0 ||
strcmp(cmd_line, "--version") == 0)
{
- printf("%s %s\n", GQ_APPNAME, VERSION);
- exit (0);
+ printf_term("%s %s\n", GQ_APPNAME, VERSION);
+ exit(0);
}
else if (strcmp(cmd_line, "--alternate") == 0)
{
/* enable faster experimental algorithm */
- printf("Alternate similarity algorithm enabled\n");
+ log_printf("Alternate similarity algorithm enabled\n");
image_sim_alternate_set(TRUE);
}
else if (strcmp(cmd_line, "-h") == 0 ||
strcmp(cmd_line, "--help") == 0)
{
- printf("%s %s\n", GQ_APPNAME, VERSION);
+ 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( " --alternate use alternate similarity algorithm\n");
#endif
- exit (0);
+ exit(0);
}
else if (!remote_do)
{
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;
+ }
+
+ printf_term(_("\nUse --remote-help for valid remote options.\n"));
+ }
+
remote_control(argv[0], remote_list, *path, list, *collection_list);
}
g_list_free(remote_list);
}
else
{
- path_list_free(list);
+ filelist_free(list);
*cmd_list = NULL;
}
}
/* we now increment the debug state for verbosity */
if (cmd_line_len == len)
- debug++;
+ debug_level_add(1);
else if (cmd_line[len] == '=' && g_ascii_isdigit(cmd_line[len+1]))
{
gint n = atoi(cmd_line + len + 1);
if (n < 0) n = 1;
- debug += n;
+ debug_level_add(n);
}
}
}
}
- DEBUG_1("debugging output enabled (level %d)\n", debug);
+ DEBUG_1("debugging output enabled (level %d)", get_debug_level());
#endif
}
{
gchar *path;
- path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_HISTORY_NAME, NULL);
+ path = g_build_filename(homedir(), GQ_RC_DIR, RC_HISTORY_NAME, NULL);
history_list_load(path);
g_free(path);
}
{
gchar *path;
- path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_HISTORY_NAME, NULL);
+ path = g_build_filename(homedir(), GQ_RC_DIR, RC_HISTORY_NAME, NULL);
history_list_save(path);
g_free(path);
}
{
gchar *buf;
- buf = g_strconcat(homedir(), "/", path, NULL);
+ buf = g_build_filename(homedir(), path, NULL);
if (!isdir(buf))
{
- printf_term(_("Creating %s dir:%s\n"), GQ_APPNAME, buf);
+ log_printf(_("Creating %s dir:%s\n"), GQ_APPNAME, buf);
if (!mkdir_utf8(buf, 0755))
{
- printf_term(_("Could not create dir:%s\n"), buf);
+ log_printf(_("Could not create dir:%s\n"), buf);
}
}
g_free(buf);
}
-static void setup_default_options(void)
-{
- gchar *path;
- gint i;
-
- for (i = 0; i < GQ_EDITOR_SLOTS; i++)
- {
- options->editor_name[i] = NULL;
- options->editor_command[i] = NULL;
- }
-
- editor_reset_defaults();
-
- bookmark_add_default(_("Home"), homedir());
- path = concat_dir_and_file(homedir(), "Desktop");
- bookmark_add_default(_("Desktop"), path);
- g_free(path);
- path = concat_dir_and_file(homedir(), GQ_RC_DIR_COLLECTIONS);
- bookmark_add_default(_("Collections"), path);
- g_free(path);
-
- g_free(options->file_ops.safe_delete_path);
- options->file_ops.safe_delete_path = concat_dir_and_file(homedir(), GQ_RC_DIR_TRASH);
-
- for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
- {
- options->color_profile.input_file[i] = NULL;
- options->color_profile.input_name[i] = NULL;
- }
-
- set_default_image_overlay_template_string(options);
- sidecar_ext_add_defaults();
- options->layout.order = g_strdup("123");
-}
static void exit_program_final(void)
{
gchar *path;
gchar *pathl;
- LayoutWindow *lw = NULL;
remote_close(remote_connection);
collect_manager_flush();
- if (layout_valid(&lw))
- {
- options->layout.main_window.maximized = window_maximized(lw->window);
- if (!options->layout.main_window.maximized)
- {
- layout_geometry_get(NULL, &options->layout.main_window.x, &options->layout.main_window.y,
- &options->layout.main_window.w, &options->layout.main_window.h);
- }
- options->image_overlay.common.enabled = image_osd_get(lw->image, NULL, NULL);
- }
-
- layout_geometry_get_dividers(NULL, &options->layout.main_window.hdivider_pos, &options->layout.main_window.vdivider_pos);
-
- layout_views_get(NULL, &options->layout.dir_view_type, &options->layout.view_as_icons);
-
- options->layout.show_thumbnails = layout_thumb_get(NULL);
- options->layout.show_marks = layout_marks_get(NULL);
-
- layout_sort_get(NULL, &options->file_sort.method, &options->file_sort.ascending);
-
- layout_geometry_get_tools(NULL, &options->layout.float_window.x, &options->layout.float_window.y,
- &options->layout.float_window.w, &options->layout.float_window.h, &options->layout.float_window.vdivider_pos);
- layout_tools_float_get(NULL, &options->layout.tools_float, &options->layout.tools_hidden);
- options->layout.toolbar_hidden = layout_toolbar_hidden(NULL);
-
- options->color_profile.enabled = layout_image_color_profile_get_use(NULL);
- layout_image_color_profile_get(NULL,
- &options->color_profile.input_type,
- &options->color_profile.screen_type,
- &options->color_profile.use_image);
-
- save_options();
+ sync_options_with_current_state(options);
+ save_options(options);
keys_save();
- path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);
+ path = g_build_filename(homedir(), GQ_RC_DIR, "accels", NULL);
pathl = path_from_utf8(path);
gtk_accel_map_save(pathl);
g_free(pathl);
exit_program_final();
}
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
{
LayoutWindow *lw;
gchar *path = NULL;
gchar *geometry = NULL;
gchar *buf;
gchar *bufl;
+ CollectionData *cd = NULL;
- /* init execution time counter*/
- get_exec_time();
+ /* init execution time counter (debug only) */
+ init_exec_time();
/* setup locale, i18n */
gtk_set_locale();
+
+#ifdef ENABLE_NLS
bindtextdomain(PACKAGE, GQ_LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
-
+#endif
+
/* setup random seed for random slideshow */
srand(time(NULL));
#if 1
- printf("%s %s, This is an alpha release.\n", GQ_APPNAME, VERSION);
+ log_printf("%s %s, This is an alpha release.\n", GQ_APPNAME, VERSION);
#endif
parse_command_line_for_debug_option(argc, argv);
options = init_options(NULL);
- setup_default_options();
- load_options();
+ setup_default_options(options);
+ load_options(options);
parse_command_line(argc, argv, &cmd_path, &cmd_file, &cmd_list, &collection_list, &geometry);
- gtk_init (&argc, &argv);
+ gtk_init(&argc, &argv);
if (gtk_major_version < GTK_MAJOR_VERSION ||
(gtk_major_version == GTK_MAJOR_VERSION && gtk_minor_version < GTK_MINOR_VERSION) )
{
- printf_term("!!! This is a friendly warning.\n");
- printf_term("!!! The version of GTK+ in use now is older than when %s was compiled.\n", GQ_APPNAME);
- printf_term("!!! compiled with GTK+-%d.%d\n", GTK_MAJOR_VERSION, GTK_MINOR_VERSION);
- printf_term("!!! running with GTK+-%d.%d\n", gtk_major_version, gtk_minor_version);
- printf_term("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME);
+ log_printf("!!! This is a friendly warning.\n");
+ log_printf("!!! The version of GTK+ in use now is older than when %s was compiled.\n", GQ_APPNAME);
+ log_printf("!!! compiled with GTK+-%d.%d\n", GTK_MAJOR_VERSION, GTK_MINOR_VERSION);
+ log_printf("!!! running with GTK+-%d.%d\n", gtk_major_version, gtk_minor_version);
+ log_printf("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME);
}
check_for_home_path(GQ_RC_DIR);
filter_add_defaults();
filter_rebuild();
- buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);
+ buf = g_build_filename(homedir(), GQ_RC_DIR, "accels", NULL);
bufl = path_from_utf8(buf);
gtk_accel_map_load(bufl);
g_free(bufl);
cmd_path = NULL;
g_free(cmd_file);
cmd_file = NULL;
- path_list_free(cmd_list);
+ filelist_free(cmd_list);
cmd_list = NULL;
- path_list_free(collection_list);
+ string_list_free(collection_list);
collection_list = NULL;
path = NULL;
{
path = g_strdup(cmd_path);
}
- else if (options->startup_path_enable && options->startup_path && isdir(options->startup_path))
+ else if (options->startup.restore_path && options->startup.path && isdir(options->startup.path))
{
- path = g_strdup(options->startup_path);
+ path = g_strdup(options->startup.path);
}
else
{
if (cmd_list ||
(startup_command_line_collection && collection_list))
{
- CollectionData *cd;
GList *work;
if (startup_command_line_collection)
else
{
cd = collection_new(""); /* if we pass NULL, untitled counter is falsely increm. */
- command_collection = cd;
}
g_free(cd->path);
collection_get_first(first_collection));
}
}
- image_osd_set(lw->image, FALSE, (options->image_overlay.common.show_at_startup || options->image_overlay.common.enabled));
+
+ 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);
- path_list_free(cmd_list);
- path_list_free(collection_list);
+ 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_strconcat(homedir(), "/", GQ_RC_DIR, "/.command", NULL);
- remote_connection = remote_server_open(buf);
- remote_server_subscribe(remote_connection, remote_cb, NULL);
+ buf = g_build_filename(homedir(), GQ_RC_DIR, ".command", NULL);
+ remote_connection = remote_server_init(buf, cd);
g_free(buf);
- gtk_main ();
+ gtk_main();
return 0;
}
projects / geeqie.git / blobdiff