projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, we don't need that. fix a regression in <esc>e
[apps/madmutt.git]
/
keymap.c
diff --git
a/keymap.c
b/keymap.c
index
3944aab
..
e8bd397
100644
(file)
--- a/
keymap.c
+++ b/
keymap.c
@@
-11,22
+11,26
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#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 "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
-#include "mapping.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.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},
@@
-79,6
+83,9
@@
static struct mapping_t KeyNames[] = {
{"<Space>", ' '},
#ifdef KEY_BTAB
{"<BackTab>", KEY_BTAB},
{"<Space>", ' '},
#ifdef KEY_BTAB
{"<BackTab>", KEY_BTAB},
+#endif
+#ifdef KEY_NEXT
+ {"<Next>", KEY_NEXT},
#endif
{NULL, 0}
};
#endif
{NULL, 0}
};
@@
-88,20
+95,19
@@
int LastKey;
struct keymap_t *Keymaps[MENU_MAX];
struct keymap_t *Keymaps[MENU_MAX];
-static struct keymap_t *allocKeys
(int len, keycode_t *
keys)
+static struct keymap_t *allocKeys
(int len, keycode_t *
keys)
{
{
- struct keymap_t *p;
+
struct keymap_t *p;
- p = safe_calloc (1, sizeof (struct keymap_t));
- p->len = len;
- p->keys = safe_malloc (len * sizeof (keycode_t));
- memcpy (p->keys, keys, len * sizeof (keycode_t));
- return (p);
+ p = p_new(struct keymap_t, 1);
+ p->len = len;
+ p->keys = p_dup(keys, len);
+ 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')
@@
-132,14
+138,14
@@
static int parse_keycode (const char *s)
return -1;
}
return -1;
}
-static int parsekeys (char *str, keycode_t * d, int max)
+static int parsekeys (c
onst c
har *str, keycode_t * d, int max)
{
int n, len = max;
char buff[SHORT_STRING];
char c;
char *s, *t;
{
int n, len = max;
char buff[SHORT_STRING];
char c;
char *s, *t;
-
strfcpy (buff, str, sizeof (buff)
);
+
m_strcpy(buff, sizeof(buff), str
);
s = buff;
while (*s && len) {
s = buff;
while (*s && len) {
@@
-179,7
+185,7
@@
static int parsekeys (char *str, keycode_t * d, int max)
/* insert a key sequence into the specified map. the map is sorted by ASCII
* value (lowest to highest)
*/
/* insert a key sequence into the specified map. the map is sorted by ASCII
* value (lowest to highest)
*/
-void km_bind (char *s, int menu, int op, char *macro, char *descr)
+void km_bind (c
onst c
har *s, int menu, int op, char *macro, char *descr)
{
struct keymap_t *map, *tmp, *last = NULL, *next;
keycode_t buf[MAX_SEQ];
{
struct keymap_t *map, *tmp, *last = NULL, *next;
keycode_t buf[MAX_SEQ];
@@
-189,8
+195,8
@@
void km_bind (char *s, int menu, int op, char *macro, char *descr)
map = allocKeys (len, buf);
map->op = op;
map = allocKeys (len, buf);
map->op = op;
- map->macro =
safe_strdup
(macro);
- map->descr =
safe_strdup
(descr);
+ map->macro =
m_strdup
(macro);
+ map->descr =
m_strdup
(descr);
tmp = Keymaps[menu];
tmp = Keymaps[menu];
@@
-200,10
+206,10
@@
void km_bind (char *s, int menu, int op, char *macro, char *descr)
do {
len = tmp->eq;
next = tmp->next;
do {
len = tmp->eq;
next = tmp->next;
-
FREE
(&tmp->macro);
-
FREE
(&tmp->keys);
-
FREE
(&tmp->descr);
-
FREE
(&tmp);
+
p_delete
(&tmp->macro);
+
p_delete
(&tmp->keys);
+
p_delete
(&tmp->descr);
+
p_delete
(&tmp);
tmp = next;
}
while (tmp && len >= pos);
tmp = next;
}
while (tmp && len >= pos);
@@
-236,25
+242,25
@@
void km_bind (char *s, int menu, int op, char *macro, char *descr)
Keymaps[menu] = map;
}
Keymaps[menu] = map;
}
-void km_bindkey (char *s, int menu, int op)
+void km_bindkey (c
onst c
har *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;
for (i = 0; bindings[i].name; i++) {
if (!ascii_strncasecmp (start, bindings[i].name, len) &&
{
int i;
for (i = 0; bindings[i].name; i++) {
if (!ascii_strncasecmp (start, bindings[i].name, len) &&
-
safe_strlen
(bindings[i].name) == len)
+
m_strlen
(bindings[i].name) == len)
return bindings[i].op;
}
return OP_NULL;
}
return bindings[i].op;
}
return OP_NULL;
}
-static char *get_func (struct binding_t *bindings, int op)
+static c
onst c
har *get_func (struct binding_t *bindings, int op)
{
int i;
{
int i;
@@
-267,10
+273,10
@@
static char *get_func (struct binding_t *bindings, int op)
return NULL;
}
return NULL;
}
-static void push_string
(
char *s)
+static void push_string
(const
char *s)
{
{
- c
har *pp, *p = s + safe_strlen
(s) - 1;
- size_t l;
+ c
onst char *pp, *p = s + m_strlen
(s) - 1;
+ s
s
ize_t l;
int i, op = OP_NULL;
while (p >= s) {
int i, op = OP_NULL;
while (p >= s) {
@@
-316,7
+322,7
@@
static void push_string (char *s)
}
}
}
}
}
}
- mutt_ungetch (*p--, 0);
+ mutt_ungetch (
(unsigned char)
*p--, 0);
}
}
}
}
@@
-354,7
+360,7
@@
int km_dokey (int menu)
if (!map)
return (retry_generic (menu, NULL, 0, 0));
if (!map)
return (retry_generic (menu, NULL, 0, 0));
-
FOREVER
{
+
for (;;)
{
/* ncurses doesn't return on resized screen when timeout is set to zero */
if (menu != MENU_EDITOR)
timeout ((Timeout > 0 ? Timeout : 60) * 1000);
/* ncurses doesn't return on resized screen when timeout is set to zero */
if (menu != MENU_EDITOR)
timeout ((Timeout > 0 ? Timeout : 60) * 1000);
@@
-370,7
+376,7
@@
int km_dokey (int menu)
/* do we have an op already? */
if (tmp.op) {
/* do we have an op already? */
if (tmp.op) {
- char *func = NULL;
+ c
onst c
har *func = NULL;
struct binding_t *bindings;
/* is this a valid op for this menu? */
struct binding_t *bindings;
/* is this a valid op for this menu? */
@@
-398,7
+404,7
@@
int km_dokey (int menu)
/* careful not to feed the <..> as one token. otherwise
* push_string() will push the bogus op right back! */
mutt_ungetch ('>', 0);
/* careful not to feed the <..> as one token. otherwise
* push_string() will push the bogus op right back! */
mutt_ungetch ('>', 0);
- push_string
(func);
+ push_string(func);
mutt_ungetch ('<', 0);
break;
}
mutt_ungetch ('<', 0);
break;
}
@@
-449,10
+455,10
@@
static void create_bindings (struct binding_t *map, int menu)
km_bindkey (map[i].seq, menu, map[i].op);
}
km_bindkey (map[i].seq, menu, map[i].op);
}
-c
har *km_keyname
(int c)
+c
onst char *km_keyname
(int c)
{
static char buf[10];
{
static char buf[10];
- char *p;
+ c
onst c
har *p;
if ((p = mutt_getnamebyvalue (c, KeyNames)))
return p;
if ((p = mutt_getnamebyvalue (c, KeyNames)))
return p;
@@
-486,9
+492,9
@@
int km_expand_key (char *s, size_t len, struct keymap_t *map)
if (!map)
return (0);
if (!map)
return (0);
-
FOREVER
{
-
strfcpy (s, km_keyname (map->keys[p]), len
);
- len -= (l =
safe_strlen
(s));
+
for (;;)
{
+
m_strcpy(s, len, km_keyname(map->keys[p])
);
+ len -= (l =
m_strlen
(s));
if (++p >= map->len || !len)
return (1);
if (++p >= map->len || !len)
return (1);
@@
-511,7
+517,7
@@
struct keymap_t *km_find_func (int menu, int func)
void km_init (void)
{
void km_init (void)
{
-
memset (Keymaps, 0, sizeof (struct keymap_t *) *
MENU_MAX);
+
p_clear(Keymaps,
MENU_MAX);
create_bindings (OpAttach, MENU_ATTACH);
create_bindings (OpBrowser, MENU_FOLDER);
create_bindings (OpAttach, MENU_ATTACH);
create_bindings (OpBrowser, MENU_FOLDER);
@@
-523,11
+529,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);
@@
-649,14
+652,14
@@
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;
mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
if (MoreArgs (s)) {
BUFFER * err)
{
int r = 0;
mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
if (MoreArgs (s)) {
-
strfcpy (err->data, _("push: too many arguments"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("push: too many arguments")
);
r = -1;
}
else
r = -1;
}
else
@@
-672,7
+675,7
@@
static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
int i = 0;
char *p, *q;
int i = 0;
char *p, *q;
-
memset (&buf, 0, sizeof (buf)
);
+
p_clear(&buf, 1
);
/* menu name */
mutt_extract_token (&buf, s, 0);
/* menu name */
mutt_extract_token (&buf, s, 0);
@@
-698,16
+701,16
@@
static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
mutt_extract_token (&buf, s, 0);
if (!*buf.data) {
mutt_extract_token (&buf, s, 0);
if (!*buf.data) {
-
strfcpy (err->data, _("null key sequence"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("null key sequence")
);
}
else if (MoreArgs (s))
return (buf.data);
}
else {
}
else if (MoreArgs (s))
return (buf.data);
}
else {
-
strfcpy (err->data, _("too few arguments"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("too few arguments")
);
}
error:
}
error:
-
FREE
(&buf.data);
+
p_delete
(&buf.data);
return (NULL);
}
return (NULL);
}
@@
-717,7
+720,7
@@
try_bind (char *key, int menu, char *func, struct binding_t *bindings)
int i;
for (i = 0; bindings[i].name; i++)
int i;
for (i = 0; bindings[i].name; i++)
- if (
safe_strcmp
(func, bindings[i].name) == 0) {
+ if (
m_strcmp
(func, bindings[i].name) == 0) {
km_bindkey (key, menu, bindings[i].op);
return (0);
}
km_bindkey (key, menu, bindings[i].op);
return (0);
}
@@
-749,7
+752,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:
@@
-768,7
+771,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;
@@
-783,7
+786,7
@@
int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data,
/* function to execute */
mutt_extract_token (buf, s, 0);
if (MoreArgs (s)) {
/* function to execute */
mutt_extract_token (buf, s, 0);
if (MoreArgs (s)) {
-
strfcpy (err->data, _("bind: too many arguments"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("bind: too many arguments")
);
r = -1;
}
else if (ascii_strcasecmp ("noop", buf->data) == 0) {
r = -1;
}
else if (ascii_strcasecmp ("noop", buf->data) == 0) {
@@
-807,12
+810,12
@@
int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data,
}
}
}
}
}
}
-
FREE
(&key);
+
p_delete
(&key);
return (r);
}
/* macro <menu> <key> <macro> <description> */
return (r);
}
/* 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 =
@@
-828,15
+831,15
@@
int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
/* make sure the macro sequence is not an empty string */
if (!*buf->data) {
mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
/* make sure the macro sequence is not an empty string */
if (!*buf->data) {
-
strfcpy (err->data, _("macro: empty key sequence"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("macro: empty key sequence")
);
}
else {
if (MoreArgs (s)) {
}
else {
if (MoreArgs (s)) {
- seq =
safe_strdup
(buf->data);
+ seq =
m_strdup
(buf->data);
mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
if (MoreArgs (s)) {
mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
if (MoreArgs (s)) {
-
strfcpy (err->data, _("macro: too many arguments"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("macro: too many arguments")
);
}
else {
for (i = 0; i < nummenus; ++i) {
}
else {
for (i = 0; i < nummenus; ++i) {
@@
-845,7
+848,7
@@
int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
}
}
}
}
-
FREE
(&seq);
+
p_delete
(&seq);
}
else {
for (i = 0; i < nummenus; ++i) {
}
else {
for (i = 0; i < nummenus; ++i) {
@@
-854,12
+857,12
@@
int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
}
}
}
}
}
}
-
FREE
(&key);
+
p_delete
(&key);
return (r);
}
/* exec function-name */
return (r);
}
/* 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];
@@
-868,7
+871,7
@@
int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data,
char *function;
if (!MoreArgs (s)) {
char *function;
if (!MoreArgs (s)) {
-
strfcpy (err->data, _("exec: no arguments"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("exec: no arguments")
);
return (-1);
}
return (-1);
}
@@
-880,9
+883,9
@@
int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data,
&& CurrentMenu != MENU_PAGER)
bindings = OpGeneric;
&& CurrentMenu != MENU_PAGER)
bindings = OpGeneric;
- ops[nops] = get_op (bindings, function,
safe_strlen
(function));
+ ops[nops] = get_op (bindings, function,
m_strlen
(function));
if (ops[nops] == OP_NULL && CurrentMenu != MENU_PAGER)
if (ops[nops] == OP_NULL && CurrentMenu != MENU_PAGER)
- ops[nops] = get_op (OpGeneric, function,
safe_strlen
(function));
+ ops[nops] = get_op (OpGeneric, function,
m_strlen
(function));
if (ops[nops] == OP_NULL) {
mutt_flushinp ();
if (ops[nops] == OP_NULL) {
mutt_flushinp ();
@@
-891,7
+894,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]);