X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/f6f450e2b1db4ae729c6df593dbbbff842bd6f3b..f85e6f6edb2c9415bc10bd2015479d72ea8c5ae2:/wincfg.c?ds=inline

diff --git a/wincfg.c b/wincfg.c
index 20eccfed..c094eb77 100644
--- a/wincfg.c
+++ b/wincfg.c
@@ -103,10 +103,10 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
 		  dlg_stdcheckbox_handler, I(offsetof(Config,ctrlaltkeys)));
 
     /*
-     * Windows allows an arbitrary .WAV to be played as a bell. For
-     * this we must search the existing controlset for the
-     * radio-button set controlling the `beep' option, and add an
-     * extra button to it.
+     * Windows allows an arbitrary .WAV to be played as a bell, and
+     * also the use of the PC speaker. For this we must search the
+     * existing controlset for the radio-button set controlling the
+     * `beep' option, and add extra buttons to it.
      * 
      * Note that although this _looks_ like a hideous hack, it's
      * actually all above board. The well-defined interface to the
@@ -127,18 +127,22 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
 	    if (c->generic.type == CTRL_RADIO &&
 		c->generic.context.i == offsetof(Config, beep)) {
 		assert(c->generic.handler == dlg_stdradiobutton_handler);
-		c->radio.nbuttons++;
+		c->radio.nbuttons += 2;
 		c->radio.buttons =
 		    sresize(c->radio.buttons, c->radio.nbuttons, char *);
 		c->radio.buttons[c->radio.nbuttons-1] =
 		    dupstr("Play a custom sound file");
+		c->radio.buttons[c->radio.nbuttons-2] =
+		    dupstr("Beep using the PC speaker");
 		c->radio.buttondata =
 		    sresize(c->radio.buttondata, c->radio.nbuttons, intorptr);
 		c->radio.buttondata[c->radio.nbuttons-1] = I(BELL_WAVEFILE);
+		c->radio.buttondata[c->radio.nbuttons-2] = I(BELL_PCSPEAKER);
 		if (c->radio.shortcuts) {
 		    c->radio.shortcuts =
 			sresize(c->radio.shortcuts, c->radio.nbuttons, char);
 		    c->radio.shortcuts[c->radio.nbuttons-1] = NO_SHORTCUT;
+		    c->radio.shortcuts[c->radio.nbuttons-2] = NO_SHORTCUT;
 		}
 		break;
 	    }
@@ -197,15 +201,18 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
 	    if (c->generic.type == CTRL_RADIO &&
 		c->generic.context.i == offsetof(Config, vtmode)) {
 		assert(c->generic.handler == dlg_stdradiobutton_handler);
-		c->radio.nbuttons += 2;
+		c->radio.nbuttons += 3;
 		c->radio.buttons =
 		    sresize(c->radio.buttons, c->radio.nbuttons, char *);
+		c->radio.buttons[c->radio.nbuttons-3] =
+		    dupstr("Font has XWindows encoding");
 		c->radio.buttons[c->radio.nbuttons-2] =
 		    dupstr("Use font in both ANSI and OEM modes");
 		c->radio.buttons[c->radio.nbuttons-1] =
 		    dupstr("Use font in OEM mode only");
 		c->radio.buttondata =
 		    sresize(c->radio.buttondata, c->radio.nbuttons, intorptr);
+		c->radio.buttondata[c->radio.nbuttons-3] = I(VT_XWINDOWS);
 		c->radio.buttondata[c->radio.nbuttons-2] = I(VT_OEMANSI);
 		c->radio.buttondata[c->radio.nbuttons-1] = I(VT_OEMONLY);
 		if (!c->radio.shortcuts) {
@@ -217,6 +224,7 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
 		    c->radio.shortcuts = sresize(c->radio.shortcuts,
 						 c->radio.nbuttons, char);
 		}
+		c->radio.shortcuts[c->radio.nbuttons-3] = 'x';
 		c->radio.shortcuts[c->radio.nbuttons-2] = 'b';
 		c->radio.shortcuts[c->radio.nbuttons-1] = 'e';
 		break;