Rethink the whole line discipline architecture. Instead of having
[u/mdw/putty] / windlg.c
index 4ef37d9..12bff5d 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -1,31 +1,21 @@
 #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>
 
 #include "ssh.h"
 #include "putty.h"
+#include "winstuff.h"
 #include "win_res.h"
 #include "storage.h"
 
 static char **events = NULL;
 static int nevents = 0, negsize = 0;
 
-static HWND logbox = NULL, abtbox = NULL;
-
-static HINSTANCE hinst;
-
 static int readytogo;
 
-static void force_normal(HWND hwnd)
+void force_normal(HWND hwnd)
 {
     static int recurse = 0;
 
@@ -35,7 +25,7 @@ static void force_normal(HWND hwnd)
     recurse = 1;
 
     wp.length = sizeof(wp);
-    if (GetWindowPlacement(hwnd, &wp))
+    if (GetWindowPlacement(hwnd, &wp) && wp.showCmd == SW_SHOWMAXIMIZED)
     {
        wp.showCmd = SW_SHOWNORMAL;
        SetWindowPlacement(hwnd, &wp);
@@ -64,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:
@@ -74,7 +66,7 @@ static int CALLBACK LogProc (HWND hwnd, UINT msg,
                 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,
@@ -93,7 +85,7 @@ static int CALLBACK LogProc (HWND hwnd, UINT msg,
                     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++) {
@@ -105,9 +97,9 @@ static int CALLBACK LogProc (HWND hwnd, UINT msg,
                             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,
@@ -119,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;
     }
@@ -153,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);
@@ -166,651 +159,18 @@ static int CALLBACK AboutProc (HWND hwnd, UINT msg,
        }
        return 0;
       case WM_CLOSE:
-       abtbox = NULL;
-       DestroyWindow (hwnd);
+        EndDialog(hwnd, TRUE);
        return 0;
     }
     return 0;
 }
 
-/* ----------------------------------------------------------------------
- * Routines to self-manage the controls in a dialog box.
- */
-
-#define GAPBETWEEN 3
-#define GAPWITHIN 1
-#define GAPXBOX 7
-#define GAPYBOX 4
-#define DLGWIDTH 168
-#define STATICHEIGHT 8
-#define CHECKBOXHEIGHT 8
-#define RADIOHEIGHT 8
-#define EDITHEIGHT 12
-#define COMBOHEIGHT 12
-#define PUSHBTNHEIGHT 14
-
-struct ctlpos {
-    HWND hwnd;
-    WPARAM font;
-    int dlu4inpix;
-    int ypos, width;
-    int xoff;
-    int boxystart, boxid, boxtextid;
-    char *boxtext;
-};
-
-static void ctlposinit(struct ctlpos *cp, HWND hwnd,
-                      int leftborder, int rightborder, int topborder) {
-    RECT r, r2;
-    cp->hwnd = hwnd;
-    cp->font = SendMessage(hwnd, WM_GETFONT, 0, 0);
-    cp->ypos = topborder;
-    GetClientRect(hwnd, &r);
-    r2.left = r2.top = 0;
-    r2.right = 4;
-    r2.bottom = 8;
-    MapDialogRect(hwnd, &r2);
-    cp->dlu4inpix = r2.right;
-    cp->width = (r.right * 4) / (r2.right) - 2*GAPBETWEEN;
-    cp->xoff = leftborder;
-    cp->width -= leftborder + rightborder;
-}
-
-static void doctl(struct ctlpos *cp, RECT r,
-                  char *wclass, int wstyle, int exstyle,
-                  char *wtext, int wid) {
-    HWND ctl;
-    /*
-     * Note nonstandard use of RECT. This is deliberate: by
-     * transforming the width and height directly we arrange to
-     * have all supposedly same-sized controls really same-sized.
-     */
-
-    r.left += cp->xoff;
-    MapDialogRect(cp->hwnd, &r);
-
-    ctl = CreateWindowEx(exstyle, wclass, wtext, wstyle,
-                         r.left, r.top, r.right, r.bottom,
-                         cp->hwnd, (HMENU)wid, hinst, NULL);
-    SendMessage(ctl, WM_SETFONT, cp->font, MAKELPARAM(TRUE, 0));
-}
-
-/*
- * A title bar across the top of a sub-dialog.
- */
-static void bartitle(struct ctlpos *cp, char *name, int id) {
-    RECT r;
-
-    r.left = GAPBETWEEN; r.right = cp->width;
-    r.top = cp->ypos; r.bottom = STATICHEIGHT;
-    cp->ypos += r.bottom + GAPBETWEEN;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, name, id);
-}
-
-/*
- * Begin a grouping box, with or without a group title.
- */
-static void beginbox(struct ctlpos *cp, char *name, int idbox, int idtext) {
-    if (name)
-        cp->ypos += STATICHEIGHT/2;
-    cp->boxystart = cp->ypos;
-    if (name)
-        cp->ypos += STATICHEIGHT - (STATICHEIGHT/2);
-    cp->ypos += GAPYBOX;
-    cp->width -= 2*GAPXBOX;
-    cp->xoff += GAPXBOX;
-    cp->boxid = idbox;
-    cp->boxtextid = idtext;
-    cp->boxtext = name;
-}
-
-/*
- * End a grouping box.
- */
-static void endbox(struct ctlpos *cp) {
-    RECT r;
-    cp->xoff -= GAPXBOX;
-    cp->width += 2*GAPXBOX;
-    cp->ypos += GAPYBOX - GAPBETWEEN;
-    r.left = GAPBETWEEN; r.right = cp->width;
-    r.top = cp->boxystart; r.bottom = cp->ypos - cp->boxystart;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_ETCHEDFRAME, 0,
-          "", cp->boxid);
-    if (cp->boxtext) {
-        SIZE s;
-        HDC hdc;
-        HFONT oldfont, dlgfont;
-        hdc = GetDC(cp->hwnd);
-        dlgfont = (HFONT)cp->font;
-        oldfont = SelectObject(hdc, dlgfont);
-        GetTextExtentPoint32(hdc, cp->boxtext, strlen(cp->boxtext), &s);
-        SelectObject(hdc, oldfont);
-        DeleteDC(hdc);
-        r.left = GAPXBOX + GAPBETWEEN;
-        r.right = (s.cx * 4 + cp->dlu4inpix-1) / cp->dlu4inpix;
-        
-        r.top = cp->boxystart - STATICHEIGHT/2; r.bottom = STATICHEIGHT;
-        doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
-              cp->boxtext, cp->boxtextid);
-    }
-    cp->ypos += GAPYBOX;
-}
-
-/*
- * Some edit boxes. Each one has a static above it. The percentages
- * of the horizontal space are provided.
- */
-static void multiedit(struct ctlpos *cp, ...) {
-    RECT r;
-    va_list ap;
-    int percent, xpos;
-
-    percent = xpos = 0;
-    va_start(ap, cp);
-    while (1) {
-        char *text;
-        int staticid, editid, pcwidth;
-        text = va_arg(ap, char *);
-        if (!text)
-            break;
-        staticid = va_arg(ap, int);
-        editid = va_arg(ap, int);
-        pcwidth = va_arg(ap, int);
-
-        r.left = xpos + GAPBETWEEN;
-        percent += pcwidth;
-        xpos = (cp->width + GAPBETWEEN) * percent / 100;
-        r.right = xpos - r.left;
-
-        r.top = cp->ypos; r.bottom = STATICHEIGHT;
-        doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
-              text, staticid);
-        r.top = cp->ypos + 8 + GAPWITHIN; r.bottom = EDITHEIGHT;
-        doctl(cp, r, "EDIT",
-              WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-              WS_EX_CLIENTEDGE,
-              "", editid);
-    }
-    va_end(ap);
-    cp->ypos += 8+GAPWITHIN+12+GAPBETWEEN;
-}
-
-/*
- * A set of radio buttons on the same line, with a static above
- * them. `nacross' dictates how many parts the line is divided into
- * (you might want this not to equal the number of buttons if you
- * needed to line up some 2s and some 3s to look good in the same
- * panel).
- */
-static void radioline(struct ctlpos *cp,
-                      char *text, int id, int nacross, ...) {
-    RECT r;
-    va_list ap;
-    int group;
-    int i;
-
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
-    cp->ypos += r.bottom + GAPWITHIN;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
-    va_start(ap, nacross);
-    group = WS_GROUP;
-    i = 0;
-    while (1) {
-        char *btext;
-        int bid;
-        btext = va_arg(ap, char *);
-        if (!btext)
-            break;
-        bid = va_arg(ap, int);
-        r.left = GAPBETWEEN + i * (cp->width+GAPBETWEEN)/nacross;
-        r.right = (i+1) * (cp->width+GAPBETWEEN)/nacross - r.left;
-        r.top = cp->ypos; r.bottom = RADIOHEIGHT;
-        doctl(cp, r, "BUTTON",
-              BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | group,
-              0,
-              btext, bid);
-        group = 0;
-        i++;
-    }
-    va_end(ap);
-    cp->ypos += r.bottom + GAPBETWEEN;
-}
-
-/*
- * A set of radio buttons on multiple lines, with a static above
- * them.
- */
-static void radiobig(struct ctlpos *cp, char *text, int id, ...) {
-    RECT r;
-    va_list ap;
-    int group;
-
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
-    cp->ypos += r.bottom + GAPWITHIN;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
-    va_start(ap, id);
-    group = WS_GROUP;
-    while (1) {
-        char *btext;
-        int bid;
-        btext = va_arg(ap, char *);
-        if (!btext)
-            break;
-        bid = va_arg(ap, int);
-        r.left = GAPBETWEEN; r.top = cp->ypos;
-        r.right = cp->width; r.bottom = STATICHEIGHT;
-        cp->ypos += r.bottom + GAPWITHIN;
-        doctl(cp, r, "BUTTON",
-              BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | group,
-              0,
-              btext, bid);
-        group = 0;
-    }
-    va_end(ap);
-    cp->ypos += GAPBETWEEN - GAPWITHIN;
-}
-
-/*
- * A single standalone checkbox.
- */
-static void checkbox(struct ctlpos *cp, char *text, int id) {
-    RECT r;
-
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = CHECKBOXHEIGHT;
-    cp->ypos += r.bottom + GAPBETWEEN;
-    doctl(cp, r, "BUTTON",
-          BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0,
-          text, id);
-}
-
-/*
- * A button on the right hand side, with a static to its left.
- */
-static void staticbtn(struct ctlpos *cp, char *stext, int sid,
-                      char *btext, int bid) {
-    const int height = (PUSHBTNHEIGHT > STATICHEIGHT ?
-                        PUSHBTNHEIGHT : STATICHEIGHT);
-    RECT r;
-    int lwid, rwid, rpos;
-
-    rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
-    lwid = rpos - 2*GAPBETWEEN;
-    rwid = cp->width + GAPBETWEEN - rpos;
-
-    r.left = GAPBETWEEN; r.top = cp->ypos + (height-STATICHEIGHT)/2;
-    r.right = lwid; r.bottom = STATICHEIGHT;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
-
-    r.left = rpos; r.top = cp->ypos + (height-PUSHBTNHEIGHT)/2;
-    r.right = rwid; r.bottom = PUSHBTNHEIGHT;
-    doctl(cp, r, "BUTTON",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-          0,
-          btext, bid);
-
-    cp->ypos += height + GAPBETWEEN;
-}
-
-/*
- * An edit control on the right hand side, with a static to its left.
- */
-static void staticedit(struct ctlpos *cp, char *stext,
-                       int sid, int eid, int percentedit) {
-    const int height = (EDITHEIGHT > STATICHEIGHT ?
-                        EDITHEIGHT : STATICHEIGHT);
-    RECT r;
-    int lwid, rwid, rpos;
-
-    rpos = GAPBETWEEN + (100-percentedit) * (cp->width + GAPBETWEEN) / 100;
-    lwid = rpos - 2*GAPBETWEEN;
-    rwid = cp->width + GAPBETWEEN - rpos;
-
-    r.left = GAPBETWEEN; r.top = cp->ypos + (height-STATICHEIGHT)/2;
-    r.right = lwid; r.bottom = STATICHEIGHT;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
-
-    r.left = rpos; r.top = cp->ypos + (height-EDITHEIGHT)/2;
-    r.right = rwid; r.bottom = EDITHEIGHT;
-    doctl(cp, r, "EDIT",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-          WS_EX_CLIENTEDGE,
-          "", eid);
-
-    cp->ypos += height + GAPBETWEEN;
-}
-
-/*
- * A tab-control substitute when a real tab control is unavailable.
- */
-static void ersatztab(struct ctlpos *cp, char *stext, int sid,
-                      int lid, int s2id) {
-    const int height = (COMBOHEIGHT > STATICHEIGHT ?
-                        COMBOHEIGHT : STATICHEIGHT);
-    RECT r;
-    int bigwid, lwid, rwid, rpos;
-    static const int BIGGAP = 15;
-    static const int MEDGAP = 3;
-
-    bigwid = cp->width + 2*GAPBETWEEN - 2*BIGGAP;
-    cp->ypos += MEDGAP;
-    rpos = BIGGAP + (bigwid + BIGGAP) / 2;
-    lwid = rpos - 2*BIGGAP;
-    rwid = bigwid + BIGGAP - rpos;
-
-    r.left = BIGGAP; r.top = cp->ypos + (height-STATICHEIGHT)/2;
-    r.right = lwid; r.bottom = STATICHEIGHT;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
-
-    r.left = rpos; r.top = cp->ypos + (height-COMBOHEIGHT)/2;
-    r.right = rwid; r.bottom = COMBOHEIGHT*10;
-    doctl(cp, r, "COMBOBOX",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-          CBS_DROPDOWNLIST | CBS_HASSTRINGS,
-          WS_EX_CLIENTEDGE,
-          "", lid);
-
-    cp->ypos += height + MEDGAP + GAPBETWEEN;
-
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = 2;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ,
-          0, "", s2id);
-}
-
-/*
- * A static line, followed by an edit control on the left hand side
- * and a button on the right.
- */
-static void editbutton(struct ctlpos *cp, char *stext, int sid,
-                       int eid, char *btext, int bid) {
-    const int height = (EDITHEIGHT > PUSHBTNHEIGHT ?
-                        EDITHEIGHT : PUSHBTNHEIGHT);
-    RECT r;
-    int lwid, rwid, rpos;
-
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
-    cp->ypos += r.bottom + GAPWITHIN;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
-
-    rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
-    lwid = rpos - 2*GAPBETWEEN;
-    rwid = cp->width + GAPBETWEEN - rpos;
-
-    r.left = GAPBETWEEN; r.top = cp->ypos + (height-EDITHEIGHT)/2;
-    r.right = lwid; r.bottom = EDITHEIGHT;
-    doctl(cp, r, "EDIT",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-          WS_EX_CLIENTEDGE,
-          "", eid);
-
-    r.left = rpos; r.top = cp->ypos + (height-PUSHBTNHEIGHT)/2;
-    r.right = rwid; r.bottom = PUSHBTNHEIGHT;
-    doctl(cp, r, "BUTTON",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-          0,
-          btext, bid);
-
-    cp->ypos += height + GAPBETWEEN;
-}
-
-/*
- * Special control which was hard to describe generically: the
- * session-saver assembly. A static; below that an edit box; below
- * that a list box. To the right of the list box, a column of
- * buttons.
- */
-static void sesssaver(struct ctlpos *cp, char *text,
-                      int staticid, int editid, int listid, ...) {
-    RECT r;
-    va_list ap;
-    int lwid, rwid, rpos;
-    int y;
-    const int LISTDEFHEIGHT = 66;
-
-    rpos = GAPBETWEEN + 3 * (cp->width + GAPBETWEEN) / 4;
-    lwid = rpos - 2*GAPBETWEEN;
-    rwid = cp->width + GAPBETWEEN - rpos;
-
-    /* The static control. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = lwid; r.bottom = STATICHEIGHT;
-    cp->ypos += r.bottom + GAPWITHIN;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, staticid);
-
-    /* The edit control. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = lwid; r.bottom = EDITHEIGHT;
-    cp->ypos += r.bottom + GAPWITHIN;
-    doctl(cp, r, "EDIT",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-          WS_EX_CLIENTEDGE,
-          "", editid);
-
-    /*
-     * The buttons (we should hold off on the list box until we
-     * know how big the buttons are).
-     */
-    va_start(ap, listid);
-    y = cp->ypos;
-    while (1) {
-        char *btext = va_arg(ap, char *);
-        int bid;
-        if (!btext) break;
-        bid = va_arg(ap, int);
-        r.left = rpos; r.top = y;
-        r.right = rwid; r.bottom = PUSHBTNHEIGHT;
-        y += r.bottom + GAPWITHIN;
-        doctl(cp, r, "BUTTON",
-              WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-              0,
-              btext, bid);
-    }
-
-    /* Compute list box height. LISTDEFHEIGHT, or height of buttons. */
-    y -= cp->ypos;
-    y -= GAPWITHIN;
-    if (y < LISTDEFHEIGHT) y = LISTDEFHEIGHT;
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = lwid; r.bottom = y;
-    cp->ypos += y + GAPBETWEEN;
-    doctl(cp, r, "LISTBOX",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | 
-          LBS_NOTIFY | LBS_HASSTRINGS,
-          WS_EX_CLIENTEDGE,
-          "", listid);
-}
-
-/*
- * Another special control: the environment-variable setter. A
- * static line first; then a pair of edit boxes with associated
- * statics, and two buttons; then a list box.
- */
-static void envsetter(struct ctlpos *cp, char *stext, int sid,
-                      char *e1stext, int e1sid, int e1id,
-                      char *e2stext, int e2sid, int e2id,
-                      int listid,
-                      char *b1text, int b1id, char *b2text, int b2id) {
-    RECT r;
-    const int height = (STATICHEIGHT > EDITHEIGHT && STATICHEIGHT > PUSHBTNHEIGHT ?
-                        STATICHEIGHT :
-                        EDITHEIGHT > PUSHBTNHEIGHT ?
-                        EDITHEIGHT : PUSHBTNHEIGHT);
-    const static int percents[] = { 20, 35, 10, 25 };
-    int i, j, xpos, percent;
-    const int LISTHEIGHT = 42;
-
-    /* The static control. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
-    cp->ypos += r.bottom + GAPWITHIN;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
-
-    /* The statics+edits+buttons. */
-    for (j = 0; j < 2; j++) {
-        percent = 10;
-        for (i = 0; i < 4; i++) {
-            xpos = (cp->width + GAPBETWEEN) * percent / 100;
-            r.left = xpos + GAPBETWEEN;
-            percent += percents[i];
-            xpos = (cp->width + GAPBETWEEN) * percent / 100;
-            r.right = xpos - r.left;
-            r.top = cp->ypos;
-            r.bottom = (i==0 ? STATICHEIGHT :
-                        i==1 ? EDITHEIGHT :
-                        PUSHBTNHEIGHT);
-            r.top += (height-r.bottom)/2;
-            if (i==0) {
-                doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
-                      j==0 ? e1stext : e2stext, j==0 ? e1sid : e2sid);
-            } else if (i==1) {
-                doctl(cp, r, "EDIT",
-                      WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-                      WS_EX_CLIENTEDGE,
-                      "", j==0 ? e1id : e2id);
-            } else if (i==3) {
-                doctl(cp, r, "BUTTON",
-                      WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-                      0,
-                      j==0 ? b1text : b2text, j==0 ? b1id : b2id);
-            }
-        }
-        cp->ypos += height + GAPWITHIN;
-    }
-
-    /* The list box. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = LISTHEIGHT;
-    cp->ypos += r.bottom + GAPBETWEEN;
-    doctl(cp, r, "LISTBOX",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
-          LBS_USETABSTOPS,
-          WS_EX_CLIENTEDGE,
-          "", listid);
-}
-
-/*
- * Yet another special control: the character-class setter. A
- * static, then a list, then a line containing a
- * button-and-static-and-edit. 
- */
-static void charclass(struct ctlpos *cp, char *stext, int sid, int listid,
-                      char *btext, int bid, int eid, char *s2text, int s2id) {
-    RECT r;
-    const int height = (STATICHEIGHT > EDITHEIGHT && STATICHEIGHT > PUSHBTNHEIGHT ?
-                        STATICHEIGHT :
-                        EDITHEIGHT > PUSHBTNHEIGHT ?
-                        EDITHEIGHT : PUSHBTNHEIGHT);
-    const static int percents[] = { 30, 40, 30 };
-    int i, xpos, percent;
-    const int LISTHEIGHT = 66;
-
-    /* The static control. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
-    cp->ypos += r.bottom + GAPWITHIN;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
-
-    /* The list box. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = LISTHEIGHT;
-    cp->ypos += r.bottom + GAPWITHIN;
-    doctl(cp, r, "LISTBOX",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
-          LBS_USETABSTOPS,
-          WS_EX_CLIENTEDGE,
-          "", listid);
-
-    /* The button+static+edit. */
-    percent = xpos = 0;
-    for (i = 0; i < 3; i++) {
-        r.left = xpos + GAPBETWEEN;
-        percent += percents[i];
-        xpos = (cp->width + GAPBETWEEN) * percent / 100;
-        r.right = xpos - r.left;
-        r.top = cp->ypos;
-        r.bottom = (i==0 ? PUSHBTNHEIGHT :
-                    i==1 ? STATICHEIGHT :
-                    EDITHEIGHT);
-        r.top += (height-r.bottom)/2;
-        if (i==0) {
-            doctl(cp, r, "BUTTON",
-                  WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-                  0, btext, bid);
-        } else if (i==1) {
-            doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_CENTER,
-                  0, s2text, s2id);
-        } else if (i==2) {
-            doctl(cp, r, "EDIT",
-                  WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL,
-                  WS_EX_CLIENTEDGE, "", eid);
-        }
-    }
-    cp->ypos += height + GAPBETWEEN;
-}
-
 /*
- * A special control (horrors!). The colour editor. A static line;
- * then on the left, a list box, and on the right, a sequence of
- * two-part statics followed by a button.
+ * Null dialog procedure.
  */
-static void colouredit(struct ctlpos *cp, char *stext, int sid, int listid,
-                       char *btext, int bid, ...) {
-    RECT r;
-    int y;
-    va_list ap;
-    int lwid, rwid, rpos;
-    const int LISTHEIGHT = 66;
-
-    /* The static control. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = cp->width; r.bottom = STATICHEIGHT;
-    cp->ypos += r.bottom + GAPWITHIN;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, stext, sid);
-    
-    rpos = GAPBETWEEN + 2 * (cp->width + GAPBETWEEN) / 3;
-    lwid = rpos - 2*GAPBETWEEN;
-    rwid = cp->width + GAPBETWEEN - rpos;
-
-    /* The list box. */
-    r.left = GAPBETWEEN; r.top = cp->ypos;
-    r.right = lwid; r.bottom = LISTHEIGHT;
-    doctl(cp, r, "LISTBOX",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | LBS_HASSTRINGS |
-          LBS_USETABSTOPS,
-          WS_EX_CLIENTEDGE,
-          "", listid);
-
-    /* The statics. */
-    y = cp->ypos;
-    va_start(ap, bid);
-    while (1) {
-        char *ltext;
-        int lid, rid;
-        ltext = va_arg(ap, char *);
-        if (!ltext) break;
-        lid = va_arg(ap, int);
-        rid = va_arg(ap, int);
-        r.top = y; r.bottom = STATICHEIGHT;
-        y += r.bottom + GAPWITHIN;
-        r.left = rpos; r.right = rwid/2;
-        doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, ltext, lid);
-        r.left = rpos + r.right; r.right = rwid - r.right;
-        doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_RIGHT, 0, "", rid);
-    }
-    va_end(ap);
-
-    /* The button. */
-    r.top = y + 2*GAPWITHIN; r.bottom = PUSHBTNHEIGHT;
-    r.left = rpos; r.right = rwid;
-    doctl(cp, r, "BUTTON",
-          WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON,
-          0, btext, bid);
-
-    cp->ypos += LISTHEIGHT + GAPBETWEEN;
+static int CALLBACK NullDlgProc (HWND hwnd, UINT msg,
+                                 WPARAM wParam, LPARAM lParam) {
+    return 0;
 }
 
 static char savedsession[2048];
@@ -819,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,
@@ -829,6 +189,7 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
     IDC_PROTSTATIC,
     IDC_PROTRAW,
     IDC_PROTTELNET,
+    IDC_PROTRLOGIN,
     IDC_PROTSSH,
     IDC_SESSSTATIC,
     IDC_SESSEDIT,
@@ -839,10 +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_KEYBOARD1,
+    IDC_BOX_KEYBOARD2,
+    IDC_BOX_KEYBOARD3,
     IDC_DELSTATIC,
     IDC_DEL008,
     IDC_DEL127,
@@ -858,56 +231,79 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
     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_BOX_TERMINAL1,
+    IDC_BOX_TERMINAL2,
     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_BLINKTEXT,
-    IDC_LDISCTERM,
+    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_WINDOW3, IDC_BOXT_WINDOW3,
-    IDC_BOX_WINDOW4,
-    IDC_WINNAME,
-    IDC_BLINKCUR,
+    IDC_BOX_WINDOW1,
+    IDC_BOX_WINDOW2,
+    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_BOX_APPEARANCE2,
+    IDC_BOX_APPEARANCE3,
+    IDC_BOX_APPEARANCE4,
+    IDC_CURSORSTATIC,
+    IDC_CURBLOCK,
+    IDC_CURUNDER,
+    IDC_CURVERT,
+    IDC_BLINKCUR,
+    IDC_FONTSTATIC,
+    IDC_CHOOSEFONT,
+    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,
@@ -918,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,
@@ -935,16 +331,27 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
     IDC_EMRFC,
     telnetpanelend,
 
+    rloginpanelstart,
+    IDC_TITLE_RLOGIN,
+    IDC_BOX_RLOGIN1,
+    IDC_BOX_RLOGIN2,
+    IDC_R_TSSTATIC,
+    IDC_R_TSEDIT,
+    IDC_RLLUSERSTATIC,
+    IDC_RLLUSEREDIT,
+    rloginpanelend,
+
     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,
     IDC_CIPHERBLOWF,
     IDC_CIPHERDES,
+    IDC_BUGGYMAC,
     IDC_AUTHTIS,
     IDC_PKSTATIC,
     IDC_PKEDIT,
@@ -955,12 +362,13 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
     IDC_AGENTFWD,
     IDC_CMDSTATIC,
     IDC_CMDEDIT,
+    IDC_COMPRESS,
     sshpanelend,
 
     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,
@@ -973,12 +381,12 @@ 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_STATIC,
-    IDC_LIST,
+    IDC_COLOURSTATIC,
+    IDC_COLOURLIST,
     IDC_RSTATIC,
     IDC_GSTATIC,
     IDC_BSTATIC,
@@ -990,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,
@@ -1006,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
 };
 
@@ -1046,10 +462,21 @@ 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 :
-                     cfg.protocol==PROT_TELNET ? IDC_PROTTELNET : IDC_PROTRAW );
+                     cfg.protocol==PROT_TELNET ? IDC_PROTTELNET :
+                      cfg.protocol==PROT_RLOGIN ? IDC_PROTRLOGIN : IDC_PROTRAW );
     SetDlgItemInt (hwnd, IDC_PINGEDIT, cfg.ping_interval, FALSE);
 
     CheckRadioButton (hwnd, IDC_DEL008, IDC_DEL127,
@@ -1062,6 +489,8 @@ static void init_dlg_ctrls(HWND hwnd) {
                       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,
@@ -1069,8 +498,17 @@ static void init_dlg_ctrls(HWND hwnd) {
                      cfg.app_keypad ? IDC_KPAPPLIC : IDC_KPNORMAL);
     CheckDlgButton (hwnd, IDC_ALTF4, cfg.alt_f4);
     CheckDlgButton (hwnd, IDC_ALTSPACE, cfg.alt_space);
-    CheckDlgButton (hwnd, IDC_LDISCTERM, cfg.ldisc_term);
+    CheckDlgButton (hwnd, IDC_ALTONLY, cfg.alt_only);
+    CheckDlgButton (hwnd, IDC_COMPOSEKEY, cfg.compose_key);
+    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);
 
     CheckDlgButton (hwnd, IDC_WRAPMODE, cfg.wrap_mode);
     CheckDlgButton (hwnd, IDC_DECOM, cfg.dec_om);
@@ -1086,6 +524,10 @@ 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);
     CheckDlgButton (hwnd, IDC_BLINKCUR, cfg.blink_cur);
     CheckDlgButton (hwnd, IDC_SCROLLBAR, cfg.scrollbar);
     CheckDlgButton (hwnd, IDC_LOCKSIZE, cfg.locksize);
@@ -1094,7 +536,14 @@ static void init_dlg_ctrls(HWND hwnd) {
 
     SetDlgItemText (hwnd, IDC_TTEDIT, cfg.termtype);
     SetDlgItemText (hwnd, IDC_TSEDIT, cfg.termspeed);
+    SetDlgItemText (hwnd, IDC_R_TSEDIT, cfg.termspeed);
+    SetDlgItemText (hwnd, IDC_RLLUSEREDIT, cfg.localusername);
     SetDlgItemText (hwnd, IDC_LOGEDIT, cfg.username);
+    SetDlgItemText (hwnd, IDC_LGFEDIT, cfg.logfilename);
+    CheckRadioButton(hwnd, IDC_LSTATOFF, IDC_LSTATRAW,
+                    cfg.logtype == 0 ? IDC_LSTATOFF :
+                    cfg.logtype == 1 ? IDC_LSTATASCII :
+                    IDC_LSTATRAW);
     {
        char *p = cfg.environmt;
        while (*p) {
@@ -1109,6 +558,8 @@ static void init_dlg_ctrls(HWND hwnd) {
     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,
                      cfg.cipher == CIPHER_BLOWFISH ? IDC_CIPHERBLOWF :
@@ -1139,13 +590,17 @@ static void init_dlg_ctrls(HWND hwnd) {
     CheckDlgButton (hwnd, IDC_BOLDCOLOUR, cfg.bold_colour);
     CheckDlgButton (hwnd, IDC_PALETTE, cfg.try_palette);
     {
-       int i;
+       int i, n;
+       n = SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_GETCOUNT, 0, 0);
+       for (i=n; i-- >0 ;)
+           SendDlgItemMessage (hwnd, IDC_COLOURLIST,
+                                   LB_DELETESTRING, i, 0);
        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);
@@ -1161,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 {
@@ -1201,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,
@@ -1214,10 +1053,13 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
     CHOOSEFONT cf;
     LOGFONT lf;
     char fontstatic[256];
+    char portname[32];
+    struct servent * service;
     int i;
 
     switch (msg) {
       case WM_INITDIALOG:
+       readytogo = 0;
        SetWindowLong(hwnd, GWL_USERDATA, 0);
        /*
         * Centre the window.
@@ -1252,7 +1094,7 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
            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 |
@@ -1269,331 +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[2].backend == NULL) {
-                   /* this is PuTTYtel, so only two protocols available */
-                   radioline(&cp, "Protocol:", IDC_PROTSTATIC, 3,
-                             "&Raw", IDC_PROTRAW,
-                             "&Telnet", IDC_PROTTELNET, NULL);
-               } else {
-                   radioline(&cp, "Protocol:", IDC_PROTSTATIC, 3,
-                             "&Raw", IDC_PROTRAW,
-                             "&Telnet", IDC_PROTTELNET,
-#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, "Stor&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] rmkh&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);
-           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);
-
-            treeview_insert(&tvfaff, 0, "Terminal");
-       }
-
-       /* The Keyboard panel. Accelerators used: [acgo] h?srvlxvnpmie */
-       {
-           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, "Change the initial state of:",
-                     IDC_BOX_KEYBOARD2, IDC_BOXT_KEYBOARD2);
-           radioline(&cp, "Initial state of cursor keys:", IDC_CURSTATIC, 2,
-                     "&Normal", IDC_CURNORMAL,
-                     "A&pplication", IDC_CURAPPLIC, NULL);
-           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);
-
-            treeview_insert(&tvfaff, 1, "Keyboard");
-       }
-
-        /* The Window panel. Accelerators used: [acgo] tibsdkw4y */
-       {
-           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",
-                     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);
-            endbox(&cp);
-            beginbox(&cp, "Control the scrollback in the window",
-                     IDC_BOX_WINDOW3, IDC_BOXT_WINDOW3);
-            staticedit(&cp, "Lines of &scrollback",
-                       IDC_SAVESTATIC, IDC_SAVEEDIT, 50);
-           checkbox(&cp, "&Display scrollbar", IDC_SCROLLBAR);
-           checkbox(&cp, "Reset scrollback on &keypress", IDC_SCROLLKEY);
-            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);
-            endbox(&cp);
-
-            treeview_insert(&tvfaff, 0, "Window");
-       }
-
-       /* 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_STATIC, IDC_LIST,
-                      "&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, "Minutes 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 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, 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);
-               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);
-                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);
 
@@ -1623,33 +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"))
+               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"))
+               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;
@@ -1670,16 +1226,19 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
            EndDialog (hwnd, 0);
            return 0;
          case IDC_PROTTELNET:
+         case IDC_PROTRLOGIN:
          case IDC_PROTSSH:
          case IDC_PROTRAW:
            if (HIWORD(wParam) == BN_CLICKED ||
                HIWORD(wParam) == BN_DOUBLECLICKED) {
                int i = IsDlgButtonChecked (hwnd, IDC_PROTSSH);
                int j = IsDlgButtonChecked (hwnd, IDC_PROTTELNET);
-               cfg.protocol = i ? PROT_SSH : j ? PROT_TELNET : PROT_RAW ;
-               if ((cfg.protocol == PROT_SSH && cfg.port == 23) ||
-                   (cfg.protocol == PROT_TELNET && cfg.port == 22)) {
-                   cfg.port = i ? 22 : 23;
+               int k = IsDlgButtonChecked (hwnd, IDC_PROTRLOGIN);
+               cfg.protocol = i ? PROT_SSH : j ? PROT_TELNET : k ? PROT_RLOGIN : PROT_RAW ;
+               if ((cfg.protocol == PROT_SSH && cfg.port != 22) ||
+                   (cfg.protocol == PROT_TELNET && cfg.port != 23) ||
+                   (cfg.protocol == PROT_RLOGIN && cfg.port != 513)) {
+                   cfg.port = i ? 22 : j ? 23 : 513;
                    SetDlgItemInt (hwnd, IDC_PORT, cfg.port, FALSE);
                }
            }
@@ -1690,8 +1249,16 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                                sizeof(cfg.host)-1);
            break;
          case IDC_PORT:
-           if (HIWORD(wParam) == EN_CHANGE)
-               MyGetDlgItemInt (hwnd, IDC_PORT, &cfg.port);
+           if (HIWORD(wParam) == EN_CHANGE) {
+               GetDlgItemText (hwnd, IDC_PORT, portname, 31);
+               if (isdigit(portname[0]))
+                   MyGetDlgItemInt (hwnd, IDC_PORT, &cfg.port);
+               else {
+                   service = getservbyname(portname, NULL);
+                   if (service) cfg.port = ntohs(service->s_port);
+                   else cfg.port = 0;
+               }
+           }
            break;
          case IDC_SESSEDIT:
            if (HIWORD(wParam) == EN_CHANGE) {
@@ -1753,6 +1320,8 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                init_dlg_ctrls(hwnd);
                 if (!isdef)
                     SetDlgItemText(hwnd, IDC_SESSEDIT, sessions[n]);
+               else
+                    SetDlgItemText(hwnd, IDC_SESSEDIT, "");
            }
            if (LOWORD(wParam) == IDC_SESSLIST) {
                /*
@@ -1840,6 +1409,16 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                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)
@@ -1850,16 +1429,51 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                HIWORD(wParam) == BN_DOUBLECLICKED)
                cfg.alt_space = IsDlgButtonChecked (hwnd, IDC_ALTSPACE);
            break;
-         case IDC_LDISCTERM:
+         case IDC_ALTONLY:
+           if (HIWORD(wParam) == BN_CLICKED ||
+               HIWORD(wParam) == BN_DOUBLECLICKED)
+               cfg.alt_only = IsDlgButtonChecked (hwnd, IDC_ALTONLY);
+           break;
+         case IDC_ECHOBACKEND:
+         case IDC_ECHOYES:
+         case IDC_ECHONO:
+           if (HIWORD(wParam) == BN_CLICKED ||
+               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 ||
                HIWORD(wParam) == BN_DOUBLECLICKED)
-               cfg.ldisc_term = IsDlgButtonChecked (hwnd, IDC_LDISCTERM);
+                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)
@@ -1936,6 +1550,26 @@ 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)
+               cfg.cursor_type = 0;
+           break;
+         case IDC_CURUNDER:
+           if (HIWORD(wParam) == BN_CLICKED ||
+               HIWORD(wParam) == BN_DOUBLECLICKED)
+               cfg.cursor_type = 1;
+           break;
+         case IDC_CURVERT:
+           if (HIWORD(wParam) == BN_CLICKED ||
+               HIWORD(wParam) == BN_DOUBLECLICKED)
+               cfg.cursor_type = 2;
+           break;
           case IDC_BLINKCUR:
             if (HIWORD(wParam) == BN_CLICKED ||
                 HIWORD(wParam) == BN_DOUBLECLICKED)
@@ -1971,9 +1605,47 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
            GetDlgItemText (hwnd, IDC_TTEDIT, cfg.termtype,
                            sizeof(cfg.termtype)-1);
            break;
+         case IDC_LGFEDIT:
+           if (HIWORD(wParam) == EN_CHANGE)
+           GetDlgItemText (hwnd, IDC_LGFEDIT, cfg.logfilename,
+                           sizeof(cfg.logfilename)-1);
+           break;
+         case IDC_LGFBUTTON:
+            memset(&of, 0, sizeof(of));
+#ifdef OPENFILENAME_SIZE_VERSION_400
+            of.lStructSize = OPENFILENAME_SIZE_VERSION_400;
+#else
+            of.lStructSize = sizeof(of);
+#endif
+            of.hwndOwner = hwnd;
+            of.lpstrFilter = "All Files\0*\0\0\0";
+            of.lpstrCustomFilter = NULL;
+            of.nFilterIndex = 1;
+            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.logfilename, filename);
+                SetDlgItemText (hwnd, IDC_LGFEDIT, cfg.logfilename);
+            }
+           break;
+         case IDC_LSTATOFF:
+         case IDC_LSTATASCII:
+         case IDC_LSTATRAW:
+           if (HIWORD(wParam) == BN_CLICKED ||
+               HIWORD(wParam) == BN_DOUBLECLICKED) {
+               if (IsDlgButtonChecked (hwnd, IDC_LSTATOFF)) cfg.logtype = 0;
+               if (IsDlgButtonChecked (hwnd, IDC_LSTATASCII)) cfg.logtype = 1;
+               if (IsDlgButtonChecked (hwnd, IDC_LSTATRAW)) cfg.logtype = 2;
+           }
+           break;
          case IDC_TSEDIT:
+         case IDC_R_TSEDIT:
            if (HIWORD(wParam) == EN_CHANGE)
-               GetDlgItemText (hwnd, IDC_TSEDIT, cfg.termspeed,
+               GetDlgItemText (hwnd, LOWORD(wParam), cfg.termspeed,
                                sizeof(cfg.termspeed)-1);
            break;
          case IDC_LOGEDIT:
@@ -1981,6 +1653,11 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                GetDlgItemText (hwnd, IDC_LOGEDIT, cfg.username,
                                sizeof(cfg.username)-1);
            break;
+         case IDC_RLLUSEREDIT:
+           if (HIWORD(wParam) == EN_CHANGE)
+               GetDlgItemText (hwnd, IDC_RLLUSEREDIT, cfg.localusername,
+                               sizeof(cfg.localusername)-1);
+           break;
          case IDC_EMBSD:
          case IDC_EMRFC:
            cfg.rfc_environ = IsDlgButtonChecked (hwnd, IDC_EMRFC);
@@ -2059,6 +1736,16 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                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)
+               cfg.buggymac = IsDlgButtonChecked (hwnd, IDC_BUGGYMAC);
+           break;
          case IDC_AGENTFWD:
            if (HIWORD(wParam) == BN_CLICKED ||
                HIWORD(wParam) == BN_DOUBLECLICKED)
@@ -2159,18 +1846,16 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                HIWORD(wParam) == BN_DOUBLECLICKED) {
                int n, i;
                cfg.bold_colour = IsDlgButtonChecked (hwnd, IDC_BOLDCOLOUR);
-               n = SendDlgItemMessage (hwnd, IDC_LIST, LB_GETCOUNT, 0, 0);
-               if (cfg.bold_colour && n!=22) {
-                   for (i=0; i<22; i++)
-                       if (!permcolour[i])
-                           SendDlgItemMessage (hwnd, IDC_LIST,
-                                               LB_INSERTSTRING, i,
-                                               (LPARAM) colours[i]);
-               } else if (!cfg.bold_colour && n!=12) {
-                   for (i=22; i-- ;)
-                       if (!permcolour[i])
-                           SendDlgItemMessage (hwnd, IDC_LIST,
+               n = SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_GETCOUNT, 0, 0);
+               if (n != 12+10*cfg.bold_colour) {
+                   for (i=n; i-- >0 ;)
+                       SendDlgItemMessage (hwnd, IDC_COLOURLIST,
                                                LB_DELETESTRING, i, 0);
+                   for (i=0; i<22; i++)
+                       if (cfg.bold_colour || permcolour[i])
+                           SendDlgItemMessage (hwnd, IDC_COLOURLIST, 
+                                               LB_ADDSTRING, 0,
+                                               (LPARAM) colours[i]);
                }
            }
            break;
@@ -2179,10 +1864,10 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                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);
@@ -2196,7 +1881,7 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                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);
@@ -2251,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:
@@ -2288,6 +1983,21 @@ static int CALLBACK ReconfDlgProc (HWND hwnd, UINT msg,
     return GenericMainDlgProc (hwnd, msg, wParam, lParam, 1);
 }
 
+void defuse_showwindow(void) {
+    /*
+     * Work around the fact that the app's first call to ShowWindow
+     * will ignore the default in favour of the shell-provided
+     * setting.
+     */
+    {
+        HWND hwnd;
+        hwnd = CreateDialog (hinst, MAKEINTRESOURCE(IDD_ABOUTBOX),
+                             NULL, NullDlgProc);
+        ShowWindow(hwnd, SW_HIDE);
+        DestroyWindow(hwnd);
+    }
+}
+
 int do_config (void) {
     int ret;
 
@@ -2307,8 +2017,6 @@ int do_reconfig (HWND hwnd) {
     ret = DialogBox (hinst, MAKEINTRESOURCE(IDD_RECONF), hwnd, ReconfDlgProc);
     if (!ret)
        cfg = backup_cfg;              /* structure copy */
-    else
-        force_normal(hwnd);
 
     return ret;
 }
@@ -2336,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,
@@ -2413,3 +2118,30 @@ void verify_ssh_host_key(char *host, int port, char *keytype,
         store_host_key(host, port, keytype, keystr);
     }
 }
+
+/*
+ * Ask whether to wipe a session log file before writing to it.
+ * Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
+ */
+int askappend(char *filename) {
+    static const char mbtitle[] = "PuTTY Log to File";
+    static const char msgtemplate[] =
+       "The session log file \"%.*s\" already exists.\n"
+       "You can overwrite it with a new session log,\n"
+       "append your session log to the end of it,\n"
+       "or disable session logging for this session.\n"
+       "Hit Yes to wipe the file, No to append to it,\n"
+       "or Cancel to disable logging.";
+    char message[sizeof(msgtemplate) + FILENAME_MAX];
+    int mbret;
+    sprintf(message, msgtemplate, FILENAME_MAX, filename);
+
+    mbret = MessageBox(NULL, message, mbtitle,
+                       MB_ICONQUESTION | MB_YESNOCANCEL);
+    if (mbret == IDYES)
+       return 2;
+    else if (mbret == IDNO)
+       return 1;
+    else
+       return 0;
+}