annotate src/main.c @ 1214:31402ecb2aed

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