#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"
{"key_select_smime", MENU_KEY_SELECT_SMIME},
#endif
- {"mix", MENU_MIX},
{"query", MENU_QUERY},
{"generic", MENU_GENERIC},
{NULL, 0}
#ifdef KEY_ENTER
{"<Enter>", KEY_ENTER},
#endif
- {"<Return>", M_ENTER_C},
+ {"<Return>", '\n'},
{"<Esc>", '\033'},
{"<Tab>", '\t'},
{"<Space>", ' '},
static int parsekeys (const char *str, keycode_t * d, int max)
{
int n, len = max;
- char buff[SHORT_STRING];
+ char buff[STRING];
char c;
char *s, *t;
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 (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);
void km_error_key (int menu)
{
- char buf[SHORT_STRING];
+ char buf[STRING];
struct keymap_t *key;
if (!(key = km_find_func (menu, OP_HELP)))
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;
}
{
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);
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 ();
-}