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