#include <windows.h>
#include <commctrl.h>
#include <commdlg.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
+#endif
#include <stdio.h>
#include <stdlib.h>
wpps (sesskey, "HostName", cfg.host);
wppi (sesskey, "PortNumber", cfg.port);
p = "raw";
- for (i = 0; backends[i].backend != NULL; i++)
+ for (i = 0; backends[i].name != NULL; i++)
if (backends[i].protocol == cfg.protocol) {
p = backends[i].name;
break;
}
wpps (sesskey, "UserName", cfg.username);
wppi (sesskey, "NoPTY", cfg.nopty);
+ wppi (sesskey, "AgentFwd", cfg.agentfwd);
+ wpps (sesskey, "RemoteCmd", cfg.remote_cmd);
wpps (sesskey, "Cipher", cfg.cipher == CIPHER_BLOWFISH ? "blowfish" :
cfg.cipher == CIPHER_DES ? "des" : "3des");
wppi (sesskey, "AuthTIS", cfg.try_tis_auth);
+ wppi (sesskey, "SshProt", cfg.sshprot);
+ wpps (sesskey, "PublicKeyFile", cfg.keyfile);
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, "LinuxFunctionKeys", cfg.funky_type);
wppi (sesskey, "ApplicationCursorKeys", cfg.app_cursor);
wppi (sesskey, "ApplicationKeypad", cfg.app_keypad);
wppi (sesskey, "NetHackKeypad", cfg.nethack_keypad);
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);
wppi (sesskey, "KoiWinXlat", cfg.xlat_enablekoiwin);
wppi (sesskey, "88592Xlat", cfg.xlat_88592w1250);
wppi (sesskey, "CapsLockCyr", cfg.xlat_capslockcyr);
+ wppi (sesskey, "ScrollBar", cfg.scrollbar);
+ wppi (sesskey, "ScrollOnKey", cfg.scroll_on_key);
+ wppi (sesskey, "LockSize", cfg.locksize);
+ wppi (sesskey, "BCE", cfg.bce);
+ wppi (sesskey, "BlinkText", cfg.blinktext);
RegCloseKey(sesskey);
}
gpps (sesskey, "Protocol", "default", prot, 10);
cfg.protocol = default_protocol;
- for (i = 0; backends[i].backend != NULL; i++)
+ for (i = 0; backends[i].name != NULL; i++)
if (!strcmp(prot, backends[i].name)) {
cfg.protocol = backends[i].protocol;
break;
}
gpps (sesskey, "UserName", "", cfg.username, sizeof(cfg.username));
gppi (sesskey, "NoPTY", 0, &cfg.nopty);
+ gppi (sesskey, "AgentFwd", 0, &cfg.agentfwd);
+ gpps (sesskey, "RemoteCmd", "", cfg.remote_cmd, sizeof(cfg.remote_cmd));
{
char cipher[10];
gpps (sesskey, "Cipher", "3des", cipher, 10);
else
cfg.cipher = CIPHER_3DES;
}
+ gppi (sesskey, "SshProt", 1, &cfg.sshprot);
gppi (sesskey, "AuthTIS", 0, &cfg.try_tis_auth);
+ gpps (sesskey, "PublicKeyFile", "", cfg.keyfile, sizeof(cfg.keyfile));
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, "LinuxFunctionKeys", 0, &cfg.funky_type);
gppi (sesskey, "ApplicationCursorKeys", 0, &cfg.app_cursor);
gppi (sesskey, "ApplicationKeypad", 0, &cfg.app_keypad);
gppi (sesskey, "NetHackKeypad", 0, &cfg.nethack_keypad);
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);
gppi (sesskey, "KoiWinXlat", 0, &cfg.xlat_enablekoiwin);
gppi (sesskey, "88592Xlat", 0, &cfg.xlat_88592w1250);
gppi (sesskey, "CapsLockCyr", 0, &cfg.xlat_capslockcyr);
+ gppi (sesskey, "ScrollBar", 1, &cfg.scrollbar);
+ gppi (sesskey, "ScrollOnKey", 0, &cfg.scroll_on_key);
+ gppi (sesskey, "LockSize", 0, &cfg.locksize);
+ gppi (sesskey, "BCE", 0, &cfg.bce);
+ gppi (sesskey, "BlinkText", 0, &cfg.blinktext);
RegCloseKey(sesskey);
}
+static void force_normal(HWND hwnd)
+{
+static int recurse = 0;
+
+ WINDOWPLACEMENT wp;
+
+ if(recurse) return;
+ recurse = 1;
+
+ wp.length = sizeof(wp);
+ if (GetWindowPlacement(hwnd, &wp))
+ {
+ wp.showCmd = SW_SHOWNORMAL;
+ SetWindowPlacement(hwnd, &wp);
+ }
+ recurse = 0;
+}
+
static void MyGetDlgItemInt (HWND hwnd, int id, int *result) {
BOOL ok;
int n;
DialogBox (hinst, MAKEINTRESOURCE(IDD_LICENCEBOX),
NULL, LicenceProc);
EnableWindow(hwnd, 1);
+ SetActiveWindow(hwnd);
return 0;
}
return 0;
return 0;
}
+static char savedsession[2048];
+
static int CALLBACK ConnectionProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) {
int i;
switch (msg) {
case WM_INITDIALOG:
SetDlgItemText (hwnd, IDC0_HOST, cfg.host);
+ SetDlgItemText (hwnd, IDC0_SESSEDIT, savedsession);
SetDlgItemInt (hwnd, IDC0_PORT, cfg.port, FALSE);
for (i = 0; i < nsessions; i++)
SendDlgItemMessage (hwnd, IDC0_SESSLIST, LB_ADDSTRING,
cfg.warn_on_close = IsDlgButtonChecked (hwnd, IDC0_CLOSEWARN);
break;
case IDC0_SESSEDIT:
- if (HIWORD(wParam) == EN_CHANGE)
+ if (HIWORD(wParam) == EN_CHANGE) {
SendDlgItemMessage (hwnd, IDC0_SESSLIST, LB_SETCURSEL,
(WPARAM) -1, 0);
+ GetDlgItemText (hwnd, IDC0_SESSEDIT,
+ savedsession, sizeof(savedsession)-1);
+ savedsession[sizeof(savedsession)-1] = '\0';
+ }
break;
case IDC0_SESSSAVE:
if (HIWORD(wParam) == BN_CLICKED ||
cfg.bksp_is_delete ? IDC1_DEL127 : IDC1_DEL008);
CheckRadioButton (hwnd, IDC1_HOMETILDE, IDC1_HOMERXVT,
cfg.rxvt_homeend ? IDC1_HOMERXVT : IDC1_HOMETILDE);
- CheckRadioButton (hwnd, IDC1_FUNCTILDE, IDC1_FUNCLINUX,
- cfg.linux_funkeys ? IDC1_FUNCLINUX : IDC1_FUNCTILDE);
+ CheckRadioButton (hwnd, IDC1_FUNCTILDE, IDC1_FUNCXTERM,
+ cfg.funky_type ?
+ (cfg.funky_type==2 ? IDC1_FUNCXTERM
+ : IDC1_FUNCLINUX )
+ : IDC1_FUNCTILDE);
CheckRadioButton (hwnd, IDC1_CURNORMAL, IDC1_CURAPPLIC,
cfg.app_cursor ? IDC1_CURAPPLIC : IDC1_CURNORMAL);
CheckRadioButton (hwnd, IDC1_KPNORMAL, IDC1_KPNH,
CheckDlgButton (hwnd, IDC1_ALTF4, cfg.alt_f4);
CheckDlgButton (hwnd, IDC1_ALTSPACE, cfg.alt_space);
CheckDlgButton (hwnd, IDC1_LDISCTERM, cfg.ldisc_term);
- CheckDlgButton (hwnd, IDC1_BLINKCUR, cfg.blink_cur);
+ CheckDlgButton (hwnd, IDC1_SCROLLKEY, cfg.scroll_on_key);
break;
case WM_COMMAND:
if (HIWORD(wParam) == BN_CLICKED ||
case IDC1_HOMERXVT:
cfg.rxvt_homeend = IsDlgButtonChecked (hwnd, IDC1_HOMERXVT);
break;
+ case IDC1_FUNCXTERM:
+ cfg.funky_type = 2;
+ break;
case IDC1_FUNCTILDE:
case IDC1_FUNCLINUX:
- cfg.linux_funkeys = IsDlgButtonChecked (hwnd, IDC1_FUNCLINUX);
+ cfg.funky_type = IsDlgButtonChecked (hwnd, IDC1_FUNCLINUX);
break;
case IDC1_KPNORMAL:
case IDC1_KPAPPLIC:
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.ldisc_term = IsDlgButtonChecked (hwnd, IDC1_LDISCTERM);
break;
- case IDC1_BLINKCUR:
+ case IDC1_SCROLLKEY:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
- cfg.blink_cur = IsDlgButtonChecked (hwnd, IDC1_BLINKCUR);
+ cfg.scroll_on_key = IsDlgButtonChecked (hwnd, IDC1_SCROLLKEY);
break;
}
}
SetDlgItemInt (hwnd, IDC2_SAVEEDIT, cfg.savelines, FALSE);
fmtfont (fontstatic);
SetDlgItemText (hwnd, IDC2_FONTSTATIC, fontstatic);
- CheckRadioButton (hwnd, IDC2_VTXWINDOWS, IDC2_VTPOORMAN,
- cfg.vtmode == VT_XWINDOWS ? IDC2_VTXWINDOWS :
- cfg.vtmode == VT_OEMANSI ? IDC2_VTOEMANSI :
- cfg.vtmode == VT_OEMONLY ? IDC2_VTOEMONLY :
- IDC2_VTPOORMAN);
+ CheckDlgButton (hwnd, IDC1_BLINKCUR, cfg.blink_cur);
+ CheckDlgButton (hwnd, IDC1_BEEP, cfg.beep);
+ CheckDlgButton (hwnd, IDC2_SCROLLBAR, cfg.scrollbar);
+ CheckDlgButton (hwnd, IDC2_LOCKSIZE, cfg.locksize);
+ CheckDlgButton (hwnd, IDC2_BCE, cfg.bce);
+ CheckDlgButton (hwnd, IDC2_BLINKTEXT, cfg.blinktext);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
SetDlgItemText (hwnd, IDC2_FONTSTATIC, fontstatic);
}
break;
- case IDC2_VTXWINDOWS:
- case IDC2_VTOEMANSI:
- case IDC2_VTOEMONLY:
- case IDC2_VTPOORMAN:
- cfg.vtmode =
- (IsDlgButtonChecked (hwnd, IDC2_VTXWINDOWS) ? VT_XWINDOWS :
- IsDlgButtonChecked (hwnd, IDC2_VTOEMANSI) ? VT_OEMANSI :
- IsDlgButtonChecked (hwnd, IDC2_VTOEMONLY) ? VT_OEMONLY :
- VT_POORMAN);
- break;
+ case IDC1_BLINKCUR:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.blink_cur = IsDlgButtonChecked (hwnd, IDC1_BLINKCUR);
+ break;
+ case IDC1_BEEP:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.beep = IsDlgButtonChecked (hwnd, IDC1_BEEP);
+ break;
+ case IDC2_SCROLLBAR:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.scrollbar = IsDlgButtonChecked (hwnd, IDC2_SCROLLBAR);
+ break;
+ case IDC2_LOCKSIZE:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.locksize = IsDlgButtonChecked (hwnd, IDC2_LOCKSIZE);
+ break;
+ case IDC2_BLINKTEXT:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.blinktext = IsDlgButtonChecked (hwnd, IDC2_BLINKTEXT);
+ break;
+ case IDC2_BCE:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.bce = IsDlgButtonChecked (hwnd, IDC2_BCE);
+ break;
}
break;
}
static int CALLBACK SshProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) {
+ OPENFILENAME of;
+ char filename[sizeof(cfg.keyfile)];
+
switch (msg) {
case WM_INITDIALOG:
SetDlgItemText (hwnd, IDC3_TTEDIT, cfg.termtype);
SetDlgItemText (hwnd, IDC3_LOGEDIT, cfg.username);
CheckDlgButton (hwnd, IDC3_NOPTY, cfg.nopty);
+ CheckDlgButton (hwnd, IDC3_AGENTFWD, cfg.agentfwd);
CheckRadioButton (hwnd, IDC3_CIPHER3DES, IDC3_CIPHERDES,
cfg.cipher == CIPHER_BLOWFISH ? IDC3_CIPHERBLOWF :
cfg.cipher == CIPHER_DES ? IDC3_CIPHERDES :
-
IDC3_CIPHER3DES);
+ CheckRadioButton (hwnd, IDC3_SSHPROT1, IDC3_SSHPROT2,
+ cfg.sshprot == 1 ? IDC3_SSHPROT1 : IDC3_SSHPROT2);
CheckDlgButton (hwnd, IDC3_AUTHTIS, cfg.try_tis_auth);
+ SetDlgItemText (hwnd, IDC3_PKEDIT, cfg.keyfile);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.nopty = IsDlgButtonChecked (hwnd, IDC3_NOPTY);
break;
+ case IDC3_AGENTFWD:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.agentfwd = IsDlgButtonChecked (hwnd, IDC3_AGENTFWD);
+ break;
case IDC3_CIPHER3DES:
case IDC3_CIPHERBLOWF:
case IDC3_CIPHERDES:
cfg.cipher = CIPHER_DES;
}
break;
+ case IDC3_SSHPROT1:
+ case IDC3_SSHPROT2:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED) {
+ if (IsDlgButtonChecked (hwnd, IDC3_SSHPROT1))
+ cfg.sshprot = 1;
+ else if (IsDlgButtonChecked (hwnd, IDC3_SSHPROT2))
+ cfg.sshprot = 2;
+ }
+ break;
case IDC3_AUTHTIS:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.try_tis_auth = IsDlgButtonChecked (hwnd, IDC3_AUTHTIS);
break;
+ case IDC3_PKEDIT:
+ if (HIWORD(wParam) == EN_CHANGE)
+ GetDlgItemText (hwnd, IDC3_PKEDIT, cfg.keyfile,
+ sizeof(cfg.keyfile)-1);
+ break;
+ case IDC3_PKBUTTON:
+ /*
+ * FIXME: this crashes. Find out why.
+ */
+ memset(&of, 0, sizeof(of));
+#ifdef OPENFILENAME_SIZE_VERSION_400
+ of.lStructSize = OPENFILENAME_SIZE_VERSION_400;
+#else
+ of.lStructSize = sizeof(of);
+#endif
+ of.hwndOwner = hwnd;
+ of.lpstrFilter = "All Files\0*\0\0\0";
+ of.lpstrCustomFilter = NULL;
+ of.nFilterIndex = 1;
+ of.lpstrFile = filename; strcpy(filename, cfg.keyfile);
+ of.nMaxFile = sizeof(filename);
+ of.lpstrFileTitle = NULL;
+ of.lpstrInitialDir = NULL;
+ of.lpstrTitle = "Select Public Key File";
+ of.Flags = 0;
+ if (GetOpenFileName(&of)) {
+ strcpy(cfg.keyfile, filename);
+ SetDlgItemText (hwnd, IDC3_PKEDIT, cfg.keyfile);
+ }
+ break;
}
break;
}
return GeneralPanelProc (hwnd, msg, wParam, lParam);
}
-static int CALLBACK LanguageProc (HWND hwnd, UINT msg,
+static int CALLBACK TranslationProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) {
switch (msg) {
case WM_INITDIALOG:
cfg.xlat_enablekoiwin ? IDC6_KOI8WIN1251 :
IDC6_NOXLAT);
CheckDlgButton (hwnd, IDC6_CAPSLOCKCYR, cfg.xlat_capslockcyr);
+ CheckRadioButton (hwnd, IDC2_VTXWINDOWS, IDC2_VTPOORMAN,
+ cfg.vtmode == VT_XWINDOWS ? IDC2_VTXWINDOWS :
+ cfg.vtmode == VT_OEMANSI ? IDC2_VTOEMANSI :
+ cfg.vtmode == VT_OEMONLY ? IDC2_VTOEMONLY :
+ IDC2_VTPOORMAN);
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC6_NOXLAT:
IsDlgButtonChecked (hwnd, IDC6_CAPSLOCKCYR);
}
break;
+ case IDC2_VTXWINDOWS:
+ case IDC2_VTOEMANSI:
+ case IDC2_VTOEMONLY:
+ case IDC2_VTPOORMAN:
+ cfg.vtmode =
+ (IsDlgButtonChecked (hwnd, IDC2_VTXWINDOWS) ? VT_XWINDOWS :
+ IsDlgButtonChecked (hwnd, IDC2_VTOEMANSI) ? VT_OEMANSI :
+ IsDlgButtonChecked (hwnd, IDC2_VTOEMONLY) ? VT_OEMONLY :
+ VT_POORMAN);
+ break;
}
}
return GeneralPanelProc (hwnd, msg, wParam, lParam);
static DLGPROC panelproc[NPANELS] = {
ConnectionProc, KeyboardProc, TerminalProc,
- TelnetProc, SshProc, SelectionProc, ColourProc, LanguageProc
+ TelnetProc, SshProc, SelectionProc, ColourProc, TranslationProc
};
static char *panelids[NPANELS] = {
MAKEINTRESOURCE(IDD_PANEL0),
static char *names[NPANELS] = {
"Connection", "Keyboard", "Terminal", "Telnet",
- "SSH", "Selection", "Colours", "Language"
+ "SSH", "Selection", "Colours", "Translation"
};
static int mainp[MAIN_NPANELS] = { 0, 1, 2, 3, 4, 5, 6, 7};
case WM_CLOSE:
EndDialog (hwnd, 0);
return 0;
+
+ /* Grrr Explorer will maximize Dialogs! */
+ case WM_SIZE:
+ if (wParam == SIZE_MAXIMIZED)
+ force_normal(hwnd);
+ return 0;
}
return 0;
}
DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX),
GetParent(hwnd), AboutProc);
EnableWindow(hwnd, 1);
+ SetActiveWindow(hwnd);
}
return GenericMainDlgProc (hwnd, msg, wParam, lParam,
MAIN_NPANELS, mainp, &page);
int ret;
get_sesslist(TRUE);
+ savedsession[0] = '\0';
ret = DialogBox (hinst, MAKEINTRESOURCE(IDD_MAINBOX), NULL, MainDlgProc);
get_sesslist(FALSE);
ret = DialogBox (hinst, MAKEINTRESOURCE(IDD_RECONF), hwnd, ReconfDlgProc);
if (!ret)
cfg = backup_cfg; /* structure copy */
+ else
+ force_normal(hwnd);
+
return ret;
}
* Now read a saved key in from the registry and see what it
* says.
*/
- otherstr = malloc(len);
- mungedhost = malloc(3*strlen(host)+1);
+ otherstr = smalloc(len);
+ mungedhost = smalloc(3*strlen(host)+1);
if (!otherstr || !mungedhost)
fatalbox("Out of memory");
projects / u / mdw / putty / blobdiff