From 2c09ba058a17424ade5f430d0740d437e2c4a90d Mon Sep 17 00:00:00 2001 From: Leon Winter Date: Fri, 25 Jun 2021 08:09:36 +0200 Subject: [PATCH 1/3] Let beep use system default settings Please note that the parameter 'percent' of XBell(3). Given the value of 100, the system defined setting (normally specified via xset) is ignored and the percent of 100 is used instead. When calling the bell from fltk with FL_BEEP_DEFAULT I would expect to get the default (system specified) percent setting. --- src/drivers/X11/Fl_X11_Screen_Driver.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index 1dbd521543..919c5afada 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -415,7 +415,7 @@ void Fl_X11_Screen_Driver::beep(int type) case FL_BEEP_DEFAULT : case FL_BEEP_ERROR : if (!fl_display) open_display(); - XBell(fl_display, 100); + XBell(fl_display, 0); break; default : if (!fl_display) open_display(); From 29c1fd3ec8d2d85a568a4f2c03b1c076263d4600 Mon Sep 17 00:00:00 2001 From: Leon Winter Date: Fri, 25 Jun 2021 16:19:35 +0200 Subject: [PATCH 2/3] beep: use maximum loudness for error, otherwise system-default --- src/drivers/X11/Fl_X11_Screen_Driver.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index 919c5afada..29ee2bf43c 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -411,17 +411,19 @@ void Fl_X11_Screen_Driver::screen_dpi(float &h, float &v, int n) void Fl_X11_Screen_Driver::beep(int type) { + + int vol; switch (type) { - case FL_BEEP_DEFAULT : case FL_BEEP_ERROR : - if (!fl_display) open_display(); - XBell(fl_display, 0); + vol = 100; break; + case FL_BEEP_DEFAULT : default : - if (!fl_display) open_display(); - XBell(fl_display, 50); + vol = 0; break; } + if (!fl_display) open_display(); + XBell(fl_display, vol); } From ae5016466e8ea9cf8843163dc2f28e80a05b1c07 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 16 Jul 2022 16:48:51 +0200 Subject: [PATCH 3/3] Remove empty line --- src/drivers/X11/Fl_X11_Screen_Driver.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index 29ee2bf43c..06a37c5f8e 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -411,7 +411,6 @@ void Fl_X11_Screen_Driver::screen_dpi(float &h, float &v, int n) void Fl_X11_Screen_Driver::beep(int type) { - int vol; switch (type) { case FL_BEEP_ERROR :