ncurses 5.7 - patch 20090728

[ncurses.git] / ncurses / tinfo / init_keytry.c

diff --git a/ncurses/tinfo/init_keytry.c b/ncurses/tinfo/init_keytry.c
index d203210615541ed6a496b26a2f84e6aaee496cf5..1ef8090b9dacc8fa36f0e379e7707fed0adc0e14 100644 (file)
--- a/ncurses/tinfo/init_keytry.c
+++ b/ncurses/tinfo/init_keytry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -27,16 +27,11 @@
  ****************************************************************************/
 
 #include <curses.priv.h>
  ****************************************************************************/
 
 #include <curses.priv.h>

-
-#include <term.h>
-/* keypad_xmit, keypad_local, meta_on, meta_off */
-/* cursor_visible,cursor_normal,cursor_invisible */
-

 #include <tic.h>               /* struct tinfo_fkeys */
 
 #include <term_entry.h>
 
 #include <tic.h>               /* struct tinfo_fkeys */
 
 #include <term_entry.h>
 

-MODULE_ID("$Id: init_keytry.c,v 1.10 2007/04/29 22:57:50 tom Exp $")
+MODULE_ID("$Id: init_keytry.c,v 1.14 2009/05/10 00:48:29 tom Exp $")

 
 /*
 **      _nc_init_keytry()
 
 /*
 **      _nc_init_keytry()


@@ -45,6 +40,13 @@ MODULE_ID("$Id: init_keytry.c,v 1.10 2007/04/29 22:57:50 tom Exp $")
 **
 */
 
 **
 */
 

+/*
+ * Internal entrypoints use SCREEN* parameter to obtain capabilities rather
+ * than cur_term.
+ */
+#undef CUR
+#define CUR SP_TERMTYPE 
+

 #if    BROKEN_LINKER
 #undef _nc_tinfo_fkeys
 #endif
 #if    BROKEN_LINKER
 #undef _nc_tinfo_fkeys
 #endif


@@ -64,19 +66,19 @@ _nc_tinfo_fkeysf(void)
 #endif
 
 NCURSES_EXPORT(void)
 #endif
 
 NCURSES_EXPORT(void)

-_nc_init_keytry(void)
+_nc_init_keytry(SCREEN *sp)

 {
     size_t n;
 
 {
     size_t n;
 

-    /* The SP->_keytry value is initialized in newterm(), where the SP
+    /* The sp->_keytry value is initialized in newterm(), where the sp

      * structure is created, because we can not tell where keypad() or
      * mouse_activate() (which will call keyok()) are first called.
      */
 
      * structure is created, because we can not tell where keypad() or
      * mouse_activate() (which will call keyok()) are first called.
      */
 

-    if (SP != 0) {
+    if (sp != 0) {

        for (n = 0; _nc_tinfo_fkeys[n].code; n++) {
            if (_nc_tinfo_fkeys[n].offset < STRCOUNT) {
        for (n = 0; _nc_tinfo_fkeys[n].code; n++) {
            if (_nc_tinfo_fkeys[n].offset < STRCOUNT) {

-               (void) _nc_add_to_try(&(SP->_keytry),
+               (void) _nc_add_to_try(&(sp->_keytry),

                                      CUR Strings[_nc_tinfo_fkeys[n].offset],
                                      _nc_tinfo_fkeys[n].code);
            }
                                      CUR Strings[_nc_tinfo_fkeys[n].offset],
                                      _nc_tinfo_fkeys[n].code);
            }


@@ -88,15 +90,16 @@ _nc_init_keytry(void)
         * names.
         */
        {
         * names.
         */
        {

-           TERMTYPE *tp = &(SP->_term->type);
+           TERMTYPE *tp = &(sp->_term->type);

            for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) {
                const char *name = ExtStrname(tp, n, strnames);
                char *value = tp->Strings[n];
                if (name != 0
                    && *name == 'k'
                    && value != 0
            for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) {
                const char *name = ExtStrname(tp, n, strnames);
                char *value = tp->Strings[n];
                if (name != 0
                    && *name == 'k'
                    && value != 0

-                   && key_defined(value) == 0) {
-                   (void) _nc_add_to_try(&(SP->_keytry),
+                   && NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx
+                                                    value) == 0) {
+                   (void) _nc_add_to_try(&(sp->_keytry),

                                          value,
                                          n - STRCOUNT + KEY_MAX);
                }
                                          value,
                                          n - STRCOUNT + KEY_MAX);
                }


@@ -104,7 +107,7 @@ _nc_init_keytry(void)
        }
 #endif
 #ifdef TRACE
        }
 #endif
 #ifdef TRACE

-       _nc_trace_tries(SP->_keytry);
+       _nc_trace_tries(sp->_keytry);

 #endif
     }
 }
 #endif
     }
 }