annotate src/main.c @ 614:b2898f04c82e

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