annotate src/main.c @ 645:b50deb0f9968

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