ncurses 5.9 - patch 20110528

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

diff --git a/ncurses/base/keyok.c b/ncurses/base/keyok.c
index 4c9950600c33830ba295fbb237894e03cd918988..0eacf49263001aa9c2b7388860605c8ad7d91baf 100644 (file)
--- a/ncurses/base/keyok.c
+++ b/ncurses/base/keyok.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2000,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2009 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 +27,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.6 2006/06/17 18:18:43 tom Exp $")
+MODULE_ID("$Id: keyok.c,v 1.10 2009/10/24 22:15:47 tom Exp $")
 
 /*
  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
@@ -45,32 +46,48 @@ MODULE_ID("$Id: keyok.c,v 1.6 2006/06/17 18:18:43 tom Exp $")
  */
 
 NCURSES_EXPORT(int)
-keyok(int c, bool flag)
+NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag)
 {
     int code = ERR;
-    int count = 0;
-    char *s;
 
+    T((T_CALLED("keyok(%p, %d,%d)"), (void *) SP_PARM, c, flag));
+#ifdef USE_TERM_DRIVER
+    code = CallDriver_2(sp, kyOk, c, flag);
+#else
     T((T_CALLED("keyok(%d,%d)"), c, flag));
     if (c >= 0) {
+       int count = 0;
+       char *s;
        unsigned ch = (unsigned) c;
+
        if (flag) {
-           while ((s = _nc_expand_try(SP->_key_ok, ch, &count, 0)) != 0
-                  && _nc_remove_key(&(SP->_key_ok), ch)) {
-               _nc_add_to_try(&(SP->_keytry), s, ch);
+           while ((s = _nc_expand_try(SP_PARM->_key_ok, ch, &count, 0)) != 0
+                  && _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 {
-           while ((s = _nc_expand_try(SP->_keytry, ch, &count, 0)) != 0
-                  && _nc_remove_key(&(SP->_keytry), ch)) {
-               _nc_add_to_try(&(SP->_key_ok), s, ch);
+           while ((s = _nc_expand_try(SP_PARM->_keytry, ch, &count, 0)) != 0
+                  && _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;
            }
        }
     }
+#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