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