ncurses 6.2 - patch 20200816

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

diff --git a/ncurses/base/keyok.c b/ncurses/base/keyok.c
index a1385769781f16de05bb71e8da3d70a36cc5a8ec..8e0b9629db20290bfe3050d9949fbfb24a3cbb0d 100644 (file)
--- a/ncurses/base/keyok.c
+++ b/ncurses/base/keyok.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 1998-2012,2014 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,12 +28,13 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
+ *  Author: Thomas E. Dickey                        1997-on                 *
+ *     and: Juergen Pfeifer                         2009                    *
  ****************************************************************************/
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: keyok.c,v 1.3 1999/02/19 11:29:48 tom Exp $")
+MODULE_ID("$Id: keyok.c,v 1.16 2020/02/02 23:34:34 tom Exp $")
 
 /*
  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
@@ -44,29 +46,58 @@ MODULE_ID("$Id: keyok.c,v 1.3 1999/02/19 11:29:48 tom Exp $")
  * corresponding tree.
  */
 
-int keyok(int c, bool flag)
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag)
 {
-       int code = ERR;
-       int count = 0;
-       char *s;
+    int code = ERR;
 
-       T((T_CALLED("keyok(%d,%d)"), c, flag));
-       if (flag) {
-               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);
+    if (HasTerminal(SP_PARM)) {
+       T((T_CALLED("keyok(%p, %d,%d)"), (void *) SP_PARM, c, flag));
+#ifdef USE_TERM_DRIVER
+       code = CallDriver_2(sp, td_kyOk, c, flag);
+#else
+       if (c >= 0) {
+           int count = 0;
+           char *s;
+           unsigned ch = (unsigned) c;
+
+           if (flag) {
+               while ((s = _nc_expand_try(SP_PARM->_key_ok,
+                                          ch, &count, (size_t) 0)) != 0) {
+                   if (_nc_remove_key(&(SP_PARM->_key_ok), ch)) {
+                       code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch);
                        free(s);
-                       code = OK;
                        count = 0;
+                       if (code != OK)
+                           break;
+                   } else {
+                       free(s);
+                   }
                }
-       } else {
-               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);
+           } else {
+               while ((s = _nc_expand_try(SP_PARM->_keytry,
+                                          ch, &count, (size_t) 0)) != 0) {
+                   if (_nc_remove_key(&(SP_PARM->_keytry), ch)) {
+                       code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch);
                        free(s);
-                       code = OK;
                        count = 0;
+                       if (code != OK)
+                           break;
+                   } else {
+                       free(s);
+                   }
                }
+           }
        }
-       returnCode(code);
+#endif
+    }
+    returnCode(code);
+}
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+keyok(int c, bool flag)
+{
+    return NCURSES_SP_NAME(keyok) (CURRENT_SCREEN, c, flag);
 }
+#endif