From 5620b95a0519e9a43d9ea6b032a727763df568d9 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Mon, 17 Dec 2018 23:23:09 +0100
Subject: [PATCH] Remove BEEPER function
---
log/include/log_action.h | 2 --
log/include/logstuff.h | 2 --
log/src/log.c | 49 +++-------------------------------------
log/src/logstuff.c | 7 ------
4 files changed, 3 insertions(+), 57 deletions(-)
diff --git a/log/include/log_action.h b/log/include/log_action.h
index 436c816..7d05b29 100644
--- a/log/include/log_action.h
+++ b/log/include/log_action.h
@@ -76,8 +76,6 @@ typedef struct log_hooks_t
void (*xform) (log_grec *g, short *x, short *y);
void (*getsig) (char *name, log_sigrec **sig);
void (*report) (int num, char *name);
- void (*alert) ();
- void (*warning) ();
void (*message) (char *msg);
void (*vmessage) (char *msg);
void (*vmessageflag) (char *msg, int b);
diff --git a/log/include/logstuff.h b/log/include/logstuff.h
index cb841a2..885b3f0 100644
--- a/log/include/logstuff.h
+++ b/log/include/logstuff.h
@@ -3,8 +3,6 @@ extern void init_X_screen(void);
extern void recolor_log_cursors(int color, int force);
extern void choose_log_cursor(int curs);
-extern void BEEPER (int frequency, int duration);
-
struct ext_proc {
char *name;
void (*proc)();
diff --git a/log/src/log.c b/log/src/log.c
index ea56dfb..ce6eb6c 100644
--- a/log/src/log.c
+++ b/log/src/log.c
@@ -358,34 +358,6 @@ static char *ioresult_message(char *Result, long iores)
return strcpy(Result, s);
}
-/*=================== ALERT ====================*/
-/*= =*/
-/*= Produce an audible alert from the keyboard. =*/
-/*= Used to attract attention to keyboard. =*/
-/*= =*/
-/*================================================*/
-
-static void alert()
-{
- if (!gg.quiet)
- BEEPER(17, 10);
-}
-
-
-/*================== WARNING ===================*/
-/*= =*/
-/*= Produce an audible alert from the keyboard. =*/
-/*= This one generally signifies an error. =*/
-/*= =*/
-/*================================================*/
-
-static void warning()
-{
- if (!gg.quiet)
- BEEPER(4, 10);
-}
-
-
static void clearshowalpha ();
/*=================== REPORT ===================*/
@@ -408,7 +380,6 @@ void report(short num, char *s)
message(STR2);
return;
}
- BEEPER(4, 15);
clearshowalpha();
nk_gotoxy(0, txdown - 1);
printf("\215--> Internal error %d in %s\210\n", num, s);
@@ -1038,7 +1009,6 @@ void pen()
do
{
y = discomadness[i - 1].time;
- BEEPER(discomadness[i - 1].note, (int)y);
do
{
} while (timers_sysclock() <= x + y);
@@ -1452,7 +1422,6 @@ static void beginerror()
{
beginbottom();
strlist_empty(&thingstodo);
- warning();
}
@@ -8611,7 +8580,6 @@ end; */
RECOVER(try16);
if (P_escapecode == -20)
_Escape(P_escapecode);
- warning();
ENDTRY(try16);
}
@@ -8655,7 +8623,6 @@ end; */
RECOVER(try17);
if (P_escapecode == -20)
_Escape(P_escapecode);
- warning();
ENDTRY(try17);
}
@@ -8698,7 +8665,6 @@ end; */
RECOVER(try18);
if (P_escapecode == -20)
_Escape(P_escapecode);
- warning();
ENDTRY(try18);
}
@@ -9378,7 +9344,6 @@ static void adjustsignal(log_grec *g)
int savecaps, rightface;
char STR1[256], STR2[256];
- alert();
savecaps = nk_setcapslock(signalcaps);
rightface = (g->kind->flag.U3.nright != (g->rot == 0));
gsignallabel(g->x, g->y, g, gg.color.backgr);
@@ -9773,7 +9738,6 @@ static void editlabel(log_lrec *l)
m_graphics_on();
clearalpha();
remcursor();
- alert();
savecaps = nk_setcapslock(labelcaps);
touching = (l != NULL && l == gg.nearlabel);
if (l == NULL)
@@ -13835,7 +13799,6 @@ static void selecttool(char *name, struct LOC_toolcommand *LINK)
tp = findtool(name);
if (!tp->ready)
{
- warning();
return;
}
@@ -15178,11 +15141,9 @@ static void dofunction()
else if (!strcmp(gg.func, "VLSI"))
{
clearfunc();
- if (gg.gbase[gg.curpage - 1] != NULL ||
- gg.hwbase[gg.curpage - 1] != NULL ||
- gg.vwbase[gg.curpage - 1] != NULL)
- warning();
- else
+ if (gg.gbase[gg.curpage - 1] == NULL &&
+ gg.hwbase[gg.curpage - 1] == NULL &&
+ gg.vwbase[gg.curpage - 1] == NULL)
setvlsimode(!vlsi);
}
else if (!strcmp(gg.func, "FAST"))
@@ -15548,8 +15509,6 @@ static void inithooks()
gg.hook.xform = xformcoords;
gg.hook.getsig = getsigname;
gg.hook.report = report;
- gg.hook.alert = alert;
- gg.hook.warning = warning;
gg.hook.message = message;
gg.hook.vmessage = vmessage;
gg.hook.vmessageflag = vmessageflag;
@@ -15666,7 +15625,6 @@ static void beginfatal(struct LOC_initialize *LINK)
if (P_escapecode == -20)
_Escape(P_escapecode);
clearshowalpha();
- warning();
printf("\n\n%c", chryellow);
}
@@ -17013,7 +16971,6 @@ int main(int argc, char * argv[])
break;
}
putchar('\n');
- warning();
nk_keybufclear();
if (gg.initdone)
{
diff --git a/log/src/logstuff.c b/log/src/logstuff.c
index 54ffeee..36393cc 100644
--- a/log/src/logstuff.c
+++ b/log/src/logstuff.c
@@ -188,13 +188,6 @@ void m_drawarrow(long x1, long y1, long x2, long y2, long a, long b)
m_drawline(x1, y1, x2, y2);
}
-
-void BEEPER(int x, int y)
-{
- XBell(m_display, 0);
-}
-
-
int nk_setcapslock(int newval)
{
return false;
--
GitLab