X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Fdefine_key.c;h=3d5815f906d623138848d4acd9605cd66577988b;hp=3b5299a338e4f1d23f46f8455700c1d99794bd36;hb=cd858895e9086dadfb3d0a9ae69bc906de6330ea;hpb=027ae42953e3186daed8f3882da73de48291b606 diff --git a/ncurses/base/define_key.c b/ncurses/base/define_key.c index 3b5299a3..3d5815f9 100644 --- a/ncurses/base/define_key.c +++ b/ncurses/base/define_key.c @@ -32,7 +32,7 @@ #include -MODULE_ID("$Id: define_key.c,v 1.10 2006/06/17 18:19:48 tom Exp $") +MODULE_ID("$Id: define_key.c,v 1.13 2006/12/30 23:23:31 tom Exp $") NCURSES_EXPORT(int) define_key(const char *str, int keycode) @@ -43,16 +43,21 @@ define_key(const char *str, int keycode) if (SP == 0) { code = ERR; } else if (keycode > 0) { + unsigned ukey = (unsigned) keycode; + if (str != 0) { define_key(str, 0); } else if (has_key(keycode)) { - while (_nc_remove_key(&(SP->_keytry), (unsigned) keycode)) + while (_nc_remove_key(&(SP->_keytry), ukey)) code = OK; } if (str != 0) { if (key_defined(str) == 0) { - (void) _nc_add_to_try(&(SP->_keytry), str, (unsigned) keycode); - code = OK; + if (_nc_add_to_try(&(SP->_keytry), str, ukey) == OK) { + code = OK; + } else { + code = ERR; + } } else { code = ERR; }