nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-02-05 06:32:25 +00:00
Code Issues Projects Releases Wiki Activity

Stop throwing out the Connection panel during midsession reconfig.

Browse Source 
Instead, only throw out the useless parts of it. See, the new auto-
layout features bear fruit immediately!

[originally from svn r685]
This commit is contained in:
Simon Tatham 2000-10-06 16:01:09 +00:00
parent 942d7f0533
commit 0129f94d1c
1 changed files with 73 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
windlg.c
View File

@ -18,7 +18,7 @@
#define NPANELS 9 #define NPANELS 9
#define MAIN_NPANELS 9 #define MAIN_NPANELS 9
#define RECONF_NPANELS 6 #define RECONF_NPANELS 7
static char **events = NULL; static char **events = NULL;
static int nevents = 0, negsize = 0; static int nevents = 0, negsize = 0;
@ -822,30 +822,32 @@ static int CALLBACK ConnectionProc (HWND hwnd, UINT msg,
case WM_INITDIALOG: case WM_INITDIALOG:
/* Accelerators used: [aco] dehlnprstwx */ /* Accelerators used: [aco] dehlnprstwx */
ctlposinit(&cp, hwnd); ctlposinit(&cp, hwnd);
multiedit(&cp, if (wParam == 0) {
"Host &Name", IDC_HOSTSTATIC, IDC_HOST, 75, multiedit(&cp,
"&Port", IDC_PORTSTATIC, IDC_PORT, 25, NULL); "Host &Name", IDC_HOSTSTATIC, IDC_HOST, 75,
if (backends[2].backend == NULL) { "&Port", IDC_PORTSTATIC, IDC_PORT, 25, NULL);
/* this is PuTTYtel, so only two protocols available */ if (backends[2].backend == NULL) {
radioline(&cp, "Protocol:", IDC_PROTSTATIC, 3, /* this is PuTTYtel, so only two protocols available */
"&Raw", IDC_PROTRAW, radioline(&cp, "Protocol:", IDC_PROTSTATIC, 3,
"&Telnet", IDC_PROTTELNET, NULL); "&Raw", IDC_PROTRAW,
} else { "&Telnet", IDC_PROTTELNET, NULL);
radioline(&cp, "Protocol:", IDC_PROTSTATIC, 3, } else {
"&Raw", IDC_PROTRAW, radioline(&cp, "Protocol:", IDC_PROTSTATIC, 3,
"&Telnet", IDC_PROTTELNET, "&Raw", IDC_PROTRAW,
"&Telnet", IDC_PROTTELNET,
#ifdef FWHACK #ifdef FWHACK
"SS&H/hack", "SS&H/hack",
#else #else
"SS&H", "SS&H",
#endif #endif
IDC_PROTSSH, NULL); IDC_PROTSSH, NULL);
}
sesssaver(&cp, "Stor&ed Sessions",
IDC_SESSSTATIC, IDC_SESSEDIT, IDC_SESSLIST,
"&Load", IDC_SESSLOAD,
"&Save", IDC_SESSSAVE,
"&Delete", IDC_SESSDEL, NULL);
} }
sesssaver(&cp, "Stor&ed Sessions",
IDC_SESSSTATIC, IDC_SESSEDIT, IDC_SESSLIST,
"&Load", IDC_SESSLOAD,
"&Save", IDC_SESSSAVE,
"&Delete", IDC_SESSDEL, NULL);
checkbox(&cp, "Close Window on E&xit", IDC_CLOSEEXIT); checkbox(&cp, "Close Window on E&xit", IDC_CLOSEEXIT);
checkbox(&cp, "&Warn on Close", IDC_CLOSEWARN); checkbox(&cp, "&Warn on Close", IDC_CLOSEWARN);
@ -1300,9 +1302,10 @@ static int CALLBACK WindowProc (HWND hwnd, UINT msg,
case WM_INITDIALOG: case WM_INITDIALOG:
/* Accelerators used: [aco] bikty */ /* Accelerators used: [aco] bikty */
ctlposinit(&cp, hwnd); ctlposinit(&cp, hwnd);
multiedit(&cp, if (wParam == 0)
"Initial window &title:", IDC_WINTITLE, IDC_WINEDIT, 100, multiedit(&cp,
NULL); "Initial window &title:", IDC_WINTITLE, IDC_WINEDIT, 100,
NULL);
checkbox(&cp, "Avoid ever using &icon title", IDC_WINNAME); checkbox(&cp, "Avoid ever using &icon title", IDC_WINNAME);
checkbox(&cp, "&Blinking cursor", IDC_BLINKCUR); checkbox(&cp, "&Blinking cursor", IDC_BLINKCUR);
checkbox(&cp, "Displa&y scrollbar", IDC_SCROLLBAR); checkbox(&cp, "Displa&y scrollbar", IDC_SCROLLBAR);
@ -1375,17 +1378,19 @@ static int CALLBACK TelnetProc (HWND hwnd, UINT msg,
case WM_INITDIALOG: case WM_INITDIALOG:
/* Accelerators used: [aco] bdflrstuv */ /* Accelerators used: [aco] bdflrstuv */
ctlposinit(&cp, hwnd); ctlposinit(&cp, hwnd);
staticedit(&cp, "Terminal-&type string", IDC_TTSTATIC, IDC_TTEDIT); if (wParam == 0) {
staticedit(&cp, "Terminal-&speed string", IDC_TSSTATIC, IDC_TSEDIT); staticedit(&cp, "Terminal-&type string", IDC_TTSTATIC, IDC_TTEDIT);
staticedit(&cp, "Auto-login &username", IDC_LOGSTATIC, IDC_LOGEDIT); staticedit(&cp, "Terminal-&speed string", IDC_TSSTATIC, IDC_TSEDIT);
envsetter(&cp, "Environment variables:", IDC_ENVSTATIC, staticedit(&cp, "Auto-login &username", IDC_LOGSTATIC, IDC_LOGEDIT);
"&Variable", IDC_VARSTATIC, IDC_VAREDIT, envsetter(&cp, "Environment variables:", IDC_ENVSTATIC,
"Va&lue", IDC_VALSTATIC, IDC_VALEDIT, "&Variable", IDC_VARSTATIC, IDC_VAREDIT,
IDC_ENVLIST, "Va&lue", IDC_VALSTATIC, IDC_VALEDIT,
"A&dd", IDC_ENVADD, "&Remove", IDC_ENVREMOVE); IDC_ENVLIST,
radioline(&cp, "Handling of OLD_ENVIRON ambiguity:", IDC_EMSTATIC, 2, "A&dd", IDC_ENVADD, "&Remove", IDC_ENVREMOVE);
"&BSD (commonplace)", IDC_EMBSD, radioline(&cp, "Handling of OLD_ENVIRON ambiguity:", IDC_EMSTATIC, 2,
"R&FC 1408 (unusual)", IDC_EMRFC, NULL); "&BSD (commonplace)", IDC_EMBSD,
"R&FC 1408 (unusual)", IDC_EMRFC, NULL);
}
SetDlgItemText (hwnd, IDC_TTEDIT, cfg.termtype); SetDlgItemText (hwnd, IDC_TTEDIT, cfg.termtype);
SetDlgItemText (hwnd, IDC_TSEDIT, cfg.termspeed); SetDlgItemText (hwnd, IDC_TSEDIT, cfg.termspeed);
@ -1528,24 +1533,26 @@ static int CALLBACK SshProc (HWND hwnd, UINT msg,
case WM_INITDIALOG: case WM_INITDIALOG:
/* Accelerators used: [aco] 123abdkmprtuw */ /* Accelerators used: [aco] 123abdkmprtuw */
ctlposinit(&cp, hwnd); ctlposinit(&cp, hwnd);
staticedit(&cp, "Terminal-&type string", IDC_TTSTATIC, IDC_TTEDIT); if (wParam == 0) {
staticedit(&cp, "Auto-login &username", IDC_LOGSTATIC, IDC_LOGEDIT); staticedit(&cp, "Terminal-&type string", IDC_TTSTATIC, IDC_TTEDIT);
multiedit(&cp, staticedit(&cp, "Auto-login &username", IDC_LOGSTATIC, IDC_LOGEDIT);
"&Remote command:", IDC_CMDSTATIC, IDC_CMDEDIT, 100, multiedit(&cp,
NULL); "&Remote command:", IDC_CMDSTATIC, IDC_CMDEDIT, 100,
checkbox(&cp, "Don't allocate a &pseudo-terminal", IDC_NOPTY); NULL);
checkbox(&cp, "Atte&mpt TIS or CryptoCard authentication", checkbox(&cp, "Don't allocate a &pseudo-terminal", IDC_NOPTY);
IDC_AUTHTIS); checkbox(&cp, "Atte&mpt TIS or CryptoCard authentication",
checkbox(&cp, "Allow &agent forwarding", IDC_AGENTFWD); IDC_AUTHTIS);
editbutton(&cp, "Private &key file for authentication:", checkbox(&cp, "Allow &agent forwarding", IDC_AGENTFWD);
IDC_PKSTATIC, IDC_PKEDIT, "Bro&wse...", IDC_PKBUTTON); editbutton(&cp, "Private &key file for authentication:",
radioline(&cp, "Preferred SSH protocol version:", IDC_PKSTATIC, IDC_PKEDIT, "Bro&wse...", IDC_PKBUTTON);
IDC_SSHPROTSTATIC, 2, radioline(&cp, "Preferred SSH protocol version:",
"&1", IDC_SSHPROT1, "&2", IDC_SSHPROT2, NULL); IDC_SSHPROTSTATIC, 2,
radioline(&cp, "Preferred encryption algorithm:", IDC_CIPHERSTATIC, 3, "&1", IDC_SSHPROT1, "&2", IDC_SSHPROT2, NULL);
"&3DES", IDC_CIPHER3DES, radioline(&cp, "Preferred encryption algorithm:", IDC_CIPHERSTATIC, 3,
"&Blowfish", IDC_CIPHERBLOWF, "&3DES", IDC_CIPHER3DES,
"&DES", IDC_CIPHERDES, NULL); "&Blowfish", IDC_CIPHERBLOWF,
"&DES", IDC_CIPHERDES, NULL);
}
SetDlgItemText (hwnd, IDC_TTEDIT, cfg.termtype); SetDlgItemText (hwnd, IDC_TTEDIT, cfg.termtype);
SetDlgItemText (hwnd, IDC_LOGEDIT, cfg.username); SetDlgItemText (hwnd, IDC_LOGEDIT, cfg.username);
@ -1959,9 +1966,10 @@ static char *names[NPANELS] = {
}; };
static int mainp[MAIN_NPANELS] = { 0, 1, 2, 3, 4, 5, 6, 7, 8}; static int mainp[MAIN_NPANELS] = { 0, 1, 2, 3, 4, 5, 6, 7, 8};
static int reconfp[RECONF_NPANELS] = { 1, 2, 3, 6, 7, 8}; static int reconfp[RECONF_NPANELS] = { 0, 1, 2, 3, 6, 7, 8};
static HWND makesubdialog(HWND hwnd, int x, int y, int w, int h, int n) { static HWND makesubdialog(HWND hwnd, int x, int y, int w, int h,
int n, int dlgtype) {
RECT r; RECT r;
HWND ret; HWND ret;
WPARAM font; WPARAM font;
@ -1978,13 +1986,14 @@ static HWND makesubdialog(HWND hwnd, int x, int y, int w, int h, int n) {
SetWindowLong (ret, DWL_DLGPROC, (LONG)panelproc[n]); SetWindowLong (ret, DWL_DLGPROC, (LONG)panelproc[n]);
font = SendMessage(hwnd, WM_GETFONT, 0, 0); font = SendMessage(hwnd, WM_GETFONT, 0, 0);
SendMessage (ret, WM_SETFONT, font, MAKELPARAM(0, 0)); SendMessage (ret, WM_SETFONT, font, MAKELPARAM(0, 0));
SendMessage (ret, WM_INITDIALOG, 0, 0); SendMessage (ret, WM_INITDIALOG, dlgtype, 0);
return ret; return ret;
} }
static int GenericMainDlgProc (HWND hwnd, UINT msg, static int GenericMainDlgProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam, WPARAM wParam, LPARAM lParam,
int npanels, int *panelnums, HWND *page) { int npanels, int dlgtype,
int *panelnums, HWND *page) {
HWND hw, tabctl; HWND hw, tabctl;
switch (msg) { switch (msg) {
@ -2039,7 +2048,7 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
} }
SendDlgItemMessage(hwnd, IDC_TABLIST, CB_SETCURSEL, 0, 0); SendDlgItemMessage(hwnd, IDC_TABLIST, CB_SETCURSEL, 0, 0);
} }
*page = makesubdialog(hwnd, 6, 30, 168, 163, panelnums[0]); *page = makesubdialog(hwnd, 6, 30, 168, 163, panelnums[0], dlgtype);
SetFocus (*page); SetFocus (*page);
return 0; return 0;
case WM_NOTIFY: case WM_NOTIFY:
@ -2048,7 +2057,8 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
int i = TabCtrl_GetCurSel(((LPNMHDR)lParam)->hwndFrom); int i = TabCtrl_GetCurSel(((LPNMHDR)lParam)->hwndFrom);
if (*page) if (*page)
DestroyWindow (*page); DestroyWindow (*page);
*page = makesubdialog(hwnd, 6, 30, 168, 163, panelnums[i]); *page = makesubdialog(hwnd, 6, 30, 168, 163,
panelnums[i], dlgtype);
SetFocus (((LPNMHDR)lParam)->hwndFrom); /* ensure focus stays */ SetFocus (((LPNMHDR)lParam)->hwndFrom); /* ensure focus stays */
return 0; return 0;
} }
@ -2061,7 +2071,8 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
int i = SendMessage (tablist, CB_GETCURSEL, 0, 0); int i = SendMessage (tablist, CB_GETCURSEL, 0, 0);
if (*page) if (*page)
DestroyWindow (*page); DestroyWindow (*page);
*page = makesubdialog(hwnd, 6, 30, 168, 163, panelnums[i]); *page = makesubdialog(hwnd, 6, 30, 168, 163,
panelnums[i], dlgtype);
SetFocus(tablist); /* ensure focus stays */ SetFocus(tablist); /* ensure focus stays */
return 0; return 0;
} }
@ -2104,14 +2115,14 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
SetActiveWindow(hwnd); SetActiveWindow(hwnd);
} }
return GenericMainDlgProc (hwnd, msg, wParam, lParam, return GenericMainDlgProc (hwnd, msg, wParam, lParam,
MAIN_NPANELS, mainp, &page); MAIN_NPANELS, 0, mainp, &page);
} }
static int CALLBACK ReconfDlgProc (HWND hwnd, UINT msg, static int CALLBACK ReconfDlgProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) { WPARAM wParam, LPARAM lParam) {
static HWND page; static HWND page;
return GenericMainDlgProc (hwnd, msg, wParam, lParam, return GenericMainDlgProc (hwnd, msg, wParam, lParam,
RECONF_NPANELS, reconfp, &page); RECONF_NPANELS, 1, reconfp, &page);
} }
int do_config (void) { int do_config (void) {