ncurses 5.3
[ncurses.git] / ncurses / tinfo / comp_parse.c
index ecb2f5834d834d77b9d44217af736a08c2253eed..a5dc70ce180282b4eb41a8109c8de70508ad567c 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2001,2002 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            *
 #include <tic.h>
 #include <term_entry.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.42 2000/10/14 17:50:45 Bernhard.Rosenkraenzer Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.53 2002/09/07 20:01:28 tom Exp $")
 
 static void sanity_check(TERMTYPE *);
-void (*_nc_check_termtype) (TERMTYPE *) = sanity_check;
+NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;
 
 /****************************************************************************
  *
@@ -78,7 +78,8 @@ void (*_nc_check_termtype) (TERMTYPE *) = sanity_check;
  *        _nc_head                _nc_tail
  */
 
-ENTRY *_nc_head = 0, *_nc_tail = 0;
+NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
+NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
 
 static void
 enqueue(ENTRY * ep)
@@ -87,7 +88,7 @@ enqueue(ENTRY * ep)
     ENTRY *newp = _nc_copy_entry(ep);
 
     if (newp == 0)
-       _nc_err_abort("Out of memory");
+       _nc_err_abort(MSG_NO_MEMORY);
 
     newp->last = _nc_tail;
     _nc_tail = newp;
@@ -97,7 +98,7 @@ enqueue(ENTRY * ep)
        newp->last->next = newp;
 }
 
-void
+NCURSES_EXPORT(void)
 _nc_free_entries(ENTRY * headp)
 /* free the allocated storage consumed by list entries */
 {
@@ -136,7 +137,7 @@ force_bar(char *dst, char *src)
     return src;
 }
 
-bool
+NCURSES_EXPORT(bool)
 _nc_entry_match(char *n1, char *n2)
 /* do any of the aliases in a pair of terminal names match? */
 {
@@ -161,10 +162,10 @@ _nc_entry_match(char *n1, char *n2)
  *
  ****************************************************************************/
 
-void
+NCURSES_EXPORT(void)
 _nc_read_entry_source(FILE * fp, char *buf,
-    int literal, bool silent,
-    bool(*hook) (ENTRY *))
+                     int literal, bool silent,
+                     bool(*hook) (ENTRY *))
 /* slurp all entries in the given file into core */
 {
     ENTRY thisentry;
@@ -179,7 +180,7 @@ _nc_read_entry_source(FILE * fp, char *buf,
        memset(&thisentry, 0, sizeof(thisentry));
        if (_nc_parse_entry(&thisentry, literal, silent) == ERR)
            break;
-       if (!isalnum(thisentry.tterm.term_names[0]))
+       if (!isalnum(UChar(thisentry.tterm.term_names[0])))
            _nc_err_abort("terminal names must start with letter or digit");
 
        /*
@@ -209,7 +210,7 @@ _nc_read_entry_source(FILE * fp, char *buf,
     _nc_suppress_warnings = oldsuppress;
 }
 
-int
+NCURSES_EXPORT(int)
 _nc_resolve_uses(bool fullresolve)
 /* try to resolve all use capabilities */
 {
@@ -226,17 +227,18 @@ _nc_resolve_uses(bool fullresolve)
     for_entry_list(qp) {
        int matchcount = 0;
 
-       for_entry_list(rp)
+       for_entry_list(rp) {
            if (qp > rp
-           && _nc_entry_match(qp->tterm.term_names, rp->tterm.term_names)) {
-           matchcount++;
-           if (matchcount == 1) {
-               (void) fprintf(stderr, "Name collision between %s",
-                   _nc_first_name(qp->tterm.term_names));
-               multiples++;
+               && _nc_entry_match(qp->tterm.term_names, rp->tterm.term_names)) {
+               matchcount++;
+               if (matchcount == 1) {
+                   (void) fprintf(stderr, "Name collision between %s",
+                                  _nc_first_name(qp->tterm.term_names));
+                   multiples++;
+               }
+               if (matchcount >= 1)
+                   (void) fprintf(stderr, " %s", _nc_first_name(rp->tterm.term_names));
            }
-           if (matchcount >= 1)
-               (void) fprintf(stderr, " %s", _nc_first_name(rp->tterm.term_names));
        }
        if (matchcount >= 1)
            (void) putc('\n', stderr);
@@ -264,14 +266,15 @@ _nc_resolve_uses(bool fullresolve)
            _nc_set_type(child);
 
            /* first, try to resolve from in-core records */
-           for_entry_list(rp)
+           for_entry_list(rp) {
                if (rp != qp
-               && _nc_name_match(rp->tterm.term_names, lookfor, "|")) {
-               DEBUG(2, ("%s: resolving use=%s (in core)",
-                       child, lookfor));
+                   && _nc_name_match(rp->tterm.term_names, lookfor, "|")) {
+                   DEBUG(2, ("%s: resolving use=%s (in core)",
+                             child, lookfor));
 
-               qp->uses[i].link = rp;
-               foundit = TRUE;
+                   qp->uses[i].link = rp;
+                   foundit = TRUE;
+               }
            }
 
            /* if that didn't work, try to merge in a compiled entry */
@@ -282,11 +285,11 @@ _nc_resolve_uses(bool fullresolve)
                memset(&thisterm, 0, sizeof(thisterm));
                if (_nc_read_entry(lookfor, filename, &thisterm) == 1) {
                    DEBUG(2, ("%s: resolving use=%s (compiled)",
-                           child, lookfor));
+                             child, lookfor));
 
                    rp = typeMalloc(ENTRY, 1);
                    if (rp == 0)
-                       _nc_err_abort("Out of memory");
+                       _nc_err_abort(MSG_NO_MEMORY);
                    rp->tterm = thisterm;
                    rp->nuses = 0;
                    rp->next = lastread;
@@ -317,8 +320,8 @@ _nc_resolve_uses(bool fullresolve)
     DEBUG(2, ("NAME RESOLUTION COMPLETED OK"));
 
     /*
-     * OK, at this point all (char *) references in `name' mwmbers
-     * have been successfully converred to (ENTRY *) pointers in
+     * OK, at this point all (char *) references in `name' members
+     * have been successfully converted to (ENTRY *) pointers in
      * `link' members.  Time to do the actual merges.
      */
     if (fullresolve) {
@@ -330,7 +333,7 @@ _nc_resolve_uses(bool fullresolve)
            for_entry_list(qp) {
                if (qp->nuses > 0) {
                    DEBUG(2, ("%s: attempting merge",
-                           _nc_first_name(qp->tterm.term_names)));
+                             _nc_first_name(qp->tterm.term_names)));
                    /*
                     * If any of the use entries we're looking for is
                     * incomplete, punt.  We'll catch this entry on a
@@ -339,7 +342,7 @@ _nc_resolve_uses(bool fullresolve)
                    for (i = 0; i < qp->nuses; i++)
                        if (qp->uses[i].link->nuses) {
                            DEBUG(2, ("%s: use entry %d unresolved",
-                                   _nc_first_name(qp->tterm.term_names), i));
+                                     _nc_first_name(qp->tterm.term_names), i));
                            goto incomplete;
                        }
 
@@ -357,7 +360,7 @@ _nc_resolve_uses(bool fullresolve)
                     */
                    for (; qp->nuses; qp->nuses--)
                        _nc_merge_entry(&merged,
-                           &qp->uses[qp->nuses - 1].link->tterm);
+                                       &qp->uses[qp->nuses - 1].link->tterm);
 
                    /*
                     * Now merge in the original entry.
@@ -371,6 +374,7 @@ _nc_resolve_uses(bool fullresolve)
                    FreeIfNeeded(qp->tterm.Numbers);
                    FreeIfNeeded(qp->tterm.Strings);
                    qp->tterm = merged;
+                   _nc_wrap_entry(qp, TRUE);
 
                    /*
                     * We know every entry is resolvable because name resolution
@@ -392,15 +396,18 @@ _nc_resolve_uses(bool fullresolve)
         * entry there should be no cancellation markers.
         */
        for_entry_list(qp) {
-           for_each_boolean(j, &(qp->tterm))
-               if (qp->tterm.Booleans[j] == CANCELLED_BOOLEAN)
-               qp->tterm.Booleans[j] = ABSENT_BOOLEAN;
-           for_each_number(j, &(qp->tterm))
+           for_each_boolean(j, &(qp->tterm)) {
+               if ((int) qp->tterm.Booleans[j] == CANCELLED_BOOLEAN)
+                   qp->tterm.Booleans[j] = ABSENT_BOOLEAN;
+           }
+           for_each_number(j, &(qp->tterm)) {
                if (qp->tterm.Numbers[j] == CANCELLED_NUMERIC)
-               qp->tterm.Numbers[j] = ABSENT_NUMERIC;
-           for_each_string(j, &(qp->tterm))
+                   qp->tterm.Numbers[j] = ABSENT_NUMERIC;
+           }
+           for_each_string(j, &(qp->tterm)) {
                if (qp->tterm.Strings[j] == CANCELLED_STRING)
-               qp->tterm.Strings[j] = ABSENT_STRING;
+                   qp->tterm.Strings[j] = ABSENT_STRING;
+           }
        }
     }
 
@@ -444,20 +451,28 @@ sanity_check(TERMTYPE * tp)
        bool terminal_entry = !strchr(tp->term_names, '+');
        if (terminal_entry &&
            (PRESENT(set_attributes)
-               || PRESENT(enter_standout_mode)
-               || PRESENT(enter_underline_mode)
-               || PRESENT(enter_blink_mode)
-               || PRESENT(enter_bold_mode)
-               || PRESENT(enter_dim_mode)
-               || PRESENT(enter_secure_mode)
-               || PRESENT(enter_protected_mode)
-               || PRESENT(enter_reverse_mode)))
+            || PRESENT(enter_standout_mode)
+            || PRESENT(enter_underline_mode)
+            || PRESENT(enter_blink_mode)
+            || PRESENT(enter_bold_mode)
+            || PRESENT(enter_dim_mode)
+            || PRESENT(enter_secure_mode)
+            || PRESENT(enter_protected_mode)
+            || PRESENT(enter_reverse_mode)))
            _nc_warning("no exit_attribute_mode");
 #endif /* __UNUSED__ */
-       PAIRED(enter_standout_mode, exit_standout_mode)
-           PAIRED(enter_underline_mode, exit_underline_mode)
+       PAIRED(enter_standout_mode, exit_standout_mode);
+       PAIRED(enter_underline_mode, exit_underline_mode);
     }
 
+    /* we do this check/fix in postprocess_termcap(), but some packagers
+     * prefer to bypass it...
+     */
+    if (acs_chars == 0
+       && enter_alt_charset_mode != 0
+       && exit_alt_charset_mode != 0)
+       acs_chars = strdup(VT_ACSC);
+
     /* listed in structure-member order of first argument */
     PAIRED(enter_alt_charset_mode, exit_alt_charset_mode);
     ANDMISSING(enter_alt_charset_mode, acs_chars);
@@ -479,6 +494,8 @@ sanity_check(TERMTYPE * tp)
     PAIRED(enter_xon_mode, exit_xon_mode);
     PAIRED(enter_am_mode, exit_am_mode);
     ANDMISSING(label_off, label_on);
+#ifdef remove_clock
     PAIRED(display_clock, remove_clock);
+#endif
     ANDMISSING(set_color_pair, initialize_pair);
 }