annotate src/main.c @ 329:a51242c032ea

Rename file sorting options.
author zas_
date Sat, 12 Apr 2008 08:35:58 +0000
parents 049d6b00cc14
children 767b53cd9ab7
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
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
4 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
5 * Author: John Ellis
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
6 *
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
7 * 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
8 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
9 * This software comes with no warranty of any kind, use at your own risk!
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
10 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
11
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
12
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 279
diff changeset
13 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
14
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
15 #include "cache.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
16 #include "collect.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
17 #include "collect-io.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
18 #include "dnd.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
19 #include "editors.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
20 #include "filelist.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 "img-view.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
23 #include "layout.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
24 #include "layout_image.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
25 #include "menu.h"
91
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
26 #include "pixbuf_util.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
27 #include "preferences.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
28 #include "rcfile.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
29 #include "remote.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
30 #include "similar.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
31 #include "slideshow.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
32 #include "utilops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
33 #include "ui_bookmark.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
34 #include "ui_help.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
35 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
36 #include "ui_tabcomp.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
37 #include "ui_utildlg.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
38
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
39 #include <gdk/gdkkeysyms.h> /* for keyboard values */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
40
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
41
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
42 #include <math.h>
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
43
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
44
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
45 static RemoteConnection *remote_connection = NULL;
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
46 static CollectionData *command_collection = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
47
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
48
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
49 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
50 *-----------------------------------------------------------------------------
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
51 * misc (public)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
52 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
53 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
54
289
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
55 GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
56 const gchar *icon_file, const gchar *subtitle)
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
57 {
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
58 gchar *title;
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
59 GtkWidget *window;
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
60
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
61 window = gtk_window_new(type);
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
62 if (!window) return NULL;
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
63
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
64 if (subtitle)
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
65 {
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
66 title = g_strdup_printf("%s - %s", subtitle, GQ_APPNAME);
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
67 }
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
68 else
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
69 {
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
70 title = g_strdup_printf("%s", GQ_APPNAME);
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
71 }
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
72
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
73 gtk_window_set_title(GTK_WINDOW(window), title);
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
74 g_free(title);
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
75
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
76 window_set_icon(window, icon, icon_file);
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
77 gtk_window_set_role(GTK_WINDOW(window), name);
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
78 gtk_window_set_wmclass(GTK_WINDOW(window), name, GQ_WMCLASS);
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
79
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
80 return window;
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
81 }
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
82
91
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
83 void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
84 {
91
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
85 if (!icon && !file) icon = PIXBUF_INLINE_ICON;
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
86
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
87 if (icon)
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
88 {
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
89 GdkPixbuf *pixbuf;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
90
91
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
91 pixbuf = pixbuf_inline(icon);
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
92 if (pixbuf)
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
93 {
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
94 gtk_window_set_icon(GTK_WINDOW(window), pixbuf);
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
95 g_object_unref(pixbuf);
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
96 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
97 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
98 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
99 {
91
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
100 gtk_window_set_icon_from_file(GTK_WINDOW(window), file, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
101 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
102 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
103
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
104 gint window_maximized(GtkWidget *window)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
105 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
106 GdkWindowState state;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
107
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
108 if (!window || !window->window) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
109
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
110 state = gdk_window_get_state(window->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
111 return (state & GDK_WINDOW_STATE_MAXIMIZED);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
112 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
113
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
114 gdouble get_zoom_increment(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
115 {
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
116 return ((options->zoom_increment != 0) ? (gdouble)options->zoom_increment / 10.0 : 1.0);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
117 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
118
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
119 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
120 *-----------------------------------------------------------------------------
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
121 * Open browser with the help Documentation
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
122 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
123 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
124
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
125 static gchar *command_result(const gchar *binary, const gchar *command)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
126 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
127 gchar *result = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
128 FILE *f;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
129 char buf[2048];
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
130 int l;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
131
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
132 if (!binary) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
133 if (!file_in_path(binary)) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
134
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
135 if (!command) return g_strdup(binary);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
136 if (command[0] == '!') return g_strdup(command + 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
137
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
138 f = popen(command, "r");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
139 if (!f) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
140
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
141 while ((l = fread(buf, sizeof(char), sizeof(buf), f)) > 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
142 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
143 if (!result)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
144 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
145 int n = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
146
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
147 while (n < l && buf[n] != '\n' && buf[n] != '\r') n++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
148 if (n > 0) result = g_strndup(buf, n);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
149 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
150 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
151
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
152 pclose(f);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
153
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
154 return result;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
155 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
156
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
157 static void help_browser_command(const gchar *command, const gchar *path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
158 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
159 gchar *result;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
160 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
161 gchar *begin;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
162 gchar *end;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
163
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
164 if (!command || !path) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
165
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
166 if (debug) printf("Help command pre \"%s\", \"%s\"\n", command, path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
167
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
168 buf = g_strdup(command);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
169 begin = strstr(buf, "%s");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
170 if (begin)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
171 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
172 *begin = '\0';
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
173 end = begin + 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
174 begin = buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
175
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
176 result = g_strdup_printf("%s%s%s &", begin, path, end);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
177 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
178 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
179 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
180 result = g_strdup_printf("%s \"%s\" &", command, path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
181 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
182 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
183
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
184 if (debug) printf("Help command post [%s]\n", result);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
185
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
186 system(result);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
187
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
188 g_free(result);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
189 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
190
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
191 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
192 * each set of 2 strings is one browser:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
193 * the 1st is the binary to look for in the path
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
194 * the 2nd has 3 capabilities:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
195 * NULL exec binary with html file path as command line
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
196 * string exec string and use results for command line
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
197 * !string use text following ! as command line, replacing optional %s with html file path
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
198 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
199 static gchar *html_browsers[] =
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
200 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
201 /* Redhat has a nifty htmlview script to start the user's preferred browser */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
202 "htmlview", NULL,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
203 /* GNOME 2 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
204 "gconftool-2", "gconftool-2 -g /desktop/gnome/url-handlers/http/command",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
205 /* KDE */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
206 "kfmclient", "!kfmclient exec \"%s\"",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
207 /* use fallbacks */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
208 "firefox", NULL,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
209 "mozilla", NULL,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
210 "konqueror", NULL,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
211 "netscape", NULL,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
212 NULL, NULL
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
213 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
214
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
215 static void help_browser_run(void)
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 gchar *result = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
218 gint i;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
219
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
220 i = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
221 while (!result && html_browsers[i])
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
222 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
223 result = command_result(html_browsers[i], html_browsers[i+1]);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
224 i += 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
225 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
226
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
227 if (!result)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
228 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
229 printf("Unable to detect an installed browser.\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
230 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
231 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
232
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
233 help_browser_command(result, GQ_HTMLDIR "/index.html");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
234
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
235 g_free(result);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
236 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
237
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
238 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
239 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
240 * help window
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
241 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
242 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
243
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
244 static GtkWidget *help_window = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
245
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
246 static void help_window_destroy_cb(GtkWidget *window, gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
247 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
248 help_window = NULL;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
249 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
250
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
251 void help_window_show(const gchar *key)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
252 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
253 if (key && strcmp(key, "html_contents") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
254 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
255 help_browser_run();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
256 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
257 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
258
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
259 if (help_window)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
260 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
261 gtk_window_present(GTK_WINDOW(help_window));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
262 if (key) help_window_set_key(help_window, key);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
263 return;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
264 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
265
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
266 {
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
267 gchar *title = g_strdup_printf("%s - %s", _("Help"), GQ_APPNAME);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
268 help_window = help_window_new(title, GQ_WMCLASS, "help",
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
269 GQ_HELPDIR "/README", key);
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
270 g_free(title);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
271 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
272 g_signal_connect(G_OBJECT(help_window), "destroy",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
273 G_CALLBACK(help_window_destroy_cb), NULL);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
274 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
275
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
276
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
277 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
278 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
279 * keyboard functions
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
280 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
281 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
282
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
283 void keyboard_scroll_calc(gint *x, gint *y, GdkEventKey *event)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
284 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
285 static gint delta = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
286 static guint32 time_old = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
287 static guint keyval_old = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
288
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
289 if (event->state & GDK_CONTROL_MASK)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
290 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
291 if (*x < 0) *x = G_MININT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
292 if (*x > 0) *x = G_MAXINT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
293 if (*y < 0) *y = G_MININT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
294 if (*y > 0) *y = G_MAXINT / 2;
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 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
297 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
298
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
299 if (options->progressive_key_scrolling)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
300 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
301 guint32 time_diff;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
302
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
303 time_diff = event->time - time_old;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
304
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
305 /* key pressed within 125ms ? (1/8 second) */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
306 if (time_diff > 125 || event->keyval != keyval_old) delta = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
307
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
308 time_old = event->time;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
309 keyval_old = event->keyval;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
310
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
311 delta += 2;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
312 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
313 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
314 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
315 delta = 8;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
316 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
317
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
318 *x = *x * delta;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
319 *y = *y * delta;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
320 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
321
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
322
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
323 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
324 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
325 * remote functions
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
326 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
327 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
328
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
329 static void gr_image_next(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
330 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
331 layout_image_next(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
332 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
333
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
334 static void gr_image_prev(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
335 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
336 layout_image_prev(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
337 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
338
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
339 static void gr_image_first(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
340 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
341 layout_image_first(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
342 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
343
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
344 static void gr_image_last(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
345 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
346 layout_image_last(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
347 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
348
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
349 static void gr_fullscreen_toggle(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
350 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
351 layout_image_full_screen_toggle(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
352 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
353
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
354 static void gr_fullscreen_start(const gchar *text, gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
355 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
356 layout_image_full_screen_start(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
357 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
358
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
359 static void gr_fullscreen_stop(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
360 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
361 layout_image_full_screen_stop(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
362 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
363
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
364 static void gr_slideshow_start_rec(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
365 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
366 GList *list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
367
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
368 list = path_list_recursive(text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
369 if (!list) return;
214
c0e9aac4c7bf Comment out forgotten debugging code.
zas_
parents: 196
diff changeset
370 //printf("length: %d\n", g_list_length(list));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
371 layout_image_slideshow_stop(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
372 layout_image_slideshow_start_from_list(NULL, list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
373 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
374
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
375 static void gr_slideshow_toggle(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
376 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
377 layout_image_slideshow_toggle(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
378 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
379
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
380 static void gr_slideshow_start(const gchar *text, gpointer data)
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 layout_image_slideshow_start(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
383 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
384
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
385 static void gr_slideshow_stop(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
386 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
387 layout_image_slideshow_stop(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
388 }
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 static void gr_slideshow_delay(const gchar *text, gpointer data)
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 gdouble n;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
393
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
394 n = strtod(text, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
395 if (n < SLIDESHOW_MIN_SECONDS || n > SLIDESHOW_MAX_SECONDS)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
396 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
397 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
398
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
399 buf = g_strdup_printf("Remote slideshow delay out of range (%.1f to %.1f)\n",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
400 SLIDESHOW_MIN_SECONDS, SLIDESHOW_MAX_SECONDS);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
401 print_term(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
402 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
403
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
404 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
405 }
326
509b84801d66 Rename slideshow options.
zas_
parents: 322
diff changeset
406 options->slideshow.delay = (gint)(n * 10.0 + 0.01);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
407 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
408
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
409 static void gr_tools_show(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
410 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
411 gint popped;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
412 gint hidden;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
413
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
414 if (layout_tools_float_get(NULL, &popped, &hidden) && hidden)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
415 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
416 layout_tools_float_set(NULL, popped, FALSE);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
417 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
418 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
419
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
420 static void gr_tools_hide(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
421 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
422 gint popped;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
423 gint hidden;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
424
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
425 if (layout_tools_float_get(NULL, &popped, &hidden) && !hidden)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
426 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
427 layout_tools_float_set(NULL, popped, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
428 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
429 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
430
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
431 static gint gr_quit_idle_cb(gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
432 {
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
433 exit_program();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
434
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
435 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
436 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
437
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
438 static void gr_quit(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
439 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
440 /* schedule exit when idle, if done from within a
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
441 * remote handler remote_close will crash
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
442 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
443 g_idle_add(gr_quit_idle_cb, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
444 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
445
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
446 static void gr_file_load(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
447 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
448 if (isfile(text))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
449 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
450 if (file_extension_match(text, ".gqv"))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
451 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
452 collection_window_new(text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
453 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
454 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
455 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
456 layout_set_path(NULL, text);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
457 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
458 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
459 else if (isdir(text))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
460 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
461 layout_set_path(NULL, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
462 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
463 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
464 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
465 printf("remote sent filename that does not exist:\"%s\"\n", text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
466 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
467 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
468
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
469 static void gr_file_view(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
470 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 113
diff changeset
471 view_window_new(file_data_new_simple(text));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
472 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
473
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
474 static void gr_list_clear(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
475 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
476 if (command_collection) collection_unref(command_collection);
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
477 command_collection = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
478 }
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 static void gr_list_add(const gchar *text, gpointer data)
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 gint new = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
483
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
484 if (!command_collection)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
485 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
486 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
487
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
488 cd = collection_new("");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
489
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
490 g_free(cd->path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
491 cd->path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
492 g_free(cd->name);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
493 cd->name = g_strdup(_("Command line"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
494
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
495 command_collection = cd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
496 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
497 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
498 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
499 new = (!collection_get_first(command_collection));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
500 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
501
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
502 if (collection_add(command_collection, file_data_new_simple(text), FALSE) && new)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
503 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
504 layout_image_set_collection(NULL, command_collection,
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
505 collection_get_first(command_collection));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
506 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
507 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
508
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
509 static void gr_raise(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
510 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
511 LayoutWindow *lw = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
512
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
513 if (layout_valid(&lw))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
514 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
515 gtk_window_present(GTK_WINDOW(lw->window));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
516 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
517 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
518
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
519 typedef struct _RemoteCommandEntry RemoteCommandEntry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
520 struct _RemoteCommandEntry {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
521 gchar *opt_s;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
522 gchar *opt_l;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
523 void (*func)(const gchar *text, gpointer data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
524 gint needs_extra;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
525 gint prefer_command_line;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
526 gchar *description;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
527 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
528
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
529 static RemoteCommandEntry remote_commands[] = {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
530 /* short, long callback, extra, prefer,description */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
531 { "-n", "--next", gr_image_next, FALSE, FALSE, N_("next image") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
532 { "-b", "--back", gr_image_prev, FALSE, FALSE, N_("previous image") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
533 { NULL, "--first", gr_image_first, FALSE, FALSE, N_("first image") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
534 { NULL, "--last", gr_image_last, FALSE, FALSE, N_("last image") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
535 { "-f", "--fullscreen", gr_fullscreen_toggle, FALSE, TRUE, N_("toggle full screen") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
536 { "-fs","--fullscreen-start", gr_fullscreen_start, FALSE, FALSE, N_("start full screen") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
537 { "-fS","--fullscreen-stop", gr_fullscreen_stop, FALSE, FALSE, N_("stop full screen") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
538 { "-s", "--slideshow", gr_slideshow_toggle, FALSE, TRUE, N_("toggle slide show") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
539 { "-ss","--slideshow-start", gr_slideshow_start, FALSE, FALSE, N_("start slide show") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
540 { "-sS","--slideshow-stop", gr_slideshow_stop, FALSE, FALSE, N_("stop slide show") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
541 { "-sr","--slideshow-recurse", gr_slideshow_start_rec, TRUE, FALSE, N_("start recursive slide show") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
542 { "-d", "--delay=", gr_slideshow_delay, TRUE, FALSE, N_("set slide show delay in seconds") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
543 { "+t", "--tools-show", gr_tools_show, FALSE, TRUE, N_("show tools") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
544 { "-t", "--tools-hide", gr_tools_hide, FALSE, TRUE, N_("hide tools") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
545 { "-q", "--quit", gr_quit, FALSE, FALSE, N_("quit") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
546 { NULL, "file:", gr_file_load, TRUE, FALSE, N_("open file") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
547 { NULL, "view:", gr_file_view, TRUE, FALSE, N_("open file in new window") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
548 { NULL, "--list-clear", gr_list_clear, FALSE, FALSE, NULL },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
549 { NULL, "--list-add:", gr_list_add, TRUE, FALSE, NULL },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
550 { NULL, "raise", gr_raise, FALSE, FALSE, NULL },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
551 { NULL, NULL, NULL, FALSE, FALSE, NULL }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
552 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
553
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
554 static RemoteCommandEntry *remote_command_find(const gchar *text, const gchar **offset)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
555 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
556 gint match = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
557 gint i;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
558
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
559 i = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
560 while (!match && remote_commands[i].func != NULL)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
561 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
562 if (remote_commands[i].needs_extra)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
563 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
564 if (remote_commands[i].opt_s &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
565 strncmp(remote_commands[i].opt_s, text, strlen(remote_commands[i].opt_s)) == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
566 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
567 if (offset) *offset = text + strlen(remote_commands[i].opt_s);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
568 return &remote_commands[i];
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
569 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
570 else if (remote_commands[i].opt_l &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
571 strncmp(remote_commands[i].opt_l, text, strlen(remote_commands[i].opt_l)) == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
572 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
573 if (offset) *offset = text + strlen(remote_commands[i].opt_l);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
574 return &remote_commands[i];
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
575 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
576 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
577 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
578 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
579 if ((remote_commands[i].opt_s && strcmp(remote_commands[i].opt_s, text) == 0) ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
580 (remote_commands[i].opt_l && strcmp(remote_commands[i].opt_l, text) == 0))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
581 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
582 if (offset) *offset = text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
583 return &remote_commands[i];
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
584 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
585 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
586
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
587 i++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
588 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
589
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
590 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
591 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
592
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
593 static void remote_cb(RemoteConnection *rc, const gchar *text, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
594 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
595 RemoteCommandEntry *entry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
596 const gchar *offset;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
597
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
598 entry = remote_command_find(text, &offset);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
599 if (entry && entry->func)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
600 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
601 entry->func(offset, data);
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
604 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
605 printf("unknown remote command:%s\n", text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
606 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
607 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
608
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
609 static void remote_help(void)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
610 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
611 gint i;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
612
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
613 print_term(_("Remote command list:\n"));
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 i = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
616 while (remote_commands[i].func != NULL)
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 if (remote_commands[i].description)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
619 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
620 gchar *buf;
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 buf = g_strdup_printf(" %-3s%s %-20s %s\n",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
623 (remote_commands[i].opt_s) ? remote_commands[i].opt_s : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
624 (remote_commands[i].opt_s && remote_commands[i].opt_l) ? "," : " ",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
625 (remote_commands[i].opt_l) ? remote_commands[i].opt_l : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
626 _(remote_commands[i].description));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
627
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
628 print_term(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
629 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
630 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
631 i++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
632 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
633 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
634
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
635 static GList *remote_build_list(GList *list, int argc, char *argv[])
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
636 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
637 gint i;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
638
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
639 i = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
640 while (i < argc)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
641 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
642 RemoteCommandEntry *entry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
643
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
644 entry = remote_command_find(argv[i], NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
645 if (entry)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
646 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
647 list = g_list_append(list, argv[i]);
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 i++;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
650 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
651
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
652 return list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
653 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
654
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
655 static void remote_control(const gchar *arg_exec, GList *remote_list, const gchar *path,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
656 GList *cmd_list, GList *collection_list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
657 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
658 RemoteConnection *rc;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
659 gint started = FALSE;
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
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
662 buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/.command", NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
663 rc = remote_client_open(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
664 if (!rc)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
665 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
666 GString *command;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
667 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
668 gint retry_count = 12;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
669 gint blank = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
670
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
671 {
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
672 gchar *msg = g_strdup_printf(_("Remote %s not running, starting..."), GQ_APPNAME);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
673 print_term(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
674 g_free(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
675 }
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
676
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
677 command = g_string_new(arg_exec);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
678
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
679 work = remote_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
680 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
681 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
682 gchar *text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
683 RemoteCommandEntry *entry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
684
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
685 text = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
686 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
687
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
688 entry = remote_command_find(text, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
689 if (entry)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
690 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
691 if (entry->prefer_command_line)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
692 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
693 remote_list = g_list_remove(remote_list, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
694 g_string_append(command, " ");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
695 g_string_append(command, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
696 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
697 if (entry->opt_l && strcmp(entry->opt_l, "file:") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
698 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
699 blank = TRUE;
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 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
702 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
703
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
704 if (blank || cmd_list || path) g_string_append(command, " --blank");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
705 if (debug) g_string_append(command, " --debug");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
706
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
707 g_string_append(command, " &");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
708 system(command->str);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
709 g_string_free(command, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
710
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
711 while (!rc && retry_count > 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
712 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
713 usleep((retry_count > 10) ? 500000 : 1000000);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
714 rc = remote_client_open(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
715 if (!rc) print_term(".");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
716 retry_count--;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
717 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
718
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
719 print_term("\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
720
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
721 started = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
722 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
723 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
724
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
725 if (rc)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
726 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
727 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
728 const gchar *prefix;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
729 gint use_path = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
730 gint sent = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
731
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
732 work = remote_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
733 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
734 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
735 gchar *text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
736 RemoteCommandEntry *entry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
737
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
738 text = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
739 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
740
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
741 entry = remote_command_find(text, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
742 if (entry &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
743 entry->opt_l &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
744 strcmp(entry->opt_l, "file:") == 0) use_path = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
745
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
746 remote_client_send(rc, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
747
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
748 sent = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
749 }
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 if (cmd_list && cmd_list->next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
752 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
753 prefix = "--list-add:";
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
754 remote_client_send(rc, "--list-clear");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
755 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
756 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
757 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
758 prefix = "file:";
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
759 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
760
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
761 work = cmd_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
762 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
763 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
764 const gchar *name;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
765 gchar *text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
766
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
767 name = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
768 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
769
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
770 text = g_strconcat(prefix, name, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
771 remote_client_send(rc, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
772 g_free(text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
773
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
774 sent = TRUE;
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
777 if (path && !cmd_list && use_path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
778 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
779 gchar *text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
780
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
781 text = g_strdup_printf("file:%s", path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
782 remote_client_send(rc, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
783 g_free(text);
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 sent = TRUE;
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
788 work = collection_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
789 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
790 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
791 const gchar *name;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
792 gchar *text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
793
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
794 name = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
795 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
796
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
797 text = g_strdup_printf("file:%s", name);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
798 remote_client_send(rc, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
799 g_free(text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
800
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
801 sent = TRUE;
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 if (!started && !sent)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
805 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
806 remote_client_send(rc, "raise");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
807 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
808 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
809 else
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 print_term(_("Remote not available\n"));
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
812 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
813
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
814 _exit(0);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
815 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
816
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
817 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
818 *-----------------------------------------------------------------------------
3
gqview
parents: 1
diff changeset
819 * command line parser (private) hehe, who needs popt anyway?
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
820 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
821 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
822
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
823 static gint startup_blank = FALSE;
3
gqview
parents: 1
diff changeset
824 static gint startup_full_screen = FALSE;
gqview
parents: 1
diff changeset
825 static gint startup_in_slideshow = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
826 static gint startup_command_line_collection = FALSE;
3
gqview
parents: 1
diff changeset
827
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
828
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
829 static void parse_command_line_add_file(const gchar *file_path, gchar **path, gchar **file,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
830 GList **list, GList **collection_list)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
831 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
832 gchar *path_parsed;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
833
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
834 path_parsed = g_strdup(file_path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
835 parse_out_relatives(path_parsed);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
836
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
837 if (file_extension_match(path_parsed, ".gqv"))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
838 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
839 *collection_list = g_list_append(*collection_list, path_parsed);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
840 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
841 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
842 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
843 if (!*path) *path = remove_level_from_path(path_parsed);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
844 if (!*file) *file = g_strdup(path_parsed);
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
845 *list = g_list_prepend(*list, path_parsed);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
846 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
847 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
848
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
849 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
850 GList **list)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
851 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
852 GList *files = NULL;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
853 gchar *path_parsed;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
854
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
855 path_parsed = g_strdup(dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
856 parse_out_relatives(path_parsed);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
857
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
858 if (path_list(path_parsed, &files, NULL))
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
859 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
860 GList *work;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
861
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
862 files = path_list_filter(files, FALSE);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
863 files = path_list_sort(files);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
864
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
865 work = files;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
866 while (work)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
867 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
868 gchar *p;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
869
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
870 p = work->data;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
871 if (!*path) *path = remove_level_from_path(p);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
872 if (!*file) *file = g_strdup(p);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
873 *list = g_list_prepend(*list, p);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
874
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
875 work = work->next;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
876 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
877
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
878 g_list_free(files);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
879 }
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
880
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
881 g_free(path_parsed);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
882 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
883
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
884 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
885 GList **list, gchar **first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
886 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
887
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
888 if (!*list && !*first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
889 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
890 *first_dir = g_strdup(dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
891 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
892 else
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
893 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
894 if (*first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
895 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
896 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
897 g_free(*first_dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
898 *first_dir = NULL;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
899 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
900 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
901 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
902 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
903
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
904 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
905 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
906 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
907
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
908 if (*first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
909 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
910 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
911 g_free(*first_dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
912 *first_dir = NULL;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
913 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
914 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
915 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
916
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
917 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
918 GList **cmd_list, GList **collection_list,
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
919 gchar **geometry)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
920 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
921 GList *list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
922 GList *remote_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
923 gint remote_do = FALSE;
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
924 gchar *first_dir = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
925
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
926 if (argc > 1)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
927 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
928 gint i;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
929 gchar *base_dir = get_current_dir();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
930 i = 1;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
931 while (i < argc)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
932 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
933 const gchar *cmd_line = argv[i];
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
934 gchar *cmd_all = concat_dir_and_file(base_dir, cmd_line);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
935
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
936 if (cmd_line[0] == '/' && isdir(cmd_line))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
937 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
938 parse_command_line_process_dir(cmd_line, path, file, &list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
939 }
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
940 else if (isdir(cmd_all))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
941 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
942 parse_command_line_process_dir(cmd_all, path, file, &list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
943 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
944 else if (cmd_line[0] == '/' && isfile(cmd_line))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
945 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
946 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
947 &list, collection_list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
948 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
949 else if (isfile(cmd_all))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
950 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
951 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
952 &list, collection_list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
953 }
227
41fc4bfc8b25 Add a debug level spinner at the end of Preferences > Advanced.
zas_
parents: 218
diff changeset
954 #ifdef DEBUG
3
gqview
parents: 1
diff changeset
955 else if (strcmp(cmd_line, "--debug") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
956 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
957 /* we now increment the debug state for verbosity */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
958 debug++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
959 printf("debugging output enabled (level %d)\n", debug);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
960 }
227
41fc4bfc8b25 Add a debug level spinner at the end of Preferences > Advanced.
zas_
parents: 218
diff changeset
961 #endif
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
962 else if (strcmp(cmd_line, "+t") == 0 ||
3
gqview
parents: 1
diff changeset
963 strcmp(cmd_line, "--with-tools") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
964 {
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
965 options->tools_float = FALSE;
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
966 options->tools_hidden = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
967
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
968 remote_list = g_list_append(remote_list, "+t");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
969 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
970 else if (strcmp(cmd_line, "-t") == 0 ||
3
gqview
parents: 1
diff changeset
971 strcmp(cmd_line, "--without-tools") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
972 {
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
973 options->tools_hidden = TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
974
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
975 remote_list = g_list_append(remote_list, "-t");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
976 }
3
gqview
parents: 1
diff changeset
977 else if (strcmp(cmd_line, "-f") == 0 ||
gqview
parents: 1
diff changeset
978 strcmp(cmd_line, "--fullscreen") == 0)
gqview
parents: 1
diff changeset
979 {
gqview
parents: 1
diff changeset
980 startup_full_screen = TRUE;
gqview
parents: 1
diff changeset
981 }
gqview
parents: 1
diff changeset
982 else if (strcmp(cmd_line, "-s") == 0 ||
gqview
parents: 1
diff changeset
983 strcmp(cmd_line, "--slideshow") == 0)
gqview
parents: 1
diff changeset
984 {
gqview
parents: 1
diff changeset
985 startup_in_slideshow = TRUE;
gqview
parents: 1
diff changeset
986 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
987 else if (strcmp(cmd_line, "-l") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
988 strcmp(cmd_line, "--list") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
989 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
990 startup_command_line_collection = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
991 }
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
992 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
993 {
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
994 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
995 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
996 else if (strcmp(cmd_line, "-r") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
997 strcmp(cmd_line, "--remote") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
998 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
999 if (!remote_do)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1000 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1001 remote_do = TRUE;
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1002 remote_list = remote_build_list(remote_list, argc, argv);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1003 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1004 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1005 else if (strcmp(cmd_line, "-rh") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1006 strcmp(cmd_line, "--remote-help") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1007 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1008 remote_help();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1009 exit (0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1010 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1011 else if (strcmp(cmd_line, "--blank") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1012 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1013 startup_blank = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1014 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1015 else if (strcmp(cmd_line, "-v") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1016 strcmp(cmd_line, "--version") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1017 {
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1018 printf("%s %s\n", GQ_APPNAME, VERSION);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1019 exit (0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1020 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1021 else if (strcmp(cmd_line, "--alternate") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1022 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1023 /* enable faster experimental algorithm */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1024 printf("Alternate similarity algorithm enabled\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1025 image_sim_alternate_set(TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1026 }
3
gqview
parents: 1
diff changeset
1027 else if (strcmp(cmd_line, "-h") == 0 ||
gqview
parents: 1
diff changeset
1028 strcmp(cmd_line, "--help") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1029 {
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1030 gchar *usage = g_strdup_printf(_("Usage: %s [options] [path]\n\n"), GQ_APPNAME_LC);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1031 printf("%s %s\n", GQ_APPNAME, VERSION);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1032 print_term(usage);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1033 g_free(usage);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1034 print_term(_("valid options are:\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1035 print_term(_(" +t, --with-tools force show of tools\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1036 print_term(_(" -t, --without-tools force hide of tools\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1037 print_term(_(" -f, --fullscreen start in full screen mode\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1038 print_term(_(" -s, --slideshow start in slideshow mode\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1039 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
1040 print_term(_(" --geometry=GEOMETRY set main window location\n"));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1041 print_term(_(" -r, --remote send following commands to open window\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1042 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
1043 #ifdef DEBUG
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1044 print_term(_(" --debug turn on debug output\n"));
227
41fc4bfc8b25 Add a debug level spinner at the end of Preferences > Advanced.
zas_
parents: 218
diff changeset
1045 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1046 print_term(_(" -v, --version print version info\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1047 print_term(_(" -h, --help show this message\n\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1048
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1049 #if 0
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1050 /* these options are not officially supported!
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1051 * only for testing new features, no need to translate them */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1052 print_term( " --alternate use alternate similarity algorithm\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1053 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1054
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1055 exit (0);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1056 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1057 else if (!remote_do)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1058 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1059 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1060
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1061 buf = g_strdup_printf(_("invalid or ignored: %s\nUse --help for options\n"), cmd_line);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1062 print_term(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1063 g_free(buf);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1064 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1065
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1066 g_free(cmd_all);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1067 i++;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1068 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1069 g_free(base_dir);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1070 parse_out_relatives(*path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1071 parse_out_relatives(*file);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1072 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1073
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1074 list = g_list_reverse(list);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1075
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1076 if (!*path && first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1077 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1078 *path = first_dir;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1079 first_dir = NULL;
79
528e3432e0c0 Thu Oct 19 07:23:37 2006 John Ellis <johne@verizon.net>
gqview
parents: 76
diff changeset
1080
528e3432e0c0 Thu Oct 19 07:23:37 2006 John Ellis <johne@verizon.net>
gqview
parents: 76
diff changeset
1081 parse_out_relatives(*path);
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1082 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1083 g_free(first_dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1084
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1085 if (remote_do)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1086 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1087 remote_control(argv[0], remote_list, *path, list, *collection_list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1088 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1089 g_list_free(remote_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1090
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1091 if (list && list->next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1092 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1093 *cmd_list = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1094 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1095 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1096 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1097 path_list_free(list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1098 *cmd_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1099 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1100 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1101
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1102 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1103 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1104 * startup, init, and exit
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1105 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1106 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1107
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1108 #define RC_HISTORY_NAME "history"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1109
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1110 static void keys_load(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1111 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1112 gchar *path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1113
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1114 path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_HISTORY_NAME, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1115 history_list_load(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1116 g_free(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1117 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1118
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1119 static void keys_save(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1120 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1121 gchar *path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1122
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1123 path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_HISTORY_NAME, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1124 history_list_save(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1125 g_free(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1126 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1127
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1128 static void check_for_home_path(gchar *path)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1129 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1130 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1131
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1132 buf = g_strconcat(homedir(), "/", path, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1133 if (!isdir(buf))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1134 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1135 gchar *tmp;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1136
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1137 tmp = g_strdup_printf(_("Creating %s dir:%s\n"), GQ_APPNAME, buf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1138 print_term(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1139 g_free(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1140
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1141 if (!mkdir_utf8(buf, 0755))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1142 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1143 tmp = g_strdup_printf(_("Could not create dir:%s\n"), buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1144 print_term(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1145 g_free(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1146 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1147 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1148 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1149 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1150
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1151 static void setup_default_options(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1152 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1153 gchar *path;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1154 gint i;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1155
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1156 for (i = 0; i < GQ_EDITOR_SLOTS; i++)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1157 {
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1158 options->editor_name[i] = NULL;
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1159 options->editor_command[i] = NULL;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1160 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1161
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1162 editor_reset_defaults();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1163
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1164 bookmark_add_default(_("Home"), homedir());
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1165 path = concat_dir_and_file(homedir(), "Desktop");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1166 bookmark_add_default(_("Desktop"), path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1167 g_free(path);
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1168 path = concat_dir_and_file(homedir(), GQ_RC_DIR_COLLECTIONS);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1169 bookmark_add_default(_("Collections"), path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1170 g_free(path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1171
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1172 g_free(options->safe_delete_path);
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1173 options->safe_delete_path = concat_dir_and_file(homedir(), GQ_RC_DIR_TRASH);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1174
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1175 for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1176 {
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
1177 options->color_profile.input_file[i] = NULL;
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
1178 options->color_profile.input_name[i] = NULL;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1179 }
189
deea9e11f1d4 fixed reading sidecar extensions from config file
nadvornik
parents: 145
diff changeset
1180
322
d344bcf37618 Rationalize fullscreen options naming.
zas_
parents: 320
diff changeset
1181 options->fullscreen.info = g_strdup("%collection%(%number%/%total%) <b>%name%</b>\n"
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
1182 "%res%|%date%|%size%\n"
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
1183 "%fAperture%|%fShutterSpeed%|%fISOSpeedRating%|%fFocalLength%|%fExposureBias%\n"
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
1184 "%fCamera%|%fFlash%");
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
1185
189
deea9e11f1d4 fixed reading sidecar extensions from config file
nadvornik
parents: 145
diff changeset
1186 sidecar_ext_add_defaults();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1187 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1188
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
1189 static void exit_program_final(void)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1190 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1191 gchar *path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1192 gchar *pathl;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1193 LayoutWindow *lw = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1194
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1195 remote_close(remote_connection);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1196
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1197 collect_manager_flush();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1198
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1199 if (layout_valid(&lw))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1200 {
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1201 options->main_window_maximized = window_maximized(lw->window);
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1202 if (!options->main_window_maximized)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1203 {
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1204 layout_geometry_get(NULL, &options->main_window_x, &options->main_window_y,
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1205 &options->main_window_w, &options->main_window_h);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1206 }
322
d344bcf37618 Rationalize fullscreen options naming.
zas_
parents: 320
diff changeset
1207 options->fullscreen.show_info = image_osd_get(lw->image, NULL, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1208 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1209
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1210 layout_geometry_get_dividers(NULL, &options->window_hdivider_pos, &options->window_vdivider_pos);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1211
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
1212 layout_views_get(NULL, &options->layout.view_as_tree, &options->layout.view_as_icons);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1213
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1214 options->thumbnails_enabled = layout_thumb_get(NULL);
329
a51242c032ea Rename file sorting options.
zas_
parents: 327
diff changeset
1215 layout_sort_get(NULL, &options->file_sort.method, &options->file_sort.ascending);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1216
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1217 layout_geometry_get_tools(NULL, &options->float_window_x, &options->float_window_y,
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1218 &options->float_window_w, &options->float_window_h, &options->float_window_divider);
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1219 layout_tools_float_get(NULL, &options->tools_float, &options->tools_hidden);
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1220 options->toolbar_hidden = layout_toolbar_hidden(NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1221
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
1222 options->color_profile.enabled = layout_image_color_profile_get_use(NULL);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1223 layout_image_color_profile_get(NULL,
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
1224 &options->color_profile.input_type,
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
1225 &options->color_profile.screen_type,
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
1226 &options->color_profile.use_image);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1227
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1228 save_options();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1229 keys_save();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1230
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1231 path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1232 pathl = path_from_utf8(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1233 gtk_accel_map_save(pathl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1234 g_free(pathl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1235 g_free(path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1236
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1237 gtk_main_quit();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1238 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1239
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1240 static GenericDialog *exit_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1241
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1242 static void exit_confirm_cancel_cb(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1243 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1244 exit_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1245 generic_dialog_close(gd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1246 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1247
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1248 static void exit_confirm_exit_cb(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1249 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1250 exit_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1251 generic_dialog_close(gd);
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
1252 exit_program_final();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1253 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1254
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1255 static gint exit_confirm_dlg(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1256 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1257 GtkWidget *parent;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1258 LayoutWindow *lw;
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1259 gchar *msg;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1260
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1261 if (exit_dialog)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1262 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1263 gtk_window_present(GTK_WINDOW(exit_dialog->dialog));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1264 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1265 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1266
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1267 if (!collection_window_modified_exists()) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1268
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1269 parent = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1270 lw = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1271 if (layout_valid(&lw))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1272 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1273 parent = lw->window;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1274 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1275
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1276 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
1277 exit_dialog = generic_dialog_new(msg,
254
9faf34f047b1 Make the wmclass value unique among the code by defining
zas_
parents: 227
diff changeset
1278 GQ_WMCLASS, "exit", parent, FALSE,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1279 exit_confirm_cancel_cb, NULL);
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1280 g_free(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1281 msg = g_strdup_printf(_("Quit %s"), GQ_APPNAME);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1282 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
1283 msg, _("Collections have been modified. Quit anyway?"));
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1284 g_free(msg);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1285 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
1286
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1287 gtk_widget_show(exit_dialog->dialog);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1288
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1289 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1290 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1291
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
1292 void exit_program(void)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1293 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1294 layout_image_full_screen_stop(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1295
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1296 if (exit_confirm_dlg()) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1297
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
1298 exit_program_final();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1299 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1300
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1301 int main (int argc, char *argv[])
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1302 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1303 LayoutWindow *lw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1304 gchar *path = NULL;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1305 gchar *cmd_path = NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1306 gchar *cmd_file = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1307 GList *cmd_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1308 GList *collection_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1309 CollectionData *first_collection = NULL;
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
1310 gchar *geometry = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1311 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1312 gchar *bufl;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1313
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1314 /* setup locale, i18n */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1315 gtk_set_locale();
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1316 bindtextdomain(PACKAGE, GQ_LOCALEDIR);
10
6d50eaba8e4b ########
gqview
parents: 9
diff changeset
1317 bind_textdomain_codeset(PACKAGE, "UTF-8");
6d50eaba8e4b ########
gqview
parents: 9
diff changeset
1318 textdomain(PACKAGE);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1319
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1320 /* setup random seed for random slideshow */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1321 srand(time(NULL));
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1322
21
56866f205a68 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 10
diff changeset
1323 #if 1
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1324 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
1325 #endif
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1326 options = init_options(NULL);
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
1327 options->layout.order = g_strdup("123"); /* TODO: move to init_options() */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1328 setup_default_options();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1329 load_options();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1330
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
1331 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
1332
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1333 gtk_init (&argc, &argv);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1334
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1335 if (gtk_major_version < GTK_MAJOR_VERSION ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1336 (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
1337 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1338 gchar *msg;
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1339
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1340 print_term("!!! This is a friendly warning.\n");
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1341 msg = g_strdup_printf("!!! The version of GTK+ in use now is older than when %s was compiled.\n", GQ_APPNAME);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1342 print_term(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1343 g_free(msg);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1344 msg = g_strdup_printf("!!! compiled with GTK+-%d.%d\n", GTK_MAJOR_VERSION, GTK_MINOR_VERSION);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1345 print_term(msg);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1346 g_free(msg);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1347 msg = g_strdup_printf("!!! running with GTK+-%d.%d\n", gtk_major_version, gtk_minor_version);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1348 print_term(msg);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1349 g_free(msg);
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1350 msg = g_strdup_printf("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1351 print_term(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1352 g_free(msg);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1353 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1354
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1355 check_for_home_path(GQ_RC_DIR);
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1356 check_for_home_path(GQ_RC_DIR_COLLECTIONS);
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1357 check_for_home_path(GQ_CACHE_RC_THUMB);
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1358 check_for_home_path(GQ_CACHE_RC_METADATA);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1359
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1360 keys_load();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1361 filter_add_defaults();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1362 filter_rebuild();
145
8be2cc687304 fixed grouping sidecar files and made it configurable via config file
nadvornik
parents: 138
diff changeset
1363
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1364 buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1365 bufl = path_from_utf8(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1366 gtk_accel_map_load(bufl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1367 g_free(bufl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1368 g_free(buf);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1369
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1370 if (startup_blank)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1371 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1372 g_free(cmd_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1373 cmd_path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1374 g_free(cmd_file);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1375 cmd_file = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1376 path_list_free(cmd_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1377 cmd_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1378 path_list_free(collection_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1379 collection_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1380
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1381 path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1382 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1383 else if (cmd_path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1384 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1385 path = g_strdup(cmd_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1386 }
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1387 else if (options->startup_path_enable && options->startup_path && isdir(options->startup_path))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1388 {
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1389 path = g_strdup(options->startup_path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1390 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1391 else
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1392 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1393 path = get_current_dir();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1394 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1395
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 289
diff changeset
1396 lw = layout_new_with_geometry(NULL, options->tools_float, options->tools_hidden, geometry);
329
a51242c032ea Rename file sorting options.
zas_
parents: 327
diff changeset
1397 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
1398
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1399 if (collection_list && !startup_command_line_collection)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1400 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1401 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1402
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1403 work = collection_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1404 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1405 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1406 CollectWindow *cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1407 const gchar *path;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1408
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1409 path = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1410 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1411
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1412 cw = collection_window_new(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1413 if (!first_collection && cw) first_collection = cw->cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1414 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1415 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1416
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1417 if (cmd_list ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1418 (startup_command_line_collection && collection_list))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1419 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1420 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1421 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1422
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1423 if (startup_command_line_collection)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1424 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1425 CollectWindow *cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1426
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1427 cw = collection_window_new("");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1428 cd = cw->cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1429 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1430 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1431 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1432 cd = collection_new(""); /* if we pass NULL, untitled counter is falsely increm. */
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1433 command_collection = cd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1434 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1435
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1436 g_free(cd->path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1437 cd->path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1438 g_free(cd->name);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1439 cd->name = g_strdup(_("Command line"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1440
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1441 collection_path_changed(cd);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1442
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1443 work = cmd_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1444 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1445 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 113
diff changeset
1446 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
1447 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1448 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1449
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1450 work = collection_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1451 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1452 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1453 collection_load(cd, (gchar *)work->data, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1454 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1455 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1456
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1457 layout_set_path(lw, path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1458 if (cd->list) layout_image_set_collection(lw, cd, cd->list->data);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1459
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1460 /* 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
1461 * (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
1462 * 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
1463 * may not work as expected when closing collection windows.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1464 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1465 * collection_unref(cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1466 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1467
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1468 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1469 else if (cmd_file)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1470 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1471 layout_set_path(lw, cmd_file);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1472 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1473 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1474 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1475 layout_set_path(lw, path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1476 if (first_collection)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1477 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1478 layout_image_set_collection(lw, first_collection,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1479 collection_get_first(first_collection));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1480 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1481 }
322
d344bcf37618 Rationalize fullscreen options naming.
zas_
parents: 320
diff changeset
1482 image_osd_set(lw->image, FALSE, options->fullscreen.show_info);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1483
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
1484 g_free(geometry);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1485 g_free(cmd_path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1486 g_free(cmd_file);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1487 path_list_free(cmd_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1488 path_list_free(collection_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1489 g_free(path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1490
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1491 if (startup_full_screen) layout_image_full_screen_start(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1492 if (startup_in_slideshow) layout_image_slideshow_start(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1493
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1494 buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/.command", NULL);
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1495 remote_connection = remote_server_open(buf);
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1496 remote_server_subscribe(remote_connection, remote_cb, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1497 g_free(buf);
3
gqview
parents: 1
diff changeset
1498
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1499 gtk_main ();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1500 return 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1501 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1502