mirror of
https://git.pwmt.org/pwmt/zathura.git
synced 2024-11-11 07:33:47 +01:00
afd008f466
- Don't delete the elements on the right of the current one, when appending a new jump to the jumplist, because this makes no sense at all; the point of the jumplist in the first place is to remember previously jumped-to positions in the document, so there is no need to delete anythings except to trim the oldest entries from the beginning to maintain the maximum size. This also makes us compatible with the Vim way of doing things. - Make the jumplist mechanism functional on the same page; if we followed a link to a target on the same page, remember the adjustments before and after following the link. The same holds for navigating search results on the same page. - Implement position_set and use it instead of position_set_delayed when following links in order to give zathura_jumplist_save a chance to record the exact adjustments of the link target. Otherwise, it will always record the adjustments after going to the target page, but before going to the exact position within it. - Don't consider movements with ^i and ^o as jumps :) - Don't use page_set followed by setting the adjustments in sc_jumplist, because this is redundant and causes clutter when using ^i and ^o, as the adjustments is set twice this way (once in page_set and again in position_set_delayed). It's enough to only update the page number on the statusbar and then set the adjustments. - Hide implementation details (zathura_jumplist_save and zathura_jumplist_append), and make things more consistent by exporting and using only zathura_jumplist_add for adding new entries. The end result: A more slick jumping experience :-) Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
255 lines
6.1 KiB
C
255 lines
6.1 KiB
C
/* See LICENSE file for license and copyright information */
|
|
|
|
#include <glib.h>
|
|
#include <glib/gi18n.h>
|
|
#include <girara/utils.h>
|
|
#include <girara/session.h>
|
|
#include <girara/settings.h>
|
|
|
|
#include "links.h"
|
|
#include "zathura.h"
|
|
#include "document.h"
|
|
#include "utils.h"
|
|
|
|
struct zathura_link_s {
|
|
zathura_rectangle_t position; /**< Position of the link */
|
|
zathura_link_type_t type; /**< Link type */
|
|
zathura_link_target_t target; /**< Link target */
|
|
};
|
|
|
|
/* forward declarations */
|
|
static void link_remote(zathura_t* zathura, const char* file);
|
|
static void link_launch(zathura_t* zathura, zathura_link_t* link);
|
|
|
|
zathura_link_t*
|
|
zathura_link_new(zathura_link_type_t type, zathura_rectangle_t position,
|
|
zathura_link_target_t target)
|
|
{
|
|
zathura_link_t* link = g_malloc0(sizeof(zathura_link_t));
|
|
|
|
link->type = type;
|
|
link->position = position;
|
|
|
|
switch (type) {
|
|
case ZATHURA_LINK_NONE:
|
|
case ZATHURA_LINK_GOTO_DEST:
|
|
link->target = target;
|
|
|
|
if (target.value != NULL) {
|
|
link->target.value = g_strdup(target.value);
|
|
}
|
|
break;
|
|
case ZATHURA_LINK_GOTO_REMOTE:
|
|
case ZATHURA_LINK_URI:
|
|
case ZATHURA_LINK_LAUNCH:
|
|
case ZATHURA_LINK_NAMED:
|
|
if (target.value == NULL) {
|
|
g_free(link);
|
|
return NULL;
|
|
}
|
|
|
|
link->target.value = g_strdup(target.value);
|
|
break;
|
|
default:
|
|
g_free(link);
|
|
return NULL;
|
|
}
|
|
|
|
return link;
|
|
}
|
|
|
|
void
|
|
zathura_link_free(zathura_link_t* link)
|
|
{
|
|
if (link == NULL) {
|
|
return;
|
|
}
|
|
|
|
switch (link->type) {
|
|
case ZATHURA_LINK_NONE:
|
|
case ZATHURA_LINK_GOTO_DEST:
|
|
case ZATHURA_LINK_GOTO_REMOTE:
|
|
case ZATHURA_LINK_URI:
|
|
case ZATHURA_LINK_LAUNCH:
|
|
case ZATHURA_LINK_NAMED:
|
|
if (link->target.value != NULL) {
|
|
g_free(link->target.value);
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
g_free(link);
|
|
}
|
|
|
|
zathura_link_type_t
|
|
zathura_link_get_type(zathura_link_t* link)
|
|
{
|
|
if (link == NULL) {
|
|
return ZATHURA_LINK_INVALID;
|
|
}
|
|
|
|
return link->type;
|
|
}
|
|
|
|
zathura_rectangle_t
|
|
zathura_link_get_position(zathura_link_t* link)
|
|
{
|
|
if (link == NULL) {
|
|
zathura_rectangle_t position = { 0, 0, 0, 0 };
|
|
return position;
|
|
}
|
|
|
|
return link->position;
|
|
}
|
|
|
|
zathura_link_target_t
|
|
zathura_link_get_target(zathura_link_t* link)
|
|
{
|
|
if (link == NULL) {
|
|
zathura_link_target_t target = { 0 };
|
|
return target;
|
|
}
|
|
|
|
return link->target;
|
|
}
|
|
|
|
void
|
|
zathura_link_evaluate(zathura_t* zathura, zathura_link_t* link)
|
|
{
|
|
if (zathura == NULL || zathura->document == NULL || link == NULL) {
|
|
return;
|
|
}
|
|
|
|
switch (link->type) {
|
|
case ZATHURA_LINK_GOTO_DEST:
|
|
if (link->target.destination_type != ZATHURA_LINK_DESTINATION_UNKNOWN) {
|
|
if (link->target.scale != 0) {
|
|
zathura_document_set_scale(zathura->document, link->target.scale);
|
|
}
|
|
|
|
/* get page */
|
|
zathura_page_t* page = zathura_document_get_page(zathura->document,
|
|
link->target.page_number);
|
|
if (page == NULL) {
|
|
return;
|
|
}
|
|
|
|
page_offset_t offset;
|
|
page_calculate_offset(zathura, page, &offset);
|
|
|
|
if (link->target.destination_type == ZATHURA_LINK_DESTINATION_XYZ) {
|
|
if (link->target.left != -1) {
|
|
offset.x += link->target.left * zathura_document_get_scale(zathura->document);
|
|
}
|
|
|
|
if (link->target.top != -1) {
|
|
offset.y += link->target.top * zathura_document_get_scale(zathura->document);
|
|
}
|
|
}
|
|
|
|
/* jump to the page */
|
|
page_set(zathura, link->target.page_number);
|
|
|
|
/* move to the target position */
|
|
bool link_hadjust = true;
|
|
girara_setting_get(zathura->ui.session, "link-hadjust", &link_hadjust);
|
|
|
|
if (link_hadjust == true) {
|
|
position_set(zathura, offset.x, offset.y);
|
|
} else {
|
|
position_set(zathura, -1, offset.y);
|
|
}
|
|
}
|
|
break;
|
|
case ZATHURA_LINK_GOTO_REMOTE:
|
|
link_remote(zathura, link->target.value);
|
|
break;
|
|
case ZATHURA_LINK_URI:
|
|
if (girara_xdg_open(link->target.value) == false) {
|
|
girara_notify(zathura->ui.session, GIRARA_ERROR, _("Failed to run xdg-open."));
|
|
}
|
|
break;
|
|
case ZATHURA_LINK_LAUNCH:
|
|
link_launch(zathura, link);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
void
|
|
zathura_link_display(zathura_t* zathura, zathura_link_t* link)
|
|
{
|
|
zathura_link_type_t type = zathura_link_get_type(link);
|
|
zathura_link_target_t target = zathura_link_get_target(link);
|
|
switch (type) {
|
|
case ZATHURA_LINK_GOTO_DEST:
|
|
girara_notify(zathura->ui.session, GIRARA_INFO, _("Link: page %d"),
|
|
target.page_number);
|
|
break;
|
|
case ZATHURA_LINK_GOTO_REMOTE:
|
|
case ZATHURA_LINK_URI:
|
|
case ZATHURA_LINK_LAUNCH:
|
|
case ZATHURA_LINK_NAMED:
|
|
girara_notify(zathura->ui.session, GIRARA_INFO, _("Link: %s"),
|
|
target.value);
|
|
break;
|
|
default:
|
|
girara_notify(zathura->ui.session, GIRARA_ERROR, _("Link: Invalid"));
|
|
}
|
|
}
|
|
|
|
static void
|
|
link_remote(zathura_t* zathura, const char* file)
|
|
{
|
|
if (zathura == NULL || file == NULL || zathura->document == NULL) {
|
|
return;
|
|
}
|
|
|
|
const char* path = zathura_document_get_path(zathura->document);
|
|
char* dir = g_path_get_dirname(path);
|
|
char* uri = g_build_filename(dir, file, NULL);
|
|
|
|
char* argv[] = {
|
|
*(zathura->global.arguments),
|
|
uri,
|
|
NULL
|
|
};
|
|
|
|
g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
|
|
|
|
g_free(uri);
|
|
g_free(dir);
|
|
}
|
|
|
|
static void
|
|
link_launch(zathura_t* zathura, zathura_link_t* link)
|
|
{
|
|
if (zathura == NULL || link == NULL || zathura->document == NULL) {
|
|
return;
|
|
}
|
|
|
|
/* get file path */
|
|
if (link->target.value == NULL) {
|
|
return;
|
|
};
|
|
|
|
char* path = NULL;
|
|
if (g_path_is_absolute(link->target.value) == TRUE) {
|
|
path = g_strdup(link->target.value);
|
|
} else {
|
|
const char* document = zathura_document_get_path(zathura->document);
|
|
char* dir = g_path_get_dirname(document);
|
|
path = g_build_filename(dir, link->target.value, NULL);
|
|
g_free(dir);
|
|
}
|
|
|
|
if (girara_xdg_open(path) == false) {
|
|
girara_notify(zathura->ui.session, GIRARA_ERROR, _("Failed to run xdg-open."));
|
|
}
|
|
|
|
g_free(path);
|
|
}
|