mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-28 07:56:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Port to newer libsynctex

Browse source
This commit is contained in:
Sebastian Ramacher 2018-04-21 13:11:10 +02:00
parent acf9a3bcc1
commit c97d83f6ce
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meson.build
View file

@ -82,6 +82,9 @@ endif
if get_option('enable-synctex') and synctex.found() if get_option('enable-synctex') and synctex.found()
build_dependencies += synctex build_dependencies += synctex
defines += '-DWITH_SYNCTEX' defines += '-DWITH_SYNCTEX'
if synctex.version() < '2.0.0'
defines += '-DWITH_SYNCTEX1'
endif
endif endif
if get_option('enable-magic') and magic.found() if get_option('enable-magic') and magic.found()

24
zathura/synctex.c
View file

@ -16,6 +16,14 @@
#include "adjustment.h" #include "adjustment.h"
#ifdef WITH_SYNCTEX #ifdef WITH_SYNCTEX
#ifdef WITH_SYNCTEX1
typedef synctex_scanner_t synctex_scanner_p;
typedef synctex_node_t synctex_node_p;
#define synctex_scanner_next_result(scanner) synctex_next_result(scanner)
#define synctex_display_query(scanner, file, line, column, page) synctex_display_query(scanner, file, line, column)
#endif
bool bool
synctex_get_input_line_column(const char* filename, unsigned int page, int x, int y, synctex_get_input_line_column(const char* filename, unsigned int page, int x, int y,
char** input_file, unsigned int* line, unsigned int* column) char** input_file, unsigned int* line, unsigned int* column)
@ -24,13 +32,13 @@ synctex_get_input_line_column(const char* filename, unsigned int page, int x, in
return false; return false;
} }
synctex_scanner_t scanner = synctex_scanner_new_with_output_file(filename, NULL, 1); synctex_scanner_p scanner = synctex_scanner_new_with_output_file(filename, NULL, 1);
if (scanner == NULL) { if (scanner == NULL) {
girara_debug("Failed to create synctex scanner."); girara_debug("Failed to create synctex scanner.");
return false; return false;
} }
synctex_scanner_t temp = synctex_scanner_parse(scanner); synctex_scanner_p temp = synctex_scanner_parse(scanner);
if (temp == NULL) { if (temp == NULL) {
girara_debug("Failed to parse synctex file."); girara_debug("Failed to parse synctex file.");
synctex_scanner_free(scanner); synctex_scanner_free(scanner);
@ -41,7 +49,7 @@ synctex_get_input_line_column(const char* filename, unsigned int page, int x, in
if (synctex_edit_query(scanner, page + 1u, x, y) > 0) { if (synctex_edit_query(scanner, page + 1u, x, y) > 0) {
/* Assume that a backward search returns at most one result. */ /* Assume that a backward search returns at most one result. */
synctex_node_t node = synctex_next_result(scanner); synctex_node_p node = synctex_scanner_next_result(scanner);
if (node != NULL) { if (node != NULL) {
if (input_file != NULL) { if (input_file != NULL) {
*input_file = g_strdup(synctex_scanner_get_name(scanner, synctex_node_tag(node))); *input_file = g_strdup(synctex_scanner_get_name(scanner, synctex_node_tag(node)));
@ -127,13 +135,13 @@ synctex_rectangles_from_position(const char* filename, const char* input_file,
++line; ++line;
++column; ++column;
synctex_scanner_t scanner = synctex_scanner_new_with_output_file(filename, NULL, 1); synctex_scanner_p scanner = synctex_scanner_new_with_output_file(filename, NULL, 1);
if (scanner == NULL) { if (scanner == NULL) {
girara_debug("Failed to create synctex scanner."); girara_debug("Failed to create synctex scanner.");
return NULL; return NULL;
} }
synctex_scanner_t temp = synctex_scanner_parse(scanner); synctex_scanner_p temp = synctex_scanner_parse(scanner);
if (temp == NULL) { if (temp == NULL) {
girara_debug("Failed to parse synctex file."); girara_debug("Failed to parse synctex file.");
synctex_scanner_free(scanner); synctex_scanner_free(scanner);
@ -143,11 +151,11 @@ synctex_rectangles_from_position(const char* filename, const char* input_file,
girara_list_t* hitlist = girara_list_new2(g_free); girara_list_t* hitlist = girara_list_new2(g_free);
girara_list_t* other_rects = girara_list_new2(g_free); girara_list_t* other_rects = girara_list_new2(g_free);
if (synctex_display_query(scanner, input_file, line, column) > 0) { if (synctex_display_query(scanner, input_file, line, column, -1) > 0) {
synctex_node_t node = NULL; synctex_node_p node = NULL;
bool got_page = false; bool got_page = false;
while ((node = synctex_next_result (scanner)) != NULL) { while ((node = synctex_scanner_next_result(scanner)) != NULL) {
const unsigned int current_page = synctex_node_page(node) - 1; const unsigned int current_page = synctex_node_page(node) - 1;
if (got_page == false) { if (got_page == false) {
got_page = true; got_page = true;