ncurses 6.1 - patch 20191102

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

diff --git a/ncurses/base/keybound.c b/ncurses/base/keybound.c
index c8ca2856bb977554ff5198570de271fed2b012ad..72790e840545d7ad89fb9be83bfe90fba9c2115c 100644 (file)
--- a/ncurses/base/keybound.c
+++ b/ncurses/base/keybound.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1999,2000 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1999-2009,2011 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -27,20 +27,37 @@
  ****************************************************************************/
 
 /****************************************************************************
  ****************************************************************************/
 
 /****************************************************************************

- *  Author: Thomas E. Dickey <dickey@clark.net> 1999                        *
+ *  Author: Thomas E. Dickey                        1999-on                 *
+ *     and: Juergen Pfeifer                         2009                    *

  ****************************************************************************/
 
 #include <curses.priv.h>
 
  ****************************************************************************/
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: keybound.c,v 1.3 2000/12/10 02:43:26 tom Exp $")
+MODULE_ID("$Id: keybound.c,v 1.11 2011/10/22 16:47:05 tom Exp $")

 
 /*
  * Returns the count'th string definition which is associated with the
  * given keycode.  The result is malloc'd, must be freed by the caller.
  */
 
 /*
  * Returns the count'th string definition which is associated with the
  * given keycode.  The result is malloc'd, must be freed by the caller.
  */

+NCURSES_EXPORT(char *)
+NCURSES_SP_NAME(keybound) (NCURSES_SP_DCLx int code, int count)
+{
+    char *result = 0;
+
+    T((T_CALLED("keybound(%p, %d,%d)"), (void *) SP_PARM, code, count));
+    if (SP_PARM != 0 && code >= 0) {
+       result = _nc_expand_try(SP_PARM->_keytry,
+                               (unsigned) code,
+                               &count,
+                               (size_t) 0);
+    }
+    returnPtr(result);
+}

 
 

+#if NCURSES_SP_FUNCS

 NCURSES_EXPORT(char *)
 keybound(int code, int count)
 {
 NCURSES_EXPORT(char *)
 keybound(int code, int count)
 {

-    return _nc_expand_try(SP->_key_ok, code, &count, 0);
+    return NCURSES_SP_NAME(keybound) (CURRENT_SCREEN, code, count);

 }
 }

+#endif