X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=87b2b28d4dd3f937f9605a6b111e46416a741673;hp=5c9b9a605c77ee9afd1be38a24f411b102b0d038;hb=16be8d10413bbcf822577afd4019d65aba7459e0;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638

diff --git a/keymap.c b/keymap.c
index 5c9b9a6..87b2b28 100644
--- a/keymap.c
+++ b/keymap.c
@@ -9,12 +9,12 @@
 
 #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"
 #include "keymap.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
 
 #define MUTT_FUNCTIONS_VALUES
 #include "functions.def"
@@ -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>", ' '},
@@ -335,12 +330,12 @@ int km_dokey (int menu)
   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)
@@ -501,17 +496,8 @@ void km_init (void)
   create_bindings (OpAlias, MENU_ALIAS);
   create_bindings (OpPgp, MENU_PGP);
   create_bindings (OpSmime, MENU_SMIME);
-
-#ifdef CRYPT_BACKEND_GPGME
   create_bindings (OpPgp, MENU_KEY_SELECT_PGP);
   create_bindings (OpSmime, MENU_KEY_SELECT_SMIME);
-#endif
-
-  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);
@@ -720,16 +706,10 @@ struct binding_t *km_get_table (int menu)
     return OpQuery;
   case MENU_PGP:
     return OpPgp;
-
-#ifdef CRYPT_BACKEND_GPGME
   case MENU_KEY_SELECT_PGP:
     return OpPgp;
   case MENU_KEY_SELECT_SMIME:
     return OpSmime;
-#endif
-
-  case MENU_MIX:
-    return OpMix;
   }
   return NULL;
 }
@@ -740,12 +720,11 @@ int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
 {
   struct binding_t *bindings = NULL;
   char *key;
-  int menu[sizeof (Menus) / sizeof (struct mapping_t) - 1], r =
+  int menu[countof(Menus) - 1], r =
     0, nummenus, i;
 
-  if ((key = parse_keymap (menu, s, sizeof (menu) / sizeof (menu[0]),
-                           &nummenus, err)) == NULL)
-    return (-1);
+  if (!(key = parse_keymap(menu, s, countof(menu), &nummenus, err)))
+    return -1;
 
   /* function to execute */
   mutt_extract_token (buf, s, 0);
@@ -865,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 ();
-}