aboutsummaryrefslogtreecommitdiff
path: root/ncurses/base/define_key.c
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
committerXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
commit4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (patch)
treeb8f6e12b479a78216f3bffb8e1258d54087268de /ncurses/base/define_key.c
parente07762606a5bf651a501cb095c98cba90e4a8fe2 (diff)
downloadsrc-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.tar.gz
src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.zip
Undo two previous imports which was never done in preparation of doing a
new import.
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=262616
Diffstat (limited to 'ncurses/base/define_key.c')
-rw-r--r--ncurses/base/define_key.c39
1 files changed, 12 insertions, 27 deletions
diff --git a/ncurses/base/define_key.c b/ncurses/base/define_key.c
index a49b094279c8..3d5815f906d6 100644
--- a/ncurses/base/define_key.c
+++ b/ncurses/base/define_key.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -27,40 +27,33 @@
****************************************************************************/
/****************************************************************************
- * Author: Thomas E. Dickey 1997-on *
- * and: Juergen Pfeifer 2009 *
+ * Author: Thomas E. Dickey 1997-on *
****************************************************************************/
#include <curses.priv.h>
-MODULE_ID("$Id: define_key.c,v 1.20 2009/11/28 22:53:17 tom Exp $")
+MODULE_ID("$Id: define_key.c,v 1.13 2006/12/30 23:23:31 tom Exp $")
NCURSES_EXPORT(int)
-NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)
+define_key(const char *str, int keycode)
{
int code = ERR;
- T((T_CALLED("define_key(%p, %s,%d)"), (void *) SP_PARM, _nc_visbuf(str), keycode));
- if (SP_PARM == 0 || !HasTInfoTerminal(SP_PARM)) {
+ T((T_CALLED("define_key(%s,%d)"), _nc_visbuf(str), keycode));
+ if (SP == 0) {
code = ERR;
} else if (keycode > 0) {
unsigned ukey = (unsigned) keycode;
-#ifdef USE_TERM_DRIVER
-#define CallHasKey(keycode) CallDriver_1(SP_PARM, kyExist, keycode)
-#else
-#define CallHasKey(keycode) NCURSES_SP_NAME(has_key)(NCURSES_SP_ARGx keycode)
-#endif
-
if (str != 0) {
- NCURSES_SP_NAME(define_key) (NCURSES_SP_ARGx str, 0);
- } else if (CallHasKey(keycode)) {
- while (_nc_remove_key(&(SP_PARM->_keytry), ukey))
+ define_key(str, 0);
+ } else if (has_key(keycode)) {
+ while (_nc_remove_key(&(SP->_keytry), ukey))
code = OK;
}
if (str != 0) {
- if (NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx str) == 0) {
- if (_nc_add_to_try(&(SP_PARM->_keytry), str, ukey) == OK) {
+ if (key_defined(str) == 0) {
+ if (_nc_add_to_try(&(SP->_keytry), str, ukey) == OK) {
code = OK;
} else {
code = ERR;
@@ -70,16 +63,8 @@ NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)
}
}
} else {
- while (_nc_remove_string(&(SP_PARM->_keytry), str))
+ while (_nc_remove_string(&(SP->_keytry), str))
code = OK;
}
returnCode(code);
}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(int)
-define_key(const char *str, int keycode)
-{
- return NCURSES_SP_NAME(define_key) (CURRENT_SCREEN, str, keycode);
-}
-#endif