using stls should not enable new CAPAs

[apps/madmutt.git] / keymap.c

diff --git a/keymap.c b/keymap.c
index ab8ad63..580c2a4 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -9,7 +9,7 @@
 
 #include <lib-lib/lib-lib.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
 
 #include "mutt.h"
@@ -30,13 +30,8 @@ struct mapping_t Menus[] = {
   {"postpone", MENU_POST},
   {"pgp", MENU_PGP},
   {"smime", MENU_SMIME},
-
-#ifdef HAVE_GPGME
   {"key_select_pgp", MENU_KEY_SELECT_PGP},
   {"key_select_smime", MENU_KEY_SELECT_SMIME},
-#endif
-
-  {"mix", MENU_MIX},
   {"query", MENU_QUERY},
   {"generic", MENU_GENERIC},
   {NULL, 0}
@@ -57,7 +52,7 @@ static struct mapping_t KeyNames[] = {
 #ifdef KEY_ENTER
   {"<Enter>", KEY_ENTER},
 #endif
-  {"<Return>", M_ENTER_C},
+  {"<Return>", '\n'},
   {"<Esc>", '\033'},
   {"<Tab>", '\t'},
   {"<Space>", ' '},
@@ -151,7 +146,7 @@ static int parsekeys (const char *str, keycode_t * d, int max)
     len--;
   }
 
-  return (max - len);
+  return max - len;
 }
 
 /* insert a key sequence into the specified map.  the map is sorted by ASCII
@@ -306,7 +301,7 @@ static int retry_generic (int menu, keycode_t * keys, int keyslen,
       mutt_ungetch (lastkey, 0);
     for (; keyslen; keyslen--)
       mutt_ungetch (keys[keyslen - 1], 0);
-    return (km_dokey (MENU_GENERIC));
+    return km_dokey (MENU_GENERIC);
   }
   if (menu != MENU_EDITOR) {
     /* probably a good idea to flush input here so we can abort macros */
@@ -330,17 +325,17 @@ int km_dokey (int menu)
 
 
   if (!map)
-    return (retry_generic (menu, NULL, 0, 0));
+    return retry_generic (menu, NULL, 0, 0);
 
   for (;;) {
     /* ncurses doesn't return on resized screen when timeout is set to zero */
     if (menu != MENU_EDITOR)
-      timeout ((Timeout > 0 ? Timeout : 60) * 1000);
+      wtimeout (main_w, (Timeout > 0 ? Timeout : 60) * 1000);
 
     tmp = mutt_getch ();
 
     if (menu != MENU_EDITOR)
-      timeout (-1);             /* restore blocking operation */
+      wtimeout (main_w, -1);             /* restore blocking operation */
 
     LastKey = tmp.ch;
     if (LastKey == -1)
@@ -390,12 +385,12 @@ int km_dokey (int menu)
     /* Nope. Business as usual */
     while (LastKey > map->keys[pos]) {
       if (pos > map->eq || !map->next)
-        return (retry_generic (menu, map->keys, pos, LastKey));
+        return retry_generic (menu, map->keys, pos, LastKey);
       map = map->next;
     }
 
     if (LastKey != map->keys[pos])
-      return (retry_generic (menu, map->keys, pos, LastKey));
+      return retry_generic (menu, map->keys, pos, LastKey);
 
     if (++pos == map->len) {
 
@@ -453,7 +448,7 @@ const char *km_keyname(int c)
     snprintf (buf, sizeof (buf), "%c", (unsigned char) c);
   else
     snprintf (buf, sizeof (buf), "\\x%hx", (unsigned short) c);
-  return (buf);
+  return buf;
 }
 
 int km_expand_key (char *s, size_t len, struct keymap_t *map)
@@ -462,14 +457,14 @@ int km_expand_key (char *s, size_t len, struct keymap_t *map)
   int p = 0;
 
   if (!map)
-    return (0);
+    return 0;
 
   for (;;) {
     m_strcpy(s, len, km_keyname(map->keys[p]));
     len -= (l = m_strlen(s));
 
     if (++p >= map->len || !len)
-      return (1);
+      return 1;
 
     s += l;
   }
@@ -484,7 +479,7 @@ struct keymap_t *km_find_func (int menu, int func)
   for (; map; map = map->next)
     if (map->op == func)
       break;
-  return (map);
+  return map;
 }
 
 void km_init (void)
@@ -503,11 +498,6 @@ void km_init (void)
   create_bindings (OpSmime, MENU_SMIME);
   create_bindings (OpPgp, MENU_KEY_SELECT_PGP);
   create_bindings (OpSmime, MENU_KEY_SELECT_SMIME);
-  create_bindings (OpMix, MENU_MIX);
-
-  km_bindkey ("<space>", MENU_MIX, OP_GENERIC_SELECT_ENTRY);
-  km_bindkey ("h", MENU_MIX, OP_MIX_CHAIN_PREV);
-  km_bindkey ("l", MENU_MIX, OP_MIX_CHAIN_NEXT);
 
   /* bindings for the line editor */
   create_bindings (OpEditor, MENU_EDITOR);
@@ -628,7 +618,7 @@ int mutt_parse_push (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
   }
   else
     push_string (buf->data);
-  return (r);
+  return r;
 }
 
 /* expects to see: <menu-string>,<menu-string>,... <key-string> */
@@ -668,14 +658,14 @@ static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
       m_strcpy(err->data, err->dsize, _("null key sequence"));
     }
     else if (MoreArgs (s))
-      return (buf.data);
+      return buf.data;
   }
   else {
     m_strcpy(err->data, err->dsize, _("too few arguments"));
   }
 error:
   p_delete(&buf.data);
-  return (NULL);
+  return NULL;
 }
 
 static int
@@ -686,9 +676,9 @@ try_bind (char *key, int menu, char *func, struct binding_t *bindings)
   for (i = 0; bindings[i].name; i++)
     if (m_strcmp(func, bindings[i].name) == 0) {
       km_bindkey (key, menu, bindings[i].op);
-      return (0);
+      return 0;
     }
-  return (-1);
+  return -1;
 }
 
 struct binding_t *km_get_table (int menu)
@@ -720,8 +710,6 @@ struct binding_t *km_get_table (int menu)
     return OpPgp;
   case MENU_KEY_SELECT_SMIME:
     return OpSmime;
-  case MENU_MIX:
-    return OpMix;
   }
   return NULL;
 }
@@ -766,7 +754,7 @@ int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
     }
   }
   p_delete(&key);
-  return (r);
+  return r;
 }
 
 /* macro <menu> <key> <macro> <description> */
@@ -781,7 +769,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
   if ((key =
        parse_keymap (menu, s, sizeof (menu) / sizeof (menu[0]), &nummenus,
                      err)) == NULL)
-    return (-1);
+    return -1;
 
   mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
   /* make sure the macro sequence is not an empty string */
@@ -813,7 +801,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
     }
   }
   p_delete(&key);
-  return (r);
+  return r;
 }
 
 /* exec function-name */
@@ -827,7 +815,7 @@ int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
 
   if (!MoreArgs (s)) {
     m_strcpy(err->data, err->dsize, _("exec: no arguments"));
-    return (-1);
+    return -1;
   }
 
   do {
@@ -845,7 +833,7 @@ int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
     if (ops[nops] == OP_NULL) {
       mutt_flushinp ();
       mutt_error (_("%s: no such function"), function);
-      return (-1);
+      return -1;
     }
     nops++;
   }
@@ -856,24 +844,3 @@ int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
 
   return 0;
 }
-
-/*
- * prompts the user to enter a keystroke, and displays the octal value back
- * to the user.
- */
-void mutt_what_key (void)
-{
-  int ch;
-
-  mvprintw (LINES - 1, 0, _("Enter keys (^G to abort): "));
-  do {
-    ch = getch ();
-    if (ch != ERR && ch != ctrl ('G')) {
-      mutt_message (_("Char = %s, Octal = %o, Decimal = %d"),
-                    km_keyname (ch), ch, ch);
-    }
-  }
-  while (ch != ERR && ch != ctrl ('G'));
-
-  mutt_flushinp ();
-}