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