#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"
{"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}
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)
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);
return OpPgp;
case MENU_KEY_SELECT_SMIME:
return OpSmime;
- case MENU_MIX:
- return OpMix;
}
return NULL;
}
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 ();
-}