ncurses 5.7 - patch 20090613

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

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 0b12624ee005c75757114736846a9a04dfa9d9fa..b123cceef243eece1fe0aaefe3fa29bf1284f9a2 100644 (file)
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -42,12 +42,16 @@
  */
 
 #include <curses.priv.h>
+
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif
+
 #include <ctype.h>
-#include <term.h>              /* padding_baud_rate, xon_xoff */
 #include <termcap.h>           /* ospeed */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tputs.c,v 1.68 2009/02/28 21:08:18 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.77 2009/06/07 13:59:11 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
@@ -70,24 +74,31 @@ _nc_set_no_padding(SCREEN *sp)
 }
 #endif
 
-static int (*my_outch) (int c) = _nc_outch;
+#if NCURSES_SP_FUNCS
+#define my_outch SP_PARM->_outch
+#else
+static NCURSES_SP_OUTC my_outch = NCURSES_SP_NAME(_nc_outch);
+#endif
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms)
 {
-    T((T_CALLED("delay_output(%d)"), ms));
+    T((T_CALLED("delay_output(%p,%d)"), SP_PARM, ms));
+
+    if (!HasTInfoTerminal(SP_PARM))
+       returnCode(ERR);
 
     if (no_pad_char) {
-       _nc_flush();
+       NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
        napms(ms);
     } else {
        register int nullcount;
 
        nullcount = (ms * _nc_baudrate(ospeed)) / (BAUDBYTE * 1000);
        for (_nc_nulls_sent += nullcount; nullcount > 0; nullcount--)
-           my_outch(PC);
-       if (my_outch == _nc_outch)
-           _nc_flush();
+           my_outch(NCURSES_SP_ARGx PC);
+       if (my_outch == NCURSES_SP_NAME(_nc_outch))
+           NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
     }
 
     returnCode(OK);
@@ -104,7 +115,7 @@ delay_output(int ms)
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
 {
-    (void) fflush(NC_OUTPUT);
+    (void) fflush(NC_OUTPUT(SP_PARM));
 }
 
 #if NCURSES_SP_FUNCS
@@ -120,16 +131,17 @@ NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch)
 {
     COUNT_OUTCHARS(1);
 
-    if (SP_PARM != 0
+    if (HasTInfoTerminal(SP_PARM)
+       && SP_PARM != 0
        && SP_PARM->_cleanup) {
        char tmp = ch;
        /*
         * POSIX says write() is safe in a signal handler, but the
         * buffered I/O is not.
         */
-       write(fileno(NC_OUTPUT), &tmp, 1);
+       write(fileno(NC_OUTPUT(SP_PARM)), &tmp, 1);
     } else {
-       putc(ch, NC_OUTPUT);
+       putc(ch, NC_OUTPUT(SP_PARM));
     }
     return OK;
 }
@@ -142,14 +154,46 @@ _nc_outch(int ch)
 }
 #endif
 
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(putp) (NCURSES_SP_DCLx const char *string)
+{
+    return NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+                                  string, 1, NCURSES_SP_NAME(_nc_outch));
+}
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx
+                          const char *name GCC_UNUSED,
+                          const char *string)
+{
+    int rc = ERR;
+
+    if (string != 0) {
+       TPUTS_TRACE(name);
+       rc = NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx string);
+    }
+    return rc;
+}
+
+#if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 putp(const char *string)
 {
-    return tputs(string, 1, _nc_outch);
+    return NCURSES_SP_NAME(putp) (CURRENT_SCREEN, string);
 }
 
 NCURSES_EXPORT(int)
-tputs(const char *string, int affcnt, int (*outc) (int))
+_nc_putp(const char *name, const char *string)
+{
+    return NCURSES_SP_NAME(_nc_putp) (CURRENT_SCREEN, name, string);
+}
+#endif
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
+                       const char *string,
+                       int affcnt,
+                       NCURSES_SP_OUTC outc)
 {
     bool always_delay;
     bool normal_delay;
@@ -162,7 +206,7 @@ tputs(const char *string, int affcnt, int (*outc) (int))
     char addrbuf[32];
 
     if (USE_TRACEF(TRACE_TPUTS)) {
-       if (outc == _nc_outch)
+       if (outc == NCURSES_SP_NAME(_nc_outch))
            (void) strcpy(addrbuf, "_nc_outch");
        else
            (void) sprintf(addrbuf, "%p", outc);
@@ -177,10 +221,19 @@ tputs(const char *string, int affcnt, int (*outc) (int))
     }
 #endif /* TRACE */
 
+    if (SP_PARM != 0 && !HasTInfoTerminal(SP_PARM))
+       return ERR;
+
     if (!VALID_STRING(string))
        return ERR;
 
-    if (cur_term == 0) {
+    if (
+#if NCURSES_SP_FUNCS
+          (SP_PARM != 0 && SP_PARM->_term == 0)
+#else
+          cur_term == 0
+#endif
+       ) {
        always_delay = FALSE;
        normal_delay = TRUE;
     } else {
@@ -189,7 +242,7 @@ tputs(const char *string, int affcnt, int (*outc) (int))
            !xon_xoff
            && padding_baud_rate
 #if NCURSES_NO_PADDING
-           && !GetNoPadding(SP)
+           && !GetNoPadding(SP_PARM)
 #endif
            && (_nc_baudrate(ospeed) >= padding_baud_rate);
     }
@@ -226,21 +279,21 @@ tputs(const char *string, int affcnt, int (*outc) (int))
     my_outch = outc;           /* redirect delay_output() */
     while (*string) {
        if (*string != '$')
-           (*outc) (*string);
+           (*outc) (NCURSES_SP_ARGx *string);
        else {
            string++;
            if (*string != '<') {
-               (*outc) ('$');
+               (*outc) (NCURSES_SP_ARGx '$');
                if (*string)
-                   (*outc) (*string);
+                   (*outc) (NCURSES_SP_ARGx *string);
            } else {
                bool mandatory;
 
                string++;
                if ((!isdigit(UChar(*string)) && *string != '.')
                    || !strchr(string, '>')) {
-                   (*outc) ('$');
-                   (*outc) ('<');
+                   (*outc) (NCURSES_SP_ARGx '$');
+                   (*outc) (NCURSES_SP_ARGx '<');
                    continue;
                }
 
@@ -275,7 +328,7 @@ tputs(const char *string, int affcnt, int (*outc) (int))
                    && (always_delay
                        || normal_delay
                        || mandatory))
-                   delay_output(number / 10);
+                   NCURSES_SP_NAME(delay_output) (NCURSES_SP_ARGx number / 10);
 
            }                   /* endelse (*string == '<') */
        }                       /* endelse (*string == '$') */
@@ -295,6 +348,25 @@ tputs(const char *string, int affcnt, int (*outc) (int))
        delay_output(trailpad / 10);
 #endif /* BSD_TPUTS */
 
-    my_outch = _nc_outch;
+    my_outch = NCURSES_SP_NAME(_nc_outch);
     return OK;
 }
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+_nc_outc_wrapper(SCREEN *sp, int c)
+{
+    if (0 == sp) {
+       return (ERR);
+    } else {
+       return sp->jump(c);
+    }
+}
+
+NCURSES_EXPORT(int)
+tputs(const char *string, int affcnt, int (*outc) (int))
+{
+    SetSafeOutcWrapper(outc);
+    return NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx string, affcnt, _nc_outc_wrapper);
+}
+#endif