ncurses 6.2 - patch 20210213

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

diff --git a/ncurses/base/define_key.c b/ncurses/base/define_key.c
index 5fdce79fec5bac1f0ea9f3c65e0bfaafcd0bd56c..fb9ae36be8779093fc57f010f75f9f6e0f739e88 100644 (file)
--- a/ncurses/base/define_key.c
+++ b/ncurses/base/define_key.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -33,7 +34,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: define_key.c,v 1.18 2009/10/24 22:15:47 tom Exp $")
+MODULE_ID("$Id: define_key.c,v 1.22 2020/02/02 23:34:34 tom Exp $")

 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)


@@ -46,9 +47,15 @@ NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)
     } else if (keycode > 0) {
        unsigned ukey = (unsigned) keycode;
 
     } else if (keycode > 0) {
        unsigned ukey = (unsigned) keycode;
 

+#ifdef USE_TERM_DRIVER
+#define CallHasKey(keycode) CallDriver_1(SP_PARM, td_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);
        if (str != 0) {
            NCURSES_SP_NAME(define_key) (NCURSES_SP_ARGx str, 0);

-       } else if (NCURSES_SP_NAME(has_key) (NCURSES_SP_ARGx keycode)) {
+       } else if (CallHasKey(keycode)) {

            while (_nc_remove_key(&(SP_PARM->_keytry), ukey))
                code = OK;
        }
            while (_nc_remove_key(&(SP_PARM->_keytry), ukey))
                code = OK;
        }