ncurses 6.2 - patch 20200718

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

diff --git a/ncurses/base/lib_flash.c b/ncurses/base/lib_flash.c
index 8fbf91cf3a540afe1c46019125d1cdd062b43ef1..975d5f5678f81a1741715eab280ee27c644b1395 100644 (file)
--- a/ncurses/base/lib_flash.c
+++ b/ncurses/base/lib_flash.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2000,2009 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            *
@@ -46,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_flash.c,v 1.10 2009/05/23 19:37:09 tom Exp $")
+MODULE_ID("$Id: lib_flash.c,v 1.15 2020/02/02 23:34:34 tom Exp $")
 
 /*
  *     flash()
@@ -61,20 +62,18 @@ NCURSES_SP_NAME(flash) (NCURSES_SP_DCL0)
 {
     int res = ERR;
 
-    T((T_CALLED("flash(%p)"), SP_PARM));
+    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
-    /* FIXME: should make sure that we are not in altchar mode */
-    if (flash_screen) {
-       TPUTS_TRACE("flash_screen");
-       res = putp(flash_screen);
-       _nc_flush();
-    } else if (bell) {
-       TPUTS_TRACE("bell");
-       res = putp(bell);
-       _nc_flush();
+    if (HasTerminal(SP_PARM)) {
+       /* FIXME: should make sure that we are not in altchar mode */
+       if (flash_screen) {
+           res = NCURSES_PUTP2_FLUSH("flash_screen", flash_screen);
+       } else if (bell) {
+           res = NCURSES_PUTP2_FLUSH("bell", bell);
+       }
     }
 #endif
     returnCode(res);