diff --git a/meson.build b/meson.build index 76e7d92..daa7335 100644 --- a/meson.build +++ b/meson.build @@ -189,7 +189,7 @@ pkg.generate( description: 'document viewer - plugin API', url: 'https://pwmt.org/projects/zathura', version: version, - requires_private: ['girara-gtk3', 'cairo'], + requires: ['girara-gtk3', 'cairo'], variables: [ 'apiversion=@0@'.format(plugin_api_version), 'abiversion=@0@'.format(plugin_abi_version), diff --git a/tests/test_sandbox.c b/tests/test_sandbox.c index 90acdc1..07cdf72 100644 --- a/tests/test_sandbox.c +++ b/tests/test_sandbox.c @@ -2,16 +2,19 @@ #include -#include "zathura.h" #include "tests.h" +#include "zathura.h" -START_TEST(test_create) { - zathura_t* zathura = zathura_create(); +START_TEST(test_create) +{ + zathura_t* zathura = zathura_create(); zathura->global.sandbox = ZATHURA_SANDBOX_STRICT; ck_assert_ptr_nonnull(zathura); ck_assert(zathura_init(zathura)); zathura_free(zathura); -} END_TEST +} +END_TEST + static void sandbox_setup(void) { @@ -24,7 +27,8 @@ sandbox_setup(void) #endif } -static Suite* suite_sandbox(void) +static Suite* +suite_sandbox(void) { TCase* tcase = NULL; Suite* suite = suite_create("Sandbox"); @@ -38,7 +42,8 @@ static Suite* suite_sandbox(void) return suite; } -int main() +int +main() { return run_suite(suite_sandbox()); } diff --git a/zathura/commands.c b/zathura/commands.c index 0eae755..56a8d00 100644 --- a/zathura/commands.c +++ b/zathura/commands.c @@ -1,30 +1,29 @@ /* SPDX-License-Identifier: Zlib */ -#include -#include #include +#include +#include -#include "commands.h" -#include "shortcuts.h" +#include "adjustment.h" #include "bookmarks.h" +#include "commands.h" +#include "config.h" #include "database.h" #include "document.h" -#include "zathura.h" -#include "print.h" -#include "document.h" -#include "utils.h" +#include "internal.h" #include "page-widget.h" #include "page.h" #include "plugin.h" -#include "internal.h" +#include "print.h" #include "render.h" -#include "adjustment.h" -#include "config.h" +#include "shortcuts.h" +#include "utils.h" +#include "zathura.h" -#include -#include #include #include +#include +#include #include bool @@ -44,11 +43,12 @@ cmd_bookmark_create(girara_session_t* session, girara_list_t* argument_list) return false; } - const char* bookmark_name = girara_list_nth(argument_list, 0); - zathura_bookmark_t* bookmark = zathura_bookmark_get(zathura, bookmark_name); - bool update = bookmark != NULL ? true : false; + const char* bookmark_name = girara_list_nth(argument_list, 0); + zathura_bookmark_t* bookmark = zathura_bookmark_get(zathura, bookmark_name); + bool update = bookmark != NULL ? true : false; - bookmark = zathura_bookmark_add(zathura, bookmark_name, zathura_document_get_current_page_number(zathura->document) + 1); + bookmark = + zathura_bookmark_add(zathura, bookmark_name, zathura_document_get_current_page_number(zathura->document) + 1); if (bookmark == NULL) { if (update == true) { girara_notify(session, GIRARA_ERROR, _("Could not update bookmark: %s"), bookmark_name); @@ -110,8 +110,7 @@ cmd_bookmark_open(girara_session_t* session, girara_list_t* argument_list) GString* string = g_string_new(NULL); GIRARA_LIST_FOREACH_BODY(zathura->bookmarks.bookmarks, zathura_bookmark_t*, bookmark, - g_string_append_printf(string, "%s: %u\n", bookmark->id, bookmark->page); - ); + g_string_append_printf(string, "%s: %u\n", bookmark->id, bookmark->page);); if (strlen(string->str) > 0) { g_string_erase(string, strlen(string->str) - 1, 1); @@ -124,8 +123,8 @@ cmd_bookmark_open(girara_session_t* session, girara_list_t* argument_list) return false; } - const char* bookmark_name = girara_list_nth(argument_list, 0); - zathura_bookmark_t* bookmark = zathura_bookmark_get(zathura, bookmark_name); + const char* bookmark_name = girara_list_nth(argument_list, 0); + zathura_bookmark_t* bookmark = zathura_bookmark_get(zathura, bookmark_name); if (bookmark == NULL) { girara_notify(session, GIRARA_ERROR, _("No such bookmark: %s"), bookmark_name); return false; @@ -168,22 +167,20 @@ cmd_info(girara_session_t* session, girara_list_t* UNUSED(argument_list)) } struct meta_field { - const char* name; + const char* name; zathura_document_information_type_t field; }; - const struct meta_field meta_fields[] = { - { _("Title"), ZATHURA_DOCUMENT_INFORMATION_TITLE }, - { _("Subject"), ZATHURA_DOCUMENT_INFORMATION_SUBJECT }, - { _("Keywords"), ZATHURA_DOCUMENT_INFORMATION_KEYWORDS }, - { _("Author"), ZATHURA_DOCUMENT_INFORMATION_AUTHOR }, - { _("Creator"), ZATHURA_DOCUMENT_INFORMATION_CREATOR }, - { _("Producer"), ZATHURA_DOCUMENT_INFORMATION_PRODUCER }, - { _("Creation date"), ZATHURA_DOCUMENT_INFORMATION_CREATION_DATE }, - { _("Modification date"), ZATHURA_DOCUMENT_INFORMATION_MODIFICATION_DATE }, - { _("Format"), ZATHURA_DOCUMENT_INFORMATION_FORMAT }, - { _("Other"), ZATHURA_DOCUMENT_INFORMATION_OTHER } - }; + const struct meta_field meta_fields[] = {{_("Title"), ZATHURA_DOCUMENT_INFORMATION_TITLE}, + {_("Subject"), ZATHURA_DOCUMENT_INFORMATION_SUBJECT}, + {_("Keywords"), ZATHURA_DOCUMENT_INFORMATION_KEYWORDS}, + {_("Author"), ZATHURA_DOCUMENT_INFORMATION_AUTHOR}, + {_("Creator"), ZATHURA_DOCUMENT_INFORMATION_CREATOR}, + {_("Producer"), ZATHURA_DOCUMENT_INFORMATION_PRODUCER}, + {_("Creation date"), ZATHURA_DOCUMENT_INFORMATION_CREATION_DATE}, + {_("Modification date"), ZATHURA_DOCUMENT_INFORMATION_MODIFICATION_DATE}, + {_("Format"), ZATHURA_DOCUMENT_INFORMATION_FORMAT}, + {_("Other"), ZATHURA_DOCUMENT_INFORMATION_OTHER}}; girara_list_t* information = zathura_document_get_information(zathura->document, NULL); if (information == NULL) { @@ -194,13 +191,12 @@ cmd_info(girara_session_t* session, girara_list_t* UNUSED(argument_list)) GString* string = g_string_new(NULL); for (unsigned int i = 0; i < LENGTH(meta_fields); i++) { - GIRARA_LIST_FOREACH_BODY(information, zathura_document_information_entry_t*, entry, - if (entry != NULL) { + GIRARA_LIST_FOREACH_BODY( + information, zathura_document_information_entry_t*, entry, if (entry != NULL) { if (meta_fields[i].field == entry->type) { g_string_append_printf(string, "%s: %s\n", meta_fields[i].name, entry->value); } - } - ); + }); } if (string->len > 0) { @@ -216,8 +212,7 @@ cmd_info(girara_session_t* session, girara_list_t* UNUSED(argument_list)) } bool -cmd_help(girara_session_t* UNUSED(session), girara_list_t* - UNUSED(argument_list)) +cmd_help(girara_session_t* UNUSED(session), girara_list_t* UNUSED(argument_list)) { return true; } @@ -235,7 +230,6 @@ cmd_hlsearch(girara_session_t* session, girara_list_t* UNUSED(argument_list)) return true; } - bool cmd_open(girara_session_t* session, girara_list_t* argument_list) { @@ -253,8 +247,8 @@ cmd_open(girara_session_t* session, girara_list_t* argument_list) } document_open_idle(zathura, girara_list_nth(argument_list, 0), - (argc == 2) ? girara_list_nth(argument_list, 1) : NULL, - ZATHURA_PAGE_NUMBER_UNSPECIFIED, NULL, NULL, NULL, NULL); + (argc == 2) ? girara_list_nth(argument_list, 1) : NULL, ZATHURA_PAGE_NUMBER_UNSPECIFIED, NULL, + NULL, NULL, NULL); } else { girara_notify(session, GIRARA_ERROR, _("No arguments given.")); return false; @@ -382,14 +376,14 @@ cmd_search(girara_session_t* session, const char* input, girara_argument_t* argu /* search pages */ for (unsigned int page_id = 0; page_id < number_of_pages; ++page_id) { - unsigned int index = (page_id + current_page_number) % number_of_pages; - zathura_page_t* page = zathura_document_get_page(zathura->document, index); + unsigned int index = (page_id + current_page_number) % number_of_pages; + zathura_page_t* page = zathura_document_get_page(zathura->document, index); if (page == NULL) { continue; } - GtkWidget* page_widget = zathura_page_get_widget(zathura, page); - GObject* obj_page_widget = G_OBJECT(page_widget); + GtkWidget* page_widget = zathura_page_get_widget(zathura, page); + GObject* obj_page_widget = G_OBJECT(page_widget); g_object_set(obj_page_widget, "draw-links", FALSE, NULL); zathura_renderer_lock(zathura->sync.render_thread); @@ -422,8 +416,8 @@ cmd_search(girara_session_t* session, const char* input, girara_argument_t* argu return false; } - arg->n = FORWARD; - arg->data = (void*) input; + arg->n = FORWARD; + arg->data = (void*)input; sc_search(session, arg, NULL, 0); g_free(arg); @@ -438,7 +432,8 @@ cmd_export(girara_session_t* session, girara_list_t* argument_list) zathura_t* zathura = session->global.data; if (zathura->global.sandbox == ZATHURA_SANDBOX_STRICT) { - girara_notify(zathura->ui.session, GIRARA_ERROR, _("Exporting attachments is not permitted in strict sandbox mode")); + girara_notify(zathura->ui.session, GIRARA_ERROR, + _("Exporting attachments is not permitted in strict sandbox mode")); return false; } @@ -466,7 +461,8 @@ cmd_export(girara_session_t* session, girara_list_t* argument_list) /* attachment */ if (strncmp(file_identifier, "attachment-", strlen("attachment-")) == 0) { - if (zathura_document_attachment_save(zathura->document, file_identifier + strlen("attachment-"), export_path) == false) { + if (zathura_document_attachment_save(zathura->document, file_identifier + strlen("attachment-"), export_path) == + false) { girara_notify(session, GIRARA_ERROR, _("Couldn't write attachment '%s' to '%s'."), file_identifier, file_name); } else { girara_notify(session, GIRARA_INFO, _("Wrote attachment '%s' to '%s'."), file_identifier, export_path); @@ -474,8 +470,8 @@ cmd_export(girara_session_t* session, girara_list_t* argument_list) /* image */ } else if (strncmp(file_identifier, "image-p", strlen("image-p")) == 0 && strlen(file_identifier) >= 10) { /* parse page id */ - const char* input = file_identifier + strlen("image-p"); - int page_id = atoi(input); + const char* input = file_identifier + strlen("image-p"); + int page_id = atoi(input); if (page_id == 0) { goto image_error; } @@ -520,7 +516,7 @@ cmd_export(girara_session_t* session, girara_list_t* argument_list) goto error_ret; -image_error: + image_error: girara_notify(session, GIRARA_ERROR, _("Unknown image '%s'."), file_identifier); goto error_ret; @@ -536,7 +532,6 @@ error_ret: return true; } - bool cmd_exec(girara_session_t* session, girara_list_t* argument_list) { @@ -550,22 +545,20 @@ cmd_exec(girara_session_t* session, girara_list_t* argument_list) } if (zathura->document != NULL) { - const char* path = zathura_document_get_path(zathura->document); + const char* path = zathura_document_get_path(zathura->document); unsigned int page = zathura_document_get_current_page_number(zathura->document); - char page_buf[G_ASCII_DTOSTR_BUF_SIZE]; - g_ascii_dtostr(page_buf, G_ASCII_DTOSTR_BUF_SIZE, page+1); + char page_buf[G_ASCII_DTOSTR_BUF_SIZE]; + g_ascii_dtostr(page_buf, G_ASCII_DTOSTR_BUF_SIZE, page + 1); - GIRARA_LIST_FOREACH_BODY_WITH_ITER(argument_list, char*, iter, value, - char* r = girara_replace_substring(value, "$PAGE", page_buf); - if (r != NULL) { + GIRARA_LIST_FOREACH_BODY_WITH_ITER( + argument_list, char*, iter, value, char* r = girara_replace_substring(value, "$PAGE", page_buf); if (r != NULL) { char* s = girara_replace_substring(r, "$FILE", path); g_free(r); if (s != NULL) { girara_list_iterator_set(iter, s); } - } - ); + }); } return girara_exec_with_argument_list(session, argument_list); @@ -635,10 +628,8 @@ cmd_source(girara_session_t* session, girara_list_t* argument_list) return false; } else if (argc == 1) { zathura_set_config_dir(zathura, girara_list_nth(argument_list, 0)); - config_load_files(zathura); - } else { - config_load_files(zathura); } + config_load_files(zathura); return true; } diff --git a/zathura/dbus-interface.c b/zathura/dbus-interface.c index aac0db5..79211e8 100644 --- a/zathura/dbus-interface.c +++ b/zathura/dbus-interface.c @@ -11,35 +11,35 @@ #include "utils.h" #include "zathura.h" -#include -#include -#include -#include #include -#include +#include +#include +#include +#include #include #include +#include #include static const char DBUS_XML_FILENAME[] = "/org/pwmt/zathura/DBus/org.pwmt.zathura.xml"; -static GBytes* load_xml_data(void) +static GBytes* +load_xml_data(void) { GResource* resource = zathura_resources_get_resource(); if (resource != NULL) { - return g_resource_lookup_data(resource, DBUS_XML_FILENAME, - G_RESOURCE_LOOKUP_FLAGS_NONE, NULL); + return g_resource_lookup_data(resource, DBUS_XML_FILENAME, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL); } return NULL; } typedef struct private_s { - zathura_t* zathura; - GDBusNodeInfo* introspection_data; + zathura_t* zathura; + GDBusNodeInfo* introspection_data; GDBusConnection* connection; - guint owner_id; - guint registration_id; + guint owner_id; + guint registration_id; } ZathuraDbusPrivate; G_DEFINE_TYPE_WITH_CODE(ZathuraDbus, zathura_dbus, G_TYPE_OBJECT, G_ADD_PRIVATE(ZathuraDbus)) @@ -56,7 +56,7 @@ static const GDBusInterfaceVTable interface_vtable; static void finalize(GObject* object) { - ZathuraDbus* dbus = ZATHURA_DBUS(object); + ZathuraDbus* dbus = ZATHURA_DBUS(object); ZathuraDbusPrivate* priv = zathura_dbus_get_instance_private(dbus); if (priv->connection != NULL && priv->registration_id > 0) { @@ -94,8 +94,8 @@ zathura_dbus_init(ZathuraDbus* dbus) } static void -gdbus_connection_closed(GDBusConnection* UNUSED(connection), - gboolean UNUSED(remote_peer_vanished), GError* error, void* UNUSED(data)) +gdbus_connection_closed(GDBusConnection* UNUSED(connection), gboolean UNUSED(remote_peer_vanished), GError* error, + void* UNUSED(data)) { if (error != NULL) { girara_debug("D-Bus connection closed: %s", error->message); @@ -108,19 +108,16 @@ bus_acquired(GDBusConnection* connection, const gchar* name, void* data) girara_debug("Bus acquired at '%s'.", name); /* register callback for GDBusConnection's closed signal */ - g_signal_connect(G_OBJECT(connection), "closed", - G_CALLBACK(gdbus_connection_closed), NULL); + g_signal_connect(G_OBJECT(connection), "closed", G_CALLBACK(gdbus_connection_closed), NULL); - ZathuraDbus* dbus = data; + ZathuraDbus* dbus = data; ZathuraDbusPrivate* priv = zathura_dbus_get_instance_private(dbus); - GError* error = NULL; + GError* error = NULL; priv->registration_id = g_dbus_connection_register_object( - connection, DBUS_OBJPATH, priv->introspection_data->interfaces[0], - &interface_vtable, dbus, NULL, &error); + connection, DBUS_OBJPATH, priv->introspection_data->interfaces[0], &interface_vtable, dbus, NULL, &error); if (priv->registration_id == 0) { - girara_warning("Failed to register object on D-Bus connection: %s", - error->message); + girara_warning("Failed to register object on D-Bus connection: %s", error->message); g_error_free(error); return; } @@ -129,18 +126,15 @@ bus_acquired(GDBusConnection* connection, const gchar* name, void* data) } static void -name_acquired(GDBusConnection* UNUSED(connection), const gchar* name, - void* UNUSED(data)) +name_acquired(GDBusConnection* UNUSED(connection), const gchar* name, void* UNUSED(data)) { girara_debug("Acquired '%s' on session bus.", name); } static void -name_lost(GDBusConnection* UNUSED(connection), const gchar* name, - void* UNUSED(data)) +name_lost(GDBusConnection* UNUSED(connection), const gchar* name, void* UNUSED(data)) { - girara_debug("Lost connection or failed to acquire '%s' on session bus.", - name); + girara_debug("Lost connection or failed to acquire '%s' on session bus.", name); } ZathuraDbus* @@ -151,20 +145,19 @@ zathura_dbus_new(zathura_t* zathura) return NULL; } - ZathuraDbus* dbus = ZATHURA_DBUS(obj); - ZathuraDbusPrivate* priv = zathura_dbus_get_instance_private(dbus); - priv->zathura = zathura; + ZathuraDbus* dbus = ZATHURA_DBUS(obj); + ZathuraDbusPrivate* priv = zathura_dbus_get_instance_private(dbus); + priv->zathura = zathura; GBytes* xml_data = load_xml_data(); - if (xml_data == NULL) - { + if (xml_data == NULL) { girara_warning("Failed to load introspection data."); g_object_unref(obj); return NULL; } - GError* error = NULL; - priv->introspection_data = g_dbus_node_info_new_for_xml((const char*) g_bytes_get_data(xml_data, NULL), &error); + GError* error = NULL; + priv->introspection_data = g_dbus_node_info_new_for_xml((const char*)g_bytes_get_data(xml_data, NULL), &error); g_bytes_unref(xml_data); if (priv->introspection_data == NULL) { @@ -175,32 +168,31 @@ zathura_dbus_new(zathura_t* zathura) } char* well_known_name = g_strdup_printf(DBUS_NAME_TEMPLATE, getpid()); - priv->owner_id = g_bus_own_name(G_BUS_TYPE_SESSION, well_known_name, - G_BUS_NAME_OWNER_FLAGS_NONE, bus_acquired, - name_acquired, name_lost, dbus, NULL); + priv->owner_id = g_bus_own_name(G_BUS_TYPE_SESSION, well_known_name, G_BUS_NAME_OWNER_FLAGS_NONE, bus_acquired, + name_acquired, name_lost, dbus, NULL); g_free(well_known_name); return dbus; } void -zathura_dbus_edit(ZathuraDbus* edit, unsigned int page, unsigned int x, unsigned int y) { +zathura_dbus_edit(ZathuraDbus* edit, unsigned int page, unsigned int x, unsigned int y) +{ ZathuraDbusPrivate* priv = zathura_dbus_get_instance_private(edit); const char* filename = zathura_document_get_path(priv->zathura->document); - char* input_file = NULL; - unsigned int line = 0; - unsigned int column = 0; + char* input_file = NULL; + unsigned int line = 0; + unsigned int column = 0; - if (synctex_get_input_line_column(filename, page, x, y, &input_file, &line, - &column) == false) { + if (synctex_get_input_line_column(filename, page, x, y, &input_file, &line, &column) == false) { return; } GError* error = NULL; - g_dbus_connection_emit_signal(priv->connection, NULL, DBUS_OBJPATH, - DBUS_INTERFACE, "Edit", g_variant_new("(suu)", input_file, line, column), &error); + g_dbus_connection_emit_signal(priv->connection, NULL, DBUS_OBJPATH, DBUS_INTERFACE, "Edit", + g_variant_new("(suu)", input_file, line, column), &error); g_free(input_file); @@ -213,19 +205,15 @@ zathura_dbus_edit(ZathuraDbus* edit, unsigned int page, unsigned int x, unsigned /* D-Bus handler */ static void -handle_open_document(zathura_t* zathura, GVariant* parameters, - GDBusMethodInvocation* invocation) +handle_open_document(zathura_t* zathura, GVariant* parameters, GDBusMethodInvocation* invocation) { gchar* filename = NULL; gchar* password = NULL; - gint page = ZATHURA_PAGE_NUMBER_UNSPECIFIED; + gint page = ZATHURA_PAGE_NUMBER_UNSPECIFIED; g_variant_get(parameters, "(ssi)", &filename, &password, &page); document_close(zathura, false); - document_open_idle(zathura, filename, - strlen(password) > 0 ? password : NULL, - page, - NULL, NULL, NULL, NULL); + document_open_idle(zathura, filename, strlen(password) > 0 ? password : NULL, page, NULL, NULL, NULL, NULL); g_free(filename); g_free(password); @@ -234,8 +222,7 @@ handle_open_document(zathura_t* zathura, GVariant* parameters, } static void -handle_close_document(zathura_t* zathura, GVariant* UNUSED(parameters), - GDBusMethodInvocation* invocation) +handle_close_document(zathura_t* zathura, GVariant* UNUSED(parameters), GDBusMethodInvocation* invocation) { const bool ret = document_close(zathura, false); @@ -244,8 +231,7 @@ handle_close_document(zathura_t* zathura, GVariant* UNUSED(parameters), } static void -handle_goto_page(zathura_t* zathura, GVariant* parameters, - GDBusMethodInvocation* invocation) +handle_goto_page(zathura_t* zathura, GVariant* parameters, GDBusMethodInvocation* invocation) { const unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document); @@ -285,8 +271,8 @@ synctex_highlight_rects_impl(gpointer ptr) } static void -synctex_highlight_rects_idle(zathura_t* zathura, girara_list_t** rectangles, - unsigned int page, unsigned number_of_pages) +synctex_highlight_rects_idle(zathura_t* zathura, girara_list_t** rectangles, unsigned int page, + unsigned number_of_pages) { highlights_rect_data_t* data = g_try_malloc0(sizeof(highlights_rect_data_t)); data->zathura = zathura; @@ -298,16 +284,14 @@ synctex_highlight_rects_idle(zathura_t* zathura, girara_list_t** rectangles, } static void -handle_highlight_rects(zathura_t* zathura, GVariant* parameters, - GDBusMethodInvocation* invocation) +handle_highlight_rects(zathura_t* zathura, GVariant* parameters, GDBusMethodInvocation* invocation) { const unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document); - guint page = 0; - GVariantIter* iter = NULL; + guint page = 0; + GVariantIter* iter = NULL; GVariantIter* secondary_iter = NULL; - g_variant_get(parameters, "(ua(dddd)a(udddd))", &page, &iter, - &secondary_iter); + g_variant_get(parameters, "(ua(dddd)a(udddd))", &page, &iter, &secondary_iter); if (page >= number_of_pages) { girara_debug("Got invalid page number."); @@ -323,8 +307,7 @@ handle_highlight_rects(zathura_t* zathura, GVariant* parameters, if (rectangles == NULL) { g_variant_iter_free(iter); g_variant_iter_free(secondary_iter); - g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, - G_DBUS_ERROR_NO_MEMORY, + g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, G_DBUS_ERROR_NO_MEMORY, "Failed to allocate memory."); return; } @@ -334,23 +317,20 @@ handle_highlight_rects(zathura_t* zathura, GVariant* parameters, g_free(rectangles); g_variant_iter_free(iter); g_variant_iter_free(secondary_iter); - g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, - G_DBUS_ERROR_NO_MEMORY, + g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, G_DBUS_ERROR_NO_MEMORY, "Failed to allocate memory."); return; } - zathura_rectangle_t temp_rect = { 0, 0, 0, 0 }; - while (g_variant_iter_loop(iter, "(dddd)", &temp_rect.x1, &temp_rect.x2, - &temp_rect.y1, &temp_rect.y2)) { + zathura_rectangle_t temp_rect = {0, 0, 0, 0}; + while (g_variant_iter_loop(iter, "(dddd)", &temp_rect.x1, &temp_rect.x2, &temp_rect.y1, &temp_rect.y2)) { zathura_rectangle_t* rect = g_try_malloc0(sizeof(zathura_rectangle_t)); if (rect == NULL) { g_variant_iter_free(iter); g_variant_iter_free(secondary_iter); girara_list_free(rectangles[page]); g_free(rectangles); - g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, - G_DBUS_ERROR_NO_MEMORY, + g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, G_DBUS_ERROR_NO_MEMORY, "Failed to allocate memory."); return; } @@ -362,8 +342,7 @@ handle_highlight_rects(zathura_t* zathura, GVariant* parameters, /* get secondary rectangles */ guint temp_page = 0; - while (g_variant_iter_loop(secondary_iter, "(udddd)", &temp_page, - &temp_rect.x1, &temp_rect.x2, &temp_rect.y1, + while (g_variant_iter_loop(secondary_iter, "(udddd)", &temp_page, &temp_rect.x1, &temp_rect.x2, &temp_rect.y1, &temp_rect.y2)) { if (temp_page >= number_of_pages) { /* error out here? */ @@ -383,8 +362,7 @@ handle_highlight_rects(zathura_t* zathura, GVariant* parameters, } g_free(rectangles); g_free(rect); - g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, - G_DBUS_ERROR_NO_MEMORY, + g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, G_DBUS_ERROR_NO_MEMORY, "Failed to allocate memory."); return; } @@ -447,8 +425,7 @@ handle_synctex_view(zathura_t* zathura, GVariant* parameters, GDBusMethodInvocat } static void -handle_execute_command(zathura_t* zathura, GVariant* parameters, - GDBusMethodInvocation* invocation) +handle_execute_command(zathura_t* zathura, GVariant* parameters, GDBusMethodInvocation* invocation) { gchar* input = NULL; g_variant_get(parameters, "(s)", &input); @@ -515,9 +492,8 @@ handle_method_call(GDBusConnection* UNUSED(connection), const gchar* UNUSED(send } if (handlers[idx].needs_document == true && priv->zathura->document == NULL) { - g_dbus_method_invocation_return_dbus_error( - invocation, "org.pwmt.zathura.NoOpenDocument", - "No document has been opened."); + g_dbus_method_invocation_return_dbus_error(invocation, "org.pwmt.zathura.NoOpenDocument", + "No document has been opened."); return; } @@ -631,18 +607,16 @@ static const GDBusInterfaceVTable interface_vtable = { static const unsigned int TIMEOUT = 3000; static bool -call_synctex_view(GDBusConnection* connection, const char* filename, - const char* name, const char* input_file, unsigned int line, - unsigned int column) +call_synctex_view(GDBusConnection* connection, const char* filename, const char* name, const char* input_file, + unsigned int line, unsigned int column) { - GError* error = NULL; - GVariant* vfilename = g_dbus_connection_call_sync( - connection, name, DBUS_OBJPATH, "org.freedesktop.DBus.Properties", "Get", - g_variant_new("(ss)", DBUS_INTERFACE, "filename"), G_VARIANT_TYPE("(v)"), - G_DBUS_CALL_FLAGS_NONE, TIMEOUT, NULL, &error); + GError* error = NULL; + GVariant* vfilename = + g_dbus_connection_call_sync(connection, name, DBUS_OBJPATH, "org.freedesktop.DBus.Properties", "Get", + g_variant_new("(ss)", DBUS_INTERFACE, "filename"), G_VARIANT_TYPE("(v)"), + G_DBUS_CALL_FLAGS_NONE, TIMEOUT, NULL, &error); if (vfilename == NULL) { - girara_error("Failed to query 'filename' property from '%s': %s", - name, error->message); + girara_error("Failed to query 'filename' property from '%s': %s", name, error->message); g_error_free(error); return false; } @@ -661,13 +635,11 @@ call_synctex_view(GDBusConnection* connection, const char* filename, g_free(remote_filename); - GVariant* ret = g_dbus_connection_call_sync( - connection, name, DBUS_OBJPATH, DBUS_INTERFACE, "SynctexView", - g_variant_new("(suu)", input_file, line, column), - G_VARIANT_TYPE("(b)"), G_DBUS_CALL_FLAGS_NONE, TIMEOUT, NULL, &error); + GVariant* ret = g_dbus_connection_call_sync(connection, name, DBUS_OBJPATH, DBUS_INTERFACE, "SynctexView", + g_variant_new("(suu)", input_file, line, column), G_VARIANT_TYPE("(b)"), + G_DBUS_CALL_FLAGS_NONE, TIMEOUT, NULL, &error); if (ret == NULL) { - girara_error("Failed to run SynctexView on '%s': %s", name, - error->message); + girara_error("Failed to run SynctexView on '%s': %s", name, error->message); g_error_free(error); return false; } @@ -677,17 +649,15 @@ call_synctex_view(GDBusConnection* connection, const char* filename, } static int -iterate_instances_call_synctex_view(const char* filename, - const char* input_file, unsigned int line, +iterate_instances_call_synctex_view(const char* filename, const char* input_file, unsigned int line, unsigned int column, pid_t hint) { if (filename == NULL) { return -1; } - GError* error = NULL; - GDBusConnection* connection = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, - &error); + GError* error = NULL; + GDBusConnection* connection = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error); if (connection == NULL) { girara_error("Could not connect to session bus: %s", error->message); g_error_free(error); @@ -695,17 +665,15 @@ iterate_instances_call_synctex_view(const char* filename, } if (hint != -1) { - char* well_known_name = g_strdup_printf(DBUS_NAME_TEMPLATE, hint); - const bool ret = call_synctex_view(connection, filename, well_known_name, - input_file, line, column); + char* well_known_name = g_strdup_printf(DBUS_NAME_TEMPLATE, hint); + const bool ret = call_synctex_view(connection, filename, well_known_name, input_file, line, column); g_free(well_known_name); return ret ? 1 : -1; } - GVariant* vnames = g_dbus_connection_call_sync( - connection, "org.freedesktop.DBus", "/org/freedesktop/DBus", - "org.freedesktop.DBus", "ListNames", NULL, G_VARIANT_TYPE("(as)"), - G_DBUS_CALL_FLAGS_NONE, TIMEOUT, NULL, &error); + GVariant* vnames = g_dbus_connection_call_sync(connection, "org.freedesktop.DBus", "/org/freedesktop/DBus", + "org.freedesktop.DBus", "ListNames", NULL, G_VARIANT_TYPE("(as)"), + G_DBUS_CALL_FLAGS_NONE, TIMEOUT, NULL, &error); if (vnames == NULL) { girara_error("Could not list available names: %s", error->message); g_error_free(error); @@ -716,8 +684,8 @@ iterate_instances_call_synctex_view(const char* filename, GVariantIter* iter = NULL; g_variant_get(vnames, "(as)", &iter); - gchar* name = NULL; - bool found_one = false; + gchar* name = NULL; + bool found_one = false; while (found_one == false && g_variant_iter_loop(iter, "s", &name) == TRUE) { if (g_str_has_prefix(name, "org.pwmt.zathura.PID") == FALSE) { continue;