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