#include "slideshow.h"
#include "ui_fileops.h"
#include "rcfile.h"
+#include "view_file.h"
#include <sys/socket.h>
#include <sys/un.h>
typedef struct _RemoteData RemoteData;
struct _RemoteData {
CollectionData *command_collection;
+ GList *file_list;
+ gboolean single_dir;
};
/* To enable file names containing newlines to be processed correctly,
gchar *buffer = NULL;
GError *error = NULL;
gsize termpos;
- /* FIXME: it should be possible to terminate the command with a null character */
+ /** @FIXME it should be possible to terminate the command with a null character */
g_io_channel_set_line_term(source, "<gq_end_of_command>", -1);
while ((status = g_io_channel_read_line(source, &buffer, NULL, &termpos, &error)) == G_IO_STATUS_NORMAL)
{
addr.sun_family = AF_UNIX;
sun_path_len = MIN(strlen(path) + 1, UNIX_PATH_MAX);
strncpy(addr.sun_path, path, sun_path_len);
- if (bind(fd, &addr, sizeof(addr)) == -1 ||
+ if (bind(fd, (struct sockaddr*)&addr, sizeof(addr)) == -1 ||
listen(fd, REMOTE_SERVER_BACKLOG) == -1)
{
log_printf("error subscribing to socket: %s\n", strerror(errno));
addr.sun_family = AF_UNIX;
sun_path_len = MIN(strlen(path) + 1, UNIX_PATH_MAX);
strncpy(addr.sun_path, path, sun_path_len);
- if (connect(fd, &addr, sizeof(addr)) == -1)
+ if (connect(fd, (struct sockaddr*)&addr, sizeof(addr)) == -1)
{
DEBUG_1("error connecting to socket: %s", strerror(errno));
close(fd);
if (!layout_valid(&lw)) return;
lw_id = layout_menu_new_window(NULL, lw);
+ layout_set_path(lw_id, pwd);
}
static gboolean gr_close_window_cb()
static void gr_slideshow_start_rec(const gchar *text, GIOChannel *channel, gpointer data)
{
GList *list;
- FileData *dir_fd = file_data_new_dir(text);
+ gchar *tilde_filename;
+
+ tilde_filename = expand_tilde(text);
+
+ FileData *dir_fd = file_data_new_dir(tilde_filename);
+ g_free(tilde_filename);
layout_valid(&lw_id);
list = filelist_recursive_full(dir_fd, lw_id->sort_method, lw_id->sort_ascend);
gint width, height;
gint r_mouse, g_mouse, b_mouse;
PixbufRenderer *pr;
- LayoutWindow *lw = NULL;
if (!layout_valid(&lw_id)) return;
{
gchar *rectangle_info;
PixbufRenderer *pr;
- LayoutWindow *lw = NULL;
gint x1, y1, x2, y2;
if (!options->draw_rectangle) return;
FileData *fd;
GString *out_string = g_string_new(NULL);
GList *work;
+ gchar *tilde_filename;
if (strcmp(text, "") == 0)
{
}
else
{
- if (isdir(text))
+ tilde_filename = expand_tilde(text);
+ if (isdir(tilde_filename))
{
- dir_fd = file_data_new_dir(text);
+ dir_fd = file_data_new_dir(tilde_filename);
}
else
{
+ g_free(tilde_filename);
return;
}
+ g_free(tilde_filename);
}
if (recurse)
g_string_free(out_string, TRUE);
}
+static gboolean wait_cb(const gpointer data)
+{
+ gint position = GPOINTER_TO_INT(data);
+ gint x = position >> 16;
+ gint y = position - (x << 16);
+
+ gtk_window_move(GTK_WINDOW(lw_id->window), x, y);
+
+ return FALSE;
+}
+
+static void gr_geometry(const gchar *text, GIOChannel *channel, gpointer data)
+{
+ gchar **geometry;
+
+ if (!layout_valid(&lw_id) || !text)
+ {
+ return;
+ }
+
+ if (text[0] == '+')
+ {
+ geometry = g_strsplit_set(text, "+", 3);
+ if (geometry[1] != NULL && geometry[2] != NULL )
+ {
+ gtk_window_move(GTK_WINDOW(lw_id->window), atoi(geometry[1]), atoi(geometry[2]));
+ }
+ }
+ else
+ {
+ geometry = g_strsplit_set(text, "+x", 4);
+ if (geometry[0] != NULL && geometry[1] != NULL)
+ {
+ gtk_window_resize(GTK_WINDOW(lw_id->window), atoi(geometry[0]), atoi(geometry[1]));
+ }
+ if (geometry[2] != NULL && geometry[3] != NULL)
+ {
+ /* There is an occasional problem with a window_move immediately after a window_resize */
+ g_idle_add(wait_cb, GINT_TO_POINTER((atoi(geometry[2]) << 16) + atoi(geometry[3])));
+ }
+ }
+ g_strfreev(geometry);
+}
static void gr_filelist(const gchar *text, GIOChannel *channel, gpointer data)
{
{
out_string = g_strconcat(image_get_path(lw_id->image), NULL);
}
+ }
+ else
+ {
+ out_string = g_strconcat(lw_id->dir_fd->path, G_DIR_SEPARATOR_S, NULL);
+ }
- g_io_channel_write_chars(channel, out_string, -1, NULL, NULL);
- g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
+ g_io_channel_write_chars(channel, out_string, -1, NULL, NULL);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
- g_free(collection_name);
- g_free(out_string);
- }
+ g_free(collection_name);
+ g_free(out_string);
}
static void gr_file_info(const gchar *text, GIOChannel *channel, gpointer data)
g_string_append_printf(out_string, _("Page no: %d/%d\n"), fd->page_num + 1, fd->page_total);
}
- country_name = exif_get_data_as_text(fd->exif, "formatted.countryname");
- if (country_name)
+ if (fd->exif)
{
- g_string_append_printf(out_string, _("Country name: %s\n"), country_name);
- }
+ country_name = exif_get_data_as_text(fd->exif, "formatted.countryname");
+ if (country_name)
+ {
+ g_string_append_printf(out_string, _("Country name: %s\n"), country_name);
+ g_free(country_name);
+ }
- country_code = exif_get_data_as_text(fd->exif, "formatted.countrycode");
- if (country_name)
- {
- g_string_append_printf(out_string, _("Country code: %s\n"), country_code);
- }
+ country_code = exif_get_data_as_text(fd->exif, "formatted.countrycode");
+ if (country_name)
+ {
+ g_string_append_printf(out_string, _("Country code: %s\n"), country_code);
+ g_free(country_code);
+ }
- timezone = exif_get_data_as_text(fd->exif, "formatted.timezone");
- if (timezone)
- {
- g_string_append_printf(out_string, _("Timezone: %s\n"), timezone);
- }
+ timezone = exif_get_data_as_text(fd->exif, "formatted.timezone");
+ if (timezone)
+ {
+ g_string_append_printf(out_string, _("Timezone: %s\n"), timezone);
+ g_free(timezone);
+ }
- local_time = exif_get_data_as_text(fd->exif, "formatted.localtime");
- if (local_time)
- {
- g_string_append_printf(out_string, ("Local time: %s\n"), local_time);
+ local_time = exif_get_data_as_text(fd->exif, "formatted.localtime");
+ if (local_time)
+ {
+ g_string_append_printf(out_string, ("Local time: %s\n"), local_time);
+ g_free(local_time);
+ }
}
g_io_channel_write_chars(channel, out_string->str, -1, NULL, NULL);
g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
- g_free(country_name);
- g_free(country_code);
- g_free(timezone);
- g_free(local_time);
g_string_free(out_string, TRUE);
file_data_unref(fd);
g_free(filename);
}
}
+static gchar *config_file_path(const gchar *param)
+{
+ gchar *path = NULL;
+ gchar *full_name = NULL;
+
+ if (file_extension_match(param, ".xml"))
+ {
+ path = g_build_filename(get_window_layouts_dir(), param, NULL);
+ }
+ else if (file_extension_match(param, NULL))
+ {
+ full_name = g_strconcat(param, ".xml", NULL);
+ path = g_build_filename(get_window_layouts_dir(), full_name, NULL);
+ }
+
+ if (!isfile(path))
+ {
+ g_free(path);
+ path = NULL;
+ }
+
+ g_free(full_name);
+ return path;
+}
+
+static gboolean is_config_file(const gchar *param)
+{
+ gchar *name = NULL;
+
+ name = config_file_path(param);
+ if (name)
+ {
+ g_free(name);
+ return TRUE;
+ }
+ return FALSE;
+}
+
static void gr_config_load(const gchar *text, GIOChannel *channel, gpointer data)
{
gchar *filename = expand_tilde(text);
+ if (!g_strstr_len(filename, -1, G_DIR_SEPARATOR_S))
+ {
+ if (is_config_file(filename))
+ {
+ gchar *tmp = config_file_path(filename);
+ g_free(filename);
+ filename = tmp;
+ }
+ }
+
if (isfile(filename))
{
load_config_from_file(filename, FALSE);
{
RemoteData *remote_data = data;
- if (remote_data->command_collection)
- {
- collection_unref(remote_data->command_collection);
- remote_data->command_collection = NULL;
- }
+ remote_data->command_collection = NULL;
+ remote_data->file_list = NULL;
+ remote_data->single_dir = TRUE;
}
static void gr_list_add(const gchar *text, GIOChannel *channel, gpointer data)
{
RemoteData *remote_data = data;
gboolean new = TRUE;
+ gchar *path = NULL;
+ FileData *fd;
+ FileData *first;
- if (!remote_data->command_collection)
+ /* If there is a files list on the command line
+ * check if they are all in the same folder
+ */
+ if (remote_data->single_dir)
{
+ GList *work;
+ work = remote_data->file_list;
+ while (work && remote_data->single_dir)
+ {
+ gchar *dirname;
+ dirname = g_path_get_dirname(((FileData *)work->data)->path);
+ if (!path)
+ {
+ path = g_strdup(dirname);
+ }
+ else
+ {
+ if (g_strcmp0(path, dirname) != 0)
+ {
+ remote_data->single_dir = FALSE;
+ }
+ }
+ g_free(dirname);
+ work = work->next;
+ }
+ g_free(path);
+ }
+
+ gchar *pathname = g_path_get_dirname(text);
+ layout_set_path(lw_id, pathname);
+ g_free(pathname);
+
+ fd = file_data_new_simple(text);
+ remote_data->file_list = g_list_append(remote_data->file_list, fd);
+ file_data_unref(fd);
+
+ vf_select_none(lw_id->vf);
+ remote_data->file_list = g_list_reverse(remote_data->file_list);
+
+ layout_select_list(lw_id, remote_data->file_list);
+ layout_refresh(lw_id);
+ first = (FileData *)(g_list_first(vf_selection_get_list(lw_id->vf))->data);
+ layout_set_fd(lw_id, first);
+
CollectionData *cd;
+ CollectWindow *cw;
- cd = collection_new("");
+ if (!remote_data->command_collection && !remote_data->single_dir)
+ {
+ cw = collection_window_new(NULL);
+ cd = cw->cd;
- g_free(cd->path);
- cd->path = NULL;
- g_free(cd->name);
- cd->name = g_strdup(_("Command line"));
+ collection_path_changed(cd);
remote_data->command_collection = cd;
}
- else
+ else if (!remote_data->single_dir)
{
new = (!collection_get_first(remote_data->command_collection));
}
- if (collection_add(remote_data->command_collection, file_data_new_group(text), FALSE) && new)
+ if (!remote_data->single_dir)
{
- layout_image_set_collection(NULL, remote_data->command_collection,
- collection_get_first(remote_data->command_collection));
+ layout_image_set_collection(lw_id, remote_data->command_collection, collection_get_first(remote_data->command_collection));
+ if (collection_add(remote_data->command_collection, file_data_new_group(text), FALSE) && new)
+ {
+ layout_image_set_collection(lw_id, remote_data->command_collection, collection_get_first(remote_data->command_collection));
+ }
}
}
static void gr_raise(const gchar *text, GIOChannel *channel, gpointer data)
{
- LayoutWindow *lw = NULL;
-
if (layout_valid(&lw_id))
{
gtk_window_present(GTK_WINDOW(lw_id->window));
{
LayoutWindow *lw = NULL;
+ layout_valid(&lw);
+
g_free(pwd);
pwd = g_strdup(text);
+ lw_id = lw;
}
static void gr_print0(const gchar *text, GIOChannel *channel, gpointer data)
{
- LayoutWindow *lw = NULL;
-
g_io_channel_write_chars(channel, "print0", -1, NULL, NULL);
g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
}
{ "+t", "--tools-show", gr_tools_show, FALSE, TRUE, NULL, N_("show tools") },
{ "-t", "--tools-hide", gr_tools_hide, FALSE, TRUE, NULL, N_("hide tools") },
{ "-q", "--quit", gr_quit, FALSE, FALSE, NULL, N_("quit") },
- { NULL, "--config-load:", gr_config_load, TRUE, FALSE, N_("<FILE>"), N_("load configuration from FILE") },
+ { NULL, "--config-load:", gr_config_load, TRUE, FALSE, N_("<FILE>|layout ID"), N_("load configuration from FILE") },
{ NULL, "--get-sidecars:", gr_get_sidecars, TRUE, FALSE, N_("<FILE>"), N_("get list of sidecars of FILE") },
{ NULL, "--get-destination:", gr_get_destination, TRUE, FALSE, N_("<FILE>"), N_("get destination path of FILE") },
- { NULL, "file:", gr_file_load, TRUE, FALSE, N_("<FILE>"), N_("open FILE, bring Geeqie window to the top") },
- { NULL, "--file:", gr_file_load, TRUE, FALSE, N_("<FILE>"), N_("open FILE, bring Geeqie window to the top") },
- { NULL, "File:", gr_file_load_no_raise, TRUE, FALSE, N_("<FILE>"), N_("open FILE, do not bring Geeqie window to the top") },
- { NULL, "--File:", gr_file_load_no_raise, TRUE, FALSE, N_("<FILE>"), N_("open FILE, do not bring Geeqie window to the top") },
+ { NULL, "file:", gr_file_load, TRUE, FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, bring Geeqie window to the top") },
+ { NULL, "--file:", gr_file_load, TRUE, FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, bring Geeqie window to the top") },
+ { NULL, "File:", gr_file_load_no_raise, TRUE, FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, do not bring Geeqie window to the top") },
+ { NULL, "--File:", gr_file_load_no_raise, TRUE, FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, do not bring Geeqie window to the top") },
{ NULL, "--tell", gr_file_tell, FALSE, FALSE, NULL, N_("print filename [and Collection] of current image") },
{ NULL, "--pixel-info", gr_pixel_info, FALSE, FALSE, NULL, N_("print pixel info of mouse pointer on current image") },
{ NULL, "--get-rectangle", gr_rectangle, FALSE, FALSE, NULL, N_("get rectangle co-ordinates") },
{ NULL, "--id:", gr_lw_id, TRUE, FALSE, N_("<ID>"), N_("window id for following commands") },
{ NULL, "--new-window", gr_new_window, FALSE, FALSE, NULL, N_("new window") },
{ NULL, "--close-window", gr_close_window, FALSE, FALSE, NULL, N_("close window") },
+ { NULL, "--geometry=", gr_geometry, TRUE, FALSE, N_("<GEOMETRY>"), N_("set window geometry") },
{ "-ct:", "--cache-thumbs:", gr_cache_thumb, TRUE, FALSE, N_("clear|clean"), N_("clear or clean thumbnail cache") },
{ "-cs:", "--cache-shared:", gr_cache_shared, TRUE, FALSE, N_("clear|clean"), N_("clear or clean shared thumbnail cache") },
{ "-cm","--cache-metadata", gr_cache_metadata, FALSE, FALSE, NULL, N_(" clean the metadata cache") },
{
list = g_list_append(list, argv[i]);
}
- else if (errors && !isfile(argv[i]))
+ else if (errors && !isname(argv[i]))
{
*errors = g_list_append(*errors, argv[i]);
}
}
/**
- * \param arg_exec Binary (argv0)
- * \param remote_list Evaluated and recognized remote commands
- * \param path The current path
- * \param cmd_list List of all non collections in Path
- * \param collection_list List of all collections in argv
+ * @param arg_exec Binary (argv0)
+ * @param remote_list Evaluated and recognized remote commands
+ * @param path The current path
+ * @param cmd_list List of all non collections in Path (gchar *path)
+ * @param collection_list List of all collections in argv
*/
void remote_control(const gchar *arg_exec, GList *remote_list, const gchar *path,
GList *cmd_list, GList *collection_list)
entry = remote_command_find(text, NULL);
if (entry)
{
+ /* If Geeqie is not running, stop the --new-window command opening a second window */
+ if (g_strcmp0(text, "--new-window") == 0)
+ {
+ remote_list = g_list_remove(remote_list, text);
+ }
if (entry->prefer_command_line)
{
remote_list = g_list_remove(remote_list, text);
work = cmd_list;
while (work)
{
- FileData *fd;
gchar *text;
- fd = work->data;
- work = work->next;
-
- text = g_strconcat(prefix, fd->path, NULL);
+ text = g_strconcat(prefix, work->data, NULL);
remote_client_send(rc, text);
g_free(text);
+ work = work->next;
sent = TRUE;
}