#include "img-view.h"
#include "layout.h"
#include "layout_image.h"
+#include "layout_util.h"
#include "misc.h"
+#include "pixbuf-renderer.h"
#include "slideshow.h"
#include "ui_fileops.h"
#include "rcfile.h"
#include <signal.h>
#include <errno.h>
+#include "glua.h"
#define SERVER_MAX_CLIENTS 8
static gint remote_client_send(RemoteConnection *rc, const gchar *text);
static void gr_raise(const gchar *text, GIOChannel *channel, gpointer data);
+static LayoutWindow *lw_id = NULL; /* points to the window set by the --id option */
typedef struct _RemoteClient RemoteClient;
struct _RemoteClient {
RemoteConnection *rc;
GIOStatus status = G_IO_STATUS_NORMAL;
+ lw_id = NULL;
rc = client->rc;
if (condition & G_IO_IN)
return TRUE;
}
-static gboolean remote_server_exists(const gchar *path)
+gboolean remote_server_exists(const gchar *path)
{
RemoteConnection *rc;
return rc;
}
-static sig_atomic_t sigpipe_occured = FALSE;
+static sig_atomic_t sigpipe_occurred = FALSE;
static void sighandler_sigpipe(gint sig)
{
- sigpipe_occured = TRUE;
+ sigpipe_occurred = TRUE;
}
static gboolean remote_client_send(RemoteConnection *rc, const gchar *text)
if (!rc || rc->server) return FALSE;
if (!text) return TRUE;
- sigpipe_occured = FALSE;
+ sigpipe_occurred = FALSE;
new_action.sa_handler = sighandler_sigpipe;
sigemptyset(&new_action.sa_mask);
static void gr_image_next(const gchar *text, GIOChannel *channel, gpointer data)
{
- layout_image_next(NULL);
+ layout_image_next(lw_id);
+}
+
+static void gr_new_window(const gchar *text, GIOChannel *channel, gpointer data)
+{
+ LayoutWindow *lw = NULL;
+
+ if (!layout_valid(&lw)) return;
+
+ lw_id = layout_menu_new_window(NULL, lw);
+}
+
+static gboolean gr_close_window_cb()
+{
+ if (!layout_valid(&lw_id)) return FALSE;
+
+ layout_menu_close_cb(NULL, lw_id);
+
+ return FALSE;
+}
+
+static void gr_close_window(const gchar *text, GIOChannel *channel, gpointer data)
+{
+ g_idle_add(gr_close_window_cb, NULL);
}
static void gr_image_prev(const gchar *text, GIOChannel *channel, gpointer data)
{
- layout_image_prev(NULL);
+ layout_image_prev(lw_id);
}
static void gr_image_first(const gchar *text, GIOChannel *channel, gpointer data)
{
- layout_image_first(NULL);
+ layout_image_first(lw_id);
}
static void gr_image_last(const gchar *text, GIOChannel *channel, gpointer data)
{
- layout_image_last(NULL);
+ layout_image_last(lw_id);
}
static void gr_fullscreen_toggle(const gchar *text, GIOChannel *channel, gpointer data)
{
- layout_image_full_screen_toggle(NULL);
+ layout_image_full_screen_toggle(lw_id);
}
static void gr_fullscreen_start(const gchar *text, GIOChannel *channel, gpointer data)
{
- layout_image_full_screen_start(NULL);
+ layout_image_full_screen_start(lw_id);
}
static void gr_fullscreen_stop(const gchar *text, GIOChannel *channel, gpointer data)
{
- layout_image_full_screen_stop(NULL);
+ layout_image_full_screen_stop(lw_id);
+}
+
+static void gr_lw_id(const gchar *text, GIOChannel *channel, gpointer data)
+{
+ lw_id = layout_find_by_layout_id(text);
+ if (!lw_id)
+ {
+ log_printf("remote sent window ID that does not exist:\"%s\"\n",text);
+ }
+ layout_valid(&lw_id);
}
static void gr_slideshow_start_rec(const gchar *text, GIOChannel *channel, gpointer data)
file_data_unref(dir_fd);
if (!list) return;
//printf("length: %d\n", g_list_length(list));
- layout_image_slideshow_stop(NULL);
- layout_image_slideshow_start_from_list(NULL, list);
+ layout_image_slideshow_stop(lw_id);
+ layout_image_slideshow_start_from_list(lw_id, list);
}
static void gr_cache_thumb(const gchar *text, GIOChannel *channel, gpointer data)
cache_maintain_home_remote(TRUE, FALSE);
}
-static void gr_cache_clear(const gchar *text, GIOChannel *channel, gpointer data)
-{
- cache_maintain_home_remote(FALSE, TRUE);
-}
-
static void gr_cache_render(const gchar *text, GIOChannel *channel, gpointer data)
{
cache_manager_render_remote(text, FALSE, FALSE);
static void gr_slideshow_toggle(const gchar *text, GIOChannel *channel, gpointer data)
{
- layout_image_slideshow_toggle(NULL);
+ layout_image_slideshow_toggle(lw_id);
}
static void gr_slideshow_start(const gchar *text, GIOChannel *channel, gpointer data)
{
- layout_image_slideshow_start(NULL);
+ layout_image_slideshow_start(lw_id);
}
static void gr_slideshow_stop(const gchar *text, GIOChannel *channel, gpointer data)
{
- layout_image_slideshow_stop(NULL);
+ layout_image_slideshow_stop(lw_id);
}
static void gr_slideshow_delay(const gchar *text, GIOChannel *channel, gpointer data)
{
- gdouble n;
+ gdouble t1, t2, t3, n;
+ gint res;
- n = g_ascii_strtod(text, NULL);
- if (n < SLIDESHOW_MIN_SECONDS || n > SLIDESHOW_MAX_SECONDS)
+ res = sscanf(text, "%lf:%lf:%lf", &t1, &t2, &t3);
+ if (res == 3)
{
- printf_term("Remote slideshow delay out of range (%.1f to %.1f)\n",
- SLIDESHOW_MIN_SECONDS, SLIDESHOW_MAX_SECONDS);
- return;
+ n = (t1 * 3600) + (t2 * 60) + t3;
+ if (n < SLIDESHOW_MIN_SECONDS || n > SLIDESHOW_MAX_SECONDS ||
+ t1 >= 24 || t2 >= 60 || t3 >= 60)
+ {
+ printf_term(TRUE, "Remote slideshow delay out of range (%.1f to %.1f)\n",
+ SLIDESHOW_MIN_SECONDS, SLIDESHOW_MAX_SECONDS);
+ return;
+ }
}
+ else if (res == 2)
+ {
+ n = t1 * 60 + t2;
+ if (n < SLIDESHOW_MIN_SECONDS || n > SLIDESHOW_MAX_SECONDS ||
+ t1 >= 60 || t2 >= 60)
+ {
+ printf_term(TRUE, "Remote slideshow delay out of range (%.1f to %.1f)\n",
+ SLIDESHOW_MIN_SECONDS, SLIDESHOW_MAX_SECONDS);
+ return;
+ }
+ }
+ else if (res == 1)
+ {
+ n = t1;
+ if (n < SLIDESHOW_MIN_SECONDS || n > SLIDESHOW_MAX_SECONDS)
+ {
+ printf_term(TRUE, "Remote slideshow delay out of range (%.1f to %.1f)\n",
+ SLIDESHOW_MIN_SECONDS, SLIDESHOW_MAX_SECONDS);
+ return;
+ }
+ }
+ else
+ {
+ n = 0;
+ }
+
options->slideshow.delay = (gint)(n * 10.0 + 0.01);
}
gboolean popped;
gboolean hidden;
- if (layout_tools_float_get(NULL, &popped, &hidden) && hidden)
+ if (layout_tools_float_get(lw_id, &popped, &hidden) && hidden)
{
- layout_tools_float_set(NULL, popped, FALSE);
+ layout_tools_float_set(lw_id, popped, FALSE);
}
}
gboolean popped;
gboolean hidden;
- if (layout_tools_float_get(NULL, &popped, &hidden) && !hidden)
+ if (layout_tools_float_get(lw_id, &popped, &hidden) && !hidden)
{
- layout_tools_float_set(NULL, popped, TRUE);
+ layout_tools_float_set(lw_id, popped, TRUE);
}
}
}
else
{
- layout_set_path(NULL, filename);
+ layout_set_path(lw_id, filename);
}
}
else if (isdir(filename))
{
- layout_set_path(NULL, filename);
+ layout_set_path(lw_id, filename);
}
else
{
log_printf("remote sent filename that does not exist:\"%s\"\n", filename);
- layout_set_path(NULL, homedir());
+ layout_set_path(lw_id, homedir());
}
g_free(filename);
gr_raise(text, channel, data);
}
+static void gr_pixel_info(const gchar *text, GIOChannel *channel, gpointer data)
+{
+ gchar *pixel_info;
+ gint x_pixel, y_pixel;
+ gint width, height;
+ gint r_mouse, g_mouse, b_mouse;
+ PixbufRenderer *pr;
+ LayoutWindow *lw = NULL;
+
+ if (!layout_valid(&lw_id)) return;
+
+ pr = (PixbufRenderer*)lw_id->image->pr;
+
+ if (pr)
+ {
+ pixbuf_renderer_get_image_size(pr, &width, &height);
+ if (width < 1 || height < 1) return;
+
+ pixbuf_renderer_get_mouse_position(pr, &x_pixel, &y_pixel);
+
+ if (x_pixel >= 0 && y_pixel >= 0)
+ {
+ pixbuf_renderer_get_pixel_colors(pr, x_pixel, y_pixel,
+ &r_mouse, &g_mouse, &b_mouse);
+
+ pixel_info = g_strdup_printf(_("[%d,%d]: RGB(%3d,%3d,%3d)"),
+ x_pixel, y_pixel,
+ r_mouse, g_mouse, b_mouse);
+
+ g_io_channel_write_chars(channel, pixel_info, -1, NULL, NULL);
+ g_io_channel_write_chars(channel, "\n", -1, NULL, NULL);
+
+ g_free(pixel_info);
+ }
+ else
+ {
+ return;
+ }
+ }
+ else
+ {
+ return;
+ }
+}
+
+static void gr_rectangle(const gchar *text, GIOChannel *channel, gpointer data)
+{
+ gchar *rectangle_info;
+ PixbufRenderer *pr;
+ LayoutWindow *lw = NULL;
+ gint x1, y1, x2, y2;
+
+ if (!options->draw_rectangle) return;
+ if (!layout_valid(&lw_id)) return;
+
+ pr = (PixbufRenderer*)lw_id->image->pr;
+
+ if (pr)
+ {
+ image_get_rectangle(&x1, &y1, &x2, &y2);
+ rectangle_info = g_strdup_printf(_("%dx%d+%d+%d"),
+ (x2 > x1) ? x2 - x1 : x1 - x2,
+ (y2 > y1) ? y2 - y1 : y1 - y2,
+ (x2 > x1) ? x1 : x2,
+ (y2 > y1) ? y1 : y2);
+
+ g_io_channel_write_chars(channel, rectangle_info, -1, NULL, NULL);
+ g_io_channel_write_chars(channel, "\n", -1, NULL, NULL);
+
+ g_free(rectangle_info);
+ }
+}
+
+static void gr_render_intent(const gchar *text, GIOChannel *channel, gpointer data)
+{
+ gchar *render_intent;
+
+ switch (options->color_profile.render_intent)
+ {
+ case 0:
+ render_intent = g_strdup("Perceptual");
+ break;
+ case 1:
+ render_intent = g_strdup("Relative Colorimetric");
+ break;
+ case 2:
+ render_intent = g_strdup("Saturation");
+ break;
+ case 3:
+ render_intent = g_strdup("Absolute Colorimetric");
+ break;
+ default:
+ render_intent = g_strdup("none");
+ break;
+ }
+
+ g_io_channel_write_chars(channel, render_intent, -1, NULL, NULL);
+ g_io_channel_write_chars(channel, "\n", -1, NULL, NULL);
+
+ g_free(render_intent);
+}
+
static void gr_file_tell(const gchar *text, GIOChannel *channel, gpointer data)
{
- LayoutWindow *lw = NULL; /* NULL to force layout_valid() to do some magic */
- if (!layout_valid(&lw)) return;
- if (image_get_path(lw->image))
+ if (!layout_valid(&lw_id)) return;
+
+ if (image_get_path(lw_id->image))
{
- g_io_channel_write_chars(channel, image_get_path(lw->image), -1, NULL, NULL);
+ g_io_channel_write_chars(channel, image_get_path(lw_id->image), -1, NULL, NULL);
g_io_channel_write_chars(channel, "\n", -1, NULL, NULL);
}
}
{
LayoutWindow *lw = NULL;
- if (layout_valid(&lw))
+ if (layout_valid(&lw_id))
+ {
+ gtk_window_present(GTK_WINDOW(lw_id->window));
+ }
+}
+
+#ifdef HAVE_LUA
+static void gr_lua(const gchar *text, GIOChannel *channel, gpointer data)
+{
+ gchar *result = NULL;
+ gchar **lua_command;
+
+ lua_command = g_strsplit(text, ",", 2);
+
+ if (lua_command[0] && lua_command[1])
{
- gtk_window_present(GTK_WINDOW(lw->window));
+ FileData *fd = file_data_new_group(lua_command[0]);
+ result = g_strdup(lua_callvalue(fd, lua_command[1], NULL));
+ if (result)
+ {
+ g_io_channel_write_chars(channel, result, -1, NULL, NULL);
+ }
+ else
+ {
+ g_io_channel_write_chars(channel, N_("lua error: no data"), -1, NULL, NULL);
+ }
}
+ else
+ {
+ g_io_channel_write_chars(channel, N_("lua error: no data"), -1, NULL, NULL);
+ }
+
+ g_io_channel_write_chars(channel, "\n", -1, NULL, NULL);
+
+ g_strfreev(lua_command);
+ g_free(result);
}
+#endif
typedef struct _RemoteCommandEntry RemoteCommandEntry;
struct _RemoteCommandEntry {
{ "-ss","--slideshow-start", gr_slideshow_start, FALSE, FALSE, NULL, N_("start slide show") },
{ "-sS","--slideshow-stop", gr_slideshow_stop, FALSE, FALSE, NULL, N_("stop slide show") },
{ NULL, "--slideshow-recurse:", gr_slideshow_start_rec, TRUE, FALSE, N_("<FOLDER>"), N_("start recursive slide show in FOLDER") },
- { "-d", "--delay=", gr_slideshow_delay, TRUE, FALSE, N_("<[N][.M]>"), N_("set slide show delay to N.M seconds") },
+ { "-d", "--delay=", gr_slideshow_delay, TRUE, FALSE, N_("<[H:][M:][N][.M]>"), N_("set slide show delay to Hrs Mins N.M seconds") },
{ "+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, "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, "--tell", gr_file_tell, FALSE, FALSE, NULL, N_("print filename 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, "--get-render-intent", gr_render_intent, FALSE, FALSE, NULL, N_("get render intent") },
{ NULL, "view:", gr_file_view, TRUE, FALSE, N_("<FILE>"), N_("open FILE in new window") },
{ NULL, "--list-clear", gr_list_clear, FALSE, FALSE, NULL, N_("clear command line collection list") },
{ NULL, "--list-add:", gr_list_add, TRUE, FALSE, N_("<FILE>"), N_("add FILE to command line collection list") },
{ NULL, "raise", gr_raise, FALSE, FALSE, NULL, N_("bring the Geeqie window to the top") },
+ { 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") },
{ "-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") },
{ "-crr:", "--cache-render-recurse:", gr_cache_render_recurse, TRUE, FALSE, N_("<folder> "), N_("render thumbnails recursively") },
{ "-crs:", "--cache-render-shared:", gr_cache_render_standard, TRUE, FALSE, N_("<folder> "), N_(" render thumbnails (see Help)") },
{ "-crsr:", "--cache-render-shared-recurse:", gr_cache_render_standard_recurse, TRUE, FALSE, N_("<folder>"), N_(" render thumbnails recursively (see Help)") },
- { NULL, NULL, NULL, FALSE, FALSE, NULL }
+#ifdef HAVE_LUA
+ { NULL, "--lua:", gr_lua, TRUE, FALSE, N_("<FILE>,<lua script>"), N_("run lua script on FILE") },
+#endif
+ { NULL, NULL, NULL, FALSE, FALSE, NULL, NULL }
};
static RemoteCommandEntry *remote_command_find(const gchar *text, const gchar **offset)
gchar *s_opt_param;
gchar *l_opt_param;
- print_term(_("Remote command list:\n"));
+ print_term(FALSE, _("Remote command list:\n"));
i = 0;
while (remote_commands[i].func != NULL)
{
s_opt_param = g_strconcat(remote_commands[i].opt_s, remote_commands[i].parameter, NULL);
l_opt_param = g_strconcat(remote_commands[i].opt_l, remote_commands[i].parameter, NULL);
- printf_term(" %-11s%-1s %-30s%-s\n",
+ printf_term(FALSE, " %-11s%-1s %-30s%-s\n",
(remote_commands[i].opt_s) ? s_opt_param : "",
(remote_commands[i].opt_s && remote_commands[i].opt_l) ? "," : " ",
(remote_commands[i].opt_l) ? l_opt_param : "",
}
i++;
}
- printf_term(N_("\n All other command line parameters are used as plain files if they exists.\n"));
+ printf_term(FALSE, N_("\n All other command line parameters are used as plain files if they exists.\n"));
}
GList *remote_build_list(GList *list, gint argc, gchar *argv[], GList **errors)
gint retry_count = 12;
gboolean blank = FALSE;
- printf_term(_("Remote %s not running, starting..."), GQ_APPNAME);
+ printf_term(FALSE, _("Remote %s not running, starting..."), GQ_APPNAME);
command = g_string_new(arg_exec);
{
usleep((retry_count > 10) ? 500000 : 1000000);
rc = remote_client_open(buf);
- if (!rc) print_term(".");
+ if (!rc) print_term(FALSE, ".");
retry_count--;
}
- print_term("\n");
+ print_term(FALSE, "\n");
started = TRUE;
}
}
else
{
- print_term(_("Remote not available\n"));
+ print_term(TRUE, _("Remote not available\n"));
}
_exit(0);
projects / geeqie.git / blobdiff