annotate src/main.c @ 386:0226daf8c30b

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