* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
#include "remote.h"
+#include <config.h>
+
#include "cache-maint.h"
-#include "collect.h"
#include "collect-io.h"
+#include "collect.h"
+#include "compat.h"
+#include "debug.h"
#include "exif.h"
#include "filedata.h"
#include "filefilter.h"
#include "image.h"
#include "img-view.h"
+#include "intl.h"
#include "layout-image.h"
#include "layout-util.h"
+#include "main-defines.h"
+#include "main.h"
#include "misc.h"
#include "pixbuf-renderer.h"
+#include "rcfile.h"
#include "slideshow.h"
#include "ui-fileops.h"
-#include "rcfile.h"
+#include "ui-misc.h"
+#include "utilops.h"
#include "view-file.h"
+#include <csignal>
#include <sys/socket.h>
#include <sys/un.h>
-#include <signal.h>
#include "glua.h"
-#define SERVER_MAX_CLIENTS 8
+enum {
+ SERVER_MAX_CLIENTS = 8
+};
-#define REMOTE_SERVER_BACKLOG 4
+enum {
+ REMOTE_SERVER_BACKLOG = 4
+};
#ifndef UNIX_PATH_MAX
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 */
+static LayoutWindow *lw_id = nullptr; /* points to the window set by the --id option */
-typedef struct _RemoteClient RemoteClient;
-struct _RemoteClient {
+struct RemoteClient {
gint fd;
guint channel_id; /* event source id */
RemoteConnection *rc;
};
-typedef struct _RemoteData RemoteData;
-struct _RemoteData {
+struct RemoteData {
CollectionData *command_collection;
GList *file_list;
gboolean single_dir;
* command was made from. Some remote commands require this. The
* value is stored here
*/
-static gchar *pwd = NULL;
+static gchar *pwd = nullptr;
/**
* @brief Ensures file path is absolute.
* @param[in] filename Filepath, absolute or relative to calling directory
* @returns absolute path
- *
+ *
* If first character of input filepath is not the directory
* separator, assume it as a relative path and prepend
* the directory the remote command was initiated from
- *
+ *
* Return value must be freed with g_free()
*/
static gchar *set_pwd(gchar *filename)
static gboolean remote_server_client_cb(GIOChannel *source, GIOCondition condition, gpointer data)
{
- RemoteClient *client = data;
+ auto client = static_cast<RemoteClient *>(data);
RemoteConnection *rc;
GIOStatus status = G_IO_STATUS_NORMAL;
- lw_id = NULL;
+ lw_id = nullptr;
rc = client->rc;
if (condition & G_IO_IN)
{
- gchar *buffer = NULL;
- GError *error = NULL;
+ gchar *buffer = nullptr;
+ GError *error = nullptr;
gsize termpos;
/** @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)
+ while ((status = g_io_channel_read_line(source, &buffer, nullptr, &termpos, &error)) == G_IO_STATUS_NORMAL)
{
if (buffer)
{
if (strlen(buffer) > 0)
{
if (rc->read_func) rc->read_func(rc, buffer, source, rc->read_data);
- g_io_channel_write_chars(source, "<gq_end_of_command>", -1, NULL, NULL); /* empty line finishes the command */
- g_io_channel_flush(source, NULL);
+ g_io_channel_write_chars(source, "<gq_end_of_command>", -1, nullptr, nullptr); /* empty line finishes the command */
+ g_io_channel_flush(source, nullptr);
}
g_free(buffer);
- buffer = NULL;
+ buffer = nullptr;
}
}
client->fd = fd;
channel = g_io_channel_unix_new(fd);
- client->channel_id = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, G_IO_IN | G_IO_HUP,
- remote_server_client_cb, client, NULL);
+ client->channel_id = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, static_cast<GIOCondition>(G_IO_IN | G_IO_HUP),
+ remote_server_client_cb, client, nullptr);
g_io_channel_unref(channel);
rc->clients = g_list_append(rc->clients, client);
{
while (rc->clients)
{
- RemoteClient *client = rc->clients->data;
+ auto client = static_cast<RemoteClient *>(rc->clients->data);
rc->clients = g_list_remove(rc->clients, client);
}
}
-static gboolean remote_server_read_cb(GIOChannel *UNUSED(source), GIOCondition UNUSED(condition), gpointer data)
+static gboolean remote_server_read_cb(GIOChannel *, GIOCondition, gpointer data)
{
- RemoteConnection *rc = data;
+ auto rc = static_cast<RemoteConnection *>(data);
gint fd;
guint alen;
- fd = accept(rc->fd, NULL, &alen);
+ fd = accept(rc->fd, nullptr, &alen);
if (fd == -1)
{
log_printf("error accepting socket: %s\n", strerror(errno));
{
RemoteConnection *rc;
struct sockaddr_un addr;
- gint sun_path_len;
gint fd;
GIOChannel *channel;
+ if (strlen(path) >= sizeof(addr.sun_path))
+ {
+ log_printf("Address is too long: %s\n", path);
+ return nullptr;
+ }
+
if (remote_server_exists(path))
{
log_printf("Address already in use: %s\n", path);
- return NULL;
+ return nullptr;
}
fd = socket(PF_UNIX, SOCK_STREAM, 0);
- if (fd == -1) return NULL;
+ if (fd == -1) return nullptr;
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, (const struct sockaddr*)&addr, sizeof(addr)) == -1 ||
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+ strncpy(addr.sun_path, path, sizeof(addr.sun_path));
+#pragma GCC diagnostic pop
+ if (bind(fd, reinterpret_cast<const struct sockaddr*>(&addr), sizeof(addr)) == -1 ||
listen(fd, REMOTE_SERVER_BACKLOG) == -1)
{
log_printf("error subscribing to socket: %s\n", strerror(errno));
close(fd);
- return NULL;
+ return nullptr;
}
rc = g_new0(RemoteConnection, 1);
rc->path = g_strdup(path);
channel = g_io_channel_unix_new(rc->fd);
- g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, NULL);
+ g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, nullptr);
rc->channel_id = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, G_IO_IN,
- remote_server_read_cb, rc, NULL);
+ remote_server_read_cb, rc, nullptr);
g_io_channel_unref(channel);
return rc;
}
-static void remote_server_subscribe(RemoteConnection *rc, RemoteReadFunc *func, gpointer data)
+static void remote_server_subscribe(RemoteConnection *rc, RemoteConnection::ReadFunc *func, gpointer data)
{
if (!rc || !rc->server) return;
RemoteConnection *rc;
struct stat st;
struct sockaddr_un addr;
- gint sun_path_len;
gint fd;
- if (stat(path, &st) != 0 || !S_ISSOCK(st.st_mode)) return NULL;
+ if (strlen(path) >= sizeof(addr.sun_path)) return nullptr;
+
+ if (stat(path, &st) != 0 || !S_ISSOCK(st.st_mode)) return nullptr;
fd = socket(PF_UNIX, SOCK_STREAM, 0);
- if (fd == -1) return NULL;
+ if (fd == -1) return nullptr;
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, (struct sockaddr*)&addr, sizeof(addr)) == -1)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+ strncpy(addr.sun_path, path, sizeof(addr.sun_path));
+#pragma GCC diagnostic pop
+ if (connect(fd, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr)) == -1)
{
DEBUG_1("error connecting to socket: %s", strerror(errno));
close(fd);
- return NULL;
+ return nullptr;
}
rc = g_new0(RemoteConnection, 1);
static sig_atomic_t sigpipe_occurred = FALSE;
-static void sighandler_sigpipe(gint UNUSED(sig))
+static void sighandler_sigpipe(gint)
{
sigpipe_occurred = TRUE;
}
static gboolean remote_client_send(RemoteConnection *rc, const gchar *text)
{
- struct sigaction new_action, old_action;
+ struct sigaction new_action;
+ struct sigaction old_action;
gboolean ret = FALSE;
- GError *error = NULL;
+ GError *error = nullptr;
GIOChannel *channel;
if (!rc || rc->server) return FALSE;
channel = g_io_channel_unix_new(rc->fd);
- g_io_channel_write_chars(channel, text, -1, NULL, &error);
- g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, &error);
+ g_io_channel_write_chars(channel, text, -1, nullptr, &error);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, &error);
g_io_channel_flush(channel, &error);
if (error)
if (ret)
{
- gchar *buffer = NULL;
+ gchar *buffer = nullptr;
gsize termpos;
g_io_channel_set_line_term(channel, "<gq_end_of_command>", -1);
- while (g_io_channel_read_line(channel, &buffer, NULL, &termpos, &error) == G_IO_STATUS_NORMAL)
+ while (g_io_channel_read_line(channel, &buffer, nullptr, &termpos, &error) == G_IO_STATUS_NORMAL)
{
if (buffer)
{
break;
}
buffer[termpos] = '\0';
- if (g_strstr_len(buffer, -1, "print0") != 0)
+ if (g_strstr_len(buffer, -1, "print0") != nullptr)
{
print0 = TRUE;
}
}
}
g_free(buffer);
- buffer = NULL;
+ buffer = nullptr;
}
}
/* restore the original signal handler */
- sigaction(SIGPIPE, &old_action, NULL);
+ sigaction(SIGPIPE, &old_action, nullptr);
g_io_channel_unref(channel);
return ret;
}
*-----------------------------------------------------------------------------
*/
-static void gr_image_next(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_image_next(const gchar *, GIOChannel *, gpointer)
{
layout_image_next(lw_id);
}
-static void gr_new_window(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_new_window(const gchar *, GIOChannel *, gpointer)
{
- LayoutWindow *lw = NULL;
+ LayoutWindow *lw = nullptr;
if (!layout_valid(&lw)) return;
layout_set_path(lw_id, pwd);
}
-static gboolean gr_close_window_cb()
+static gboolean gr_close_window_cb(gpointer)
{
if (!layout_valid(&lw_id)) return FALSE;
- layout_menu_close_cb(NULL, lw_id);
+ layout_menu_close_cb(nullptr, lw_id);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
-static void gr_close_window(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_close_window(const gchar *, GIOChannel *, gpointer)
{
- g_idle_add(gr_close_window_cb, NULL);
+ g_idle_add((gr_close_window_cb), nullptr);
}
-static void gr_image_prev(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_image_prev(const gchar *, GIOChannel *, gpointer)
{
layout_image_prev(lw_id);
}
-static void gr_image_first(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_image_first(const gchar *, GIOChannel *, gpointer)
{
layout_image_first(lw_id);
}
-static void gr_image_last(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_image_last(const gchar *, GIOChannel *, gpointer)
{
layout_image_last(lw_id);
}
-static void gr_fullscreen_toggle(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_fullscreen_toggle(const gchar *, GIOChannel *, gpointer)
{
layout_image_full_screen_toggle(lw_id);
}
-static void gr_fullscreen_start(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_fullscreen_start(const gchar *, GIOChannel *, gpointer)
{
layout_image_full_screen_start(lw_id);
}
-static void gr_fullscreen_stop(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_fullscreen_stop(const gchar *, GIOChannel *, gpointer)
{
layout_image_full_screen_stop(lw_id);
}
-static void gr_lw_id(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_lw_id(const gchar *text, GIOChannel *, gpointer)
{
lw_id = layout_find_by_layout_id(text);
if (!lw_id)
layout_valid(&lw_id);
}
-static void gr_slideshow_start_rec(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_slideshow_start_rec(const gchar *text, GIOChannel *, gpointer)
{
GList *list;
gchar *tilde_filename;
g_free(tilde_filename);
layout_valid(&lw_id);
- list = filelist_recursive_full(dir_fd, lw_id->sort_method, lw_id->sort_ascend);
+ list = filelist_recursive_full(dir_fd, lw_id->options.file_view_list_sort.method, lw_id->options.file_view_list_sort.ascend, lw_id->options.file_view_list_sort.case_sensitive);
file_data_unref(dir_fd);
if (!list) return;
-//printf("length: %d\n", g_list_length(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 *UNUSED(channel), gpointer UNUSED(data))
+static void gr_cache_thumb(const gchar *text, GIOChannel *, gpointer)
{
if (!g_strcmp0(text, "clear"))
{
- cache_maintain_home_remote(FALSE, TRUE, NULL);
+ cache_maintain_home_remote(FALSE, TRUE, nullptr);
}
else if (!g_strcmp0(text, "clean"))
{
- cache_maintain_home_remote(FALSE, FALSE, NULL);
+ cache_maintain_home_remote(FALSE, FALSE, nullptr);
}
}
-static void gr_cache_shared(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_cache_shared(const gchar *text, GIOChannel *, gpointer)
{
if (!g_strcmp0(text, "clear"))
cache_manager_standard_process_remote(TRUE);
cache_manager_standard_process_remote(FALSE);
}
-static void gr_cache_metadata(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_cache_metadata(const gchar *, GIOChannel *, gpointer)
{
- cache_maintain_home_remote(TRUE, FALSE, NULL);
+ cache_maintain_home_remote(TRUE, FALSE, nullptr);
}
-static void gr_cache_render(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_cache_render(const gchar *text, GIOChannel *, gpointer)
{
- cache_manager_render_remote(text, FALSE, FALSE, NULL);
+ cache_manager_render_remote(text, FALSE, FALSE, nullptr);
}
-static void gr_cache_render_recurse(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_cache_render_recurse(const gchar *text, GIOChannel *, gpointer)
{
- cache_manager_render_remote(text, TRUE, FALSE, NULL);
+ cache_manager_render_remote(text, TRUE, FALSE, nullptr);
}
-static void gr_cache_render_standard(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_cache_render_standard(const gchar *text, GIOChannel *, gpointer)
{
if(options->thumbnails.spec_standard)
{
- cache_manager_render_remote(text, FALSE, TRUE, NULL);
+ cache_manager_render_remote(text, FALSE, TRUE, nullptr);
}
}
-static void gr_cache_render_standard_recurse(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_cache_render_standard_recurse(const gchar *text, GIOChannel *, gpointer)
{
if(options->thumbnails.spec_standard)
{
- cache_manager_render_remote(text, TRUE, TRUE, NULL);
+ cache_manager_render_remote(text, TRUE, TRUE, nullptr);
}
}
-static void gr_slideshow_toggle(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_slideshow_toggle(const gchar *, GIOChannel *, gpointer)
{
layout_image_slideshow_toggle(lw_id);
}
-static void gr_slideshow_start(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_slideshow_start(const gchar *, GIOChannel *, gpointer)
{
layout_image_slideshow_start(lw_id);
}
-static void gr_slideshow_stop(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_slideshow_stop(const gchar *, GIOChannel *, gpointer)
{
layout_image_slideshow_stop(lw_id);
}
-static void gr_slideshow_delay(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_slideshow_delay(const gchar *text, GIOChannel *, gpointer)
{
- gdouble t1, t2, t3, n;
+ gdouble t1;
+ gdouble t2;
+ gdouble t3;
+ gdouble n;
gint res;
res = sscanf(text, "%lf:%lf:%lf", &t1, &t2, &t3);
n = 0;
}
- options->slideshow.delay = (gint)(n * 10.0 + 0.01);
+ options->slideshow.delay = static_cast<gint>(n * 10.0 + 0.01);
}
-static void gr_tools_show(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_tools_show(const gchar *, GIOChannel *, gpointer)
{
gboolean popped;
gboolean hidden;
}
}
-static void gr_tools_hide(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_tools_hide(const gchar *, GIOChannel *, gpointer)
{
gboolean popped;
gboolean hidden;
}
}
-static gboolean gr_quit_idle_cb(gpointer UNUSED(data))
+static gboolean gr_quit_idle_cb(gpointer)
{
exit_program();
- return FALSE;
+ return G_SOURCE_REMOVE;
}
-static void gr_quit(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_quit(const gchar *, GIOChannel *, gpointer)
{
/* schedule exit when idle, if done from within a
* remote handler remote_close will crash
*/
- g_idle_add(gr_quit_idle_cb, NULL);
+ g_idle_add(gr_quit_idle_cb, nullptr);
}
-static void gr_file_load_no_raise(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_file_load_no_raise(const gchar *text, GIOChannel *, gpointer)
{
gchar *filename;
gchar *tilde_filename;
- if (!download_web_file(text, TRUE, NULL))
+ if (!download_web_file(text, TRUE, nullptr))
{
tilde_filename = expand_tilde(text);
filename = set_pwd(tilde_filename);
gr_raise(text, channel, data);
}
-static void gr_pixel_info(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
+static void gr_pixel_info(const gchar *, GIOChannel *channel, gpointer)
{
gchar *pixel_info;
- gint x_pixel, y_pixel;
- gint width, height;
- gint r_mouse, g_mouse, b_mouse;
+ gint x_pixel;
+ gint y_pixel;
+ gint width;
+ gint height;
+ gint r_mouse;
+ gint g_mouse;
+ gint b_mouse;
PixbufRenderer *pr;
if (!layout_valid(&lw_id)) return;
- pr = (PixbufRenderer*)lw_id->image->pr;
+ pr = reinterpret_cast<PixbufRenderer*>(lw_id->image->pr);
if (pr)
{
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, "<gq_end_of_command>", -1, NULL, NULL);
+ g_io_channel_write_chars(channel, pixel_info, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
g_free(pixel_info);
}
}
}
-static void gr_rectangle(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
+static void gr_rectangle(const gchar *, GIOChannel *channel, gpointer)
{
gchar *rectangle_info;
PixbufRenderer *pr;
- gint x1, y1, x2, y2;
+ gint x1;
+ gint y1;
+ gint x2;
+ gint y2;
if (!options->draw_rectangle) return;
if (!layout_valid(&lw_id)) return;
- pr = (PixbufRenderer*)lw_id->image->pr;
+ pr = reinterpret_cast<PixbufRenderer*>(lw_id->image->pr);
if (pr)
{
(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, "<gq_end_of_command>", -1, NULL, NULL);
+ g_io_channel_write_chars(channel, rectangle_info, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
g_free(rectangle_info);
}
}
-static void gr_render_intent(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
+static void gr_render_intent(const gchar *, GIOChannel *channel, gpointer)
{
gchar *render_intent;
break;
}
- g_io_channel_write_chars(channel, render_intent, -1, NULL, NULL);
- g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
+ g_io_channel_write_chars(channel, render_intent, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
g_free(render_intent);
}
static void get_filelist(const gchar *text, GIOChannel *channel, gboolean recurse)
{
- GList *list = NULL;
+ GList *list = nullptr;
FileFormatClass format_class;
FileData *dir_fd;
FileData *fd;
- GString *out_string = g_string_new(NULL);
GList *work;
gchar *tilde_filename;
}
else
{
- filelist_read(dir_fd, &list, NULL);
+ filelist_read(dir_fd, &list, nullptr);
}
+ GString *out_string = g_string_new(nullptr);
work = list;
while (work)
{
- fd = work->data;
- g_string_append_printf(out_string, "%s", fd->path);
+ fd = static_cast<FileData *>(work->data);
+ g_string_append(out_string, fd->path);
format_class = filter_file_get_class(fd->path);
switch (format_class)
work = work->next;
}
- 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_io_channel_write_chars(channel, out_string->str, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
g_string_free(out_string, TRUE);
filelist_free(list);
file_data_unref(dir_fd);
}
-static void gr_get_selection(const gchar *UNUSED(text), GIOChannel *channel, gboolean UNUSED(data))
+static void gr_get_selection(const gchar *, GIOChannel *channel, gpointer)
{
if (!layout_valid(&lw_id)) return;
GList *selected = layout_selection_list(lw_id); // Keep copy to free.
- GString *out_string = g_string_new(NULL);
+ GString *out_string = g_string_new(nullptr);
GList *work = selected;
while (work)
{
- FileData *fd = work->data;
+ auto fd = static_cast<FileData *>(work->data);
g_assert(fd->magick == FD_MAGICK);
g_string_append_printf(out_string, "%s %s\n",
work = work->next;
}
- 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_io_channel_write_chars(channel, out_string->str, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
filelist_free(selected);
g_string_free(out_string, TRUE);
}
-static void gr_selection_add(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_selection_add(const gchar *text, GIOChannel *, gpointer)
{
if (!layout_valid(&lw_id)) return;
- FileData *fd_to_select = NULL;
+ FileData *fd_to_select = nullptr;
if (strcmp(text, "") == 0)
{
// No file specified, use current fd.
GList *file_list = layout_list(lw_id);
for (GList *work = file_list; work && !fd_to_select; work = work->next)
{
- FileData *fd = work->data;
+ auto fd = static_cast<FileData *>(work->data);
if (!strcmp(path, fd->path) || g_str_has_suffix(fd->path, slash_plus_filename))
{
fd_to_select = file_data_ref(fd);
for (GList *sidecar = fd->sidecar_files; sidecar && !fd_to_select; sidecar = sidecar->next)
{
- FileData *side_fd = sidecar->data;
+ auto side_fd = static_cast<FileData *>(sidecar->data);
if (!strcmp(path, side_fd->path)
|| g_str_has_suffix(side_fd->path, slash_plus_filename))
{
if (fd_to_select)
{
- GList *to_select = g_list_append(NULL, fd_to_select);
+ GList *to_select = g_list_append(nullptr, fd_to_select);
// Using the "_list" variant doesn't clear the existing selection.
layout_select_list(lw_id, to_select);
filelist_free(to_select);
}
}
-static void gr_selection_clear(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_selection_clear(const gchar *, GIOChannel *, gpointer)
{
layout_select_none(lw_id); // Checks lw_id validity internally.
}
-static void gr_selection_remove(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_selection_remove(const gchar *text, GIOChannel *, gpointer)
{
if (!layout_valid(&lw_id)) return;
return;
}
- FileData *fd_to_deselect = NULL;
- gchar *path = NULL;
- gchar *filename = NULL;
- gchar *slash_plus_filename = NULL;
+ FileData *fd_to_deselect = nullptr;
+ gchar *path = nullptr;
+ gchar *filename = nullptr;
+ gchar *slash_plus_filename = nullptr;
if (strcmp(text, "") == 0)
{
// No file specified, use current fd.
slash_plus_filename = g_strdup_printf("%s%s", G_DIR_SEPARATOR_S, filename);
}
- GList *prior_link = NULL; // Stash base for link removal to avoid a second traversal.
- GList *link_to_remove = NULL;
+ GList *prior_link = nullptr; // Stash base for link removal to avoid a second traversal.
+ GList *link_to_remove = nullptr;
for (GList *work = selected; work; prior_link = work, work = work->next)
{
- FileData *fd = work->data;
+ auto fd = static_cast<FileData *>(work->data);
if (fd_to_deselect)
{
if (fd == fd_to_deselect)
// Remove first link.
selected = g_list_remove_link(selected, link_to_remove);
filelist_free(link_to_remove);
- link_to_remove = NULL;
+ link_to_remove = nullptr;
}
else
{
// Remove a subsequent link.
prior_link = g_list_remove_link(prior_link, link_to_remove);
filelist_free(link_to_remove);
- link_to_remove = NULL;
+ link_to_remove = nullptr;
}
// Re-select all but the deselected item.
g_free(path);
}
-static void gr_collection(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
+static void gr_collection(const gchar *text, GIOChannel *channel, gpointer)
{
- GString *contents = g_string_new(NULL);
+ GString *contents = g_string_new(nullptr);
if (is_collection(text))
{
return;
}
- g_io_channel_write_chars(channel, contents->str, -1, NULL, NULL);
- g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
+ g_io_channel_write_chars(channel, contents->str, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
g_string_free(contents, TRUE);
}
-static void gr_collection_list(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
+static void gr_collection_list(const gchar *, GIOChannel *channel, gpointer)
{
- GList *collection_list = NULL;
+ GList *collection_list = nullptr;
GList *work;
- GString *out_string = g_string_new(NULL);
+ GString *out_string = g_string_new(nullptr);
- collect_manager_list(&collection_list, NULL, NULL);
+ collect_manager_list(&collection_list, nullptr, nullptr);
work = collection_list;
while (work)
{
- const gchar *collection_name = work->data;
- out_string = g_string_append(out_string, g_strdup(collection_name));
+ auto collection_name = static_cast<const gchar *>(work->data);
+ out_string = g_string_append(out_string, collection_name);
out_string = g_string_append(out_string, "\n");
work = work->next;
}
- 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_io_channel_write_chars(channel, out_string->str, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
- string_list_free(collection_list);
+ g_list_free_full(collection_list, g_free);
g_string_free(out_string, TRUE);
}
-static gboolean wait_cb(const gpointer data)
+static gboolean wait_cb(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);
+ gq_gtk_window_move(GTK_WINDOW(lw_id->window), x, y);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
-static void gr_geometry(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_geometry(const gchar *text, GIOChannel *, gpointer)
{
gchar **geometry;
if (text[0] == '+')
{
geometry = g_strsplit_set(text, "+", 3);
- if (geometry[1] != NULL && geometry[2] != NULL )
+ if (geometry[1] != nullptr && geometry[2] != nullptr )
{
- gtk_window_move(GTK_WINDOW(lw_id->window), atoi(geometry[1]), atoi(geometry[2]));
+ gq_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)
+ if (geometry[0] != nullptr && geometry[1] != nullptr)
{
gtk_window_resize(GTK_WINDOW(lw_id->window), atoi(geometry[0]), atoi(geometry[1]));
}
- if (geometry[2] != NULL && geometry[3] != NULL)
+ if (geometry[2] != nullptr && geometry[3] != nullptr)
{
/* 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 UNUSED(data))
+static void gr_filelist(const gchar *text, GIOChannel *channel, gpointer)
{
get_filelist(text, channel, FALSE);
}
-static void gr_filelist_recurse(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
+static void gr_filelist_recurse(const gchar *text, GIOChannel *channel, gpointer)
{
get_filelist(text, channel, TRUE);
}
-static void gr_file_tell(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
+static void gr_file_tell(const gchar *, GIOChannel *channel, gpointer)
{
gchar *out_string;
- gchar *collection_name = NULL;
+ gchar *collection_name = nullptr;
if (!layout_valid(&lw_id)) return;
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, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
g_free(collection_name);
g_free(out_string);
}
-static void gr_file_info(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
+static void gr_file_info(const gchar *, GIOChannel *channel, gpointer)
{
gchar *filename;
FileData *fd;
{
filename = g_strdup(image_get_path(lw_id->image));
fd = file_data_new_group(filename);
- out_string = g_string_new(NULL);
+ out_string = g_string_new(nullptr);
- format_class = filter_file_get_class(image_get_path(lw_id->image));
- if (format_class)
+ if (fd->pixbuf)
+ {
+ format_class = filter_file_get_class(image_get_path(lw_id->image));
+ }
+ else
{
- g_string_append_printf(out_string, _("Class: %s\n"), format_class_list[format_class]);
+ format_class = FORMAT_CLASS_UNKNOWN;
}
+ g_string_append_printf(out_string, _("Class: %s\n"), format_class_list[format_class]);
+
if (fd->page_total > 1)
{
g_string_append_printf(out_string, _("Page no: %d/%d\n"), fd->page_num + 1, fd->page_total);
}
}
- 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_io_channel_write_chars(channel, out_string->str, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
g_string_free(out_string, TRUE);
file_data_unref(fd);
static gchar *config_file_path(const gchar *param)
{
- gchar *path = NULL;
- gchar *full_name = NULL;
+ gchar *path = nullptr;
+ gchar *full_name = nullptr;
if (file_extension_match(param, ".xml"))
{
path = g_build_filename(get_window_layouts_dir(), param, NULL);
}
- else if (file_extension_match(param, NULL))
+ else if (file_extension_match(param, nullptr))
{
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;
+ path = nullptr;
}
g_free(full_name);
static gboolean is_config_file(const gchar *param)
{
- gchar *name = NULL;
+ gchar *name = nullptr;
name = config_file_path(param);
if (name)
return FALSE;
}
-static void gr_config_load(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_config_load(const gchar *text, GIOChannel *, gpointer)
{
gchar *filename = expand_tilde(text);
else
{
log_printf("remote sent filename that does not exist:\"%s\"\n", filename);
- layout_set_path(NULL, homedir());
+ layout_set_path(nullptr, homedir());
}
g_free(filename);
}
-static void gr_get_sidecars(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
+static void gr_get_sidecars(const gchar *text, GIOChannel *channel, gpointer)
{
gchar *filename = expand_tilde(text);
FileData *fd = file_data_new_group(filename);
GList *work;
if (fd->parent) fd = fd->parent;
- g_io_channel_write_chars(channel, fd->path, -1, NULL, NULL);
- g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
+ g_io_channel_write_chars(channel, fd->path, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
work = fd->sidecar_files;
while (work)
{
- fd = work->data;
+ fd = static_cast<FileData *>(work->data);
work = work->next;
- g_io_channel_write_chars(channel, fd->path, -1, NULL, NULL);
- g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
+ g_io_channel_write_chars(channel, fd->path, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
}
g_free(filename);
}
-static void gr_get_destination(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
+static void gr_get_destination(const gchar *text, GIOChannel *channel, gpointer)
{
gchar *filename = expand_tilde(text);
FileData *fd = file_data_new_group(filename);
if (fd->change && fd->change->dest)
{
- g_io_channel_write_chars(channel, fd->change->dest, -1, NULL, NULL);
- g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
+ g_io_channel_write_chars(channel, fd->change->dest, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
}
g_free(filename);
}
-static void gr_file_view(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_file_view(const gchar *text, GIOChannel *, gpointer)
{
gchar *filename;
gchar *tilde_filename = expand_tilde(text);
g_free(tilde_filename);
}
-static void gr_list_clear(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer data)
+static void gr_list_clear(const gchar *, GIOChannel *, gpointer data)
{
- RemoteData *remote_data = data;
+ auto remote_data = static_cast<RemoteData *>(data);
- remote_data->command_collection = NULL;
- remote_data->file_list = NULL;
+ remote_data->command_collection = nullptr;
+ remote_data->file_list = nullptr;
remote_data->single_dir = TRUE;
}
-static void gr_list_add(const gchar *text, GIOChannel *UNUSED(channel), gpointer data)
+static void gr_list_add(const gchar *text, GIOChannel *, gpointer data)
{
- RemoteData *remote_data = data;
+ auto remote_data = static_cast<RemoteData *>(data);
gboolean is_new = TRUE;
- gchar *path = NULL;
+ gchar *path = nullptr;
FileData *fd;
FileData *first;
while (work && remote_data->single_dir)
{
gchar *dirname;
- dirname = g_path_get_dirname(((FileData *)work->data)->path);
+ dirname = g_path_get_dirname((static_cast<FileData *>(work->data))->path);
if (!path)
{
path = g_strdup(dirname);
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);
+ first = static_cast<FileData *>(g_list_first(vf_selection_get_list(lw_id->vf))->data);
layout_set_fd(lw_id, first);
CollectionData *cd;
if (!remote_data->command_collection && !remote_data->single_dir)
{
- cw = collection_window_new(NULL);
+ cw = collection_window_new(nullptr);
cd = cw->cd;
collection_path_changed(cd);
}
}
-static void gr_raise(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_action(const gchar *text, GIOChannel *, gpointer)
+{
+ GtkAction *action;
+
+ if (!layout_valid(&lw_id))
+ {
+ return;
+ }
+
+ if (g_strstr_len(text, -1, ".desktop") != nullptr)
+ {
+ file_util_start_editor_from_filelist(text, layout_selection_list(lw_id), layout_get_path(lw_id), lw_id->window);
+ }
+ else
+ {
+ action = gtk_action_group_get_action(lw_id->action_group, text);
+ if (action)
+ {
+ gtk_action_activate(action);
+ }
+ else
+ {
+ log_printf("Action %s unknown", text);
+ }
+ }
+}
+
+static void gr_action_list(const gchar *, GIOChannel *channel, gpointer)
+{
+ ActionItem *action_item;
+ gint max_length = 0;
+ GList *list = nullptr;
+ GString *out_string = g_string_new(nullptr);
+
+ if (!layout_valid(&lw_id))
+ {
+ return;
+ }
+
+ list = get_action_items();
+
+ /* Get the length required for padding */
+ for (GList *work = list; work; work = work->next)
+ {
+ action_item = static_cast<ActionItem *>(work->data);
+ const auto length = g_utf8_strlen(action_item->name, -1);
+ max_length = MAX(length, max_length);
+ }
+
+ /* Pad the action names to the same column for readable output */
+ for (GList *work = list; work; work = work->next)
+ {
+ action_item = static_cast<ActionItem *>(work->data);
+
+ g_string_append_printf(out_string, "%-*s", max_length + 4, action_item->name);
+ out_string = g_string_append(out_string, action_item->label);
+ out_string = g_string_append(out_string, "\n");
+ }
+
+ action_items_free(list);
+
+ g_io_channel_write_chars(channel, out_string->str, -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
+
+ g_string_free(out_string, TRUE);
+}
+
+static void gr_raise(const gchar *, GIOChannel *, gpointer)
{
if (layout_valid(&lw_id))
{
}
}
-static void gr_pwd(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
+static void gr_pwd(const gchar *text, GIOChannel *, gpointer)
{
- LayoutWindow *lw = NULL;
+ LayoutWindow *lw = nullptr;
layout_valid(&lw);
lw_id = lw;
}
-static void gr_print0(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
+static void gr_print0(const gchar *, GIOChannel *channel, gpointer)
{
- g_io_channel_write_chars(channel, "print0", -1, NULL, NULL);
- g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
+ g_io_channel_write_chars(channel, "print0", -1, nullptr, nullptr);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
}
#ifdef HAVE_LUA
-static void gr_lua(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
+static void gr_lua(const gchar *text, GIOChannel *channel, gpointer)
{
- gchar *result = NULL;
+ gchar *result = nullptr;
gchar **lua_command;
lua_command = g_strsplit(text, ",", 2);
if (lua_command[0] && lua_command[1])
{
FileData *fd = file_data_new_group(lua_command[0]);
- result = g_strdup(lua_callvalue(fd, lua_command[1], NULL));
+ result = g_strdup(lua_callvalue(fd, lua_command[1], nullptr));
if (result)
{
- g_io_channel_write_chars(channel, result, -1, NULL, NULL);
+ g_io_channel_write_chars(channel, result, -1, nullptr, nullptr);
}
else
{
- g_io_channel_write_chars(channel, N_("lua error: no data"), -1, NULL, NULL);
+ g_io_channel_write_chars(channel, N_("lua error: no data"), -1, nullptr, nullptr);
}
}
else
{
- g_io_channel_write_chars(channel, N_("lua error: no data"), -1, NULL, NULL);
+ g_io_channel_write_chars(channel, N_("lua error: no data"), -1, nullptr, nullptr);
}
- g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
+ g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, nullptr, nullptr);
g_strfreev(lua_command);
g_free(result);
}
#endif
-typedef struct _RemoteCommandEntry RemoteCommandEntry;
-struct _RemoteCommandEntry {
- gchar *opt_s;
- gchar *opt_l;
+struct RemoteCommandEntry {
+ const gchar *opt_s;
+ const gchar *opt_l;
void (*func)(const gchar *text, GIOChannel *channel, gpointer data);
gboolean needs_extra;
gboolean prefer_command_line;
- gchar *parameter;
- gchar *description;
+ const gchar *parameter;
+ const gchar *description;
};
static RemoteCommandEntry remote_commands[] = {
/* short, long callback, extra, prefer, parameter, description */
- { "-b", "--back", gr_image_prev, FALSE, FALSE, NULL, N_("previous image") },
- { NULL, "--close-window", gr_close_window, FALSE, FALSE, NULL, N_("close window") },
- { NULL, "--config-load:", gr_config_load, TRUE, FALSE, N_("<FILE>|layout ID"), N_("load configuration from FILE") },
- { "-cm","--cache-metadata", gr_cache_metadata, FALSE, FALSE, NULL, N_("clean the metadata cache") },
+ { nullptr, "--action:", gr_action, TRUE, FALSE, N_("<ACTION>"), N_("execute keyboard action (See Help/Reference/Remote Keyboard Actions)") },
+ { nullptr, "--action-list", gr_action_list, FALSE, FALSE, nullptr, N_("list available keyboard actions (some are redundant)") },
+ { "-b", "--back", gr_image_prev, FALSE, FALSE, nullptr, N_("previous image") },
+ { nullptr, "--close-window", gr_close_window, FALSE, FALSE, nullptr, N_("close window") },
+ { nullptr, "--config-load:", gr_config_load, TRUE, FALSE, N_("<FILE>|layout ID"), N_("load configuration from FILE") },
+ { "-cm","--cache-metadata", gr_cache_metadata, FALSE, FALSE, nullptr, N_("clean the metadata cache") },
{ "-cr:", "--cache-render:", gr_cache_render, TRUE, FALSE, N_("<folder> "), N_(" render thumbnails") },
{ "-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)") },
{ "-cs:", "--cache-shared:", gr_cache_shared, TRUE, FALSE, N_("clear|clean"), N_("clear or clean shared thumbnail cache") },
{ "-ct:", "--cache-thumbs:", gr_cache_thumb, TRUE, FALSE, N_("clear|clean"), N_("clear or clean thumbnail cache") },
{ "-d", "--delay=", gr_slideshow_delay, TRUE, FALSE, N_("<[H:][M:][N][.M]>"), N_("set slide show delay to Hrs Mins N.M seconds") },
- { NULL, "--first", gr_image_first, FALSE, FALSE, NULL, N_("first image") },
- { "-f", "--fullscreen", gr_fullscreen_toggle, FALSE, TRUE, NULL, N_("toggle full screen") },
- { 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") },
- { "-fs","--fullscreen-start", gr_fullscreen_start, FALSE, FALSE, NULL, N_("start full screen") },
- { "-fS","--fullscreen-stop", gr_fullscreen_stop, FALSE, FALSE, NULL, N_("stop full screen") },
- { NULL, "--geometry=", gr_geometry, TRUE, FALSE, N_("<GEOMETRY>"), N_("set window geometry") },
- { NULL, "--get-collection:", gr_collection, TRUE, FALSE, N_("<COLLECTION>"), N_("get collection content") },
- { NULL, "--get-collection-list", gr_collection_list, FALSE, FALSE, NULL, N_("get collection list") },
- { NULL, "--get-destination:", gr_get_destination, TRUE, FALSE, N_("<FILE>"), N_("get destination path of FILE (See Plugins Configuration)") },
- { NULL, "--get-file-info", gr_file_info, FALSE, FALSE, NULL, N_("get file info") },
- { NULL, "--get-filelist:", gr_filelist, TRUE, FALSE, N_("[<FOLDER>]"), N_("get list of files and class") },
- { NULL, "--get-filelist-recurse:", gr_filelist_recurse, TRUE, FALSE, N_("[<FOLDER>]"), N_("get list of files and class recursive") },
- { 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, "--get-selection", gr_get_selection, FALSE, FALSE, NULL, N_("get list of selected files") },
- { NULL, "--get-sidecars:", gr_get_sidecars, TRUE, FALSE, N_("<FILE>"), N_("get list of sidecars of FILE") },
- { NULL, "--id:", gr_lw_id, TRUE, FALSE, N_("<ID>"), N_("window id for following commands") },
- { NULL, "--last", gr_image_last, FALSE, FALSE, NULL, N_("last image") },
- { NULL, "--list-add:", gr_list_add, TRUE, FALSE, N_("<FILE>"), N_("add FILE to command line collection list") },
- { NULL, "--list-clear", gr_list_clear, FALSE, FALSE, NULL, N_("clear command line collection list") },
+ { nullptr, "--first", gr_image_first, FALSE, FALSE, nullptr, N_("first image") },
+ { "-f", "--fullscreen", gr_fullscreen_toggle, FALSE, TRUE, nullptr, N_("toggle full screen") },
+ { nullptr, "--file:", gr_file_load, TRUE, FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, bring Geeqie window to the top") },
+ { nullptr, "file:", gr_file_load, TRUE, FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, bring Geeqie window to the top") },
+ { nullptr, "--File:", gr_file_load_no_raise, TRUE, FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, do not bring Geeqie window to the top") },
+ { nullptr, "File:", gr_file_load_no_raise, TRUE, FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, do not bring Geeqie window to the top") },
+ { "-fs","--fullscreen-start", gr_fullscreen_start, FALSE, FALSE, nullptr, N_("start full screen") },
+ { "-fS","--fullscreen-stop", gr_fullscreen_stop, FALSE, FALSE, nullptr, N_("stop full screen") },
+ { nullptr, "--geometry=", gr_geometry, TRUE, FALSE, N_("<GEOMETRY>"), N_("set window geometry") },
+ { nullptr, "--get-collection:", gr_collection, TRUE, FALSE, N_("<COLLECTION>"), N_("get collection content") },
+ { nullptr, "--get-collection-list", gr_collection_list, FALSE, FALSE, nullptr, N_("get collection list") },
+ { nullptr, "--get-destination:", gr_get_destination, TRUE, FALSE, N_("<FILE>"), N_("get destination path of FILE (See Plugins Configuration)") },
+ { nullptr, "--get-file-info", gr_file_info, FALSE, FALSE, nullptr, N_("get file info") },
+ { nullptr, "--get-filelist:", gr_filelist, TRUE, FALSE, N_("[<FOLDER>]"), N_("get list of files and class") },
+ { nullptr, "--get-filelist-recurse:", gr_filelist_recurse, TRUE, FALSE, N_("[<FOLDER>]"), N_("get list of files and class recursive") },
+ { nullptr, "--get-rectangle", gr_rectangle, FALSE, FALSE, nullptr, N_("get rectangle co-ordinates") },
+ { nullptr, "--get-render-intent", gr_render_intent, FALSE, FALSE, nullptr, N_("get render intent") },
+ { nullptr, "--get-selection", gr_get_selection, FALSE, FALSE, nullptr, N_("get list of selected files") },
+ { nullptr, "--get-sidecars:", gr_get_sidecars, TRUE, FALSE, N_("<FILE>"), N_("get list of sidecars of FILE") },
+ { nullptr, "--id:", gr_lw_id, TRUE, FALSE, N_("<ID>"), N_("window id for following commands") },
+ { nullptr, "--last", gr_image_last, FALSE, FALSE, nullptr, N_("last image") },
+ { nullptr, "--list-add:", gr_list_add, TRUE, FALSE, N_("<FILE>"), N_("add FILE to command line collection list") },
+ { nullptr, "--list-clear", gr_list_clear, FALSE, FALSE, nullptr, N_("clear command line collection list") },
#ifdef HAVE_LUA
- { NULL, "--lua:", gr_lua, TRUE, FALSE, N_("<FILE>,<lua script>"), N_("run lua script on FILE") },
+ { nullptr, "--lua:", gr_lua, TRUE, FALSE, N_("<FILE>,<lua script>"), N_("run lua script on FILE") },
#endif
- { NULL, "--new-window", gr_new_window, FALSE, FALSE, NULL, N_("new window") },
- { "-n", "--next", gr_image_next, FALSE, FALSE, NULL, N_("next image") },
- { NULL, "--pixel-info", gr_pixel_info, FALSE, FALSE, NULL, N_("print pixel info of mouse pointer on current image") },
- { NULL, "--print0", gr_print0, TRUE, FALSE, NULL, N_("terminate returned data with null character instead of newline") },
- {
NULL, "--PWD:", gr_pwd, TRUE, FALSE, N_("<PWD>"), N_("use PWD as working directory for following commands") },
- { "-q", "--quit", gr_quit, FALSE, FALSE, NULL, N_("quit") },
- { NULL, "--raise", gr_raise, FALSE, FALSE, NULL, N_("bring the Geeqie window to the top") },
- { NULL, "raise", gr_raise, FALSE, FALSE, NULL, N_("bring the Geeqie window to the top") },
- { NULL, "--selection-add:", gr_selection_add, TRUE, FALSE, N_("[<FILE>]"), N_("adds the current file (or the specified file) to the current selection") },
- { NULL, "--selection-clear", gr_selection_clear, FALSE, FALSE, NULL, N_("clears the current selection") },
- { NULL, "--selection-remove:", gr_selection_remove, TRUE, FALSE, N_("[<FILE>]"), N_("removes the current file (or the specified file) from the current selection") },
- { "-s", "--slideshow", gr_slideshow_toggle, FALSE, TRUE, NULL, N_("toggle slide show") },
- { NULL, "--slideshow-recurse:", gr_slideshow_start_rec, TRUE, FALSE, N_("<FOLDER>"), N_("start recursive slide show in FOLDER") },
- { "-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, "--tell", gr_file_tell, FALSE, FALSE, NULL, N_("print filename [and Collection] of current image") },
- { "+t", "--tools-show", gr_tools_show, FALSE, TRUE, NULL, N_("show tools") },
- { "-t", "--tools-hide", gr_tools_hide, FALSE, TRUE, NULL, N_("hide tools") },
- { NULL, "--view:", gr_file_view, TRUE, FALSE, N_("<FILE>"), N_("open FILE in new window") },
- { NULL, "view:", gr_file_view, TRUE, FALSE, N_("<FILE>"), N_("open FILE in new window") },
- { NULL, NULL, NULL, FALSE, FALSE, NULL, NULL }
+ { nullptr, "--new-window", gr_new_window, FALSE, FALSE, nullptr, N_("new window") },
+ { "-n", "--next", gr_image_next, FALSE, FALSE, nullptr, N_("next image") },
+ { nullptr, "--pixel-info", gr_pixel_info, FALSE, FALSE, nullptr, N_("print pixel info of mouse pointer on current image") },
+ { nullptr, "--print0", gr_print0, TRUE, FALSE, nullptr, N_("terminate returned data with null character instead of newline") },
+ {
nullptr, "--PWD:", gr_pwd, TRUE, FALSE, N_("<PWD>"), N_("use PWD as working directory for following commands") },
+ { "-q", "--quit", gr_quit, FALSE, FALSE, nullptr, N_("quit") },
+ { nullptr, "--raise", gr_raise, FALSE, FALSE, nullptr, N_("bring the Geeqie window to the top") },
+ { nullptr, "raise", gr_raise, FALSE, FALSE, nullptr, N_("bring the Geeqie window to the top") },
+ { nullptr, "--selection-add:", gr_selection_add, TRUE, FALSE, N_("[<FILE>]"), N_("adds the current file (or the specified file) to the current selection") },
+ { nullptr, "--selection-clear", gr_selection_clear, FALSE, FALSE, nullptr, N_("clears the current selection") },
+ { nullptr, "--selection-remove:", gr_selection_remove, TRUE, FALSE, N_("[<FILE>]"), N_("removes the current file (or the specified file) from the current selection") },
+ { "-s", "--slideshow", gr_slideshow_toggle, FALSE, TRUE, nullptr, N_("toggle slide show") },
+ { nullptr, "--slideshow-recurse:", gr_slideshow_start_rec, TRUE, FALSE, N_("<FOLDER>"), N_("start recursive slide show in FOLDER") },
+ { "-ss","--slideshow-start", gr_slideshow_start, FALSE, FALSE, nullptr, N_("start slide show") },
+ { "-sS","--slideshow-stop", gr_slideshow_stop, FALSE, FALSE, nullptr, N_("stop slide show") },
+ { nullptr, "--tell", gr_file_tell, FALSE, FALSE, nullptr, N_("print filename [and Collection] of current image") },
+ { "+t", "--tools-show", gr_tools_show, FALSE, TRUE, nullptr, N_("show tools") },
+ { "-t", "--tools-hide", gr_tools_hide, FALSE, TRUE, nullptr, N_("hide tools") },
+ { nullptr, "--view:", gr_file_view, TRUE, FALSE, N_("<FILE>"), N_("open FILE in new window") },
+ { nullptr, "view:", gr_file_view, TRUE, FALSE, N_("<FILE>"), N_("open FILE in new window") },
+ { nullptr, nullptr, nullptr, FALSE, FALSE, nullptr, nullptr }
};
static RemoteCommandEntry *remote_command_find(const gchar *text, const gchar **offset)
gint i;
i = 0;
- while (!match && remote_commands[i].func != NULL)
+ while (!match && remote_commands[i].func != nullptr)
{
if (remote_commands[i].needs_extra)
{
if (offset) *offset = text + strlen(remote_commands[i].opt_s);
return &remote_commands[i];
}
- else if (remote_commands[i].opt_l &&
+
+ if (remote_commands[i].opt_l &&
strncmp(remote_commands[i].opt_l, text, strlen(remote_commands[i].opt_l)) == 0)
{
if (offset) *offset = text + strlen(remote_commands[i].opt_l);
i++;
}
- return NULL;
+ return nullptr;
}
-static void remote_cb(RemoteConnection *UNUSED(rc), const gchar *text, GIOChannel *channel, gpointer data)
+static void remote_cb(RemoteConnection *, const gchar *text, GIOChannel *channel, gpointer data)
{
RemoteCommandEntry *entry;
const gchar *offset;
}
}
-void remote_help(void)
+void remote_help()
{
gint i;
gchar *s_opt_param;
print_term(FALSE, _("Remote command list:\n"));
i = 0;
- while (remote_commands[i].func != NULL)
+ while (remote_commands[i].func != nullptr)
{
if (remote_commands[i].description)
{
s_opt_param = g_strdup(remote_commands[i].opt_s ? remote_commands[i].opt_s : "" );
l_opt_param = g_strconcat(remote_commands[i].opt_l, remote_commands[i].parameter, NULL);
- printf_term(FALSE, " %-4s %-40s%-s\n",
- s_opt_param,
- l_opt_param,
- _(remote_commands[i].description));
+
+ if (g_str_has_prefix(l_opt_param, "--"))
+ {
+ printf_term(FALSE, " %-4s %-40s%-s\n", s_opt_param, l_opt_param, _(remote_commands[i].description));
+ }
g_free(s_opt_param);
g_free(l_opt_param);
}
{
RemoteCommandEntry *entry;
- entry = remote_command_find(argv[i], NULL);
+ entry = remote_command_find(argv[i], nullptr);
if (entry)
{
list = g_list_append(list, argv[i]);
gchar *text;
RemoteCommandEntry *entry;
- text = work->data;
+ text = static_cast<gchar *>(work->data);
work = work->next;
- entry = remote_command_find(text, NULL);
+ entry = remote_command_find(text, nullptr);
if (entry)
{
/* If Geeqie is not running, stop the --new-window command opening a second window */
gchar *text;
RemoteCommandEntry *entry;
- text = work->data;
+ text = static_cast<gchar *>(work->data);
work = work->next;
- entry = remote_command_find(text, NULL);
+ entry = remote_command_find(text, nullptr);
if (entry &&
entry->opt_l &&
strcmp(entry->opt_l, "file:") == 0) use_path = FALSE;
const gchar *name;
gchar *text;
- name = work->data;
+ name = static_cast<const gchar *>(work->data);
work = work->next;
text = g_strdup_printf("file:%s", name);
RemoteConnection *remote_server_init(gchar *path, CollectionData *command_collection)
{
RemoteConnection *remote_connection = remote_server_open(path);
- RemoteData *remote_data = g_new(RemoteData, 1);
+ auto remote_data = g_new(RemoteData, 1);
remote_data->command_collection = command_collection;
projects / geeqie.git / blobdiff