annotate src/remote.c @ 1299:d53d4a448fae

hopefully fixed a freeze on solaris
author nadvornik
date Mon, 16 Feb 2009 21:01:27 +0000
parents 50ae02a4a675
children bd1c6e445396
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 64
diff changeset
2 * Geeqie
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
3 * (C) 2004 John Ellis
1284
8b89e3ff286b Add year 2009 to copyright info everywhere.
zas_
parents: 1145
diff changeset
4 * Copyright (C) 2008 - 2009 The Geeqie Team
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
5 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
6 * Author: John Ellis
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
7 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
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:
diff changeset
9 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
11 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
12
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
13
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 196
diff changeset
14 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
15 #include "remote.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
16
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
17 #include "collect.h"
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
18 #include "filedata.h"
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
19 #include "img-view.h"
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
20 #include "layout.h"
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
21 #include "layout_image.h"
1022
9962b24b6b43 Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents: 1000
diff changeset
22 #include "misc.h"
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
23 #include "slideshow.h"
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
24 #include "ui_fileops.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
25
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
26 #include <sys/socket.h>
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
27 #include <sys/un.h>
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
28 #include <signal.h>
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
29 #include <errno.h>
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
30
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
31
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
32 #define SERVER_MAX_CLIENTS 8
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
33
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
34 #define REMOTE_SERVER_BACKLOG 4
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
35
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
36
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
37 #ifndef UNIX_PATH_MAX
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
38 #define UNIX_PATH_MAX 108
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
39 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
40
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
41
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
42 static RemoteConnection *remote_client_open(const gchar *path);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
43 static gint remote_client_send(RemoteConnection *rc, const gchar *text);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
44
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
45
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
46 typedef struct _RemoteClient RemoteClient;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
47 struct _RemoteClient {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
48 gint fd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
49 gint channel_id;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
50 RemoteConnection *rc;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
51 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
52
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
53 typedef struct _RemoteData RemoteData;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
54 struct _RemoteData {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
55 CollectionData *command_collection;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
56 };
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
57
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
58
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
59 static gboolean remote_server_client_cb(GIOChannel *source, GIOCondition condition, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
60 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
61 RemoteClient *client = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
62 RemoteConnection *rc;
1299
d53d4a448fae hopefully fixed a freeze on solaris
nadvornik
parents: 1291
diff changeset
63 GIOStatus status = G_IO_STATUS_NORMAL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
64
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
65 rc = client->rc;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
66
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
67 if (condition & G_IO_IN)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
68 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
69 GList *queue = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
70 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
71 gchar *buffer = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
72 GError *error = NULL;
64
04ff0df3ad2f Mon Aug 15 17:13:57 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
73 guint termpos;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
74
1299
d53d4a448fae hopefully fixed a freeze on solaris
nadvornik
parents: 1291
diff changeset
75 while ((status = g_io_channel_read_line(source, &buffer, NULL, &termpos, &error)) == G_IO_STATUS_NORMAL)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
76 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
77 if (buffer)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
78 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
79 buffer[termpos] = '\0';
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
80
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
81 if (strlen(buffer) > 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
82 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
83 queue = g_list_append(queue, buffer);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
84 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
85 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
86 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
87 g_free(buffer);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
88 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
89
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
90 buffer = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
91 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
92 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
93
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
94 if (error)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
95 {
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
96 log_printf("error reading socket: %s\n", error->message);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
97 g_error_free(error);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
98 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
99
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
100 work = queue;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
101 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
102 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
103 gchar *command = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
104 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
105
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
106 if (rc->read_func) rc->read_func(rc, command, rc->read_data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
107 g_free(command);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
108 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
109
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
110 g_list_free(queue);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
111 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
112
1299
d53d4a448fae hopefully fixed a freeze on solaris
nadvornik
parents: 1291
diff changeset
113 if (condition & G_IO_HUP || status == G_IO_STATUS_EOF || status == G_IO_STATUS_ERROR)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
114 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
115 rc->clients = g_list_remove(rc->clients, client);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
116
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
117 DEBUG_1("HUP detected, closing client.");
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
118 DEBUG_1("client count %d", g_list_length(rc->clients));
495
c7a2471e5c4e Introduce macros to display debug messages.
zas_
parents: 475
diff changeset
119
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
120 g_source_remove(client->channel_id);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
121 close(client->fd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
122 g_free(client);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
123 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
124
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
125 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
126 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
127
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 995
diff changeset
128 static void remote_server_client_add(RemoteConnection *rc, gint fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
129 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
130 RemoteClient *client;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
131 GIOChannel *channel;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
132
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
133 if (g_list_length(rc->clients) > SERVER_MAX_CLIENTS)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
134 {
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
135 log_printf("maximum remote clients of %d exceeded, closing connection\n", SERVER_MAX_CLIENTS);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
136 close(fd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
137 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
138 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
139
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
140 client = g_new0(RemoteClient, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
141 client->rc = rc;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
142 client->fd = fd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
143
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
144 channel = g_io_channel_unix_new(fd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
145 client->channel_id = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, G_IO_IN | G_IO_HUP,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
146 remote_server_client_cb, client, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
147 g_io_channel_unref(channel);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
148
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
149 rc->clients = g_list_append(rc->clients, client);
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
150 DEBUG_1("client count %d", g_list_length(rc->clients));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
151 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
152
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
153 static void remote_server_clients_close(RemoteConnection *rc)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
154 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
155 while (rc->clients)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
156 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
157 RemoteClient *client = rc->clients->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
158
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
159 rc->clients = g_list_remove(rc->clients, client);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
160
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
161 g_source_remove(client->channel_id);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
162 close(client->fd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
163 g_free(client);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
164 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
165 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
166
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
167 static gboolean remote_server_read_cb(GIOChannel *source, GIOCondition condition, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
168 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
169 RemoteConnection *rc = data;
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 995
diff changeset
170 gint fd;
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 995
diff changeset
171 guint alen;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
172
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
173 fd = accept(rc->fd, NULL, &alen);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
174 if (fd == -1)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
175 {
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
176 log_printf("error accepting socket: %s\n", strerror(errno));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
177 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
178 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
179
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
180 remote_server_client_add(rc, fd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
181
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
182 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
183 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
184
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
185 static gint remote_server_exists(const gchar *path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
186 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
187 RemoteConnection *rc;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
188
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
189 /* verify server up */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
190 rc = remote_client_open(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
191 remote_close(rc);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
192
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
193 if (rc) return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
194
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
195 /* unable to connect, remove socket file to free up address */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
196 unlink(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
197 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
198 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
199
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
200 static RemoteConnection *remote_server_open(const gchar *path)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
201 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
202 RemoteConnection *rc;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
203 struct sockaddr_un addr;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
204 gint sun_path_len;
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 995
diff changeset
205 gint fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
206 GIOChannel *channel;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
207
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
208 if (remote_server_exists(path))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
209 {
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
210 log_printf("Address already in use: %s\n", path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
211 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
212 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
213
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
214 fd = socket(PF_UNIX, SOCK_STREAM, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
215 if (fd == -1) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
216
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
217 addr.sun_family = AF_UNIX;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
218 sun_path_len = MIN(strlen(path) + 1, UNIX_PATH_MAX);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
219 strncpy(addr.sun_path, path, sun_path_len);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
220 if (bind(fd, &addr, sizeof(addr)) == -1 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
221 listen(fd, REMOTE_SERVER_BACKLOG) == -1)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
222 {
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
223 log_printf("error subscribing to socket: %s\n", strerror(errno));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
224 close(fd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
225 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
226 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
227
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
228 rc = g_new0(RemoteConnection, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
229 rc->server = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
230 rc->fd = fd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
231 rc->path = g_strdup(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
232
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
233 rc->read_func = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
234 rc->read_data = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
235
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
236 rc->clients = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
237
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
238 channel = g_io_channel_unix_new(rc->fd);
1291
50ae02a4a675 replaced bar_info with an universal bar, restored the original
nadvornik
parents: 1284
diff changeset
239 g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, NULL);
50ae02a4a675 replaced bar_info with an universal bar, restored the original
nadvornik
parents: 1284
diff changeset
240
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
241 rc->channel_id = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, G_IO_IN,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
242 remote_server_read_cb, rc, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
243 g_io_channel_unref(channel);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
244
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
245 return rc;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
246 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
247
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
248 static void remote_server_subscribe(RemoteConnection *rc, RemoteReadFunc *func, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
249 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
250 if (!rc || !rc->server) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
251
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
252 rc->read_func = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
253 rc->read_data = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
254 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
255
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
256
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
257 static RemoteConnection *remote_client_open(const gchar *path)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
258 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
259 RemoteConnection *rc;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
260 struct stat st;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
261 struct sockaddr_un addr;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
262 gint sun_path_len;
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 995
diff changeset
263 gint fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
264
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
265 if (stat(path, &st) != 0 || !S_ISSOCK(st.st_mode)) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
266
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
267 fd = socket(PF_UNIX, SOCK_STREAM, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
268 if (fd == -1) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
269
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
270 addr.sun_family = AF_UNIX;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
271 sun_path_len = MIN(strlen(path) + 1, UNIX_PATH_MAX);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
272 strncpy(addr.sun_path, path, sun_path_len);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
273 if (connect(fd, &addr, sizeof(addr)) == -1)
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 371
diff changeset
274 {
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
275 DEBUG_1("error connecting to socket: %s", strerror(errno));
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 371
diff changeset
276 close(fd);
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 371
diff changeset
277 return NULL;
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 371
diff changeset
278 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
279
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
280 rc = g_new0(RemoteConnection, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
281 rc->server = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
282 rc->fd = fd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
283 rc->path = g_strdup(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
284
371
7997b6704fdb this might fix the freezes on freebsd, solaris, etc.
nadvornik
parents: 281
diff changeset
285 /* this might fix the freezes on freebsd, solaris, etc. - completely untested */
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 371
diff changeset
286 remote_client_send(rc, "\n");
371
7997b6704fdb this might fix the freezes on freebsd, solaris, etc.
nadvornik
parents: 281
diff changeset
287
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
288 return rc;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
289 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
290
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
291 static sig_atomic_t sigpipe_occured = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
292
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 995
diff changeset
293 static void sighandler_sigpipe(gint sig)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
294 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
295 sigpipe_occured = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
296 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
297
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
298 static gint remote_client_send(RemoteConnection *rc, const gchar *text)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
299 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
300 struct sigaction new_action, old_action;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
301 gint ret = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
302
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
303 if (!rc || rc->server) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
304 if (!text) return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
305
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
306 sigpipe_occured = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
307
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
308 new_action.sa_handler = sighandler_sigpipe;
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
309 sigemptyset(&new_action.sa_mask);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
310 new_action.sa_flags = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
311
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
312 /* setup our signal handler */
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
313 sigaction(SIGPIPE, &new_action, &old_action);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
314
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
315 if (write(rc->fd, text, strlen(text)) == -1 ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
316 write(rc->fd, "\n", 1) == -1)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
317 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
318 if (sigpipe_occured)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
319 {
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
320 log_printf("SIGPIPE writing to socket: %s\n", rc->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
321 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
322 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
323 {
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
324 log_printf("error writing to socket: %s\n", strerror(errno));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
325 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
326 ret = FALSE;;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
327 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
328 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
329 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
330 ret = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
331 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
332
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
333 /* restore the original signal handler */
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
334 sigaction(SIGPIPE, &old_action, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
335
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
336 return ret;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
337 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
338
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
339 void remote_close(RemoteConnection *rc)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
340 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
341 if (!rc) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
342
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
343 if (rc->server)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
344 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
345 remote_server_clients_close(rc);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
346
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
347 g_source_remove(rc->channel_id);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
348 unlink(rc->path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
349 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
350
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
351 if (rc->read_data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
352 g_free(rc->read_data);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
353
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
354 close(rc->fd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
355
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
356 g_free(rc->path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
357 g_free(rc);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
358 }
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
359
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
360 /*
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
361 *-----------------------------------------------------------------------------
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
362 * remote functions
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
363 *-----------------------------------------------------------------------------
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
364 */
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
365
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
366 static void gr_image_next(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
367 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
368 layout_image_next(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
369 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
370
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
371 static void gr_image_prev(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
372 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
373 layout_image_prev(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
374 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
375
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
376 static void gr_image_first(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
377 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
378 layout_image_first(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
379 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
380
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
381 static void gr_image_last(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
382 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
383 layout_image_last(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
384 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
385
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
386 static void gr_fullscreen_toggle(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
387 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
388 layout_image_full_screen_toggle(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
389 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
390
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
391 static void gr_fullscreen_start(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
392 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
393 layout_image_full_screen_start(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
394 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
395
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
396 static void gr_fullscreen_stop(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
397 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
398 layout_image_full_screen_stop(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
399 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
400
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
401 static void gr_slideshow_start_rec(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
402 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
403 GList *list;
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 781
diff changeset
404 FileData *dir_fd = file_data_new_simple(text);
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 781
diff changeset
405 list = filelist_recursive(dir_fd);
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 781
diff changeset
406 file_data_unref(dir_fd);
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
407 if (!list) return;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
408 //printf("length: %d\n", g_list_length(list));
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
409 layout_image_slideshow_stop(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
410 layout_image_slideshow_start_from_list(NULL, list);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
411 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
412
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
413 static void gr_slideshow_toggle(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
414 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
415 layout_image_slideshow_toggle(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
416 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
417
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
418 static void gr_slideshow_start(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
419 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
420 layout_image_slideshow_start(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
421 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
422
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
423 static void gr_slideshow_stop(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
424 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
425 layout_image_slideshow_stop(NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
426 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
427
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
428 static void gr_slideshow_delay(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
429 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
430 gdouble n;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
431
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
432 n = strtod(text, NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
433 if (n < SLIDESHOW_MIN_SECONDS || n > SLIDESHOW_MAX_SECONDS)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
434 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
435 printf_term("Remote slideshow delay out of range (%.1f to %.1f)\n",
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
436 SLIDESHOW_MIN_SECONDS, SLIDESHOW_MAX_SECONDS);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
437 return;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
438 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
439 options->slideshow.delay = (gint)(n * 10.0 + 0.01);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
440 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
441
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
442 static void gr_tools_show(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
443 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
444 gint popped;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
445 gint hidden;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
446
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
447 if (layout_tools_float_get(NULL, &popped, &hidden) && hidden)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
448 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
449 layout_tools_float_set(NULL, popped, FALSE);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
450 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
451 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
452
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
453 static void gr_tools_hide(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
454 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
455 gint popped;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
456 gint hidden;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
457
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
458 if (layout_tools_float_get(NULL, &popped, &hidden) && !hidden)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
459 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
460 layout_tools_float_set(NULL, popped, TRUE);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
461 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
462 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
463
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
464 static gint gr_quit_idle_cb(gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
465 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
466 exit_program();
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
467
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
468 return FALSE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
469 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
470
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
471 static void gr_quit(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
472 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
473 /* schedule exit when idle, if done from within a
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
474 * remote handler remote_close will crash
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
475 */
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
476 g_idle_add(gr_quit_idle_cb, NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
477 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
478
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
479 static void gr_file_load(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
480 {
653
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
481 gchar *filename = expand_tilde(text);
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
482
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
483 if (isfile(filename))
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
484 {
781
2d2cca2bceb0 Replace hardcoded collection filename extension by a macro (GQ_COLLECTION_EXT).
zas_
parents: 713
diff changeset
485 if (file_extension_match(filename, GQ_COLLECTION_EXT))
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
486 {
653
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
487 collection_window_new(filename);
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
488 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
489 else
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
490 {
653
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
491 layout_set_path(NULL, filename);
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
492 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
493 }
653
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
494 else if (isdir(filename))
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
495 {
653
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
496 layout_set_path(NULL, filename);
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
497 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
498 else
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
499 {
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
500 log_printf("remote sent filename that does not exist:\"%s\"\n", filename);
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
501 }
653
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
502
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
503 g_free(filename);
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
504 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
505
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
506 static void gr_file_view(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
507 {
653
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
508 gchar *filename = expand_tilde(text);
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
509
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
510 view_window_new(file_data_new_simple(filename));
e06947d07086 Expand tilde with file: and view: remote parameters.
zas_
parents: 652
diff changeset
511 g_free(filename);
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
512 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
513
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
514 static void gr_list_clear(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
515 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
516 RemoteData *remote_data = data;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
517
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
518 if (remote_data->command_collection)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
519 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
520 collection_unref(remote_data->command_collection);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
521 remote_data->command_collection = NULL;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
522 }
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 783
diff changeset
523 }
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
524
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
525 static void gr_list_add(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
526 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
527 RemoteData *remote_data = data;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
528 gint new = TRUE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
529
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
530 if (!remote_data->command_collection)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
531 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
532 CollectionData *cd;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
533
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
534 cd = collection_new("");
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
535
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
536 g_free(cd->path);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
537 cd->path = NULL;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
538 g_free(cd->name);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
539 cd->name = g_strdup(_("Command line"));
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
540
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
541 remote_data->command_collection = cd;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
542 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
543 else
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
544 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
545 new = (!collection_get_first(remote_data->command_collection));
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
546 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
547
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
548 if (collection_add(remote_data->command_collection, file_data_new_simple(text), FALSE) && new)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
549 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
550 layout_image_set_collection(NULL, remote_data->command_collection,
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
551 collection_get_first(remote_data->command_collection));
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
552 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
553 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
554
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
555 static void gr_raise(const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
556 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
557 LayoutWindow *lw = NULL;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
558
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
559 if (layout_valid(&lw))
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
560 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
561 gtk_window_present(GTK_WINDOW(lw->window));
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
562 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
563 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
564
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
565 typedef struct _RemoteCommandEntry RemoteCommandEntry;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
566 struct _RemoteCommandEntry {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
567 gchar *opt_s;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
568 gchar *opt_l;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
569 void (*func)(const gchar *text, gpointer data);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
570 gint needs_extra;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
571 gint prefer_command_line;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
572 gchar *description;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
573 };
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
574
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
575 static RemoteCommandEntry remote_commands[] = {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
576 /* short, long callback, extra, prefer,description */
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
577 { "-n", "--next", gr_image_next, FALSE, FALSE, N_("next image") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
578 { "-b", "--back", gr_image_prev, FALSE, FALSE, N_("previous image") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
579 { NULL, "--first", gr_image_first, FALSE, FALSE, N_("first image") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
580 { NULL, "--last", gr_image_last, FALSE, FALSE, N_("last image") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
581 { "-f", "--fullscreen", gr_fullscreen_toggle, FALSE, TRUE, N_("toggle full screen") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
582 { "-fs","--fullscreen-start", gr_fullscreen_start, FALSE, FALSE, N_("start full screen") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
583 { "-fS","--fullscreen-stop", gr_fullscreen_stop, FALSE, FALSE, N_("stop full screen") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
584 { "-s", "--slideshow", gr_slideshow_toggle, FALSE, TRUE, N_("toggle slide show") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
585 { "-ss","--slideshow-start", gr_slideshow_start, FALSE, FALSE, N_("start slide show") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
586 { "-sS","--slideshow-stop", gr_slideshow_stop, FALSE, FALSE, N_("stop slide show") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
587 { "-sr","--slideshow-recurse", gr_slideshow_start_rec, TRUE, FALSE, N_("start recursive slide show") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
588 { "-d", "--delay=", gr_slideshow_delay, TRUE, FALSE, N_("set slide show delay in seconds") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
589 { "+t", "--tools-show", gr_tools_show, FALSE, TRUE, N_("show tools") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
590 { "-t", "--tools-hide", gr_tools_hide, FALSE, TRUE, N_("hide tools") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
591 { "-q", "--quit", gr_quit, FALSE, FALSE, N_("quit") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
592 { NULL, "file:", gr_file_load, TRUE, FALSE, N_("open file") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
593 { NULL, "view:", gr_file_view, TRUE, FALSE, N_("open file in new window") },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
594 { NULL, "--list-clear", gr_list_clear, FALSE, FALSE, NULL },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
595 { NULL, "--list-add:", gr_list_add, TRUE, FALSE, NULL },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
596 { NULL, "raise", gr_raise, FALSE, FALSE, NULL },
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
597 { NULL, NULL, NULL, FALSE, FALSE, NULL }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
598 };
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
599
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
600 static RemoteCommandEntry *remote_command_find(const gchar *text, const gchar **offset)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
601 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
602 gint match = FALSE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
603 gint i;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
604
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
605 i = 0;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
606 while (!match && remote_commands[i].func != NULL)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
607 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
608 if (remote_commands[i].needs_extra)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
609 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
610 if (remote_commands[i].opt_s &&
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
611 strncmp(remote_commands[i].opt_s, text, strlen(remote_commands[i].opt_s)) == 0)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
612 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
613 if (offset) *offset = text + strlen(remote_commands[i].opt_s);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
614 return &remote_commands[i];
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
615 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
616 else if (remote_commands[i].opt_l &&
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
617 strncmp(remote_commands[i].opt_l, text, strlen(remote_commands[i].opt_l)) == 0)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
618 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
619 if (offset) *offset = text + strlen(remote_commands[i].opt_l);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
620 return &remote_commands[i];
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
621 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
622 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
623 else
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
624 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
625 if ((remote_commands[i].opt_s && strcmp(remote_commands[i].opt_s, text) == 0) ||
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
626 (remote_commands[i].opt_l && strcmp(remote_commands[i].opt_l, text) == 0))
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
627 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
628 if (offset) *offset = text;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
629 return &remote_commands[i];
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
630 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
631 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
632
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
633 i++;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
634 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
635
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
636 return NULL;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
637 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
638
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
639 static void remote_cb(RemoteConnection *rc, const gchar *text, gpointer data)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
640 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
641 RemoteCommandEntry *entry;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
642 const gchar *offset;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
643
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
644 entry = remote_command_find(text, &offset);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
645 if (entry && entry->func)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
646 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
647 entry->func(offset, data);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
648 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
649 else
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
650 {
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
651 log_printf("unknown remote command:%s\n", text);
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
652 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
653 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
654
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
655 void remote_help(void)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
656 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
657 gint i;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
658
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
659 print_term(_("Remote command list:\n"));
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
660
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
661 i = 0;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
662 while (remote_commands[i].func != NULL)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
663 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
664 if (remote_commands[i].description)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
665 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
666 printf_term(" %-3s%s %-20s %s\n",
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
667 (remote_commands[i].opt_s) ? remote_commands[i].opt_s : "",
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
668 (remote_commands[i].opt_s && remote_commands[i].opt_l) ? "," : " ",
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
669 (remote_commands[i].opt_l) ? remote_commands[i].opt_l : "",
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
670 _(remote_commands[i].description));
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
671 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
672 i++;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
673 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
674 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
675
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 995
diff changeset
676 GList *remote_build_list(GList *list, gint argc, gchar *argv[], GList **errors)
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
677 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
678 gint i;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
679
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
680 i = 1;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
681 while (i < argc)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
682 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
683 RemoteCommandEntry *entry;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
684
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
685 entry = remote_command_find(argv[i], NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
686 if (entry)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
687 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
688 list = g_list_append(list, argv[i]);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
689 }
652
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
690 else if (errors)
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
691 {
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
692 *errors = g_list_append(*errors, argv[i]);
9bcfd6d7a902 Display a message when invalid remote options are used.
zas_
parents: 649
diff changeset
693 }
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
694 i++;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
695 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
696
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
697 return list;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
698 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
699
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
700 void remote_control(const gchar *arg_exec, GList *remote_list, const gchar *path,
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
701 GList *cmd_list, GList *collection_list)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
702 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
703 RemoteConnection *rc;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
704 gint started = FALSE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
705 gchar *buf;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
706
1145
3a7af6a8cd5f Use functions to return directories instead of constants.
zas_
parents: 1144
diff changeset
707 buf = g_build_filename(get_rc_dir(), ".command", NULL);
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
708 rc = remote_client_open(buf);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
709 if (!rc)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
710 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
711 GString *command;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
712 GList *work;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
713 gint retry_count = 12;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
714 gint blank = FALSE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
715
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
716 printf_term(_("Remote %s not running, starting..."), GQ_APPNAME);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
717
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
718 command = g_string_new(arg_exec);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
719
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
720 work = remote_list;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
721 while (work)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
722 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
723 gchar *text;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
724 RemoteCommandEntry *entry;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
725
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
726 text = work->data;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
727 work = work->next;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
728
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
729 entry = remote_command_find(text, NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
730 if (entry)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
731 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
732 if (entry->prefer_command_line)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
733 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
734 remote_list = g_list_remove(remote_list, text);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
735 g_string_append(command, " ");
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
736 g_string_append(command, text);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
737 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
738 if (entry->opt_l && strcmp(entry->opt_l, "file:") == 0)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
739 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
740 blank = TRUE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
741 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
742 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
743 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
744
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
745 if (blank || cmd_list || path) g_string_append(command, " --blank");
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
746 if (get_debug_level()) g_string_append(command, " --debug");
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
747
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
748 g_string_append(command, " &");
1144
5fe3b8b3a612 Add a wrapper around system() call named runcmd() which allows easier debugging. Improve the code launching the help browser.
zas_
parents: 1055
diff changeset
749 runcmd(command->str);
649
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
750 g_string_free(command, TRUE);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
751
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
752 while (!rc && retry_count > 0)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
753 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
754 usleep((retry_count > 10) ? 500000 : 1000000);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
755 rc = remote_client_open(buf);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
756 if (!rc) print_term(".");
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
757 retry_count--;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
758 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
759
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
760 print_term("\n");
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
761
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
762 started = TRUE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
763 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
764 g_free(buf);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
765
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
766 if (rc)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
767 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
768 GList *work;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
769 const gchar *prefix;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
770 gint use_path = TRUE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
771 gint sent = FALSE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
772
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
773 work = remote_list;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
774 while (work)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
775 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
776 gchar *text;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
777 RemoteCommandEntry *entry;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
778
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
779 text = work->data;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
780 work = work->next;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
781
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
782 entry = remote_command_find(text, NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
783 if (entry &&
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
784 entry->opt_l &&
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
785 strcmp(entry->opt_l, "file:") == 0) use_path = FALSE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
786
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
787 remote_client_send(rc, text);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
788
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
789 sent = TRUE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
790 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
791
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
792 if (cmd_list && cmd_list->next)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
793 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
794 prefix = "--list-add:";
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
795 remote_client_send(rc, "--list-clear");
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
796 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
797 else
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
798 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
799 prefix = "file:";
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
800 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
801
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
802 work = cmd_list;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
803 while (work)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
804 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
805 FileData *fd;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
806 gchar *text;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
807
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
808 fd = work->data;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
809 work = work->next;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
810
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
811 text = g_strconcat(prefix, fd->path, NULL);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
812 remote_client_send(rc, text);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
813 g_free(text);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
814
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
815 sent = TRUE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
816 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
817
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
818 if (path && !cmd_list && use_path)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
819 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
820 gchar *text;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
821
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
822 text = g_strdup_printf("file:%s", path);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
823 remote_client_send(rc, text);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
824 g_free(text);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
825
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
826 sent = TRUE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
827 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
828
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
829 work = collection_list;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
830 while (work)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
831 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
832 const gchar *name;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
833 gchar *text;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
834
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
835 name = work->data;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
836 work = work->next;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
837
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
838 text = g_strdup_printf("file:%s", name);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
839 remote_client_send(rc, text);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
840 g_free(text);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
841
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
842 sent = TRUE;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
843 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
844
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
845 if (!started && !sent)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
846 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
847 remote_client_send(rc, "raise");
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
848 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
849 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
850 else
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
851 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
852 print_term(_("Remote not available\n"));
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
853 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
854
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
855 _exit(0);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
856 }
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
857
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
858 RemoteConnection *remote_server_init(gchar *path, CollectionData *command_collection)
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
859 {
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
860 RemoteConnection *remote_connection = remote_server_open(path);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
861 RemoteData *remote_data = g_new(RemoteData, 1);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
862
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
863 remote_data->command_collection = command_collection;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
864
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
865 remote_server_subscribe(remote_connection, remote_cb, remote_data);
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
866 return remote_connection;
3097880d7d95 Move all remote stuff from main.c to remote.[ch].
zas_
parents: 512
diff changeset
867 }
1055
1646720364cf Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents: 1022
diff changeset
868 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */