mirror of
https://git.pwmt.org/pwmt/zathura.git
synced 2024-12-28 19:56:01 +01:00
Replace ~ with $HOME
This commit is contained in:
parent
50b1c1b4c8
commit
2e6d6ccc17
1 changed files with 14 additions and 4 deletions
16
zathura.c
16
zathura.c
|
@ -1116,6 +1116,7 @@ cmd_close(int argc, char** argv)
|
|||
{
|
||||
if(!Zathura.PDF.document)
|
||||
{
|
||||
if(argc != -1)
|
||||
notify(ERROR, "No file has been opened");
|
||||
return FALSE;
|
||||
}
|
||||
|
@ -1166,10 +1167,7 @@ cmd_open(int argc, char** argv)
|
|||
char* file = realpath(argv[0], NULL);
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
/* check if file exists */
|
||||
if(!g_file_test(file, G_FILE_TEST_IS_REGULAR))
|
||||
|
@ -1178,6 +1176,9 @@ cmd_open(int argc, char** argv)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
/* close old file */
|
||||
cmd_close(-1, NULL);
|
||||
|
||||
/* open file */
|
||||
Zathura.PDF.document = poppler_document_new_from_file(g_strdup_printf("file://%s", file),
|
||||
(argc == 2) ? argv[1] : NULL, NULL);
|
||||
|
@ -1347,6 +1348,15 @@ cc_open(char* input)
|
|||
char* file = "";
|
||||
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 */
|
||||
if(input && strlen(input) > 0)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue