ncurses 5.7 - patch 20090725

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

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

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


@@ -29,25 +29,41 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996-on                 *
+ *     and: Juergen Pfeifer                                                 *
+ *                                                                          *
+ * some of the code in here was contributed by:                             *
+ * Magnus Bengtsson, d6mbeng@dtek.chalmers.se (Nov'93)                      *
+ * (but it has changed a lot)                                               *

  ****************************************************************************/
 
  ****************************************************************************/
 

+#define __INTERNAL_CAPS_VISIBLE

 #include <curses.priv.h>
 
 #include <termcap.h>
 #include <tic.h>
 #include <curses.priv.h>
 
 #include <termcap.h>
 #include <tic.h>

+#include <ctype.h>

 
 

-#define __INTERNAL_CAPS_VISIBLE

 #include <term_entry.h>
 
 #include <term_entry.h>
 

-MODULE_ID("$Id: lib_termcap.c,v 1.36 2000/02/13 01:01:26 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif
+
+MODULE_ID("$Id: lib_termcap.c,v 1.69 2009/07/11 18:14:21 tom Exp $")

 
 

-/*
-   some of the code in here was contributed by:
-   Magnus Bengtsson, d6mbeng@dtek.chalmers.se
-*/
+NCURSES_EXPORT_VAR(char *) UP = 0;
+NCURSES_EXPORT_VAR(char *) BC = 0;

 
 

-char *UP = 0;
-char *BC = 0;
+#define MyCache  _nc_globals.tgetent_cache
+#define CacheInx _nc_globals.tgetent_index
+#define CacheSeq _nc_globals.tgetent_sequence
+
+#define FIX_SGR0 MyCache[CacheInx].fix_sgr0
+#define LAST_TRM MyCache[CacheInx].last_term
+#define LAST_BUF MyCache[CacheInx].last_bufp
+#define LAST_USE MyCache[CacheInx].last_used
+#define LAST_SEQ MyCache[CacheInx].sequence

 
 /***************************************************************************
  *
 
 /***************************************************************************
  *


@@ -64,19 +80,86 @@ char *BC = 0;
  *
  ***************************************************************************/
 
  *
  ***************************************************************************/
 

-int
-tgetent(char *bufp GCC_UNUSED, const char *name)
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)

 {
 {

-    int errcode;
+    int errcode = ERR;
+    int n;
+    bool found_cache = FALSE;
+#ifdef USE_TERM_DRIVER
+    TERMINAL *termp = 0;
+#endif

 
 

+    START_TRACE();

     T((T_CALLED("tgetent()")));
 
     T((T_CALLED("tgetent()")));
 

-    setupterm((NCURSES_CONST char *) name, STDOUT_FILENO, &errcode);
+#ifdef USE_TERM_DRIVER
+    _nc_setupterm_ex(&termp, (NCURSES_CONST char *) name,
+                    STDOUT_FILENO, &errcode, TRUE);
+
+    if (termp == 0 ||
+       !((TERMINAL_CONTROL_BLOCK *) termp)->drv->isTerminfo)
+       return (errcode);
+#else
+    _nc_setupterm((NCURSES_CONST char *) name, STDOUT_FILENO, &errcode, TRUE);
+#endif
+
+    /*
+     * In general we cannot tell if the fixed sgr0 is still used by the
+     * caller, but if tgetent() is called with the same buffer, that is
+     * good enough, since the previous data would be invalidated by the
+     * current call.
+     *
+     * bufp may be a null pointer, e.g., GNU termcap.  That allocates data,
+     * which is good until the next tgetent() call.  The conventional termcap
+     * is inconvenient because of the fixed buffer size, but because it uses
+     * caller-supplied buffers, can have multiple terminal descriptions in
+     * use at a given time.
+     */
+    for (n = 0; n < TGETENT_MAX; ++n) {
+       bool same_result = (MyCache[n].last_used && MyCache[n].last_bufp == bufp);
+       if (same_result) {
+           CacheInx = n;
+           if (FIX_SGR0 != 0) {
+               FreeAndNull(FIX_SGR0);
+           }
+           /*
+            * Also free the terminfo data that we loaded (much bigger leak).
+            */
+           if (LAST_TRM != 0 && LAST_TRM != TerminalOf(SP_PARM)) {
+               TERMINAL *trm = LAST_TRM;
+               NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx LAST_TRM);
+               for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx)
+                   if (LAST_TRM == trm)
+                       LAST_TRM = 0;
+               CacheInx = n;
+           }
+           found_cache = TRUE;
+           break;
+       }
+    }
+    if (!found_cache) {
+       int best = 0;
+
+       for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
+           if (LAST_SEQ < MyCache[best].sequence) {
+               best = CacheInx;
+           }
+       }
+       CacheInx = best;
+    }
+    LAST_TRM = TerminalOf(SP_PARM);
+    LAST_SEQ = ++CacheSeq;
+
+    PC = 0;
+    UP = 0;
+    BC = 0;
+    FIX_SGR0 = 0;              /* don't free it - application may still use */

 
     if (errcode == 1) {
 
        if (cursor_left)
 
     if (errcode == 1) {
 
        if (cursor_left)

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

                backspace_if_not_bs = cursor_left;
 
        /* we're required to export these */
                backspace_if_not_bs = cursor_left;
 
        /* we're required to export these */


@@ -87,7 +170,19 @@ tgetent(char *bufp GCC_UNUSED, const char *name)
        if (backspace_if_not_bs != NULL)
            BC = backspace_if_not_bs;
 
        if (backspace_if_not_bs != NULL)
            BC = backspace_if_not_bs;
 

-       (void) baudrate();      /* sets ospeed as a side-effect */
+       if ((FIX_SGR0 = _nc_trim_sgr0(&(TerminalOf(SP_PARM)->type))) != 0) {
+           if (!strcmp(FIX_SGR0, exit_attribute_mode)) {
+               if (FIX_SGR0 != exit_attribute_mode) {
+                   free(FIX_SGR0);
+               }
+               FIX_SGR0 = 0;
+           }
+       }
+       LAST_BUF = bufp;
+       LAST_USE = TRUE;
+
+       SetNoPadding(SP_PARM);
+       (void) NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG);      /* sets ospeed as a side-effect */

 
 /* LINT_PREPRO
 #if 0*/
 
 /* LINT_PREPRO
 #if 0*/


@@ -99,6 +194,25 @@ tgetent(char *bufp GCC_UNUSED, const char *name)
     returnCode(errcode);
 }
 
     returnCode(errcode);
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+tgetent(char *bufp, const char *name)
+{
+    return NCURSES_SP_NAME(tgetent) (CURRENT_SCREEN, bufp, name);
+}
+#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)


@@ -108,24 +222,48 @@ tgetent(char *bufp GCC_UNUSED, const char *name)
  *
  ***************************************************************************/
 
  *
  ***************************************************************************/
 

-int
-tgetflag(NCURSES_CONST char *id)
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(tgetflag) (NCURSES_SP_DCLx NCURSES_CONST char *id)

 {
 {

-    int i;
-
-    T((T_CALLED("tgetflag(%s)"), id));
-    if (cur_term != 0) {
-       TERMTYPE *tp = &(cur_term->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]);
+    int result = 0;            /* Solaris returns zero for missing flag */
+    int i, j;
+
+    T((T_CALLED("tgetflag(%p, %s)"), SP_PARM, id));
+    if (HasTInfoTerminal(SP_PARM)) {
+       TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
+       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
+NCURSES_EXPORT(int)
+tgetflag(NCURSES_CONST char *id)
+{
+    return NCURSES_SP_NAME(tgetflag) (CURRENT_SCREEN, id);

 }
 }

+#endif

 
 /***************************************************************************
  *
 
 /***************************************************************************
  *


@@ -136,26 +274,49 @@ tgetflag(NCURSES_CONST char *id)
  *
  ***************************************************************************/
 
  *
  ***************************************************************************/
 

-int
-tgetnum(NCURSES_CONST char *id)
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(tgetnum) (NCURSES_SP_DCLx NCURSES_CONST char *id)

 {
 {

-    int i;
-
-    T((T_CALLED("tgetnum(%s)"), id));
-    if (cur_term != 0) {
-       TERMTYPE *tp = &(cur_term->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]);
+    int result = ABSENT_NUMERIC;
+    int i, j;
+
+    T((T_CALLED("tgetnum(%p, %s)"), SP_PARM, id));
+    if (HasTInfoTerminal(SP_PARM)) {
+       TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
+       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
+NCURSES_EXPORT(int)
+tgetnum(NCURSES_CONST char *id)
+{
+    return NCURSES_SP_NAME(tgetnum) (CURRENT_SCREEN, id);
+}
+#endif
+

 /***************************************************************************
  *
  * tgetstr(str, area)
 /***************************************************************************
  *
  * tgetstr(str, area)


@@ -165,44 +326,71 @@ tgetnum(NCURSES_CONST char *id)
  *
  ***************************************************************************/
 
  *
  ***************************************************************************/
 

-char *
-tgetstr(NCURSES_CONST char *id, char **area)
+NCURSES_EXPORT(char *)
+NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area)

 {
 {

-    int i;
+    char *result = NULL;
+    int i, j;

 
     T((T_CALLED("tgetstr(%s,%p)"), id, area));
 
     T((T_CALLED("tgetstr(%s,%p)"), id, area));

-    if (cur_term != 0) {
-       TERMTYPE *tp = &(cur_term->type);
-       for_each_string(i, tp) {
-           const char *capname = ExtStrname(tp, i, strcodes);
-           if (!strncmp(id, capname, 2)) {
-               TR(TRACE_DATABASE,("found match : %s", _nc_visbuf(tp->Strings[i])));
-               /* setupterm forces canceled strings to null */
+    if (HasTInfoTerminal(SP_PARM)) {
+       TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
+       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
                if (area != 0

-                   && *area != 0
-                   && VALID_STRING(tp->Strings[i])) {
-                   (void) strcpy(*area, tp->Strings[i]);
+                   && *area != 0) {
+                   (void) strcpy(*area, result);
+                   result = *area;

                    *area += strlen(*area) + 1;
                }
                    *area += strlen(*area) + 1;
                }

-               returnPtr(tp->Strings[i]);

            }
        }
     }
            }
        }
     }

-    returnPtr(NULL);
+    returnPtr(result);

 }
 
 }
 

-/*
- *     char *
- *     tgoto(string, x, y)
- *
- *     Retained solely for upward compatibility.  Note the intentional
- *     reversing of the last two arguments.
- *
- */
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(char *)
+tgetstr(NCURSES_CONST char *id, char **area)
+{
+    return NCURSES_SP_NAME(tgetstr) (CURRENT_SCREEN, id, area);
+}
+#endif

 
 

-char *
-tgoto(const char *string, int x, int y)
+#if NO_LEAKS
+NCURSES_EXPORT(void)
+_nc_tgetent_leaks(void)

 {
 {

-    T((T_CALLED("tgoto(%s,%d,%d)"), string, x, y));
-    returnPtr(tparm((NCURSES_CONST char *) string, y, x));
+    for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
+       FreeIfNeeded(FIX_SGR0);
+       if (LAST_TRM != 0)
+           del_curterm(LAST_TRM);
+    }

 }
 }

+#endif