ncurses 6.1 - patch 20190406

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

diff --git a/ncurses/base/lib_beep.c b/ncurses/base/lib_beep.c
index 1d2f504053da15b5a232701a4ce78f29470b526f..b775d56e8001136eadc2d255d7a578b5a849ec73 100644 (file)
--- a/ncurses/base/lib_beep.c
+++ b/ncurses/base/lib_beep.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2005,2009 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            *
@@ -41,9 +41,12 @@
  */
 
 #include <curses.priv.h>
-#include <term.h>              /* beep, flash */
 
-MODULE_ID("$Id: lib_beep.c,v 1.11 2009/02/15 00:32:06 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif
+
+MODULE_ID("$Id: lib_beep.c,v 1.17 2014/03/08 20:32:59 tom Exp $")
 
 /*
  *     beep()
@@ -58,20 +61,22 @@ NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0)
 {
     int res = ERR;
 
-    T((T_CALLED("beep()")));
+    T((T_CALLED("beep(%p)"), (void *) SP_PARM));
 
+#ifdef USE_TERM_DRIVER
+    if (SP_PARM != 0)
+       res = CallDriver_1(SP_PARM, td_doBeepOrFlash, TRUE);
+#else
     /* FIXME: should make sure that we are not in altchar mode */
     if (cur_term == 0) {
        res = ERR;
     } else if (bell) {
-       TPUTS_TRACE("bell");
-       res = putp(bell);
-       _nc_flush();
+       res = NCURSES_PUTP2_FLUSH("bell", bell);
     } else if (flash_screen) {
-       TPUTS_TRACE("flash_screen");
-       res = putp(flash_screen);
+       res = NCURSES_PUTP2_FLUSH("flash_screen", flash_screen);
        _nc_flush();
     }
+#endif
 
     returnCode(res);
 }