X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/9ef49106fcb71617298e49a65e701a6b19a7cbf2..684d367c45028e742c1f8751cbe1f2502426c308:/windlg.c

diff --git a/windlg.c b/windlg.c
index 3dccae15..47a8690b 100644
--- a/windlg.c
+++ b/windlg.c
@@ -9,14 +9,15 @@
 #include "putty.h"
 #include "win_res.h"
 
-#define NPANELS 7
-#define MAIN_NPANELS 7
-#define RECONF_NPANELS 4
+#define NPANELS 8
+#define MAIN_NPANELS 8
+#define RECONF_NPANELS 5
 
 static const char *const puttystr = PUTTY_REG_POS "\\Sessions";
 
-static char **negots = NULL;
-static int nnegots = 0, negsize = 0;
+static char **events = NULL;
+static int nevents = 0, negsize = 0;
+
 static HWND logbox = NULL, abtbox = NULL;
 
 static char hex[16] = "0123456789ABCDEF";
@@ -146,12 +147,17 @@ static void save_settings (char *section, int do_host) {
     wppi (sesskey, "NoPTY", cfg.nopty);
     wpps (sesskey, "Cipher", cfg.cipher == CIPHER_BLOWFISH ? "blowfish" :
                              cfg.cipher == CIPHER_DES ? "des" : "3des");
+    wppi (sesskey, "AuthTIS", cfg.try_tis_auth);
     wppi (sesskey, "RFCEnviron", cfg.rfc_environ);
     wppi (sesskey, "BackspaceIsDelete", cfg.bksp_is_delete);
     wppi (sesskey, "RXVTHomeEnd", cfg.rxvt_homeend);
     wppi (sesskey, "LinuxFunctionKeys", cfg.linux_funkeys);
     wppi (sesskey, "ApplicationCursorKeys", cfg.app_cursor);
     wppi (sesskey, "ApplicationKeypad", cfg.app_keypad);
+    wppi (sesskey, "NetHackKeypad", cfg.nethack_keypad);
+    wppi (sesskey, "AltF4", cfg.alt_f4);
+    wppi (sesskey, "AltSpace", cfg.alt_space);
+    wppi (sesskey, "LdiscTerm", cfg.ldisc_term);
     wppi (sesskey, "ScrollbackLines", cfg.savelines);
     wppi (sesskey, "DECOriginMode", cfg.dec_om);
     wppi (sesskey, "AutoWrapMode", cfg.wrap_mode);
@@ -161,6 +167,7 @@ static void save_settings (char *section, int do_host) {
     wppi (sesskey, "TermHeight", cfg.height);
     wpps (sesskey, "Font", cfg.font);
     wppi (sesskey, "FontIsBold", cfg.fontisbold);
+    wppi (sesskey, "FontCharSet", cfg.fontcharset);
     wppi (sesskey, "FontHeight", cfg.fontheight);
     wppi (sesskey, "FontVTMode", cfg.vtmode);
     wppi (sesskey, "TryPalette", cfg.try_palette);
@@ -184,6 +191,9 @@ static void save_settings (char *section, int do_host) {
 	}
 	wpps (sesskey, buf, buf2);
     }
+    wppi (sesskey, "KoiWinXlat", cfg.xlat_enablekoiwin);
+    wppi (sesskey, "88592Xlat", cfg.xlat_88592w1250);
+    wppi (sesskey, "CapsLockCyr", cfg.xlat_capslockcyr);
 
     RegCloseKey(sesskey);
 }
@@ -272,12 +282,17 @@ static void load_settings (char *section, int do_host) {
 	else
 	    cfg.cipher = CIPHER_3DES;
     }
+    gppi (sesskey, "AuthTIS", 0, &cfg.try_tis_auth);
     gppi (sesskey, "RFCEnviron", 0, &cfg.rfc_environ);
     gppi (sesskey, "BackspaceIsDelete", 1, &cfg.bksp_is_delete);
     gppi (sesskey, "RXVTHomeEnd", 0, &cfg.rxvt_homeend);
     gppi (sesskey, "LinuxFunctionKeys", 0, &cfg.linux_funkeys);
     gppi (sesskey, "ApplicationCursorKeys", 0, &cfg.app_cursor);
     gppi (sesskey, "ApplicationKeypad", 0, &cfg.app_keypad);
+    gppi (sesskey, "NetHackKeypad", 0, &cfg.nethack_keypad);
+    gppi (sesskey, "AltF4", 1, &cfg.alt_f4);
+    gppi (sesskey, "AltSpace", 0, &cfg.alt_space);
+    gppi (sesskey, "LdiscTerm", 0, &cfg.ldisc_term);
     gppi (sesskey, "ScrollbackLines", 200, &cfg.savelines);
     gppi (sesskey, "DECOriginMode", 0, &cfg.dec_om);
     gppi (sesskey, "AutoWrapMode", 1, &cfg.wrap_mode);
@@ -287,8 +302,9 @@ static void load_settings (char *section, int do_host) {
     gppi (sesskey, "TermHeight", 24, &cfg.height);
     gpps (sesskey, "Font", "Courier", cfg.font, sizeof(cfg.font));
     gppi (sesskey, "FontIsBold", 0, &cfg.fontisbold);
+    gppi (sesskey, "FontCharSet", ANSI_CHARSET, &cfg.fontcharset);
     gppi (sesskey, "FontHeight", 10, &cfg.fontheight);
-    gppi (sesskey, "FontVTMode", VT_POORMAN, &cfg.vtmode);
+    gppi (sesskey, "FontVTMode", VT_POORMAN, (int *)&cfg.vtmode);
     gppi (sesskey, "TryPalette", 0, &cfg.try_palette);
     gppi (sesskey, "BoldAsColour", 1, &cfg.bold_colour);
     for (i=0; i<22; i++) {
@@ -300,10 +316,14 @@ static void load_settings (char *section, int do_host) {
 	    "85,255,255", "187,187,187", "255,255,255"
  	};
 	char buf[20], buf2[30];
+	int c0, c1, c2;
 	sprintf(buf, "Colour%d", i);
 	gpps (sesskey, buf, defaults[i], buf2, sizeof(buf2));
-	sscanf(buf2, "%d,%d,%d", &cfg.colours[i][0],
-	       &cfg.colours[i][1], &cfg.colours[i][2]);
+	if(sscanf(buf2, "%d,%d,%d", &c0, &c1, &c2) == 3) {
+	    cfg.colours[i][0] = c0;
+	    cfg.colours[i][1] = c1;
+	    cfg.colours[i][2] = c2;
+	}
     }
     gppi (sesskey, "MouseIsXterm", 0, &cfg.mouse_is_xterm);
     for (i=0; i<256; i+=32) {
@@ -329,6 +349,10 @@ static void load_settings (char *section, int do_host) {
 	    cfg.wordness[j] = atoi(q);
 	}
     }
+    gppi (sesskey, "KoiWinXlat", 0, &cfg.xlat_enablekoiwin);
+    gppi (sesskey, "88592Xlat", 0, &cfg.xlat_88592w1250);
+    gppi (sesskey, "CapsLockCyr", 0, &cfg.xlat_capslockcyr);
+
     RegCloseKey(sesskey);
 }
 
@@ -346,9 +370,9 @@ static int CALLBACK LogProc (HWND hwnd, UINT msg,
 
     switch (msg) {
       case WM_INITDIALOG:
-	for (i=0; i<nnegots; i++)
+	for (i=0; i<nevents; i++)
 	    SendDlgItemMessage (hwnd, IDN_LIST, LB_ADDSTRING,
-				0, (LPARAM)negots[i]);
+				0, (LPARAM)events[i]);
 	return 1;
 /*      case WM_CTLCOLORDLG: */
 /*	return (int) GetStockObject (LTGRAY_BRUSH); */
@@ -615,8 +639,12 @@ static int CALLBACK KeyboardProc (HWND hwnd, UINT msg,
 			  cfg.linux_funkeys ? IDC1_FUNCLINUX : IDC1_FUNCTILDE);
 	CheckRadioButton (hwnd, IDC1_CURNORMAL, IDC1_CURAPPLIC,
 			  cfg.app_cursor ? IDC1_CURAPPLIC : IDC1_CURNORMAL);
-	CheckRadioButton (hwnd, IDC1_KPNORMAL, IDC1_KPAPPLIC,
+	CheckRadioButton (hwnd, IDC1_KPNORMAL, IDC1_KPNH,
+			  cfg.nethack_keypad ? IDC1_KPNH :
 			  cfg.app_keypad ? IDC1_KPAPPLIC : IDC1_KPNORMAL);
+	CheckDlgButton (hwnd, IDC1_ALTF4, cfg.alt_f4);
+	CheckDlgButton (hwnd, IDC1_ALTSPACE, cfg.alt_space);
+	CheckDlgButton (hwnd, IDC1_LDISCTERM, cfg.ldisc_term);
 	break;
       case WM_COMMAND:
 	if (HIWORD(wParam) == BN_CLICKED ||
@@ -637,11 +665,31 @@ static int CALLBACK KeyboardProc (HWND hwnd, UINT msg,
 	      case IDC1_KPNORMAL:
 	      case IDC1_KPAPPLIC:
 		cfg.app_keypad = IsDlgButtonChecked (hwnd, IDC1_KPAPPLIC);
+		cfg.nethack_keypad = FALSE;
+		break;
+	      case IDC1_KPNH:
+		cfg.app_keypad = FALSE;
+		cfg.nethack_keypad = TRUE;
 		break;
 	      case IDC1_CURNORMAL:
 	      case IDC1_CURAPPLIC:
 		cfg.app_cursor = IsDlgButtonChecked (hwnd, IDC1_CURAPPLIC);
 		break;
+	      case IDC1_ALTF4:
+		if (HIWORD(wParam) == BN_CLICKED ||
+		    HIWORD(wParam) == BN_DOUBLECLICKED)
+		    cfg.alt_f4 = IsDlgButtonChecked (hwnd, IDC1_ALTF4);
+		break;
+	      case IDC1_ALTSPACE:
+		if (HIWORD(wParam) == BN_CLICKED ||
+		    HIWORD(wParam) == BN_DOUBLECLICKED)
+		    cfg.alt_space = IsDlgButtonChecked (hwnd, IDC1_ALTSPACE);
+		break;
+	      case IDC1_LDISCTERM:
+		if (HIWORD(wParam) == BN_CLICKED ||
+		    HIWORD(wParam) == BN_DOUBLECLICKED)
+		    cfg.ldisc_term = IsDlgButtonChecked (hwnd, IDC1_LDISCTERM);
+		break;
 	    }
     }
     return GeneralPanelProc (hwnd, msg, wParam, lParam);
@@ -721,7 +769,7 @@ static int CALLBACK TerminalProc (HWND hwnd, UINT msg,
 	    lf.lfWidth = lf.lfEscapement = lf.lfOrientation = 0;
 	    lf.lfItalic = lf.lfUnderline = lf.lfStrikeOut = 0;
 	    lf.lfWeight = (cfg.fontisbold ? FW_BOLD : 0);
-	    lf.lfCharSet = ANSI_CHARSET;
+	    lf.lfCharSet = cfg.fontcharset;
 	    lf.lfOutPrecision = OUT_DEFAULT_PRECIS;
 	    lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;
 	    lf.lfQuality = DEFAULT_QUALITY;
@@ -739,6 +787,7 @@ static int CALLBACK TerminalProc (HWND hwnd, UINT msg,
 		strncpy (cfg.font, lf.lfFaceName, sizeof(cfg.font)-1);
 		cfg.font[sizeof(cfg.font)-1] = '\0';
 		cfg.fontisbold = (lf.lfWeight == FW_BOLD);
+		cfg.fontcharset = lf.lfCharSet;
 		cfg.fontheight = lf.lfHeight;
 		fmtfont (fontstatic);
 		SetDlgItemText (hwnd, IDC2_FONTSTATIC, fontstatic);
@@ -888,6 +937,7 @@ static int CALLBACK SshProc (HWND hwnd, UINT msg,
 			  cfg.cipher == CIPHER_DES ? IDC3_CIPHERDES :
 
 			  IDC3_CIPHER3DES);
+	CheckDlgButton (hwnd, IDC3_AUTHTIS, cfg.try_tis_auth);
 	break;
       case WM_COMMAND:
 	switch (LOWORD(wParam)) {
@@ -919,6 +969,11 @@ static int CALLBACK SshProc (HWND hwnd, UINT msg,
 		    cfg.cipher = CIPHER_DES;
 	    }
 	    break;
+	  case IDC3_AUTHTIS:
+	    if (HIWORD(wParam) == BN_CLICKED ||
+		HIWORD(wParam) == BN_DOUBLECLICKED)
+		cfg.try_tis_auth = IsDlgButtonChecked (hwnd, IDC3_AUTHTIS);
+	    break;
 	}
 	break;
     }
@@ -1071,7 +1126,7 @@ static int CALLBACK ColourProc (HWND hwnd, UINT msg,
 		    i = (i < 3 ? i*2 : i == 3 ? 5 : i*2-2);
 		cc.lStructSize = sizeof(cc);
 		cc.hwndOwner = hwnd;
-		cc.hInstance = hinst;
+		cc.hInstance = (HWND)hinst;
 		cc.lpCustColors = custom;
 		cc.rgbResult = RGB (cfg.colours[i][0], cfg.colours[i][1],
 				    cfg.colours[i][2]);
@@ -1098,9 +1153,40 @@ static int CALLBACK ColourProc (HWND hwnd, UINT msg,
     return GeneralPanelProc (hwnd, msg, wParam, lParam);
 }
 
+static int CALLBACK LanguageProc (HWND hwnd, UINT msg,
+				  WPARAM wParam, LPARAM lParam) {
+    switch (msg) {
+      case WM_INITDIALOG:
+	CheckRadioButton (hwnd, IDC6_NOXLAT, IDC6_88592WIN1250,
+			  cfg.xlat_88592w1250 ? IDC6_88592WIN1250 :
+			  cfg.xlat_enablekoiwin ? IDC6_KOI8WIN1251 :
+			  IDC6_NOXLAT);
+	CheckDlgButton (hwnd, IDC6_CAPSLOCKCYR, cfg.xlat_capslockcyr);
+      case WM_COMMAND:
+	switch (LOWORD(wParam)) {
+	  case IDC6_NOXLAT:
+	  case IDC6_KOI8WIN1251:
+	  case IDC6_88592WIN1250:
+	    cfg.xlat_enablekoiwin =
+		IsDlgButtonChecked (hwnd, IDC6_KOI8WIN1251);
+	    cfg.xlat_88592w1250 =
+		IsDlgButtonChecked (hwnd, IDC6_88592WIN1250);
+	    break;
+	  case IDC6_CAPSLOCKCYR:
+	    if (HIWORD(wParam) == BN_CLICKED ||
+		HIWORD(wParam) == BN_DOUBLECLICKED) {
+		cfg.xlat_capslockcyr =
+		    IsDlgButtonChecked (hwnd, IDC6_CAPSLOCKCYR);
+	    }
+	    break;
+	}
+    }
+    return GeneralPanelProc (hwnd, msg, wParam, lParam);
+}
+
 static DLGPROC panelproc[NPANELS] = {
     ConnectionProc, KeyboardProc, TerminalProc,
-    TelnetProc, SshProc, SelectionProc, ColourProc
+    TelnetProc, SshProc, SelectionProc, ColourProc, LanguageProc
 };
 static char *panelids[NPANELS] = {
     MAKEINTRESOURCE(IDD_PANEL0),
@@ -1109,14 +1195,17 @@ static char *panelids[NPANELS] = {
     MAKEINTRESOURCE(IDD_PANEL3),
     MAKEINTRESOURCE(IDD_PANEL35),
     MAKEINTRESOURCE(IDD_PANEL4),
-    MAKEINTRESOURCE(IDD_PANEL5)
+    MAKEINTRESOURCE(IDD_PANEL5),
+    MAKEINTRESOURCE(IDD_PANEL6)
 };
+
 static char *names[NPANELS] = {
-    "Connection", "Keyboard", "Terminal", "Telnet", "SSH", "Selection", "Colours"
+    "Connection", "Keyboard", "Terminal", "Telnet",
+    "SSH", "Selection", "Colours", "Language"
 };
 
-static int mainp[MAIN_NPANELS] = { 0, 1, 2, 3, 4, 5, 6 };
-static int reconfp[RECONF_NPANELS] = { 1, 2, 5, 6 };
+static int mainp[MAIN_NPANELS] = { 0, 1, 2, 3, 4, 5, 6, 7};
+static int reconfp[RECONF_NPANELS] = { 1, 2, 5, 6, 7};
 
 static int GenericMainDlgProc (HWND hwnd, UINT msg,
 			       WPARAM wParam, LPARAM lParam,
@@ -1315,20 +1404,20 @@ void do_defaults (char *session) {
 	load_settings ("Default Settings", FALSE);
 }
 
-void lognegot (char *string) {
-    if (nnegots >= negsize) {
+void logevent (char *string) {
+    if (nevents >= negsize) {
 	negsize += 64;
-	negots = srealloc (negots, negsize * sizeof(*negots));
+	events = srealloc (events, negsize * sizeof(*events));
     }
-    negots[nnegots] = smalloc(1+strlen(string));
-    strcpy (negots[nnegots], string);
-    nnegots++;
+    events[nevents] = smalloc(1+strlen(string));
+    strcpy (events[nevents], string);
+    nevents++;
     if (logbox)
 	SendDlgItemMessage (logbox, IDN_LIST, LB_ADDSTRING,
 			    0, (LPARAM)string);
 }
 
-void shownegot (HWND hwnd) {
+void showeventlog (HWND hwnd) {
     if (!logbox) {
 	logbox = CreateDialog (hinst, MAKEINTRESOURCE(IDD_LOGBOX),
 			       hwnd, LogProc);