annotate src/main.c @ 714:0f177c151368

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