#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>
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_TITLE_KEYBOARD,
IDC_BOX_KEYBOARD1, IDC_BOXT_KEYBOARD1,
IDC_BOX_KEYBOARD2, IDC_BOXT_KEYBOARD2,
+ IDC_BOX_KEYBOARD3, IDC_BOXT_KEYBOARD3,
IDC_DELSTATIC,
IDC_DEL008,
IDC_DEL127,
IDC_KPNORMAL,
IDC_KPAPPLIC,
IDC_KPNH,
+ IDC_NOAPPLICK,
+ IDC_NOAPPLICC,
IDC_CURSTATIC,
IDC_CURNORMAL,
IDC_CURAPPLIC,
+ IDC_COMPOSEKEY,
keyboardpanelend,
terminalpanelstart,
IDC_TITLE_TERMINAL,
IDC_BOX_TERMINAL1, IDC_BOXT_TERMINAL1,
- IDC_BOX_TERMINAL2, IDC_BOXT_TERMINAL2,
- IDC_BOX_TERMINAL3, IDC_BOXT_TERMINAL3,
IDC_WRAPMODE,
IDC_DECOM,
- IDC_DIMSTATIC,
- IDC_ROWSSTATIC,
- IDC_ROWSEDIT,
- IDC_COLSSTATIC,
- IDC_COLSEDIT,
- IDC_LOCKSIZE,
- IDC_FONTSTATIC,
- IDC_CHOOSEFONT,
IDC_LFHASCR,
IDC_BEEP,
IDC_BCE,
IDC_TITLE_WINDOW,
IDC_BOX_WINDOW1, IDC_BOXT_WINDOW1,
IDC_BOX_WINDOW2, IDC_BOXT_WINDOW2,
- IDC_BOX_WINDOW3, IDC_BOXT_WINDOW3,
- IDC_BOX_WINDOW4,
- IDC_WINNAME,
- IDC_BLINKCUR,
+ IDC_BOX_WINDOW3,
+ IDC_ROWSSTATIC,
+ IDC_ROWSEDIT,
+ IDC_COLSSTATIC,
+ IDC_COLSEDIT,
+ IDC_LOCKSIZE,
IDC_SCROLLBAR,
- IDC_WINTITLE,
- IDC_WINEDIT,
IDC_CLOSEWARN,
IDC_SAVESTATIC,
IDC_SAVEEDIT,
IDC_ALTF4,
IDC_ALTSPACE,
+ IDC_ALTONLY,
IDC_SCROLLKEY,
+ IDC_SCROLLDISP,
+ IDC_ALWAYSONTOP,
windowpanelend,
+ appearancepanelstart,
+ IDC_TITLE_APPEARANCE,
+ IDC_BOX_APPEARANCE1, IDC_BOXT_APPEARANCE1,
+ IDC_BOX_APPEARANCE2, IDC_BOXT_APPEARANCE2,
+ IDC_BOX_APPEARANCE3, IDC_BOXT_APPEARANCE3,
+ IDC_BLINKCUR,
+ IDC_FONTSTATIC,
+ IDC_CHOOSEFONT,
+ IDC_WINTITLE,
+ IDC_WINEDIT,
+ IDC_WINNAME,
+ appearancepanelend,
+
connectionpanelstart,
IDC_TITLE_CONNECTION,
IDC_BOX_CONNECTION1, IDC_BOXT_CONNECTION1,
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_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,
cfg.app_keypad ? IDC_KPAPPLIC : IDC_KPNORMAL);
CheckDlgButton (hwnd, IDC_ALTF4, cfg.alt_f4);
CheckDlgButton (hwnd, IDC_ALTSPACE, cfg.alt_space);
+ 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);
CheckDlgButton (hwnd, IDC_WRAPMODE, cfg.wrap_mode);
CheckDlgButton (hwnd, IDC_DECOM, cfg.dec_om);
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,
switch (msg) {
case WM_INITDIALOG:
+ readytogo = 0;
SetWindowLong(hwnd, GWL_USERDATA, 0);
/*
* Centre the window.
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] rmkh&dlbenu */
+ /* The Terminal panel. Accelerators used: [acgo] &dlbenu */
{
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
bartitle(&cp, "Options controlling the terminal emulation",
IDC_TITLE_TERMINAL);
- beginbox(&cp, "Set the size of the terminal window",
- IDC_BOX_TERMINAL1, IDC_BOXT_TERMINAL1);
- multiedit(&cp,
- "&Rows", IDC_ROWSSTATIC, IDC_ROWSEDIT, 50,
- "Colu&mns", IDC_COLSSTATIC, IDC_COLSEDIT, 50,
- NULL);
- checkbox(&cp, "Loc&k window size against resizing", IDC_LOCKSIZE);
- endbox(&cp);
- beginbox(&cp, "Set the font used in the terminal window",
- IDC_BOX_TERMINAL2, IDC_BOXT_TERMINAL2);
- staticbtn(&cp, "", IDC_FONTSTATIC, "C&hange...", IDC_CHOOSEFONT);
- endbox(&cp);
beginbox(&cp, "Set various terminal options",
- IDC_BOX_TERMINAL3, IDC_BOXT_TERMINAL3);
+ IDC_BOX_TERMINAL1, IDC_BOXT_TERMINAL1);
checkbox(&cp, "Auto &wrap mode initially on", IDC_WRAPMODE);
checkbox(&cp, "&DEC Origin Mode initially on", IDC_DECOM);
checkbox(&cp, "Implicit CR in every &LF", IDC_LFHASCR);
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);
treeview_insert(&tvfaff, 0, "Terminal");
}
- /* The Keyboard panel. Accelerators used: [acgo] h?srvlxvnpmie */
+ /* The Keyboard panel. Accelerators used: [acgo] h?srvlxvnpmietu */
{
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
"&Xterm R6", IDC_FUNCXTERM,
"&VT400", IDC_FUNCVT400, NULL);
endbox(&cp);
- beginbox(&cp, "Change the initial state of:",
+ beginbox(&cp, "Application keypad settings:",
IDC_BOX_KEYBOARD2, IDC_BOXT_KEYBOARD2);
+ checkbox(&cp,
+ "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,
"N&etHack", IDC_KPNH, NULL);
endbox(&cp);
+ beginbox(&cp, "Enable extra keyboard features:",
+ IDC_BOX_KEYBOARD3, IDC_BOXT_KEYBOARD3);
+ checkbox(&cp, "Application and AltGr ac&t as Compose key",
+ IDC_COMPOSEKEY);
+ endbox(&cp);
treeview_insert(&tvfaff, 1, "Keyboard");
}
- /* The Window panel. Accelerators used: [acgo] tibsdkw4y */
+ /* The Window panel. Accelerators used: [acgo] bsdkw4ylpt */
{
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
bartitle(&cp, "Options controlling PuTTY's window",
IDC_TITLE_WINDOW);
- beginbox(&cp, "Adjust the use of the window title",
+ beginbox(&cp, "Set the size of the window",
IDC_BOX_WINDOW1, IDC_BOXT_WINDOW1);
- if (dlgtype == 0)
- multiedit(&cp,
- "Initial window &title:", IDC_WINTITLE,
- IDC_WINEDIT, 100, NULL);
- checkbox(&cp, "Avoid ever using &icon title", IDC_WINNAME);
- endbox(&cp);
- beginbox(&cp, "Adjust the use of the cursor",
- IDC_BOX_WINDOW2, IDC_BOXT_WINDOW2);
- checkbox(&cp, "Cursor &blinks", IDC_BLINKCUR);
+ multiedit(&cp,
+ "&Rows", IDC_ROWSSTATIC, IDC_ROWSEDIT, 50,
+ "Colu&mns", IDC_COLSSTATIC, IDC_COLSEDIT, 50,
+ NULL);
+ checkbox(&cp, "Loc&k window size against resizing", IDC_LOCKSIZE);
endbox(&cp);
beginbox(&cp, "Control the scrollback in the window",
- IDC_BOX_WINDOW3, IDC_BOXT_WINDOW3);
+ IDC_BOX_WINDOW2, IDC_BOXT_WINDOW2);
staticedit(&cp, "Lines of &scrollback",
IDC_SAVESTATIC, IDC_SAVEEDIT, 50);
checkbox(&cp, "&Display scrollbar", IDC_SCROLLBAR);
checkbox(&cp, "Reset scrollback on &keypress", IDC_SCROLLKEY);
+ checkbox(&cp, "Reset scrollback on dis&play activity",
+ IDC_SCROLLDISP);
endbox(&cp);
- beginbox(&cp, NULL, IDC_BOX_WINDOW4, 0);
+ beginbox(&cp, NULL, IDC_BOX_WINDOW3, 0);
checkbox(&cp, "&Warn before closing window", IDC_CLOSEWARN);
checkbox(&cp, "Window closes on ALT-F&4", IDC_ALTF4);
- checkbox(&cp, "S&ystem menu appears on ALT-Space)", IDC_ALTSPACE);
+ 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");
}
+ /* The Appearance panel. Accelerators used: [acgo] rmkhti */
+ {
+ struct ctlpos cp;
+ ctlposinit(&cp, hwnd, 80, 3, 13);
+ bartitle(&cp, "Options controlling PuTTY's appearance",
+ IDC_TITLE_APPEARANCE);
+ beginbox(&cp, "Adjust the use of the cursor",
+ IDC_BOX_APPEARANCE1, IDC_BOXT_APPEARANCE1);
+ checkbox(&cp, "Cursor &blinks", IDC_BLINKCUR);
+ endbox(&cp);
+ beginbox(&cp, "Set the font used in the terminal window",
+ IDC_BOX_APPEARANCE2, IDC_BOXT_APPEARANCE2);
+ staticbtn(&cp, "", IDC_FONTSTATIC, "C&hange...", IDC_CHOOSEFONT);
+ endbox(&cp);
+ beginbox(&cp, "Adjust the use of the window title",
+ IDC_BOX_APPEARANCE3, IDC_BOXT_APPEARANCE3);
+ if (dlgtype == 0)
+ multiedit(&cp,
+ "Initial window &title:", IDC_WINTITLE,
+ IDC_WINEDIT, 100, NULL);
+ checkbox(&cp, "Avoid ever using &icon title", IDC_WINNAME);
+ endbox(&cp);
+
+ treeview_insert(&tvfaff, 1, "Appearance");
+ }
+
/* The Translation panel. Accelerators used: [acgo] xbepnkis */
{
struct ctlpos cp;
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);
hide(hwnd, FALSE, terminalpanelstart, terminalpanelend);
if (!strcmp(buffer, "Window"))
hide(hwnd, FALSE, windowpanelstart, windowpanelend);
+ if (!strcmp(buffer, "Appearance"))
+ hide(hwnd, FALSE, appearancepanelstart, appearancepanelend);
if (!strcmp(buffer, "Connection"))
hide(hwnd, FALSE, connectionpanelstart, connectionpanelend);
if (!strcmp(buffer, "Telnet"))
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_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_k = IsDlgButtonChecked (hwnd, IDC_NOAPPLICK);
+ break;
case IDC_ALTF4:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.alt_space = IsDlgButtonChecked (hwnd, IDC_ALTSPACE);
break;
+ case IDC_ALTONLY:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.alt_only = IsDlgButtonChecked (hwnd, IDC_ALTONLY);
+ break;
case IDC_LDISCTERM:
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)
cfg.scroll_on_key = IsDlgButtonChecked (hwnd, IDC_SCROLLKEY);
break;
+ case IDC_SCROLLDISP:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.scroll_on_disp = IsDlgButtonChecked (hwnd, IDC_SCROLLDISP);
+ break;
+ case IDC_COMPOSEKEY:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.compose_key = IsDlgButtonChecked (hwnd, IDC_COMPOSEKEY);
+ break;
case IDC_WRAPMODE:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
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)
0, 0);
if (!cfg.bold_colour)
i = (i < 3 ? i*2 : i == 3 ? 5 : i*2-2);
-debug(("ooh\n"));
SetDlgItemInt (hwnd, IDC_RVALUE, cfg.colours[i][0], FALSE);
SetDlgItemInt (hwnd, IDC_GVALUE, cfg.colours[i][1], FALSE);
SetDlgItemInt (hwnd, IDC_BVALUE, cfg.colours[i][2], FALSE);
projects / u / mdw / putty / blobdiff