ncurses 5.9 - patch 20140308

[ncurses.git] / ncurses / base / lib_flash.c

diff --git a/ncurses/base/lib_flash.c b/ncurses/base/lib_flash.c
index d0d607f6b0f82eced47f9f7dd4df57fb594de1aa..7f25038cea516d75b4efae44b03b89e232414109 100644 (file)
--- a/ncurses/base/lib_flash.c
+++ b/ncurses/base/lib_flash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2013,2014 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,9 +29,10 @@
 /****************************************************************************
  *  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                         2009                    *

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

-

 /*
  *     flash.c
  *
 /*
  *     flash.c
  *


@@ -40,9 +41,12 @@
  */
 
 #include <curses.priv.h>
  */
 
 #include <curses.priv.h>

-#include <term.h>      /* beep, flash */

 
 

-MODULE_ID("$Id: lib_flash.c,v 1.4 1999/10/22 21:39:06 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif
+
+MODULE_ID("$Id: lib_flash.c,v 1.14 2014/03/08 20:32:59 tom Exp $")

 
 /*
  *     flash()
 
 /*
  *     flash()


@@ -52,22 +56,32 @@ MODULE_ID("$Id: lib_flash.c,v 1.4 1999/10/22 21:39:06 tom Exp $")
  *
  */
 
  *
  */
 

-int flash(void)
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(flash) (NCURSES_SP_DCL0)

 {
 {

-       int res = ERR;
-
-       T((T_CALLED("flash()")));
+    int res = ERR;

 
 

+    T((T_CALLED("flash(%p)"), (void *) SP_PARM));
+#ifdef USE_TERM_DRIVER
+    if (SP_PARM != 0)
+       res = CallDriver_1(SP_PARM, td_doBeepOrFlash, FALSE);
+#else
+    if (HasTerminal(SP_PARM)) {

        /* FIXME: should make sure that we are not in altchar mode */
        if (flash_screen) {
        /* FIXME: should make sure that we are not in altchar mode */
        if (flash_screen) {

-               TPUTS_TRACE("flash_screen");
-               res = putp(flash_screen);
-               _nc_flush();
+           res = NCURSES_PUTP2_FLUSH("flash_screen", flash_screen);

        } else if (bell) {
        } else if (bell) {

-               TPUTS_TRACE("bell");
-               res = putp(bell);
-               _nc_flush();
+           res = NCURSES_PUTP2_FLUSH("bell", bell);

        }
        }

+    }
+#endif
+    returnCode(res);
+}

 
 

-       returnCode(res);
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+flash(void)
+{
+    return NCURSES_SP_NAME(flash) (CURRENT_SCREEN);

 }
 }

+#endif