mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-01-29 00:44:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add completion for :write (Closes: #138)

Browse source
This commit is contained in:
Sebastian Ramacher 2012-03-20 00:54:12 +01:00
parent 41bcad37d7
commit 8789dea222
3 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
completion.c
View file

@ -28,7 +28,8 @@ compare_case_insensitive(const char* str1, const char* str2)
}
static girara_list_t*
list_files(zathura_t* zathura, const char* current_path, const char* current_file, int current_file_length, bool is_dir)
list_files(zathura_t* zathura, const char* current_path, const char* current_file,
int current_file_length, bool is_dir, bool check_file_ext)
{
if (zathura == NULL || zathura->ui.session == NULL || current_path == NULL) {
return NULL;
@ -85,7 +86,7 @@ list_files(zathura_t* zathura, const char* current_path, const char* current_fil
full_path = g_strdup_printf("%s/", full_path);
g_free(tmp_path);
girara_list_append(res, full_path);
} else if (file_valid_extension(zathura, full_path) == true) {
} else if (file_valid_extension(zathura, full_path) == true || check_file_ext == false) {
girara_list_append(res, full_path);
} else {
g_free(full_path);
@ -102,14 +103,10 @@ error_free:
}
girara_completion_t*
cc_open(girara_session_t* session, const char* input)
list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext)
{
g_return_val_if_fail(session != NULL, NULL);
g_return_val_if_fail(session->global.data != NULL, NULL);
zathura_t* zathura = session->global.data;
girara_completion_t* completion = girara_completion_init();
girara_completion_group_t* group = girara_completion_group_create(session, NULL);
girara_completion_group_t* group = girara_completion_group_create(zathura->ui.session, NULL);
gchar* path = NULL;
gchar* current_path = NULL;
@ -166,7 +163,7 @@ cc_open(girara_session_t* session, const char* input)
/* read directory */
if (g_file_test(current_path, G_FILE_TEST_IS_DIR) == TRUE) {
girara_list_t* names = list_files(zathura, current_path, current_file, current_file_length, is_dir);
girara_list_t* names = list_files(zathura, current_path, current_file, current_file_length, is_dir, check_file_ext);
if (!names) {
goto error_free;
}
@ -199,6 +196,26 @@ error_free:
return NULL;
}
girara_completion_t*
cc_open(girara_session_t* session, const char* input)
{
g_return_val_if_fail(session != NULL, NULL);
g_return_val_if_fail(session->global.data != NULL, NULL);
zathura_t* zathura = session->global.data;
return list_files_for_cc(zathura, input, true);
}
girara_completion_t*
cc_write(girara_session_t* session, const char* input)
{
g_return_val_if_fail(session != NULL, NULL);
g_return_val_if_fail(session->global.data != NULL, NULL);
zathura_t* zathura = session->global.data;
return list_files_for_cc(zathura, input, false);
}
girara_completion_t*
cc_bookmarks(girara_session_t* session, const char* input)
{

10
completion.h
View file

@ -15,6 +15,16 @@
*/
girara_completion_t* cc_open(girara_session_t* session, const char* input);
/**
* Completion for the write command - Creates a list of accesible directories or
* files
*
* @param session The used girara session
* @param input The current input
* @return The completion object or NULL if an error occured
*/
girara_completion_t* cc_write(girara_session_t* session, const char* input);
/**
* Completion for the bmarks command - Creates a list of bookmarks
*

4
config.c
View file

@ -245,8 +245,8 @@ config_load_default(zathura_t* zathura)
girara_inputbar_command_add(gsession, "help", NULL, cmd_help, NULL, _("Show help"));
girara_inputbar_command_add(gsession, "open", "o", cmd_open, cc_open, _("Open document"));
girara_inputbar_command_add(gsession, "print", NULL, cmd_print, NULL, _("Print document"));
girara_inputbar_command_add(gsession, "write", NULL, cmd_save, NULL, _("Save document"));
girara_inputbar_command_add(gsession, "write!", NULL, cmd_savef, NULL, _("Save document (and force overwriting)"));
girara_inputbar_command_add(gsession, "write", NULL, cmd_save, cc_write, _("Save document"));
girara_inputbar_command_add(gsession, "write!", NULL, cmd_savef, cc_write, _("Save document (and force overwriting)"));
girara_inputbar_command_add(gsession, "export", NULL, cmd_export, cc_export, _("Save attachments"));
girara_special_command_add(gsession, '/', cmd_search, true, FORWARD, NULL);