mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

mceditor: new APIs.

Browse Source 
* (edit_arg_init): initialize edit_arg_t object.
  * (edit_arg_assign): Apply new values to edit_arg_t object members.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2024-02-23 14:59:26 +03:00
parent 54bdd0efbf
commit e79e76b72b
3 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/editor/edit.c
View File

@ -4135,10 +4135,7 @@ void
edit_stack_init (void) edit_stack_init (void)
{ {
for (edit_stack_iterator = 0; edit_stack_iterator < MAX_HISTORY_MOVETO; edit_stack_iterator++) for (edit_stack_iterator = 0; edit_stack_iterator < MAX_HISTORY_MOVETO; edit_stack_iterator++)
{ edit_arg_init (&edit_history_moveto[edit_stack_iterator], NULL, -1);
edit_history_moveto[edit_stack_iterator].file_vpath = NULL;
edit_history_moveto[edit_stack_iterator].line_number = -1;
}
edit_stack_iterator = 0; edit_stack_iterator = 0;
} }
@ -4206,6 +4203,38 @@ edit_arg_new (const char *file_name, long line_number)
return edit_arg_vpath_new (vfs_path_from_str (file_name), line_number); return edit_arg_vpath_new (vfs_path_from_str (file_name), line_number);
} }
/* --------------------------------------------------------------------------------------------- */
/**
* Initialize edit_arg_t object.
*
* @param arg edit_arg_t object
* @param vpath vfs_path_t object
* @param line line number
*/
void
edit_arg_init (edit_arg_t * arg, vfs_path_t * vpath, long line)
{
arg->file_vpath = (vfs_path_t *) vpath;
arg->line_number = line;
}
/* --------------------------------------------------------------------------------------------- */
/**
* Apply new values to edit_arg_t object members.
*
* @param arg edit_arg_t object
* @param vpath vfs_path_t object
* @param line line number
*/
void
edit_arg_assign (edit_arg_t * arg, vfs_path_t * vpath, long line)
{
vfs_path_free (arg->file_vpath, TRUE);
edit_arg_init (arg, vpath, line);
}
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/** /**
* Free the edit_arg_t object. * Free the edit_arg_t object.

2
src/editor/edit.h
View File

@ -83,6 +83,8 @@ gboolean edit_files (const GList * files);
edit_arg_t *edit_arg_vpath_new (vfs_path_t * file_vpath, long line_number); edit_arg_t *edit_arg_vpath_new (vfs_path_t * file_vpath, long line_number);
edit_arg_t *edit_arg_new (const char *file_name, long line_number); edit_arg_t *edit_arg_new (const char *file_name, long line_number);
void edit_arg_init (edit_arg_t * arg, vfs_path_t * vpath, long line);
void edit_arg_assign (edit_arg_t * arg, vfs_path_t * vpath, long line);
void edit_arg_free (edit_arg_t * arg); void edit_arg_free (edit_arg_t * arg);
const char *edit_get_file_name (const WEdit * edit); const char *edit_get_file_name (const WEdit * edit);

17
src/editor/etags.c
View File

@ -380,23 +380,20 @@ editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, GPtrArray
if (curr != NULL && do_moveto && edit_stack_iterator + 1 < MAX_HISTORY_MOVETO) if (curr != NULL && do_moveto && edit_stack_iterator + 1 < MAX_HISTORY_MOVETO)
{ {
vfs_path_free (edit_history_moveto[edit_stack_iterator].file_vpath, TRUE); vfs_path_t *vpath;
/* Is file path absolute? Prepend with dir_vpath if necessary */ /* Is file path absolute? Prepend with dir_vpath if necessary */
if (edit->filename_vpath != NULL && edit->filename_vpath->relative if (edit->filename_vpath != NULL && edit->filename_vpath->relative
&& edit->dir_vpath != NULL) && edit->dir_vpath != NULL)
edit_history_moveto[edit_stack_iterator].file_vpath = vpath = vfs_path_append_vpath_new (edit->dir_vpath, edit->filename_vpath, NULL);
vfs_path_append_vpath_new (edit->dir_vpath, edit->filename_vpath, NULL);
else else
edit_history_moveto[edit_stack_iterator].file_vpath = vpath = vfs_path_clone (edit->filename_vpath);
vfs_path_clone (edit->filename_vpath);
edit_history_moveto[edit_stack_iterator].line_number = edit->start_line + edit->curs_row + 1; edit_arg_assign (&edit_history_moveto[edit_stack_iterator], vpath,
edit->start_line + edit->curs_row + 1);
edit_stack_iterator++; edit_stack_iterator++;
vfs_path_free (edit_history_moveto[edit_stack_iterator].file_vpath, TRUE); edit_arg_assign (&edit_history_moveto[edit_stack_iterator],
edit_history_moveto[edit_stack_iterator].file_vpath = vfs_path_from_str ((char *) curr_def->fullpath), curr_def->line);
vfs_path_from_str ((char *) curr_def->fullpath);
edit_history_moveto[edit_stack_iterator].line_number = curr_def->line;
edit_reload_line (edit, edit_history_moveto[edit_stack_iterator].file_vpath, edit_reload_line (edit, edit_history_moveto[edit_stack_iterator].file_vpath,
edit_history_moveto[edit_stack_iterator].line_number); edit_history_moveto[edit_stack_iterator].line_number);
} }