X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=enter.c;h=cc3b3799808c99967a7c0d82db294dbfd86ca337;hp=5ad1f0a8d40d4090c49e32a95860982f83444ca9;hb=3c3c535e5ed1d651c6024b5acf670e217af473f7;hpb=b2b5c2916e7850ad2f4d1a1b6c8aeb0f1ed49be6

diff --git a/enter.c b/enter.c
index 5ad1f0a..cc3b379 100644
--- a/enter.c
+++ b/enter.c
@@ -1,40 +1,40 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 2000 Edmund Grimley Evans <edmundo@rano.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- */ 
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <lib-lib/mem.h>
 
 #include "mutt.h"
+#include "enter.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "history.h"
+#include "buffy.h"
+
 
 #include <string.h>
 
 /* redraw flags for mutt_enter_string() */
-enum
-{
-  M_REDRAW_INIT = 1,        /* go to end of line and redraw */
-  M_REDRAW_LINE                /* redraw entire line */
+enum {
+  M_REDRAW_INIT = 1,            /* go to end of line and redraw */
+  M_REDRAW_LINE                 /* redraw entire line */
 };
 
 static int my_wcwidth (wchar_t wc)
 {
   int n = wcwidth (wc);
+
   if (IsWPrint (wc) && n > 0)
     return n;
   if (!(wc & ~0x7f))
@@ -47,9 +47,10 @@ static int my_wcwidth (wchar_t wc)
 /* combining mark / non-spacing character */
 #define COMB_CHAR(wc) (IsWPrint (wc) && !wcwidth (wc))
 
-static int my_wcswidth (const wchar_t *s, size_t n)
+static int my_wcswidth (const wchar_t * s, size_t n)
 {
   int w = 0;
+
   while (n--)
     w += my_wcwidth (*s++);
   return w;
@@ -58,34 +59,37 @@ static int my_wcswidth (const wchar_t *s, size_t n)
 static int my_addwch (wchar_t wc)
 {
   int n = wcwidth (wc);
+
   if (IsWPrint (wc) && n > 0)
     return mutt_addwch (wc);
   if (!(wc & ~0x7f))
-    return printw ("^%c", ((int)wc + 0x40) & 0x7f);
+    return printw ("^%c", ((int) wc + 0x40) & 0x7f);
   if (!(wc & ~0xffff))
-    return printw ("\\u%04x", (int)wc);
-  return printw ("\\u%08x", (int)wc);
+    return printw ("\\u%04x", (int) wc);
+  return printw ("\\u%08x", (int) wc);
 }
 
-static size_t width_ceiling (const wchar_t *s, size_t n, int w1)
+static size_t width_ceiling (const wchar_t * s, size_t n, int w1)
 {
   const wchar_t *s0 = s;
   int w = 0;
+
   for (; n; s++, n--)
     if ((w += my_wcwidth (*s)) > w1)
       break;
-  return s - s0;  
+  return s - s0;
 }
 
-static void my_wcstombs (char *dest, size_t dlen, const wchar_t *src, size_t slen)
+static void my_wcstombs (char *dest, size_t dlen, const wchar_t * src,
+                         size_t slen)
 {
   mbstate_t st;
   size_t k;
 
   /* First convert directly into the destination buffer */
-  memset (&st, 0, sizeof (st));
+  p_clear(&st, 1);
   for (; slen && dlen >= MB_LEN_MAX; dest += k, dlen -= k, src++, slen--)
-    if ((k = wcrtomb (dest, *src, &st)) == (size_t)(-1))
+    if ((k = wcrtomb (dest, *src, &st)) == (size_t) (-1))
       break;
 
   /* If this works, we can stop now */
@@ -100,7 +104,7 @@ static void my_wcstombs (char *dest, size_t dlen, const wchar_t *src, size_t sle
     char *p = buf;
 
     for (; slen && p - buf < dlen; p += k, src++, slen--)
-      if ((k = wcrtomb (p, *src, &st)) == (size_t)(-1))
+      if ((k = wcrtomb (p, *src, &st)) == (size_t) (-1))
         break;
     p += wcrtomb (p, 0, &st);
 
@@ -112,11 +116,11 @@ static void my_wcstombs (char *dest, size_t dlen, const wchar_t *src, size_t sle
 
     /* Otherwise we truncate the string in an ugly fashion */
     memcpy (dest, buf, dlen);
-    dest[dlen - 1] = '\0'; /* assume original dlen > 0 */
+    dest[dlen - 1] = '\0';      /* assume original dlen > 0 */
   }
 }
 
-size_t my_mbstowcs (wchar_t **pwbuf, size_t *pwbuflen, size_t i, char *buf)
+size_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, const char *buf)
 {
   wchar_t wc;
   mbstate_t st;
@@ -125,14 +129,12 @@ size_t my_mbstowcs (wchar_t **pwbuf, size_t *pwbuflen, size_t i, char *buf)
   size_t wbuflen;
 
   wbuf = *pwbuf, wbuflen = *pwbuflen;
-  memset (&st, 0, sizeof (st));
+  p_clear(&st, 1);
   for (; (k = mbrtowc (&wc, buf, MB_LEN_MAX, &st)) &&
-         k != (size_t)(-1) && k != (size_t)(-2); buf += k)
-  {
-    if (i >= wbuflen)
-    {
+       k != (size_t) (-1) && k != (size_t) (-2); buf += k) {
+    if (i >= wbuflen) {
       wbuflen = i + 20;
-      safe_realloc (&wbuf, wbuflen * sizeof (*wbuf));
+      p_realloc(&wbuf, wbuflen);
     }
     wbuf[i++] = wc;
   }
@@ -144,28 +146,28 @@ size_t my_mbstowcs (wchar_t **pwbuf, size_t *pwbuflen, size_t i, char *buf)
  * Replace part of the wchar_t buffer, from FROM to CURPOS, by BUF.
  */
 
-static void replace_part (ENTER_STATE *state, size_t from, char *buf)
+static void replace_part (ENTER_STATE *state, size_t from, const char *buf)
 {
   /* Save the suffix */
   size_t savelen = state->lastchar - state->curpos;
-  wchar_t *savebuf = safe_calloc (savelen, sizeof (wchar_t));
+  wchar_t *savebuf = p_new(wchar_t, savelen);
+
   memcpy (savebuf, state->wbuf + state->curpos, savelen * sizeof (wchar_t));
 
   /* Convert to wide characters */
-  state->curpos = my_mbstowcs (&state->wbuf, &state->wbuflen, from, buf);
+  state->curpos = my_mbstowcs(&state->wbuf, &state->wbuflen, from, buf);
 
   /* Make space for suffix */
-  if (state->curpos + savelen > state->wbuflen)
-  {
+  if (state->curpos + savelen > state->wbuflen) {
     state->wbuflen = state->curpos + savelen;
-    safe_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
+    p_realloc(&state->wbuf, state->wbuflen);
   }
 
   /* Restore suffix */
   memcpy (state->wbuf + state->curpos, savebuf, savelen * sizeof (wchar_t));
   state->lastchar = state->curpos + savelen;
 
-  FREE (&savebuf);
+  p_delete(&savebuf);
 }
 
 /*
@@ -175,10 +177,11 @@ static void replace_part (ENTER_STATE *state, size_t from, char *buf)
  *         -1 if abort.
  */
 
-int  mutt_enter_string(char *buf, size_t buflen, int y, int x, int flags)
+int mutt_enter_string (char *buf, size_t buflen, int y, int x, int flags)
 {
   int rv;
   ENTER_STATE *es = mutt_new_enter_state ();
+
   rv = _mutt_enter_string (buf, buflen, y, x, flags, 0, NULL, NULL, es);
   mutt_free_enter_state (&es);
   return rv;
@@ -186,7 +189,7 @@ int  mutt_enter_string(char *buf, size_t buflen, int y, int x, int flags)
 
 int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
                         int flags, int multiple, char ***files, int *numfiles,
-                        ENTER_STATE *state)
+                        ENTER_STATE * state)
 {
   int width = COLS - x - 1;
   int redraw;
@@ -201,15 +204,14 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
   mbstate_t mbstate;
 
   int rv = 0;
-  memset (&mbstate, 0, sizeof (mbstate));
-  
-  if (state->wbuf)
-  {
+
+  p_clear(&mbstate, 1);
+
+  if (state->wbuf) {
     /* Coming back after return 1 */
     redraw = M_REDRAW_LINE;
   }
-  else
-  {
+  else {
     /* Initialise wbuf from buf */
     state->wbuflen = 0;
     state->lastchar = my_mbstowcs (&state->wbuf, &state->wbuflen, 0, buf);
@@ -226,401 +228,374 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
     hclass = HC_COMMAND;
   else if (flags & M_PATTERN)
     hclass = HC_PATTERN;
-  else 
+  else
     hclass = HC_OTHER;
-    
-  for (;;)
-  {
-    if (redraw && !pass)
-    {
-      if (redraw == M_REDRAW_INIT)
-      {
+
+  for (;;) {
+    if (redraw && !pass) {
+      if (redraw == M_REDRAW_INIT) {
         /* Go to end of line */
         state->curpos = state->lastchar;
-        state->begin = width_ceiling (state->wbuf, state->lastchar, my_wcswidth (state->wbuf, state->lastchar) - width + 1);
-      } 
+        state->begin =
+          width_ceiling (state->wbuf, state->lastchar,
+                         my_wcswidth (state->wbuf,
+                                      state->lastchar) - width + 1);
+      }
       if (state->curpos < state->begin ||
-          my_wcswidth (state->wbuf + state->begin, state->curpos - state->begin) >= width)
-        state->begin = width_ceiling (state->wbuf, state->lastchar, my_wcswidth (state->wbuf, state->curpos) - width / 2);
+          my_wcswidth (state->wbuf + state->begin,
+                       state->curpos - state->begin) >= width)
+        state->begin =
+          width_ceiling (state->wbuf, state->lastchar,
+                         my_wcswidth (state->wbuf,
+                                      state->curpos) - width / 2);
       move (y, x);
       w = 0;
-      for (i = state->begin; i < state->lastchar; i++)
-      {
+      for (i = state->begin; i < state->lastchar; i++) {
         w += my_wcwidth (state->wbuf[i]);
         if (w > width)
           break;
         my_addwch (state->wbuf[i]);
       }
       clrtoeol ();
-      move (y, x + my_wcswidth (state->wbuf + state->begin, state->curpos - state->begin));
+      move (y,
+            x + my_wcswidth (state->wbuf + state->begin,
+                             state->curpos - state->begin));
     }
     mutt_refresh ();
 
-    if ((ch = km_dokey (MENU_EDITOR)) == -1)
-    {
-      rv = -1; 
+    if ((ch = km_dokey (MENU_EDITOR)) == -1) {
+      rv = -1;
       goto bye;
     }
 
-    if (ch != OP_NULL)
-    {
+    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)
-      {
-        case OP_EDITOR_HISTORY_UP:
-          state->curpos = state->lastchar;
-          replace_part (state, 0, mutt_history_prev (hclass));
-          redraw = M_REDRAW_INIT;
-          break;
+      switch (ch) {
+      case OP_EDITOR_HISTORY_UP:
+        state->curpos = state->lastchar;
+        replace_part(state, 0, mutt_history_prev(hclass));
+        redraw = M_REDRAW_INIT;
+        break;
 
-        case OP_EDITOR_HISTORY_DOWN:
-          state->curpos = state->lastchar;
-          replace_part (state, 0, mutt_history_next (hclass));
-          redraw = M_REDRAW_INIT;
-          break;
+      case OP_EDITOR_HISTORY_DOWN:
+        state->curpos = state->lastchar;
+        replace_part(state, 0, mutt_history_next(hclass));
+        redraw = M_REDRAW_INIT;
+        break;
 
-        case OP_EDITOR_BACKSPACE:
-          if (state->curpos == 0)
-            BEEP ();
-          else
-          {
-            i = state->curpos;
-            while (i && COMB_CHAR (state->wbuf[i - 1]))
-              --i;
-            if (i)
-              --i;
-            memmove (state->wbuf + i, state->wbuf + state->curpos, (state->lastchar - state->curpos) * sizeof (wchar_t));
-            state->lastchar -= state->curpos - i;
-            state->curpos = i;
-          }
-          break;
+      case OP_EDITOR_BACKSPACE:
+        if (state->curpos == 0)
+          BEEP ();
+        else {
+          i = state->curpos;
+          while (i && COMB_CHAR (state->wbuf[i - 1]))
+            --i;
+          if (i)
+            --i;
+          memmove (state->wbuf + i, state->wbuf + state->curpos,
+                   (state->lastchar - state->curpos) * sizeof (wchar_t));
+          state->lastchar -= state->curpos - i;
+          state->curpos = i;
+        }
+        break;
 
-        case OP_EDITOR_BOL:
-          state->curpos = 0;
-          break;
+      case OP_EDITOR_BOL:
+        state->curpos = 0;
+        break;
 
-        case OP_EDITOR_EOL:
-          redraw= M_REDRAW_INIT;
-          break;
+      case OP_EDITOR_EOL:
+        redraw = M_REDRAW_INIT;
+        break;
 
-        case OP_EDITOR_KILL_LINE:
-          state->curpos = state->lastchar = 0;
-          break;
+      case OP_EDITOR_KILL_LINE:
+        state->curpos = state->lastchar = 0;
+        break;
 
-        case OP_EDITOR_KILL_EOL:
-          state->lastchar = state->curpos;
-          break;
+      case OP_EDITOR_KILL_EOL:
+        state->lastchar = state->curpos;
+        break;
 
-        case OP_EDITOR_BACKWARD_CHAR:
-          if (state->curpos == 0)
-            BEEP ();
-          else
-          {
-            while (state->curpos && COMB_CHAR (state->wbuf[state->curpos - 1]))
-              state->curpos--;
-            if (state->curpos)
-              state->curpos--;
-          }
-          break;
+      case OP_EDITOR_BACKWARD_CHAR:
+        if (state->curpos == 0)
+          BEEP ();
+        else {
+          while (state->curpos && COMB_CHAR (state->wbuf[state->curpos - 1]))
+            state->curpos--;
+          if (state->curpos)
+            state->curpos--;
+        }
+        break;
 
-        case OP_EDITOR_FORWARD_CHAR:
-          if (state->curpos == state->lastchar)
-            BEEP ();
-          else
-          {
+      case OP_EDITOR_FORWARD_CHAR:
+        if (state->curpos == state->lastchar)
+          BEEP ();
+        else {
+          ++state->curpos;
+          while (state->curpos < state->lastchar
+                 && COMB_CHAR (state->wbuf[state->curpos]))
             ++state->curpos;
-            while (state->curpos < state->lastchar && COMB_CHAR (state->wbuf[state->curpos]))
-              ++state->curpos;
-          }
-          break;
-
-        case OP_EDITOR_BACKWARD_WORD:
-          if (state->curpos == 0)
-            BEEP ();
-          else
-          {
-            while (state->curpos && iswspace (state->wbuf[state->curpos - 1]))
-              --state->curpos;
-            while (state->curpos && !iswspace (state->wbuf[state->curpos - 1]))
-              --state->curpos;
-          }
-          break;
-
-        case OP_EDITOR_FORWARD_WORD:
-          if (state->curpos == state->lastchar)
-            BEEP ();
-          else
-          {
-            while (state->curpos < state->lastchar && iswspace (state->wbuf[state->curpos]))
-              ++state->curpos;
-            while (state->curpos < state->lastchar && !iswspace (state->wbuf[state->curpos]))
-              ++state->curpos;
-          }
-          break;
+        }
+        break;
 
-        case OP_EDITOR_CAPITALIZE_WORD:
-        case OP_EDITOR_UPCASE_WORD:
-        case OP_EDITOR_DOWNCASE_WORD:
-          if (state->curpos == state->lastchar)
-          {
-            BEEP ();
-            break;
-          }
-          while (state->curpos && !iswspace (state->wbuf[state->curpos]))
+      case OP_EDITOR_BACKWARD_WORD:
+        if (state->curpos == 0)
+          BEEP ();
+        else {
+          while (state->curpos && iswspace (state->wbuf[state->curpos - 1]))
             --state->curpos;
-          while (state->curpos < state->lastchar && iswspace (state->wbuf[state->curpos]))
+          while (state->curpos && !iswspace (state->wbuf[state->curpos - 1]))
+            --state->curpos;
+        }
+        break;
+
+      case OP_EDITOR_FORWARD_WORD:
+        if (state->curpos == state->lastchar)
+          BEEP ();
+        else {
+          while (state->curpos < state->lastchar
+                 && iswspace (state->wbuf[state->curpos]))
             ++state->curpos;
-          while (state->curpos < state->lastchar && !iswspace (state->wbuf[state->curpos]))
-          {
-            if (ch == OP_EDITOR_DOWNCASE_WORD)
-              state->wbuf[state->curpos] = towlower (state->wbuf[state->curpos]);
-            else
-            {
-              state->wbuf[state->curpos] = towupper (state->wbuf[state->curpos]);
-              if (ch == OP_EDITOR_CAPITALIZE_WORD)
-                ch = OP_EDITOR_DOWNCASE_WORD;
-            }
-            state->curpos++;
-          }
-          break;
+          while (state->curpos < state->lastchar
+                 && !iswspace (state->wbuf[state->curpos]))
+            ++state->curpos;
+        }
+        break;
 
-        case OP_EDITOR_DELETE_CHAR:
-          if (state->curpos == state->lastchar)
-            BEEP ();
-          else
-          {
-            i = state->curpos;
-            while (i < state->lastchar && COMB_CHAR (state->wbuf[i]))
-              ++i;
-            if (i < state->lastchar)
-              ++i;
-            while (i < state->lastchar && COMB_CHAR (state->wbuf[i]))
-              ++i;
-            memmove (state->wbuf + state->curpos, state->wbuf + i, (state->lastchar - i) * sizeof (wchar_t));
-            state->lastchar -= i - state->curpos;
-          }
+      case OP_EDITOR_CAPITALIZE_WORD:
+      case OP_EDITOR_UPCASE_WORD:
+      case OP_EDITOR_DOWNCASE_WORD:
+        if (state->curpos == state->lastchar) {
+          BEEP ();
           break;
-
-        case OP_EDITOR_KILL_WORD:
-          /* delete to begining of word */
-          if (state->curpos != 0)
-          {
-            i = state->curpos;
-            while (i && iswspace (state->wbuf[i - 1]))
-              --i;
-            if (i)
-            {
-              if (iswalnum (state->wbuf[i - 1]))
-              {
-                for (--i; i && iswalnum (state->wbuf[i - 1]); i--)
-                  ;
-              }
-              else
-                --i;
-            }
-            memmove (state->wbuf + i, state->wbuf + state->curpos,
-                     (state->lastchar - state->curpos) * sizeof (wchar_t));
-            state->lastchar += i - state->curpos;
-            state->curpos = i;
+        }
+        while (state->curpos && !iswspace (state->wbuf[state->curpos]))
+          --state->curpos;
+        while (state->curpos < state->lastchar
+               && iswspace (state->wbuf[state->curpos]))
+          ++state->curpos;
+        while (state->curpos < state->lastchar
+               && !iswspace (state->wbuf[state->curpos])) {
+          if (ch == OP_EDITOR_DOWNCASE_WORD)
+            state->wbuf[state->curpos] =
+              towlower (state->wbuf[state->curpos]);
+          else {
+            state->wbuf[state->curpos] =
+              towupper (state->wbuf[state->curpos]);
+            if (ch == OP_EDITOR_CAPITALIZE_WORD)
+              ch = OP_EDITOR_DOWNCASE_WORD;
           }
-          break;
+          state->curpos++;
+        }
+        break;
 
-        case OP_EDITOR_KILL_EOW:
-          /* delete to end of word */
-          for (i = state->curpos;
-               i < state->lastchar && iswspace (state->wbuf[i]); i++)
-            ;
-          for (; i < state->lastchar && !iswspace (state->wbuf[i]); i++)
-            ;
+      case OP_EDITOR_DELETE_CHAR:
+        if (state->curpos == state->lastchar)
+          BEEP ();
+        else {
+          i = state->curpos;
+          while (i < state->lastchar && COMB_CHAR (state->wbuf[i]))
+            ++i;
+          if (i < state->lastchar)
+            ++i;
+          while (i < state->lastchar && COMB_CHAR (state->wbuf[i]))
+            ++i;
           memmove (state->wbuf + state->curpos, state->wbuf + i,
                    (state->lastchar - i) * sizeof (wchar_t));
-          state->lastchar += state->curpos - i;
-          break;
+          state->lastchar -= i - state->curpos;
+        }
+        break;
 
-        case OP_EDITOR_BUFFY_CYCLE:
-          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);
-            state->curpos = state->lastchar = my_mbstowcs (&state->wbuf, &state->wbuflen, 0, buf);
-            break;
-          }
-          else if (!(flags & M_FILE))
-            goto self_insert;
-          /* fall through to completion routine (M_FILE) */
-
-        case OP_EDITOR_COMPLETE:
-          state->tabs++;
-          if (flags & M_CMD)
-          {
-            for (i = state->curpos; i && state->wbuf[i-1] != ' '; i--)
-              ;
-            my_wcstombs (buf, buflen, state->wbuf + i, state->curpos - i);
-            if (tempbuf && templen == state->lastchar - i &&
-                !memcmp (tempbuf, state->wbuf + i, (state->lastchar - i) * sizeof (wchar_t)))
-            {
-              mutt_select_file (buf, buflen, (flags & M_EFILE) ? M_SEL_FOLDER : 0);
-              set_option (OPTNEEDREDRAW);
-              if (*buf)
-                replace_part (state, i, buf);
-              rv = 1; 
-              goto bye;
-            }
-            if (!mutt_complete (buf, buflen))
-            {
-              templen = state->lastchar - i;
-              safe_realloc (&tempbuf, templen * sizeof (wchar_t));
+      case OP_EDITOR_KILL_WORD:
+        /* delete to begining of word */
+        if (state->curpos != 0) {
+          i = state->curpos;
+          while (i && iswspace (state->wbuf[i - 1]))
+            --i;
+          if (i) {
+            if (iswalnum (state->wbuf[i - 1])) {
+              for (--i; i && iswalnum (state->wbuf[i - 1]); i--);
             }
             else
-              BEEP ();
-
-            replace_part (state, i, buf);
+              --i;
           }
-          else if (flags & M_ALIAS)
-          {
-            /* invoke the alias-menu to get more addresses */
-            for (i = state->curpos; i && state->wbuf[i-1] != ',' && 
-                 state->wbuf[i-1] != ':'; i--)
-              ;
-            for (; i < state->lastchar && state->wbuf[i] == ' '; i++)
-              ;
-            my_wcstombs (buf, buflen, state->wbuf + i, state->curpos - i);
-            r = mutt_alias_complete (buf, buflen);
-            replace_part (state, i, buf);
-            if (!r)
-            {
-              rv = 1;
-              goto bye;
-            }
-            break;
+          memmove (state->wbuf + i, state->wbuf + state->curpos,
+                   (state->lastchar - state->curpos) * sizeof (wchar_t));
+          state->lastchar += i - state->curpos;
+          state->curpos = i;
+        }
+        break;
+
+      case OP_EDITOR_KILL_EOW:
+        /* delete to end of word */
+        for (i = state->curpos;
+             i < state->lastchar && iswspace (state->wbuf[i]); i++);
+        for (; i < state->lastchar && !iswspace (state->wbuf[i]); i++);
+        memmove (state->wbuf + state->curpos, state->wbuf + i,
+                 (state->lastchar - i) * sizeof (wchar_t));
+        state->lastchar += state->curpos - i;
+        break;
+
+      case OP_EDITOR_BUFFY_CYCLE:
+        if (flags & M_EFILE) {
+          first = 1;            /* clear input if user types a real key later */
+          my_wcstombs (buf, buflen, state->wbuf, state->curpos);
+          buffy_next (buf, buflen);
+          state->curpos = state->lastchar =
+            my_mbstowcs (&state->wbuf, &state->wbuflen, 0, buf);
+          break;
+        }
+        else if (!(flags & M_FILE))
+          goto self_insert;
+        /* 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--);
+          my_wcstombs (buf, buflen, state->wbuf + i, state->curpos - i);
+          if (tempbuf && templen == state->lastchar - i &&
+              !memcmp (tempbuf, state->wbuf + i,
+                       (state->lastchar - i) * sizeof (wchar_t))) {
+            mutt_select_file (buf, buflen,
+                              (flags & M_EFILE) ? M_SEL_FOLDER : 0);
+            set_option (OPTNEEDREDRAW);
+            if (*buf)
+              replace_part (state, i, buf);
+            rv = 1;
+            goto bye;
           }
-          else if (flags & M_COMMAND)
-          {
-            my_wcstombs (buf, buflen, state->wbuf, state->curpos);
-            i = strlen (buf);
-            if (i && buf[i - 1] == '=' &&
-                mutt_var_value_complete (buf, buflen, i))
-              state->tabs = 0;
-            else if (!mutt_command_complete (buf, buflen, i, state->tabs))
-              BEEP ();
-            replace_part (state, 0, buf);
+          if (!mutt_complete (buf, buflen)) {
+            templen = state->lastchar - i;
+            p_realloc(&tempbuf, templen);
           }
-          else if (flags & (M_FILE | M_EFILE))
-          {
-            my_wcstombs (buf, buflen, state->wbuf, state->curpos);
-
-            /* see if the path has changed from the last time */
-            if ((!tempbuf && !state->lastchar) || (tempbuf && templen == state->lastchar &&
-                !memcmp (tempbuf, state->wbuf, state->lastchar * sizeof (wchar_t))))
-            {
-              _mutt_select_file (buf, buflen, 
-                                 ((flags & M_EFILE) ? M_SEL_FOLDER : 0) | (multiple ? M_SEL_MULTI : 0), 
-                                 files, numfiles);
-              set_option (OPTNEEDREDRAW);
-              if (*buf)
-              {
-                mutt_pretty_mailbox (buf);
-                if (!pass)
-                  mutt_history_add (hclass, buf);
-                rv = 0;
-                goto bye;
-              }
-
-              /* file selection cancelled */
-              rv = 1;
-              goto bye;
-            }
+          else
+            BEEP ();
 
-            if (!mutt_complete (buf, buflen))
-            {
-              templen = state->lastchar;
-              safe_realloc (&tempbuf, templen * sizeof (wchar_t));
-              memcpy (tempbuf, state->wbuf, templen * sizeof (wchar_t));
-            }
-            else
-              BEEP (); /* let the user know that nothing matched */
-            replace_part (state, 0, buf);
+          replace_part (state, i, buf);
+        }
+        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--);
+          for (; i < state->lastchar && state->wbuf[i] == ' '; i++);
+          my_wcstombs (buf, buflen, state->wbuf + i, state->curpos - i);
+          r = mutt_alias_complete (buf, buflen);
+          replace_part (state, i, buf);
+          if (!r) {
+            rv = 1;
+            goto bye;
           }
-          else
-            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++)
-                ;
+        } 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 = m_strlen(buf);
+          if (i && buf[i - 1] == '=' &&
+              mutt_var_value_complete (buf, buflen, i))
+            state->tabs = 0;
+          else if (!mutt_command_complete (buf, buflen, i, state->tabs))
+            BEEP ();
+          replace_part (state, 0, buf);
+        }
+        else if (flags & (M_FILE | M_EFILE)) {
+          my_wcstombs (buf, buflen, state->wbuf, state->curpos);
+
+          /* see if the path has changed from the last time */
+          if ((!tempbuf && !state->lastchar)
+              || (tempbuf && templen == state->lastchar
+                  && !memcmp (tempbuf, state->wbuf,
+                              state->lastchar * sizeof (wchar_t)))) {
+            _mutt_select_file (buf, buflen,
+                               ((flags & M_EFILE) ? M_SEL_FOLDER : 0) |
+                               (multiple ? M_SEL_MULTI : 0), files, numfiles);
+            set_option (OPTNEEDREDRAW);
+            if (*buf) {
+              mutt_pretty_mailbox (buf);
+              if (!pass)
+                mutt_history_add (hclass, buf);
+              rv = 0;
+              goto bye;
             }
 
-            my_wcstombs (buf, buflen, state->wbuf + i, state->curpos - i);
-            mutt_query_complete (buf, buflen);
-            replace_part (state, i, buf);
-
-            rv = 1; 
+            /* file selection cancelled */
+            rv = 1;
             goto bye;
           }
-          else
-            goto self_insert;
 
-        case OP_EDITOR_QUOTE_CHAR:
-          {
-            event_t event;
-            /*ADDCH (LastKey);*/
-            event = mutt_getch ();
-            if (event.ch != -1)
-            {
-              LastKey = event.ch;
-              goto self_insert;
-            }
+          if (!mutt_complete (buf, buflen)) {
+            templen = state->lastchar;
+            p_realloc(&tempbuf, templen);
+            memcpy (tempbuf, state->wbuf, templen * sizeof (wchar_t));
           }
-
-        case OP_EDITOR_TRANSPOSE_CHARS:
-          if (state->lastchar < 2)
-            BEEP ();
           else
-        {
-            wchar_t t;
+            BEEP ();            /* let the user know that nothing matched */
+          replace_part (state, 0, buf);
+        }
+        else
+          goto self_insert;
+        break;
 
-            if (state->curpos == 0)
-              state->curpos = 2;
-            else if (state->curpos < state->lastchar)
-              ++state->curpos;
+      case OP_EDITOR_QUOTE_CHAR:
+        {
+          event_t event;
 
-            t = state->wbuf[state->curpos - 2];
-            state->wbuf[state->curpos - 2] = state->wbuf[state->curpos - 1];
-            state->wbuf[state->curpos - 1] = t;
+          /*ADDCH (LastKey); */
+          event = mutt_getch ();
+          if (event.ch != -1) {
+            LastKey = event.ch;
+            goto self_insert;
           }
-          break;
+        }
 
-        default:
+      case OP_EDITOR_TRANSPOSE_CHARS:
+        if (state->lastchar < 2)
           BEEP ();
+        else {
+          wchar_t t;
+
+          if (state->curpos == 0)
+            state->curpos = 2;
+          else if (state->curpos < state->lastchar)
+            ++state->curpos;
+
+          t = state->wbuf[state->curpos - 2];
+          state->wbuf[state->curpos - 2] = state->wbuf[state->curpos - 1];
+          state->wbuf[state->curpos - 1] = t;
+        }
+        break;
+
+      default:
+        BEEP ();
       }
     }
-    else
-    {
-      
-self_insert:
+    else {
+
+    self_insert:
 
       state->tabs = 0;
       /* use the raw keypress */
       ch = LastKey;
 
-      if ((ch == '#') && (flags & M_LASTFOLDER))
-      {
+      if ((ch == '#') && (flags & M_LASTFOLDER)) {
         rv = 2;
         my_wcstombs (buf, buflen, state->wbuf, state->lastchar);
         goto bye;
       }
-      
+
 #ifdef KEY_ENTER
       /* treat ENTER the same as RETURN */
       if (ch == KEY_ENTER)
@@ -638,72 +613,68 @@ self_insert:
 
         c = ch;
         k = mbrtowc (&wc, &c, 1, &mbstate);
-        if (k == (size_t)(-2))
+        if (k == (size_t) (-2))
           continue;
-        else if (k && k != 1)
-        {
-          memset (&mbstate, 0, sizeof (mbstate));
+        else if (k && k != 1) {
+          p_clear(&mbstate, 1);
           continue;
         }
       }
 
-      if (first && (flags & M_CLEAR))
-      {
+      if (first && (flags & M_CLEAR)) {
         first = 0;
-        if (IsWPrint (wc)) /* why? */
+        if (IsWPrint (wc))      /* why? */
           state->curpos = state->lastchar = 0;
       }
 
-      if (wc == '\r' || wc == '\n')
-      {
+      if (wc == '\r' || wc == '\n') {
         /* Convert from wide characters */
         my_wcstombs (buf, buflen, state->wbuf, state->lastchar);
         if (!pass)
           mutt_history_add (hclass, buf);
 
-        if (multiple)
-        {
+        if (multiple) {
           char **tfiles;
+
           *numfiles = 1;
-          tfiles = safe_calloc (*numfiles, sizeof (char *));
+          tfiles = p_new(char *, *numfiles);
           mutt_expand_path (buf, buflen);
-          tfiles[0] = safe_strdup (buf);
+          tfiles[0] = m_strdup(buf);
           *files = tfiles;
         }
-        rv = 0; 
+        rv = 0;
         goto bye;
       }
-      else if (wc && (wc < ' ' || IsWPrint (wc))) /* why? */
-      {
-        if (state->lastchar >= state->wbuflen)
-        {
+      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));
+          p_realloc(&state->wbuf, state->wbuflen);
         }
-        memmove (state->wbuf + state->curpos + 1, state->wbuf + state->curpos, (state->lastchar - state->curpos) * sizeof (wchar_t));
+        memmove (state->wbuf + state->curpos + 1, state->wbuf + state->curpos,
+                 (state->lastchar - state->curpos) * sizeof (wchar_t));
         state->wbuf[state->curpos++] = wc;
         state->lastchar++;
       }
-      else
-      {
+      else {
         mutt_flushinp ();
         BEEP ();
       }
     }
   }
-  
-  bye:
-  
-  FREE (&tempbuf);
+
+bye:
+
+  p_delete(&tempbuf);
   return rv;
 }
 
-void mutt_free_enter_state (ENTER_STATE **esp)
+void mutt_free_enter_state (ENTER_STATE ** esp)
 {
-  if (!esp) return;
-  
-  FREE (&(*esp)->wbuf);
-  FREE (esp);
+  if (!esp)
+    return;
+
+  p_delete(&(*esp)->wbuf);
+  p_delete(esp);
 }
 
 /*