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

Replace ~ with $HOME

Browse source
This commit is contained in:
Moritz Lipp 2010-01-01 20:55:12 +01:00
parent 50b1c1b4c8
commit 2e6d6ccc17
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
zathura.c
View file

@ -1116,7 +1116,8 @@ cmd_close(int argc, char** argv)
{ {
if(!Zathura.PDF.document) if(!Zathura.PDF.document)
{ {
notify(ERROR, "No file has been opened"); if(argc != -1)
notify(ERROR, "No file has been opened");
return FALSE; return FALSE;
} }
@ -1166,10 +1167,7 @@ cmd_open(int argc, char** argv)
char* file = realpath(argv[0], NULL); char* file = realpath(argv[0], NULL);
if(argv[0][0] == '~') if(argv[0][0] == '~')
{
// file = realloc(file, ((int) strlen(argv[0]) + (int) strlen(getenv("HOME")) - 1) * sizeof(char));
file = g_strdup_printf("%s%s", getenv("HOME"), argv[0] + 1); file = g_strdup_printf("%s%s", getenv("HOME"), argv[0] + 1);
}
/* check if file exists */ /* check if file exists */
if(!g_file_test(file, G_FILE_TEST_IS_REGULAR)) if(!g_file_test(file, G_FILE_TEST_IS_REGULAR))
@ -1178,6 +1176,9 @@ cmd_open(int argc, char** argv)
return FALSE; return FALSE;
} }
/* close old file */
cmd_close(-1, NULL);
/* open file */ /* open file */
Zathura.PDF.document = poppler_document_new_from_file(g_strdup_printf("file://%s", file), Zathura.PDF.document = poppler_document_new_from_file(g_strdup_printf("file://%s", file),
(argc == 2) ? argv[1] : NULL, NULL); (argc == 2) ? argv[1] : NULL, NULL);
@ -1347,6 +1348,15 @@ cc_open(char* input)
char* file = ""; char* file = "";
int file_length = 0; int file_length = 0;
/* ~ */
if(input[0] == '~')
{
char *file = g_strdup_printf(":open %s/%s", getenv("HOME"), input + 1);
gtk_entry_set_text(Zathura.UI.inputbar, file);
gtk_editable_set_position(GTK_EDITABLE(Zathura.UI.inputbar), -1);
return NULL;
}
/* parse input string */ /* parse input string */
if(input && strlen(input) > 0) if(input && strlen(input) > 0)
{ {