ncurses 5.7 - patch 20090418

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

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index a8b7276895a503a9e3bb2037bdc5e2eeef88836d..0b12624ee005c75757114736846a9a04dfa9d9fa 100644 (file)
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2007,2008 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            *


@@ -30,6 +30,7 @@
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  *     and: Thomas E. Dickey                        1996-on                 *
  *  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                         2009                    *

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


@@ -46,7 +47,7 @@
 #include <termcap.h>           /* ospeed */
 #include <tic.h>
 
 #include <termcap.h>           /* ospeed */
 #include <tic.h>
 

-MODULE_ID("$Id: lib_tputs.c,v 1.66 2008/06/28 13:12:15 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.68 2009/02/28 21:08:18 tom Exp $")

 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */


@@ -72,7 +73,7 @@ _nc_set_no_padding(SCREEN *sp)
 static int (*my_outch) (int c) = _nc_outch;
 
 NCURSES_EXPORT(int)
 static int (*my_outch) (int c) = _nc_outch;
 
 NCURSES_EXPORT(int)

-delay_output(int ms)
+NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms)

 {
     T((T_CALLED("delay_output(%d)"), ms));
 
 {
     T((T_CALLED("delay_output(%d)"), ms));
 


@@ -92,19 +93,35 @@ delay_output(int ms)
     returnCode(OK);
 }
 
     returnCode(OK);
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+delay_output(int ms)
+{
+    return NCURSES_SP_NAME(delay_output) (CURRENT_SCREEN, ms);
+}
+#endif
+

 NCURSES_EXPORT(void)
 NCURSES_EXPORT(void)

-_nc_flush(void)
+NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)

 {
     (void) fflush(NC_OUTPUT);
 }
 
 {
     (void) fflush(NC_OUTPUT);
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(void)
+_nc_flush(void)
+{
+    NCURSES_SP_NAME(_nc_flush) (CURRENT_SCREEN);
+}
+#endif
+

 NCURSES_EXPORT(int)
 NCURSES_EXPORT(int)

-_nc_outch(int ch)
+NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch)

 {
     COUNT_OUTCHARS(1);
 
 {
     COUNT_OUTCHARS(1);
 

-    if (SP != 0
-       && SP->_cleanup) {
+    if (SP_PARM != 0
+       && SP_PARM->_cleanup) {

        char tmp = ch;
        /*
         * POSIX says write() is safe in a signal handler, but the
        char tmp = ch;
        /*
         * POSIX says write() is safe in a signal handler, but the


@@ -117,6 +134,14 @@ _nc_outch(int ch)
     return OK;
 }
 
     return OK;
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+_nc_outch(int ch)
+{
+    return NCURSES_SP_NAME(_nc_outch) (CURRENT_SCREEN, ch);
+}
+#endif
+

 NCURSES_EXPORT(int)
 putp(const char *string)
 {
 NCURSES_EXPORT(int)
 putp(const char *string)
 {