ncurses 6.2 - patch 20200502

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

diff --git a/ncurses/base/lib_flash.c b/ncurses/base/lib_flash.c
index 2ef9c278d967e2d4f726b02e9976b3d1f84a7026..975d5f5678f81a1741715eab280ee27c644b1395 100644 (file)
--- a/ncurses/base/lib_flash.c
+++ b/ncurses/base/lib_flash.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 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            *


@@ -46,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_flash.c,v 1.12 2011/05/28 21:53:45 tom Exp $")
+MODULE_ID("$Id: lib_flash.c,v 1.15 2020/02/02 23:34:34 tom Exp $")

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


@@ -64,18 +65,14 @@ NCURSES_SP_NAME(flash) (NCURSES_SP_DCL0)
     T((T_CALLED("flash(%p)"), (void *) SP_PARM));
 #ifdef USE_TERM_DRIVER
     if (SP_PARM != 0)
     T((T_CALLED("flash(%p)"), (void *) SP_PARM));
 #ifdef USE_TERM_DRIVER
     if (SP_PARM != 0)

-       res = CallDriver_1(SP_PARM, doBeepOrFlash, FALSE);
+       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) {
 #else
     if (HasTerminal(SP_PARM)) {
        /* 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
        }
     }
 #endif