ncurses 5.7 - patch 20090927

[ncurses.git] / include / tic.h

diff --git a/include/tic.h b/include/tic.h
index 6afe9eb4119b4ead26583b37182d71891668e49a..4f3a21c22b3fbdaed94ded0ab63721f85c3c91c4 100644 (file)
--- a/include/tic.h
+++ b/include/tic.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,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            *


@@ -33,7 +33,7 @@
  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*

- * $Id: tic.h,v 1.61 2007/07/28 22:20:07 tom Exp $
+ * $Id: tic.h,v 1.65 2009/08/08 17:52:46 tom Exp $

  *     tic.h - Global variables and structures for the terminfo
  *                     compiler.
  */
  *     tic.h - Global variables and structures for the terminfo
  *                     compiler.
  */


@@ -183,6 +183,8 @@ extern NCURSES_EXPORT_VAR(const struct tinfo_fkeys) _nc_tinfo_fkeys[];
 
 #endif
 
 
 #endif
 

+typedef short HashValue;
+

        /*
         * The file comp_captab.c contains an array of these structures, one
         * per possible capability.  These are indexed by a hash table array of
        /*
         * The file comp_captab.c contains an array of these structures, one
         * per possible capability.  These are indexed by a hash table array of


@@ -193,10 +195,21 @@ struct name_table_entry
 {
        const char *nte_name;   /* name to hash on */
        int     nte_type;       /* BOOLEAN, NUMBER or STRING */
 {
        const char *nte_name;   /* name to hash on */
        int     nte_type;       /* BOOLEAN, NUMBER or STRING */

-       short   nte_index;      /* index of associated variable in its array */
-       short   nte_link;       /* index in table of next hash, or -1 */
+       HashValue nte_index;    /* index of associated variable in its array */
+       HashValue nte_link;     /* index in table of next hash, or -1 */

 };
 
 };
 

+       /*
+        * Use this structure to hide differences between terminfo and termcap
+        * tables.
+        */
+typedef struct {
+       unsigned table_size;
+       const HashValue *table_data;
+       HashValue (*hash_of)(const char *);
+       int (*compare_names)(const char *, const char *);
+} HashData;
+

 struct alias
 {
        const char      *from;
 struct alias
 {
        const char      *from;


@@ -204,11 +217,9 @@ struct alias
        const char      *source;
 };
 
        const char      *source;
 };
 

-extern NCURSES_EXPORT_VAR(const short) _nc_info_hash_table[];
-extern NCURSES_EXPORT_VAR(const short) _nc_cap_hash_table[];
-

 extern NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool);
 extern NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool);

-extern NCURSES_EXPORT(const short *) _nc_get_hash_table (bool);
+extern NCURSES_EXPORT(const HashData *) _nc_get_hash_info (bool);
+extern NCURSES_EXPORT(const HashValue *) _nc_get_hash_table (bool);

 extern NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool);
 
 #define NOTFOUND       ((struct name_table_entry *) 0)
 extern NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool);
 
 #define NOTFOUND       ((struct name_table_entry *) 0)


@@ -247,9 +258,9 @@ extern NCURSES_EXPORT(char *) _nc_rootname (char *);
 
 /* comp_hash.c: name lookup */
 extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry
 
 /* comp_hash.c: name lookup */
 extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry

-       (const char *, const short *);
+       (const char *, const HashValue *);

 extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_type_entry
 extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_type_entry

-       (const char *, int, const struct name_table_entry *);
+       (const char *, int, bool);

 
 /* comp_scan.c: lexical analysis */
 extern NCURSES_EXPORT(int)  _nc_get_token (bool);
 
 /* comp_scan.c: lexical analysis */
 extern NCURSES_EXPORT(int)  _nc_get_token (bool);