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