annotate src/main.c @ 506:fc9c8a3e1a8b

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