Rethink the whole line discipline architecture. Instead of having
[u/mdw/putty] / windlg.c
index f3f7dfc..12bff5d 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -13,8 +13,6 @@
 static char **events = NULL;
 static int nevents = 0, negsize = 0;
 
-static HWND logbox = NULL, abtbox = NULL;
-
 static int readytogo;
 
 void force_normal(HWND hwnd)
@@ -56,7 +54,9 @@ static int CALLBACK LogProc (HWND hwnd, UINT msg,
       case WM_COMMAND:
        switch (LOWORD(wParam)) {
          case IDOK:
+         case IDCANCEL:
            logbox = NULL;
+            SetActiveWindow(GetParent(hwnd));
            DestroyWindow (hwnd);
            return 0;
           case IDN_COPY:
@@ -111,6 +111,7 @@ static int CALLBACK LogProc (HWND hwnd, UINT msg,
        return 0;
       case WM_CLOSE:
        logbox = NULL;
+        SetActiveWindow(GetParent(hwnd));
        DestroyWindow (hwnd);
        return 0;
     }
@@ -145,8 +146,8 @@ static int CALLBACK AboutProc (HWND hwnd, UINT msg,
       case WM_COMMAND:
        switch (LOWORD(wParam)) {
          case IDOK:
-           abtbox = NULL;
-           DestroyWindow (hwnd);
+          case IDCANCEL:
+            EndDialog(hwnd, TRUE);
            return 0;
          case IDA_LICENCE:
            EnableWindow(hwnd, 0);
@@ -158,8 +159,7 @@ static int CALLBACK AboutProc (HWND hwnd, UINT msg,
        }
        return 0;
       case WM_CLOSE:
-       abtbox = NULL;
-       DestroyWindow (hwnd);
+        EndDialog(hwnd, TRUE);
        return 0;
     }
     return 0;
@@ -179,8 +179,8 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
 
     sessionpanelstart,
     IDC_TITLE_SESSION,
-    IDC_BOX_SESSION1, IDC_BOXT_SESSION1,
-    IDC_BOX_SESSION2, IDC_BOXT_SESSION2,
+    IDC_BOX_SESSION1,
+    IDC_BOX_SESSION2,
     IDC_BOX_SESSION3,
     IDC_HOSTSTATIC,
     IDC_HOST,
@@ -200,11 +200,22 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
     IDC_CLOSEEXIT,
     sessionpanelend,
 
+    loggingpanelstart,
+    IDC_BOX_LOGGING1,
+    IDC_LSTATSTATIC,
+    IDC_LSTATOFF,
+    IDC_LSTATASCII,
+    IDC_LSTATRAW,
+    IDC_LGFSTATIC,
+    IDC_LGFEDIT,
+    IDC_LGFBUTTON,
+    loggingpanelend,
+
     keyboardpanelstart,
     IDC_TITLE_KEYBOARD,
-    IDC_BOX_KEYBOARD1, IDC_BOXT_KEYBOARD1,
-    IDC_BOX_KEYBOARD2, IDC_BOXT_KEYBOARD2,
-    IDC_BOX_KEYBOARD3, IDC_BOXT_KEYBOARD3,
+    IDC_BOX_KEYBOARD1,
+    IDC_BOX_KEYBOARD2,
+    IDC_BOX_KEYBOARD3,
     IDC_DELSTATIC,
     IDC_DEL008,
     IDC_DEL127,
@@ -230,28 +241,28 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
 
     terminalpanelstart,
     IDC_TITLE_TERMINAL,
-    IDC_BOX_TERMINAL1, IDC_BOXT_TERMINAL1,
-    IDC_BOX_TERMINAL2, IDC_BOXT_TERMINAL2,
+    IDC_BOX_TERMINAL1,
+    IDC_BOX_TERMINAL2,
     IDC_WRAPMODE,
     IDC_DECOM,
     IDC_LFHASCR,
     IDC_BEEP,
     IDC_BCE,
     IDC_BLINKTEXT,
-    IDC_LDISCTERM,
-    IDC_LSTATSTATIC,
-    IDC_LSTATOFF,
-    IDC_LSTATASCII,
-    IDC_LSTATRAW,
-    IDC_LGFSTATIC,
-    IDC_LGFEDIT,
-    IDC_LGFBUTTON,
+    IDC_ECHOSTATIC,
+    IDC_ECHOBACKEND,
+    IDC_ECHOYES,
+    IDC_ECHONO,
+    IDC_EDITSTATIC,
+    IDC_EDITBACKEND,
+    IDC_EDITYES,
+    IDC_EDITNO,
     terminalpanelend,
 
     windowpanelstart,
     IDC_TITLE_WINDOW,
-    IDC_BOX_WINDOW1, IDC_BOXT_WINDOW1,
-    IDC_BOX_WINDOW2, IDC_BOXT_WINDOW2,
+    IDC_BOX_WINDOW1,
+    IDC_BOX_WINDOW2,
     IDC_BOX_WINDOW3,
     IDC_ROWSSTATIC,
     IDC_ROWSEDIT,
@@ -272,9 +283,10 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
 
     appearancepanelstart,
     IDC_TITLE_APPEARANCE,
-    IDC_BOX_APPEARANCE1, IDC_BOXT_APPEARANCE1,
-    IDC_BOX_APPEARANCE2, IDC_BOXT_APPEARANCE2,
-    IDC_BOX_APPEARANCE3, IDC_BOXT_APPEARANCE3,
+    IDC_BOX_APPEARANCE1,
+    IDC_BOX_APPEARANCE2,
+    IDC_BOX_APPEARANCE3,
+    IDC_BOX_APPEARANCE4,
     IDC_CURSORSTATIC,
     IDC_CURBLOCK,
     IDC_CURUNDER,
@@ -285,12 +297,13 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
     IDC_WINTITLE,
     IDC_WINEDIT,
     IDC_WINNAME,
+    IDC_HIDEMOUSE,
     appearancepanelend,
 
     connectionpanelstart,
     IDC_TITLE_CONNECTION,
-    IDC_BOX_CONNECTION1, IDC_BOXT_CONNECTION1,
-    IDC_BOX_CONNECTION2, IDC_BOXT_CONNECTION2,
+    IDC_BOX_CONNECTION1,
+    IDC_BOX_CONNECTION2,
     IDC_TTSTATIC,
     IDC_TTEDIT,
     IDC_LOGSTATIC,
@@ -301,8 +314,8 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
 
     telnetpanelstart,
     IDC_TITLE_TELNET,
-    IDC_BOX_TELNET1, IDC_BOXT_TELNET1,
-    IDC_BOX_TELNET2, IDC_BOXT_TELNET2,
+    IDC_BOX_TELNET1,
+    IDC_BOX_TELNET2,
     IDC_TSSTATIC,
     IDC_TSEDIT,
     IDC_ENVSTATIC,
@@ -320,8 +333,8 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
 
     rloginpanelstart,
     IDC_TITLE_RLOGIN,
-    IDC_BOX_RLOGIN1, IDC_BOXT_RLOGIN1,
-    IDC_BOX_RLOGIN2, IDC_BOXT_RLOGIN2,
+    IDC_BOX_RLOGIN1,
+    IDC_BOX_RLOGIN2,
     IDC_R_TSSTATIC,
     IDC_R_TSEDIT,
     IDC_RLLUSERSTATIC,
@@ -330,9 +343,9 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
 
     sshpanelstart,
     IDC_TITLE_SSH,
-    IDC_BOX_SSH1, IDC_BOXT_SSH1,
-    IDC_BOX_SSH2, IDC_BOXT_SSH2,
-    IDC_BOX_SSH3, IDC_BOXT_SSH3,
+    IDC_BOX_SSH1,
+    IDC_BOX_SSH2,
+    IDC_BOX_SSH3,
     IDC_NOPTY,
     IDC_CIPHERSTATIC,
     IDC_CIPHER3DES,
@@ -354,8 +367,8 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
 
     selectionpanelstart,
     IDC_TITLE_SELECTION,
-    IDC_BOX_SELECTION1, IDC_BOXT_SELECTION1,
-    IDC_BOX_SELECTION2, IDC_BOXT_SELECTION2,
+    IDC_BOX_SELECTION1,
+    IDC_BOX_SELECTION2,
     IDC_MBSTATIC,
     IDC_MBWINDOWS,
     IDC_MBXTERM,
@@ -368,8 +381,8 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
 
     colourspanelstart,
     IDC_TITLE_COLOURS,
-    IDC_BOX_COLOURS1, IDC_BOXT_COLOURS1,
-    IDC_BOX_COLOURS2, IDC_BOXT_COLOURS2,
+    IDC_BOX_COLOURS1,
+    IDC_BOX_COLOURS2,
     IDC_BOLDCOLOUR,
     IDC_PALETTE,
     IDC_COLOURSTATIC,
@@ -385,9 +398,9 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
 
     translationpanelstart,
     IDC_TITLE_TRANSLATION,
-    IDC_BOX_TRANSLATION1, IDC_BOXT_TRANSLATION1,
-    IDC_BOX_TRANSLATION2, IDC_BOXT_TRANSLATION2,
-    IDC_BOX_TRANSLATION3, IDC_BOXT_TRANSLATION3,
+    IDC_BOX_TRANSLATION1,
+    IDC_BOX_TRANSLATION2,
+    IDC_BOX_TRANSLATION3,
     IDC_XLATSTATIC,
     IDC_NOXLAT,
     IDC_KOI8WIN1251,
@@ -401,6 +414,14 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
     IDC_VTPOORMAN,
     translationpanelend,
 
+    tunnelspanelstart,
+    IDC_TITLE_TUNNELS,
+    IDC_BOX_TUNNELS,
+    IDC_X11_FORWARD,
+    IDC_X11_DISPSTATIC,
+    IDC_X11_DISPLAY,
+    tunnelspanelend,
+
     controlendvalue
 };
 
@@ -441,6 +462,16 @@ static void init_dlg_ctrls(HWND hwnd) {
 
     SetDlgItemText (hwnd, IDC_HOST, cfg.host);
     SetDlgItemText (hwnd, IDC_SESSEDIT, savedsession);
+    {
+       int i, n;
+       n = SendDlgItemMessage (hwnd, IDC_SESSLIST, LB_GETCOUNT, 0, 0);
+       for (i=n; i-- >0 ;)
+           SendDlgItemMessage (hwnd, IDC_SESSLIST,
+                                   LB_DELETESTRING, i, 0);
+        for (i = 0; i < nsessions; i++)
+            SendDlgItemMessage (hwnd, IDC_SESSLIST, LB_ADDSTRING,
+                                0, (LPARAM) (sessions[i]));
+    }
     SetDlgItemInt (hwnd, IDC_PORT, cfg.port, FALSE);
     CheckRadioButton (hwnd, IDC_PROTRAW, IDC_PROTSSH,
                      cfg.protocol==PROT_SSH ? IDC_PROTSSH :
@@ -469,7 +500,12 @@ static void init_dlg_ctrls(HWND hwnd) {
     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);
+    CheckRadioButton (hwnd, IDC_ECHOBACKEND, IDC_ECHONO,
+                     cfg.localecho == LD_BACKEND ? IDC_ECHOBACKEND:
+                      cfg.localecho == LD_YES ? IDC_ECHOYES : IDC_ECHONO);
+    CheckRadioButton (hwnd, IDC_EDITBACKEND, IDC_EDITNO,
+                     cfg.localedit == LD_BACKEND ? IDC_EDITBACKEND:
+                      cfg.localedit == LD_YES ? IDC_EDITYES : IDC_EDITNO);
     CheckDlgButton (hwnd, IDC_ALWAYSONTOP, cfg.alwaysontop);
     CheckDlgButton (hwnd, IDC_SCROLLKEY, cfg.scroll_on_key);
     CheckDlgButton (hwnd, IDC_SCROLLDISP, cfg.scroll_on_disp);
@@ -488,6 +524,7 @@ static void init_dlg_ctrls(HWND hwnd) {
 
     SetDlgItemText (hwnd, IDC_WINEDIT, cfg.wintitle);
     CheckDlgButton (hwnd, IDC_WINNAME, cfg.win_name_always);
+    CheckDlgButton (hwnd, IDC_HIDEMOUSE, cfg.hide_mouseptr);
     CheckRadioButton (hwnd, IDC_CURBLOCK, IDC_CURVERT,
                      cfg.cursor_type==0 ? IDC_CURBLOCK :
                      cfg.cursor_type==1 ? IDC_CURUNDER : IDC_CURVERT);
@@ -579,16 +616,9 @@ static void init_dlg_ctrls(HWND hwnd) {
                      cfg.vtmode == VT_OEMANSI ? IDC_VTOEMANSI :
                      cfg.vtmode == VT_OEMONLY ? IDC_VTOEMONLY :
                      IDC_VTPOORMAN);
-}
 
-static void hide(HWND hwnd, int hide, int minid, int maxid) {
-    int i;
-    for (i = minid; i < maxid; i++) {
-       HWND ctl = GetDlgItem(hwnd, i);
-       if (ctl) {
-           ShowWindow(ctl, hide ? SW_HIDE : SW_SHOW);
-       }
-    }
+    CheckDlgButton (hwnd, IDC_X11_FORWARD, cfg.x11_forward);
+    SetDlgItemText (hwnd, IDC_X11_DISPLAY, cfg.x11_display);
 }
 
 struct treeview_faff {
@@ -619,7 +649,398 @@ static HTREEITEM treeview_insert(struct treeview_faff *faff,
 }
 
 /*
- * This _huge_ function is the configuration box.
+ * Create the panelfuls of controls in the configuration box.
+ */
+static void create_controls(HWND hwnd, int dlgtype, int panel) {
+    if (panel == sessionpanelstart) {
+       /* The Session panel. Accelerators used: [acgo] nprthelsdx */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        bartitle(&cp, "Basic options for your PuTTY session",
+                 IDC_TITLE_SESSION);
+        if (dlgtype == 0) {
+            beginbox(&cp, "Specify your connection by host name",
+                     IDC_BOX_SESSION1);
+            multiedit(&cp,
+                      "Host &Name", IDC_HOSTSTATIC, IDC_HOST, 75,
+                      "&Port", IDC_PORTSTATIC, IDC_PORT, 25, NULL);
+            if (backends[3].backend == NULL) {
+                /* this is PuTTYtel, so only three protocols available */
+                radioline(&cp, "Protocol:", IDC_PROTSTATIC, 4,
+                          "&Raw", IDC_PROTRAW,
+                          "&Telnet", IDC_PROTTELNET,
+                          "R&login", IDC_PROTRLOGIN, NULL);
+            } else {
+                radioline(&cp, "Protocol:", IDC_PROTSTATIC, 4,
+                          "&Raw", IDC_PROTRAW,
+                          "&Telnet", IDC_PROTTELNET,
+                          "R&login", IDC_PROTRLOGIN,
+#ifdef FWHACK
+                          "SS&H/hack",
+#else
+                          "SS&H",
+#endif
+                          IDC_PROTSSH, NULL);
+            }
+            endbox(&cp);
+            beginbox(&cp, "Load, save or delete a stored session",
+                     IDC_BOX_SESSION2);
+            sesssaver(&cp, "Sav&ed Sessions",
+                      IDC_SESSSTATIC, IDC_SESSEDIT, IDC_SESSLIST,
+                      "&Load", IDC_SESSLOAD,
+                      "&Save", IDC_SESSSAVE,
+                      "&Delete", IDC_SESSDEL, NULL);
+            endbox(&cp);
+        }
+        beginbox(&cp, NULL, IDC_BOX_SESSION3);
+        checkbox(&cp, "Close Window on E&xit", IDC_CLOSEEXIT);
+        endbox(&cp);
+    }
+
+    if (panel == loggingpanelstart) {
+        /* The Logging panel. Accelerators used: [acgo] lpt */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        bartitle(&cp, "Options controlling session logging",
+                 IDC_TITLE_TERMINAL);
+        beginbox(&cp, NULL, IDC_BOX_LOGGING1);
+        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);
+    }
+
+    if (panel == terminalpanelstart) {
+        /* The Terminal panel. Accelerators used: [acgo] &dflbentuw */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        bartitle(&cp, "Options controlling the terminal emulation",
+                 IDC_TITLE_TERMINAL);
+        beginbox(&cp, "Set various terminal options",
+                 IDC_BOX_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);
+        endbox(&cp);
+
+        beginbox(&cp, "Line discipline options",
+                 IDC_BOX_TERMINAL2);
+        radioline(&cp, "Local echo:", IDC_ECHOSTATIC, 3,
+                  "A&uto", IDC_ECHOBACKEND,
+                  "Force on", IDC_ECHOYES,
+                  "Force off", IDC_ECHONO, NULL);
+        radioline(&cp, "Local line editing:", IDC_EDITSTATIC, 3,
+                  "Au&to", IDC_EDITBACKEND,
+                  "Force on", IDC_EDITYES,
+                  "Force off", IDC_EDITNO, NULL);
+        endbox(&cp);
+    }
+
+    if (panel == keyboardpanelstart) {
+        /* The Keyboard panel. Accelerators used: [acgo] h?srvlxvnpmietu */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        bartitle(&cp, "Options controlling the effects of keys",
+                 IDC_TITLE_KEYBOARD);
+        beginbox(&cp, "Change the sequences sent by:",
+                 IDC_BOX_KEYBOARD1);
+        radioline(&cp, "The Backspace key", IDC_DELSTATIC, 2,
+                  "Control-&H", IDC_DEL008,
+                  "Control-&? (127)", IDC_DEL127, NULL);
+        radioline(&cp, "The Home and End keys", IDC_HOMESTATIC, 2,
+                  "&Standard", IDC_HOMETILDE,
+                  "&rxvt", IDC_HOMERXVT, NULL);
+        radioline(&cp, "The Function keys and keypad", IDC_FUNCSTATIC, 4,
+                  "ESC[n&~", IDC_FUNCTILDE,
+                  "&Linux", IDC_FUNCLINUX,
+                  "&Xterm R6", IDC_FUNCXTERM,
+                  "&VT400", IDC_FUNCVT400, NULL);
+        endbox(&cp);
+        beginbox(&cp, "Application keypad settings:",
+                 IDC_BOX_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);
+        checkbox(&cp, "Application and AltGr ac&t as Compose key",
+                 IDC_COMPOSEKEY);
+        endbox(&cp);
+    }
+
+    if (panel == windowpanelstart) {
+        /* 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, "Set the size of the window",
+                 IDC_BOX_WINDOW1);
+        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_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_WINDOW3);
+        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, "System menu appears on A&LT alone", IDC_ALTONLY);
+        checkbox(&cp, "Ensure window is always on &top", IDC_ALWAYSONTOP);
+        endbox(&cp);
+    }
+
+    if (panel == appearancepanelstart) {
+        /* The Appearance panel. Accelerators used: [acgo] rmkhtibluv */
+        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);
+        radioline(&cp, "Cursor appearance:", IDC_CURSORSTATIC, 3,
+                  "B&lock", IDC_CURBLOCK,
+                  "&Underline", IDC_CURUNDER,
+                  "&Vertical line", IDC_CURVERT,
+                  NULL);
+        checkbox(&cp, "Cursor &blinks", IDC_BLINKCUR);
+        endbox(&cp);
+        beginbox(&cp, "Set the font used in the terminal window",
+                 IDC_BOX_APPEARANCE2);
+        staticbtn(&cp, "", IDC_FONTSTATIC, "C&hange...", IDC_CHOOSEFONT);
+        endbox(&cp);
+        beginbox(&cp, "Adjust the use of the window title",
+                 IDC_BOX_APPEARANCE3);
+        multiedit(&cp,
+                  "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 mouse pointer",
+                 IDC_BOX_APPEARANCE4);
+        checkbox(&cp, "Hide mouse &pointer when typing in window",
+                 IDC_HIDEMOUSE);
+        endbox(&cp);
+    }
+
+    if (panel == translationpanelstart) {
+        /* The Translation panel. Accelerators used: [acgo] xbepnkis */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        bartitle(&cp, "Options controlling character set translation",
+                 IDC_TITLE_TRANSLATION);
+        beginbox(&cp, "Adjust how PuTTY displays line drawing characters",
+                 IDC_BOX_TRANSLATION1);
+        radiobig(&cp,
+                 "Handling of line drawing characters:", IDC_VTSTATIC,
+                 "Font has &XWindows encoding", IDC_VTXWINDOWS,
+                 "Use font in &both ANSI and OEM modes", IDC_VTOEMANSI,
+                 "Use font in O&EM mode only", IDC_VTOEMONLY,
+                 "&Poor man's line drawing (""+"", ""-"" and ""|"")",
+                 IDC_VTPOORMAN, NULL);
+        endbox(&cp);
+        beginbox(&cp, "Enable character set translation on received data",
+                 IDC_BOX_TRANSLATION2);
+        radiobig(&cp,
+                 "Character set translation:", IDC_XLATSTATIC,
+                 "&None", IDC_NOXLAT,
+                 "&KOI8 / Win-1251", IDC_KOI8WIN1251,
+                 "&ISO-8859-2 / Win-1250", IDC_88592WIN1250,
+                 "&ISO-8859-2 / CP852", IDC_88592CP852, NULL);
+        endbox(&cp);
+        beginbox(&cp, "Enable character set translation on input data",
+                 IDC_BOX_TRANSLATION3);
+        checkbox(&cp, "CAP&S LOCK acts as cyrillic switch",
+                 IDC_CAPSLOCKCYR);
+        endbox(&cp);
+    }
+
+    if (panel == selectionpanelstart) {
+        /* The Selection panel. Accelerators used: [acgo] wxst */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        bartitle(&cp, "Options controlling copy and paste",
+                 IDC_TITLE_SELECTION);
+        beginbox(&cp, "Control which mouse button does which thing",
+                 IDC_BOX_SELECTION1);
+        radiobig(&cp, "Action of mouse buttons:", IDC_MBSTATIC,
+                 "&Windows (Right pastes, Middle extends)", IDC_MBWINDOWS,
+                 "&xterm (Right extends, Middle pastes)", IDC_MBXTERM,
+                 NULL);
+        endbox(&cp);
+        beginbox(&cp, "Control the select-one-word-at-a-time mode",
+                 IDC_BOX_SELECTION2);
+        charclass(&cp, "Character classes:", IDC_CCSTATIC, IDC_CCLIST,
+                  "&Set", IDC_CCSET, IDC_CCEDIT,
+                  "&to class", IDC_CCSTATIC2);
+        endbox(&cp);
+    }
+
+    if (panel == colourspanelstart) {
+        /* The Colours panel. Accelerators used: [acgo] blum */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        bartitle(&cp, "Options controlling use of colours",
+                 IDC_TITLE_COLOURS);
+        beginbox(&cp, "General options for colour usage",
+                 IDC_BOX_COLOURS1);
+        checkbox(&cp, "&Bolded text is a different colour", IDC_BOLDCOLOUR);
+        checkbox(&cp, "Attempt to use &logical palettes", IDC_PALETTE);
+        endbox(&cp);
+        beginbox(&cp, "Adjust the precise colours PuTTY displays",
+                 IDC_BOX_COLOURS2);
+        colouredit(&cp, "Select a colo&ur and then click to modify it:",
+                   IDC_COLOURSTATIC, IDC_COLOURLIST,
+                   "&Modify...", IDC_CHANGE,
+                   "Red:", IDC_RSTATIC, IDC_RVALUE,
+                   "Green:", IDC_GSTATIC, IDC_GVALUE,
+                   "Blue:", IDC_BSTATIC, IDC_BVALUE, NULL);
+        endbox(&cp);
+    }
+
+    if (panel == connectionpanelstart) {
+        /* The Connection panel. Accelerators used: [acgo] tuk */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        bartitle(&cp, "Options controlling the connection", IDC_TITLE_CONNECTION);
+        if (dlgtype == 0) {
+            beginbox(&cp, "Data to send to the server",
+                     IDC_BOX_CONNECTION1);
+            staticedit(&cp, "Terminal-&type string", IDC_TTSTATIC, IDC_TTEDIT, 50);
+            staticedit(&cp, "Auto-login &username", IDC_LOGSTATIC, IDC_LOGEDIT, 50);
+            endbox(&cp);
+        }
+        beginbox(&cp, "Sending of null packets to keep session active",
+                 IDC_BOX_CONNECTION2);
+        staticedit(&cp, "Seconds between &keepalives (0 to turn off)",
+                   IDC_PINGSTATIC, IDC_PINGEDIT, 25);
+        endbox(&cp);
+    }
+
+    if (panel == telnetpanelstart) {
+        /* The Telnet panel. Accelerators used: [acgo] svldrbf */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        if (dlgtype == 0) {
+            bartitle(&cp, "Options controlling Telnet connections", IDC_TITLE_TELNET);
+            beginbox(&cp, "Data to send to the server",
+                     IDC_BOX_TELNET1);
+            staticedit(&cp, "Terminal-&speed string", IDC_TSSTATIC, IDC_TSEDIT, 50);
+            envsetter(&cp, "Environment variables:", IDC_ENVSTATIC,
+                      "&Variable", IDC_VARSTATIC, IDC_VAREDIT,
+                      "Va&lue", IDC_VALSTATIC, IDC_VALEDIT,
+                      IDC_ENVLIST,
+                      "A&dd", IDC_ENVADD, "&Remove", IDC_ENVREMOVE);
+            endbox(&cp);
+            beginbox(&cp, "Telnet protocol adjustments",
+                     IDC_BOX_TELNET2);
+            radioline(&cp, "Handling of OLD_ENVIRON ambiguity:", IDC_EMSTATIC, 2,
+                      "&BSD (commonplace)", IDC_EMBSD,
+                      "R&FC 1408 (unusual)", IDC_EMRFC, NULL);
+            endbox(&cp);
+        }
+    }
+
+    if (panel == rloginpanelstart) {
+        /* The Rlogin panel. Accelerators used: [acgo] sl */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        if (dlgtype == 0) {
+            bartitle(&cp, "Options controlling Rlogin connections", IDC_TITLE_RLOGIN);
+            beginbox(&cp, "Data to send to the server",
+                     IDC_BOX_RLOGIN1);
+            staticedit(&cp, "Terminal-&speed string", IDC_R_TSSTATIC, IDC_R_TSEDIT, 50);
+            staticedit(&cp, "&Local username:", IDC_RLLUSERSTATIC, IDC_RLLUSEREDIT, 50);
+            endbox(&cp);
+        }
+    }
+
+    if (panel == sshpanelstart) {
+        /* The SSH panel. Accelerators used: [acgo] rmakwp123bd */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        if (dlgtype == 0) {
+            bartitle(&cp, "Options controlling SSH connections", IDC_TITLE_SSH);
+            beginbox(&cp, "Data to send to the server",
+                     IDC_BOX_SSH1);
+            multiedit(&cp,
+                      "&Remote command:", IDC_CMDSTATIC, IDC_CMDEDIT, 100,
+                      NULL);
+            endbox(&cp);
+            beginbox(&cp, "Authentication options",
+                     IDC_BOX_SSH2);
+            checkbox(&cp, "Atte&mpt TIS or CryptoCard authentication",
+                     IDC_AUTHTIS);
+            checkbox(&cp, "Allow &agent forwarding", IDC_AGENTFWD);
+            editbutton(&cp, "Private &key file for authentication:",
+                       IDC_PKSTATIC, IDC_PKEDIT, "Bro&wse...", IDC_PKBUTTON);
+            endbox(&cp);
+            beginbox(&cp, "Protocol options",
+                     IDC_BOX_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);
+            radioline(&cp, "Preferred encryption algorithm:", IDC_CIPHERSTATIC, 3,
+                      "&3DES", IDC_CIPHER3DES,
+                      "&Blowfish", IDC_CIPHERBLOWF,
+                      "&DES", IDC_CIPHERDES, NULL);
+            checkbox(&cp, "Imitate SSH 2 MAC bug in commercial <= v2.3.x",
+                     IDC_BUGGYMAC);
+            endbox(&cp);
+        }
+    }
+
+    if (panel == tunnelspanelstart) {
+        /* The Tunnels panel. Accelerators used: [acgo] ex */
+        struct ctlpos cp;
+        ctlposinit(&cp, hwnd, 80, 3, 13);
+        if (dlgtype == 0) {
+            bartitle(&cp, "Options controlling SSH tunnelling",
+                     IDC_TITLE_TUNNELS);
+            beginbox(&cp, "X11 forwarding options",
+                     IDC_BOX_TUNNELS);
+            checkbox(&cp, "&Enable X11 forwarding",
+                     IDC_X11_FORWARD);
+            multiedit(&cp, "&X display location", IDC_X11_DISPSTATIC,
+                      IDC_X11_DISPLAY, 50, NULL);
+            endbox(&cp);
+        }
+    }
+}
+
+/*
+ * This function is the configuration box.
  */
 static int GenericMainDlgProc (HWND hwnd, UINT msg,
                               WPARAM wParam, LPARAM lParam,
@@ -690,394 +1111,30 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
         }
 
        /*
-        * Create the various panelfuls of controls.
+        * Set up the tree view contents.
         */
-
-       /* The Session panel. Accelerators used: [acgo] nprthelsdx */
-       {
-           struct ctlpos cp;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-            bartitle(&cp, "Basic options for your PuTTY session",
-                     IDC_TITLE_SESSION);
-           if (dlgtype == 0) {
-                beginbox(&cp, "Specify your connection by host name",
-                         IDC_BOX_SESSION1, IDC_BOXT_SESSION1);
-               multiedit(&cp,
-                         "Host &Name", IDC_HOSTSTATIC, IDC_HOST, 75,
-                         "&Port", IDC_PORTSTATIC, IDC_PORT, 25, NULL);
-               if (backends[3].backend == NULL) {
-                   /* this is PuTTYtel, so only two protocols available */
-                   radioline(&cp, "Protocol:", IDC_PROTSTATIC, 4,
-                             "&Raw", IDC_PROTRAW,
-                             "&Telnet", IDC_PROTTELNET,
-                             "R&login", IDC_PROTRLOGIN, NULL);
-               } else {
-                   radioline(&cp, "Protocol:", IDC_PROTSTATIC, 4,
-                             "&Raw", IDC_PROTRAW,
-                             "&Telnet", IDC_PROTTELNET,
-                             "R&login", IDC_PROTRLOGIN,
-#ifdef FWHACK
-                             "SS&H/hack",
-#else
-                             "SS&H",
-#endif
-                             IDC_PROTSSH, NULL);
-               }
-                endbox(&cp);
-                beginbox(&cp, "Load, save or delete a stored session",
-                         IDC_BOX_SESSION2, IDC_BOXT_SESSION2);
-               sesssaver(&cp, "Sav&ed Sessions",
-                         IDC_SESSSTATIC, IDC_SESSEDIT, IDC_SESSLIST,
-                         "&Load", IDC_SESSLOAD,
-                         "&Save", IDC_SESSSAVE,
-                         "&Delete", IDC_SESSDEL, NULL);
-                endbox(&cp);
-           }
-            beginbox(&cp, NULL, IDC_BOX_SESSION3, 0);
-           checkbox(&cp, "Close Window on E&xit", IDC_CLOSEEXIT);
-            endbox(&cp);
-
-            hsession = treeview_insert(&tvfaff, 0, "Session");
-       }
-
-        /* The Terminal panel. Accelerators used: [acgo] &dflbenuw */
-       {
-           struct ctlpos cp;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-            bartitle(&cp, "Options controlling the terminal emulation",
-                     IDC_TITLE_TERMINAL);
-            beginbox(&cp, "Set various terminal options",
-                     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);
-            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?srvlxvnpmietu */
-       {
-           struct ctlpos cp;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-            bartitle(&cp, "Options controlling the effects of keys",
-                     IDC_TITLE_KEYBOARD);
-            beginbox(&cp, "Change the sequences sent by:",
-                     IDC_BOX_KEYBOARD1, IDC_BOXT_KEYBOARD1);
-           radioline(&cp, "The Backspace key", IDC_DELSTATIC, 2,
-                     "Control-&H", IDC_DEL008,
-                     "Control-&? (127)", IDC_DEL127, NULL);
-           radioline(&cp, "The Home and End keys", IDC_HOMESTATIC, 2,
-                     "&Standard", IDC_HOMETILDE,
-                     "&rxvt", IDC_HOMERXVT, NULL);
-           radioline(&cp, "The Function keys and keypad", IDC_FUNCSTATIC, 4,
-                     "ESC[n&~", IDC_FUNCTILDE,
-                     "&Linux", IDC_FUNCLINUX,
-                     "&Xterm R6", IDC_FUNCXTERM,
-                      "&VT400", IDC_FUNCVT400, NULL);
-            endbox(&cp);
-            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] bsdkw4ylpt */
-       {
-           struct ctlpos cp;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-            bartitle(&cp, "Options controlling PuTTY's window",
-                     IDC_TITLE_WINDOW);
-            beginbox(&cp, "Set the size of the window",
-                     IDC_BOX_WINDOW1, IDC_BOXT_WINDOW1);
-           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_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_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, "System menu appears on A&LT 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] rmkhtibluv */
-       {
-           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);
-           radioline(&cp, "Cursor appearance:", IDC_CURSORSTATIC, 3,
-                     "B&lock", IDC_CURBLOCK,
-                     "&Underline", IDC_CURUNDER,
-                     "&Vertical line", IDC_CURVERT,
-                     NULL);
-           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);
-            multiedit(&cp,
-                      "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;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-            bartitle(&cp, "Options controlling character set translation",
-                     IDC_TITLE_TRANSLATION);
-            beginbox(&cp, "Adjust how PuTTY displays line drawing characters",
-                     IDC_BOX_TRANSLATION1, IDC_BOXT_TRANSLATION1);
-           radiobig(&cp,
-                    "Handling of line drawing characters:", IDC_VTSTATIC,
-                    "Font has &XWindows encoding", IDC_VTXWINDOWS,
-                    "Use font in &both ANSI and OEM modes", IDC_VTOEMANSI,
-                    "Use font in O&EM mode only", IDC_VTOEMONLY,
-                    "&Poor man's line drawing (""+"", ""-"" and ""|"")",
-                    IDC_VTPOORMAN, NULL);
-            endbox(&cp);
-            beginbox(&cp, "Enable character set translation on received data",
-                     IDC_BOX_TRANSLATION2, IDC_BOXT_TRANSLATION2);
-           radiobig(&cp,
-                    "Character set translation:", IDC_XLATSTATIC,
-                    "&None", IDC_NOXLAT,
-                    "&KOI8 / Win-1251", IDC_KOI8WIN1251,
-                    "&ISO-8859-2 / Win-1250", IDC_88592WIN1250,
-                     "&ISO-8859-2 / CP852", IDC_88592CP852, NULL);
-            endbox(&cp);
-            beginbox(&cp, "Enable character set translation on input data",
-                     IDC_BOX_TRANSLATION3, IDC_BOXT_TRANSLATION3);
-           checkbox(&cp, "CAP&S LOCK acts as cyrillic switch",
-                     IDC_CAPSLOCKCYR);
-            endbox(&cp);
-
-            treeview_insert(&tvfaff, 1, "Translation");
-       }
-
-        /* The Selection panel. Accelerators used: [acgo] wxst */
-       {
-           struct ctlpos cp;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-            bartitle(&cp, "Options controlling copy and paste",
-                     IDC_TITLE_SELECTION);
-            beginbox(&cp, "Control which mouse button does which thing",
-                     IDC_BOX_SELECTION1, IDC_BOXT_SELECTION1);
-           radiobig(&cp, "Action of mouse buttons:", IDC_MBSTATIC,
-                    "&Windows (Right pastes, Middle extends)", IDC_MBWINDOWS,
-                    "&xterm (Right extends, Middle pastes)", IDC_MBXTERM,
-                    NULL);
-            endbox(&cp);
-            beginbox(&cp, "Control the select-one-word-at-a-time mode",
-                     IDC_BOX_SELECTION2, IDC_BOXT_SELECTION2);
-           charclass(&cp, "Character classes:", IDC_CCSTATIC, IDC_CCLIST,
-                     "&Set", IDC_CCSET, IDC_CCEDIT,
-                     "&to class", IDC_CCSTATIC2);
-            endbox(&cp);
-
-            treeview_insert(&tvfaff, 1, "Selection");
-       }
-
-        /* The Colours panel. Accelerators used: [acgo] blum */
-       {
-           struct ctlpos cp;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-            bartitle(&cp, "Options controlling use of colours",
-                     IDC_TITLE_COLOURS);
-            beginbox(&cp, "General options for colour usage",
-                     IDC_BOX_COLOURS1, IDC_BOXT_COLOURS1);
-           checkbox(&cp, "&Bolded text is a different colour", IDC_BOLDCOLOUR);
-           checkbox(&cp, "Attempt to use &logical palettes", IDC_PALETTE);
-            endbox(&cp);
-            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_COLOURSTATIC, IDC_COLOURLIST,
-                      "&Modify...", IDC_CHANGE,
-                      "Red:", IDC_RSTATIC, IDC_RVALUE,
-                      "Green:", IDC_GSTATIC, IDC_GVALUE,
-                      "Blue:", IDC_BSTATIC, IDC_BVALUE, NULL);
-            endbox(&cp);
-
-            treeview_insert(&tvfaff, 1, "Colours");
-       }
-
-        /* The Connection panel. Accelerators used: [acgo] tuk */
-        {
-           struct ctlpos cp;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-            bartitle(&cp, "Options controlling the connection", IDC_TITLE_CONNECTION);
-           if (dlgtype == 0) {
-                beginbox(&cp, "Data to send to the server",
-                         IDC_BOX_CONNECTION1, IDC_BOXT_CONNECTION1);
-                staticedit(&cp, "Terminal-&type string", IDC_TTSTATIC, IDC_TTEDIT, 50);
-                staticedit(&cp, "Auto-login &username", IDC_LOGSTATIC, IDC_LOGEDIT, 50);
-                endbox(&cp);
+        hsession = treeview_insert(&tvfaff, 0, "Session");
+        treeview_insert(&tvfaff, 1, "Logging");
+        treeview_insert(&tvfaff, 0, "Terminal");
+        treeview_insert(&tvfaff, 1, "Keyboard");
+        treeview_insert(&tvfaff, 0, "Window");
+        treeview_insert(&tvfaff, 1, "Appearance");
+        treeview_insert(&tvfaff, 1, "Translation");
+        treeview_insert(&tvfaff, 1, "Selection");
+        treeview_insert(&tvfaff, 1, "Colours");
+        treeview_insert(&tvfaff, 0, "Connection");
+        if (dlgtype == 0) {
+            treeview_insert(&tvfaff, 1, "Telnet");
+            treeview_insert(&tvfaff, 1, "Rlogin");
+            if (backends[3].backend != NULL) {
+                treeview_insert(&tvfaff, 1, "SSH");
+                treeview_insert(&tvfaff, 2, "Tunnels");
             }
-            beginbox(&cp, "Sending of null packets to keep session active",
-                     IDC_BOX_CONNECTION2, IDC_BOXT_CONNECTION2);
-            staticedit(&cp, "Seconds between &keepalives (0 to turn off)",
-                       IDC_PINGSTATIC, IDC_PINGEDIT, 25);
-            endbox(&cp);
-
-            treeview_insert(&tvfaff, 0, "Connection");
         }
 
-        /* The Telnet panel. Accelerators used: [acgo] svldrbf */
-       {
-           struct ctlpos cp;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-           if (dlgtype == 0) {
-                bartitle(&cp, "Options controlling Telnet connections", IDC_TITLE_TELNET);
-                beginbox(&cp, "Data to send to the server",
-                         IDC_BOX_TELNET1, IDC_BOXT_TELNET1);
-               staticedit(&cp, "Terminal-&speed string", IDC_TSSTATIC, IDC_TSEDIT, 50);
-               envsetter(&cp, "Environment variables:", IDC_ENVSTATIC,
-                         "&Variable", IDC_VARSTATIC, IDC_VAREDIT,
-                         "Va&lue", IDC_VALSTATIC, IDC_VALEDIT,
-                         IDC_ENVLIST,
-                         "A&dd", IDC_ENVADD, "&Remove", IDC_ENVREMOVE);
-                endbox(&cp);
-                beginbox(&cp, "Telnet protocol adjustments",
-                         IDC_BOX_TELNET2, IDC_BOXT_TELNET2);
-               radioline(&cp, "Handling of OLD_ENVIRON ambiguity:", IDC_EMSTATIC, 2,
-                         "&BSD (commonplace)", IDC_EMBSD,
-                         "R&FC 1408 (unusual)", IDC_EMRFC, NULL);
-                endbox(&cp);
-
-                treeview_insert(&tvfaff, 1, "Telnet");
-           }
-       }
-
-
-       /* The Rlogin Panel */
-       {
-           struct ctlpos cp;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-           if (dlgtype == 0) {
-                bartitle(&cp, "Options controlling Rlogin connections", IDC_TITLE_RLOGIN);
-                beginbox(&cp, "Data to send to the server",
-                         IDC_BOX_RLOGIN1, IDC_BOXT_RLOGIN1);
-               staticedit(&cp, "Terminal-&speed string", IDC_R_TSSTATIC, IDC_R_TSEDIT, 50);
-               staticedit(&cp, "&Local username:", IDC_RLLUSERSTATIC, IDC_RLLUSEREDIT, 50);
-                endbox(&cp);
-
-                treeview_insert(&tvfaff, 1, "Rlogin");
-           }
-       }
-
-       /* The SSH panel. Accelerators used: [acgo] rmakwp123bd */
-        if (backends[3].backend != NULL) {
-           struct ctlpos cp;
-           ctlposinit(&cp, hwnd, 80, 3, 13);
-           if (dlgtype == 0) {
-                bartitle(&cp, "Options controlling SSH connections", IDC_TITLE_SSH);
-                beginbox(&cp, "Data to send to the server",
-                         IDC_BOX_SSH1, IDC_BOXT_SSH1);
-               multiedit(&cp,
-                         "&Remote command:", IDC_CMDSTATIC, IDC_CMDEDIT, 100,
-                         NULL);
-                endbox(&cp);
-                beginbox(&cp, "Authentication options",
-                         IDC_BOX_SSH2, IDC_BOXT_SSH2);
-               checkbox(&cp, "Atte&mpt TIS or CryptoCard authentication",
-                        IDC_AUTHTIS);
-               checkbox(&cp, "Allow &agent forwarding", IDC_AGENTFWD);
-               editbutton(&cp, "Private &key file for authentication:",
-                          IDC_PKSTATIC, IDC_PKEDIT, "Bro&wse...", IDC_PKBUTTON);
-                endbox(&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);
-               radioline(&cp, "Preferred encryption algorithm:", IDC_CIPHERSTATIC, 3,
-                         "&3DES", IDC_CIPHER3DES,
-                         "&Blowfish", IDC_CIPHERBLOWF,
-                         "&DES", IDC_CIPHERDES, NULL);
-               checkbox(&cp, "Imitate SSH 2 MAC bug in commercial <= v2.3.x",
-                         IDC_BUGGYMAC);
-                endbox(&cp);
-
-                treeview_insert(&tvfaff, 1, "SSH");
-           }
-       }
-
-       init_dlg_ctrls(hwnd);
-        for (i = 0; i < nsessions; i++)
-            SendDlgItemMessage (hwnd, IDC_SESSLIST, LB_ADDSTRING,
-                                0, (LPARAM) (sessions[i]));
-
-        /*
-         * Hide all the controls to start with.
-         */
-       hide(hwnd, TRUE, controlstartvalue, controlendvalue);
-
         /*
          * Put the treeview selection on to the Session panel. This
-         * should also cause unhiding of the relevant controls.
+         * should also cause creation of the relevant controls.
          */
         TreeView_SelectItem(treeview, hsession);
 
@@ -1107,37 +1164,48 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
            ((LPNMHDR)lParam)->code == TVN_SELCHANGED) {
            HTREEITEM i = TreeView_GetSelection(((LPNMHDR)lParam)->hwndFrom);
            TVITEM item;
+            int j;
            char buffer[64];
             item.hItem = i;
            item.pszText = buffer;
            item.cchTextMax = sizeof(buffer);
            item.mask = TVIF_TEXT;
            TreeView_GetItem(((LPNMHDR)lParam)->hwndFrom, &item);
-           hide(hwnd, TRUE, controlstartvalue, controlendvalue);
+           for (j = controlstartvalue; j < controlendvalue; j++) {
+                HWND item = GetDlgItem(hwnd, j);
+                if (item)
+                    DestroyWindow(item);
+            }
            if (!strcmp(buffer, "Session"))
-               hide(hwnd, FALSE, sessionpanelstart, sessionpanelend);
+               create_controls(hwnd, dlgtype, sessionpanelstart);
+           if (!strcmp(buffer, "Logging"))
+               create_controls(hwnd, dlgtype, loggingpanelstart);
            if (!strcmp(buffer, "Keyboard"))
-               hide(hwnd, FALSE, keyboardpanelstart, keyboardpanelend);
+               create_controls(hwnd, dlgtype, keyboardpanelstart);
            if (!strcmp(buffer, "Terminal"))
-               hide(hwnd, FALSE, terminalpanelstart, terminalpanelend);
+               create_controls(hwnd, dlgtype, terminalpanelstart);
            if (!strcmp(buffer, "Window"))
-               hide(hwnd, FALSE, windowpanelstart, windowpanelend);
+               create_controls(hwnd, dlgtype, windowpanelstart);
            if (!strcmp(buffer, "Appearance"))
-               hide(hwnd, FALSE, appearancepanelstart, appearancepanelend);
+               create_controls(hwnd, dlgtype, appearancepanelstart);
+           if (!strcmp(buffer, "Tunnels"))
+               create_controls(hwnd, dlgtype, tunnelspanelstart);
            if (!strcmp(buffer, "Connection"))
-               hide(hwnd, FALSE, connectionpanelstart, connectionpanelend);
+               create_controls(hwnd, dlgtype, connectionpanelstart);
            if (!strcmp(buffer, "Telnet"))
-               hide(hwnd, FALSE, telnetpanelstart, telnetpanelend);
+               create_controls(hwnd, dlgtype, telnetpanelstart);
            if (!strcmp(buffer, "Rlogin"))
-               hide(hwnd, FALSE, rloginpanelstart, rloginpanelend);
+               create_controls(hwnd, dlgtype, rloginpanelstart);
            if (!strcmp(buffer, "SSH"))
-               hide(hwnd, FALSE, sshpanelstart, sshpanelend);
+               create_controls(hwnd, dlgtype, sshpanelstart);
            if (!strcmp(buffer, "Selection"))
-               hide(hwnd, FALSE, selectionpanelstart, selectionpanelend);
+               create_controls(hwnd, dlgtype, selectionpanelstart);
            if (!strcmp(buffer, "Colours"))
-               hide(hwnd, FALSE, colourspanelstart, colourspanelend);
+               create_controls(hwnd, dlgtype, colourspanelstart);
            if (!strcmp(buffer, "Translation"))
-               hide(hwnd, FALSE, translationpanelstart, translationpanelend);
+               create_controls(hwnd, dlgtype, translationpanelstart);
+
+            init_dlg_ctrls(hwnd);
 
            SetFocus (((LPNMHDR)lParam)->hwndFrom);   /* ensure focus stays */
            return 0;
@@ -1366,10 +1434,25 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                HIWORD(wParam) == BN_DOUBLECLICKED)
                cfg.alt_only = IsDlgButtonChecked (hwnd, IDC_ALTONLY);
            break;
-         case IDC_LDISCTERM:
+         case IDC_ECHOBACKEND:
+         case IDC_ECHOYES:
+         case IDC_ECHONO:
            if (HIWORD(wParam) == BN_CLICKED ||
-               HIWORD(wParam) == BN_DOUBLECLICKED)
-               cfg.ldisc_term = IsDlgButtonChecked (hwnd, IDC_LDISCTERM);
+               HIWORD(wParam) == BN_DOUBLECLICKED) {
+               if (LOWORD(wParam)==IDC_ECHOBACKEND) cfg.localecho=LD_BACKEND;
+               if (LOWORD(wParam)==IDC_ECHOYES) cfg.localecho=LD_YES;
+               if (LOWORD(wParam)==IDC_ECHONO) cfg.localecho=LD_NO;
+            }
+           break;
+         case IDC_EDITBACKEND:
+         case IDC_EDITYES:
+         case IDC_EDITNO:
+           if (HIWORD(wParam) == BN_CLICKED ||
+               HIWORD(wParam) == BN_DOUBLECLICKED) {
+               if (LOWORD(wParam)==IDC_EDITBACKEND) cfg.localedit=LD_BACKEND;
+               if (LOWORD(wParam)==IDC_EDITYES) cfg.localedit=LD_YES;
+               if (LOWORD(wParam)==IDC_EDITNO) cfg.localedit=LD_NO;
+            }
            break;
           case IDC_ALWAYSONTOP:
            if (HIWORD(wParam) == BN_CLICKED ||
@@ -1467,6 +1550,11 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                HIWORD(wParam) == BN_DOUBLECLICKED)
                cfg.win_name_always = IsDlgButtonChecked (hwnd, IDC_WINNAME);
            break;
+         case IDC_HIDEMOUSE:
+           if (HIWORD(wParam) == BN_CLICKED ||
+               HIWORD(wParam) == BN_DOUBLECLICKED)
+               cfg.hide_mouseptr = IsDlgButtonChecked (hwnd, IDC_HIDEMOUSE);
+           break;
          case IDC_CURBLOCK:
            if (HIWORD(wParam) == BN_CLICKED ||
                HIWORD(wParam) == BN_DOUBLECLICKED)
@@ -1533,15 +1621,15 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
             of.lpstrFilter = "All Files\0*\0\0\0";
             of.lpstrCustomFilter = NULL;
             of.nFilterIndex = 1;
-            of.lpstrFile = filename; strcpy(filename, cfg.keyfile);
+            of.lpstrFile = filename; strcpy(filename, cfg.logfilename);
             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);
+                strcpy(cfg.logfilename, filename);
+                SetDlgItemText (hwnd, IDC_LGFEDIT, cfg.logfilename);
             }
            break;
          case IDC_LSTATOFF:
@@ -1848,6 +1936,16 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                 IsDlgButtonChecked (hwnd, IDC_VTOEMONLY) ? VT_OEMONLY :
                 VT_POORMAN);
            break;
+         case IDC_X11_FORWARD:
+           if (HIWORD(wParam) == BN_CLICKED ||
+               HIWORD(wParam) == BN_DOUBLECLICKED)
+               cfg.x11_forward = IsDlgButtonChecked (hwnd, IDC_X11_FORWARD);
+           break;
+          case IDC_X11_DISPLAY:
+            if (HIWORD(wParam) == EN_CHANGE)
+                GetDlgItemText (hwnd, IDC_X11_DISPLAY, cfg.x11_display,
+                                sizeof(cfg.x11_display)-1);
+            break;
        }
        return 0;
       case WM_CLOSE:
@@ -1946,14 +2044,11 @@ void showeventlog (HWND hwnd) {
                               hwnd, LogProc);
        ShowWindow (logbox, SW_SHOWNORMAL);
     }
+    SetActiveWindow(logbox);
 }
 
 void showabout (HWND hwnd) {
-    if (!abtbox) {
-       abtbox = CreateDialog (hinst, MAKEINTRESOURCE(IDD_ABOUTBOX),
-                              hwnd, AboutProc);
-       ShowWindow (abtbox, SW_SHOWNORMAL);
-    }
+    DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX),hwnd, AboutProc);
 }
 
 void verify_ssh_host_key(char *host, int port, char *keytype,