* When in curses mode, call beep() instead of putc(7, stdout) to make it beep.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 83e2f91338499707317d35c54423e72191af35f0..994a9179534a7a57e700357bee9491367f61768d 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.67  2002/11/13 17:20:57  ajc
+ * When in curses mode, call beep() instead of putc(7, stdout) to make it beep.
+
  Revision 601.66  2002/11/12 04:30:16  ajc
  * Completed the invitation accept/decline code.  It now sends back a
    correctly formated reply!  (Tested with Evolution)
@@ -4214,3 +4217,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/commands.c b/citadel/commands.c
index a20f67d2621606b95ad6097ba930f55a3bdfa6d0..cfb6b97614eb8c4c97104ea211905d64ec9e7fa1 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -219,7 +219,7 @@ void print_express(void)
                return;
 
        if (rc_exp_beep) {
-               scr_putc(7);
+               ctdl_beep();
        }
        if (strlen(rc_exp_cmd) == 0) {
                color(BRIGHT_RED);

diff --git a/citadel/rooms.c b/citadel/rooms.c
index 3baafc670aa36d320a61dc11b464763961c39866..9bcbfd785b7b68951e42ce4390d5ac6d07dec9c1 100644 (file)
--- a/citadel/rooms.c
+++ b/citadel/rooms.c
@@ -714,7 +714,7 @@ void download(CtdlIPC *ipc, int proto)
 
        /* clean up the temporary directory */
        nukedir(tempdir);
-       scr_putc(7);    /* Beep beep! */
+       ctdl_beep();    /* Beep beep! */
 }
 
 

diff --git a/citadel/screen.c b/citadel/screen.c
index fa91ce430e4869c14e0374b2e2a36c9bcb49e8e1..c25fae949ad9b4c4abd66d375ada7f77432f8940 100644 (file)
--- a/citadel/screen.c
+++ b/citadel/screen.c
@@ -170,6 +170,19 @@ void screen_delete(void)
 #endif
 }
 
+/*
+ * Beep.
+ */
+void ctdl_beep(void) {
+#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
+       if (myscreen)
+               beep();
+       else
+#endif
+       putc(7, stdout);
+}
+       
+
 
 /*
  * Set screen/IO parameters, e.g. at start of program or return from external

diff --git a/citadel/screen.h b/citadel/screen.h
index f86422fae216e8e581b58736c1a34a149aefcb1a..4c82a430fbe464f20c51a999f0a761920e1f71c3 100644 (file)
--- a/citadel/screen.h
+++ b/citadel/screen.h
@@ -38,3 +38,4 @@ int scr_blockread(void);
 int is_curses_enabled(void);
 RETSIGTYPE scr_winch(int signum);
 void wait_indicator(int state);
+void ctdl_beep(void);