static int readytogo;
-static void force_normal(HWND hwnd)
+void force_normal(HWND hwnd)
{
static int recurse = 0;
recurse = 1;
wp.length = sizeof(wp);
- if (GetWindowPlacement(hwnd, &wp))
+ if (GetWindowPlacement(hwnd, &wp) && wp.showCmd == SW_SHOWMAXIMIZED)
{
wp.showCmd = SW_SHOWNORMAL;
SetWindowPlacement(hwnd, &wp);
int *selitems;
selcount = SendDlgItemMessage(hwnd, IDN_LIST,
LB_GETSELCOUNT, 0, 0);
- selitems = malloc(selcount * sizeof(int));
+ selitems = smalloc(selcount * sizeof(int));
if (selitems) {
int count = SendDlgItemMessage(hwnd, IDN_LIST,
LB_GETSELITEMS,
for (i = 0; i < count; i++)
size += strlen(events[selitems[i]]) + sizeof(sel_nl);
- clipdata = malloc(size);
+ clipdata = smalloc(size);
if (clipdata) {
char *p = clipdata;
for (i = 0; i < count; i++) {
p += sizeof(sel_nl);
}
write_clip(clipdata, size, TRUE);
- free(clipdata);
+ sfree(clipdata);
}
- free(selitems);
+ sfree(selitems);
for (i = 0; i < nevents; i++)
SendDlgItemMessage(hwnd, IDN_LIST, LB_SETSEL,
IDC_KPNORMAL,
IDC_KPAPPLIC,
IDC_KPNH,
- IDC_NOAPPLIC,
+ IDC_NOAPPLICK,
+ IDC_NOAPPLICC,
IDC_CURSTATIC,
IDC_CURNORMAL,
IDC_CURAPPLIC,
terminalpanelstart,
IDC_TITLE_TERMINAL,
IDC_BOX_TERMINAL1, IDC_BOXT_TERMINAL1,
+ IDC_BOX_TERMINAL2, IDC_BOXT_TERMINAL2,
IDC_WRAPMODE,
IDC_DECOM,
IDC_LFHASCR,
IDC_BCE,
IDC_BLINKTEXT,
IDC_LDISCTERM,
+ IDC_LSTATSTATIC,
+ IDC_LSTATOFF,
+ IDC_LSTATASCII,
+ IDC_LSTATRAW,
+ IDC_LGFSTATIC,
+ IDC_LGFEDIT,
+ IDC_LGFBUTTON,
terminalpanelend,
windowpanelstart,
IDC_ALTONLY,
IDC_SCROLLKEY,
IDC_SCROLLDISP,
+ IDC_ALWAYSONTOP,
windowpanelend,
appearancepanelstart,
IDC_AGENTFWD,
IDC_CMDSTATIC,
IDC_CMDEDIT,
+ IDC_COMPRESS,
sshpanelend,
selectionpanelstart,
cfg.funky_type == 2 ? IDC_FUNCXTERM :
cfg.funky_type == 3 ? IDC_FUNCVT400 :
IDC_FUNCTILDE );
- CheckDlgButton (hwnd, IDC_NOAPPLIC, cfg.no_applic);
+ CheckDlgButton (hwnd, IDC_NOAPPLICC, cfg.no_applic_c);
+ CheckDlgButton (hwnd, IDC_NOAPPLICK, cfg.no_applic_k);
CheckRadioButton (hwnd, IDC_CURNORMAL, IDC_CURAPPLIC,
cfg.app_cursor ? IDC_CURAPPLIC : IDC_CURNORMAL);
CheckRadioButton (hwnd, IDC_KPNORMAL, IDC_KPNH,
CheckDlgButton (hwnd, IDC_ALTONLY, cfg.alt_only);
CheckDlgButton (hwnd, IDC_COMPOSEKEY, cfg.compose_key);
CheckDlgButton (hwnd, IDC_LDISCTERM, cfg.ldisc_term);
+ CheckDlgButton (hwnd, IDC_ALWAYSONTOP, cfg.alwaysontop);
CheckDlgButton (hwnd, IDC_SCROLLKEY, cfg.scroll_on_key);
CheckDlgButton (hwnd, IDC_SCROLLDISP, cfg.scroll_on_disp);
SetDlgItemText (hwnd, IDC_TTEDIT, cfg.termtype);
SetDlgItemText (hwnd, IDC_TSEDIT, cfg.termspeed);
SetDlgItemText (hwnd, IDC_LOGEDIT, cfg.username);
+ SetDlgItemText (hwnd, IDC_LGFEDIT, cfg.logfilename);
+ CheckRadioButton(hwnd, IDC_LSTATOFF, IDC_LSTATRAW,
+ cfg.logtype == 0 ? IDC_LSTATOFF :
+ cfg.logtype == 1 ? IDC_LSTATASCII :
+ IDC_LSTATRAW);
{
char *p = cfg.environmt;
while (*p) {
SetDlgItemText (hwnd, IDC_TTEDIT, cfg.termtype);
SetDlgItemText (hwnd, IDC_LOGEDIT, cfg.username);
CheckDlgButton (hwnd, IDC_NOPTY, cfg.nopty);
+ CheckDlgButton (hwnd, IDC_COMPRESS, cfg.compression);
CheckDlgButton (hwnd, IDC_BUGGYMAC, cfg.buggymac);
CheckDlgButton (hwnd, IDC_AGENTFWD, cfg.agentfwd);
CheckRadioButton (hwnd, IDC_CIPHER3DES, IDC_CIPHERDES,
CheckDlgButton (hwnd, IDC_BOLDCOLOUR, cfg.bold_colour);
CheckDlgButton (hwnd, IDC_PALETTE, cfg.try_palette);
{
- int i;
+ int i, n;
+ n = SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_GETCOUNT, 0, 0);
+ for (i=n; i-- >0 ;)
+ SendDlgItemMessage (hwnd, IDC_COLOURLIST,
+ LB_DELETESTRING, i, 0);
for (i=0; i<22; i++)
if (cfg.bold_colour || permcolour[i])
SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_ADDSTRING, 0,
CHOOSEFONT cf;
LOGFONT lf;
char fontstatic[256];
+ char portname[32];
+ struct servent * service;
int i;
switch (msg) {
SendMessage(tvstatic, WM_SETFONT, font, MAKELPARAM(TRUE, 0));
r.left = 3; r.right = r.left + 75;
- r.top = 13; r.bottom = r.top + 196;
+ r.top = 13; r.bottom = r.top + 206;
MapDialogRect(hwnd, &r);
treeview = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, "",
WS_CHILD | WS_VISIBLE |
hsession = treeview_insert(&tvfaff, 0, "Session");
}
- /* The Terminal panel. Accelerators used: [acgo] &dlbenu */
+ /* The Terminal panel. Accelerators used: [acgo] &dflbenuw */
{
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
checkbox(&cp, "&Beep enabled", IDC_BEEP);
checkbox(&cp, "Use background colour to &erase screen", IDC_BCE);
checkbox(&cp, "Enable bli&nking text", IDC_BLINKTEXT);
- checkbox(&cp, "&Use local terminal line discipline", IDC_LDISCTERM);
+ checkbox(&cp, "&Use local terminal line discipline", IDC_LDISCTERM);
endbox(&cp);
+ beginbox(&cp, "Control session logging",
+ IDC_BOX_TERMINAL2, IDC_BOXT_TERMINAL2);
+ radiobig(&cp,
+ "Session logging:", IDC_LSTATSTATIC,
+ "Logging turned &off completely", IDC_LSTATOFF,
+ "Log printable output only", IDC_LSTATASCII,
+ "Log all session output", IDC_LSTATRAW, NULL);
+ editbutton(&cp, "Log &file name:",
+ IDC_LGFSTATIC, IDC_LGFEDIT, "Bro&wse...",
+ IDC_LGFBUTTON);
+ endbox(&cp);
+
treeview_insert(&tvfaff, 0, "Terminal");
}
- /* The Keyboard panel. Accelerators used: [acgo] h?srvlxvnpmiet */
+ /* The Keyboard panel. Accelerators used: [acgo] h?srvlxvnpmietu */
{
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
beginbox(&cp, "Application keypad settings:",
IDC_BOX_KEYBOARD2, IDC_BOXT_KEYBOARD2);
checkbox(&cp,
- "Application ke&ypad and cursor keys totally disabled",
- IDC_NOAPPLIC);
+ "Application c&ursor keys totally disabled",
+ IDC_NOAPPLICC);
radioline(&cp, "Initial state of cursor keys:", IDC_CURSTATIC, 2,
"&Normal", IDC_CURNORMAL,
"A&pplication", IDC_CURAPPLIC, NULL);
+ checkbox(&cp,
+ "Application ke&ypad keys totally disabled",
+ IDC_NOAPPLICK);
radioline(&cp, "Initial state of numeric keypad:", IDC_KPSTATIC, 3,
"Nor&mal", IDC_KPNORMAL,
"Appl&ication", IDC_KPAPPLIC,
treeview_insert(&tvfaff, 1, "Keyboard");
}
- /* The Window panel. Accelerators used: [acgo] bsdkw4ylp */
+ /* The Window panel. Accelerators used: [acgo] bsdkw4ylpt */
{
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
checkbox(&cp, "Window closes on ALT-F&4", IDC_ALTF4);
checkbox(&cp, "S&ystem menu appears on ALT-Space", IDC_ALTSPACE);
checkbox(&cp, "System menu appears on A< alone", IDC_ALTONLY);
+ checkbox(&cp, "Ensure window is always on &top", IDC_ALWAYSONTOP);
endbox(&cp);
treeview_insert(&tvfaff, 0, "Window");
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
bartitle(&cp, "Options controlling PuTTY's appearance",
- IDC_TITLE_WINDOW);
+ IDC_TITLE_APPEARANCE);
beginbox(&cp, "Adjust the use of the cursor",
IDC_BOX_APPEARANCE1, IDC_BOXT_APPEARANCE1);
checkbox(&cp, "Cursor &blinks", IDC_BLINKCUR);
beginbox(&cp, "Protocol options",
IDC_BOX_SSH3, IDC_BOXT_SSH3);
checkbox(&cp, "Don't allocate a &pseudo-terminal", IDC_NOPTY);
+ checkbox(&cp, "Enable compr&ession", IDC_COMPRESS);
radioline(&cp, "Preferred SSH protocol version:",
IDC_SSHPROTSTATIC, 2,
"&1", IDC_SSHPROT1, "&2", IDC_SSHPROT2, NULL);
sizeof(cfg.host)-1);
break;
case IDC_PORT:
- if (HIWORD(wParam) == EN_CHANGE)
- MyGetDlgItemInt (hwnd, IDC_PORT, &cfg.port);
+ if (HIWORD(wParam) == EN_CHANGE) {
+ GetDlgItemText (hwnd, IDC_PORT, portname, 31);
+ if (isdigit(portname[0]))
+ MyGetDlgItemInt (hwnd, IDC_PORT, &cfg.port);
+ else {
+ service = getservbyname(portname, NULL);
+ if (service) cfg.port = ntohs(service->s_port);
+ else cfg.port = 0;
+ }
+ }
break;
case IDC_SESSEDIT:
if (HIWORD(wParam) == EN_CHANGE) {
init_dlg_ctrls(hwnd);
if (!isdef)
SetDlgItemText(hwnd, IDC_SESSEDIT, sessions[n]);
+ else
+ SetDlgItemText(hwnd, IDC_SESSEDIT, "");
}
if (LOWORD(wParam) == IDC_SESSLIST) {
/*
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.app_cursor = IsDlgButtonChecked (hwnd, IDC_CURAPPLIC);
break;
- case IDC_NOAPPLIC:
+ case IDC_NOAPPLICC:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.no_applic_c = IsDlgButtonChecked (hwnd, IDC_NOAPPLICC);
+ break;
+ case IDC_NOAPPLICK:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
- cfg.no_applic = IsDlgButtonChecked (hwnd, IDC_NOAPPLIC);
+ cfg.no_applic_k = IsDlgButtonChecked (hwnd, IDC_NOAPPLICK);
break;
case IDC_ALTF4:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.ldisc_term = IsDlgButtonChecked (hwnd, IDC_LDISCTERM);
break;
+ case IDC_ALWAYSONTOP:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.alwaysontop = IsDlgButtonChecked (hwnd, IDC_ALWAYSONTOP);
+ break;
case IDC_SCROLLKEY:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
GetDlgItemText (hwnd, IDC_TTEDIT, cfg.termtype,
sizeof(cfg.termtype)-1);
break;
+ case IDC_LGFEDIT:
+ if (HIWORD(wParam) == EN_CHANGE)
+ GetDlgItemText (hwnd, IDC_LGFEDIT, cfg.logfilename,
+ sizeof(cfg.logfilename)-1);
+ break;
+ case IDC_LGFBUTTON:
+ 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 session log file";
+ of.Flags = 0;
+ if (GetSaveFileName(&of)) {
+ strcpy(cfg.keyfile, filename);
+ SetDlgItemText (hwnd, IDC_LGFEDIT, cfg.keyfile);
+ }
+ break;
+ case IDC_LSTATOFF:
+ case IDC_LSTATASCII:
+ case IDC_LSTATRAW:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED) {
+ if (IsDlgButtonChecked (hwnd, IDC_LSTATOFF)) cfg.logtype = 0;
+ if (IsDlgButtonChecked (hwnd, IDC_LSTATASCII)) cfg.logtype = 1;
+ if (IsDlgButtonChecked (hwnd, IDC_LSTATRAW)) cfg.logtype = 2;
+ }
+ break;
case IDC_TSEDIT:
if (HIWORD(wParam) == EN_CHANGE)
GetDlgItemText (hwnd, IDC_TSEDIT, cfg.termspeed,
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.nopty = IsDlgButtonChecked (hwnd, IDC_NOPTY);
break;
+ case IDC_COMPRESS:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.compression = IsDlgButtonChecked (hwnd, IDC_COMPRESS);
+ break;
case IDC_BUGGYMAC:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
int n, i;
cfg.bold_colour = IsDlgButtonChecked (hwnd, IDC_BOLDCOLOUR);
n = SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_GETCOUNT, 0, 0);
- if (cfg.bold_colour && n!=22) {
- for (i=0; i<22; i++)
- if (!permcolour[i])
- SendDlgItemMessage (hwnd, IDC_COLOURLIST,
- LB_INSERTSTRING, i,
- (LPARAM) colours[i]);
- } else if (!cfg.bold_colour && n!=12) {
- for (i=22; i-- ;)
- if (!permcolour[i])
- SendDlgItemMessage (hwnd, IDC_COLOURLIST,
+ if (n != 12+10*cfg.bold_colour) {
+ for (i=n; i-- >0 ;)
+ SendDlgItemMessage (hwnd, IDC_COLOURLIST,
LB_DELETESTRING, i, 0);
+ for (i=0; i<22; i++)
+ if (cfg.bold_colour || permcolour[i])
+ SendDlgItemMessage (hwnd, IDC_COLOURLIST,
+ LB_ADDSTRING, 0,
+ (LPARAM) colours[i]);
}
}
break;
ret = DialogBox (hinst, MAKEINTRESOURCE(IDD_RECONF), hwnd, ReconfDlgProc);
if (!ret)
cfg = backup_cfg; /* structure copy */
- else
- force_normal(hwnd);
return ret;
}
store_host_key(host, port, keytype, keystr);
}
}
+
+/*
+ * Ask whether to wipe a session log file before writing to it.
+ * Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
+ */
+int askappend(char *filename) {
+ static const char mbtitle[] = "PuTTY Log to File";
+ static const char msgtemplate[] =
+ "The session log file \"%.*s\" already exists.\n"
+ "You can overwrite it with a new session log,\n"
+ "append your session log to the end of it,\n"
+ "or disable session logging for this session.\n"
+ "Hit Yes to wipe the file, No to append to it,\n"
+ "or Cancel to disable logging.";
+ char message[sizeof(msgtemplate) + FILENAME_MAX];
+ int mbret;
+ sprintf(message, msgtemplate, FILENAME_MAX, filename);
+
+ mbret = MessageBox(NULL, message, mbtitle,
+ MB_ICONQUESTION | MB_YESNOCANCEL);
+ if (mbret == IDYES)
+ return 2;
+ else if (mbret == IDNO)
+ return 1;
+ else
+ return 0;
+}