projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
keymap.c
diff --git
a/keymap.c
b/keymap.c
index
6f71eda
..
b480455
100644
(file)
--- a/
keymap.c
+++ b/
keymap.c
@@
-12,6
+12,8
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
@@
-79,6
+81,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}
};
@@
-92,9
+97,9
@@
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 =
mem
_calloc (1, sizeof (struct keymap_t));
p->len = len;
p->len = len;
- p->keys =
safe
_malloc (len * sizeof (keycode_t));
+ p->keys =
mem
_malloc (len * sizeof (keycode_t));
memcpy (p->keys, keys, len * sizeof (keycode_t));
return (p);
}
memcpy (p->keys, keys, len * sizeof (keycode_t));
return (p);
}
@@
-189,8
+194,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 = s
afe_str
dup (macro);
- map->descr = s
afe_str
dup (descr);
+ map->macro = s
tr_
dup (macro);
+ map->descr = s
tr_
dup (descr);
tmp = Keymaps[menu];
tmp = Keymaps[menu];
@@
-200,10
+205,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);
+
mem_free
(&tmp->macro);
+
mem_free
(&tmp->keys);
+
mem_free
(&tmp->descr);
+
mem_free
(&tmp);
tmp = next;
}
while (tmp && len >= pos);
tmp = next;
}
while (tmp && len >= pos);
@@
-247,7
+252,7
@@
static int get_op (struct binding_t *bindings, const char *start, size_t len)
for (i = 0; bindings[i].name; i++) {
if (!ascii_strncasecmp (start, bindings[i].name, len) &&
for (i = 0; bindings[i].name; i++) {
if (!ascii_strncasecmp (start, bindings[i].name, len) &&
-
mutt_str
len (bindings[i].name) == len)
+
str_
len (bindings[i].name) == len)
return bindings[i].op;
}
return bindings[i].op;
}
@@
-269,7
+274,7
@@
static char *get_func (struct binding_t *bindings, int op)
static void push_string (char *s)
{
static void push_string (char *s)
{
- char *pp, *p = s +
mutt_str
len (s) - 1;
+ char *pp, *p = s +
str_
len (s) - 1;
size_t l;
int i, op = OP_NULL;
size_t l;
int i, op = OP_NULL;
@@
-316,7
+321,7
@@
static void push_string (char *s)
}
}
}
}
}
}
- mutt_ungetch (*p--, 0);
+ mutt_ungetch (
(unsigned char)
*p--, 0);
}
}
}
}
@@
-488,7
+493,7
@@
int km_expand_key (char *s, size_t len, struct keymap_t *map)
FOREVER {
strfcpy (s, km_keyname (map->keys[p]), len);
FOREVER {
strfcpy (s, km_keyname (map->keys[p]), len);
- len -= (l =
mutt_str
len (s));
+ len -= (l =
str_
len (s));
if (++p >= map->len || !len)
return (1);
if (++p >= map->len || !len)
return (1);
@@
-707,7
+712,7
@@
static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
strfcpy (err->data, _("too few arguments"), err->dsize);
}
error:
strfcpy (err->data, _("too few arguments"), err->dsize);
}
error:
-
FREE
(&buf.data);
+
mem_free
(&buf.data);
return (NULL);
}
return (NULL);
}
@@
-717,7
+722,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 (
mutt_str
cmp (func, bindings[i].name) == 0) {
+ if (
str_
cmp (func, bindings[i].name) == 0) {
km_bindkey (key, menu, bindings[i].op);
return (0);
}
km_bindkey (key, menu, bindings[i].op);
return (0);
}
@@
-807,7
+812,7
@@
int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data,
}
}
}
}
}
}
-
FREE
(&key);
+
mem_free
(&key);
return (r);
}
return (r);
}
@@
-832,7
+837,7
@@
int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
}
else {
if (MoreArgs (s)) {
}
else {
if (MoreArgs (s)) {
- seq = s
afe_str
dup (buf->data);
+ seq = s
tr_
dup (buf->data);
mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
if (MoreArgs (s)) {
mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
if (MoreArgs (s)) {
@@
-845,7
+850,7
@@
int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
}
}
}
}
-
FREE
(&seq);
+
mem_free
(&seq);
}
else {
for (i = 0; i < nummenus; ++i) {
}
else {
for (i = 0; i < nummenus; ++i) {
@@
-854,7
+859,7
@@
int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
}
}
}
}
}
}
-
FREE
(&key);
+
mem_free
(&key);
return (r);
}
return (r);
}
@@
-880,9
+885,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,
mutt_str
len (function));
+ ops[nops] = get_op (bindings, function,
str_
len (function));
if (ops[nops] == OP_NULL && CurrentMenu != MENU_PAGER)
if (ops[nops] == OP_NULL && CurrentMenu != MENU_PAGER)
- ops[nops] = get_op (OpGeneric, function,
mutt_str
len (function));
+ ops[nops] = get_op (OpGeneric, function,
str_
len (function));
if (ops[nops] == OP_NULL) {
mutt_flushinp ();
if (ops[nops] == OP_NULL) {
mutt_flushinp ();