annotate src/main.c @ 786:a20ff446347e

Compare paths using utf8_collate_key() since paths are utf8-encoded. It fixes bug 1959854.
author zas_
date Thu, 05 Jun 2008 09:24:42 +0000
parents d6a7fb4b8e7c
children baade53888be
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 195
diff changeset
2 * Geeqie
79
528e3432e0c0 Thu Oct 19 07:23:37 2006 John Ellis <johne@verizon.net>
gqview
parents: 76
diff changeset
3 * (C) 2006 John Ellis
475
48c8e49b571c updated copyright in source files
nadvornik
parents: 469
diff changeset
4 * Copyright (C) 2008 The Geeqie Team
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
5 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
6 * Author: John Ellis
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
7 *
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
8 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
9 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
11 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
12
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
13
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 279
diff changeset
14 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
15
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
16 #include "cache.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
17 #include "collect.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
18 #include "collect-io.h"
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 576
diff changeset
19 #include "filedata.h"
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 576
diff changeset
20 #include "filefilter.h"
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
21 #include "image-overlay.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
22 #include "layout.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
23 #include "layout_image.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
24 #include "rcfile.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
25 #include "remote.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
26 #include "similar.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
27 #include "ui_bookmark.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
28 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
29 #include "ui_utildlg.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
30
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
31 #include <gdk/gdkkeysyms.h> /* for keyboard values */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
32
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
33
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
34 #include <math.h>
653
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
35 #ifdef G_OS_UNIX
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
36 #include <pwd.h>
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
37 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
38
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
39
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
40 static RemoteConnection *remote_connection = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
41
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
42
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
43 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
44 *-----------------------------------------------------------------------------
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
45 * misc (public)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
46 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
47 */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
48
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
49
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
50 gdouble get_zoom_increment(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
51 {
334
df868b947aa0 Rename image-related options.
zas_
parents: 333
diff changeset
52 return ((options->image.zoom_increment != 0) ? (gdouble)options->image.zoom_increment / 10.0 : 1.0);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
53 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
54
767
e73d30e0c896 Make utf8_validate_or_convert() to always allocate a new string.
zas_
parents: 742
diff changeset
55 gchar *utf8_validate_or_convert(const gchar *text)
645
b50deb0f9968 Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents: 638
diff changeset
56 {
b50deb0f9968 Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents: 638
diff changeset
57 gint len;
b50deb0f9968 Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents: 638
diff changeset
58
b50deb0f9968 Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents: 638
diff changeset
59 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
60
b50deb0f9968 Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents: 638
diff changeset
61 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
62 if (!g_utf8_validate(text, len, NULL))
767
e73d30e0c896 Make utf8_validate_or_convert() to always allocate a new string.
zas_
parents: 742
diff changeset
63 return g_convert(text, len, "UTF-8", "ISO-8859-1", NULL, NULL, NULL);
645
b50deb0f9968 Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents: 638
diff changeset
64
767
e73d30e0c896 Make utf8_validate_or_convert() to always allocate a new string.
zas_
parents: 742
diff changeset
65 return g_strdup(text);
645
b50deb0f9968 Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents: 638
diff changeset
66 }
b50deb0f9968 Rename bar_exif_validate_text() to utf8_validate_or_convert() and move it to main.[ch].
zas_
parents: 638
diff changeset
67
786
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
68 gint utf8_compare(const gchar *s1, const gchar *s2, gboolean case_sensitive)
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
69 {
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
70 gchar *s1_key, *s2_key;
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
71 gchar *s1_t, *s2_t;
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
72 gint ret;
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
73
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
74 g_assert(g_utf8_validate(s1, -1, NULL));
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
75 g_assert(g_utf8_validate(s2, -1, NULL));
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
76
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
77 if (!case_sensitive)
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
78 {
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
79 s1_t = g_utf8_casefold(s1, -1);
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
80 s2_t = g_utf8_casefold(s2, -1);
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
81 }
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
82
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
83 s1_key = g_utf8_collate_key(s1_t, -1);
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
84 s2_key = g_utf8_collate_key(s2_t, -1);
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
85
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
86 ret = strcmp(s1_key, s2_key);
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
87
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
88 g_free(s1_key);
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
89 g_free(s2_key);
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
90
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
91 if (!case_sensitive)
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
92 {
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
93 g_free(s1_t);
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
94 g_free(s2_t);
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
95 }
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
96
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
97 return ret;
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
98 }
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 783
diff changeset
99
653
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
100 /* Borrowed from gtkfilesystemunix.c */
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
101 gchar *expand_tilde(const gchar *filename)
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
102 {
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
103 #ifndef G_OS_UNIX
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
104 return g_strdup(filename);
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
105 #else
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
106 const char *notilde;
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
107 const char *slash;
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
108 const char *home;
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 if (filename[0] != '~')
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
111 return g_strdup(filename);
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 notilde = filename + 1;
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
114 slash = strchr(notilde, G_DIR_SEPARATOR);
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
115 if (slash == notilde || !*notilde)
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
116 {
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
117 home = g_get_home_dir();
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
118 if (!home)
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
119 return g_strdup(filename);
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 else
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
122 {
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
123 gchar *username;
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
124 struct passwd *passwd;
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 if (slash)
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
127 username = g_strndup(notilde, slash - notilde);
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
128 else
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
129 username = g_strdup(notilde);
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
130
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
131 passwd = getpwnam(username);
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
132 g_free(username);
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 if (!passwd)
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
135 return g_strdup(filename);
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
136
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
137 home = passwd->pw_dir;
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
138 }
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
139
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
140 if (slash)
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
141 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
142 else
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
143 return g_build_filename(home, G_DIR_SEPARATOR_S, NULL);
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
144 #endif
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
145 }
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
146
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
147
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
148 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
149 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
150 * keyboard functions
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
151 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
152 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
153
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
154 void keyboard_scroll_calc(gint *x, gint *y, GdkEventKey *event)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
155 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
156 static gint delta = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
157 static guint32 time_old = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
158 static guint keyval_old = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
159
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
160 if (event->state & GDK_CONTROL_MASK)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
161 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
162 if (*x < 0) *x = G_MININT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
163 if (*x > 0) *x = G_MAXINT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
164 if (*y < 0) *y = G_MININT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
165 if (*y > 0) *y = G_MAXINT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
166
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
167 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
168 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
169
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
170 if (options->progressive_key_scrolling)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
171 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
172 guint32 time_diff;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
173
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
174 time_diff = event->time - time_old;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
175
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
176 /* key pressed within 125ms ? (1/8 second) */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
177 if (time_diff > 125 || event->keyval != keyval_old) delta = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
178
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
179 time_old = event->time;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
180 keyval_old = event->keyval;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
181
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
182 delta += 2;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
183 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
184 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
185 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
186 delta = 8;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
187 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
188
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
189 *x = *x * delta;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
190 *y = *y * delta;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
191 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
192
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
193
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
194
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
195 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
196 *-----------------------------------------------------------------------------
3
gqview
parents: 1
diff changeset
197 * command line parser (private) hehe, who needs popt anyway?
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
198 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
199 */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
200
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
201 static gint startup_blank = FALSE;
3
gqview
parents: 1
diff changeset
202 static gint startup_full_screen = FALSE;
gqview
parents: 1
diff changeset
203 static gint startup_in_slideshow = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
204 static gint startup_command_line_collection = FALSE;
3
gqview
parents: 1
diff changeset
205
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
206
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
207 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
208 GList **list, GList **collection_list)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
209 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
210 gchar *path_parsed;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
211
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
212 path_parsed = g_strdup(file_path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
213 parse_out_relatives(path_parsed);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
214
781
2d2cca2bceb0 Replace hardcoded collection filename extension by a macro (GQ_COLLECTION_EXT).
zas_
parents: 780
diff changeset
215 if (file_extension_match(path_parsed, GQ_COLLECTION_EXT))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
216 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
217 *collection_list = g_list_append(*collection_list, path_parsed);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
218 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
219 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
220 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
221 if (!*path) *path = remove_level_from_path(path_parsed);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
222 if (!*file) *file = g_strdup(path_parsed);
576
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
223 *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
224 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
225 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
226
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
227 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
228 GList **list)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
229 {
780
44128da39e13 Drop initialization to NULL since filelist_read() will take care of it.
zas_
parents: 767
diff changeset
230 GList *files;
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
231 gchar *path_parsed;
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 782
diff changeset
232 FileData *dir_fd;
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
233
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
234 path_parsed = g_strdup(dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
235 parse_out_relatives(path_parsed);
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 782
diff changeset
236 dir_fd = file_data_new_simple(path_parsed);
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 782
diff changeset
237
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
238
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 782
diff changeset
239 if (filelist_read(dir_fd, &files, NULL))
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
240 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
241 GList *work;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
242
576
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
243 files = filelist_filter(files, FALSE);
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
244 files = filelist_sort_path(files);
76
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 work = files;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
247 while (work)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
248 {
576
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
249 FileData *fd = work->data;
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
250 if (!*path) *path = remove_level_from_path(fd->path);
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
251 if (!*file) *file = g_strdup(fd->path);
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
252 *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
253
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
254 work = work->next;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
255 }
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 g_list_free(files);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
258 }
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
259
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
260 g_free(path_parsed);
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 782
diff changeset
261 file_data_unref(dir_fd);
76
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
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
264 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
265 GList **list, gchar **first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
266 {
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
267
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
268 if (!*list && !*first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
269 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
270 *first_dir = g_strdup(dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
271 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
272 else
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
273 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
274 if (*first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
275 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
276 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
277 g_free(*first_dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
278 *first_dir = NULL;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
279 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
280 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
281 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
282 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
283
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
284 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
285 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
286 {
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
287
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
288 if (*first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
289 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
290 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
291 g_free(*first_dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
292 *first_dir = NULL;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
293 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
294 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
295 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
296
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
297 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
298 GList **cmd_list, GList **collection_list,
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
299 gchar **geometry)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
300 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
301 GList *list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
302 GList *remote_list = NULL;
652
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
303 GList *remote_errors = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
304 gint remote_do = FALSE;
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
305 gchar *first_dir = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
306
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
307 if (argc > 1)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
308 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
309 gint i;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
310 gchar *base_dir = get_current_dir();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
311 i = 1;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
312 while (i < argc)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
313 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
314 const gchar *cmd_line = argv[i];
702
e07895754e65 Drop concat_dir_and_file() and use g_build_filename() instead.
zas_
parents: 694
diff changeset
315 gchar *cmd_all = g_build_filename(base_dir, cmd_line, NULL);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
316
726
a1dcef8cd1ae Use G_DIR_SEPARATOR where applicable.
zas_
parents: 714
diff changeset
317 if (cmd_line[0] == G_DIR_SEPARATOR && isdir(cmd_line))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
318 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
319 parse_command_line_process_dir(cmd_line, path, file, &list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
320 }
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
321 else if (isdir(cmd_all))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
322 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
323 parse_command_line_process_dir(cmd_all, path, file, &list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
324 }
726
a1dcef8cd1ae Use G_DIR_SEPARATOR where applicable.
zas_
parents: 714
diff changeset
325 else if (cmd_line[0] == G_DIR_SEPARATOR && isfile(cmd_line))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
326 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
327 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
328 &list, collection_list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
329 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
330 else if (isfile(cmd_all))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
331 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
332 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
333 &list, collection_list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
334 }
378
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
335 else if (strncmp(cmd_line, "--debug", 7) == 0 && (cmd_line[7] == '\0' || cmd_line[7] == '='))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
336 {
378
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
337 /* do nothing but do not produce warnings */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
338 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
339 else if (strcmp(cmd_line, "+t") == 0 ||
3
gqview
parents: 1
diff changeset
340 strcmp(cmd_line, "--with-tools") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
341 {
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 334
diff changeset
342 options->layout.tools_float = FALSE;
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 334
diff changeset
343 options->layout.tools_hidden = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
344
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
345 remote_list = g_list_append(remote_list, "+t");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
346 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
347 else if (strcmp(cmd_line, "-t") == 0 ||
3
gqview
parents: 1
diff changeset
348 strcmp(cmd_line, "--without-tools") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
349 {
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 334
diff changeset
350 options->layout.tools_hidden = TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
351
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
352 remote_list = g_list_append(remote_list, "-t");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
353 }
3
gqview
parents: 1
diff changeset
354 else if (strcmp(cmd_line, "-f") == 0 ||
gqview
parents: 1
diff changeset
355 strcmp(cmd_line, "--fullscreen") == 0)
gqview
parents: 1
diff changeset
356 {
gqview
parents: 1
diff changeset
357 startup_full_screen = TRUE;
gqview
parents: 1
diff changeset
358 }
gqview
parents: 1
diff changeset
359 else if (strcmp(cmd_line, "-s") == 0 ||
gqview
parents: 1
diff changeset
360 strcmp(cmd_line, "--slideshow") == 0)
gqview
parents: 1
diff changeset
361 {
gqview
parents: 1
diff changeset
362 startup_in_slideshow = TRUE;
gqview
parents: 1
diff changeset
363 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
364 else if (strcmp(cmd_line, "-l") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
365 strcmp(cmd_line, "--list") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
366 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
367 startup_command_line_collection = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
368 }
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
369 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
370 {
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
371 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
372 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
373 else if (strcmp(cmd_line, "-r") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
374 strcmp(cmd_line, "--remote") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
375 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
376 if (!remote_do)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
377 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
378 remote_do = TRUE;
652
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
379 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
380 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
381 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
382 else if (strcmp(cmd_line, "-rh") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
383 strcmp(cmd_line, "--remote-help") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
384 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
385 remote_help();
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 509
diff changeset
386 exit(0);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
387 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
388 else if (strcmp(cmd_line, "--blank") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
389 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
390 startup_blank = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
391 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
392 else if (strcmp(cmd_line, "-v") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
393 strcmp(cmd_line, "--version") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
394 {
694
a3218946bd2d Sort out log_printf() vs printf_term() mix up.
zas_
parents: 687
diff changeset
395 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
396 exit(0);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
397 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
398 else if (strcmp(cmd_line, "--alternate") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
399 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
400 /* enable faster experimental algorithm */
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
401 log_printf("Alternate similarity algorithm enabled\n");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
402 image_sim_alternate_set(TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
403 }
3
gqview
parents: 1
diff changeset
404 else if (strcmp(cmd_line, "-h") == 0 ||
gqview
parents: 1
diff changeset
405 strcmp(cmd_line, "--help") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
406 {
694
a3218946bd2d Sort out log_printf() vs printf_term() mix up.
zas_
parents: 687
diff changeset
407 printf_term("%s %s\n", GQ_APPNAME, VERSION);
403
2649a28d31b6 Introduce printf_term() macro and use it.
zas_
parents: 387
diff changeset
408 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
409 print_term(_("valid options are:\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
410 print_term(_(" +t, --with-tools force show of tools\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
411 print_term(_(" -t, --without-tools force hide of tools\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
412 print_term(_(" -f, --fullscreen start in full screen mode\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
413 print_term(_(" -s, --slideshow start in slideshow mode\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
414 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
415 print_term(_(" --geometry=GEOMETRY set main window location\n"));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
416 print_term(_(" -r, --remote send following commands to open window\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
417 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
418 #ifdef DEBUG
379
a430eb2e3c95 Indicate --debug[=level] in usage display.
zas_
parents: 378
diff changeset
419 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
420 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
421 print_term(_(" -v, --version print version info\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
422 print_term(_(" -h, --help show this message\n\n"));
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
423
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
424 #if 0
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
425 /* these options are not officially supported!
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
426 * only for testing new features, no need to translate them */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
427 print_term( " --alternate use alternate similarity algorithm\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
428 #endif
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
429
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 509
diff changeset
430 exit(0);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
431 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
432 else if (!remote_do)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
433 {
403
2649a28d31b6 Introduce printf_term() macro and use it.
zas_
parents: 387
diff changeset
434 printf_term(_("invalid or ignored: %s\nUse --help for options\n"), cmd_line);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
435 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
436
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
437 g_free(cmd_all);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
438 i++;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
439 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
440 g_free(base_dir);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
441 parse_out_relatives(*path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
442 parse_out_relatives(*file);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
443 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
444
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
445 list = g_list_reverse(list);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
446
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
447 if (!*path && first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
448 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
449 *path = first_dir;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
450 first_dir = NULL;
79
528e3432e0c0 Thu Oct 19 07:23:37 2006 John Ellis <johne@verizon.net>
gqview
parents: 76
diff changeset
451
528e3432e0c0 Thu Oct 19 07:23:37 2006 John Ellis <johne@verizon.net>
gqview
parents: 76
diff changeset
452 parse_out_relatives(*path);
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
453 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
454 g_free(first_dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
455
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
456 if (remote_do)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
457 {
652
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
458 if (remote_errors)
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
459 {
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
460 GList *work = remote_errors;
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
461
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
462 printf_term(_("Invalid or ignored remote options: "));
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
463 while (work)
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
464 {
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
465 gchar *opt = work->data;
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
466
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
467 printf_term("%s%s", (work == remote_errors) ? "" : ", ", opt);
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
468 work = work->next;
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
469 }
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
470
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
471 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
472 }
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
473
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
474 remote_control(argv[0], remote_list, *path, list, *collection_list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
475 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
476 g_list_free(remote_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
477
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
478 if (list && list->next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
479 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
480 *cmd_list = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
481 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
482 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
483 {
576
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
484 filelist_free(list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
485 *cmd_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
486 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
487 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
488
378
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
489 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
490 {
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
491 #ifdef DEBUG
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
492 const gchar *debug_option = "--debug";
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
493 gint len = strlen(debug_option);
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
494
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
495 if (argc > 1)
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
496 {
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
497 gint i;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
498
378
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
499 for (i = 1; i < argc; i++)
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 const gchar *cmd_line = argv[i];
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
502 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
503 {
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
504 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
505
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
506 /* 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
507 if (cmd_line_len == len)
507
135570a8bd96 Move debug macros from main.h to new debug.h.
zas_
parents: 506
diff changeset
508 debug_level_add(1);
378
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
509 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
510 {
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
511 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
512 if (n < 0) n = 1;
507
135570a8bd96 Move debug macros from main.h to new debug.h.
zas_
parents: 506
diff changeset
513 debug_level_add(n);
378
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
514 }
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
515 }
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
516 }
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
517 }
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
518
507
135570a8bd96 Move debug macros from main.h to new debug.h.
zas_
parents: 506
diff changeset
519 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
520 #endif
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
521 }
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
522
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
523 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
524 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
525 * startup, init, and exit
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
526 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
527 */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
528
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
529 #define RC_HISTORY_NAME "history"
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 static void keys_load(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
532 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
533 gchar *path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
534
714
0f177c151368 Use g_build_filename() where applicable.
zas_
parents: 702
diff changeset
535 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
536 history_list_load(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
537 g_free(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
538 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
539
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
540 static void keys_save(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
541 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
542 gchar *path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
543
714
0f177c151368 Use g_build_filename() where applicable.
zas_
parents: 702
diff changeset
544 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
545 history_list_save(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
546 g_free(path);
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 check_for_home_path(gchar *path)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
550 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
551 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
552
714
0f177c151368 Use g_build_filename() where applicable.
zas_
parents: 702
diff changeset
553 buf = g_build_filename(homedir(), path, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
554 if (!isdir(buf))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
555 {
694
a3218946bd2d Sort out log_printf() vs printf_term() mix up.
zas_
parents: 687
diff changeset
556 log_printf(_("Creating %s dir:%s\n"), GQ_APPNAME, buf);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
557
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
558 if (!mkdir_utf8(buf, 0755))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
559 {
694
a3218946bd2d Sort out log_printf() vs printf_term() mix up.
zas_
parents: 687
diff changeset
560 log_printf(_("Could not create dir:%s\n"), buf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
561 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
562 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
563 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
564 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
565
630
83d3ded39e49 An option to save and restore the last path used was added.
zas_
parents: 629
diff changeset
566
739
3296f8d3a79b Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents: 738
diff changeset
567 static void exit_program_final(void)
3296f8d3a79b Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents: 738
diff changeset
568 {
3296f8d3a79b Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents: 738
diff changeset
569 gchar *path;
3296f8d3a79b Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents: 738
diff changeset
570 gchar *pathl;
3296f8d3a79b Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents: 738
diff changeset
571
3296f8d3a79b Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents: 738
diff changeset
572 remote_close(remote_connection);
3296f8d3a79b Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents: 738
diff changeset
573
3296f8d3a79b Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents: 738
diff changeset
574 collect_manager_flush();
3296f8d3a79b Move code from exit_program_final() to new sync_options_with_current_state().
zas_
parents: 738
diff changeset
575
740
9b0ac8d58c89 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
zas_
parents: 739
diff changeset
576 sync_options_with_current_state(options);
742
a336b5545af6 Pass ConfOptions * to save_options() and load_options().
zas_
parents: 740
diff changeset
577 save_options(options);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
578 keys_save();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
579
714
0f177c151368 Use g_build_filename() where applicable.
zas_
parents: 702
diff changeset
580 path = g_build_filename(homedir(), GQ_RC_DIR, "accels", NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
581 pathl = path_from_utf8(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
582 gtk_accel_map_save(pathl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
583 g_free(pathl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
584 g_free(path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
585
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
586 gtk_main_quit();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
587 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
588
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
589 static GenericDialog *exit_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
590
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
591 static void exit_confirm_cancel_cb(GenericDialog *gd, gpointer data)
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 exit_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
594 generic_dialog_close(gd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
595 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
596
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
597 static void exit_confirm_exit_cb(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
598 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
599 exit_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
600 generic_dialog_close(gd);
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
601 exit_program_final();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
602 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
603
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
604 static gint exit_confirm_dlg(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
605 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
606 GtkWidget *parent;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
607 LayoutWindow *lw;
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
608 gchar *msg;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
609
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
610 if (exit_dialog)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
611 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
612 gtk_window_present(GTK_WINDOW(exit_dialog->dialog));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
613 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
614 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
615
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
616 if (!collection_window_modified_exists()) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
617
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
618 parent = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
619 lw = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
620 if (layout_valid(&lw))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
621 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
622 parent = lw->window;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
623 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
624
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
625 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
626 exit_dialog = generic_dialog_new(msg,
254
9faf34f047b1 Make the wmclass value unique among the code by defining
zas_
parents: 227
diff changeset
627 GQ_WMCLASS, "exit", parent, FALSE,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
628 exit_confirm_cancel_cb, NULL);
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
629 g_free(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
630 msg = g_strdup_printf(_("Quit %s"), GQ_APPNAME);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
631 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
632 msg, _("Collections have been modified. Quit anyway?"));
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
633 g_free(msg);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
634 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
635
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
636 gtk_widget_show(exit_dialog->dialog);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
637
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
638 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
639 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
640
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
641 void exit_program(void)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
642 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
643 layout_image_full_screen_stop(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
644
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
645 if (exit_confirm_dlg()) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
646
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
647 exit_program_final();
9
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
630
83d3ded39e49 An option to save and restore the last path used was added.
zas_
parents: 629
diff changeset
650 int main(int argc, char *argv[])
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
651 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
652 LayoutWindow *lw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
653 gchar *path = NULL;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
654 gchar *cmd_path = NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
655 gchar *cmd_file = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
656 GList *cmd_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
657 GList *collection_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
658 CollectionData *first_collection = NULL;
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
659 gchar *geometry = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
660 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
661 gchar *bufl;
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 648
diff changeset
662 CollectionData *cd = NULL;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
663
509
b78a91d0779e Move get_exec_time() to debug.{c,h}.
zas_
parents: 507
diff changeset
664 /* init execution time counter (debug only) */
b78a91d0779e Move get_exec_time() to debug.{c,h}.
zas_
parents: 507
diff changeset
665 init_exec_time();
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
666
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
667 /* setup locale, i18n */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
668 gtk_set_locale();
686
c0dda0ffb931 configure.in was rewritten:
bruclik
parents: 684
diff changeset
669
687
d100e927488f Fix spurious end of line introduced in revision 780.
zas_
parents: 686
diff changeset
670 #ifdef ENABLE_NLS
d100e927488f Fix spurious end of line introduced in revision 780.
zas_
parents: 686
diff changeset
671 bindtextdomain(PACKAGE, GQ_LOCALEDIR);
10
6d50eaba8e4b ########
gqview
parents: 9
diff changeset
672 bind_textdomain_codeset(PACKAGE, "UTF-8");
6d50eaba8e4b ########
gqview
parents: 9
diff changeset
673 textdomain(PACKAGE);
686
c0dda0ffb931 configure.in was rewritten:
bruclik
parents: 684
diff changeset
674 #endif
c0dda0ffb931 configure.in was rewritten:
bruclik
parents: 684
diff changeset
675
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
676 /* setup random seed for random slideshow */
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
677 srand(time(NULL));
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
678
21
56866f205a68 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 10
diff changeset
679 #if 1
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
680 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
681 #endif
378
f1bdbbdb73ba Parse command line for --debug option as soon as possible and allow
zas_
parents: 367
diff changeset
682 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
683
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
684 options = init_options(NULL);
740
9b0ac8d58c89 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
zas_
parents: 739
diff changeset
685 setup_default_options(options);
742
a336b5545af6 Pass ConfOptions * to save_options() and load_options().
zas_
parents: 740
diff changeset
686 load_options(options);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
687
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
688 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
689
782
3f7a0420c293 Allow to modify the aspect of Geeqie through the use of a
zas_
parents: 781
diff changeset
690 /* If a gtkrc file exists in the rc directory, add it to the
3f7a0420c293 Allow to modify the aspect of Geeqie through the use of a
zas_
parents: 781
diff changeset
691 * list of files to be parsed at the end of gtk_init() */
3f7a0420c293 Allow to modify the aspect of Geeqie through the use of a
zas_
parents: 781
diff changeset
692 buf = g_build_filename(homedir(), GQ_RC_DIR, "gtkrc", NULL);
3f7a0420c293 Allow to modify the aspect of Geeqie through the use of a
zas_
parents: 781
diff changeset
693 bufl = path_from_utf8(buf);
3f7a0420c293 Allow to modify the aspect of Geeqie through the use of a
zas_
parents: 781
diff changeset
694 if (access(bufl, R_OK) == 0)
3f7a0420c293 Allow to modify the aspect of Geeqie through the use of a
zas_
parents: 781
diff changeset
695 gtk_rc_add_default_file(bufl);
3f7a0420c293 Allow to modify the aspect of Geeqie through the use of a
zas_
parents: 781
diff changeset
696 g_free(bufl);
3f7a0420c293 Allow to modify the aspect of Geeqie through the use of a
zas_
parents: 781
diff changeset
697 g_free(buf);
3f7a0420c293 Allow to modify the aspect of Geeqie through the use of a
zas_
parents: 781
diff changeset
698
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 509
diff changeset
699 gtk_init(&argc, &argv);
9
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 (gtk_major_version < GTK_MAJOR_VERSION ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
702 (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
703 {
694
a3218946bd2d Sort out log_printf() vs printf_term() mix up.
zas_
parents: 687
diff changeset
704 log_printf("!!! This is a friendly warning.\n");
a3218946bd2d Sort out log_printf() vs printf_term() mix up.
zas_
parents: 687
diff changeset
705 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
706 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
707 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
708 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
709 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
710
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
711 check_for_home_path(GQ_RC_DIR);
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
712 check_for_home_path(GQ_RC_DIR_COLLECTIONS);
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
713 check_for_home_path(GQ_CACHE_RC_THUMB);
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
714 check_for_home_path(GQ_CACHE_RC_METADATA);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
715
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
716 keys_load();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
717 filter_add_defaults();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
718 filter_rebuild();
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
719
714
0f177c151368 Use g_build_filename() where applicable.
zas_
parents: 702
diff changeset
720 buf = g_build_filename(homedir(), GQ_RC_DIR, "accels", NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
721 bufl = path_from_utf8(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
722 gtk_accel_map_load(bufl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
723 g_free(bufl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
724 g_free(buf);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
725
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
726 if (startup_blank)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
727 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
728 g_free(cmd_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
729 cmd_path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
730 g_free(cmd_file);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
731 cmd_file = NULL;
576
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
732 filelist_free(cmd_list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
733 cmd_list = NULL;
576
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
734 string_list_free(collection_list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
735 collection_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
736
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
737 path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
738 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
739 else if (cmd_path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
740 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
741 path = g_strdup(cmd_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
742 }
629
1fa2cb6d9d65 Rename options:
zas_
parents: 628
diff changeset
743 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
744 {
629
1fa2cb6d9d65 Rename options:
zas_
parents: 628
diff changeset
745 path = g_strdup(options->startup.path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
746 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
747 else
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
748 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
749 path = get_current_dir();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
750 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
751
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 334
diff changeset
752 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
753 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
754
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
755 if (collection_list && !startup_command_line_collection)
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 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
758
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
759 work = collection_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
760 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
761 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
762 CollectWindow *cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
763 const gchar *path;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
764
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
765 path = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
766 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
767
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
768 cw = collection_window_new(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
769 if (!first_collection && cw) first_collection = cw->cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
770 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
771 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
772
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
773 if (cmd_list ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
774 (startup_command_line_collection && collection_list))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
775 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
776 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
777
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
778 if (startup_command_line_collection)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
779 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
780 CollectWindow *cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
781
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
782 cw = collection_window_new("");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
783 cd = cw->cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
784 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
785 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
786 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
787 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
788 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
789
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
790 g_free(cd->path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
791 cd->path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
792 g_free(cd->name);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
793 cd->name = g_strdup(_("Command line"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
794
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
795 collection_path_changed(cd);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
796
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
797 work = cmd_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
798 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
799 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 113
diff changeset
800 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
801 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
802 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
803
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
804 work = collection_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
805 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
806 {
358
384eed18df04 Use flags for collection_load*().
zas_
parents: 354
diff changeset
807 collection_load(cd, (gchar *)work->data, COLLECTION_LOAD_APPEND);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
808 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
809 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
810
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
811 layout_set_path(lw, path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
812 if (cd->list) layout_image_set_collection(lw, cd, cd->list->data);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
813
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
814 /* 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
815 * (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
816 * 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
817 * may not work as expected when closing collection windows.
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 * collection_unref(cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
820 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
821
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 else if (cmd_file)
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 layout_set_path(lw, cmd_file);
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 else
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 layout_set_path(lw, path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
830 if (first_collection)
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 layout_image_set_collection(lw, first_collection,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
833 collection_get_first(first_collection));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
834 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
835 }
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 586
diff changeset
836
638
8cc9f349c670 Rename option image_overlay.common.enabled to image_overlay.common.state
zas_
parents: 630
diff changeset
837 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
838
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
839 g_free(geometry);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
840 g_free(cmd_path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
841 g_free(cmd_file);
576
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
842 filelist_free(cmd_list);
9dc0513837b5 dropped path_list functions, use filelist functions everywhere
nadvornik
parents: 556
diff changeset
843 string_list_free(collection_list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
844 g_free(path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
845
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
846 if (startup_full_screen) layout_image_full_screen_start(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
847 if (startup_in_slideshow) layout_image_slideshow_start(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
848
714
0f177c151368 Use g_build_filename() where applicable.
zas_
parents: 702
diff changeset
849 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
850 remote_connection = remote_server_init(buf, cd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
851 g_free(buf);
3
gqview
parents: 1
diff changeset
852
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 509
diff changeset
853 gtk_main();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
854 return 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
855 }