ncurses 5.9 - patch 20110507

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

diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c
index af4d8f84bb83c95b5ace405a733c00b0999c4460..e9dae85bdd9780ee8d406f6027ac56bb242f22f9 100644 (file)
--- a/ncurses/tinfo/lib_termcap.c
+++ b/ncurses/tinfo/lib_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -44,13 +44,11 @@
 #include <tic.h>
 #include <ctype.h>
 
 #include <tic.h>
 #include <ctype.h>
 

-#include <term_entry.h>
-

 #ifndef CUR
 #define CUR SP_TERMTYPE
 #endif
 
 #ifndef CUR
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_termcap.c,v 1.67 2009/05/30 20:05:20 tom Exp $")
+MODULE_ID("$Id: lib_termcap.c,v 1.73 2010/12/25 19:27:12 tom Exp $")

 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;
 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;


@@ -83,7 +81,7 @@ NCURSES_EXPORT_VAR(char *) BC = 0;
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
 {
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
 {

-    int errcode = ERR;
+    int rc = ERR;

     int n;
     bool found_cache = FALSE;
 #ifdef USE_TERM_DRIVER
     int n;
     bool found_cache = FALSE;
 #ifdef USE_TERM_DRIVER


@@ -93,15 +91,13 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
     START_TRACE();
     T((T_CALLED("tgetent()")));
 
     START_TRACE();
     T((T_CALLED("tgetent()")));
 

-#ifdef USE_TERM_DRIVER
-    _nc_setupterm_ex(&termp, (NCURSES_CONST char *) name,
-                    STDOUT_FILENO, &errcode, TRUE);
+    TINFO_SETUP_TERM(&termp, (NCURSES_CONST char *) name,
+                    STDOUT_FILENO, &rc, TRUE);

 
 

+#ifdef USE_TERM_DRIVER

     if (termp == 0 ||
        !((TERMINAL_CONTROL_BLOCK *) termp)->drv->isTerminfo)
     if (termp == 0 ||
        !((TERMINAL_CONTROL_BLOCK *) termp)->drv->isTerminfo)

-       return (errcode);
-#else
-    _nc_setupterm((NCURSES_CONST char *) name, STDOUT_FILENO, &errcode, TRUE);
+       return (rc);

 #endif
 
     /*
 #endif
 
     /*


@@ -156,7 +152,7 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
     BC = 0;
     FIX_SGR0 = 0;              /* don't free it - application may still use */
 
     BC = 0;
     FIX_SGR0 = 0;              /* don't free it - application may still use */
 

-    if (errcode == 1) {
+    if (rc == 1) {

 
        if (cursor_left)
            if ((backspaces_with_bs = (char) !strcmp(cursor_left, "\b")) == 0)
 
        if (cursor_left)
            if ((backspaces_with_bs = (char) !strcmp(cursor_left, "\b")) == 0)


@@ -191,7 +187,7 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
 #endif*/
 
     }
 #endif*/
 
     }

-    returnCode(errcode);
+    returnCode(rc);

 }
 
 #if NCURSES_SP_FUNCS
 }
 
 #if NCURSES_SP_FUNCS


@@ -202,6 +198,17 @@ tgetent(char *bufp, const char *name)
 }
 #endif
 
 }
 #endif
 

+#if 0
+static bool
+same_tcname(const char *a, const char *b)
+{
+    fprintf(stderr, "compare(%s,%s)\n", a, b);
+    return !strncmp(a, b, 2);
+}
+#else
+#define same_tcname(a,b) !strncmp(a,b,2)
+#endif
+

 /***************************************************************************
  *
  * tgetflag(str)
 /***************************************************************************
  *
  * tgetflag(str)


@@ -214,20 +221,36 @@ tgetent(char *bufp, const char *name)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(tgetflag) (NCURSES_SP_DCLx NCURSES_CONST char *id)
 {
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(tgetflag) (NCURSES_SP_DCLx NCURSES_CONST char *id)
 {

-    unsigned i;
+    int result = 0;            /* Solaris returns zero for missing flag */
+    int i, j;

 
 

-    T((T_CALLED("tgetflag(%p, %s)"), SP_PARM, id));
+    T((T_CALLED("tgetflag(%p, %s)"), (void *) SP_PARM, id));

     if (HasTInfoTerminal(SP_PARM)) {
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
     if (HasTInfoTerminal(SP_PARM)) {
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);

-       for_each_boolean(i, tp) {
-           const char *capname = ExtBoolname(tp, i, boolcodes);
-           if (!strncmp(id, capname, 2)) {
-               /* setupterm forces invalid booleans to false */
-               returnCode(tp->Booleans[i]);
+       struct name_table_entry const *entry_ptr;
+
+       entry_ptr = _nc_find_type_entry(id, BOOLEAN, TRUE);
+       if (entry_ptr != 0) {
+           j = entry_ptr->nte_index;
+       }
+#if NCURSES_XNAMES
+       else {
+           j = -1;
+           for_each_ext_boolean(i, tp) {
+               const char *capname = ExtBoolname(tp, i, boolcodes);
+               if (same_tcname(id, capname)) {
+                   j = i;
+                   break;
+               }

            }
        }
            }
        }

+#endif
+       if (j >= 0) {
+           /* note: setupterm forces invalid booleans to false */
+           result = tp->Booleans[j];
+       }

     }
     }

-    returnCode(0);             /* Solaris does this */
+    returnCode(result);

 }
 
 #if NCURSES_SP_FUNCS
 }
 
 #if NCURSES_SP_FUNCS


@@ -250,21 +273,36 @@ tgetflag(NCURSES_CONST char *id)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(tgetnum) (NCURSES_SP_DCLx NCURSES_CONST char *id)
 {
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(tgetnum) (NCURSES_SP_DCLx NCURSES_CONST char *id)
 {

-    unsigned i;
+    int result = ABSENT_NUMERIC;
+    int i, j;

 
 

-    T((T_CALLED("tgetnum(%p, %s)"), SP_PARM, id));
+    T((T_CALLED("tgetnum(%p, %s)"), (void *) SP_PARM, id));

     if (HasTInfoTerminal(SP_PARM)) {
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
     if (HasTInfoTerminal(SP_PARM)) {
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);

-       for_each_number(i, tp) {
-           const char *capname = ExtNumname(tp, i, numcodes);
-           if (!strncmp(id, capname, 2)) {
-               if (!VALID_NUMERIC(tp->Numbers[i]))
-                   returnCode(ABSENT_NUMERIC);
-               returnCode(tp->Numbers[i]);
+       struct name_table_entry const *entry_ptr;
+
+       entry_ptr = _nc_find_type_entry(id, NUMBER, TRUE);
+       if (entry_ptr != 0) {
+           j = entry_ptr->nte_index;
+       }
+#if NCURSES_XNAMES
+       else {
+           j = -1;
+           for_each_ext_number(i, tp) {
+               const char *capname = ExtNumname(tp, i, numcodes);
+               if (same_tcname(id, capname)) {
+                   j = i;
+                   break;
+               }

            }
        }
            }
        }

+#endif
+       if (j >= 0) {
+           if (VALID_NUMERIC(tp->Numbers[j]))
+               result = tp->Numbers[j];
+       }

     }
     }

-    returnCode(ABSENT_NUMERIC);
+    returnCode(result);

 }
 
 #if NCURSES_SP_FUNCS
 }
 
 #if NCURSES_SP_FUNCS


@@ -287,32 +325,46 @@ tgetnum(NCURSES_CONST char *id)
 NCURSES_EXPORT(char *)
 NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area)
 {
 NCURSES_EXPORT(char *)
 NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area)
 {

-    unsigned i;

     char *result = NULL;
     char *result = NULL;

+    int i, j;

 
 

-    T((T_CALLED("tgetstr(%s,%p)"), id, area));
+    T((T_CALLED("tgetstr(%s,%p)"), id, (void *) area));

     if (HasTInfoTerminal(SP_PARM)) {
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
     if (HasTInfoTerminal(SP_PARM)) {
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);

-       for_each_string(i, tp) {
-           const char *capname = ExtStrname(tp, i, strcodes);
-           if (!strncmp(id, capname, 2)) {
-               result = tp->Strings[i];
-               TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(result)));
-               /* setupterm forces canceled strings to null */
-               if (VALID_STRING(result)) {
-                   if (result == exit_attribute_mode
-                       && FIX_SGR0 != 0) {
-                       result = FIX_SGR0;
-                       TR(TRACE_DATABASE, ("altered to : %s", _nc_visbuf(result)));
-                   }
-                   if (area != 0
-                       && *area != 0) {
-                       (void) strcpy(*area, result);
-                       result = *area;
-                       *area += strlen(*area) + 1;
-                   }
+       struct name_table_entry const *entry_ptr;
+
+       entry_ptr = _nc_find_type_entry(id, STRING, TRUE);
+       if (entry_ptr != 0) {
+           j = entry_ptr->nte_index;
+       }
+#if NCURSES_XNAMES
+       else {
+           j = -1;
+           for_each_ext_string(i, tp) {
+               const char *capname = ExtStrname(tp, i, strcodes);
+               if (same_tcname(id, capname)) {
+                   j = i;
+                   break;
+               }
+           }
+       }
+#endif
+       if (j >= 0) {
+           result = tp->Strings[j];
+           TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(result)));
+           /* setupterm forces canceled strings to null */
+           if (VALID_STRING(result)) {
+               if (result == exit_attribute_mode
+                   && FIX_SGR0 != 0) {
+                   result = FIX_SGR0;
+                   TR(TRACE_DATABASE, ("altered to : %s", _nc_visbuf(result)));
+               }
+               if (area != 0
+                   && *area != 0) {
+                   (void) strcpy(*area, result);
+                   result = *area;
+                   *area += strlen(*area) + 1;

                }
                }

-               break;

            }
        }
     }
            }
        }
     }