2009-12-26 14:30:50 +01:00
|
|
|
/* See LICENSE file for license and copyright information */
|
|
|
|
|
2011-10-21 15:00:22 +02:00
|
|
|
#define _BSD_SOURCE
|
2011-10-23 20:18:44 +02:00
|
|
|
#define _XOPEN_SOURCE 700
|
2011-10-21 15:00:22 +02:00
|
|
|
|
2012-10-05 00:51:28 +02:00
|
|
|
#include <errno.h>
|
2010-12-28 09:47:09 +01:00
|
|
|
#include <stdlib.h>
|
2011-10-24 06:46:53 +02:00
|
|
|
#include <unistd.h>
|
2012-02-08 21:34:53 +01:00
|
|
|
#include <math.h>
|
2010-12-28 09:47:09 +01:00
|
|
|
|
2011-10-23 17:01:15 +02:00
|
|
|
#include <girara/datastructures.h>
|
|
|
|
#include <girara/utils.h>
|
|
|
|
#include <girara/session.h>
|
|
|
|
#include <girara/statusbar.h>
|
|
|
|
#include <girara/settings.h>
|
Hide the inputbar and completion menu before saving the adjustments ratios into a new jump structure
Since we are now saving the adjustments ratios in the jump structures, we need
to take care of the following scenario:
- We do an action that results in a new jump structure being added to the
jumplist while the inputbar is visible (e.g., search, jumping to a
specific page, jumping to a bookmark, or following a link).
- Since we are now storing the adjustments ratios in the jump structures,
all of the above actions would result in the vertical adjustment ratio
being saved while the inputbar and/or the completion menu is visible.
- Now we are exactly on the target of the jump (note that the inputbar and
completion menu now are hidden), so suppose that we want to go back using
^o (assuming that we didn't change the adjustments after jumping), then
the check at sc_jumplist that compares the current adjustments ratios
with that of the current jump (the jump that has just been added and
which we are currently on it's position) would fail, because after the
inputbar (with possibly the completion menu in case of bookmarks) is
activated it is hidden, which results in the vertical adjustment upper
bound to change, which in turn results in the vertical adjustment ratio
returned by zathura_adjustment_get_ratio to become different from what is
stored in the current jump structure, even though we haven't changed the
adjustments at all after the jump. This would always result in taking us
back to the exact position of the jump (which would be slightly different
from the current position) when we press ^o. This can be annoying,
because it would happen, for example, every time we need to go back
quickly after jumping to a link target, a search result, or a bookmark.
So, what this patch does is essentially to make the vertical adjustment ratio
reflecting the current vertical adjustment after a jump, to always be the same
as the one stored in the newly added jump structure, since both are calculated
with zathura_adjustment_get_ratio while the inputbar is _not_ visible, so they
should be the same.
I've elaborated just to make things clear, in case the purpose of the patch
isn't obvious.
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:25:29 +02:00
|
|
|
#include <girara/shortcuts.h>
|
2011-10-21 15:00:22 +02:00
|
|
|
#include <glib/gstdio.h>
|
2012-03-04 18:35:16 +01:00
|
|
|
#include <glib/gi18n.h>
|
2011-04-18 17:03:08 +02:00
|
|
|
|
2011-09-01 15:43:34 +02:00
|
|
|
#include "bookmarks.h"
|
2010-11-12 13:48:18 +01:00
|
|
|
#include "callbacks.h"
|
|
|
|
#include "config.h"
|
2012-03-04 15:56:54 +01:00
|
|
|
#ifdef WITH_SQLITE
|
|
|
|
#include "database-sqlite.h"
|
|
|
|
#endif
|
|
|
|
#include "database-plain.h"
|
2011-03-05 19:46:05 +01:00
|
|
|
#include "document.h"
|
2010-11-12 13:48:18 +01:00
|
|
|
#include "shortcuts.h"
|
2010-11-10 19:18:01 +01:00
|
|
|
#include "zathura.h"
|
2010-12-28 09:47:09 +01:00
|
|
|
#include "utils.h"
|
2012-04-21 04:59:58 +02:00
|
|
|
#include "marks.h"
|
2011-04-18 18:19:41 +02:00
|
|
|
#include "render.h"
|
2012-03-26 14:44:56 +02:00
|
|
|
#include "page.h"
|
2012-03-24 16:15:34 +01:00
|
|
|
#include "page-widget.h"
|
2012-03-27 13:30:04 +02:00
|
|
|
#include "plugin.h"
|
2013-03-23 15:59:27 +01:00
|
|
|
#include "adjustment.h"
|
2009-12-26 17:57:46 +01:00
|
|
|
|
2012-10-09 01:12:18 +02:00
|
|
|
typedef struct zathura_document_info_s {
|
2011-04-18 21:22:35 +02:00
|
|
|
zathura_t* zathura;
|
|
|
|
const char* path;
|
|
|
|
const char* password;
|
2013-03-17 10:56:43 +01:00
|
|
|
int page_number;
|
2011-04-18 21:22:35 +02:00
|
|
|
} zathura_document_info_t;
|
|
|
|
|
2012-10-09 01:12:18 +02:00
|
|
|
typedef struct page_set_delayed_s {
|
2012-04-20 23:35:48 +02:00
|
|
|
zathura_t* zathura;
|
|
|
|
unsigned int page;
|
|
|
|
} page_set_delayed_t;
|
|
|
|
|
2012-10-09 01:12:18 +02:00
|
|
|
typedef struct position_set_delayed_s {
|
2012-04-20 23:35:48 +02:00
|
|
|
zathura_t* zathura;
|
2012-04-21 04:59:58 +02:00
|
|
|
double position_x;
|
|
|
|
double position_y;
|
2012-04-20 23:35:48 +02:00
|
|
|
} position_set_delayed_t;
|
|
|
|
|
2011-10-21 14:11:37 +02:00
|
|
|
static gboolean document_info_open(gpointer data);
|
2013-06-09 05:53:31 +02:00
|
|
|
static void zathura_jumplist_reset_current(zathura_t* zathura);
|
|
|
|
static void zathura_jumplist_append_jump(zathura_t* zathura);
|
|
|
|
static void zathura_jumplist_save(zathura_t* zathura);
|
2009-12-26 17:57:46 +01:00
|
|
|
|
2010-11-10 19:18:01 +01:00
|
|
|
/* function implementation */
|
2011-04-18 17:27:49 +02:00
|
|
|
zathura_t*
|
2012-08-05 15:34:10 +02:00
|
|
|
zathura_create(void)
|
2010-06-03 18:05:34 +02:00
|
|
|
{
|
2011-10-08 23:42:41 +02:00
|
|
|
zathura_t* zathura = g_malloc0(sizeof(zathura_t));
|
2011-06-23 22:43:08 +02:00
|
|
|
|
2012-07-12 10:37:58 +02:00
|
|
|
/* global settings */
|
|
|
|
zathura->global.update_page_number = true;
|
2012-12-18 04:09:09 +01:00
|
|
|
zathura->global.search_direction = FORWARD;
|
2012-07-12 10:37:58 +02:00
|
|
|
|
2011-06-23 22:43:08 +02:00
|
|
|
/* plugins */
|
2012-04-01 18:32:16 +02:00
|
|
|
zathura->plugins.manager = zathura_plugin_manager_new();
|
|
|
|
if (zathura->plugins.manager == NULL) {
|
2012-08-05 15:34:10 +02:00
|
|
|
goto error_out;
|
2012-04-01 18:32:16 +02:00
|
|
|
}
|
2011-06-23 22:43:08 +02:00
|
|
|
|
2012-08-05 15:34:10 +02:00
|
|
|
/* UI */
|
|
|
|
if ((zathura->ui.session = girara_session_create()) == NULL) {
|
|
|
|
goto error_out;
|
2011-04-19 14:46:08 +02:00
|
|
|
}
|
|
|
|
|
2012-08-05 15:34:10 +02:00
|
|
|
zathura->ui.session->global.data = zathura;
|
|
|
|
|
|
|
|
return zathura;
|
|
|
|
|
|
|
|
error_out:
|
|
|
|
|
|
|
|
zathura_free(zathura);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
2011-04-19 14:46:08 +02:00
|
|
|
|
2012-08-05 15:34:10 +02:00
|
|
|
bool
|
|
|
|
zathura_init(zathura_t* zathura)
|
|
|
|
{
|
|
|
|
if (zathura == NULL) {
|
|
|
|
return false;
|
2012-07-13 15:39:16 +02:00
|
|
|
}
|
|
|
|
|
2011-10-03 17:19:55 +02:00
|
|
|
/* create zathura (config/data) directory */
|
2012-10-05 00:51:28 +02:00
|
|
|
if (g_mkdir_with_parents(zathura->config.config_dir, 0771) == -1) {
|
|
|
|
girara_error("Could not create '%s': %s", zathura->config.config_dir, strerror(errno));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (g_mkdir_with_parents(zathura->config.data_dir, 0771) == -1) {
|
|
|
|
girara_error("Could not create '%s': %s", zathura->config.data_dir, strerror(errno));
|
|
|
|
}
|
2011-10-03 17:19:55 +02:00
|
|
|
|
2012-07-12 10:37:58 +02:00
|
|
|
/* load plugins */
|
|
|
|
zathura_plugin_manager_load(zathura->plugins.manager);
|
|
|
|
|
2011-12-11 00:19:46 +01:00
|
|
|
/* configuration */
|
|
|
|
config_load_default(zathura);
|
|
|
|
|
2011-10-30 11:46:30 +01:00
|
|
|
/* load global configuration files */
|
2012-02-28 08:32:34 +01:00
|
|
|
char* config_path = girara_get_xdg_path(XDG_CONFIG_DIRS);
|
|
|
|
girara_list_t* config_dirs = girara_split_path_array(config_path);
|
2011-10-30 11:46:30 +01:00
|
|
|
ssize_t size = girara_list_size(config_dirs) - 1;
|
|
|
|
for (; size >= 0; --size) {
|
|
|
|
const char* dir = girara_list_nth(config_dirs, size);
|
|
|
|
char* file = g_build_filename(dir, ZATHURA_RC, NULL);
|
|
|
|
config_load_file(zathura, file);
|
|
|
|
g_free(file);
|
|
|
|
}
|
|
|
|
girara_list_free(config_dirs);
|
2012-02-28 08:32:34 +01:00
|
|
|
g_free(config_path);
|
2011-10-30 11:46:30 +01:00
|
|
|
|
|
|
|
config_load_file(zathura, GLOBAL_RC);
|
|
|
|
|
2011-04-25 17:41:45 +02:00
|
|
|
/* load local configuration files */
|
|
|
|
char* configuration_file = g_build_filename(zathura->config.config_dir, ZATHURA_RC, NULL);
|
|
|
|
config_load_file(zathura, configuration_file);
|
2011-10-08 23:42:41 +02:00
|
|
|
g_free(configuration_file);
|
2011-04-25 17:41:45 +02:00
|
|
|
|
2012-08-05 15:34:10 +02:00
|
|
|
/* UI */
|
2011-12-13 19:59:59 +01:00
|
|
|
if (girara_session_init(zathura->ui.session, "zathura") == false) {
|
2012-04-21 04:59:58 +02:00
|
|
|
goto error_free;
|
2011-04-25 17:41:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* girara events */
|
2012-05-01 19:09:33 +02:00
|
|
|
zathura->ui.session->events.buffer_changed = cb_buffer_changed;
|
|
|
|
zathura->ui.session->events.unknown_command = cb_unknown_command;
|
2011-04-25 17:41:45 +02:00
|
|
|
|
2010-12-29 11:46:13 +01:00
|
|
|
/* page view */
|
2012-08-05 02:30:03 +02:00
|
|
|
#if (GTK_MAJOR_VERSION == 3)
|
|
|
|
zathura->ui.page_widget = gtk_grid_new();
|
2012-08-05 15:56:35 +02:00
|
|
|
gtk_grid_set_row_homogeneous(GTK_GRID(zathura->ui.page_widget), TRUE);
|
|
|
|
gtk_grid_set_column_homogeneous(GTK_GRID(zathura->ui.page_widget), TRUE);
|
2012-08-05 02:30:03 +02:00
|
|
|
#else
|
2012-02-07 18:30:46 +01:00
|
|
|
zathura->ui.page_widget = gtk_table_new(0, 0, TRUE);
|
2012-08-05 02:30:03 +02:00
|
|
|
#endif
|
2012-02-12 16:35:33 +01:00
|
|
|
if (zathura->ui.page_widget == NULL) {
|
2010-12-29 11:46:13 +01:00
|
|
|
goto error_free;
|
|
|
|
}
|
|
|
|
|
2012-02-14 15:53:04 +01:00
|
|
|
g_signal_connect(G_OBJECT(zathura->ui.session->gtk.window), "size-allocate", G_CALLBACK(cb_view_resized), zathura);
|
2012-02-09 01:46:51 +01:00
|
|
|
|
2013-03-23 15:59:27 +01:00
|
|
|
/* Setup hadjustment tracker */
|
|
|
|
GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(
|
|
|
|
GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view));
|
|
|
|
zathura->ui.hadjustment = zathura_adjustment_clone(hadjustment);
|
|
|
|
g_object_ref_sink(zathura->ui.hadjustment);
|
|
|
|
|
|
|
|
/* Connect hadjustment signals */
|
|
|
|
g_signal_connect(G_OBJECT(hadjustment), "value-changed",
|
|
|
|
G_CALLBACK(cb_view_vadjustment_value_changed), zathura);
|
|
|
|
g_signal_connect(G_OBJECT(hadjustment), "value-changed",
|
|
|
|
G_CALLBACK(cb_adjustment_track_value), zathura->ui.hadjustment);
|
|
|
|
g_signal_connect(G_OBJECT(hadjustment), "changed",
|
|
|
|
G_CALLBACK(cb_view_hadjustment_changed), zathura);
|
|
|
|
g_signal_connect(G_OBJECT(hadjustment), "changed",
|
|
|
|
G_CALLBACK(cb_adjustment_track_bounds), zathura->ui.hadjustment);
|
|
|
|
|
|
|
|
/* Setup vadjustment tracker */
|
|
|
|
GtkAdjustment* vadjustment = gtk_scrolled_window_get_vadjustment(
|
|
|
|
GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view));
|
|
|
|
zathura->ui.vadjustment = zathura_adjustment_clone(vadjustment);
|
|
|
|
g_object_ref_sink(zathura->ui.vadjustment);
|
|
|
|
|
|
|
|
/* Connect vadjustment signals */
|
|
|
|
g_signal_connect(G_OBJECT(vadjustment), "value-changed",
|
|
|
|
G_CALLBACK(cb_view_vadjustment_value_changed), zathura);
|
|
|
|
g_signal_connect(G_OBJECT(vadjustment), "value-changed",
|
|
|
|
G_CALLBACK(cb_adjustment_track_value), zathura->ui.vadjustment);
|
|
|
|
g_signal_connect(G_OBJECT(vadjustment), "changed",
|
|
|
|
G_CALLBACK(cb_view_vadjustment_changed), zathura);
|
|
|
|
g_signal_connect(G_OBJECT(vadjustment), "changed",
|
|
|
|
G_CALLBACK(cb_adjustment_track_bounds), zathura->ui.vadjustment);
|
2011-04-19 21:42:18 +02:00
|
|
|
|
2012-01-13 17:39:46 +01:00
|
|
|
/* page view alignment */
|
2012-02-07 18:30:46 +01:00
|
|
|
zathura->ui.page_widget_alignment = gtk_alignment_new(0.5, 0.5, 0, 0);
|
2012-02-12 16:35:33 +01:00
|
|
|
if (zathura->ui.page_widget_alignment == NULL) {
|
2012-01-13 17:39:46 +01:00
|
|
|
goto error_free;
|
|
|
|
}
|
2012-02-07 18:30:46 +01:00
|
|
|
gtk_container_add(GTK_CONTAINER(zathura->ui.page_widget_alignment), zathura->ui.page_widget);
|
2012-01-13 17:39:46 +01:00
|
|
|
|
2012-08-05 15:56:35 +02:00
|
|
|
#if (GTK_MAJOR_VERSION == 3)
|
|
|
|
gtk_widget_set_hexpand_set(zathura->ui.page_widget_alignment, TRUE);
|
|
|
|
gtk_widget_set_hexpand(zathura->ui.page_widget_alignment, FALSE);
|
|
|
|
gtk_widget_set_vexpand_set(zathura->ui.page_widget_alignment, TRUE);
|
|
|
|
gtk_widget_set_vexpand(zathura->ui.page_widget_alignment, FALSE);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2012-02-07 18:30:46 +01:00
|
|
|
gtk_widget_show(zathura->ui.page_widget);
|
2010-12-26 01:52:17 +01:00
|
|
|
|
2010-12-26 11:10:10 +01:00
|
|
|
/* statusbar */
|
2011-04-18 17:27:49 +02:00
|
|
|
zathura->ui.statusbar.file = girara_statusbar_item_add(zathura->ui.session, TRUE, TRUE, TRUE, NULL);
|
|
|
|
if (zathura->ui.statusbar.file == NULL) {
|
2010-12-26 01:52:17 +01:00
|
|
|
goto error_free;
|
2010-11-13 12:40:48 +01:00
|
|
|
}
|
|
|
|
|
2011-04-18 17:27:49 +02:00
|
|
|
zathura->ui.statusbar.buffer = girara_statusbar_item_add(zathura->ui.session, FALSE, FALSE, FALSE, NULL);
|
|
|
|
if (zathura->ui.statusbar.buffer == NULL) {
|
2010-12-26 01:52:17 +01:00
|
|
|
goto error_free;
|
2010-11-18 21:22:43 +01:00
|
|
|
}
|
|
|
|
|
2011-04-18 17:27:49 +02:00
|
|
|
zathura->ui.statusbar.page_number = girara_statusbar_item_add(zathura->ui.session, FALSE, FALSE, FALSE, NULL);
|
2012-02-12 16:35:33 +01:00
|
|
|
if (zathura->ui.statusbar.page_number == NULL) {
|
2010-12-26 01:52:17 +01:00
|
|
|
goto error_free;
|
2010-11-18 21:22:43 +01:00
|
|
|
}
|
|
|
|
|
2012-03-16 15:59:23 +01:00
|
|
|
girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, _("[No name]"));
|
2010-11-18 21:22:43 +01:00
|
|
|
|
2010-11-12 13:48:18 +01:00
|
|
|
/* signals */
|
2012-03-07 01:11:18 +01:00
|
|
|
g_signal_connect(G_OBJECT(zathura->ui.session->gtk.window), "destroy", G_CALLBACK(cb_destroy), zathura);
|
2010-12-29 11:46:13 +01:00
|
|
|
|
2012-03-16 15:47:30 +01:00
|
|
|
/* set page padding */
|
|
|
|
int page_padding = 1;
|
|
|
|
girara_setting_get(zathura->ui.session, "page-padding", &page_padding);
|
2011-04-19 19:24:03 +02:00
|
|
|
|
2012-08-05 02:30:03 +02:00
|
|
|
#if (GTK_MAJOR_VERSION == 3)
|
|
|
|
gtk_grid_set_row_spacing(GTK_GRID(zathura->ui.page_widget), page_padding);
|
|
|
|
gtk_grid_set_column_spacing(GTK_GRID(zathura->ui.page_widget), page_padding);
|
|
|
|
#else
|
2012-03-16 15:47:30 +01:00
|
|
|
gtk_table_set_row_spacings(GTK_TABLE(zathura->ui.page_widget), page_padding);
|
|
|
|
gtk_table_set_col_spacings(GTK_TABLE(zathura->ui.page_widget), page_padding);
|
2012-08-05 02:30:03 +02:00
|
|
|
#endif
|
2011-04-19 21:42:18 +02:00
|
|
|
|
2011-09-02 20:46:16 +02:00
|
|
|
/* database */
|
2012-03-04 15:56:54 +01:00
|
|
|
char* database = NULL;
|
|
|
|
girara_setting_get(zathura->ui.session, "database", &database);
|
|
|
|
|
|
|
|
if (g_strcmp0(database, "plain") == 0) {
|
2013-01-15 11:31:35 +01:00
|
|
|
girara_debug("Using plain database backend.");
|
2012-03-04 15:56:54 +01:00
|
|
|
zathura->database = zathura_plaindatabase_new(zathura->config.data_dir);
|
|
|
|
#ifdef WITH_SQLITE
|
|
|
|
} else if (g_strcmp0(database, "sqlite") == 0) {
|
2013-01-15 11:31:35 +01:00
|
|
|
girara_debug("Using sqlite database backend.");
|
2012-03-04 15:56:54 +01:00
|
|
|
char* tmp = g_build_filename(zathura->config.data_dir, "bookmarks.sqlite", NULL);
|
|
|
|
zathura->database = zathura_sqldatabase_new(tmp);
|
|
|
|
g_free(tmp);
|
|
|
|
#endif
|
|
|
|
} else {
|
|
|
|
girara_error("Database backend '%s' is not supported.", database);
|
|
|
|
}
|
|
|
|
g_free(database);
|
|
|
|
|
2011-09-02 20:46:16 +02:00
|
|
|
if (zathura->database == NULL) {
|
2011-10-03 17:28:14 +02:00
|
|
|
girara_error("Unable to initialize database. Bookmarks won't be available.");
|
2013-03-17 16:19:10 +01:00
|
|
|
} else {
|
2013-03-17 16:25:02 +01:00
|
|
|
g_object_set(zathura->ui.session->command_history, "io", zathura->database, NULL);
|
2011-09-02 20:46:16 +02:00
|
|
|
}
|
|
|
|
|
2011-09-01 15:43:34 +02:00
|
|
|
/* bookmarks */
|
2011-10-15 18:42:30 +02:00
|
|
|
zathura->bookmarks.bookmarks = girara_sorted_list_new2((girara_compare_function_t) zathura_bookmarks_compare,
|
2012-10-09 01:12:18 +02:00
|
|
|
(girara_free_function_t) zathura_bookmark_free);
|
2011-09-01 15:43:34 +02:00
|
|
|
|
2012-08-17 14:14:57 +02:00
|
|
|
/* jumplist */
|
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
int jumplist_size = 20;
|
|
|
|
girara_setting_get(zathura->ui.session, "jumplist-size", &jumplist_size);
|
2012-08-17 14:14:57 +02:00
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
zathura->jumplist.max_size = jumplist_size < 0 ? 0 : jumplist_size;
|
|
|
|
zathura->jumplist.list = NULL;
|
2012-08-17 14:14:57 +02:00
|
|
|
zathura->jumplist.size = 0;
|
|
|
|
zathura->jumplist.cur = NULL;
|
2013-03-26 04:50:22 +01:00
|
|
|
|
2012-08-05 15:34:10 +02:00
|
|
|
return true;
|
2010-12-26 01:52:17 +01:00
|
|
|
|
|
|
|
error_free:
|
|
|
|
|
2012-02-12 16:35:33 +01:00
|
|
|
if (zathura->ui.page_widget != NULL) {
|
2012-02-07 18:30:46 +01:00
|
|
|
g_object_unref(zathura->ui.page_widget);
|
2010-12-29 11:46:13 +01:00
|
|
|
}
|
|
|
|
|
2012-02-12 16:35:33 +01:00
|
|
|
if (zathura->ui.page_widget_alignment != NULL) {
|
2012-02-07 18:30:46 +01:00
|
|
|
g_object_unref(zathura->ui.page_widget_alignment);
|
2012-01-13 17:39:46 +01:00
|
|
|
}
|
2010-12-26 01:52:17 +01:00
|
|
|
|
2012-08-05 15:34:10 +02:00
|
|
|
return false;
|
2011-04-18 17:27:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
zathura_free(zathura_t* zathura)
|
|
|
|
{
|
|
|
|
if (zathura == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-02-20 20:07:24 +01:00
|
|
|
document_close(zathura, false);
|
2011-10-16 21:11:25 +02:00
|
|
|
|
2011-04-18 17:27:49 +02:00
|
|
|
if (zathura->ui.session != NULL) {
|
|
|
|
girara_session_destroy(zathura->ui.session);
|
|
|
|
}
|
|
|
|
|
2013-03-23 15:59:27 +01:00
|
|
|
if (zathura->ui.hadjustment != NULL) {
|
|
|
|
g_object_unref(G_OBJECT(zathura->ui.hadjustment));
|
|
|
|
}
|
|
|
|
if (zathura->ui.vadjustment != NULL) {
|
|
|
|
g_object_unref(G_OBJECT(zathura->ui.vadjustment));
|
|
|
|
}
|
|
|
|
|
2011-10-21 15:00:22 +02:00
|
|
|
/* stdin support */
|
|
|
|
if (zathura->stdin_support.file != NULL) {
|
|
|
|
g_unlink(zathura->stdin_support.file);
|
|
|
|
g_free(zathura->stdin_support.file);
|
|
|
|
}
|
|
|
|
|
2011-09-01 15:43:34 +02:00
|
|
|
/* bookmarks */
|
|
|
|
girara_list_free(zathura->bookmarks.bookmarks);
|
|
|
|
|
2011-09-02 20:46:16 +02:00
|
|
|
/* database */
|
2013-03-14 21:30:01 +01:00
|
|
|
if (zathura->database != NULL) {
|
|
|
|
g_object_unref(G_OBJECT(zathura->database));
|
|
|
|
}
|
2011-09-02 20:46:16 +02:00
|
|
|
|
2011-04-29 00:28:19 +02:00
|
|
|
/* free print settings */
|
2012-02-12 16:35:33 +01:00
|
|
|
if (zathura->print.settings != NULL) {
|
2011-09-21 09:46:54 +02:00
|
|
|
g_object_unref(zathura->print.settings);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (zathura->print.page_setup != NULL) {
|
|
|
|
g_object_unref(zathura->print.page_setup);
|
|
|
|
}
|
2011-04-29 00:28:19 +02:00
|
|
|
|
2011-04-18 17:27:49 +02:00
|
|
|
/* free registered plugins */
|
2012-04-01 18:32:16 +02:00
|
|
|
zathura_plugin_manager_free(zathura->plugins.manager);
|
2011-04-19 00:36:56 +02:00
|
|
|
|
|
|
|
/* free config variables */
|
|
|
|
g_free(zathura->config.config_dir);
|
|
|
|
g_free(zathura->config.data_dir);
|
2011-09-30 12:33:50 +02:00
|
|
|
|
2012-08-17 14:14:57 +02:00
|
|
|
/* free jumplist */
|
|
|
|
if (zathura->jumplist.list != NULL) {
|
|
|
|
girara_list_free(zathura->jumplist.list);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (zathura->jumplist.cur != NULL) {
|
|
|
|
girara_list_iterator_free(zathura->jumplist.cur);
|
|
|
|
}
|
|
|
|
|
2011-10-08 23:42:41 +02:00
|
|
|
g_free(zathura);
|
2010-06-03 18:05:34 +02:00
|
|
|
}
|
|
|
|
|
2012-08-05 15:34:10 +02:00
|
|
|
void
|
|
|
|
#if (GTK_MAJOR_VERSION == 2)
|
|
|
|
zathura_set_xid(zathura_t* zathura, GdkNativeWindow xid)
|
|
|
|
#else
|
|
|
|
zathura_set_xid(zathura_t* zathura, Window xid)
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
g_return_if_fail(zathura != NULL);
|
|
|
|
|
|
|
|
zathura->ui.session->gtk.embed = xid;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
zathura_set_config_dir(zathura_t* zathura, const char* dir)
|
|
|
|
{
|
|
|
|
g_return_if_fail(zathura != NULL);
|
|
|
|
|
|
|
|
if (dir != NULL) {
|
|
|
|
zathura->config.config_dir = g_strdup(dir);
|
|
|
|
} else {
|
|
|
|
gchar* path = girara_get_xdg_path(XDG_CONFIG);
|
|
|
|
zathura->config.config_dir = g_build_filename(path, "zathura", NULL);
|
|
|
|
g_free(path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
zathura_set_data_dir(zathura_t* zathura, const char* dir)
|
|
|
|
{
|
|
|
|
if (dir != NULL) {
|
|
|
|
zathura->config.data_dir = g_strdup(dir);
|
|
|
|
} else {
|
|
|
|
gchar* path = girara_get_xdg_path(XDG_DATA);
|
|
|
|
zathura->config.data_dir = g_build_filename(path, "zathura", NULL);
|
|
|
|
g_free(path);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_return_if_fail(zathura != NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
zathura_set_plugin_dir(zathura_t* zathura, const char* dir)
|
|
|
|
{
|
|
|
|
g_return_if_fail(zathura != NULL);
|
|
|
|
g_return_if_fail(zathura->plugins.manager != NULL);
|
|
|
|
|
|
|
|
if (dir != NULL) {
|
|
|
|
girara_list_t* paths = girara_split_path_array(dir);
|
|
|
|
GIRARA_LIST_FOREACH(paths, char*, iter, path)
|
2012-10-09 01:12:18 +02:00
|
|
|
zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
|
2012-08-05 15:34:10 +02:00
|
|
|
GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
|
|
|
|
girara_list_free(paths);
|
|
|
|
} else {
|
|
|
|
#ifdef ZATHURA_PLUGINDIR
|
|
|
|
girara_list_t* paths = girara_split_path_array(ZATHURA_PLUGINDIR);
|
|
|
|
GIRARA_LIST_FOREACH(paths, char*, iter, path)
|
2012-10-09 01:12:18 +02:00
|
|
|
zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
|
2012-08-05 15:34:10 +02:00
|
|
|
GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
|
|
|
|
girara_list_free(paths);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
zathura_set_synctex_editor_command(zathura_t* zathura, const char* command)
|
|
|
|
{
|
|
|
|
g_return_if_fail(zathura != NULL);
|
|
|
|
|
|
|
|
if (zathura->synctex.editor != NULL) {
|
|
|
|
g_free(zathura->synctex.editor);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (command != NULL) {
|
|
|
|
zathura->synctex.editor = g_strdup(command);
|
|
|
|
} else {
|
|
|
|
zathura->synctex.editor = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-13 18:17:20 +02:00
|
|
|
void
|
2012-12-06 12:24:36 +01:00
|
|
|
zathura_set_synctex(zathura_t* zathura, bool value)
|
2012-08-13 18:17:20 +02:00
|
|
|
{
|
|
|
|
g_return_if_fail(zathura != NULL);
|
|
|
|
g_return_if_fail(zathura->ui.session != NULL);
|
|
|
|
|
|
|
|
girara_setting_set(zathura->ui.session, "synctex", &value);
|
|
|
|
}
|
|
|
|
|
2012-08-05 15:34:10 +02:00
|
|
|
void
|
|
|
|
zathura_set_argv(zathura_t* zathura, char** argv)
|
|
|
|
{
|
|
|
|
g_return_if_fail(zathura != NULL);
|
|
|
|
|
|
|
|
zathura->global.arguments = argv;
|
|
|
|
}
|
|
|
|
|
2011-10-21 15:00:22 +02:00
|
|
|
static gchar*
|
|
|
|
prepare_document_open_from_stdin(zathura_t* zathura)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail(zathura, NULL);
|
|
|
|
|
|
|
|
GError* error = NULL;
|
|
|
|
gchar* file = NULL;
|
|
|
|
gint handle = g_file_open_tmp("zathura.stdin.XXXXXX", &file, &error);
|
2012-07-12 10:39:21 +02:00
|
|
|
if (handle == -1) {
|
2012-02-07 20:05:24 +01:00
|
|
|
if (error != NULL) {
|
|
|
|
girara_error("Can not create temporary file: %s", error->message);
|
|
|
|
g_error_free(error);
|
|
|
|
}
|
2011-10-21 15:00:22 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// read from stdin and dump to temporary file
|
|
|
|
int stdinfno = fileno(stdin);
|
2012-07-12 10:39:21 +02:00
|
|
|
if (stdinfno == -1) {
|
2011-10-21 15:00:22 +02:00
|
|
|
girara_error("Can not read from stdin.");
|
|
|
|
close(handle);
|
|
|
|
g_unlink(file);
|
|
|
|
g_free(file);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
char buffer[BUFSIZ];
|
|
|
|
ssize_t count = 0;
|
2012-07-12 10:39:21 +02:00
|
|
|
while ((count = read(stdinfno, buffer, BUFSIZ)) > 0) {
|
|
|
|
if (write(handle, buffer, count) != count) {
|
2011-10-21 15:00:22 +02:00
|
|
|
girara_error("Can not write to temporary file: %s", file);
|
|
|
|
close(handle);
|
|
|
|
g_unlink(file);
|
|
|
|
g_free(file);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2012-07-12 10:39:21 +02:00
|
|
|
|
2011-10-21 15:00:22 +02:00
|
|
|
close(handle);
|
|
|
|
|
2012-07-12 10:39:21 +02:00
|
|
|
if (count != 0) {
|
2011-10-21 15:00:22 +02:00
|
|
|
girara_error("Can not read from stdin.");
|
|
|
|
g_unlink(file);
|
|
|
|
g_free(file);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return file;
|
|
|
|
}
|
|
|
|
|
2011-10-21 14:11:37 +02:00
|
|
|
static gboolean
|
2011-04-18 21:22:35 +02:00
|
|
|
document_info_open(gpointer data)
|
|
|
|
{
|
|
|
|
zathura_document_info_t* document_info = data;
|
|
|
|
g_return_val_if_fail(document_info != NULL, FALSE);
|
|
|
|
|
2011-10-21 14:11:37 +02:00
|
|
|
if (document_info->zathura != NULL && document_info->path != NULL) {
|
2011-10-21 15:00:22 +02:00
|
|
|
char* file = NULL;
|
|
|
|
if (g_strcmp0(document_info->path, "-") == 0) {
|
|
|
|
file = prepare_document_open_from_stdin(document_info->zathura);
|
|
|
|
if (file == NULL) {
|
|
|
|
girara_notify(document_info->zathura->ui.session, GIRARA_ERROR,
|
2012-10-09 01:12:18 +02:00
|
|
|
"Could not read file from stdin and write it to a temporary file.");
|
2011-10-23 17:34:10 +02:00
|
|
|
} else {
|
|
|
|
document_info->zathura->stdin_support.file = g_strdup(file);
|
2011-10-21 15:00:22 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
file = g_strdup(document_info->path);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (file != NULL) {
|
2013-03-17 10:56:43 +01:00
|
|
|
document_open(document_info->zathura, file, document_info->password,
|
|
|
|
document_info->page_number);
|
2011-10-21 15:00:22 +02:00
|
|
|
g_free(file);
|
|
|
|
}
|
2011-04-18 21:22:35 +02:00
|
|
|
}
|
|
|
|
|
2011-10-21 14:11:37 +02:00
|
|
|
g_free(document_info);
|
2011-04-18 21:22:35 +02:00
|
|
|
return FALSE;
|
2010-06-03 18:05:34 +02:00
|
|
|
}
|
|
|
|
|
2010-12-12 22:04:42 +01:00
|
|
|
bool
|
2013-03-17 10:56:43 +01:00
|
|
|
document_open(zathura_t* zathura, const char* path, const char* password,
|
|
|
|
int page_number)
|
2010-12-12 22:04:42 +01:00
|
|
|
{
|
2012-04-03 09:02:45 +02:00
|
|
|
if (zathura == NULL || zathura->plugins.manager == NULL || path == NULL) {
|
2010-12-29 11:46:13 +01:00
|
|
|
goto error_out;
|
2010-12-12 22:04:42 +01:00
|
|
|
}
|
|
|
|
|
2013-03-11 23:26:14 +01:00
|
|
|
gchar* file_uri = NULL;
|
2012-04-03 09:02:45 +02:00
|
|
|
zathura_error_t error = ZATHURA_ERROR_OK;
|
|
|
|
zathura_document_t* document = zathura_document_open(zathura->plugins.manager, path, password, &error);
|
2010-12-12 22:04:42 +01:00
|
|
|
|
2012-02-12 16:35:33 +01:00
|
|
|
if (document == NULL) {
|
2012-04-03 09:02:45 +02:00
|
|
|
if (error == ZATHURA_ERROR_INVALID_PASSWORD) {
|
|
|
|
zathura_password_dialog_info_t* password_dialog_info = malloc(sizeof(zathura_password_dialog_info_t));
|
|
|
|
if (password_dialog_info != NULL) {
|
|
|
|
password_dialog_info->zathura = zathura;
|
|
|
|
|
|
|
|
if (path != NULL) {
|
|
|
|
password_dialog_info->path = g_strdup(path);
|
|
|
|
girara_dialog(zathura->ui.session, "Enter password:", true, NULL,
|
2012-10-09 01:12:18 +02:00
|
|
|
(girara_callback_inputbar_activate_t) cb_password_dialog, password_dialog_info);
|
2012-04-03 09:02:45 +02:00
|
|
|
goto error_out;
|
|
|
|
} else {
|
|
|
|
free(password_dialog_info);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
goto error_out;
|
|
|
|
}
|
2013-05-28 18:12:15 +02:00
|
|
|
if (error == ZATHURA_ERROR_OK ) {
|
|
|
|
girara_notify(zathura->ui.session, GIRARA_ERROR, _("Unsupported file type. Please install the necessary plugin."));
|
|
|
|
}
|
2010-12-29 11:46:13 +01:00
|
|
|
goto error_out;
|
2010-12-12 22:04:42 +01:00
|
|
|
}
|
|
|
|
|
2012-04-20 21:15:03 +02:00
|
|
|
const char* file_path = zathura_document_get_path(document);
|
|
|
|
unsigned int number_of_pages = zathura_document_get_number_of_pages(document);
|
2012-04-03 09:02:45 +02:00
|
|
|
|
2013-03-11 23:26:14 +01:00
|
|
|
if (number_of_pages == 0) {
|
|
|
|
girara_notify(zathura->ui.session, GIRARA_WARNING,
|
|
|
|
_("Document does not contain any pages"));
|
|
|
|
goto error_free;
|
|
|
|
}
|
|
|
|
|
2012-04-03 09:02:45 +02:00
|
|
|
/* read history file */
|
2012-07-13 14:05:07 +02:00
|
|
|
zathura_fileinfo_t file_info = { 0, 0, 1, 0, 0, 0, 0, 0 };
|
2012-05-07 00:32:55 +02:00
|
|
|
bool known_file = zathura_db_get_fileinfo(zathura->database, file_path, &file_info);
|
2012-04-03 09:02:45 +02:00
|
|
|
|
2012-04-22 10:04:46 +02:00
|
|
|
/* set page offset */
|
2012-04-20 21:15:03 +02:00
|
|
|
zathura_document_set_page_offset(document, file_info.page_offset);
|
2012-04-07 16:00:51 +02:00
|
|
|
|
2012-04-03 09:02:45 +02:00
|
|
|
/* check for valid scale value */
|
2012-04-20 21:15:03 +02:00
|
|
|
if (file_info.scale <= FLT_EPSILON) {
|
2012-04-03 09:02:45 +02:00
|
|
|
girara_warning("document info: '%s' has non positive scale", file_path);
|
|
|
|
zathura_document_set_scale(document, 1);
|
2012-04-07 16:00:51 +02:00
|
|
|
} else {
|
2012-04-20 21:15:03 +02:00
|
|
|
zathura_document_set_scale(document, file_info.scale);
|
2012-04-03 09:02:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* check current page number */
|
2013-03-17 10:56:43 +01:00
|
|
|
/* if it wasn't specified on the command-line, get it from file_info */
|
|
|
|
if (page_number == ZATHURA_PAGE_NUMBER_UNSPECIFIED)
|
|
|
|
page_number = file_info.current_page;
|
|
|
|
if (page_number < 0)
|
|
|
|
page_number += number_of_pages;
|
|
|
|
if ((unsigned)page_number > number_of_pages) {
|
2012-04-03 09:02:45 +02:00
|
|
|
girara_warning("document info: '%s' has an invalid page number", file_path);
|
|
|
|
zathura_document_set_current_page_number(document, 0);
|
2012-04-07 16:00:51 +02:00
|
|
|
} else {
|
2013-03-17 10:56:43 +01:00
|
|
|
zathura_document_set_current_page_number(document, page_number);
|
2012-04-07 16:00:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* check for valid rotation */
|
2012-04-20 21:15:03 +02:00
|
|
|
if (file_info.rotation % 90 != 0) {
|
2012-04-07 16:00:51 +02:00
|
|
|
girara_warning("document info: '%s' has an invalid rotation", file_path);
|
|
|
|
zathura_document_set_rotation(document, 0);
|
|
|
|
} else {
|
2012-04-20 21:15:03 +02:00
|
|
|
zathura_document_set_rotation(document, file_info.rotation % 360);
|
2012-04-03 09:02:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* jump to first page if setting enabled */
|
|
|
|
bool always_first_page = false;
|
|
|
|
girara_setting_get(zathura->ui.session, "open-first-page", &always_first_page);
|
|
|
|
if (always_first_page == true) {
|
|
|
|
zathura_document_set_current_page_number(document, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* apply open adjustment */
|
|
|
|
char* adjust_open = "best-fit";
|
2012-05-07 00:32:55 +02:00
|
|
|
if (known_file == false && girara_setting_get(zathura->ui.session, "adjust-open", &(adjust_open)) == true) {
|
2012-04-03 09:02:45 +02:00
|
|
|
if (g_strcmp0(adjust_open, "best-fit") == 0) {
|
|
|
|
zathura_document_set_adjust_mode(document, ZATHURA_ADJUST_BESTFIT);
|
|
|
|
} else if (g_strcmp0(adjust_open, "width") == 0) {
|
|
|
|
zathura_document_set_adjust_mode(document, ZATHURA_ADJUST_WIDTH);
|
|
|
|
} else {
|
|
|
|
zathura_document_set_adjust_mode(document, ZATHURA_ADJUST_NONE);
|
|
|
|
}
|
|
|
|
g_free(adjust_open);
|
2012-05-07 00:32:55 +02:00
|
|
|
} else {
|
|
|
|
zathura_document_set_adjust_mode(document, ZATHURA_ADJUST_NONE);
|
2012-04-03 09:02:45 +02:00
|
|
|
}
|
|
|
|
|
2013-07-07 17:27:25 +02:00
|
|
|
/* initialize bisect state */
|
|
|
|
zathura->bisect.start = 0;
|
|
|
|
zathura->bisect.last_jump = zathura_document_get_current_page_number(document);
|
|
|
|
zathura->bisect.end = number_of_pages - 1;
|
|
|
|
|
2012-04-03 09:02:45 +02:00
|
|
|
/* update statusbar */
|
2013-02-28 16:20:54 +01:00
|
|
|
bool basename_only = false;
|
|
|
|
girara_setting_get(zathura->ui.session, "statusbar-basename", &basename_only);
|
|
|
|
if (basename_only == false) {
|
|
|
|
girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, file_path);
|
|
|
|
} else {
|
2013-07-22 15:01:05 +02:00
|
|
|
girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, zathura_document_get_basename(document));
|
2013-02-28 16:20:54 +01:00
|
|
|
}
|
2012-04-03 09:02:45 +02:00
|
|
|
|
2012-02-20 20:07:24 +01:00
|
|
|
/* install file monitor */
|
2013-03-11 23:26:14 +01:00
|
|
|
file_uri = g_filename_to_uri(file_path, NULL, NULL);
|
2012-02-20 20:07:24 +01:00
|
|
|
if (file_uri == NULL) {
|
|
|
|
goto error_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (zathura->file_monitor.file == NULL) {
|
2012-03-02 20:34:41 +01:00
|
|
|
zathura->file_monitor.file = g_file_new_for_uri(file_uri);
|
|
|
|
if (zathura->file_monitor.file == NULL) {
|
|
|
|
goto error_free;
|
|
|
|
}
|
2012-02-20 20:07:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (zathura->file_monitor.monitor == NULL) {
|
2012-03-02 20:34:41 +01:00
|
|
|
zathura->file_monitor.monitor = g_file_monitor_file(zathura->file_monitor.file, G_FILE_MONITOR_NONE, NULL, NULL);
|
|
|
|
if (zathura->file_monitor.monitor == NULL) {
|
|
|
|
goto error_free;
|
|
|
|
}
|
|
|
|
g_signal_connect(G_OBJECT(zathura->file_monitor.monitor), "changed", G_CALLBACK(cb_file_monitor), zathura->ui.session);
|
2012-02-20 20:07:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (zathura->file_monitor.file_path == NULL) {
|
2012-03-27 21:59:35 +02:00
|
|
|
zathura->file_monitor.file_path = g_strdup(file_path);
|
2012-03-02 20:34:41 +01:00
|
|
|
if (zathura->file_monitor.file_path == NULL) {
|
|
|
|
goto error_free;
|
|
|
|
}
|
2012-02-20 20:07:24 +01:00
|
|
|
}
|
|
|
|
|
2012-03-27 21:59:35 +02:00
|
|
|
if (password != NULL) {
|
2012-03-02 20:34:41 +01:00
|
|
|
g_free(zathura->file_monitor.password);
|
2012-03-27 21:59:35 +02:00
|
|
|
zathura->file_monitor.password = g_strdup(password);
|
2012-02-20 20:07:24 +01:00
|
|
|
if (zathura->file_monitor.password == NULL) {
|
|
|
|
goto error_free;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-21 04:59:58 +02:00
|
|
|
/* create marks list */
|
|
|
|
zathura->global.marks = girara_list_new2((girara_free_function_t) mark_free);
|
|
|
|
if (zathura->global.marks == NULL) {
|
|
|
|
goto error_free;
|
|
|
|
}
|
|
|
|
|
2011-04-18 17:27:49 +02:00
|
|
|
zathura->document = document;
|
2010-12-12 22:04:42 +01:00
|
|
|
|
2013-10-18 20:00:04 +02:00
|
|
|
/* page cache size */
|
|
|
|
int cache_size = 0;
|
|
|
|
girara_setting_get(zathura->ui.session, "page-cache-size", &cache_size);
|
|
|
|
if (cache_size <= 0) {
|
|
|
|
girara_warning("page-cache-size is not positive, using %d instead",
|
|
|
|
ZATHURA_PAGE_CACHE_DEFAULT_SIZE);
|
|
|
|
cache_size = ZATHURA_PAGE_CACHE_DEFAULT_SIZE;
|
|
|
|
}
|
|
|
|
|
2013-08-21 18:32:18 +02:00
|
|
|
/* threads */
|
2013-10-18 20:00:04 +02:00
|
|
|
zathura->sync.render_thread = zathura_renderer_new(cache_size);
|
2013-08-21 18:32:18 +02:00
|
|
|
|
|
|
|
if (zathura->sync.render_thread == NULL) {
|
|
|
|
goto error_free;
|
|
|
|
}
|
|
|
|
|
2013-08-30 15:05:00 +02:00
|
|
|
/* set up recolor info in ZathuraRenderer */
|
2013-08-24 00:07:32 +02:00
|
|
|
char* recolor_dark = NULL;
|
|
|
|
char* recolor_light = NULL;
|
|
|
|
girara_setting_get(zathura->ui.session, "recolor-darkcolor", &recolor_dark);
|
|
|
|
girara_setting_get(zathura->ui.session, "recolor-lightcolor", &recolor_light);
|
|
|
|
zathura_renderer_set_recolor_colors_str(zathura->sync.render_thread,
|
|
|
|
recolor_light, recolor_dark);
|
|
|
|
g_free(recolor_dark);
|
|
|
|
g_free(recolor_light);
|
|
|
|
|
2013-08-30 18:55:42 +02:00
|
|
|
bool recolor = false;
|
|
|
|
girara_setting_get(zathura->ui.session, "recolor", &recolor);
|
|
|
|
zathura_renderer_enable_recolor(zathura->sync.render_thread, recolor);
|
|
|
|
girara_setting_get(zathura->ui.session, "recolor-keephue", &recolor);
|
|
|
|
zathura_renderer_enable_recolor_hue(zathura->sync.render_thread, recolor);
|
|
|
|
|
2012-04-03 09:02:45 +02:00
|
|
|
/* create blank pages */
|
|
|
|
zathura->pages = calloc(number_of_pages, sizeof(GtkWidget*));
|
|
|
|
if (zathura->pages == NULL) {
|
|
|
|
goto error_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (unsigned int page_id = 0; page_id < number_of_pages; page_id++) {
|
|
|
|
zathura_page_t* page = zathura_document_get_page(document, page_id);
|
|
|
|
if (page == NULL) {
|
|
|
|
goto error_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkWidget* page_widget = zathura_page_widget_new(zathura, page);
|
|
|
|
if (page_widget == NULL) {
|
|
|
|
goto error_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
zathura->pages[page_id] = page_widget;
|
|
|
|
|
|
|
|
/* set widget size */
|
|
|
|
unsigned int page_height = 0;
|
|
|
|
unsigned int page_width = 0;
|
2013-10-20 19:20:03 +02:00
|
|
|
|
|
|
|
double height = zathura_page_get_height(page);
|
|
|
|
double width = zathura_page_get_width(page);
|
|
|
|
page_calc_height_width(zathura->document, height, width, &page_height, &page_width, true);
|
2012-04-03 09:02:45 +02:00
|
|
|
|
|
|
|
gtk_widget_set_size_request(page_widget, page_width, page_height);
|
2013-08-31 13:12:41 +02:00
|
|
|
|
|
|
|
g_signal_connect(G_OBJECT(page_widget), "text-selected",
|
|
|
|
G_CALLBACK(cb_page_widget_text_selected), zathura);
|
|
|
|
g_signal_connect(G_OBJECT(page_widget), "image-selected",
|
|
|
|
G_CALLBACK(cb_page_widget_text_selected), zathura);
|
2012-04-03 09:02:45 +02:00
|
|
|
}
|
|
|
|
|
2011-03-18 18:40:20 +01:00
|
|
|
/* view mode */
|
2012-02-03 22:15:29 +01:00
|
|
|
int pages_per_row = 1;
|
2012-06-27 22:34:16 +02:00
|
|
|
int first_page_column = 1;
|
2012-04-20 23:35:48 +02:00
|
|
|
if (file_info.pages_per_row > 0) {
|
|
|
|
pages_per_row = file_info.pages_per_row;
|
|
|
|
} else {
|
|
|
|
girara_setting_get(zathura->ui.session, "pages-per-row", &pages_per_row);
|
|
|
|
}
|
2012-04-29 06:26:38 +02:00
|
|
|
|
2012-06-27 22:34:16 +02:00
|
|
|
if (file_info.first_page_column > 0) {
|
|
|
|
first_page_column = file_info.first_page_column;
|
|
|
|
} else {
|
|
|
|
girara_setting_get(zathura->ui.session, "first-page-column", &first_page_column);
|
|
|
|
}
|
|
|
|
|
2012-04-29 06:26:38 +02:00
|
|
|
girara_setting_set(zathura->ui.session, "pages-per-row", &pages_per_row);
|
2012-06-27 22:34:16 +02:00
|
|
|
girara_setting_set(zathura->ui.session, "first-page-column", &first_page_column);
|
|
|
|
page_widget_set_mode(zathura, pages_per_row, first_page_column);
|
2010-12-28 09:47:09 +01:00
|
|
|
|
2012-02-07 18:30:46 +01:00
|
|
|
girara_set_view(zathura->ui.session, zathura->ui.page_widget_alignment);
|
2010-12-28 09:47:09 +01:00
|
|
|
|
2012-03-27 21:59:35 +02:00
|
|
|
for (unsigned int page_id = 0; page_id < number_of_pages; page_id++) {
|
2012-04-03 09:02:45 +02:00
|
|
|
gtk_widget_realize(zathura->pages[page_id]);
|
2010-12-29 11:46:13 +01:00
|
|
|
}
|
2010-12-12 22:04:42 +01:00
|
|
|
|
2011-09-03 14:21:36 +02:00
|
|
|
/* bookmarks */
|
2012-03-27 21:59:35 +02:00
|
|
|
zathura_bookmarks_load(zathura, file_path);
|
2011-09-03 14:21:36 +02:00
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
/* jumplist */
|
|
|
|
if (zathura_jumplist_load(zathura, file_path) == false) {
|
|
|
|
zathura->jumplist.list = girara_list_new2(g_free);
|
|
|
|
}
|
|
|
|
|
2012-03-16 07:58:55 +01:00
|
|
|
/* update title */
|
2013-02-28 16:20:54 +01:00
|
|
|
basename_only = false;
|
2012-07-02 14:13:13 +02:00
|
|
|
girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only);
|
|
|
|
if (basename_only == false) {
|
|
|
|
girara_set_window_title(zathura->ui.session, file_path);
|
|
|
|
} else {
|
2013-07-22 15:01:05 +02:00
|
|
|
girara_set_window_title(zathura->ui.session, zathura_document_get_basename(document));
|
2012-07-02 14:13:13 +02:00
|
|
|
}
|
2012-03-16 07:58:55 +01:00
|
|
|
|
2012-04-03 09:02:45 +02:00
|
|
|
g_free(file_uri);
|
2012-02-20 20:07:24 +01:00
|
|
|
|
2012-03-25 20:31:19 +02:00
|
|
|
/* adjust window */
|
2012-03-27 21:59:35 +02:00
|
|
|
girara_argument_t argument = { zathura_document_get_adjust_mode(document), NULL };
|
2012-03-25 20:31:19 +02:00
|
|
|
sc_adjust_window(zathura->ui.session, &argument, NULL, 0);
|
|
|
|
|
2012-04-20 23:35:48 +02:00
|
|
|
/* set position */
|
|
|
|
if (file_info.position_x != 0 || file_info.position_y != 0) {
|
2012-04-21 04:59:58 +02:00
|
|
|
position_set_delayed(zathura, file_info.position_x, file_info.position_y);
|
2012-04-20 23:35:48 +02:00
|
|
|
} else {
|
|
|
|
page_set_delayed(zathura, zathura_document_get_current_page_number(document));
|
|
|
|
cb_view_vadjustment_value_changed(NULL, zathura);
|
|
|
|
}
|
|
|
|
|
2010-12-12 22:04:42 +01:00
|
|
|
return true;
|
2010-12-29 11:46:13 +01:00
|
|
|
|
|
|
|
error_free:
|
|
|
|
|
2012-02-20 20:07:24 +01:00
|
|
|
if (file_uri != NULL) {
|
|
|
|
g_free(file_uri);
|
|
|
|
}
|
|
|
|
|
2010-12-29 11:46:13 +01:00
|
|
|
zathura_document_free(document);
|
|
|
|
|
|
|
|
error_out:
|
|
|
|
|
|
|
|
return false;
|
2010-12-12 22:04:42 +01:00
|
|
|
}
|
|
|
|
|
2012-08-05 15:34:10 +02:00
|
|
|
void
|
2013-03-17 10:56:43 +01:00
|
|
|
document_open_idle(zathura_t* zathura, const char* path, const char* password,
|
|
|
|
int page_number)
|
2012-08-05 15:34:10 +02:00
|
|
|
{
|
|
|
|
if (zathura == NULL || path == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
zathura_document_info_t* document_info = g_malloc0(sizeof(zathura_document_info_t));
|
|
|
|
|
2013-03-17 10:56:43 +01:00
|
|
|
document_info->zathura = zathura;
|
|
|
|
document_info->path = path;
|
|
|
|
document_info->password = password;
|
|
|
|
document_info->page_number = page_number;
|
2012-08-05 15:34:10 +02:00
|
|
|
|
|
|
|
gdk_threads_add_idle(document_info_open, document_info);
|
|
|
|
}
|
|
|
|
|
2011-09-01 11:51:49 +02:00
|
|
|
bool
|
|
|
|
document_save(zathura_t* zathura, const char* path, bool overwrite)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail(zathura, false);
|
|
|
|
g_return_val_if_fail(zathura->document, false);
|
|
|
|
g_return_val_if_fail(path, false);
|
|
|
|
|
|
|
|
gchar* file_path = girara_fix_path(path);
|
2013-01-17 12:07:53 +01:00
|
|
|
/* use current basename if path points to a directory */
|
|
|
|
if (g_file_test(file_path, G_FILE_TEST_IS_DIR) == TRUE) {
|
|
|
|
char* basename = g_path_get_basename(zathura_document_get_path(zathura->document));
|
|
|
|
char* tmp = file_path;
|
|
|
|
file_path = g_strconcat(file_path, "/", basename, NULL);
|
|
|
|
g_free(tmp);
|
|
|
|
g_free(basename);
|
|
|
|
}
|
|
|
|
|
2012-10-09 01:12:18 +02:00
|
|
|
if ((overwrite == false) && g_file_test(file_path, G_FILE_TEST_EXISTS)) {
|
2011-11-12 18:21:45 +01:00
|
|
|
girara_error("File already exists: %s. Use :write! to overwrite it.", file_path);
|
2011-10-21 15:00:22 +02:00
|
|
|
g_free(file_path);
|
2011-09-01 11:51:49 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-03-27 13:30:04 +02:00
|
|
|
zathura_error_t error = zathura_document_save_as(zathura->document, file_path);
|
2011-09-01 11:51:49 +02:00
|
|
|
g_free(file_path);
|
2012-03-04 23:54:03 +01:00
|
|
|
|
2012-03-27 13:30:04 +02:00
|
|
|
return (error == ZATHURA_ERROR_OK) ? true : false;
|
2011-09-01 11:51:49 +02:00
|
|
|
}
|
|
|
|
|
2011-07-21 14:39:25 +02:00
|
|
|
static void
|
|
|
|
remove_page_from_table(GtkWidget* page, gpointer permanent)
|
|
|
|
{
|
2012-02-12 16:35:33 +01:00
|
|
|
if (permanent == false) {
|
2011-07-21 14:39:25 +02:00
|
|
|
g_object_ref(G_OBJECT(page));
|
|
|
|
}
|
|
|
|
|
2012-02-13 12:43:22 +01:00
|
|
|
gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(page)), page);
|
2011-07-21 14:39:25 +02:00
|
|
|
}
|
|
|
|
|
2010-12-12 22:04:42 +01:00
|
|
|
bool
|
2012-02-20 20:07:24 +01:00
|
|
|
document_close(zathura_t* zathura, bool keep_monitor)
|
2010-12-12 22:04:42 +01:00
|
|
|
{
|
2012-02-20 20:07:24 +01:00
|
|
|
if (zathura == NULL || zathura->document == NULL) {
|
2010-12-12 22:04:42 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-08-21 18:32:18 +02:00
|
|
|
/* stop rendering */
|
|
|
|
zathura_renderer_stop(zathura->sync.render_thread);
|
|
|
|
|
2012-02-20 20:07:24 +01:00
|
|
|
/* remove monitor */
|
|
|
|
if (keep_monitor == false) {
|
|
|
|
if (zathura->file_monitor.monitor != NULL) {
|
|
|
|
g_file_monitor_cancel(zathura->file_monitor.monitor);
|
|
|
|
g_object_unref(zathura->file_monitor.monitor);
|
|
|
|
zathura->file_monitor.monitor = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (zathura->file_monitor.file != NULL) {
|
|
|
|
g_object_unref(zathura->file_monitor.file);
|
|
|
|
zathura->file_monitor.file = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (zathura->file_monitor.file_path != NULL) {
|
|
|
|
g_free(zathura->file_monitor.file_path);
|
|
|
|
zathura->file_monitor.file_path = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (zathura->file_monitor.password != NULL) {
|
|
|
|
g_free(zathura->file_monitor.password);
|
|
|
|
zathura->file_monitor.password = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-21 04:59:58 +02:00
|
|
|
/* remove marks */
|
|
|
|
if (zathura->global.marks != NULL) {
|
|
|
|
girara_list_free(zathura->global.marks);
|
|
|
|
zathura->global.marks = NULL;
|
|
|
|
}
|
|
|
|
|
2012-04-20 21:15:03 +02:00
|
|
|
/* store file information */
|
|
|
|
const char* path = zathura_document_get_path(zathura->document);
|
2012-03-27 21:59:35 +02:00
|
|
|
|
2012-06-27 22:34:16 +02:00
|
|
|
zathura_fileinfo_t file_info = { 0, 0, 1, 0, 1, 1, 0, 0 };
|
2012-04-20 21:15:03 +02:00
|
|
|
file_info.current_page = zathura_document_get_current_page_number(zathura->document);
|
|
|
|
file_info.page_offset = zathura_document_get_page_offset(zathura->document);
|
|
|
|
file_info.scale = zathura_document_get_scale(zathura->document);
|
|
|
|
file_info.rotation = zathura_document_get_rotation(zathura->document);
|
|
|
|
|
2012-04-20 23:35:48 +02:00
|
|
|
girara_setting_get(zathura->ui.session, "pages-per-row", &(file_info.pages_per_row));
|
2012-06-27 22:34:16 +02:00
|
|
|
girara_setting_get(zathura->ui.session, "first-page-column", &(file_info.first_page_column));
|
2012-04-20 23:35:48 +02:00
|
|
|
|
|
|
|
/* get position */
|
|
|
|
GtkScrolledWindow *window = GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view);
|
|
|
|
GtkAdjustment* vadjustment = gtk_scrolled_window_get_vadjustment(window);
|
|
|
|
GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(window);
|
|
|
|
|
|
|
|
file_info.position_x = gtk_adjustment_get_value(hadjustment);
|
|
|
|
file_info.position_y = gtk_adjustment_get_value(vadjustment);
|
|
|
|
|
|
|
|
/* save file info */
|
2012-04-20 21:15:03 +02:00
|
|
|
zathura_db_set_fileinfo(zathura->database, path, &file_info);
|
2011-10-06 17:57:26 +02:00
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
/* save jumplist */
|
|
|
|
zathura_db_save_jumplist(zathura->database, path, zathura->jumplist.list);
|
|
|
|
girara_list_iterator_free(zathura->jumplist.cur);
|
|
|
|
zathura->jumplist.cur = NULL;
|
|
|
|
girara_list_free(zathura->jumplist.list);
|
|
|
|
zathura->jumplist.list = NULL;
|
|
|
|
zathura->jumplist.size = 0;
|
|
|
|
|
2012-04-03 09:02:45 +02:00
|
|
|
/* release render thread */
|
2013-08-21 18:32:18 +02:00
|
|
|
g_object_unref(zathura->sync.render_thread);
|
2011-07-21 14:39:25 +02:00
|
|
|
zathura->sync.render_thread = NULL;
|
|
|
|
|
2012-04-03 09:02:45 +02:00
|
|
|
/* remove widgets */
|
2012-04-20 23:35:48 +02:00
|
|
|
gtk_container_foreach(GTK_CONTAINER(zathura->ui.page_widget), remove_page_from_table, (gpointer) 1);
|
2012-05-08 17:10:57 +02:00
|
|
|
for (unsigned int i = 0; i < zathura_document_get_number_of_pages(zathura->document); i++) {
|
|
|
|
g_object_unref(zathura->pages[i]);
|
2013-04-17 13:42:03 +02:00
|
|
|
g_object_unref(zathura->pages[i]); // FIXME
|
2012-05-08 17:10:57 +02:00
|
|
|
}
|
2012-04-03 09:02:45 +02:00
|
|
|
free(zathura->pages);
|
|
|
|
zathura->pages = NULL;
|
2011-01-24 12:43:39 +01:00
|
|
|
|
2012-04-03 09:02:45 +02:00
|
|
|
/* remove document */
|
2011-04-18 17:27:49 +02:00
|
|
|
zathura_document_free(zathura->document);
|
2011-07-21 14:39:25 +02:00
|
|
|
zathura->document = NULL;
|
|
|
|
|
2012-04-16 09:17:25 +02:00
|
|
|
/* remove index */
|
|
|
|
if (zathura->ui.index != NULL) {
|
|
|
|
g_object_ref_sink(zathura->ui.index);
|
|
|
|
zathura->ui.index = NULL;
|
|
|
|
}
|
|
|
|
|
2012-02-07 18:30:46 +01:00
|
|
|
gtk_widget_hide(zathura->ui.page_widget);
|
2011-09-29 17:32:35 +02:00
|
|
|
|
|
|
|
statusbar_page_number_update(zathura);
|
|
|
|
|
|
|
|
if (zathura->ui.session != NULL && zathura->ui.statusbar.file != NULL) {
|
2012-03-16 13:42:15 +01:00
|
|
|
girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, _("[No name]"));
|
2011-09-29 17:32:35 +02:00
|
|
|
}
|
2010-12-12 22:04:42 +01:00
|
|
|
|
2012-03-16 07:58:55 +01:00
|
|
|
/* update title */
|
|
|
|
girara_set_window_title(zathura->ui.session, "zathura");
|
|
|
|
|
2010-12-12 22:04:42 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-10-06 17:48:17 +02:00
|
|
|
static gboolean
|
2011-12-11 19:30:36 +01:00
|
|
|
page_set_delayed_impl(gpointer data)
|
|
|
|
{
|
2011-10-06 17:48:17 +02:00
|
|
|
page_set_delayed_t* p = data;
|
|
|
|
page_set(p->zathura, p->page);
|
|
|
|
|
|
|
|
g_free(p);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
page_set_delayed(zathura_t* zathura, unsigned int page_id)
|
|
|
|
{
|
2012-03-27 21:59:35 +02:00
|
|
|
if (zathura == NULL || zathura->document == NULL ||
|
|
|
|
(page_id >= zathura_document_get_number_of_pages(zathura->document))) {
|
2011-10-06 17:48:17 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
page_set_delayed_t* p = g_malloc(sizeof(page_set_delayed_t));
|
|
|
|
p->zathura = zathura;
|
|
|
|
p->page = page_id;
|
2012-02-16 16:18:12 +01:00
|
|
|
gdk_threads_add_idle(page_set_delayed_impl, p);
|
2011-10-06 17:48:17 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2010-12-12 22:04:42 +01:00
|
|
|
bool
|
2011-04-18 17:27:49 +02:00
|
|
|
page_set(zathura_t* zathura, unsigned int page_id)
|
2010-12-12 22:04:42 +01:00
|
|
|
{
|
2012-03-27 21:59:35 +02:00
|
|
|
if (zathura == NULL || zathura->document == NULL) {
|
2010-12-26 01:52:17 +01:00
|
|
|
goto error_out;
|
2010-12-12 22:04:42 +01:00
|
|
|
}
|
|
|
|
|
2010-12-27 09:07:17 +01:00
|
|
|
/* render page */
|
2012-03-27 21:59:35 +02:00
|
|
|
zathura_page_t* page = zathura_document_get_page(zathura->document, page_id);
|
2010-12-27 09:44:28 +01:00
|
|
|
|
2012-02-12 16:35:33 +01:00
|
|
|
if (page == NULL) {
|
2010-12-27 09:07:17 +01:00
|
|
|
goto error_out;
|
|
|
|
}
|
|
|
|
|
2012-03-27 21:59:35 +02:00
|
|
|
zathura_document_set_current_page_number(zathura->document, page_id);
|
2012-02-21 20:39:42 +01:00
|
|
|
zathura->global.update_page_number = false;
|
2012-02-20 12:40:25 +01:00
|
|
|
|
2012-02-07 14:56:58 +01:00
|
|
|
page_offset_t offset;
|
2012-04-03 09:02:45 +02:00
|
|
|
page_calculate_offset(zathura, page, &offset);
|
2011-04-27 20:32:57 +02:00
|
|
|
|
2011-04-18 17:27:49 +02:00
|
|
|
GtkAdjustment* view_vadjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view));
|
2011-04-27 20:32:57 +02:00
|
|
|
GtkAdjustment* view_hadjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view));
|
2013-03-23 15:59:27 +01:00
|
|
|
zathura_adjustment_set_value(view_hadjustment, offset.x);
|
|
|
|
zathura_adjustment_set_value(view_vadjustment, offset.y);
|
2010-12-27 09:07:17 +01:00
|
|
|
|
2013-07-06 21:55:35 +02:00
|
|
|
/* refresh horizontal adjustment, to honor zoom-center */
|
|
|
|
cb_view_hadjustment_changed(view_hadjustment, zathura);
|
|
|
|
|
2012-02-21 22:12:44 +01:00
|
|
|
statusbar_page_number_update(zathura);
|
|
|
|
|
2010-12-12 22:04:42 +01:00
|
|
|
return true;
|
2010-12-26 01:52:17 +01:00
|
|
|
|
|
|
|
error_out:
|
|
|
|
|
|
|
|
return false;
|
2010-12-12 22:04:42 +01:00
|
|
|
}
|
|
|
|
|
2011-04-27 19:57:49 +02:00
|
|
|
void
|
|
|
|
statusbar_page_number_update(zathura_t* zathura)
|
|
|
|
{
|
|
|
|
if (zathura == NULL || zathura->ui.statusbar.page_number == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-03-27 21:59:35 +02:00
|
|
|
unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document);
|
|
|
|
unsigned int current_page_number = zathura_document_get_current_page_number(zathura->document);
|
|
|
|
|
2011-09-29 17:32:35 +02:00
|
|
|
if (zathura->document != NULL) {
|
2012-03-27 21:59:35 +02:00
|
|
|
char* page_number_text = g_strdup_printf("[%d/%d]", current_page_number + 1, number_of_pages);
|
2011-09-29 17:32:35 +02:00
|
|
|
girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.page_number, page_number_text);
|
2013-07-22 15:01:05 +02:00
|
|
|
|
|
|
|
bool page_number_in_window_title = false;
|
|
|
|
girara_setting_get(zathura->ui.session, "window-title-page", &page_number_in_window_title);
|
|
|
|
|
|
|
|
if (page_number_in_window_title == true) {
|
|
|
|
bool basename_only = false;
|
|
|
|
girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only);
|
|
|
|
char* title = g_strdup_printf("%s %s",
|
|
|
|
(basename_only == true)
|
|
|
|
? zathura_document_get_basename(zathura->document)
|
|
|
|
: zathura_document_get_path(zathura->document),
|
|
|
|
page_number_text);
|
|
|
|
girara_set_window_title(zathura->ui.session, title);
|
|
|
|
g_free(title);
|
|
|
|
}
|
|
|
|
|
2011-09-29 17:32:35 +02:00
|
|
|
g_free(page_number_text);
|
|
|
|
} else {
|
|
|
|
girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.page_number, "");
|
|
|
|
}
|
2011-04-27 19:57:49 +02:00
|
|
|
}
|
|
|
|
|
2011-03-18 18:40:20 +01:00
|
|
|
void
|
2012-06-27 22:34:16 +02:00
|
|
|
page_widget_set_mode(zathura_t* zathura, unsigned int pages_per_row, unsigned int first_page_column)
|
2011-03-18 18:40:20 +01:00
|
|
|
{
|
2011-04-25 16:54:21 +02:00
|
|
|
/* show at least one page */
|
|
|
|
if (pages_per_row == 0) {
|
|
|
|
pages_per_row = 1;
|
|
|
|
}
|
|
|
|
|
2012-10-09 01:12:18 +02:00
|
|
|
/* ensure: 0 < first_page_column <= pages_per_row */
|
|
|
|
if (first_page_column < 1) {
|
|
|
|
first_page_column = 1;
|
|
|
|
}
|
2012-06-27 22:34:16 +02:00
|
|
|
|
2012-10-09 01:12:18 +02:00
|
|
|
if (first_page_column > pages_per_row) {
|
|
|
|
first_page_column = ((first_page_column - 1) % pages_per_row) + 1;
|
|
|
|
}
|
2012-06-27 22:34:16 +02:00
|
|
|
|
2011-07-21 14:47:24 +02:00
|
|
|
if (zathura->document == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-02-07 18:30:46 +01:00
|
|
|
gtk_container_foreach(GTK_CONTAINER(zathura->ui.page_widget), remove_page_from_table, (gpointer)0);
|
2011-07-21 14:47:24 +02:00
|
|
|
|
2012-03-27 21:59:35 +02:00
|
|
|
unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document);
|
2012-08-05 02:30:03 +02:00
|
|
|
#if (GTK_MAJOR_VERSION == 3)
|
|
|
|
#else
|
2012-06-27 22:34:16 +02:00
|
|
|
gtk_table_resize(GTK_TABLE(zathura->ui.page_widget), ceil((number_of_pages + first_page_column - 1) / pages_per_row), pages_per_row);
|
2012-08-05 02:30:03 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
for (unsigned int i = 0; i < number_of_pages; i++) {
|
2012-06-27 22:34:16 +02:00
|
|
|
int x = (i + first_page_column - 1) % pages_per_row;
|
|
|
|
int y = (i + first_page_column - 1) / pages_per_row;
|
2012-03-26 14:44:56 +02:00
|
|
|
|
2012-03-27 21:59:35 +02:00
|
|
|
zathura_page_t* page = zathura_document_get_page(zathura->document, i);
|
2012-04-03 09:02:45 +02:00
|
|
|
GtkWidget* page_widget = zathura_page_get_widget(zathura, page);
|
2012-08-05 02:30:03 +02:00
|
|
|
#if (GTK_MAJOR_VERSION == 3)
|
|
|
|
gtk_grid_attach(GTK_GRID(zathura->ui.page_widget), page_widget, x, y, 1, 1);
|
|
|
|
#else
|
2012-03-26 14:44:56 +02:00
|
|
|
gtk_table_attach(GTK_TABLE(zathura->ui.page_widget), page_widget, x, x + 1, y, y + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
|
2012-08-05 02:30:03 +02:00
|
|
|
#endif
|
2011-03-18 18:40:20 +01:00
|
|
|
}
|
|
|
|
|
2012-02-07 18:30:46 +01:00
|
|
|
gtk_widget_show_all(zathura->ui.page_widget);
|
2011-03-18 18:40:20 +01:00
|
|
|
}
|
2012-03-24 16:15:34 +01:00
|
|
|
|
2012-04-20 23:35:48 +02:00
|
|
|
static gboolean
|
2012-04-21 04:59:58 +02:00
|
|
|
position_set_delayed_impl(gpointer data)
|
2012-04-20 23:35:48 +02:00
|
|
|
{
|
|
|
|
position_set_delayed_t* p = (position_set_delayed_t*) data;
|
|
|
|
|
|
|
|
GtkScrolledWindow *window = GTK_SCROLLED_WINDOW(p->zathura->ui.session->gtk.view);
|
|
|
|
GtkAdjustment* vadjustment = gtk_scrolled_window_get_vadjustment(window);
|
|
|
|
GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(window);
|
|
|
|
|
2012-08-16 18:41:31 +02:00
|
|
|
/* negative values mean: don't set the position */
|
|
|
|
if (p->position_x >= 0) {
|
|
|
|
zathura_adjustment_set_value(hadjustment, p->position_x);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p->position_y >= 0) {
|
|
|
|
zathura_adjustment_set_value(vadjustment, p->position_y);
|
|
|
|
}
|
2012-04-20 23:35:48 +02:00
|
|
|
|
2012-05-08 17:02:18 +02:00
|
|
|
g_free(p);
|
|
|
|
|
2012-04-20 23:35:48 +02:00
|
|
|
return FALSE;
|
|
|
|
}
|
2012-04-21 04:59:58 +02:00
|
|
|
|
2013-06-09 05:53:31 +02:00
|
|
|
void
|
2012-04-21 04:59:58 +02:00
|
|
|
position_set_delayed(zathura_t* zathura, double position_x, double position_y)
|
|
|
|
{
|
2013-06-09 05:53:31 +02:00
|
|
|
g_return_if_fail(zathura != NULL);
|
|
|
|
|
2012-04-21 04:59:58 +02:00
|
|
|
position_set_delayed_t* p = g_malloc0(sizeof(position_set_delayed_t));
|
|
|
|
|
|
|
|
p->zathura = zathura;
|
|
|
|
p->position_x = position_x;
|
|
|
|
p->position_y = position_y;
|
|
|
|
|
|
|
|
gdk_threads_add_idle(position_set_delayed_impl, p);
|
|
|
|
}
|
2012-08-17 14:14:57 +02:00
|
|
|
|
2013-06-09 05:53:31 +02:00
|
|
|
void
|
|
|
|
position_set(zathura_t* zathura, double position_x, double position_y)
|
|
|
|
{
|
|
|
|
g_return_if_fail(zathura != NULL);
|
|
|
|
|
|
|
|
GtkScrolledWindow *window = GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view);
|
|
|
|
GtkAdjustment* vadjustment = gtk_scrolled_window_get_vadjustment(window);
|
|
|
|
GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(window);
|
|
|
|
|
|
|
|
/* negative values mean: don't set the position */
|
|
|
|
if (position_x >= 0) {
|
|
|
|
zathura_adjustment_set_value(hadjustment, position_x);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (position_y >= 0) {
|
|
|
|
zathura_adjustment_set_value(vadjustment, position_y);
|
|
|
|
}
|
|
|
|
}
|
2012-08-17 14:14:57 +02:00
|
|
|
|
Hide the inputbar and completion menu before saving the adjustments ratios into a new jump structure
Since we are now saving the adjustments ratios in the jump structures, we need
to take care of the following scenario:
- We do an action that results in a new jump structure being added to the
jumplist while the inputbar is visible (e.g., search, jumping to a
specific page, jumping to a bookmark, or following a link).
- Since we are now storing the adjustments ratios in the jump structures,
all of the above actions would result in the vertical adjustment ratio
being saved while the inputbar and/or the completion menu is visible.
- Now we are exactly on the target of the jump (note that the inputbar and
completion menu now are hidden), so suppose that we want to go back using
^o (assuming that we didn't change the adjustments after jumping), then
the check at sc_jumplist that compares the current adjustments ratios
with that of the current jump (the jump that has just been added and
which we are currently on it's position) would fail, because after the
inputbar (with possibly the completion menu in case of bookmarks) is
activated it is hidden, which results in the vertical adjustment upper
bound to change, which in turn results in the vertical adjustment ratio
returned by zathura_adjustment_get_ratio to become different from what is
stored in the current jump structure, even though we haven't changed the
adjustments at all after the jump. This would always result in taking us
back to the exact position of the jump (which would be slightly different
from the current position) when we press ^o. This can be annoying,
because it would happen, for example, every time we need to go back
quickly after jumping to a link target, a search result, or a bookmark.
So, what this patch does is essentially to make the vertical adjustment ratio
reflecting the current vertical adjustment after a jump, to always be the same
as the one stored in the newly added jump structure, since both are calculated
with zathura_adjustment_get_ratio while the inputbar is _not_ visible, so they
should be the same.
I've elaborated just to make things clear, in case the purpose of the patch
isn't obvious.
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:25:29 +02:00
|
|
|
static void
|
|
|
|
zathura_jumplist_hide_inputbar(zathura_t* zathura)
|
|
|
|
{
|
|
|
|
g_return_if_fail(zathura != NULL && zathura->ui.session->gtk.inputbar != NULL);
|
|
|
|
|
|
|
|
girara_argument_t arg = { GIRARA_HIDE, NULL };
|
|
|
|
girara_isc_completion(zathura->ui.session, &arg, NULL, 0);
|
|
|
|
|
|
|
|
if (zathura->ui.session->global.autohide_inputbar == true) {
|
2013-08-14 23:39:34 +02:00
|
|
|
/* XXX: This is a workaround for incremental-search. We should revisit this
|
|
|
|
* when we drop GTK+3 support and the inputbar is placed in a GtkOverlay
|
|
|
|
* widget. */
|
2013-08-08 19:48:31 +02:00
|
|
|
char *input = gtk_editable_get_chars(GTK_EDITABLE(zathura->ui.session->gtk.inputbar_entry), 0, -1);
|
|
|
|
bool res = false;
|
|
|
|
|
|
|
|
girara_setting_get(zathura->ui.session, "incremental-search", &res);
|
|
|
|
|
|
|
|
if ((*input == '/' || *input == '?') && res == true) {
|
|
|
|
g_free(input);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
2013-08-14 23:39:34 +02:00
|
|
|
/* </workaround> */
|
2013-08-08 19:48:31 +02:00
|
|
|
|
Hide the inputbar and completion menu before saving the adjustments ratios into a new jump structure
Since we are now saving the adjustments ratios in the jump structures, we need
to take care of the following scenario:
- We do an action that results in a new jump structure being added to the
jumplist while the inputbar is visible (e.g., search, jumping to a
specific page, jumping to a bookmark, or following a link).
- Since we are now storing the adjustments ratios in the jump structures,
all of the above actions would result in the vertical adjustment ratio
being saved while the inputbar and/or the completion menu is visible.
- Now we are exactly on the target of the jump (note that the inputbar and
completion menu now are hidden), so suppose that we want to go back using
^o (assuming that we didn't change the adjustments after jumping), then
the check at sc_jumplist that compares the current adjustments ratios
with that of the current jump (the jump that has just been added and
which we are currently on it's position) would fail, because after the
inputbar (with possibly the completion menu in case of bookmarks) is
activated it is hidden, which results in the vertical adjustment upper
bound to change, which in turn results in the vertical adjustment ratio
returned by zathura_adjustment_get_ratio to become different from what is
stored in the current jump structure, even though we haven't changed the
adjustments at all after the jump. This would always result in taking us
back to the exact position of the jump (which would be slightly different
from the current position) when we press ^o. This can be annoying,
because it would happen, for example, every time we need to go back
quickly after jumping to a link target, a search result, or a bookmark.
So, what this patch does is essentially to make the vertical adjustment ratio
reflecting the current vertical adjustment after a jump, to always be the same
as the one stored in the newly added jump structure, since both are calculated
with zathura_adjustment_get_ratio while the inputbar is _not_ visible, so they
should be the same.
I've elaborated just to make things clear, in case the purpose of the patch
isn't obvious.
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:25:29 +02:00
|
|
|
gtk_widget_hide(zathura->ui.session->gtk.inputbar);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we want to do it immediately */
|
2013-06-29 11:45:07 +02:00
|
|
|
/* XXX: ... and we want this to go away */
|
Hide the inputbar and completion menu before saving the adjustments ratios into a new jump structure
Since we are now saving the adjustments ratios in the jump structures, we need
to take care of the following scenario:
- We do an action that results in a new jump structure being added to the
jumplist while the inputbar is visible (e.g., search, jumping to a
specific page, jumping to a bookmark, or following a link).
- Since we are now storing the adjustments ratios in the jump structures,
all of the above actions would result in the vertical adjustment ratio
being saved while the inputbar and/or the completion menu is visible.
- Now we are exactly on the target of the jump (note that the inputbar and
completion menu now are hidden), so suppose that we want to go back using
^o (assuming that we didn't change the adjustments after jumping), then
the check at sc_jumplist that compares the current adjustments ratios
with that of the current jump (the jump that has just been added and
which we are currently on it's position) would fail, because after the
inputbar (with possibly the completion menu in case of bookmarks) is
activated it is hidden, which results in the vertical adjustment upper
bound to change, which in turn results in the vertical adjustment ratio
returned by zathura_adjustment_get_ratio to become different from what is
stored in the current jump structure, even though we haven't changed the
adjustments at all after the jump. This would always result in taking us
back to the exact position of the jump (which would be slightly different
from the current position) when we press ^o. This can be annoying,
because it would happen, for example, every time we need to go back
quickly after jumping to a link target, a search result, or a bookmark.
So, what this patch does is essentially to make the vertical adjustment ratio
reflecting the current vertical adjustment after a jump, to always be the same
as the one stored in the newly added jump structure, since both are calculated
with zathura_adjustment_get_ratio while the inputbar is _not_ visible, so they
should be the same.
I've elaborated just to make things clear, in case the purpose of the patch
isn't obvious.
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:25:29 +02:00
|
|
|
while (gtk_events_pending()) {
|
|
|
|
gtk_main_iteration();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-31 17:53:14 +02:00
|
|
|
bool
|
|
|
|
zathura_jumplist_has_previous(zathura_t* zathura)
|
|
|
|
{
|
|
|
|
return girara_list_iterator_has_previous(zathura->jumplist.cur);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
2013-06-09 05:53:31 +02:00
|
|
|
zathura_jumplist_has_next(zathura_t* zathura)
|
2013-03-31 17:53:14 +02:00
|
|
|
{
|
|
|
|
return girara_list_iterator_has_next(zathura->jumplist.cur);
|
|
|
|
}
|
|
|
|
|
2012-08-17 14:14:57 +02:00
|
|
|
zathura_jump_t*
|
2012-10-09 01:12:18 +02:00
|
|
|
zathura_jumplist_current(zathura_t* zathura)
|
|
|
|
{
|
2012-08-17 14:14:57 +02:00
|
|
|
if (zathura->jumplist.cur != NULL) {
|
|
|
|
return girara_list_iterator_data(zathura->jumplist.cur);
|
|
|
|
} else {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2012-10-09 01:12:18 +02:00
|
|
|
zathura_jumplist_forward(zathura_t* zathura)
|
|
|
|
{
|
2012-08-17 14:14:57 +02:00
|
|
|
if (girara_list_iterator_has_next(zathura->jumplist.cur)) {
|
|
|
|
girara_list_iterator_next(zathura->jumplist.cur);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2012-10-09 01:12:18 +02:00
|
|
|
zathura_jumplist_backward(zathura_t* zathura)
|
|
|
|
{
|
2012-08-17 14:14:57 +02:00
|
|
|
if (girara_list_iterator_has_previous(zathura->jumplist.cur)) {
|
|
|
|
girara_list_iterator_previous(zathura->jumplist.cur);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-09 05:53:31 +02:00
|
|
|
static void
|
|
|
|
zathura_jumplist_reset_current(zathura_t* zathura)
|
|
|
|
{
|
2013-06-30 18:06:48 +02:00
|
|
|
g_return_if_fail(zathura != NULL && zathura->jumplist.cur != NULL);
|
2013-06-09 05:53:31 +02:00
|
|
|
|
|
|
|
while (true) {
|
|
|
|
if (girara_list_iterator_has_next(zathura->jumplist.cur) == false) {
|
|
|
|
return;
|
|
|
|
}
|
2013-06-30 18:06:48 +02:00
|
|
|
|
|
|
|
girara_list_iterator_next(zathura->jumplist.cur);
|
2013-06-09 05:53:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-10-09 01:12:18 +02:00
|
|
|
zathura_jumplist_append_jump(zathura_t* zathura)
|
|
|
|
{
|
2013-06-21 14:30:04 +02:00
|
|
|
g_return_if_fail(zathura != NULL && zathura->jumplist.list != NULL);
|
|
|
|
|
2012-08-17 14:14:57 +02:00
|
|
|
zathura_jump_t *jump = g_malloc(sizeof(zathura_jump_t));
|
2013-06-21 14:30:04 +02:00
|
|
|
jump->page = 0;
|
|
|
|
jump->x = 0.0;
|
|
|
|
jump->y = 0.0;
|
|
|
|
girara_list_append(zathura->jumplist.list, jump);
|
2012-08-17 14:14:57 +02:00
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
if (zathura->jumplist.size == 0) {
|
|
|
|
zathura->jumplist.cur = girara_list_iterator(zathura->jumplist.list);
|
|
|
|
}
|
2013-06-09 05:53:31 +02:00
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
++zathura->jumplist.size;
|
|
|
|
zathura_jumplist_trim(zathura);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
zathura_jumplist_trim(zathura_t* zathura)
|
|
|
|
{
|
|
|
|
g_return_if_fail(zathura != NULL && zathura->jumplist.list != NULL && zathura->jumplist.size != 0);
|
|
|
|
|
|
|
|
girara_list_iterator_t* cur = girara_list_iterator(zathura->jumplist.list);
|
|
|
|
|
|
|
|
while (zathura->jumplist.size > zathura->jumplist.max_size) {
|
|
|
|
if (girara_list_iterator_data(cur) == girara_list_iterator_data(zathura->jumplist.cur)) {
|
|
|
|
girara_list_iterator_free(zathura->jumplist.cur);
|
|
|
|
zathura->jumplist.cur = NULL;
|
2013-06-09 05:53:31 +02:00
|
|
|
}
|
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
girara_list_iterator_remove(cur);
|
|
|
|
--zathura->jumplist.size;
|
|
|
|
}
|
|
|
|
|
2013-06-30 18:06:49 +02:00
|
|
|
if (zathura->jumplist.size == 0 || (zathura->jumplist.size != 0 && zathura->jumplist.cur != NULL)) {
|
2013-06-21 14:30:04 +02:00
|
|
|
girara_list_iterator_free(cur);
|
2013-06-30 18:06:49 +02:00
|
|
|
} else {
|
2013-06-21 14:30:04 +02:00
|
|
|
zathura->jumplist.cur = cur;
|
2012-08-17 14:14:57 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2012-10-09 01:12:18 +02:00
|
|
|
zathura_jumplist_add(zathura_t* zathura)
|
|
|
|
{
|
Hide the inputbar and completion menu before saving the adjustments ratios into a new jump structure
Since we are now saving the adjustments ratios in the jump structures, we need
to take care of the following scenario:
- We do an action that results in a new jump structure being added to the
jumplist while the inputbar is visible (e.g., search, jumping to a
specific page, jumping to a bookmark, or following a link).
- Since we are now storing the adjustments ratios in the jump structures,
all of the above actions would result in the vertical adjustment ratio
being saved while the inputbar and/or the completion menu is visible.
- Now we are exactly on the target of the jump (note that the inputbar and
completion menu now are hidden), so suppose that we want to go back using
^o (assuming that we didn't change the adjustments after jumping), then
the check at sc_jumplist that compares the current adjustments ratios
with that of the current jump (the jump that has just been added and
which we are currently on it's position) would fail, because after the
inputbar (with possibly the completion menu in case of bookmarks) is
activated it is hidden, which results in the vertical adjustment upper
bound to change, which in turn results in the vertical adjustment ratio
returned by zathura_adjustment_get_ratio to become different from what is
stored in the current jump structure, even though we haven't changed the
adjustments at all after the jump. This would always result in taking us
back to the exact position of the jump (which would be slightly different
from the current position) when we press ^o. This can be annoying,
because it would happen, for example, every time we need to go back
quickly after jumping to a link target, a search result, or a bookmark.
So, what this patch does is essentially to make the vertical adjustment ratio
reflecting the current vertical adjustment after a jump, to always be the same
as the one stored in the newly added jump structure, since both are calculated
with zathura_adjustment_get_ratio while the inputbar is _not_ visible, so they
should be the same.
I've elaborated just to make things clear, in case the purpose of the patch
isn't obvious.
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:25:29 +02:00
|
|
|
g_return_if_fail(zathura != NULL && zathura->jumplist.list != NULL);
|
|
|
|
zathura_jumplist_hide_inputbar(zathura);
|
2013-06-09 05:53:31 +02:00
|
|
|
|
Hide the inputbar and completion menu before saving the adjustments ratios into a new jump structure
Since we are now saving the adjustments ratios in the jump structures, we need
to take care of the following scenario:
- We do an action that results in a new jump structure being added to the
jumplist while the inputbar is visible (e.g., search, jumping to a
specific page, jumping to a bookmark, or following a link).
- Since we are now storing the adjustments ratios in the jump structures,
all of the above actions would result in the vertical adjustment ratio
being saved while the inputbar and/or the completion menu is visible.
- Now we are exactly on the target of the jump (note that the inputbar and
completion menu now are hidden), so suppose that we want to go back using
^o (assuming that we didn't change the adjustments after jumping), then
the check at sc_jumplist that compares the current adjustments ratios
with that of the current jump (the jump that has just been added and
which we are currently on it's position) would fail, because after the
inputbar (with possibly the completion menu in case of bookmarks) is
activated it is hidden, which results in the vertical adjustment upper
bound to change, which in turn results in the vertical adjustment ratio
returned by zathura_adjustment_get_ratio to become different from what is
stored in the current jump structure, even though we haven't changed the
adjustments at all after the jump. This would always result in taking us
back to the exact position of the jump (which would be slightly different
from the current position) when we press ^o. This can be annoying,
because it would happen, for example, every time we need to go back
quickly after jumping to a link target, a search result, or a bookmark.
So, what this patch does is essentially to make the vertical adjustment ratio
reflecting the current vertical adjustment after a jump, to always be the same
as the one stored in the newly added jump structure, since both are calculated
with zathura_adjustment_get_ratio while the inputbar is _not_ visible, so they
should be the same.
I've elaborated just to make things clear, in case the purpose of the patch
isn't obvious.
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:25:29 +02:00
|
|
|
unsigned int pagenum = zathura_document_get_current_page_number(zathura->document);
|
|
|
|
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)));
|
2013-06-09 05:53:31 +02:00
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
if (zathura->jumplist.size != 0) {
|
|
|
|
zathura_jumplist_reset_current(zathura);
|
2013-06-09 05:53:31 +02:00
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
zathura_jump_t* cur = zathura_jumplist_current(zathura);
|
2012-08-17 14:14:57 +02:00
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
if (cur != NULL) {
|
|
|
|
if (cur->page == pagenum && cur->x == x && cur->y == y) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2012-08-17 14:14:57 +02:00
|
|
|
}
|
Hide the inputbar and completion menu before saving the adjustments ratios into a new jump structure
Since we are now saving the adjustments ratios in the jump structures, we need
to take care of the following scenario:
- We do an action that results in a new jump structure being added to the
jumplist while the inputbar is visible (e.g., search, jumping to a
specific page, jumping to a bookmark, or following a link).
- Since we are now storing the adjustments ratios in the jump structures,
all of the above actions would result in the vertical adjustment ratio
being saved while the inputbar and/or the completion menu is visible.
- Now we are exactly on the target of the jump (note that the inputbar and
completion menu now are hidden), so suppose that we want to go back using
^o (assuming that we didn't change the adjustments after jumping), then
the check at sc_jumplist that compares the current adjustments ratios
with that of the current jump (the jump that has just been added and
which we are currently on it's position) would fail, because after the
inputbar (with possibly the completion menu in case of bookmarks) is
activated it is hidden, which results in the vertical adjustment upper
bound to change, which in turn results in the vertical adjustment ratio
returned by zathura_adjustment_get_ratio to become different from what is
stored in the current jump structure, even though we haven't changed the
adjustments at all after the jump. This would always result in taking us
back to the exact position of the jump (which would be slightly different
from the current position) when we press ^o. This can be annoying,
because it would happen, for example, every time we need to go back
quickly after jumping to a link target, a search result, or a bookmark.
So, what this patch does is essentially to make the vertical adjustment ratio
reflecting the current vertical adjustment after a jump, to always be the same
as the one stored in the newly added jump structure, since both are calculated
with zathura_adjustment_get_ratio while the inputbar is _not_ visible, so they
should be the same.
I've elaborated just to make things clear, in case the purpose of the patch
isn't obvious.
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:25:29 +02:00
|
|
|
|
|
|
|
zathura_jumplist_append_jump(zathura);
|
|
|
|
zathura_jumplist_reset_current(zathura);
|
|
|
|
zathura_jumplist_save(zathura);
|
2012-08-17 14:14:57 +02:00
|
|
|
}
|
|
|
|
|
2013-06-21 14:30:04 +02:00
|
|
|
bool
|
|
|
|
zathura_jumplist_load(zathura_t* zathura, const char* file)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail(zathura != NULL && zathura->database != NULL && file != NULL, false);
|
|
|
|
|
|
|
|
zathura->jumplist.list = zathura_db_load_jumplist(zathura->database, file);
|
|
|
|
|
|
|
|
if (zathura->jumplist.list == NULL) {
|
|
|
|
girara_error("Failed to load the jumplist from the database");
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
zathura->jumplist.size = girara_list_size(zathura->jumplist.list);
|
|
|
|
|
|
|
|
if (zathura->jumplist.size != 0) {
|
|
|
|
zathura->jumplist.cur = girara_list_iterator(zathura->jumplist.list);
|
|
|
|
zathura_jumplist_reset_current(zathura);
|
|
|
|
zathura_jumplist_trim(zathura);
|
|
|
|
girara_debug("Loaded the jumplist from the database");
|
|
|
|
} else {
|
|
|
|
girara_debug("No jumplist for this file in the database yet");
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-06-09 05:53:31 +02:00
|
|
|
static void
|
2012-10-09 01:12:18 +02:00
|
|
|
zathura_jumplist_save(zathura_t* zathura)
|
|
|
|
{
|
Hide the inputbar and completion menu before saving the adjustments ratios into a new jump structure
Since we are now saving the adjustments ratios in the jump structures, we need
to take care of the following scenario:
- We do an action that results in a new jump structure being added to the
jumplist while the inputbar is visible (e.g., search, jumping to a
specific page, jumping to a bookmark, or following a link).
- Since we are now storing the adjustments ratios in the jump structures,
all of the above actions would result in the vertical adjustment ratio
being saved while the inputbar and/or the completion menu is visible.
- Now we are exactly on the target of the jump (note that the inputbar and
completion menu now are hidden), so suppose that we want to go back using
^o (assuming that we didn't change the adjustments after jumping), then
the check at sc_jumplist that compares the current adjustments ratios
with that of the current jump (the jump that has just been added and
which we are currently on it's position) would fail, because after the
inputbar (with possibly the completion menu in case of bookmarks) is
activated it is hidden, which results in the vertical adjustment upper
bound to change, which in turn results in the vertical adjustment ratio
returned by zathura_adjustment_get_ratio to become different from what is
stored in the current jump structure, even though we haven't changed the
adjustments at all after the jump. This would always result in taking us
back to the exact position of the jump (which would be slightly different
from the current position) when we press ^o. This can be annoying,
because it would happen, for example, every time we need to go back
quickly after jumping to a link target, a search result, or a bookmark.
So, what this patch does is essentially to make the vertical adjustment ratio
reflecting the current vertical adjustment after a jump, to always be the same
as the one stored in the newly added jump structure, since both are calculated
with zathura_adjustment_get_ratio while the inputbar is _not_ visible, so they
should be the same.
I've elaborated just to make things clear, in case the purpose of the patch
isn't obvious.
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:25:29 +02:00
|
|
|
g_return_if_fail(zathura != NULL);
|
|
|
|
|
2012-08-17 14:14:57 +02:00
|
|
|
zathura_jump_t* cur = zathura_jumplist_current(zathura);
|
|
|
|
|
|
|
|
unsigned int pagenum = zathura_document_get_current_page_number(zathura->document);
|
|
|
|
|
|
|
|
if (cur) {
|
|
|
|
cur->page = pagenum;
|
2013-06-21 14:25:28 +02:00
|
|
|
cur->x = zathura_adjustment_get_ratio(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)));
|
|
|
|
cur->y = zathura_adjustment_get_ratio(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)));
|
2012-08-17 14:14:57 +02:00
|
|
|
}
|
|
|
|
}
|