projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put old m_snsubst into file.c as m_file_fmt.
[apps/madmutt.git]
/
keymap.c
diff --git
a/keymap.c
b/keymap.c
index
bc577b7
..
7be6869
100644
(file)
--- a/
keymap.c
+++ b/
keymap.c
@@
-7,29
+7,17
@@
* 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-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 "mapping.h"
-#include "mutt_crypt.h"
-
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <lib-crypt/crypt.h>
-#include "functions.h"
+#define MUTT_FUNCTIONS_VALUES
+#include "functions.def"
struct mapping_t Menus[] = {
{"alias", MENU_ALIAS},
struct mapping_t Menus[] = {
{"alias", MENU_ALIAS},
@@
-48,19
+36,15
@@
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
#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},
@@
-104,9
+88,9
@@
static struct keymap_t *allocKeys(int len, keycode_t *keys)
return p;
}
return p;
}
-static int parse_fkey (char *s)
+static int parse_fkey (c
onst c
har *s)
{
{
- char *t;
+ c
onst c
har *t;
int n = 0;
if (s[0] != '<' || ascii_tolower (s[1]) != 'f')
int n = 0;
if (s[0] != '<' || ascii_tolower (s[1]) != 'f')
@@
-246,7
+230,7
@@
void km_bindkey (const char *s, int menu, int op)
km_bind (s, menu, op, NULL, NULL);
}
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, s
s
ize_t len)
{
int i;
{
int i;
@@
-275,7
+259,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;
static void push_string(const char *s)
{
const char *pp, *p = s + m_strlen(s) - 1;
- size_t l;
+ s
s
ize_t l;
int i, op = OP_NULL;
while (p >= s) {
int i, op = OP_NULL;
while (p >= s) {
@@
-476,7
+460,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);
@@
-528,11
+512,8
@@
void km_init (void)
create_bindings (OpAlias, MENU_ALIAS);
create_bindings (OpAlias, MENU_ALIAS);
- if ((WithCrypto & APPLICATION_PGP))
- create_bindings (OpPgp, MENU_PGP);
-
- if ((WithCrypto & APPLICATION_SMIME))
- 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);
#ifdef CRYPT_BACKEND_GPGME
create_bindings (OpPgp, MENU_KEY_SELECT_PGP);
@@
-654,7
+635,7
@@
void km_error_key (int menu)
return;
}
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;
BUFFER * err)
{
int r = 0;
@@
-688,7
+669,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;
}
@@
-754,7
+735,7
@@
struct binding_t *km_get_table (int menu)
return OpQuery;
case MENU_PGP:
return OpQuery;
case MENU_PGP:
- return
(WithCrypto & APPLICATION_PGP) ? OpPgp : NULL
;
+ return
OpPgp
;
#ifdef CRYPT_BACKEND_GPGME
case MENU_KEY_SELECT_PGP:
#ifdef CRYPT_BACKEND_GPGME
case MENU_KEY_SELECT_PGP:
@@
-773,7
+754,7
@@
struct binding_t *km_get_table (int menu)
}
/* bind menu-name '<key_sequence>' function-name */
}
/* bind menu-name '<key_sequence>' 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;
BUFFER * err)
{
struct binding_t *bindings = NULL;
@@
-817,7
+798,7
@@
int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data,
}
/* macro <menu> <key> <macro> <description> */
}
/* macro <menu> <key> <macro> <description> */
-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 =
BUFFER * err)
{
int menu[sizeof (Menus) / sizeof (struct mapping_t) - 1], r =
@@
-864,7
+845,7
@@
int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
}
/* exec function-name */
}
/* 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];
BUFFER * err)
{
int ops[128];
@@
-896,7
+877,7
@@
int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data,
}
nops++;
}
}
nops++;
}
- while (MoreArgs (s) && nops < s
izeof (ops) /
sizeof (ops[0]));
+ while (MoreArgs (s) && nops < s
sizeof (ops) / s
sizeof (ops[0]));
while (nops)
mutt_ungetch (0, ops[--nops]);
while (nops)
mutt_ungetch (0, ops[--nops]);