Borland makefile should now work sanely with the free-beer bcc55

[u/mdw/putty] / win_res.rc

diff --git a/win_res.rc b/win_res.rc
index 8ed6ebd..093ffef 100644 (file)
--- a/win_res.rc
+++ b/win_res.rc
@@ -1,6 +1,12 @@
+/* Some compilers, like Borland, don't have winresrc.h */
+#ifndef NO_WINRESRC_H
 #include <winresrc.h>
+#endif
 
+/* Some systems don't define this, so I do it myself if necessary */
+#ifndef TCS_MULTILINE
 #define TCS_MULTILINE 0x0200
+#endif
 
 #include "win_res.h"
 
@@ -27,8 +33,13 @@ BEGIN
     DEFPUSHBUTTON "&Open", IDOK, 86, 199, 44, 14
     PUSHBUTTON "&Cancel", IDCANCEL, 133, 199, 44, 14
     PUSHBUTTON "&About", IDC_ABOUT, 3, 199, 44, 14, NOT WS_TABSTOP
-    CONTROL "", IDC_TAB, L"SysTabControl32", TCS_MULTILINE | WS_TABSTOP,
-       3, 3, 174, 193
+    CONTROL "", IDC_TAB,
+#ifdef ASCIICTLS
+        "SysTabControl32",
+#else
+        L"SysTabControl32",
+#endif
+       TCS_MULTILINE | WS_TABSTOP, 3, 3, 174, 193
 END
 
 IDD_RECONF DIALOG DISCARDABLE 0, 0, 180, 216
@@ -38,8 +49,13 @@ FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON "&Apply", IDOK, 86, 199, 44, 14
     PUSHBUTTON "&Cancel", IDCANCEL, 133, 199, 44, 14
-    CONTROL "", IDC_TAB, L"SysTabControl32", TCS_MULTILINE | WS_TABSTOP,
-       3, 3, 174, 193
+    CONTROL "", IDC_TAB,
+#ifdef ASCIICTLS
+        "SysTabControl32",
+#else
+        L"SysTabControl32",
+#endif
+       TCS_MULTILINE | WS_TABSTOP, 3, 3, 174, 193
 END
 
 IDD_PANEL0 DIALOG DISCARDABLE 6, 30, 168, 163
@@ -77,28 +93,36 @@ STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
 FONT 8, "MS Sans Serif"
 BEGIN
     LTEXT "Action of Backspace:", IDC1_DELSTATIC, 3, 3, 162, 8
-    AUTORADIOBUTTON "Control-&H (ASCII 8)", IDC1_DEL008, 3, 12, 162, 10, WS_GROUP
-    AUTORADIOBUTTON "Control-&? (ASCII 127)", IDC1_DEL127, 3, 22, 162, 10
-    LTEXT "Action of Home and End:", IDC1_HOMESTATIC, 3, 35, 162, 8
-    AUTORADIOBUTTON "&Standard (ESC [ 1 ~ and ESC [ 4 ~)",
-       IDC1_HOMETILDE, 3, 44, 162, 10, WS_GROUP
-    AUTORADIOBUTTON "&rxvt (ESC [ H and ESC O w)",
-       IDC1_HOMERXVT, 3, 54, 162, 10
-    LTEXT "Action of F1 through F5:", IDC1_FUNCSTATIC, 3, 67, 162, 8
-    AUTORADIOBUTTON "S&tandard (ESC [ 11 ~ through ESC [ 15 ~)",
-       IDC1_FUNCTILDE, 3, 76, 162, 10, WS_GROUP
-    AUTORADIOBUTTON "&Linux (ESC [ [ A through ESC [ [ E)",
-       IDC1_FUNCLINUX, 3, 86, 162, 10
-    LTEXT "Initial state of numeric keypad:", IDC1_KPSTATIC, 3, 99, 162, 8
-    AUTORADIOBUTTON "&Normal (depends on NumLock)",
-       IDC1_KPNORMAL, 3, 108, 162, 10, WS_GROUP
-    AUTORADIOBUTTON "A&pplication (ESC O P etc)",
-       IDC1_KPAPPLIC, 3, 118, 162, 10
-    LTEXT "Initial state of cursor keys:", IDC1_CURSTATIC, 3, 131, 162, 8
-    AUTORADIOBUTTON "Nor&mal (ESC [ A through ESC [ D)",
-       IDC1_CURNORMAL, 3, 140, 162, 10, WS_GROUP
-    AUTORADIOBUTTON "Appl&ication (ESC O A through ESC O D)",
-       IDC1_CURAPPLIC, 3, 150, 162, 10
+    AUTORADIOBUTTON "Control-&H", IDC1_DEL008, 3, 12, 50, 10, WS_GROUP
+    AUTORADIOBUTTON "Control-&? (127)", IDC1_DEL127, 62, 12, 100, 10
+    LTEXT "Action of Home and End:", IDC1_HOMESTATIC, 3, 25, 162, 8
+    AUTORADIOBUTTON "&Standard",
+       IDC1_HOMETILDE, 3, 34, 50, 10, WS_GROUP
+    AUTORADIOBUTTON "&rxvt",
+       IDC1_HOMERXVT, 62, 34, 50, 10
+    LTEXT "Action of F1 through F5:", IDC1_FUNCSTATIC, 3, 47, 162, 8
+    AUTORADIOBUTTON "S&tandard",
+       IDC1_FUNCTILDE, 3, 56, 50, 10, WS_GROUP
+    AUTORADIOBUTTON "&Linux console",
+       IDC1_FUNCLINUX, 62, 56, 100, 10
+    LTEXT "Initial state of cursor keys:", IDC1_CURSTATIC, 3, 69, 162, 8
+    AUTORADIOBUTTON "&Normal",
+       IDC1_CURNORMAL, 3, 78, 50, 10, WS_GROUP
+    AUTORADIOBUTTON "A&pplication",
+       IDC1_CURAPPLIC, 62, 78, 50, 10
+    LTEXT "Initial state of numeric keypad:", IDC1_KPSTATIC, 3, 91, 162, 8
+    AUTORADIOBUTTON "Nor&mal",
+       IDC1_KPNORMAL, 3, 100, 50, 10, WS_GROUP
+    AUTORADIOBUTTON "Appl&ication",
+       IDC1_KPAPPLIC, 62, 100, 50, 10
+    AUTORADIOBUTTON "N&etHack",
+       IDC1_KPNH, 121, 100, 50, 10
+    AUTOCHECKBOX "ALT-F&4 is special (closes window)",
+        IDC1_ALTF4, 3, 113, 162, 10
+    AUTOCHECKBOX "ALT-Space is special (S&ystem menu)",
+        IDC1_ALTSPACE, 3, 123, 162, 10
+    AUTOCHECKBOX "&Use local terminal line discipline",
+        IDC1_LDISCTERM, 3, 133, 162, 10
 END
 
 IDD_PANEL2 DIALOG DISCARDABLE 6, 30, 168, 163
@@ -167,6 +191,7 @@ BEGIN
     AUTORADIOBUTTON "&3DES", IDC3_CIPHER3DES, 46, 50, 35, 10, WS_GROUP
     AUTORADIOBUTTON "&Blowfish", IDC3_CIPHERBLOWF, 84, 50, 40, 10
     AUTORADIOBUTTON "&DES", IDC3_CIPHERDES, 127, 50, 30, 10
+    AUTOCHECKBOX "Attempt TIS authentication", IDC3_AUTHTIS, 3, 60, 162, 10
 END
 
 IDD_PANEL4 DIALOG DISCARDABLE 6, 30, 168, 163
@@ -204,9 +229,24 @@ BEGIN
     PUSHBUTTON "C&hange...", IDC5_CHANGE, 109, 140, 56, 14
 END
 
+IDD_PANEL6 DIALOG DISCARDABLE  6, 30, 168, 163
+STYLE WS_CHILD | WS_VISIBLE
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT "Character set translation:", IDC6_XLATSTATIC, 3, 3, 162, 8
+    AUTORADIOBUTTON "&None",
+       IDC6_NOXLAT, 3, 12, 162, 10, WS_GROUP
+    AUTORADIOBUTTON "&KOI8 / Win-1251",
+       IDC6_KOI8WIN1251, 3, 22, 162, 10
+    AUTORADIOBUTTON "&ISO-8859-2 / Win-1250",
+       IDC6_88592WIN1250, 3, 32, 162, 10
+    AUTOCHECKBOX "CA&PS LOCK acts as cyrillic switch",
+        IDC6_CAPSLOCKCYR, 3, 46, 162, 10
+END
+
 IDD_LOGBOX DIALOG DISCARDABLE 100, 20, 160, 119
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "PuTTY Negotiation Log"
+CAPTION "PuTTY Event Log"
 FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON "&Close", IDOK, 58, 102, 44, 14