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

Factor out SyncTeX string parsing

Browse source 
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
This commit is contained in:
Sebastian Ramacher 2015-10-07 22:13:55 +02:00
parent 80582c9079
commit 0ab1147543
3 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
zathura/main.c
View file

@ -13,6 +13,7 @@
#include "zathura.h" #include "zathura.h"
#include "utils.h" #include "utils.h"
#include "dbus-interface.h" #include "dbus-interface.h"
#include "synctex.h"
/* main function */ /* main function */
int int
@ -113,27 +114,18 @@ main(int argc, char* argv[])
return -1; return -1;
} }
char** split_fwd = g_strsplit(synctex_fwd, ":", 0); int line = 0;
if (split_fwd == NULL || split_fwd[0] == NULL || split_fwd[1] == NULL || int column = 0;
split_fwd[2] == NULL || split_fwd[3] != NULL) { char* input_file = NULL;
if (synctex_parse_input(synctex_fwd, &input_file, &line, &column) == false) {
girara_error("Failed to parse argument to --synctex-forward."); girara_error("Failed to parse argument to --synctex-forward.");
g_free(real_path); g_free(real_path);
g_strfreev(split_fwd);
return -1; return -1;
} }
int line = MIN(INT_MAX, g_ascii_strtoll(split_fwd[0], NULL, 10)); const int ret = zathura_dbus_synctex_position(real_path, input_file, line, column, synctex_pid);
int column = MIN(INT_MAX, g_ascii_strtoll(split_fwd[1], NULL, 10)); g_free(input_file);
/* SyncTeX starts indexing at 1, but we use 0 */ g_free(real_path);
if (line > 0) {
--line;
}
if (column > 0) {
--column;
}
const bool ret = zathura_dbus_synctex_position(real_path, split_fwd[2], line, column, synctex_pid);
g_strfreev(split_fwd);
if (ret == false) { if (ret == false) {
girara_error("Could not find open instance for '%s' or got no usable data from synctex.", real_path); girara_error("Could not find open instance for '%s' or got no usable data from synctex.", real_path);

29
zathura/synctex.c
View file

@ -192,3 +192,32 @@ synctex_rectangles_from_position(const char* filename, const char* input_file,
return hitlist; return hitlist;
} }
bool
synctex_parse_input(const char* synctex, char** input_file, int* line,
int* column)
{
if (synctex == NULL || input_file == NULL || line == NULL || column == NULL) {
return false;
}
char** split_fwd = g_strsplit(synctex, ":", 0);
if (split_fwd == NULL || split_fwd[0] == NULL || split_fwd[1] == NULL ||
split_fwd[2] == NULL || split_fwd[3] != NULL) {
g_strfreev(split_fwd);
return false;
}
*line = MIN(INT_MAX, g_ascii_strtoll(split_fwd[0], NULL, 10));
*column = MIN(INT_MAX, g_ascii_strtoll(split_fwd[1], NULL, 10));
/* SyncTeX starts indexing at 1, but we use 0 */
if (*line > 0) {
--*line;
}
if (*column > 0) {
--*column;
}
*input_file = g_strdup(split_fwd[2]);
g_strfreev(split_fwd);
return true;
}

3
zathura/synctex.h
View file

@ -15,6 +15,9 @@ bool synctex_get_input_line_column(const char* filename, unsigned int page,
void synctex_edit(const char* editor, zathura_page_t* page, int x, int y); void synctex_edit(const char* editor, zathura_page_t* page, int x, int y);
bool synctex_parse_input(const char* synctex, char** input_file, int* line,
int* column);
girara_list_t* synctex_rectangles_from_position(const char* filename, girara_list_t* synctex_rectangles_from_position(const char* filename,
const char* input_file, int line, int column, unsigned int* page, const char* input_file, int line, int column, unsigned int* page,
girara_list_t** secondary_rects); girara_list_t** secondary_rects);