mirror of
https://git.pwmt.org/pwmt/zathura.git
synced 2024-09-21 19:11:21 +02:00
ae59da30c8
This patch adds some enhancements/fixes to the bookmarking feature of Zathura:
- Bookmark the exact vertical and horizontal adjustments values, along with
the page number. This is done in a backward-compatible way for both the
plain and sqlite database backends, so that bookmarks that was taken
previously (bookmarking only the page number) will still work as expected
and won't be lost.
- Fix the issue of not being able to remove bookmarks from the plain
database; removing a bookmark in plain_remove_bookmark using
g_key_file_remove_key corrupts the bookmarks file. This is due to not
truncating the entire bookmarks file in zathura_db_write_key_file_to_file
prior to overriding it with a new one not containing the removed line.
This is why, I guess, plain_remove_bookmark hadn't been implemented as
expected using g_key_file_remove_key, because apparently, someone thought
that the problem is caused by this API.
- Fix not being able to update existing bookmarks persistently; updating a
bookmark works only during the current session, but after the file is
closed and reopened, the updated bookmark still has it's old value. This
is due to changing only the bookmark structure in memory; the proper way
to do it, is to call zathura_db_remove_bookmark on the old bookmark, then
follow that by a call to zathura_db_add_bookmark on a bookmark structure
containing the new position and the same old ID.
- Make zathura_bookmark_add updates the bookmark if it already exists,
rather than doing this externally in cmd_bookmark_create. This allows us
to have all the relevant girara_notify messages in cmd_bookmark_create.
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
150 lines
3.7 KiB
C
150 lines
3.7 KiB
C
/* See LICENSE file for license and copyright information */
|
|
|
|
#include <string.h>
|
|
#include "bookmarks.h"
|
|
#include "database.h"
|
|
#include "document.h"
|
|
#include "adjustment.h"
|
|
|
|
#include <girara/datastructures.h>
|
|
#include <girara/utils.h>
|
|
#include <girara/session.h>
|
|
|
|
static int
|
|
bookmark_compare_find(const void* item, const void* data)
|
|
{
|
|
const zathura_bookmark_t* bookmark = item;
|
|
const char* id = data;
|
|
|
|
return g_strcmp0(bookmark->id, id);
|
|
}
|
|
|
|
zathura_bookmark_t*
|
|
zathura_bookmark_add(zathura_t* zathura, const gchar* id, unsigned int page)
|
|
{
|
|
g_return_val_if_fail(zathura && zathura->document && zathura->bookmarks.bookmarks, NULL);
|
|
g_return_val_if_fail(id, NULL);
|
|
|
|
double x = zathura_adjustment_get_ratio(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)));
|
|
double y = zathura_adjustment_get_ratio(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)));
|
|
zathura_bookmark_t* old = zathura_bookmark_get(zathura, id);
|
|
|
|
if (old != NULL) {
|
|
old->page = page;
|
|
old->x = x;
|
|
old->y = y;
|
|
|
|
if (zathura->database != NULL) {
|
|
const char* path = zathura_document_get_path(zathura->document);
|
|
if (zathura_db_remove_bookmark(zathura->database, path, old->id) == false) {
|
|
girara_warning("Failed to remove old bookmark from database.");
|
|
}
|
|
|
|
if (zathura_db_add_bookmark(zathura->database, path, old) == false) {
|
|
girara_warning("Failed to add new bookmark to database.");
|
|
}
|
|
}
|
|
|
|
return old;
|
|
}
|
|
|
|
zathura_bookmark_t* bookmark = g_malloc0(sizeof(zathura_bookmark_t));
|
|
|
|
bookmark->id = g_strdup(id);
|
|
bookmark->page = page;
|
|
bookmark->x = x;
|
|
bookmark->y = y;
|
|
girara_list_append(zathura->bookmarks.bookmarks, bookmark);
|
|
|
|
if (zathura->database != NULL) {
|
|
const char* path = zathura_document_get_path(zathura->document);
|
|
if (zathura_db_add_bookmark(zathura->database, path, bookmark) == false) {
|
|
girara_warning("Failed to add bookmark to database.");
|
|
}
|
|
}
|
|
|
|
return bookmark;
|
|
}
|
|
|
|
bool
|
|
zathura_bookmark_remove(zathura_t* zathura, const gchar* id)
|
|
{
|
|
g_return_val_if_fail(zathura && zathura->document && zathura->bookmarks.bookmarks, false);
|
|
g_return_val_if_fail(id, false);
|
|
|
|
zathura_bookmark_t* bookmark = zathura_bookmark_get(zathura, id);
|
|
if (bookmark == NULL) {
|
|
return false;
|
|
}
|
|
|
|
if (zathura->database != NULL) {
|
|
const char* path = zathura_document_get_path(zathura->document);
|
|
if (zathura_db_remove_bookmark(zathura->database, path, bookmark->id) == false) {
|
|
girara_warning("Failed to remove bookmark from database.");
|
|
}
|
|
}
|
|
|
|
girara_list_remove(zathura->bookmarks.bookmarks, bookmark);
|
|
|
|
return true;
|
|
}
|
|
|
|
zathura_bookmark_t*
|
|
zathura_bookmark_get(zathura_t* zathura, const gchar* id)
|
|
{
|
|
g_return_val_if_fail(zathura && zathura->bookmarks.bookmarks, NULL);
|
|
g_return_val_if_fail(id, NULL);
|
|
|
|
return girara_list_find(zathura->bookmarks.bookmarks, bookmark_compare_find, id);
|
|
}
|
|
|
|
void
|
|
zathura_bookmark_free(zathura_bookmark_t* bookmark)
|
|
{
|
|
if (bookmark == NULL) {
|
|
return;
|
|
}
|
|
|
|
g_free(bookmark->id);
|
|
g_free(bookmark);
|
|
}
|
|
|
|
bool
|
|
zathura_bookmarks_load(zathura_t* zathura, const gchar* file)
|
|
{
|
|
g_return_val_if_fail(zathura, false);
|
|
g_return_val_if_fail(file, false);
|
|
|
|
if (zathura->database == NULL) {
|
|
return false;
|
|
}
|
|
|
|
girara_list_t* bookmarks = zathura_db_load_bookmarks(zathura->database, file);
|
|
if (bookmarks == NULL) {
|
|
return false;
|
|
}
|
|
|
|
girara_list_free(zathura->bookmarks.bookmarks);
|
|
zathura->bookmarks.bookmarks = bookmarks;
|
|
|
|
return true;
|
|
}
|
|
|
|
int
|
|
zathura_bookmarks_compare(zathura_bookmark_t* lhs, zathura_bookmark_t* rhs)
|
|
{
|
|
if (lhs == NULL && rhs == NULL) {
|
|
return 0;
|
|
}
|
|
|
|
if (lhs == NULL) {
|
|
return -1;
|
|
}
|
|
|
|
if (rhs == NULL) {
|
|
return 1;
|
|
}
|
|
|
|
return g_strcmp0(lhs->id, rhs->id);
|
|
}
|