ncurses 6.2 - patch 20200502

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

diff --git a/ncurses/base/lib_beep.c b/ncurses/base/lib_beep.c
index 0093a38246f2d61b69ec5eddc78b8c945bf52509..b1a60b923ef6be0fbfaafa1d01299a5b2ffc0bf7 100644 (file)
--- a/ncurses/base/lib_beep.c
+++ b/ncurses/base/lib_beep.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


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

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

 
 #ifndef CUR
 
 #ifndef CUR

-#define CUR SP_TERMTYPE 
+#define CUR SP_TERMTYPE

 #endif
 
 #endif
 

-MODULE_ID("$Id: lib_beep.c,v 1.13 2009/05/10 00:48:29 tom Exp $")
+MODULE_ID("$Id: lib_beep.c,v 1.18 2020/02/02 23:34:34 tom Exp $")

 
 /*
  *     beep()
 
 /*
  *     beep()


@@ -62,20 +62,22 @@ NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0)
 {
     int res = ERR;
 
 {
     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) {
     /* 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) {
     } else if (flash_screen) {

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

        _nc_flush();
     }
        _nc_flush();
     }

+#endif

 
     returnCode(res);
 }
 
     returnCode(res);
 }