X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=ab8ad6389a77f677d6d145d206ef1638598f3cd6;hp=208fce0a56cabe0e02d627c2713aaf7ccea80769;hb=3bb9d26e7eb111656d716e34d81225dfb16b6c4b;hpb=53186676acf2c3b5509a614433eb00a2087cd4ec diff --git a/keymap.c b/keymap.c index 208fce0..ab8ad63 100644 --- a/keymap.c +++ b/keymap.c @@ -7,27 +7,14 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include -#include -#include -#include -#include -#include -#include +#include +#include #include "mutt.h" -#include "mutt_menu.h" -#include "mutt_curses.h" #include "keymap.h" -#include "mutt_crypt.h" - - -#include -#include -#include +#include "crypt.h" #define MUTT_FUNCTIONS_VALUES #include "functions.def" @@ -49,19 +36,12 @@ struct mapping_t Menus[] = { {"key_select_smime", MENU_KEY_SELECT_SMIME}, #endif - -#ifdef MIXMASTER {"mix", MENU_MIX}, -#endif - - {"query", MENU_QUERY}, {"generic", MENU_GENERIC}, {NULL, 0} }; -#define mutt_check_menu(s) mutt_getvaluebyname(s, Menus) - static struct mapping_t KeyNames[] = { {"", KEY_PPAGE}, {"", KEY_NPAGE}, @@ -105,23 +85,15 @@ static struct keymap_t *allocKeys(int len, keycode_t *keys) return p; } -static int parse_fkey (char *s) +static int parse_fkey (const char *s) { - char *t; int n = 0; - if (s[0] != '<' || ascii_tolower (s[1]) != 'f') + if (s[0] != '<' || ascii_tolower(s[1]) != 'f') 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 +102,18 @@ static int parse_fkey (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; - char buff[SHORT_STRING]; + char buff[STRING]; char c; char *s, *t; @@ -247,7 +219,7 @@ void km_bindkey (const char *s, int menu, int op) km_bind (s, menu, op, NULL, NULL); } -static int get_op (struct binding_t *bindings, const char *start, size_t len) +static int get_op (struct binding_t *bindings, const char *start, ssize_t len) { int i; @@ -276,7 +248,7 @@ static const char *get_func (struct binding_t *bindings, int op) static void push_string(const char *s) { const char *pp, *p = s + m_strlen(s) - 1; - size_t l; + ssize_t l; int i, op = OP_NULL; while (p >= s) { @@ -477,7 +449,7 @@ const char *km_keyname(int c) } else if (c >= KEY_F0 && c < KEY_F (256)) /* this maximum is just a guess */ sprintf (buf, "", 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); @@ -527,26 +499,15 @@ void km_init (void) create_bindings (OpPost, MENU_POST); create_bindings (OpQuery, MENU_QUERY); create_bindings (OpAlias, MENU_ALIAS); - - - if ((WithCrypto & APPLICATION_PGP)) - create_bindings (OpPgp, MENU_PGP); - - if ((WithCrypto & APPLICATION_SMIME)) - create_bindings (OpSmime, MENU_SMIME); - -#ifdef CRYPT_BACKEND_GPGME + create_bindings (OpPgp, MENU_PGP); + create_bindings (OpSmime, MENU_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 ("", 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); @@ -631,7 +592,7 @@ void km_init (void) 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))) @@ -655,7 +616,7 @@ void km_error_key (int menu) return; } -int mutt_parse_push (BUFFER * buf, BUFFER * s, unsigned long data, +int mutt_parse_push (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), BUFFER * err) { int r = 0; @@ -689,7 +650,7 @@ static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus, 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; } @@ -753,38 +714,29 @@ struct binding_t *km_get_table (int menu) return OpEditor; case MENU_QUERY: return OpQuery; - case MENU_PGP: - return (WithCrypto & APPLICATION_PGP) ? OpPgp : NULL; - -#ifdef CRYPT_BACKEND_GPGME + return OpPgp; 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; } /* bind menu-name '' function-name */ -int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data, +int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), BUFFER * err) { 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); @@ -818,7 +770,7 @@ int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data, } /* macro */ -int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data, +int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), BUFFER * err) { int menu[sizeof (Menus) / sizeof (struct mapping_t) - 1], r = @@ -865,7 +817,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data, } /* exec function-name */ -int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data, +int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), BUFFER * err) { int ops[128]; @@ -897,7 +849,7 @@ int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data, } nops++; } - while (MoreArgs (s) && nops < sizeof (ops) / sizeof (ops[0])); + while (MoreArgs (s) && nops < ssizeof (ops) / ssizeof (ops[0])); while (nops) mutt_ungetch (0, ops[--nops]);