ncurses 5.0

[ncurses.git] / ncurses / base / keyok.c

diff --git a/ncurses/keyok.c b/ncurses/base/keyok.c
similarity index 93%
rename from ncurses/keyok.c
rename to ncurses/base/keyok.c
index a0947d9e2b64a2a3c8e01b7926597ca668bd1e3a..a1385769781f16de05bb71e8da3d70a36cc5a8ec 100644 (file)
--- a/ncurses/keyok.c
+++ b/ncurses/base/keyok.c
@@ -32,7 +32,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: keyok.c,v 1.2 1998/02/11 12:13:54 tom Exp $")
+MODULE_ID("$Id: keyok.c,v 1.3 1999/02/19 11:29:48 tom Exp $")
 
 /*
  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
@@ -47,22 +47,25 @@ MODULE_ID("$Id: keyok.c,v 1.2 1998/02/11 12:13:54 tom Exp $")
 int keyok(int c, bool flag)
 {
        int code = ERR;
+       int count = 0;
        char *s;
 
        T((T_CALLED("keyok(%d,%d)"), c, flag));
        if (flag) {
-               if ((s = _nc_expand_try(SP->_key_ok, c, 0)) != 0
+               while ((s = _nc_expand_try(SP->_key_ok, c, &count, 0)) != 0
                 && _nc_remove_key(&(SP->_key_ok), c)) {
                        _nc_add_to_try(&(SP->_keytry), s, c);
                        free(s);
                        code = OK;
+                       count = 0;
                }
        } else {
-               if ((s = _nc_expand_try(SP->_keytry, c, 0)) != 0
+               while ((s = _nc_expand_try(SP->_keytry, c, &count, 0)) != 0
                 && _nc_remove_key(&(SP->_keytry), c)) {
                        _nc_add_to_try(&(SP->_key_ok), s, c);
                        free(s);
                        code = OK;
+                       count = 0;
                }
        }
        returnCode(code);