annotate src/main.c @ 288:d1f74154463e

Replace occurences of Geeqie / geeqie by constants defined in main.h.
author zas_
date Wed, 09 Apr 2008 13:53:01 +0000
parents e213fb025621
children 6a7298988a7a
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
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
205 help_browser_command(result, GQ_HTMLDIR "/index.html");
9
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
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
238 {
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
239 gchar *title = g_strdup_printf("%s - %s", _("Help"), GQ_APPNAME);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
240 help_window = help_window_new(title, GQ_WMCLASS, "help",
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
241 GQ_HELPDIR "/README", key);
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
242 g_free(title);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
243 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
244 g_signal_connect(G_OBJECT(help_window), "destroy",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
245 G_CALLBACK(help_window_destroy_cb), NULL);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
246 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
247
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
248
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
249 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
250 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
251 * keyboard functions
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
252 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
253 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
254
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
255 void keyboard_scroll_calc(gint *x, gint *y, GdkEventKey *event)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
256 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
257 static gint delta = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
258 static guint32 time_old = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
259 static guint keyval_old = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
260
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
261 if (event->state & GDK_CONTROL_MASK)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
262 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
263 if (*x < 0) *x = G_MININT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
264 if (*x > 0) *x = G_MAXINT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
265 if (*y < 0) *y = G_MININT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
266 if (*y > 0) *y = G_MAXINT / 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
267
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
268 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
269 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
270
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
271 if (progressive_key_scrolling)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
272 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
273 guint32 time_diff;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
274
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
275 time_diff = event->time - time_old;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
276
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
277 /* key pressed within 125ms ? (1/8 second) */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
278 if (time_diff > 125 || event->keyval != keyval_old) delta = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
279
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
280 time_old = event->time;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
281 keyval_old = event->keyval;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
282
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
283 delta += 2;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
284 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
285 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
286 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
287 delta = 8;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
288 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
289
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
290 *x = *x * delta;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
291 *y = *y * delta;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
292 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
293
9
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 * remote functions
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 */
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 static void gr_image_next(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
302 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
303 layout_image_next(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
304 }
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 static void gr_image_prev(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
307 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
308 layout_image_prev(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
309 }
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 static void gr_image_first(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
312 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
313 layout_image_first(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
314 }
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 static void gr_image_last(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
317 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
318 layout_image_last(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
319 }
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 static void gr_fullscreen_toggle(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
322 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
323 layout_image_full_screen_toggle(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
324 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
325
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
326 static void gr_fullscreen_start(const gchar *text, gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
327 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
328 layout_image_full_screen_start(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
329 }
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 static void gr_fullscreen_stop(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
332 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
333 layout_image_full_screen_stop(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
334 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
335
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
336 static void gr_slideshow_start_rec(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
337 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
338 GList *list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
339
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
340 list = path_list_recursive(text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
341 if (!list) return;
214
c0e9aac4c7bf Comment out forgotten debugging code.
zas_
parents: 196
diff changeset
342 //printf("length: %d\n", g_list_length(list));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
343 layout_image_slideshow_stop(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
344 layout_image_slideshow_start_from_list(NULL, list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
345 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
346
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
347 static void gr_slideshow_toggle(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
348 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
349 layout_image_slideshow_toggle(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
350 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
351
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
352 static void gr_slideshow_start(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
353 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
354 layout_image_slideshow_start(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
355 }
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 static void gr_slideshow_stop(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
358 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
359 layout_image_slideshow_stop(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
360 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
361
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
362 static void gr_slideshow_delay(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
363 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
364 gdouble n;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
365
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
366 n = strtod(text, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
367 if (n < SLIDESHOW_MIN_SECONDS || n > SLIDESHOW_MAX_SECONDS)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
368 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
369 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
370
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
371 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
372 SLIDESHOW_MIN_SECONDS, SLIDESHOW_MAX_SECONDS);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
373 print_term(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
374 g_free(buf);
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 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
377 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
378 slideshow_delay = (gint)(n * 10.0 + 0.01);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
379 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
380
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
381 static void gr_tools_show(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
382 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
383 gint popped;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
384 gint hidden;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
385
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
386 if (layout_tools_float_get(NULL, &popped, &hidden) && hidden)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
387 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
388 layout_tools_float_set(NULL, popped, FALSE);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
389 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
390 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
391
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
392 static void gr_tools_hide(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
393 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
394 gint popped;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
395 gint hidden;
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 if (layout_tools_float_get(NULL, &popped, &hidden) && !hidden)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
398 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
399 layout_tools_float_set(NULL, popped, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
400 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
401 }
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 static gint gr_quit_idle_cb(gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
404 {
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
405 exit_program();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
406
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
407 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
408 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
409
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
410 static void gr_quit(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
411 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
412 /* schedule exit when idle, if done from within a
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
413 * remote handler remote_close will crash
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
414 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
415 g_idle_add(gr_quit_idle_cb, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
416 }
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 static void gr_file_load(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
419 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
420 if (isfile(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 if (file_extension_match(text, ".gqv"))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
423 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
424 collection_window_new(text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
425 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
426 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
427 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
428 layout_set_path(NULL, text);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
429 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
430 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
431 else if (isdir(text))
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 layout_set_path(NULL, 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 else
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 printf("remote sent filename that does not exist:\"%s\"\n", text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
438 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
439 }
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 static void gr_file_view(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
442 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 113
diff changeset
443 view_window_new(file_data_new_simple(text));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
444 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
445
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
446 static void gr_list_clear(const gchar *text, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
447 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
448 if (command_collection) collection_unref(command_collection);
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
449 command_collection = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
450 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
451
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
452 static void gr_list_add(const gchar *text, gpointer data)
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 gint new = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
455
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
456 if (!command_collection)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
457 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
458 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
459
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
460 cd = collection_new("");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
461
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
462 g_free(cd->path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
463 cd->path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
464 g_free(cd->name);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
465 cd->name = g_strdup(_("Command line"));
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 command_collection = cd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
468 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
469 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
470 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
471 new = (!collection_get_first(command_collection));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
472 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
473
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
474 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
475 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
476 layout_image_set_collection(NULL, command_collection,
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
477 collection_get_first(command_collection));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
478 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
479 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
480
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
481 static void gr_raise(const gchar *text, gpointer data)
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 LayoutWindow *lw = NULL;
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 if (layout_valid(&lw))
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 gtk_window_present(GTK_WINDOW(lw->window));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
488 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
489 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
490
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
491 typedef struct _RemoteCommandEntry RemoteCommandEntry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
492 struct _RemoteCommandEntry {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
493 gchar *opt_s;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
494 gchar *opt_l;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
495 void (*func)(const gchar *text, gpointer data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
496 gint needs_extra;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
497 gint prefer_command_line;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
498 gchar *description;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
499 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
500
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
501 static RemoteCommandEntry remote_commands[] = {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
502 /* short, long callback, extra, prefer,description */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
503 { "-n", "--next", gr_image_next, FALSE, FALSE, N_("next image") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
504 { "-b", "--back", gr_image_prev, FALSE, FALSE, N_("previous image") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
505 { NULL, "--first", gr_image_first, FALSE, FALSE, N_("first image") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
506 { NULL, "--last", gr_image_last, FALSE, FALSE, N_("last image") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
507 { "-f", "--fullscreen", gr_fullscreen_toggle, FALSE, TRUE, N_("toggle full screen") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
508 { "-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
509 { "-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
510 { "-s", "--slideshow", gr_slideshow_toggle, FALSE, TRUE, N_("toggle slide show") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
511 { "-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
512 { "-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
513 { "-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
514 { "-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
515 { "+t", "--tools-show", gr_tools_show, FALSE, TRUE, N_("show tools") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
516 { "-t", "--tools-hide", gr_tools_hide, FALSE, TRUE, N_("hide tools") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
517 { "-q", "--quit", gr_quit, FALSE, FALSE, N_("quit") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
518 { NULL, "file:", gr_file_load, TRUE, FALSE, N_("open file") },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
519 { 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
520 { NULL, "--list-clear", gr_list_clear, FALSE, FALSE, NULL },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
521 { NULL, "--list-add:", gr_list_add, TRUE, FALSE, NULL },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
522 { NULL, "raise", gr_raise, FALSE, FALSE, NULL },
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
523 { NULL, NULL, NULL, FALSE, FALSE, NULL }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
524 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
525
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
526 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
527 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
528 gint match = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
529 gint i;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
530
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
531 i = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
532 while (!match && remote_commands[i].func != NULL)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
533 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
534 if (remote_commands[i].needs_extra)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
535 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
536 if (remote_commands[i].opt_s &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
537 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
538 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
539 if (offset) *offset = text + strlen(remote_commands[i].opt_s);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
540 return &remote_commands[i];
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
541 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
542 else if (remote_commands[i].opt_l &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
543 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
544 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
545 if (offset) *offset = text + strlen(remote_commands[i].opt_l);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
546 return &remote_commands[i];
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
547 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
548 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
549 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
550 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
551 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
552 (remote_commands[i].opt_l && strcmp(remote_commands[i].opt_l, text) == 0))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
553 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
554 if (offset) *offset = text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
555 return &remote_commands[i];
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
556 }
9
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
559 i++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
560 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
561
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
562 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
563 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
564
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
565 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
566 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
567 RemoteCommandEntry *entry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
568 const gchar *offset;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
569
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
570 entry = remote_command_find(text, &offset);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
571 if (entry && entry->func)
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 entry->func(offset, data);
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
576 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
577 printf("unknown remote command:%s\n", text);
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 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
580
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
581 static void remote_help(void)
9
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 gint i;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
584
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
585 print_term(_("Remote command list:\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
586
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
587 i = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
588 while (remote_commands[i].func != NULL)
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 if (remote_commands[i].description)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
591 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
592 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
593
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
594 buf = g_strdup_printf(" %-3s%s %-20s %s\n",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
595 (remote_commands[i].opt_s) ? remote_commands[i].opt_s : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
596 (remote_commands[i].opt_s && remote_commands[i].opt_l) ? "," : " ",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
597 (remote_commands[i].opt_l) ? remote_commands[i].opt_l : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
598 _(remote_commands[i].description));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
599
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
600 print_term(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
601 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
602 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
603 i++;
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 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
606
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
607 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
608 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
609 gint i;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
610
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
611 i = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
612 while (i < argc)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
613 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
614 RemoteCommandEntry *entry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
615
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
616 entry = remote_command_find(argv[i], NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
617 if (entry)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
618 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
619 list = g_list_append(list, argv[i]);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
620 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
621 i++;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
622 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
623
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
624 return 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
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
627 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
628 GList *cmd_list, GList *collection_list)
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 RemoteConnection *rc;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
631 gint started = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
632 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
633
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
634 buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/.command", NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
635 rc = remote_client_open(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
636 if (!rc)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
637 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
638 GString *command;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
639 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
640 gint retry_count = 12;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
641 gint blank = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
642
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
643 {
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
644 gchar *msg = g_strdup_printf(_("Remote %s not running, starting..."), GQ_APPNAME);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
645 print_term(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
646 g_free(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
647 }
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
648
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
649 command = g_string_new(arg_exec);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
650
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
651 work = remote_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
652 while (work)
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 gchar *text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
655 RemoteCommandEntry *entry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
656
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
657 text = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
658 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
659
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
660 entry = remote_command_find(text, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
661 if (entry)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
662 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
663 if (entry->prefer_command_line)
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 remote_list = g_list_remove(remote_list, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
666 g_string_append(command, " ");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
667 g_string_append(command, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
668 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
669 if (entry->opt_l && strcmp(entry->opt_l, "file:") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
670 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
671 blank = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
672 }
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 }
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 if (blank || cmd_list || path) g_string_append(command, " --blank");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
677 if (debug) g_string_append(command, " --debug");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
678
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
679 g_string_append(command, " &");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
680 system(command->str);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
681 g_string_free(command, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
682
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
683 while (!rc && retry_count > 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
684 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
685 usleep((retry_count > 10) ? 500000 : 1000000);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
686 rc = remote_client_open(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
687 if (!rc) print_term(".");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
688 retry_count--;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
689 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
690
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
691 print_term("\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
692
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
693 started = TRUE;
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 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
696
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
697 if (rc)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
698 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
699 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
700 const gchar *prefix;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
701 gint use_path = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
702 gint sent = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
703
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
704 work = remote_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
705 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
706 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
707 gchar *text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
708 RemoteCommandEntry *entry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
709
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
710 text = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
711 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
712
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
713 entry = remote_command_find(text, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
714 if (entry &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
715 entry->opt_l &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
716 strcmp(entry->opt_l, "file:") == 0) use_path = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
717
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
718 remote_client_send(rc, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
719
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
720 sent = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
721 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
722
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
723 if (cmd_list && cmd_list->next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
724 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
725 prefix = "--list-add:";
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
726 remote_client_send(rc, "--list-clear");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
727 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
728 else
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 prefix = "file:";
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
731 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
732
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
733 work = cmd_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
734 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
735 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
736 const gchar *name;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
737 gchar *text;
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 name = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
740 work = work->next;
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 text = g_strconcat(prefix, name, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
743 remote_client_send(rc, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
744 g_free(text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
745
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
746 sent = TRUE;
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
749 if (path && !cmd_list && use_path)
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 gchar *text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
752
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
753 text = g_strdup_printf("file:%s", path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
754 remote_client_send(rc, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
755 g_free(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 sent = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
758 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
759
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
760 work = collection_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
761 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
762 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
763 const gchar *name;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
764 gchar *text;
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 name = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
767 work = work->next;
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 text = g_strdup_printf("file:%s", name);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
770 remote_client_send(rc, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
771 g_free(text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
772
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
773 sent = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
774 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
775
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
776 if (!started && !sent)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
777 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
778 remote_client_send(rc, "raise");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
779 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
780 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
781 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
782 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
783 print_term(_("Remote not available\n"));
1
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 _exit(0);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
787 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
788
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
789 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
790 *-----------------------------------------------------------------------------
3
gqview
parents: 1
diff changeset
791 * command line parser (private) hehe, who needs popt anyway?
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
792 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
793 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
794
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
795 static gint startup_blank = FALSE;
3
gqview
parents: 1
diff changeset
796 static gint startup_full_screen = FALSE;
gqview
parents: 1
diff changeset
797 static gint startup_in_slideshow = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
798 static gint startup_command_line_collection = FALSE;
3
gqview
parents: 1
diff changeset
799
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
800
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
801 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
802 GList **list, GList **collection_list)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
803 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
804 gchar *path_parsed;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
805
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
806 path_parsed = g_strdup(file_path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
807 parse_out_relatives(path_parsed);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
808
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
809 if (file_extension_match(path_parsed, ".gqv"))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
810 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
811 *collection_list = g_list_append(*collection_list, path_parsed);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
812 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
813 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
814 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
815 if (!*path) *path = remove_level_from_path(path_parsed);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
816 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
817 *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
818 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
819 }
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 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
822 GList **list)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
823 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
824 GList *files = NULL;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
825 gchar *path_parsed;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
826
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
827 path_parsed = g_strdup(dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
828 parse_out_relatives(path_parsed);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
829
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
830 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
831 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
832 GList *work;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
833
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
834 files = path_list_filter(files, FALSE);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
835 files = path_list_sort(files);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
836
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
837 work = files;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
838 while (work)
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 gchar *p;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
841
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
842 p = work->data;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
843 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
844 if (!*file) *file = g_strdup(p);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
845 *list = g_list_prepend(*list, p);
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 work = work->next;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
848 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
849
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
850 g_list_free(files);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
851 }
76
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 g_free(path_parsed);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
854 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
855
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
856 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
857 GList **list, gchar **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
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
860 if (!*list && !*first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
861 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
862 *first_dir = g_strdup(dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
863 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
864 else
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 if (*first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
867 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
868 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
869 g_free(*first_dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
870 *first_dir = NULL;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
871 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
872 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
873 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
874 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
875
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
876 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
877 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
878 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
879
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
880 if (*first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
881 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
882 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
883 g_free(*first_dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
884 *first_dir = NULL;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
885 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
886 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
887 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
888
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
889 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
890 GList **cmd_list, GList **collection_list,
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
891 gchar **geometry)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
892 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
893 GList *list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
894 GList *remote_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
895 gint remote_do = FALSE;
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
896 gchar *first_dir = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
897
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
898 if (argc > 1)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
899 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
900 gint i;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
901 gchar *base_dir = get_current_dir();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
902 i = 1;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
903 while (i < argc)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
904 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
905 const gchar *cmd_line = argv[i];
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
906 gchar *cmd_all = concat_dir_and_file(base_dir, cmd_line);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
907
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
908 if (cmd_line[0] == '/' && isdir(cmd_line))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
909 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
910 parse_command_line_process_dir(cmd_line, path, file, &list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
911 }
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
912 else if (isdir(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_dir(cmd_all, path, file, &list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
915 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
916 else if (cmd_line[0] == '/' && isfile(cmd_line))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
917 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
918 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
919 &list, collection_list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
920 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
921 else if (isfile(cmd_all))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
922 {
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
923 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
924 &list, collection_list, &first_dir);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
925 }
227
41fc4bfc8b25 Add a debug level spinner at the end of Preferences > Advanced.
zas_
parents: 218
diff changeset
926 #ifdef DEBUG
3
gqview
parents: 1
diff changeset
927 else if (strcmp(cmd_line, "--debug") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
928 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
929 /* we now increment the debug state for verbosity */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
930 debug++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
931 printf("debugging output enabled (level %d)\n", debug);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
932 }
227
41fc4bfc8b25 Add a debug level spinner at the end of Preferences > Advanced.
zas_
parents: 218
diff changeset
933 #endif
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
934 else if (strcmp(cmd_line, "+t") == 0 ||
3
gqview
parents: 1
diff changeset
935 strcmp(cmd_line, "--with-tools") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
936 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
937 tools_float = FALSE;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
938 tools_hidden = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
939
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
940 remote_list = g_list_append(remote_list, "+t");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
941 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
942 else if (strcmp(cmd_line, "-t") == 0 ||
3
gqview
parents: 1
diff changeset
943 strcmp(cmd_line, "--without-tools") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
944 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
945 tools_hidden = TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
946
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
947 remote_list = g_list_append(remote_list, "-t");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
948 }
3
gqview
parents: 1
diff changeset
949 else if (strcmp(cmd_line, "-f") == 0 ||
gqview
parents: 1
diff changeset
950 strcmp(cmd_line, "--fullscreen") == 0)
gqview
parents: 1
diff changeset
951 {
gqview
parents: 1
diff changeset
952 startup_full_screen = TRUE;
gqview
parents: 1
diff changeset
953 }
gqview
parents: 1
diff changeset
954 else if (strcmp(cmd_line, "-s") == 0 ||
gqview
parents: 1
diff changeset
955 strcmp(cmd_line, "--slideshow") == 0)
gqview
parents: 1
diff changeset
956 {
gqview
parents: 1
diff changeset
957 startup_in_slideshow = TRUE;
gqview
parents: 1
diff changeset
958 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
959 else if (strcmp(cmd_line, "-l") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
960 strcmp(cmd_line, "--list") == 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 startup_command_line_collection = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
963 }
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
964 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
965 {
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
966 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
967 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
968 else if (strcmp(cmd_line, "-r") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
969 strcmp(cmd_line, "--remote") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
970 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
971 if (!remote_do)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
972 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
973 remote_do = TRUE;
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
974 remote_list = remote_build_list(remote_list, argc, argv);
9
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 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
977 else if (strcmp(cmd_line, "-rh") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
978 strcmp(cmd_line, "--remote-help") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
979 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
980 remote_help();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
981 exit (0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
982 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
983 else if (strcmp(cmd_line, "--blank") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
984 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
985 startup_blank = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
986 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
987 else if (strcmp(cmd_line, "-v") == 0 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
988 strcmp(cmd_line, "--version") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
989 {
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
990 printf("%s %s\n", GQ_APPNAME, VERSION);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
991 exit (0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
992 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
993 else if (strcmp(cmd_line, "--alternate") == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
994 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
995 /* enable faster experimental algorithm */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
996 printf("Alternate similarity algorithm enabled\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
997 image_sim_alternate_set(TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
998 }
3
gqview
parents: 1
diff changeset
999 else if (strcmp(cmd_line, "-h") == 0 ||
gqview
parents: 1
diff changeset
1000 strcmp(cmd_line, "--help") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1001 {
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1002 gchar *usage = g_strdup_printf(_("Usage: %s [options] [path]\n\n"), GQ_APPNAME_LC);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1003 printf("%s %s\n", GQ_APPNAME, VERSION);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1004 print_term(usage);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1005 g_free(usage);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1006 print_term(_("valid options are:\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1007 print_term(_(" +t, --with-tools force show of tools\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1008 print_term(_(" -t, --without-tools force hide of tools\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1009 print_term(_(" -f, --fullscreen start in full screen mode\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1010 print_term(_(" -s, --slideshow start in slideshow mode\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1011 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
1012 print_term(_(" --geometry=GEOMETRY set main window location\n"));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1013 print_term(_(" -r, --remote send following commands to open window\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1014 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
1015 #ifdef DEBUG
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1016 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
1017 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1018 print_term(_(" -v, --version print version info\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1019 print_term(_(" -h, --help show this message\n\n"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1020
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1021 #if 0
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1022 /* these options are not officially supported!
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1023 * only for testing new features, no need to translate them */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1024 print_term( " --alternate use alternate similarity algorithm\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1025 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1026
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1027 exit (0);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1028 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1029 else if (!remote_do)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1030 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1031 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1032
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1033 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
1034 print_term(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1035 g_free(buf);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1036 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1037
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1038 g_free(cmd_all);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1039 i++;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1040 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1041 g_free(base_dir);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1042 parse_out_relatives(*path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1043 parse_out_relatives(*file);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1044 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1045
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1046 list = g_list_reverse(list);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1047
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1048 if (!*path && first_dir)
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1049 {
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1050 *path = first_dir;
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1051 first_dir = NULL;
79
528e3432e0c0 Thu Oct 19 07:23:37 2006 John Ellis <johne@verizon.net>
gqview
parents: 76
diff changeset
1052
528e3432e0c0 Thu Oct 19 07:23:37 2006 John Ellis <johne@verizon.net>
gqview
parents: 76
diff changeset
1053 parse_out_relatives(*path);
76
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1054 }
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1055 g_free(first_dir);
07773a3c5b29 Sun Oct 15 04:03:41 2006 John Ellis <johne@verizon.net>
gqview
parents: 21
diff changeset
1056
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1057 if (remote_do)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1058 {
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1059 remote_control(argv[0], remote_list, *path, list, *collection_list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1060 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1061 g_list_free(remote_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1062
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1063 if (list && list->next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1064 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1065 *cmd_list = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1066 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1067 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1068 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1069 path_list_free(list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1070 *cmd_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1071 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1072 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1073
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1074 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1075 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1076 * startup, init, and exit
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1077 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1078 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1079
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1080 #define RC_HISTORY_NAME "history"
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 static void keys_load(void)
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 gchar *path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1085
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1086 path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_HISTORY_NAME, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1087 history_list_load(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1088 g_free(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1089 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1090
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1091 static void keys_save(void)
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 gchar *path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1094
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1095 path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_HISTORY_NAME, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1096 history_list_save(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1097 g_free(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1098 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1099
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1100 static void check_for_home_path(gchar *path)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1101 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1102 gchar *buf;
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 buf = g_strconcat(homedir(), "/", path, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1105 if (!isdir(buf))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1106 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1107 gchar *tmp;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1108
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1109 tmp = g_strdup_printf(_("Creating %s dir:%s\n"), GQ_APPNAME, buf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1110 print_term(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1111 g_free(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1112
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1113 if (!mkdir_utf8(buf, 0755))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1114 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1115 tmp = g_strdup_printf(_("Could not create dir:%s\n"), buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1116 print_term(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1117 g_free(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1118 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1119 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1120 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1121 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1122
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1123 static void setup_default_options(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1124 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1125 gchar *path;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1126 gint i;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1127
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1128 for (i = 0; i < GQ_EDITOR_SLOTS; i++)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1129 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1130 editor_name[i] = NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1131 editor_command[i] = NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1132 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1133
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1134 editor_reset_defaults();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1135
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1136 bookmark_add_default(_("Home"), homedir());
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1137 path = concat_dir_and_file(homedir(), "Desktop");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1138 bookmark_add_default(_("Desktop"), path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1139 g_free(path);
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1140 path = concat_dir_and_file(homedir(), GQ_RC_DIR_COLLECTIONS);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1141 bookmark_add_default(_("Collections"), path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1142 g_free(path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1143
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1144 g_free(safe_delete_path);
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1145 safe_delete_path = concat_dir_and_file(homedir(), GQ_RC_DIR_TRASH);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1146
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1147 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
1148 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1149 color_profile_input_file[i] = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1150 color_profile_input_name[i] = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1151 }
189
deea9e11f1d4 fixed reading sidecar extensions from config file
nadvornik
parents: 145
diff changeset
1152
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
1153 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
1154 "%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
1155 "%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
1156 "%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
1157
189
deea9e11f1d4 fixed reading sidecar extensions from config file
nadvornik
parents: 145
diff changeset
1158 sidecar_ext_add_defaults();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1159 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1160
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
1161 static void exit_program_final(void)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1162 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1163 gchar *path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1164 gchar *pathl;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1165 LayoutWindow *lw = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1166
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1167 remote_close(remote_connection);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1168
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1169 collect_manager_flush();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1170
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1171 if (layout_valid(&lw))
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 main_window_maximized = window_maximized(lw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1174 if (!main_window_maximized)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1175 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1176 layout_geometry_get(NULL, &main_window_x, &main_window_y,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1177 &main_window_w, &main_window_h);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1178 }
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
1179 show_fullscreen_info = image_osd_get(lw->image, NULL, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1180 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1181
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1182 layout_geometry_get_dividers(NULL, &window_hdivider_pos, &window_vdivider_pos);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1183
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1184 layout_views_get(NULL, &layout_view_tree, &layout_view_icons);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1185
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1186 thumbnails_enabled = layout_thumb_get(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1187 layout_sort_get(NULL, &file_sort_method, &file_sort_ascending);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1188
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1189 layout_geometry_get_tools(NULL, &float_window_x, &float_window_y,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1190 &float_window_w, &float_window_h, &float_window_divider);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1191 layout_tools_float_get(NULL, &tools_float, &tools_hidden);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1192 toolbar_hidden = layout_toolbar_hidden(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1193
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1194 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
1195 layout_image_color_profile_get(NULL,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1196 &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
1197 &color_profile_use_image);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1198
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1199 save_options();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1200 keys_save();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1201
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1202 path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1203 pathl = path_from_utf8(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1204 gtk_accel_map_save(pathl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1205 g_free(pathl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1206 g_free(path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1207
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1208 gtk_main_quit();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1209 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1210
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1211 static GenericDialog *exit_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1212
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1213 static void exit_confirm_cancel_cb(GenericDialog *gd, gpointer data)
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 exit_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1216 generic_dialog_close(gd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1217 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1218
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1219 static void exit_confirm_exit_cb(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1220 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1221 exit_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1222 generic_dialog_close(gd);
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
1223 exit_program_final();
9
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 static gint exit_confirm_dlg(void)
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 GtkWidget *parent;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1229 LayoutWindow *lw;
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1230 gchar *msg;
9
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 if (exit_dialog)
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 gtk_window_present(GTK_WINDOW(exit_dialog->dialog));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1235 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1236 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1237
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1238 if (!collection_window_modified_exists()) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1239
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1240 parent = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1241 lw = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1242 if (layout_valid(&lw))
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 parent = lw->window;
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
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1247 msg = g_strdup_printf("%s - %s", GQ_APPNAME, _("exit"));
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1248 exit_dialog = generic_dialog_new(msg,
254
9faf34f047b1 Make the wmclass value unique among the code by defining
zas_
parents: 227
diff changeset
1249 GQ_WMCLASS, "exit", parent, FALSE,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1250 exit_confirm_cancel_cb, NULL);
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1251 g_free(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1252 msg = g_strdup_printf(_("Quit %s"), GQ_APPNAME);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1253 generic_dialog_add_message(exit_dialog, GTK_STOCK_DIALOG_QUESTION,
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1254 msg, _("Collections have been modified. Quit anyway?"));
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1255 g_free(msg);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1256 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
1257
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1258 gtk_widget_show(exit_dialog->dialog);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1259
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1260 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1261 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1262
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
1263 void exit_program(void)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1264 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1265 layout_image_full_screen_stop(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1266
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1267 if (exit_confirm_dlg()) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1268
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 254
diff changeset
1269 exit_program_final();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1270 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1271
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1272 int main (int argc, char *argv[])
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1273 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1274 LayoutWindow *lw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1275 gchar *path = NULL;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1276 gchar *cmd_path = NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1277 gchar *cmd_file = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1278 GList *cmd_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1279 GList *collection_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1280 CollectionData *first_collection = NULL;
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
1281 gchar *geometry = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1282 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1283 gchar *bufl;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1284
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1285 /* setup locale, i18n */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1286 gtk_set_locale();
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1287 bindtextdomain(PACKAGE, GQ_LOCALEDIR);
10
6d50eaba8e4b ########
gqview
parents: 9
diff changeset
1288 bind_textdomain_codeset(PACKAGE, "UTF-8");
6d50eaba8e4b ########
gqview
parents: 9
diff changeset
1289 textdomain(PACKAGE);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1290
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1291 /* setup random seed for random slideshow */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1292 srand(time(NULL));
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1293
21
56866f205a68 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 10
diff changeset
1294 #if 1
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1295 printf("%s %s, This is an alpha release.\n", GQ_APPNAME, VERSION);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1296 #endif
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1297
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1298 layout_order = g_strdup("123");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1299 setup_default_options();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1300 load_options();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1301
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
1302 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
1303
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1304 gtk_init (&argc, &argv);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1305
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1306 if (gtk_major_version < GTK_MAJOR_VERSION ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1307 (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
1308 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1309 gchar *msg;
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1310
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1311 print_term("!!! This is a friendly warning.\n");
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1312 msg = g_strdup_printf("!!! The version of GTK+ in use now is older than when %s was compiled.\n", GQ_APPNAME);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1313 print_term(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1314 g_free(msg);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1315 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
1316 print_term(msg);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1317 g_free(msg);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1318 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
1319 print_term(msg);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1320 g_free(msg);
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1321 msg = g_strdup_printf("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1322 print_term(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
1323 g_free(msg);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1324 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1325
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1326 check_for_home_path(GQ_RC_DIR);
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1327 check_for_home_path(GQ_RC_DIR_COLLECTIONS);
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1328 check_for_home_path(GQ_CACHE_RC_THUMB);
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1329 check_for_home_path(GQ_CACHE_RC_METADATA);
9
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 keys_load();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1332 filter_add_defaults();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1333 filter_rebuild();
145
8be2cc687304 fixed grouping sidecar files and made it configurable via config file
nadvornik
parents: 138
diff changeset
1334
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1335 buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1336 bufl = path_from_utf8(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1337 gtk_accel_map_load(bufl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1338 g_free(bufl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1339 g_free(buf);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1340
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1341 if (startup_blank)
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 g_free(cmd_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1344 cmd_path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1345 g_free(cmd_file);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1346 cmd_file = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1347 path_list_free(cmd_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1348 cmd_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1349 path_list_free(collection_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1350 collection_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1351
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1352 path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1353 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1354 else if (cmd_path)
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 path = g_strdup(cmd_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1357 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1358 else if (startup_path_enable && startup_path && isdir(startup_path))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1359 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1360 path = g_strdup(startup_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1361 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1362 else
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1363 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1364 path = get_current_dir();
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
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
1367 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
1368 layout_sort_set(lw, file_sort_method, file_sort_ascending);
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 if (collection_list && !startup_command_line_collection)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1371 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1372 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1373
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1374 work = collection_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1375 while (work)
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 CollectWindow *cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1378 const gchar *path;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1379
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1380 path = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1381 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1382
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1383 cw = collection_window_new(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1384 if (!first_collection && cw) first_collection = cw->cd;
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 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1387
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1388 if (cmd_list ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1389 (startup_command_line_collection && collection_list))
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 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1392 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1393
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1394 if (startup_command_line_collection)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1395 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1396 CollectWindow *cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1397
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1398 cw = collection_window_new("");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1399 cd = cw->cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1400 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1401 else
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 cd = collection_new(""); /* if we pass NULL, untitled counter is falsely increm. */
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1404 command_collection = cd;
9
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 g_free(cd->path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1408 cd->path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1409 g_free(cd->name);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1410 cd->name = g_strdup(_("Command line"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1411
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1412 collection_path_changed(cd);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1413
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1414 work = cmd_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1415 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1416 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 113
diff changeset
1417 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
1418 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1419 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1420
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1421 work = collection_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1422 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1423 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1424 collection_load(cd, (gchar *)work->data, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1425 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1426 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1427
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1428 layout_set_path(lw, path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1429 if (cd->list) layout_image_set_collection(lw, cd, cd->list->data);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1430
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1431 /* 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
1432 * (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
1433 * 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
1434 * may not work as expected when closing collection windows.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1435 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1436 * collection_unref(cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1437 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1438
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1439 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1440 else if (cmd_file)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1441 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1442 layout_set_path(lw, cmd_file);
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1445 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1446 layout_set_path(lw, path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1447 if (first_collection)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1448 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1449 layout_image_set_collection(lw, first_collection,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1450 collection_get_first(first_collection));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1451 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1452 }
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
1453 image_osd_set(lw->image, FALSE, show_fullscreen_info);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1454
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 79
diff changeset
1455 g_free(geometry);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1456 g_free(cmd_path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1457 g_free(cmd_file);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1458 path_list_free(cmd_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1459 path_list_free(collection_list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1460 g_free(path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1461
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1462 if (startup_full_screen) layout_image_full_screen_start(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1463 if (startup_in_slideshow) layout_image_slideshow_start(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1464
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
1465 buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/.command", NULL);
279
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1466 remote_connection = remote_server_open(buf);
5cd386db1e6c gqview_remote -> remote_connection
zas_
parents: 278
diff changeset
1467 remote_server_subscribe(remote_connection, remote_cb, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
1468 g_free(buf);
3
gqview
parents: 1
diff changeset
1469
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1470 gtk_main ();
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1471 return 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1472 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1473