Mercurial > geeqie
annotate src/main.c @ 786:a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
It fixes bug 1959854.
| author | zas_ |
|---|---|
| date | Thu, 05 Jun 2008 09:24:42 +0000 |
| parents | d6a7fb4b8e7c |
| children | baade53888be |
| rev | line source |
|---|---|
| 1 | 1 /* |
| 196 | 2 * Geeqie |
|
79
528e3432e0c0
Thu Oct 19 07:23:37 2006 John Ellis <johne@verizon.net>
gqview
parents:
76
diff
changeset
|
3 * (C) 2006 John Ellis |
| 475 | 4 * Copyright (C) 2008 The Geeqie Team |
| 1 | 5 * |
| 6 * Author: John Ellis | |
| 7 * | |
| 9 | 8 * This software is released under the GNU General Public License (GNU GPL). |
| 9 * Please read the included file COPYING for more information. | |
| 10 * This software comes with no warranty of any kind, use at your own risk! | |
| 1 | 11 */ |
| 12 | |
| 9 | 13 |
| 281 | 14 #include "main.h" |
| 9 | 15 |
| 16 #include "cache.h" | |
| 17 #include "collect.h" | |
| 18 #include "collect-io.h" | |
| 586 | 19 #include "filedata.h" |
| 20 #include "filefilter.h" | |
|
218
f4a0555794a9
Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents:
214
diff
changeset
|
21 #include "image-overlay.h" |
| 9 | 22 #include "layout.h" |
| 23 #include "layout_image.h" | |
| 24 #include "rcfile.h" | |
| 25 #include "remote.h" | |
| 26 #include "similar.h" | |
| 27 #include "ui_bookmark.h" | |
| 28 #include "ui_fileops.h" | |
| 29 #include "ui_utildlg.h" | |
| 30 | |
| 1 | 31 #include <gdk/gdkkeysyms.h> /* for keyboard values */ |
| 32 | |
| 9 | 33 |
| 34 #include <math.h> | |
| 653 | 35 #ifdef G_OS_UNIX |
| 36 #include <pwd.h> | |
| 37 #endif | |
| 9 | 38 |
| 39 | |
| 279 | 40 static RemoteConnection *remote_connection = NULL; |
| 9 | 41 |
| 1 | 42 |
| 43 /* | |
| 44 *----------------------------------------------------------------------------- | |
| 9 | 45 * misc (public) |
| 1 | 46 *----------------------------------------------------------------------------- |
| 442 | 47 */ |
| 1 | 48 |
| 9 | 49 |
| 50 gdouble get_zoom_increment(void) | |
| 51 { | |
| 334 | 52 return ((options->image.zoom_increment != 0) ? (gdouble)options->image.zoom_increment / 10.0 : 1.0); |
| 1 | 53 } |
| 54 | |
|
767
e73d30e0c896
Make utf8_validate_or_convert() to always allocate a new string.
zas_
parents:
742
diff
changeset
|
55 gchar *utf8_validate_or_convert(const gchar *text) |
|
645
b50deb0f9968
Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents:
638
diff
changeset
|
56 { |
|
b50deb0f9968
Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents:
638
diff
changeset
|
57 gint len; |
|
b50deb0f9968
Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents:
638
diff
changeset
|
58 |
|
b50deb0f9968
Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents:
638
diff
changeset
|
59 if (!text) return NULL; |
|
b50deb0f9968
Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents:
638
diff
changeset
|
60 |
|
b50deb0f9968
Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents:
638
diff
changeset
|
61 len = strlen(text); |
|
b50deb0f9968
Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents:
638
diff
changeset
|
62 if (!g_utf8_validate(text, len, NULL)) |
|
767
e73d30e0c896
Make utf8_validate_or_convert() to always allocate a new string.
zas_
parents:
742
diff
changeset
|
63 return g_convert(text, len, "UTF-8", "ISO-8859-1", NULL, NULL, NULL); |
|
645
b50deb0f9968
Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents:
638
diff
changeset
|
64 |
|
767
e73d30e0c896
Make utf8_validate_or_convert() to always allocate a new string.
zas_
parents:
742
diff
changeset
|
65 return g_strdup(text); |
|
645
b50deb0f9968
Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents:
638
diff
changeset
|
66 } |
|
b50deb0f9968
Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents:
638
diff
changeset
|
67 |
|
786
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
68 gint utf8_compare(const gchar *s1, const gchar *s2, gboolean case_sensitive) |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
69 { |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
70 gchar *s1_key, *s2_key; |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
71 gchar *s1_t, *s2_t; |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
72 gint ret; |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
73 |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
74 g_assert(g_utf8_validate(s1, -1, NULL)); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
75 g_assert(g_utf8_validate(s2, -1, NULL)); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
76 |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
77 if (!case_sensitive) |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
78 { |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
79 s1_t = g_utf8_casefold(s1, -1); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
80 s2_t = g_utf8_casefold(s2, -1); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
81 } |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
82 |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
83 s1_key = g_utf8_collate_key(s1_t, -1); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
84 s2_key = g_utf8_collate_key(s2_t, -1); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
85 |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
86 ret = strcmp(s1_key, s2_key); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
87 |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
88 g_free(s1_key); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
89 g_free(s2_key); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
90 |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
91 if (!case_sensitive) |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
92 { |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
93 g_free(s1_t); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
94 g_free(s2_t); |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
95 } |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
96 |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
97 return ret; |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
98 } |
|
a20ff446347e
Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents:
783
diff
changeset
|
99 |
| 653 | 100 /* Borrowed from gtkfilesystemunix.c */ |
| 101 gchar *expand_tilde(const gchar *filename) | |
| 102 { | |
| 103 #ifndef G_OS_UNIX | |
| 104 return g_strdup(filename); | |
| 105 #else | |
| 106 const char *notilde; | |
| 107 const char *slash; | |
| 108 const char *home; | |
| 109 | |
| 110 if (filename[0] != '~') | |
| 111 return g_strdup(filename); | |
| 112 | |
| 113 notilde = filename + 1; | |
| 114 slash = strchr(notilde, G_DIR_SEPARATOR); | |
| 115 if (slash == notilde || !*notilde) | |
| 116 { | |
| 117 home = g_get_home_dir(); | |
| 118 if (!home) | |
| 119 return g_strdup(filename); | |
| 120 } | |
| 121 else | |
| 122 { | |
| 123 gchar *username; | |
| 124 struct passwd *passwd; | |
| 125 | |
| 126 if (slash) | |
| 127 username = g_strndup(notilde, slash - notilde); | |
| 128 else | |
| 129 username = g_strdup(notilde); | |
| 130 | |
| 131 passwd = getpwnam(username); | |
| 132 g_free(username); | |
| 133 | |
| 134 if (!passwd) | |
| 135 return g_strdup(filename); | |
| 136 | |
| 137 home = passwd->pw_dir; | |
| 138 } | |
| 139 | |
| 140 if (slash) | |
| 141 return g_build_filename(home, G_DIR_SEPARATOR_S, slash + 1, NULL); | |
| 142 else | |
| 143 return g_build_filename(home, G_DIR_SEPARATOR_S, NULL); | |
| 144 #endif | |
| 145 } | |
| 146 | |
| 147 | |
| 1 | 148 /* |
| 149 *----------------------------------------------------------------------------- | |
| 150 * keyboard functions | |
| 151 *----------------------------------------------------------------------------- | |
| 152 */ | |
| 153 | |
| 154 void keyboard_scroll_calc(gint *x, gint *y, GdkEventKey *event) | |
| 155 { | |
| 156 static gint delta = 0; | |
| 157 static guint32 time_old = 0; | |
| 158 static guint keyval_old = 0; | |
| 159 | |
| 9 | 160 if (event->state & GDK_CONTROL_MASK) |
| 161 { | |
| 162 if (*x < 0) *x = G_MININT / 2; | |
| 163 if (*x > 0) *x = G_MAXINT / 2; | |
| 164 if (*y < 0) *y = G_MININT / 2; | |
| 165 if (*y > 0) *y = G_MAXINT / 2; | |
| 166 | |
| 167 return; | |
| 168 } | |
| 169 | |
| 318 | 170 if (options->progressive_key_scrolling) |
| 1 | 171 { |
| 172 guint32 time_diff; | |
| 173 | |
| 174 time_diff = event->time - time_old; | |
| 175 | |
| 176 /* key pressed within 125ms ? (1/8 second) */ | |
| 177 if (time_diff > 125 || event->keyval != keyval_old) delta = 0; | |
| 178 | |
| 179 time_old = event->time; | |
| 180 keyval_old = event->keyval; | |
| 181 | |
| 182 delta += 2; | |
| 183 } | |
| 184 else | |
| 185 { | |
| 186 delta = 8; | |
| 187 } | |
| 188 | |
| 189 *x = *x * delta; | |
| 190 *y = *y * delta; | |
| 191 } | |
| 192 | |
| 9 | 193 |
| 1 | 194 |
| 195 /* | |
| 196 *----------------------------------------------------------------------------- | |
| 3 | 197 * command line parser (private) hehe, who needs popt anyway? |
| 1 | 198 *----------------------------------------------------------------------------- |
| 442 | 199 */ |
| 1 | 200 |
| 9 | 201 static gint startup_blank = FALSE; |
| 3 | 202 static gint startup_full_screen = FALSE; |
| 203 static gint startup_in_slideshow = FALSE; | |
| 9 | 204 static gint startup_command_line_collection = FALSE; |
| 3 | 205 |
| 9 | 206 |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
207 static void parse_command_line_add_file(const gchar *file_path, gchar **path, gchar **file, |
| 442 | 208 GList **list, GList **collection_list) |
| 1 | 209 { |
| 9 | 210 gchar *path_parsed; |
| 211 | |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
212 path_parsed = g_strdup(file_path); |
| 9 | 213 parse_out_relatives(path_parsed); |
| 214 | |
|
781
2d2cca2bceb0
Replace hardcoded collection filename extension by a macro (GQ_COLLECTION_EXT).
zas_
parents:
780
diff
changeset
|
215 if (file_extension_match(path_parsed, GQ_COLLECTION_EXT)) |
| 9 | 216 { |
| 217 *collection_list = g_list_append(*collection_list, path_parsed); | |
| 218 } | |
| 219 else | |
| 220 { | |
| 221 if (!*path) *path = remove_level_from_path(path_parsed); | |
| 222 if (!*file) *file = g_strdup(path_parsed); | |
|
576
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
223 *list = g_list_prepend(*list, file_data_new_simple(path_parsed)); |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
224 } |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
225 } |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
226 |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
227 static void parse_command_line_add_dir(const gchar *dir, gchar **path, gchar **file, |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
228 GList **list) |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
229 { |
|
780
44128da39e13
Drop initialization to NULL since filelist_read() will take care of it.
zas_
parents:
767
diff
changeset
|
230 GList *files; |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
231 gchar *path_parsed; |
| 783 | 232 FileData *dir_fd; |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
233 |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
234 path_parsed = g_strdup(dir); |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
235 parse_out_relatives(path_parsed); |
| 783 | 236 dir_fd = file_data_new_simple(path_parsed); |
| 237 | |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
238 |
| 783 | 239 if (filelist_read(dir_fd, &files, NULL)) |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
240 { |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
241 GList *work; |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
242 |
|
576
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
243 files = filelist_filter(files, FALSE); |
|
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
244 files = filelist_sort_path(files); |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
245 |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
246 work = files; |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
247 while (work) |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
248 { |
|
576
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
249 FileData *fd = work->data; |
|
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
250 if (!*path) *path = remove_level_from_path(fd->path); |
|
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
251 if (!*file) *file = g_strdup(fd->path); |
|
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
252 *list = g_list_prepend(*list, fd); |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
253 |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
254 work = work->next; |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
255 } |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
256 |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
257 g_list_free(files); |
| 9 | 258 } |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
259 |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
260 g_free(path_parsed); |
| 783 | 261 file_data_unref(dir_fd); |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
262 } |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
263 |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
264 static void parse_command_line_process_dir(const gchar *dir, gchar **path, gchar **file, |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
265 GList **list, gchar **first_dir) |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
266 { |
| 442 | 267 |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
268 if (!*list && !*first_dir) |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
269 { |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
270 *first_dir = g_strdup(dir); |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
271 } |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
272 else |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
273 { |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
274 if (*first_dir) |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
275 { |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
276 parse_command_line_add_dir(*first_dir, path, file, list); |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
277 g_free(*first_dir); |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
278 *first_dir = NULL; |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
279 } |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
280 parse_command_line_add_dir(dir, path, file, list); |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
281 } |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
282 } |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
283 |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
284 static void parse_command_line_process_file(const gchar *file_path, gchar **path, gchar **file, |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
285 GList **list, GList **collection_list, gchar **first_dir) |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
286 { |
| 442 | 287 |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
288 if (*first_dir) |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
289 { |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
290 parse_command_line_add_dir(*first_dir, path, file, list); |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
291 g_free(*first_dir); |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
292 *first_dir = NULL; |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
293 } |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
294 parse_command_line_add_file(file_path, path, file, list, collection_list); |
| 9 | 295 } |
| 296 | |
| 297 static void parse_command_line(int argc, char *argv[], gchar **path, gchar **file, | |
|
81
0ef72a64930b
Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents:
79
diff
changeset
|
298 GList **cmd_list, GList **collection_list, |
|
0ef72a64930b
Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents:
79
diff
changeset
|
299 gchar **geometry) |
| 9 | 300 { |
| 301 GList *list = NULL; | |
| 302 GList *remote_list = NULL; | |
|
652
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
303 GList *remote_errors = NULL; |
| 9 | 304 gint remote_do = FALSE; |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
305 gchar *first_dir = NULL; |
| 9 | 306 |
| 1 | 307 if (argc > 1) |
| 308 { | |
| 309 gint i; | |
| 310 gchar *base_dir = get_current_dir(); | |
| 311 i = 1; | |
| 312 while (i < argc) | |
| 313 { | |
| 9 | 314 const gchar *cmd_line = argv[i]; |
|
702
e07895754e65
Drop concat_dir_and_file() and use g_build_filename() instead.
zas_
parents:
694
diff
changeset
|
315 gchar *cmd_all = g_build_filename(base_dir, cmd_line, NULL); |
| 1 | 316 |
| 726 | 317 if (cmd_line[0] == G_DIR_SEPARATOR && isdir(cmd_line)) |
| 1 | 318 { |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
319 parse_command_line_process_dir(cmd_line, path, file, &list, &first_dir); |
| 1 | 320 } |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
321 else if (isdir(cmd_all)) |
| 1 | 322 { |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
323 parse_command_line_process_dir(cmd_all, path, file, &list, &first_dir); |
| 1 | 324 } |
| 726 | 325 else if (cmd_line[0] == G_DIR_SEPARATOR && isfile(cmd_line)) |
| 1 | 326 { |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
327 parse_command_line_process_file(cmd_line, path, file, |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
328 &list, collection_list, &first_dir); |
| 1 | 329 } |
| 9 | 330 else if (isfile(cmd_all)) |
| 1 | 331 { |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
332 parse_command_line_process_file(cmd_all, path, file, |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
333 &list, collection_list, &first_dir); |
| 1 | 334 } |
|
378
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
335 else if (strncmp(cmd_line, "--debug", 7) == 0 && (cmd_line[7] == '\0' || cmd_line[7] == '=')) |
| 1 | 336 { |
|
378
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
337 /* do nothing but do not produce warnings */ |
| 1 | 338 } |
| 339 else if (strcmp(cmd_line, "+t") == 0 || | |
| 3 | 340 strcmp(cmd_line, "--with-tools") == 0) |
| 1 | 341 { |
|
338
41c3cb73120f
Rename window options (moved to layout) and re-order rc file.
zas_
parents:
334
diff
changeset
|
342 options->layout.tools_float = FALSE; |
|
41c3cb73120f
Rename window options (moved to layout) and re-order rc file.
zas_
parents:
334
diff
changeset
|
343 options->layout.tools_hidden = FALSE; |
| 9 | 344 |
| 345 remote_list = g_list_append(remote_list, "+t"); | |
| 1 | 346 } |
| 347 else if (strcmp(cmd_line, "-t") == 0 || | |
| 3 | 348 strcmp(cmd_line, "--without-tools") == 0) |
| 1 | 349 { |
|
338
41c3cb73120f
Rename window options (moved to layout) and re-order rc file.
zas_
parents:
334
diff
changeset
|
350 options->layout.tools_hidden = TRUE; |
| 9 | 351 |
| 352 remote_list = g_list_append(remote_list, "-t"); | |
| 1 | 353 } |
| 3 | 354 else if (strcmp(cmd_line, "-f") == 0 || |
| 355 strcmp(cmd_line, "--fullscreen") == 0) | |
| 356 { | |
| 357 startup_full_screen = TRUE; | |
| 358 } | |
| 359 else if (strcmp(cmd_line, "-s") == 0 || | |
| 360 strcmp(cmd_line, "--slideshow") == 0) | |
| 361 { | |
| 362 startup_in_slideshow = TRUE; | |
| 363 } | |
| 9 | 364 else if (strcmp(cmd_line, "-l") == 0 || |
| 365 strcmp(cmd_line, "--list") == 0) | |
| 366 { | |
| 367 startup_command_line_collection = TRUE; | |
| 368 } | |
|
81
0ef72a64930b
Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents:
79
diff
changeset
|
369 else if (strncmp(cmd_line, "--geometry=", 11) == 0) |
|
0ef72a64930b
Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents:
79
diff
changeset
|
370 { |
|
0ef72a64930b
Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents:
79
diff
changeset
|
371 if (!*geometry) *geometry = g_strdup(cmd_line + 11); |
|
0ef72a64930b
Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents:
79
diff
changeset
|
372 } |
| 9 | 373 else if (strcmp(cmd_line, "-r") == 0 || |
| 374 strcmp(cmd_line, "--remote") == 0) | |
| 375 { | |
| 376 if (!remote_do) | |
| 377 { | |
| 378 remote_do = TRUE; | |
|
652
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
379 remote_list = remote_build_list(remote_list, argc - i, &argv[i], &remote_errors); |
| 9 | 380 } |
| 381 } | |
| 382 else if (strcmp(cmd_line, "-rh") == 0 || | |
| 383 strcmp(cmd_line, "--remote-help") == 0) | |
| 384 { | |
| 279 | 385 remote_help(); |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
509
diff
changeset
|
386 exit(0); |
| 9 | 387 } |
| 388 else if (strcmp(cmd_line, "--blank") == 0) | |
| 389 { | |
| 390 startup_blank = TRUE; | |
| 391 } | |
| 392 else if (strcmp(cmd_line, "-v") == 0 || | |
| 393 strcmp(cmd_line, "--version") == 0) | |
| 394 { | |
| 694 | 395 printf_term("%s %s\n", GQ_APPNAME, VERSION); |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
509
diff
changeset
|
396 exit(0); |
| 9 | 397 } |
| 398 else if (strcmp(cmd_line, "--alternate") == 0) | |
| 399 { | |
| 400 /* enable faster experimental algorithm */ | |
|
673
fbebf5cf4a55
Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents:
671
diff
changeset
|
401 log_printf("Alternate similarity algorithm enabled\n"); |
| 9 | 402 image_sim_alternate_set(TRUE); |
| 403 } | |
| 3 | 404 else if (strcmp(cmd_line, "-h") == 0 || |
| 405 strcmp(cmd_line, "--help") == 0) | |
| 1 | 406 { |
| 694 | 407 printf_term("%s %s\n", GQ_APPNAME, VERSION); |
| 403 | 408 printf_term(_("Usage: %s [options] [path]\n\n"), GQ_APPNAME_LC); |
| 9 | 409 print_term(_("valid options are:\n")); |
| 410 print_term(_(" +t, --with-tools force show of tools\n")); | |
| 411 print_term(_(" -t, --without-tools force hide of tools\n")); | |
| 412 print_term(_(" -f, --fullscreen start in full screen mode\n")); | |
| 413 print_term(_(" -s, --slideshow start in slideshow mode\n")); | |
| 414 print_term(_(" -l, --list open collection window for command line\n")); | |
|
81
0ef72a64930b
Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents:
79
diff
changeset
|
415 print_term(_(" --geometry=GEOMETRY set main window location\n")); |
| 9 | 416 print_term(_(" -r, --remote send following commands to open window\n")); |
| 417 print_term(_(" -rh,--remote-help print remote command list\n")); | |
|
227
41fc4bfc8b25
Add a debug level spinner at the end of Preferences > Advanced.
zas_
parents:
218
diff
changeset
|
418 #ifdef DEBUG |
| 379 | 419 print_term(_(" --debug[=level] turn on debug output\n")); |
|
227
41fc4bfc8b25
Add a debug level spinner at the end of Preferences > Advanced.
zas_
parents:
218
diff
changeset
|
420 #endif |
| 9 | 421 print_term(_(" -v, --version print version info\n")); |
| 422 print_term(_(" -h, --help show this message\n\n")); | |
| 442 | 423 |
| 9 | 424 #if 0 |
| 425 /* these options are not officially supported! | |
| 426 * only for testing new features, no need to translate them */ | |
| 427 print_term( " --alternate use alternate similarity algorithm\n"); | |
| 428 #endif | |
| 442 | 429 |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
509
diff
changeset
|
430 exit(0); |
| 1 | 431 } |
| 9 | 432 else if (!remote_do) |
| 1 | 433 { |
| 403 | 434 printf_term(_("invalid or ignored: %s\nUse --help for options\n"), cmd_line); |
| 1 | 435 } |
| 9 | 436 |
| 1 | 437 g_free(cmd_all); |
| 438 i++; | |
| 439 } | |
| 440 g_free(base_dir); | |
| 441 parse_out_relatives(*path); | |
| 442 parse_out_relatives(*file); | |
| 443 } | |
| 9 | 444 |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
445 list = g_list_reverse(list); |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
446 |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
447 if (!*path && first_dir) |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
448 { |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
449 *path = first_dir; |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
450 first_dir = NULL; |
|
79
528e3432e0c0
Thu Oct 19 07:23:37 2006 John Ellis <johne@verizon.net>
gqview
parents:
76
diff
changeset
|
451 |
|
528e3432e0c0
Thu Oct 19 07:23:37 2006 John Ellis <johne@verizon.net>
gqview
parents:
76
diff
changeset
|
452 parse_out_relatives(*path); |
|
76
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
453 } |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
454 g_free(first_dir); |
|
07773a3c5b29
Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents:
21
diff
changeset
|
455 |
| 9 | 456 if (remote_do) |
| 457 { | |
|
652
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
458 if (remote_errors) |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
459 { |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
460 GList *work = remote_errors; |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
461 |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
462 printf_term(_("Invalid or ignored remote options: ")); |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
463 while (work) |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
464 { |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
465 gchar *opt = work->data; |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
466 |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
467 printf_term("%s%s", (work == remote_errors) ? "" : ", ", opt); |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
468 work = work->next; |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
469 } |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
470 |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
471 printf_term(_("\nUse --remote-help for valid remote options.\n")); |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
472 } |
|
9bcfd6d7a902
Display a message when invalid remote options are used.
zas_
parents:
649
diff
changeset
|
473 |
| 279 | 474 remote_control(argv[0], remote_list, *path, list, *collection_list); |
| 9 | 475 } |
| 476 g_list_free(remote_list); | |
| 477 | |
| 478 if (list && list->next) | |
| 479 { | |
| 480 *cmd_list = list; | |
| 481 } | |
| 482 else | |
| 483 { | |
|
576
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
484 filelist_free(list); |
| 9 | 485 *cmd_list = NULL; |
| 486 } | |
| 1 | 487 } |
| 488 | |
|
378
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
489 static void parse_command_line_for_debug_option(int argc, char *argv[]) |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
490 { |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
491 #ifdef DEBUG |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
492 const gchar *debug_option = "--debug"; |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
493 gint len = strlen(debug_option); |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
494 |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
495 if (argc > 1) |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
496 { |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
497 gint i; |
| 442 | 498 |
|
378
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
499 for (i = 1; i < argc; i++) |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
500 { |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
501 const gchar *cmd_line = argv[i]; |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
502 if (strncmp(cmd_line, debug_option, len) == 0) |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
503 { |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
504 gint cmd_line_len = strlen(cmd_line); |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
505 |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
506 /* we now increment the debug state for verbosity */ |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
507 if (cmd_line_len == len) |
| 507 | 508 debug_level_add(1); |
|
378
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
509 else if (cmd_line[len] == '=' && g_ascii_isdigit(cmd_line[len+1])) |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
510 { |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
511 gint n = atoi(cmd_line + len + 1); |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
512 if (n < 0) n = 1; |
| 507 | 513 debug_level_add(n); |
|
378
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
514 } |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
515 } |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
516 } |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
517 } |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
518 |
| 507 | 519 DEBUG_1("debugging output enabled (level %d)", get_debug_level()); |
|
378
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
520 #endif |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
521 } |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
522 |
| 1 | 523 /* |
| 524 *----------------------------------------------------------------------------- | |
| 525 * startup, init, and exit | |
| 526 *----------------------------------------------------------------------------- | |
| 442 | 527 */ |
| 1 | 528 |
| 9 | 529 #define RC_HISTORY_NAME "history" |
| 530 | |
| 531 static void keys_load(void) | |
| 532 { | |
| 533 gchar *path; | |
| 534 | |
| 714 | 535 path = g_build_filename(homedir(), GQ_RC_DIR, RC_HISTORY_NAME, NULL); |
| 9 | 536 history_list_load(path); |
| 537 g_free(path); | |
| 538 } | |
| 539 | |
| 540 static void keys_save(void) | |
| 541 { | |
| 542 gchar *path; | |
| 543 | |
| 714 | 544 path = g_build_filename(homedir(), GQ_RC_DIR, RC_HISTORY_NAME, NULL); |
| 9 | 545 history_list_save(path); |
| 546 g_free(path); | |
| 547 } | |
| 548 | |
| 549 static void check_for_home_path(gchar *path) | |
| 1 | 550 { |
| 9 | 551 gchar *buf; |
| 552 | |
| 714 | 553 buf = g_build_filename(homedir(), path, NULL); |
| 9 | 554 if (!isdir(buf)) |
| 555 { | |
| 694 | 556 log_printf(_("Creating %s dir:%s\n"), GQ_APPNAME, buf); |
| 442 | 557 |
| 9 | 558 if (!mkdir_utf8(buf, 0755)) |
| 559 { | |
| 694 | 560 log_printf(_("Could not create dir:%s\n"), buf); |
| 9 | 561 } |
| 562 } | |
| 563 g_free(buf); | |
| 564 } | |
| 565 | |
|
630
83d3ded39e49
An option to save and restore the last path used was added.
zas_
parents:
629
diff
changeset
|
566 |
|
739
3296f8d3a79b
Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents:
738
diff
changeset
|
567 static void exit_program_final(void) |
|
3296f8d3a79b
Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents:
738
diff
changeset
|
568 { |
|
3296f8d3a79b
Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents:
738
diff
changeset
|
569 gchar *path; |
|
3296f8d3a79b
Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents:
738
diff
changeset
|
570 gchar *pathl; |
|
3296f8d3a79b
Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents:
738
diff
changeset
|
571 |
|
3296f8d3a79b
Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents:
738
diff
changeset
|
572 remote_close(remote_connection); |
|
3296f8d3a79b
Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents:
738
diff
changeset
|
573 |
|
3296f8d3a79b
Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents:
738
diff
changeset
|
574 collect_manager_flush(); |
|
3296f8d3a79b
Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents:
738
diff
changeset
|
575 |
|
740
9b0ac8d58c89
Move setup_default_options() and sync_options_with_current_state() to options.[ch].
zas_
parents:
739
diff
changeset
|
576 sync_options_with_current_state(options); |
|
742
a336b5545af6
Pass ConfOptions * to save_options() and load_options().
zas_
parents:
740
diff
changeset
|
577 save_options(options); |
| 9 | 578 keys_save(); |
| 579 | |
| 714 | 580 path = g_build_filename(homedir(), GQ_RC_DIR, "accels", NULL); |
| 9 | 581 pathl = path_from_utf8(path); |
| 582 gtk_accel_map_save(pathl); | |
| 583 g_free(pathl); | |
| 584 g_free(path); | |
| 1 | 585 |
| 586 gtk_main_quit(); | |
| 587 } | |
| 588 | |
| 9 | 589 static GenericDialog *exit_dialog = NULL; |
| 590 | |
| 591 static void exit_confirm_cancel_cb(GenericDialog *gd, gpointer data) | |
| 592 { | |
| 593 exit_dialog = NULL; | |
| 594 generic_dialog_close(gd); | |
| 595 } | |
| 596 | |
| 597 static void exit_confirm_exit_cb(GenericDialog *gd, gpointer data) | |
| 598 { | |
| 599 exit_dialog = NULL; | |
| 600 generic_dialog_close(gd); | |
| 278 | 601 exit_program_final(); |
| 9 | 602 } |
| 603 | |
| 604 static gint exit_confirm_dlg(void) | |
| 605 { | |
| 606 GtkWidget *parent; | |
| 607 LayoutWindow *lw; | |
|
288
d1f74154463e
Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents:
283
diff
changeset
|
608 gchar *msg; |
| 9 | 609 |
| 610 if (exit_dialog) | |
| 611 { | |
| 612 gtk_window_present(GTK_WINDOW(exit_dialog->dialog)); | |
| 613 return TRUE; | |
| 614 } | |
| 615 | |
| 616 if (!collection_window_modified_exists()) return FALSE; | |
| 617 | |
| 618 parent = NULL; | |
| 619 lw = NULL; | |
| 620 if (layout_valid(&lw)) | |
| 621 { | |
| 622 parent = lw->window; | |
| 623 } | |
| 624 | |
|
288
d1f74154463e
Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents:
283
diff
changeset
|
625 msg = g_strdup_printf("%s - %s", GQ_APPNAME, _("exit")); |
|
d1f74154463e
Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents:
283
diff
changeset
|
626 exit_dialog = generic_dialog_new(msg, |
|
254
9faf34f047b1
Make the wmclass value unique among the code by defining
zas_
parents:
227
diff
changeset
|
627 GQ_WMCLASS, "exit", parent, FALSE, |
| 9 | 628 exit_confirm_cancel_cb, NULL); |
|
288
d1f74154463e
Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents:
283
diff
changeset
|
629 g_free(msg); |
|
d1f74154463e
Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents:
283
diff
changeset
|
630 msg = g_strdup_printf(_("Quit %s"), GQ_APPNAME); |
| 9 | 631 generic_dialog_add_message(exit_dialog, GTK_STOCK_DIALOG_QUESTION, |
|
288
d1f74154463e
Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents:
283
diff
changeset
|
632 msg, _("Collections have been modified. Quit anyway?")); |
|
d1f74154463e
Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents:
283
diff
changeset
|
633 g_free(msg); |
| 9 | 634 generic_dialog_add_button(exit_dialog, GTK_STOCK_QUIT, NULL, exit_confirm_exit_cb, TRUE); |
| 635 | |
| 636 gtk_widget_show(exit_dialog->dialog); | |
| 637 | |
| 638 return TRUE; | |
| 639 } | |
| 640 | |
| 278 | 641 void exit_program(void) |
| 9 | 642 { |
| 643 layout_image_full_screen_stop(NULL); | |
| 644 | |
| 645 if (exit_confirm_dlg()) return; | |
| 646 | |
| 278 | 647 exit_program_final(); |
| 9 | 648 } |
| 649 | |
|
630
83d3ded39e49
An option to save and restore the last path used was added.
zas_
parents:
629
diff
changeset
|
650 int main(int argc, char *argv[]) |
| 1 | 651 { |
| 9 | 652 LayoutWindow *lw; |
| 653 gchar *path = NULL; | |
| 1 | 654 gchar *cmd_path = NULL; |
| 655 gchar *cmd_file = NULL; | |
| 9 | 656 GList *cmd_list = NULL; |
| 657 GList *collection_list = NULL; | |
| 658 CollectionData *first_collection = NULL; | |
|
81
0ef72a64930b
Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents:
79
diff
changeset
|
659 gchar *geometry = NULL; |
| 9 | 660 gchar *buf; |
| 661 gchar *bufl; | |
| 649 | 662 CollectionData *cd = NULL; |
| 1 | 663 |
| 509 | 664 /* init execution time counter (debug only) */ |
| 665 init_exec_time(); | |
| 442 | 666 |
| 1 | 667 /* setup locale, i18n */ |
| 668 gtk_set_locale(); | |
| 686 | 669 |
| 687 | 670 #ifdef ENABLE_NLS |
| 671 bindtextdomain(PACKAGE, GQ_LOCALEDIR); | |
| 10 | 672 bind_textdomain_codeset(PACKAGE, "UTF-8"); |
| 673 textdomain(PACKAGE); | |
| 686 | 674 #endif |
| 675 | |
| 1 | 676 /* setup random seed for random slideshow */ |
| 442 | 677 srand(time(NULL)); |
| 1 | 678 |
|
21
56866f205a68
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
10
diff
changeset
|
679 #if 1 |
|
673
fbebf5cf4a55
Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents:
671
diff
changeset
|
680 log_printf("%s %s, This is an alpha release.\n", GQ_APPNAME, VERSION); |
| 9 | 681 #endif |
|
378
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
682 parse_command_line_for_debug_option(argc, argv); |
|
f1bdbbdb73ba
Parse command line for --debug option as soon as possible and allow
zas_
parents:
367
diff
changeset
|
683 |
| 318 | 684 options = init_options(NULL); |
|
740
9b0ac8d58c89
Move setup_default_options() and sync_options_with_current_state() to options.[ch].
zas_
parents:
739
diff
changeset
|
685 setup_default_options(options); |
|
742
a336b5545af6
Pass ConfOptions * to save_options() and load_options().
zas_
parents:
740
diff
changeset
|
686 load_options(options); |
| 1 | 687 |
|
81
0ef72a64930b
Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents:
79
diff
changeset
|
688 parse_command_line(argc, argv, &cmd_path, &cmd_file, &cmd_list, &collection_list, &geometry); |
| 9 | 689 |
|
782
3f7a0420c293
Allow to modify the aspect of Geeqie through the use of a
zas_
parents:
781
diff
changeset
|
690 /* If a gtkrc file exists in the rc directory, add it to the |
|
3f7a0420c293
Allow to modify the aspect of Geeqie through the use of a
zas_
parents:
781
diff
changeset
|
691 * list of files to be parsed at the end of gtk_init() */ |
|
3f7a0420c293
Allow to modify the aspect of Geeqie through the use of a
zas_
parents:
781
diff
changeset
|
692 buf = g_build_filename(homedir(), GQ_RC_DIR, "gtkrc", NULL); |
|
3f7a0420c293
Allow to modify the aspect of Geeqie through the use of a
zas_
parents:
781
diff
changeset
|
693 bufl = path_from_utf8(buf); |
|
3f7a0420c293
Allow to modify the aspect of Geeqie through the use of a
zas_
parents:
781
diff
changeset
|
694 if (access(bufl, R_OK) == 0) |
|
3f7a0420c293
Allow to modify the aspect of Geeqie through the use of a
zas_
parents:
781
diff
changeset
|
695 gtk_rc_add_default_file(bufl); |
|
3f7a0420c293
Allow to modify the aspect of Geeqie through the use of a
zas_
parents:
781
diff
changeset
|
696 g_free(bufl); |
|
3f7a0420c293
Allow to modify the aspect of Geeqie through the use of a
zas_
parents:
781
diff
changeset
|
697 g_free(buf); |
|
3f7a0420c293
Allow to modify the aspect of Geeqie through the use of a
zas_
parents:
781
diff
changeset
|
698 |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
509
diff
changeset
|
699 gtk_init(&argc, &argv); |
| 9 | 700 |
| 701 if (gtk_major_version < GTK_MAJOR_VERSION || | |
| 702 (gtk_major_version == GTK_MAJOR_VERSION && gtk_minor_version < GTK_MINOR_VERSION) ) | |
| 703 { | |
| 694 | 704 log_printf("!!! This is a friendly warning.\n"); |
| 705 log_printf("!!! The version of GTK+ in use now is older than when %s was compiled.\n", GQ_APPNAME); | |
| 706 log_printf("!!! compiled with GTK+-%d.%d\n", GTK_MAJOR_VERSION, GTK_MINOR_VERSION); | |
| 707 log_printf("!!! running with GTK+-%d.%d\n", gtk_major_version, gtk_minor_version); | |
| 708 log_printf("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME); | |
| 9 | 709 } |
| 710 | |
| 283 | 711 check_for_home_path(GQ_RC_DIR); |
| 712 check_for_home_path(GQ_RC_DIR_COLLECTIONS); | |
| 713 check_for_home_path(GQ_CACHE_RC_THUMB); | |
| 714 check_for_home_path(GQ_CACHE_RC_METADATA); | |
| 9 | 715 |
| 716 keys_load(); | |
| 717 filter_add_defaults(); | |
| 718 filter_rebuild(); | |
| 442 | 719 |
| 714 | 720 buf = g_build_filename(homedir(), GQ_RC_DIR, "accels", NULL); |
| 9 | 721 bufl = path_from_utf8(buf); |
| 722 gtk_accel_map_load(bufl); | |
| 723 g_free(bufl); | |
| 724 g_free(buf); | |
| 1 | 725 |
| 9 | 726 if (startup_blank) |
| 727 { | |
| 728 g_free(cmd_path); | |
| 729 cmd_path = NULL; | |
| 730 g_free(cmd_file); | |
| 731 cmd_file = NULL; | |
|
576
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
732 filelist_free(cmd_list); |
| 9 | 733 cmd_list = NULL; |
|
576
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
734 string_list_free(collection_list); |
| 9 | 735 collection_list = NULL; |
| 736 | |
| 737 path = NULL; | |
| 738 } | |
| 739 else if (cmd_path) | |
| 740 { | |
| 741 path = g_strdup(cmd_path); | |
| 742 } | |
| 629 | 743 else if (options->startup.restore_path && options->startup.path && isdir(options->startup.path)) |
| 9 | 744 { |
| 629 | 745 path = g_strdup(options->startup.path); |
| 9 | 746 } |
| 1 | 747 else |
| 9 | 748 { |
| 749 path = get_current_dir(); | |
| 750 } | |
| 751 | |
|
338
41c3cb73120f
Rename window options (moved to layout) and re-order rc file.
zas_
parents:
334
diff
changeset
|
752 lw = layout_new_with_geometry(NULL, options->layout.tools_float, options->layout.tools_hidden, geometry); |
| 329 | 753 layout_sort_set(lw, options->file_sort.method, options->file_sort.ascending); |
| 9 | 754 |
| 755 if (collection_list && !startup_command_line_collection) | |
| 756 { | |
| 757 GList *work; | |
| 758 | |
| 759 work = collection_list; | |
| 760 while (work) | |
| 761 { | |
| 762 CollectWindow *cw; | |
| 763 const gchar *path; | |
| 1 | 764 |
| 9 | 765 path = work->data; |
| 766 work = work->next; | |
| 767 | |
| 768 cw = collection_window_new(path); | |
| 769 if (!first_collection && cw) first_collection = cw->cd; | |
| 770 } | |
| 771 } | |
| 772 | |
| 773 if (cmd_list || | |
| 774 (startup_command_line_collection && collection_list)) | |
| 775 { | |
| 776 GList *work; | |
| 777 | |
| 778 if (startup_command_line_collection) | |
| 779 { | |
| 780 CollectWindow *cw; | |
| 781 | |
| 782 cw = collection_window_new(""); | |
| 783 cd = cw->cd; | |
| 784 } | |
| 785 else | |
| 786 { | |
| 787 cd = collection_new(""); /* if we pass NULL, untitled counter is falsely increm. */ | |
| 788 } | |
| 789 | |
| 790 g_free(cd->path); | |
| 791 cd->path = NULL; | |
| 792 g_free(cd->name); | |
| 793 cd->name = g_strdup(_("Command line")); | |
| 794 | |
| 795 collection_path_changed(cd); | |
| 1 | 796 |
| 9 | 797 work = cmd_list; |
| 798 while (work) | |
| 799 { | |
| 138 | 800 collection_add(cd, file_data_new_simple((gchar *)work->data), FALSE); |
| 9 | 801 work = work->next; |
| 802 } | |
| 803 | |
| 804 work = collection_list; | |
| 805 while (work) | |
| 806 { | |
| 358 | 807 collection_load(cd, (gchar *)work->data, COLLECTION_LOAD_APPEND); |
| 9 | 808 work = work->next; |
| 809 } | |
| 810 | |
| 811 layout_set_path(lw, path); | |
| 812 if (cd->list) layout_image_set_collection(lw, cd, cd->list->data); | |
| 1 | 813 |
| 9 | 814 /* mem leak, we never unref this collection when !startup_command_line_collection |
| 815 * (the image view of the main window does not hold a ref to the collection) | |
| 816 * this is sort of unavoidable, for if it did hold a ref, next/back | |
| 817 * may not work as expected when closing collection windows. | |
| 818 * | |
| 819 * collection_unref(cd); | |
| 820 */ | |
| 821 | |
| 822 } | |
| 823 else if (cmd_file) | |
| 824 { | |
| 825 layout_set_path(lw, cmd_file); | |
| 826 } | |
| 827 else | |
| 828 { | |
| 829 layout_set_path(lw, path); | |
| 830 if (first_collection) | |
| 831 { | |
| 832 layout_image_set_collection(lw, first_collection, | |
| 833 collection_get_first(first_collection)); | |
| 834 } | |
| 835 } | |
| 614 | 836 |
|
638
8cc9f349c670
Rename option image_overlay.common.enabled to image_overlay.common.state
zas_
parents:
630
diff
changeset
|
837 image_osd_set(lw->image, options->image_overlay.common.state | (options->image_overlay.common.show_at_startup ? OSD_SHOW_INFO : OSD_SHOW_NOTHING)); |
| 1 | 838 |
|
81
0ef72a64930b
Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents:
79
diff
changeset
|
839 g_free(geometry); |
| 1 | 840 g_free(cmd_path); |
| 841 g_free(cmd_file); | |
|
576
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
842 filelist_free(cmd_list); |
|
9dc0513837b5
dropped path_list functions, use filelist functions everywhere
nadvornik
parents:
556
diff
changeset
|
843 string_list_free(collection_list); |
| 9 | 844 g_free(path); |
| 1 | 845 |
| 9 | 846 if (startup_full_screen) layout_image_full_screen_start(lw); |
| 847 if (startup_in_slideshow) layout_image_slideshow_start(lw); | |
| 848 | |
| 714 | 849 buf = g_build_filename(homedir(), GQ_RC_DIR, ".command", NULL); |
| 649 | 850 remote_connection = remote_server_init(buf, cd); |
| 9 | 851 g_free(buf); |
| 3 | 852 |
|
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
509
diff
changeset
|
853 gtk_main(); |
| 1 | 854 return 0; |
| 855 } |
