X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=enter.c;h=7cd96dce34c15d01280632cfbbff04f2c9ce4d51;hp=793804b18b73fe9236ab019e7b14cc7ad603ddae;hb=9ed6c0f86855d82f8b95b3f623bf2639f0f19d0b;hpb=74a2265af51ce89bca845adc1d68f273c9933c13 diff --git a/enter.c b/enter.c index 793804b..7cd96dc 100644 --- a/enter.c +++ b/enter.c @@ -13,10 +13,12 @@ #endif #include "mutt.h" +#include "enter.h" #include "mutt_menu.h" #include "mutt_curses.h" #include "keymap.h" #include "history.h" +#include "buffy.h" #include "lib/mem.h" @@ -131,7 +133,7 @@ size_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, char *buf) k != (size_t) (-1) && k != (size_t) (-2); buf += k) { if (i >= wbuflen) { wbuflen = i + 20; - safe_realloc (&wbuf, wbuflen * sizeof (*wbuf)); + mem_realloc (&wbuf, wbuflen * sizeof (*wbuf)); } wbuf[i++] = wc; } @@ -147,7 +149,7 @@ static void replace_part (ENTER_STATE * state, size_t from, char *buf) { /* Save the suffix */ size_t savelen = state->lastchar - state->curpos; - wchar_t *savebuf = safe_calloc (savelen, sizeof (wchar_t)); + wchar_t *savebuf = mem_calloc (savelen, sizeof (wchar_t)); memcpy (savebuf, state->wbuf + state->curpos, savelen * sizeof (wchar_t)); @@ -157,14 +159,14 @@ static void replace_part (ENTER_STATE * state, size_t from, char *buf) /* Make space for suffix */ if (state->curpos + savelen > state->wbuflen) { state->wbuflen = state->curpos + savelen; - safe_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t)); + mem_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t)); } /* Restore suffix */ memcpy (state->wbuf + state->curpos, savebuf, savelen * sizeof (wchar_t)); state->lastchar = state->curpos + savelen; - FREE (&savebuf); + mem_free (&savebuf); } /* @@ -267,7 +269,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, if (ch != OP_NULL) { first = 0; - if (ch != OP_EDITOR_COMPLETE) + if (ch != OP_EDITOR_COMPLETE && ch != OP_EDITOR_COMPLETE_QUERY) state->tabs = 0; redraw = M_REDRAW_LINE; switch (ch) { @@ -439,7 +441,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, if (flags & M_EFILE) { first = 1; /* clear input if user types a real key later */ my_wcstombs (buf, buflen, state->wbuf, state->curpos); - mutt_buffy (buf, buflen); + buffy_next (buf, buflen); state->curpos = state->lastchar = my_mbstowcs (&state->wbuf, &state->wbuflen, 0, buf); break; @@ -449,6 +451,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, /* fall through to completion routine (M_FILE) */ case OP_EDITOR_COMPLETE: + case OP_EDITOR_COMPLETE_QUERY: state->tabs++; if (flags & M_CMD) { for (i = state->curpos; i && state->wbuf[i - 1] != ' '; i--); @@ -466,14 +469,14 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, } if (!mutt_complete (buf, buflen)) { templen = state->lastchar - i; - safe_realloc (&tempbuf, templen * sizeof (wchar_t)); + mem_realloc (&tempbuf, templen * sizeof (wchar_t)); } else BEEP (); replace_part (state, i, buf); } - else if (flags & M_ALIAS) { + else if (flags & M_ALIAS && ch == OP_EDITOR_COMPLETE) { /* invoke the alias-menu to get more addresses */ for (i = state->curpos; i && state->wbuf[i - 1] != ',' && state->wbuf[i - 1] != ':'; i--); @@ -486,10 +489,20 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, goto bye; } break; - } - else if (flags & M_COMMAND) { + } else if (flags & M_ALIAS && ch == OP_EDITOR_COMPLETE_QUERY) { + /* invoke the query-menu to get more addresses */ + if ((i = state->curpos)) { + for (; i && state->wbuf[i - 1] != ','; i--); + for (; i < state->curpos && state->wbuf[i] == ' '; i++); + } + my_wcstombs (buf, buflen, state->wbuf + i, state->curpos - i); + mutt_query_complete (buf, buflen); + replace_part (state, i, buf); + rv = 1; + goto bye; + } else if (flags & M_COMMAND) { my_wcstombs (buf, buflen, state->wbuf, state->curpos); - i = mutt_strlen (buf); + i = str_len (buf); if (i && buf[i - 1] == '=' && mutt_var_value_complete (buf, buflen, i)) state->tabs = 0; @@ -524,7 +537,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, if (!mutt_complete (buf, buflen)) { templen = state->lastchar; - safe_realloc (&tempbuf, templen * sizeof (wchar_t)); + mem_realloc (&tempbuf, templen * sizeof (wchar_t)); memcpy (tempbuf, state->wbuf, templen * sizeof (wchar_t)); } else @@ -535,24 +548,6 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, goto self_insert; break; - case OP_EDITOR_COMPLETE_QUERY: - if (flags & M_ALIAS) { - /* invoke the query-menu to get more addresses */ - if ((i = state->curpos)) { - for (; i && state->wbuf[i - 1] != ','; i--); - for (; i < state->curpos && state->wbuf[i] == ' '; i++); - } - - my_wcstombs (buf, buflen, state->wbuf + i, state->curpos - i); - mutt_query_complete (buf, buflen); - replace_part (state, i, buf); - - rv = 1; - goto bye; - } - else - goto self_insert; - case OP_EDITOR_QUOTE_CHAR: { event_t event; @@ -641,9 +636,9 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, char **tfiles; *numfiles = 1; - tfiles = safe_calloc (*numfiles, sizeof (char *)); + tfiles = mem_calloc (*numfiles, sizeof (char *)); mutt_expand_path (buf, buflen); - tfiles[0] = safe_strdup (buf); + tfiles[0] = str_dup (buf); *files = tfiles; } rv = 0; @@ -652,7 +647,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, else if (wc && (wc < ' ' || IsWPrint (wc))) { /* why? */ if (state->lastchar >= state->wbuflen) { state->wbuflen = state->lastchar + 20; - safe_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t)); + mem_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t)); } memmove (state->wbuf + state->curpos + 1, state->wbuf + state->curpos, (state->lastchar - state->curpos) * sizeof (wchar_t)); @@ -668,7 +663,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, bye: - FREE (&tempbuf); + mem_free (&tempbuf); return rv; } @@ -677,8 +672,8 @@ void mutt_free_enter_state (ENTER_STATE ** esp) if (!esp) return; - FREE (&(*esp)->wbuf); - FREE (esp); + mem_free (&(*esp)->wbuf); + mem_free (esp); } /*