Make beep optional - thanks to Antal Novak

[originally from svn r507]
[this commit reordered to come after creation of 0.49 tag]

diff --git a/putty.h b/putty.h
index 151ab9e061f799a09436035c37d3ce2bf99dc14c..0971fab3046d51d4110e03cc0133f8d1b2ae3af2 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -151,6 +151,7 @@ typedef struct {
     int alt_space;                    /* is it special? */
     int ldisc_term;
     int blink_cur;
+    int beep;
     /* Terminal options */
     int savelines;
     int dec_om;

diff --git a/terminal.c b/terminal.c
index 392ce7ff00ec0de557f6559981ea2199b54b7725..856d5b1953412690469f41dbbc037b8a686cfe09 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -676,7 +676,7 @@ void term_out(void) {
                ldisc->send ("PuTTY", 5);
                break;
              case '\007':
-               beep();
+                if(cfg.beep) beep();
                disptop = scrtop;
                break;
              case '\b':

diff --git a/win_res.h b/win_res.h
index 8d4abf2fe6f2a861fb4cc9f1d23e2fe64fb7a2bd..6ea558c376c50dadd832f331b689205945f5d3d1 100644 (file)
--- a/win_res.h
+++ b/win_res.h
@@ -65,6 +65,7 @@
 #define IDC1_ALTSPACE   1018
 #define IDC1_LDISCTERM  1019
 #define IDC1_BLINKCUR   1020
+#define IDC1_BEEP       1021
 
 #define IDC2_WRAPMODE   1001
 #define IDC2_DECOM      1002

diff --git a/win_res.rc b/win_res.rc
index 663fb54f0bbbeafe64b7a76ff5cc533d5216efc5..49b429ccb65fe8e419eb58b2b087b14e6cc4e2da 100644 (file)
--- a/win_res.rc
+++ b/win_res.rc
@@ -127,6 +127,8 @@ BEGIN
         IDC1_LDISCTERM, 3, 133, 162, 10
     AUTOCHECKBOX "&Blinking cursor",
         IDC1_BLINKCUR, 3, 143, 162, 10
+    AUTOCHECKBOX "Bee&p enabled",
+        IDC1_BEEP, 3, 153, 162, 10
 END
 
 IDD_PANEL2 DIALOG DISCARDABLE 6, 30, 168, 163

diff --git a/windlg.c b/windlg.c
index 23aee3ff4a96331e9f15cb1725d314db6028066e..c9c00bda6aef5b26949bee91f6a598f410a4ff62 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -163,6 +163,7 @@ static void save_settings (char *section, int do_host) {
     wppi (sesskey, "AltSpace", cfg.alt_space);
     wppi (sesskey, "LdiscTerm", cfg.ldisc_term);
     wppi (sesskey, "BlinkCur", cfg.blink_cur);
+    wppi (sesskey, "Beep", cfg.beep);
     wppi (sesskey, "ScrollbackLines", cfg.savelines);
     wppi (sesskey, "DECOriginMode", cfg.dec_om);
     wppi (sesskey, "AutoWrapMode", cfg.wrap_mode);
@@ -298,6 +299,7 @@ static void load_settings (char *section, int do_host) {
     gppi (sesskey, "AltSpace", 0, &cfg.alt_space);
     gppi (sesskey, "LdiscTerm", 0, &cfg.ldisc_term);
     gppi (sesskey, "BlinkCur", 0, &cfg.blink_cur);
+    gppi (sesskey, "Beep", 1, &cfg.beep);
     gppi (sesskey, "ScrollbackLines", 200, &cfg.savelines);
     gppi (sesskey, "DECOriginMode", 0, &cfg.dec_om);
     gppi (sesskey, "AutoWrapMode", 1, &cfg.wrap_mode);
@@ -651,6 +653,7 @@ static int CALLBACK KeyboardProc (HWND hwnd, UINT msg,
        CheckDlgButton (hwnd, IDC1_ALTSPACE, cfg.alt_space);
        CheckDlgButton (hwnd, IDC1_LDISCTERM, cfg.ldisc_term);
        CheckDlgButton (hwnd, IDC1_BLINKCUR, cfg.blink_cur);
+        CheckDlgButton (hwnd, IDC1_BEEP, cfg.beep);
        break;
       case WM_COMMAND:
        if (HIWORD(wParam) == BN_CLICKED ||
@@ -700,6 +703,10 @@ static int CALLBACK KeyboardProc (HWND hwnd, UINT msg,
                if (HIWORD(wParam) == BN_CLICKED ||
                    HIWORD(wParam) == BN_DOUBLECLICKED)
                    cfg.blink_cur = IsDlgButtonChecked (hwnd, IDC1_BLINKCUR);
+              case IDC1_BEEP:
+                if (HIWORD(wParam) == BN_CLICKED ||
+                    HIWORD(wParam) == BN_DOUBLECLICKED)
+                    cfg.beep = IsDlgButtonChecked (hwnd, IDC1_BEEP);
                break;
            }
     }