mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

(editcmd_dialog_select_definition_show): minor refactoring.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2019-01-19 18:24:22 +03:00
parent 0327191c24
commit 54215184f5
1 changed files with 27 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/editor/editcmd_dialogs.c
View File

@ -411,7 +411,6 @@ void
editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, int max_len, int word_len, editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, int max_len, int word_len,
etags_hash_t * def_hash, int num_lines) etags_hash_t * def_hash, int num_lines)
{ {
int start_x, start_y, offset, i; int start_x, start_y, offset, i;
char *curr = NULL; char *curr = NULL;
WDialog *def_dlg; WDialog *def_dlg;
@ -441,14 +440,9 @@ editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, int max_l
if (offset > 0) if (offset > 0)
start_y -= (offset + 1); start_y -= (offset + 1);
/* create the dialog */
def_dlg = dlg_create (TRUE, start_y, start_x, def_dlg_h, def_dlg_w, WPOS_KEEP_DEFAULT, TRUE, def_dlg = dlg_create (TRUE, start_y, start_x, def_dlg_h, def_dlg_w, WPOS_KEEP_DEFAULT, TRUE,
dialog_colors, NULL, NULL, "[Definitions]", match_expr); dialog_colors, NULL, NULL, "[Definitions]", match_expr);
/* create the listbox */
def_list = listbox_new (1, 1, def_dlg_h - 2, def_dlg_w - 2, FALSE, NULL); def_list = listbox_new (1, 1, def_dlg_h - 2, def_dlg_w - 2, FALSE, NULL);
/* add the dialog */
add_widget (def_dlg, def_list); add_widget (def_dlg, def_list);
/* fill the listbox with the completions */ /* fill the listbox with the completions */
@ -467,58 +461,46 @@ editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, int max_l
if (dlg_run (def_dlg) == B_ENTER) if (dlg_run (def_dlg) == B_ENTER)
{ {
etags_hash_t *curr_def = NULL; etags_hash_t *curr_def = NULL;
int do_moveto = 0; gboolean do_moveto = FALSE;
listbox_get_current (def_list, &curr, (void **) &curr_def); listbox_get_current (def_list, &curr, (void **) &curr_def);
if (edit->modified)
if (!edit->modified)
do_moveto = TRUE;
else if (!edit_query_dialog2
(_("Warning"),
_("Current text was modified without a file save.\n"
"Continue discards these changes."), _("C&ontinue"), _("&Cancel")))
{ {
if (!edit_query_dialog2 edit->force |= REDRAW_COMPLETELY;
(_("Warning"), do_moveto = TRUE;
_("Current text was modified without a file save.\n"
"Continue discards these changes."), _("C&ontinue"), _("&Cancel")))
{
edit->force |= REDRAW_COMPLETELY;
do_moveto = 1;
}
}
else
{
do_moveto = 1;
} }
if (curr && do_moveto) if (curr != NULL && do_moveto && edit_stack_iterator + 1 < MAX_HISTORY_MOVETO)
{ {
if (edit_stack_iterator + 1 < MAX_HISTORY_MOVETO) vfs_path_free (edit_history_moveto[edit_stack_iterator].filename_vpath);
{
vfs_path_free (edit_history_moveto[edit_stack_iterator].filename_vpath); if (edit->dir_vpath != NULL)
if (edit->dir_vpath != NULL)
{
edit_history_moveto[edit_stack_iterator].filename_vpath =
vfs_path_append_vpath_new (edit->dir_vpath, edit->filename_vpath, NULL);
}
else
{
edit_history_moveto[edit_stack_iterator].filename_vpath =
vfs_path_clone (edit->filename_vpath);
}
edit_history_moveto[edit_stack_iterator].line = edit->start_line +
edit->curs_row + 1;
edit_stack_iterator++;
vfs_path_free (edit_history_moveto[edit_stack_iterator].filename_vpath);
edit_history_moveto[edit_stack_iterator].filename_vpath = edit_history_moveto[edit_stack_iterator].filename_vpath =
vfs_path_from_str ((char *) curr_def->fullpath); vfs_path_append_vpath_new (edit->dir_vpath, edit->filename_vpath, NULL);
edit_history_moveto[edit_stack_iterator].line = curr_def->line; else
edit_reload_line (edit, edit_history_moveto[edit_stack_iterator].filename_vpath, edit_history_moveto[edit_stack_iterator].filename_vpath =
edit_history_moveto[edit_stack_iterator].line); vfs_path_clone (edit->filename_vpath);
}
edit_history_moveto[edit_stack_iterator].line = edit->start_line + edit->curs_row + 1;
edit_stack_iterator++;
vfs_path_free (edit_history_moveto[edit_stack_iterator].filename_vpath);
edit_history_moveto[edit_stack_iterator].filename_vpath =
vfs_path_from_str ((char *) curr_def->fullpath);
edit_history_moveto[edit_stack_iterator].line = curr_def->line;
edit_reload_line (edit, edit_history_moveto[edit_stack_iterator].filename_vpath,
edit_history_moveto[edit_stack_iterator].line);
} }
} }
/* clear definition hash */ /* clear definition hash */
for (i = 0; i < MAX_DEFINITIONS; i++) for (i = 0; i < MAX_DEFINITIONS; i++)
{
g_free (def_hash[i].filename); g_free (def_hash[i].filename);
}
/* destroy dialog before return */ /* destroy dialog before return */
dlg_destroy (def_dlg); dlg_destroy (def_dlg);