#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>
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_CURSTATIC,
IDC_CURNORMAL,
IDC_CURAPPLIC,
+ IDC_COMPOSEKEY,
keyboardpanelend,
terminalpanelstart,
IDC_SAVEEDIT,
IDC_ALTF4,
IDC_ALTSPACE,
+ IDC_ALTONLY,
IDC_SCROLLKEY,
+ IDC_SCROLLDISP,
windowpanelend,
connectionpanelstart,
IDC_BOX_COLOURS2, IDC_BOXT_COLOURS2,
IDC_BOLDCOLOUR,
IDC_PALETTE,
- IDC_STATIC,
- IDC_LIST,
+ IDC_COLOURSTATIC,
+ IDC_COLOURLIST,
IDC_RSTATIC,
IDC_GSTATIC,
IDC_BSTATIC,
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_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);
int i;
for (i=0; i<22; i++)
if (cfg.bold_colour || permcolour[i])
- SendDlgItemMessage (hwnd, IDC_LIST, LB_ADDSTRING, 0,
+ SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_ADDSTRING, 0,
(LPARAM) colours[i]);
}
- SendDlgItemMessage (hwnd, IDC_LIST, LB_SETCURSEL, 0, 0);
+ SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_SETCURSEL, 0, 0);
SetDlgItemInt (hwnd, IDC_RVALUE, cfg.colours[0][0], FALSE);
SetDlgItemInt (hwnd, IDC_GVALUE, cfg.colours[0][1], FALSE);
SetDlgItemInt (hwnd, IDC_BVALUE, cfg.colours[0][2], FALSE);
switch (msg) {
case WM_INITDIALOG:
+ readytogo = 0;
SetWindowLong(hwnd, GWL_USERDATA, 0);
/*
* Centre the window.
endbox(&cp);
beginbox(&cp, "Load, save or delete a stored session",
IDC_BOX_SESSION2, IDC_BOXT_SESSION2);
- sesssaver(&cp, "Stor&ed Sessions",
+ sesssaver(&cp, "Sav&ed Sessions",
IDC_SESSSTATIC, IDC_SESSEDIT, IDC_SESSLIST,
"&Load", IDC_SESSLOAD,
"&Save", IDC_SESSSAVE,
treeview_insert(&tvfaff, 0, "Terminal");
}
- /* The Keyboard panel. Accelerators used: [acgo] h?srvlxvnpmie */
+ /* The Keyboard panel. Accelerators used: [acgo] h?srvlxvnpmiet */
{
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
"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] tibsdkw4ylp */
{
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
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);
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);
endbox(&cp);
treeview_insert(&tvfaff, 0, "Window");
beginbox(&cp, "Adjust the precise colours PuTTY displays",
IDC_BOX_COLOURS2, IDC_BOXT_COLOURS2);
colouredit(&cp, "Select a colo&ur and then click to modify it:",
- IDC_STATIC, IDC_LIST,
+ IDC_COLOURSTATIC, IDC_COLOURLIST,
"&Modify...", IDC_CHANGE,
"Red:", IDC_RSTATIC, IDC_RVALUE,
"Green:", IDC_GSTATIC, IDC_GVALUE,
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)
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) {
int n, i;
cfg.bold_colour = IsDlgButtonChecked (hwnd, IDC_BOLDCOLOUR);
- n = SendDlgItemMessage (hwnd, IDC_LIST, LB_GETCOUNT, 0, 0);
+ 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_LIST,
+ 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_LIST,
+ SendDlgItemMessage (hwnd, IDC_COLOURLIST,
LB_DELETESTRING, i, 0);
}
}
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.try_palette = IsDlgButtonChecked (hwnd, IDC_PALETTE);
break;
- case IDC_LIST:
+ case IDC_COLOURLIST:
if (HIWORD(wParam) == LBN_DBLCLK ||
HIWORD(wParam) == LBN_SELCHANGE) {
- int i = SendDlgItemMessage (hwnd, IDC_LIST, LB_GETCURSEL,
+ int i = SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_GETCURSEL,
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);
HIWORD(wParam) == BN_DOUBLECLICKED) {
static CHOOSECOLOR cc;
static DWORD custom[16] = {0}; /* zero initialisers */
- int i = SendDlgItemMessage (hwnd, IDC_LIST, LB_GETCURSEL,
+ int i = SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_GETCURSEL,
0, 0);
if (!cfg.bold_colour)
i = (i < 3 ? i*2 : i == 3 ? 5 : i*2-2);