static const char *const puttystr = PUTTY_REG_POS "\\Sessions";
-static char **negots = NULL;
-static int nnegots = 0, negsize = 0;
+static char **events = NULL;
+static int nevents = 0, negsize = 0;
+
static HWND logbox = NULL, abtbox = NULL;
static char hex[16] = "0123456789ABCDEF";
wppi (sesskey, "LinuxFunctionKeys", cfg.linux_funkeys);
wppi (sesskey, "ApplicationCursorKeys", cfg.app_cursor);
wppi (sesskey, "ApplicationKeypad", cfg.app_keypad);
+ wppi (sesskey, "NetHackKeypad", cfg.nethack_keypad);
+ wppi (sesskey, "AltF4", cfg.alt_f4);
+ wppi (sesskey, "AltSpace", cfg.alt_space);
+ wppi (sesskey, "LdiscTerm", cfg.ldisc_term);
wppi (sesskey, "ScrollbackLines", cfg.savelines);
wppi (sesskey, "DECOriginMode", cfg.dec_om);
wppi (sesskey, "AutoWrapMode", cfg.wrap_mode);
wpps (sesskey, buf, buf2);
}
wppi (sesskey, "KoiWinXlat", cfg.xlat_enablekoiwin);
+ wppi (sesskey, "88592Xlat", cfg.xlat_88592w1250);
wppi (sesskey, "CapsLockCyr", cfg.xlat_capslockcyr);
RegCloseKey(sesskey);
gppi (sesskey, "LinuxFunctionKeys", 0, &cfg.linux_funkeys);
gppi (sesskey, "ApplicationCursorKeys", 0, &cfg.app_cursor);
gppi (sesskey, "ApplicationKeypad", 0, &cfg.app_keypad);
+ gppi (sesskey, "NetHackKeypad", 0, &cfg.nethack_keypad);
+ gppi (sesskey, "AltF4", 1, &cfg.alt_f4);
+ gppi (sesskey, "AltSpace", 0, &cfg.alt_space);
+ gppi (sesskey, "LdiscTerm", 0, &cfg.ldisc_term);
gppi (sesskey, "ScrollbackLines", 200, &cfg.savelines);
gppi (sesskey, "DECOriginMode", 0, &cfg.dec_om);
gppi (sesskey, "AutoWrapMode", 1, &cfg.wrap_mode);
gppi (sesskey, "FontIsBold", 0, &cfg.fontisbold);
gppi (sesskey, "FontCharSet", ANSI_CHARSET, &cfg.fontcharset);
gppi (sesskey, "FontHeight", 10, &cfg.fontheight);
- gppi (sesskey, "FontVTMode", VT_POORMAN, &cfg.vtmode);
+ gppi (sesskey, "FontVTMode", VT_POORMAN, (int *)&cfg.vtmode);
gppi (sesskey, "TryPalette", 0, &cfg.try_palette);
gppi (sesskey, "BoldAsColour", 1, &cfg.bold_colour);
for (i=0; i<22; i++) {
"85,255,255", "187,187,187", "255,255,255"
};
char buf[20], buf2[30];
+ int c0, c1, c2;
sprintf(buf, "Colour%d", i);
gpps (sesskey, buf, defaults[i], buf2, sizeof(buf2));
- sscanf(buf2, "%d,%d,%d", &cfg.colours[i][0],
- &cfg.colours[i][1], &cfg.colours[i][2]);
+ if(sscanf(buf2, "%d,%d,%d", &c0, &c1, &c2) == 3) {
+ cfg.colours[i][0] = c0;
+ cfg.colours[i][1] = c1;
+ cfg.colours[i][2] = c2;
+ }
}
gppi (sesskey, "MouseIsXterm", 0, &cfg.mouse_is_xterm);
for (i=0; i<256; i+=32) {
}
}
gppi (sesskey, "KoiWinXlat", 0, &cfg.xlat_enablekoiwin);
+ gppi (sesskey, "88592Xlat", 0, &cfg.xlat_88592w1250);
gppi (sesskey, "CapsLockCyr", 0, &cfg.xlat_capslockcyr);
RegCloseKey(sesskey);
switch (msg) {
case WM_INITDIALOG:
- for (i=0; i<nnegots; i++)
+ for (i=0; i<nevents; i++)
SendDlgItemMessage (hwnd, IDN_LIST, LB_ADDSTRING,
- 0, (LPARAM)negots[i]);
+ 0, (LPARAM)events[i]);
return 1;
/* case WM_CTLCOLORDLG: */
/* return (int) GetStockObject (LTGRAY_BRUSH); */
cfg.linux_funkeys ? IDC1_FUNCLINUX : IDC1_FUNCTILDE);
CheckRadioButton (hwnd, IDC1_CURNORMAL, IDC1_CURAPPLIC,
cfg.app_cursor ? IDC1_CURAPPLIC : IDC1_CURNORMAL);
- CheckRadioButton (hwnd, IDC1_KPNORMAL, IDC1_KPAPPLIC,
+ CheckRadioButton (hwnd, IDC1_KPNORMAL, IDC1_KPNH,
+ cfg.nethack_keypad ? IDC1_KPNH :
cfg.app_keypad ? IDC1_KPAPPLIC : IDC1_KPNORMAL);
+ CheckDlgButton (hwnd, IDC1_ALTF4, cfg.alt_f4);
+ CheckDlgButton (hwnd, IDC1_ALTSPACE, cfg.alt_space);
+ CheckDlgButton (hwnd, IDC1_LDISCTERM, cfg.ldisc_term);
break;
case WM_COMMAND:
if (HIWORD(wParam) == BN_CLICKED ||
case IDC1_KPNORMAL:
case IDC1_KPAPPLIC:
cfg.app_keypad = IsDlgButtonChecked (hwnd, IDC1_KPAPPLIC);
+ cfg.nethack_keypad = FALSE;
+ break;
+ case IDC1_KPNH:
+ cfg.app_keypad = FALSE;
+ cfg.nethack_keypad = TRUE;
break;
case IDC1_CURNORMAL:
case IDC1_CURAPPLIC:
cfg.app_cursor = IsDlgButtonChecked (hwnd, IDC1_CURAPPLIC);
break;
+ case IDC1_ALTF4:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.alt_f4 = IsDlgButtonChecked (hwnd, IDC1_ALTF4);
+ break;
+ case IDC1_ALTSPACE:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.alt_space = IsDlgButtonChecked (hwnd, IDC1_ALTSPACE);
+ break;
+ case IDC1_LDISCTERM:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.ldisc_term = IsDlgButtonChecked (hwnd, IDC1_LDISCTERM);
+ break;
}
}
return GeneralPanelProc (hwnd, msg, wParam, lParam);
i = (i < 3 ? i*2 : i == 3 ? 5 : i*2-2);
cc.lStructSize = sizeof(cc);
cc.hwndOwner = hwnd;
- cc.hInstance = hinst;
+ cc.hInstance = (HWND)hinst;
cc.lpCustColors = custom;
cc.rgbResult = RGB (cfg.colours[i][0], cfg.colours[i][1],
cfg.colours[i][2]);
WPARAM wParam, LPARAM lParam) {
switch (msg) {
case WM_INITDIALOG:
- CheckDlgButton (hwnd, IDC6_ENABLEKOIWINXLAT, cfg.xlat_enablekoiwin);
+ CheckRadioButton (hwnd, IDC6_NOXLAT, IDC6_88592WIN1250,
+ cfg.xlat_88592w1250 ? IDC6_88592WIN1250 :
+ cfg.xlat_enablekoiwin ? IDC6_KOI8WIN1251 :
+ IDC6_NOXLAT);
CheckDlgButton (hwnd, IDC6_CAPSLOCKCYR, cfg.xlat_capslockcyr);
case WM_COMMAND:
switch (LOWORD(wParam)) {
- case IDC6_ENABLEKOIWINXLAT:
- if (HIWORD(wParam) == BN_CLICKED ||
- HIWORD(wParam) == BN_DOUBLECLICKED) {
- cfg.xlat_enablekoiwin =
- IsDlgButtonChecked (hwnd, IDC6_ENABLEKOIWINXLAT);
- }
+ case IDC6_NOXLAT:
+ case IDC6_KOI8WIN1251:
+ case IDC6_88592WIN1250:
+ cfg.xlat_enablekoiwin =
+ IsDlgButtonChecked (hwnd, IDC6_KOI8WIN1251);
+ cfg.xlat_88592w1250 =
+ IsDlgButtonChecked (hwnd, IDC6_88592WIN1250);
break;
case IDC6_CAPSLOCKCYR:
if (HIWORD(wParam) == BN_CLICKED ||
load_settings ("Default Settings", FALSE);
}
-void lognegot (char *string) {
- if (nnegots >= negsize) {
+void logevent (char *string) {
+ if (nevents >= negsize) {
negsize += 64;
- negots = srealloc (negots, negsize * sizeof(*negots));
+ events = srealloc (events, negsize * sizeof(*events));
}
- negots[nnegots] = smalloc(1+strlen(string));
- strcpy (negots[nnegots], string);
- nnegots++;
+ events[nevents] = smalloc(1+strlen(string));
+ strcpy (events[nevents], string);
+ nevents++;
if (logbox)
SendDlgItemMessage (logbox, IDN_LIST, LB_ADDSTRING,
0, (LPARAM)string);
}
-void shownegot (HWND hwnd) {
+void showeventlog (HWND hwnd) {
if (!logbox) {
logbox = CreateDialog (hinst, MAKEINTRESOURCE(IDD_LOGBOX),
hwnd, LogProc);