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