projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop mixmaster support. I don't like people caring about being anonymous that much.
[apps/madmutt.git]
/
keymap.c
diff --git
a/keymap.c
b/keymap.c
index
e8bd397
..
5e32da0
100644
(file)
--- a/
keymap.c
+++ b/
keymap.c
@@
-7,27
+7,14
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "keymap.h"
#include "keymap.h"
-#include <lib-crypt/crypt.h>
-
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include "crypt.h"
#define MUTT_FUNCTIONS_VALUES
#include "functions.def"
#define MUTT_FUNCTIONS_VALUES
#include "functions.def"
@@
-49,19
+36,11
@@
struct mapping_t Menus[] = {
{"key_select_smime", MENU_KEY_SELECT_SMIME},
#endif
{"key_select_smime", MENU_KEY_SELECT_SMIME},
#endif
-
-#ifdef MIXMASTER
- {"mix", MENU_MIX},
-#endif
-
-
{"query", MENU_QUERY},
{"generic", MENU_GENERIC},
{NULL, 0}
};
{"query", MENU_QUERY},
{"generic", MENU_GENERIC},
{NULL, 0}
};
-#define mutt_check_menu(s) mutt_getvaluebyname(s, Menus)
-
static struct mapping_t KeyNames[] = {
{"<PageUp>", KEY_PPAGE},
{"<PageDown>", KEY_NPAGE},
static struct mapping_t KeyNames[] = {
{"<PageUp>", KEY_PPAGE},
{"<PageDown>", KEY_NPAGE},
@@
-77,7
+56,7
@@
static struct mapping_t KeyNames[] = {
#ifdef KEY_ENTER
{"<Enter>", KEY_ENTER},
#endif
#ifdef KEY_ENTER
{"<Enter>", KEY_ENTER},
#endif
- {"<Return>",
M_ENTER_C
},
+ {"<Return>",
'\n'
},
{"<Esc>", '\033'},
{"<Tab>", '\t'},
{"<Space>", ' '},
{"<Esc>", '\033'},
{"<Tab>", '\t'},
{"<Space>", ' '},
@@
-107,21
+86,13
@@
static struct keymap_t *allocKeys(int len, keycode_t *keys)
static int parse_fkey (const char *s)
{
static int parse_fkey (const char *s)
{
- const char *t;
int n = 0;
int n = 0;
- if (s[0] != '<' || ascii_tolower
(s[1]) != 'f')
+ if (s[0] != '<' || ascii_tolower(s[1]) != 'f')
return -1;
return -1;
- for (t = s + 2; *t && isdigit ((unsigned char) *t); t++) {
- n *= 10;
- n += *t - '0';
- }
-
- if (*t != '>')
- return -1;
- else
- return n;
+ n = strtol(s + 2, (char **)&s, 10);
+ return *s == '>' ? n : -1;
}
/*
}
/*
@@
-130,18
+101,18
@@
static int parse_fkey (const char *s)
*/
static int parse_keycode (const char *s)
{
*/
static int parse_keycode (const char *s)
{
- if (isdigit ((unsigned char) s[1]) &&
- isdigit ((unsigned char) s[2]) &&
- isdigit ((unsigned char) s[3]) && s[4] == '>') {
-
return (s[3] - '0') + (s[2] - '0') * 8 + (s[1] - '0') * 64
;
- }
-
return
-1;
+ int n;
+
+ if (*s != '<')
+
return -1
;
+ n = strtol(s + 1, (char **)&s, 8);
+
return *s == '>' ? n :
-1;
}
static int parsekeys (const char *str, keycode_t * d, int max)
{
int n, len = max;
}
static int parsekeys (const char *str, keycode_t * d, int max)
{
int n, len = max;
- char buff[S
HORT_S
TRING];
+ char buff[STRING];
char c;
char *s, *t;
char c;
char *s, *t;
@@
-363,12
+334,12
@@
int km_dokey (int menu)
for (;;) {
/* ncurses doesn't return on resized screen when timeout is set to zero */
if (menu != MENU_EDITOR)
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 (stdscr,
(Timeout > 0 ? Timeout : 60) * 1000);
tmp = mutt_getch ();
if (menu != MENU_EDITOR)
tmp = mutt_getch ();
if (menu != MENU_EDITOR)
-
timeout (
-1); /* restore blocking operation */
+
wtimeout (stdscr,
-1); /* restore blocking operation */
LastKey = tmp.ch;
if (LastKey == -1)
LastKey = tmp.ch;
if (LastKey == -1)
@@
-477,7
+448,7
@@
const char *km_keyname(int c)
}
else if (c >= KEY_F0 && c < KEY_F (256)) /* this maximum is just a guess */
sprintf (buf, "<F%d>", c - KEY_F0);
}
else if (c >= KEY_F0 && c < KEY_F (256)) /* this maximum is just a guess */
sprintf (buf, "<F%d>", c - KEY_F0);
- else if (
IsPrint (
c))
+ else if (
isprint((unsigned char)
c))
snprintf (buf, sizeof (buf), "%c", (unsigned char) c);
else
snprintf (buf, sizeof (buf), "\\x%hx", (unsigned short) c);
snprintf (buf, sizeof (buf), "%c", (unsigned char) c);
else
snprintf (buf, sizeof (buf), "\\x%hx", (unsigned short) c);
@@
-527,23
+498,10
@@
void km_init (void)
create_bindings (OpPost, MENU_POST);
create_bindings (OpQuery, MENU_QUERY);
create_bindings (OpAlias, MENU_ALIAS);
create_bindings (OpPost, MENU_POST);
create_bindings (OpQuery, MENU_QUERY);
create_bindings (OpAlias, MENU_ALIAS);
-
-
create_bindings (OpPgp, MENU_PGP);
create_bindings (OpSmime, MENU_SMIME);
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);
create_bindings (OpPgp, MENU_KEY_SELECT_PGP);
create_bindings (OpSmime, MENU_KEY_SELECT_SMIME);
-#endif
-
-#ifdef MIXMASTER
- 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);
-#endif
/* bindings for the line editor */
create_bindings (OpEditor, MENU_EDITOR);
/* bindings for the line editor */
create_bindings (OpEditor, MENU_EDITOR);
@@
-628,7
+586,7
@@
void km_init (void)
void km_error_key (int menu)
{
void km_error_key (int menu)
{
- char buf[S
HORT_S
TRING];
+ char buf[STRING];
struct keymap_t *key;
if (!(key = km_find_func (menu, OP_HELP)))
struct keymap_t *key;
if (!(key = km_find_func (menu, OP_HELP)))
@@
-686,7
+644,7
@@
static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
if (q)
*q = '\0';
if (q)
*q = '\0';
- if ((menu[i] = mutt_
check_menu (p
)) == -1) {
+ if ((menu[i] = mutt_
getvaluebyname(p, Menus
)) == -1) {
snprintf (err->data, err->dsize, _("%s: no such menu"), p);
goto error;
}
snprintf (err->data, err->dsize, _("%s: no such menu"), p);
goto error;
}
@@
-750,22
+708,12
@@
struct binding_t *km_get_table (int menu)
return OpEditor;
case MENU_QUERY:
return OpQuery;
return OpEditor;
case MENU_QUERY:
return OpQuery;
-
case MENU_PGP:
return OpPgp;
case MENU_PGP:
return OpPgp;
-
-#ifdef CRYPT_BACKEND_GPGME
case MENU_KEY_SELECT_PGP:
return OpPgp;
case MENU_KEY_SELECT_SMIME:
return OpSmime;
case MENU_KEY_SELECT_PGP:
return OpPgp;
case MENU_KEY_SELECT_SMIME:
return OpSmime;
-#endif
-
-#ifdef MIXMASTER
- case MENU_MIX:
- return OpMix;
-#endif
-
}
return NULL;
}
}
return NULL;
}
@@
-776,12
+724,11
@@
int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
{
struct binding_t *bindings = NULL;
char *key;
{
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;
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);
/* function to execute */
mutt_extract_token (buf, s, 0);
@@
-910,9
+857,9
@@
void mutt_what_key (void)
{
int ch;
{
int ch;
- mv
printw (
LINES - 1, 0, _("Enter keys (^G to abort): "));
+ mv
wprintw (stdscr,
LINES - 1, 0, _("Enter keys (^G to abort): "));
do {
do {
- ch =
getch (
);
+ ch =
wgetch (stdscr
);
if (ch != ERR && ch != ctrl ('G')) {
mutt_message (_("Char = %s, Octal = %o, Decimal = %d"),
km_keyname (ch), ch, ch);
if (ch != ERR && ch != ctrl ('G')) {
mutt_message (_("Char = %s, Octal = %o, Decimal = %d"),
km_keyname (ch), ch, ch);