mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-02-22 11:05:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor link shortcut functions

Browse source 
The three link shortcut functions `sc_follow`, `sc_display_link` and
`sc_copy_link` were almost identical.
This commit is contained in:
Andreas Perstinger 2023-04-20 14:48:36 +02:00 • committed by Sebastian Ramacher
parent 2b9b8a9c70
commit a6859512b5
1 changed files with 28 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
zathura/shortcuts.c
View file

@ -21,7 +21,7 @@
#include "adjustment.h" #include "adjustment.h"
#include <math.h> #include <math.h>
/* Helper function; see sc_display_link and sc_follow. */ /* Helper function for highlighting the links */
static bool static bool
draw_links(zathura_t* zathura) draw_links(zathura_t* zathura)
{ {
@ -55,6 +55,30 @@ draw_links(zathura_t* zathura)
return show_links; return show_links;
} }
/* Common code for sc_follow, sc_display_link and sc_copy_link */
static bool
link_shortcuts(zathura_t* zathura, girara_callback_inputbar_activate_t callback,
const char* text)
{
if (zathura->document == NULL || zathura->ui.session == NULL) {
return false;
}
bool show_links = draw_links(zathura);
/* ask for input */
if (show_links == true) {
GtkWidget *inputbar = zathura->ui.session->gtk.inputbar;
gulong handler_id = g_signal_connect(inputbar, "hide", G_CALLBACK(cb_hide_links), zathura);
g_object_set_data(G_OBJECT(inputbar), "handler_id", GUINT_TO_POINTER(handler_id));
zathura_document_set_adjust_mode(zathura->document, ZATHURA_ADJUST_INPUTBAR);
girara_dialog(zathura->ui.session, text, FALSE, NULL, callback, zathura->ui.session);
}
return false;
}
bool bool
sc_abort(girara_session_t* session, girara_argument_t* UNUSED(argument), sc_abort(girara_session_t* session, girara_argument_t* UNUSED(argument),
girara_event_t* UNUSED(event), unsigned int UNUSED(t)) girara_event_t* UNUSED(event), unsigned int UNUSED(t))
@ -133,21 +157,7 @@ sc_display_link(girara_session_t* session, girara_argument_t* UNUSED(argument),
g_return_val_if_fail(session->global.data != NULL, false); g_return_val_if_fail(session->global.data != NULL, false);
zathura_t* zathura = session->global.data; zathura_t* zathura = session->global.data;
if (zathura->document == NULL || zathura->ui.session == NULL) { return link_shortcuts(zathura, cb_sc_display_link, "Display Link: ");
return false;
}
bool show_links = draw_links(zathura);
/* ask for input */
if (show_links) {
zathura_document_set_adjust_mode(zathura->document, ZATHURA_ADJUST_INPUTBAR);
girara_dialog(zathura->ui.session, "Display link:", FALSE, NULL,
cb_sc_display_link,
zathura->ui.session);
}
return false;
} }
bool bool
@ -158,21 +168,7 @@ sc_copy_link(girara_session_t* session, girara_argument_t* UNUSED(argument),
g_return_val_if_fail(session->global.data != NULL, false); g_return_val_if_fail(session->global.data != NULL, false);
zathura_t* zathura = session->global.data; zathura_t* zathura = session->global.data;
if (zathura->document == NULL || zathura->ui.session == NULL) { return link_shortcuts(zathura, cb_sc_copy_link, "Copy Link: ");
return false;
}
bool show_links = draw_links(zathura);
/* ask for input */
if (show_links) {
zathura_document_set_adjust_mode(zathura->document, ZATHURA_ADJUST_INPUTBAR);
girara_dialog(zathura->ui.session, "Copy link:", FALSE, NULL,
cb_sc_copy_link,
zathura->ui.session);
}
return false;
} }
bool bool
@ -272,19 +268,7 @@ sc_follow(girara_session_t* session, girara_argument_t* UNUSED(argument),
g_return_val_if_fail(session->global.data != NULL, false); g_return_val_if_fail(session->global.data != NULL, false);
zathura_t* zathura = session->global.data; zathura_t* zathura = session->global.data;
if (zathura->document == NULL || zathura->ui.session == NULL) { return link_shortcuts(zathura, cb_sc_follow, "Follow Link: ");
return false;
}
bool show_links = draw_links(zathura);
/* ask for input */
if (show_links == true) {
zathura_document_set_adjust_mode(zathura->document, ZATHURA_ADJUST_INPUTBAR);
girara_dialog(zathura->ui.session, "Follow link:", FALSE, NULL, cb_sc_follow, zathura->ui.session);
}
return false;
} }
bool bool