mirror of https://github.com/MidnightCommander/mc
* editcmd.c (edit_set_search_parameters): Use g_malloc().
(edit_complete_word_cmd): Use g_free().
This commit is contained in:
Pavel Roskin
parent
b628d515c0
commit
29f1543919
|
|
@ -1,3 +1,8 @@
|
|||
2002-11-30 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* editcmd.c (edit_set_search_parameters): Use g_malloc().
|
||||
(edit_complete_word_cmd): Use g_free().
|
||||
|
||||
2002-11-29 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* edit.h: Don't define HAVE_SYNTAXH.
|
||||
|
|
|
|||
181
edit/editcmd.c
181
edit/editcmd.c
|
|
@ -2480,53 +2480,61 @@ static void edit_set_search_parameters (int rs, int rb, int rr, int rw, int rc)
|
|||
|
||||
#define MAX_WORD_COMPLETIONS 100 /* in listbox */
|
||||
|
||||
/* collect the possible completions */
|
||||
static int edit_collect_completions (WEdit *edit, long start,
|
||||
int word_len, char *match_expr, struct selection *compl, int *num)
|
||||
/* collect the possible completions */
|
||||
static int
|
||||
edit_collect_completions (WEdit *edit, long start, int word_len,
|
||||
char *match_expr, struct selection *compl,
|
||||
int *num)
|
||||
{
|
||||
int len, max_len = 0, i, skip;
|
||||
char *bufpos;
|
||||
|
||||
/* collect max MAX_WORD_COMPLETIONS completions */
|
||||
while (*num < MAX_WORD_COMPLETIONS) {
|
||||
/* get next match */
|
||||
start = edit_find (start - 1, (unsigned char *) match_expr, &len,
|
||||
edit->last_byte, (int (*)(void *, long)) edit_get_byte,
|
||||
(void *) edit, 0);
|
||||
|
||||
/* not matched */
|
||||
/* collect max MAX_WORD_COMPLETIONS completions */
|
||||
while (*num < MAX_WORD_COMPLETIONS) {
|
||||
/* get next match */
|
||||
start =
|
||||
edit_find (start - 1, (unsigned char *) match_expr, &len,
|
||||
edit->last_byte,
|
||||
(int (*)(void *, long)) edit_get_byte,
|
||||
(void *) edit, 0);
|
||||
|
||||
/* not matched */
|
||||
if (start < 0)
|
||||
break;
|
||||
|
||||
/* add matched completion if not yet added */
|
||||
bufpos = &edit->buffers1[start >> S_EDIT_BUF_SIZE][start & M_EDIT_BUF_SIZE];
|
||||
|
||||
/* add matched completion if not yet added */
|
||||
bufpos =
|
||||
&edit->
|
||||
buffers1[start >> S_EDIT_BUF_SIZE][start & M_EDIT_BUF_SIZE];
|
||||
skip = 0;
|
||||
for (i = 0; i < *num; i++) {
|
||||
if (strncmp (&compl[i].text[word_len], &bufpos[word_len],
|
||||
max (len, compl[i].len) - word_len) == 0) {
|
||||
if (strncmp
|
||||
(&compl[i].text[word_len], &bufpos[word_len],
|
||||
max (len, compl[i].len) - word_len) == 0) {
|
||||
skip = 1;
|
||||
break; /* skip it, already added */
|
||||
break; /* skip it, already added */
|
||||
}
|
||||
}
|
||||
if (skip)
|
||||
continue;
|
||||
|
||||
compl[*num].text = CMalloc (len + 1);
|
||||
compl[*num].text = g_malloc (len + 1);
|
||||
compl[*num].len = len;
|
||||
for (i = 0; i < len; i++)
|
||||
compl[*num].text[i] = *(bufpos + i);
|
||||
compl[*num].text[i] = '\0';
|
||||
(*num)++;
|
||||
|
||||
/* note the maximal length needed for the completion dialog */
|
||||
|
||||
/* note the maximal length needed for the completion dialog */
|
||||
if (len > max_len)
|
||||
max_len = len;
|
||||
}
|
||||
return max_len;
|
||||
return max_len;
|
||||
}
|
||||
|
||||
|
||||
static int compllist_callback (void *data)
|
||||
static int
|
||||
compllist_callback (void *data)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -2534,127 +2542,134 @@ static int compllist_callback (void *data)
|
|||
|
||||
/* let the user select its preferred completion */
|
||||
static void
|
||||
edit_completion_dialog (WEdit *edit, int max_len, int word_len,
|
||||
struct selection *compl, int num_compl)
|
||||
edit_completion_dialog (WEdit *edit, int max_len, int word_len,
|
||||
struct selection *compl, int num_compl)
|
||||
{
|
||||
int start_x, start_y, offset, i;
|
||||
char *curr = NULL;
|
||||
Dlg_head *compl_dlg;
|
||||
WListbox *compl_list;
|
||||
unsigned int compl_dlg_h; /* completion dialog height */
|
||||
unsigned int compl_dlg_w; /* completion dialog width */
|
||||
unsigned int compl_dlg_h; /* completion dialog height */
|
||||
unsigned int compl_dlg_w; /* completion dialog width */
|
||||
|
||||
/* calculate the dialog metrics */
|
||||
/* calculate the dialog metrics */
|
||||
compl_dlg_h = num_compl + 2;
|
||||
compl_dlg_w = max_len + 4;
|
||||
start_x = edit->curs_col + edit->start_col - (compl_dlg_w / 2);
|
||||
start_y = edit->curs_row + EDIT_TEXT_VERTICAL_OFFSET + 1;
|
||||
|
||||
if (start_x < 0)
|
||||
start_x = 0;
|
||||
if (compl_dlg_w > COLS)
|
||||
compl_dlg_w = COLS;
|
||||
if (compl_dlg_h > LINES - 2)
|
||||
compl_dlg_h = LINES - 2;
|
||||
if (start_x < 0)
|
||||
start_x = 0;
|
||||
if (compl_dlg_w > COLS)
|
||||
compl_dlg_w = COLS;
|
||||
if (compl_dlg_h > LINES - 2)
|
||||
compl_dlg_h = LINES - 2;
|
||||
|
||||
offset = start_x + compl_dlg_w - COLS;
|
||||
if (offset > 0)
|
||||
start_x -= offset;
|
||||
start_x -= offset;
|
||||
offset = start_y + compl_dlg_h - LINES;
|
||||
if (offset > 0)
|
||||
start_y -= (offset + 1);
|
||||
start_y -= (offset + 1);
|
||||
|
||||
/* create the dialog */
|
||||
compl_dlg = create_dlg (start_y, start_x, compl_dlg_h, compl_dlg_w,
|
||||
dialog_colors, NULL, "[Completion]", NULL,
|
||||
DLG_COMPACT);
|
||||
|
||||
/* create the listbox */
|
||||
compl_list = listbox_new (1, 1, compl_dlg_w - 2, compl_dlg_h - 2, 0,
|
||||
compllist_callback, NULL);
|
||||
|
||||
/* add the dialog */
|
||||
/* create the dialog */
|
||||
compl_dlg =
|
||||
create_dlg (start_y, start_x, compl_dlg_h, compl_dlg_w,
|
||||
dialog_colors, NULL, "[Completion]", NULL,
|
||||
DLG_COMPACT);
|
||||
|
||||
/* create the listbox */
|
||||
compl_list =
|
||||
listbox_new (1, 1, compl_dlg_w - 2, compl_dlg_h - 2, 0,
|
||||
compllist_callback, NULL);
|
||||
|
||||
/* add the dialog */
|
||||
add_widget (compl_dlg, compl_list);
|
||||
|
||||
/* fill the listbox with the completions */
|
||||
/* fill the listbox with the completions */
|
||||
for (i = 0; i < num_compl; i++)
|
||||
listbox_add_item (compl_list, 0, 0, compl[i].text, NULL);
|
||||
|
||||
/* pop up the dialog */
|
||||
listbox_add_item (compl_list, 0, 0, compl[i].text, NULL);
|
||||
|
||||
/* pop up the dialog */
|
||||
run_dlg (compl_dlg);
|
||||
|
||||
/* apply the choosen completion */
|
||||
/* apply the choosen completion */
|
||||
if (compl_dlg->ret_value == B_ENTER) {
|
||||
listbox_get_current (compl_list, &curr, NULL);
|
||||
listbox_get_current (compl_list, &curr, NULL);
|
||||
if (curr)
|
||||
for (curr += word_len; *curr; curr++)
|
||||
edit_insert (edit, *curr);
|
||||
}
|
||||
|
||||
/* destroy dialog before return */
|
||||
/* destroy dialog before return */
|
||||
destroy_dlg (compl_dlg);
|
||||
}
|
||||
|
||||
|
||||
/* complete current word using regular expression search */
|
||||
/* backwards beginning at current cursor position */
|
||||
void edit_complete_word_cmd (WEdit *edit)
|
||||
/*
|
||||
* Complete current word using regular expression search
|
||||
* backwards beginning at the current cursor position.
|
||||
*/
|
||||
void
|
||||
edit_complete_word_cmd (WEdit *edit)
|
||||
{
|
||||
int word_len = 0, i, num_compl = 0, max_len;
|
||||
long word_start = 0;
|
||||
char *bufpos;
|
||||
char match_expr[MAX_REPL_LEN];
|
||||
struct selection compl[MAX_WORD_COMPLETIONS]; /* completions */
|
||||
|
||||
/* don't want to disturb another search */
|
||||
struct selection compl[MAX_WORD_COMPLETIONS]; /* completions */
|
||||
|
||||
/* don't want to disturb another search */
|
||||
int old_rs = replace_scanf;
|
||||
int old_rb = replace_backwards;
|
||||
int old_rr = replace_regexp;
|
||||
int old_rw = replace_whole;
|
||||
int old_rc = replace_case;
|
||||
|
||||
/* search start of word to be completed */
|
||||
/* search start of word to be completed */
|
||||
if (!edit_find_word_start (edit, &word_start, &word_len))
|
||||
return;
|
||||
|
||||
/* prepare match expression */
|
||||
/* prepare match expression */
|
||||
bufpos = &edit->buffers1[word_start >> S_EDIT_BUF_SIZE]
|
||||
[word_start & M_EDIT_BUF_SIZE];
|
||||
[word_start & M_EDIT_BUF_SIZE];
|
||||
strncpy (match_expr, bufpos, word_len);
|
||||
match_expr[word_len] = '\0';
|
||||
strcat (match_expr, "[a-zA-Z_0-9]+");
|
||||
|
||||
/* init search: backward, regexp, whole word, case sensitive */
|
||||
|
||||
/* init search: backward, regexp, whole word, case sensitive */
|
||||
edit_set_search_parameters (0, 1, 1, 1, 1);
|
||||
|
||||
/* collect the possible completions */
|
||||
/* start search from curs1 down to begin of file */
|
||||
max_len = edit_collect_completions (edit, word_start, word_len,
|
||||
match_expr, (struct selection *) &compl, &num_compl);
|
||||
/* collect the possible completions */
|
||||
/* start search from curs1 down to begin of file */
|
||||
max_len =
|
||||
edit_collect_completions (edit, word_start, word_len, match_expr,
|
||||
(struct selection *) &compl, &num_compl);
|
||||
|
||||
if (num_compl > 0) {
|
||||
/* insert completed word if there is only one match */
|
||||
/* insert completed word if there is only one match */
|
||||
if (num_compl == 1) {
|
||||
for (i = word_len; i < compl[0].len; i++)
|
||||
edit_insert (edit, *(compl[0].text + i));
|
||||
}
|
||||
/* more than one possible completion => ask the user */
|
||||
}
|
||||
/* more than one possible completion => ask the user */
|
||||
else {
|
||||
/* !!! usually only a beep is expected and when <ALT-TAB> is !!! */
|
||||
/* !!! pressed again the selection dialog pops up, but that !!! */
|
||||
/* !!! seems to require a further internal state !!! */
|
||||
/*beep ();*/
|
||||
|
||||
/* let the user select the preferred completion */
|
||||
edit_completion_dialog (edit, max_len, word_len,
|
||||
(struct selection *) &compl, num_compl);
|
||||
/* !!! usually only a beep is expected and when <ALT-TAB> is !!! */
|
||||
/* !!! pressed again the selection dialog pops up, but that !!! */
|
||||
/* !!! seems to require a further internal state !!! */
|
||||
/*beep (); */
|
||||
|
||||
/* let the user select the preferred completion */
|
||||
edit_completion_dialog (edit, max_len, word_len,
|
||||
(struct selection *) &compl,
|
||||
num_compl);
|
||||
}
|
||||
}
|
||||
|
||||
/* release memory before return */
|
||||
for (i = 0; i < num_compl; i++)
|
||||
free (compl[i].text);
|
||||
|
||||
/* restore search parameters */
|
||||
/* release memory before return */
|
||||
for (i = 0; i < num_compl; i++)
|
||||
g_free (compl[i].text);
|
||||
|
||||
/* restore search parameters */
|
||||
edit_set_search_parameters (old_rs, old_rb, old_rr, old_rw, old_rc);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue