annotate src/main.c @ 281:9995c5fb202a

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