X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=b480455c9c5e7c67f69dba650fb3f2ece23d2aa4;hp=5d91776f1fad2d3671ccb70af63e8ea30d1a5c39;hb=b0811fbd6a0e218c9c310a6ef4170e81540e6c22;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/keymap.c b/keymap.c
index 5d91776..b480455 100644
--- a/keymap.c
+++ b/keymap.c
@@ -12,12 +12,18 @@
 #endif
 
 #include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "mapping.h"
 #include "mutt_crypt.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -75,6 +81,9 @@ static struct mapping_t KeyNames[] = {
   {"<Space>", ' '},
 #ifdef KEY_BTAB
   {"<BackTab>", KEY_BTAB},
+#endif
+#ifdef KEY_NEXT
+  {"<Next>",    KEY_NEXT},
 #endif
   {NULL, 0}
 };
@@ -88,9 +97,9 @@ static struct keymap_t *allocKeys (int len, keycode_t * keys)
 {
   struct keymap_t *p;
 
-  p = safe_calloc (1, sizeof (struct keymap_t));
+  p = mem_calloc (1, sizeof (struct keymap_t));
   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);
 }
@@ -185,8 +194,8 @@ void km_bind (char *s, int menu, int op, char *macro, char *descr)
 
   map = allocKeys (len, buf);
   map->op = op;
-  map->macro = safe_strdup (macro);
-  map->descr = safe_strdup (descr);
+  map->macro = str_dup (macro);
+  map->descr = str_dup (descr);
 
   tmp = Keymaps[menu];
 
@@ -196,10 +205,10 @@ void km_bind (char *s, int menu, int op, char *macro, char *descr)
       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);
@@ -243,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) &&
-        mutt_strlen (bindings[i].name) == len)
+        str_len (bindings[i].name) == len)
       return bindings[i].op;
   }
 
@@ -265,7 +274,7 @@ static char *get_func (struct binding_t *bindings, int op)
 
 static void push_string (char *s)
 {
-  char *pp, *p = s + mutt_strlen (s) - 1;
+  char *pp, *p = s + str_len (s) - 1;
   size_t l;
   int i, op = OP_NULL;
 
@@ -312,7 +321,7 @@ static void push_string (char *s)
         }
       }
     }
-    mutt_ungetch (*p--, 0);
+    mutt_ungetch ((unsigned char) *p--, 0);
   }
 }
 
@@ -484,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);
-    len -= (l = mutt_strlen (s));
+    len -= (l = str_len (s));
 
     if (++p >= map->len || !len)
       return (1);
@@ -703,7 +712,7 @@ static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
     strfcpy (err->data, _("too few arguments"), err->dsize);
   }
 error:
-  FREE (&buf.data);
+  mem_free (&buf.data);
   return (NULL);
 }
 
@@ -713,7 +722,7 @@ try_bind (char *key, int menu, char *func, struct binding_t *bindings)
   int i;
 
   for (i = 0; bindings[i].name; i++)
-    if (mutt_strcmp (func, bindings[i].name) == 0) {
+    if (str_cmp (func, bindings[i].name) == 0) {
       km_bindkey (key, menu, bindings[i].op);
       return (0);
     }
@@ -803,7 +812,7 @@ int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data,
       }
     }
   }
-  FREE (&key);
+  mem_free (&key);
   return (r);
 }
 
@@ -828,7 +837,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
   }
   else {
     if (MoreArgs (s)) {
-      seq = safe_strdup (buf->data);
+      seq = str_dup (buf->data);
       mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
 
       if (MoreArgs (s)) {
@@ -841,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) {
@@ -850,7 +859,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
       }
     }
   }
-  FREE (&key);
+  mem_free (&key);
   return (r);
 }
 
@@ -876,9 +885,9 @@ int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data,
         && CurrentMenu != MENU_PAGER)
       bindings = OpGeneric;
 
-    ops[nops] = get_op (bindings, function, mutt_strlen (function));
+    ops[nops] = get_op (bindings, function, str_len (function));
     if (ops[nops] == OP_NULL && CurrentMenu != MENU_PAGER)
-      ops[nops] = get_op (OpGeneric, function, mutt_strlen (function));
+      ops[nops] = get_op (OpGeneric, function, str_len (function));
 
     if (ops[nops] == OP_NULL) {
       mutt_flushinp ();