From 87a7f2310f44184217b8cd1ec0036b0e86f981c5 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 21 Jun 2013 14:25:29 +0200 Subject: [PATCH] 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 --- zathura.c | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/zathura.c b/zathura.c index a82fb55..a858b1c 100644 --- a/zathura.c +++ b/zathura.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -1145,6 +1146,25 @@ position_set(zathura_t* zathura, double position_x, double position_y) } } +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) { + gtk_widget_hide(zathura->ui.session->gtk.inputbar); + } + + /* we want to do it immediately */ + + while (gtk_events_pending()) { + gtk_main_iteration(); + } +} + bool zathura_jumplist_has_previous(zathura_t* zathura) { @@ -1231,29 +1251,31 @@ zathura_jumplist_append_jump(zathura_t* zathura) void zathura_jumplist_add(zathura_t* zathura) { - if (zathura->jumplist.list != NULL) { + g_return_if_fail(zathura != NULL && zathura->jumplist.list != NULL); + zathura_jumplist_hide_inputbar(zathura); - 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))); + 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))); - zathura_jumplist_reset_current(zathura); + zathura_jumplist_reset_current(zathura); - zathura_jump_t* cur = zathura_jumplist_current(zathura); + zathura_jump_t* cur = zathura_jumplist_current(zathura); - if (cur && cur->page == pagenum && cur->x == x && cur->y == y) { - return; - } - - zathura_jumplist_append_jump(zathura); - zathura_jumplist_reset_current(zathura); - zathura_jumplist_save(zathura); + if (cur && cur->page == pagenum && cur->x == x && cur->y == y) { + return; } + + zathura_jumplist_append_jump(zathura); + zathura_jumplist_reset_current(zathura); + zathura_jumplist_save(zathura); } static void zathura_jumplist_save(zathura_t* zathura) { + g_return_if_fail(zathura != NULL); + zathura_jump_t* cur = zathura_jumplist_current(zathura); unsigned int pagenum = zathura_document_get_current_page_number(zathura->document);