Introduced wrapper macros snew(), snewn() and sresize() for the
[u/mdw/putty] / window.c
index 01acb83..5d6b2cf 100644 (file)
--- a/window.c
+++ b/window.c
@@ -1,6 +1,7 @@
 #include <windows.h>
 #include <imm.h>
 #include <commctrl.h>
+#include <richedit.h>
 #include <mmsystem.h>
 #ifndef AUTO_WINSOCK
 #ifdef WINSOCK_TWO
 #endif
 #endif
 
+#ifndef NO_MULTIMON
+#if WINVER < 0x0500
+#define COMPILE_MULTIMON_STUBS
+#include <multimon.h>
+#endif
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <time.h>
+#include <assert.h>
 
 #define PUTTY_DO_GLOBALS              /* actually _define_ globals */
 #include "putty.h"
+#include "terminal.h"
 #include "winstuff.h"
 #include "storage.h"
 #include "win_res.h"
 #define IDM_TEL_SUSP  0x0110
 #define IDM_TEL_EOR   0x0120
 #define IDM_TEL_EOF   0x0130
-#define IDM_ABOUT     0x0140
-#define IDM_SAVEDSESS 0x0150
-#define IDM_COPYALL   0x0160
-#define IDM_FULLSCREEN 0x0170
+#define IDM_HELP      0x0140
+#define IDM_ABOUT     0x0150
+#define IDM_SAVEDSESS 0x0160
+#define IDM_COPYALL   0x0170
+#define IDM_FULLSCREEN 0x0180
 
 #define IDM_SESSLGP   0x0250          /* log type printable */
 #define IDM_SESSLGA   0x0260          /* log type all chars */
 #define IDM_SAVED_MAX 0x2000
 
 #define WM_IGNORE_CLIP (WM_XUSER + 2)
+#define WM_FULLSCR_ON_MAX (WM_XUSER + 3)
 
 /* Needed for Chinese support and apparently not always defined. */
 #ifndef VK_PROCESSKEY
 #define VK_PROCESSKEY 0xE5
 #endif
 
-/* Needed for mouse wheel support and not defined in earlier SDKs. */
+/* Mouse wheel support. */
 #ifndef WM_MOUSEWHEEL
-#define WM_MOUSEWHEEL 0x020A
+#define WM_MOUSEWHEEL 0x020A          /* not defined in earlier SDKs */
+#endif
+#ifndef WHEEL_DELTA
+#define WHEEL_DELTA 120
 #endif
 
+static Mouse_Button translate_button(Mouse_Button button);
 static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
                        unsigned char *output);
@@ -71,10 +87,15 @@ static void init_palette(void);
 static void init_fonts(int, int);
 static void another_font(int);
 static void deinit_fonts(void);
+static void set_input_locale(HKL);
+
+static int is_full_screen(void);
+static void make_full_screen(void);
+static void clear_full_screen(void);
+static void flip_full_screen(void);
 
 /* Window layout information */
 static void reset_window(int);
-static int full_screen = 0;
 static int extra_width, extra_height;
 static int font_width, font_height, font_dualwidth;
 static int offset_width, offset_height;
@@ -86,10 +107,27 @@ static WPARAM pend_netevent_wParam = 0;
 static LPARAM pend_netevent_lParam = 0;
 static void enact_pending_netevent(void);
 static void flash_window(int mode);
-static void flip_full_screen(void);
+static void sys_cursor_update(void);
+static int is_shift_pressed(void);
+static int get_fullscreen_rect(RECT * ss);
 
 static time_t last_movement = 0;
 
+static int caret_x = -1, caret_y = -1;
+
+static int kbd_codepage;
+
+static void *ldisc;
+static Backend *back;
+static void *backhandle;
+
+static struct unicode_data ucsdata;
+static int session_closed;
+
+Config cfg;                           /* exported to windlg.c */
+
+extern struct sesslist sesslist;       /* imported from windlg.c */
+
 #define FONT_NORMAL 0
 #define FONT_BOLD 1
 #define FONT_UNDERLINE 2
@@ -106,6 +144,7 @@ static time_t last_movement = 0;
 #define FONT_MAXNO     0x2F
 #define FONT_SHIFT     5
 static HFONT fonts[FONT_MAXNO];
+static LOGFONT lfont;
 static int fontflag[FONT_MAXNO];
 static enum {
     BOLD_COLOURS, BOLD_SHADOW, BOLD_FONT
@@ -136,10 +175,14 @@ static char *window_name, *icon_name;
 
 static int compose_state = 0;
 
+static int wsa_started = 0;
+
 static OSVERSIONINFO osVersion;
 
+static UINT wm_mousewheel = WM_MOUSEWHEEL;
+
 /* Dummy routine, only required in plink. */
-void ldisc_update(int echo, int edit)
+void ldisc_update(void *frontend, int echo, int edit)
 {
 }
 
@@ -167,6 +210,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        WSACleanup();
        return 1;
     }
+    wsa_started = 1;
     /* WISHLIST: maybe allow config tweaking even if winsock not present? */
     sk_init();
 
@@ -187,66 +231,74 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     }
 
     /*
+     * If we're running a version of Windows that doesn't support
+     * WM_MOUSEWHEEL, find out what message number we should be
+     * using instead.
+     */
+    if (osVersion.dwMajorVersion < 4 ||
+       (osVersion.dwMajorVersion == 4 && 
+        osVersion.dwPlatformId != VER_PLATFORM_WIN32_NT))
+       wm_mousewheel = RegisterWindowMessage("MSWHEEL_ROLLMSG");
+
+    /*
+     * See if we can find our Help file.
+     */
+    {
+        char b[2048], *p, *q, *r;
+        FILE *fp;
+        GetModuleFileName(NULL, b, sizeof(b) - 1);
+        r = b;
+        p = strrchr(b, '\\');
+        if (p && p >= r) r = p+1;
+        q = strrchr(b, ':');
+        if (q && q >= r) r = q+1;
+        strcpy(r, "putty.hlp");
+        if ( (fp = fopen(b, "r")) != NULL) {
+            help_path = dupstr(b);
+            fclose(fp);
+        } else
+            help_path = NULL;
+        strcpy(r, "putty.cnt");
+        if ( (fp = fopen(b, "r")) != NULL) {
+            help_has_contents = TRUE;
+            fclose(fp);
+        } else
+            help_has_contents = FALSE;
+    }
+
+    /*
      * Process the command line.
      */
     {
        char *p;
+       int got_host = 0;
 
-       default_protocol = DEFAULT_PROTOCOL;
-       default_port = DEFAULT_PORT;
+       default_protocol = be_default_protocol;
+       /* Find the appropriate default port. */
+       {
+           int i;
+           default_port = 0; /* illegal */
+           for (i = 0; backends[i].backend != NULL; i++)
+               if (backends[i].protocol == default_protocol) {
+                   default_port = backends[i].backend->default_port;
+                   break;
+               }
+       }
        cfg.logtype = LGTYP_NONE;
 
        do_defaults(NULL, &cfg);
 
        p = cmdline;
-       while (*p && isspace(*p))
-           p++;
 
        /*
-        * Process command line options first. Yes, this can be
-        * done better, and it will be as soon as I have the
-        * energy...
+        * Process a couple of command-line options which are more
+        * easily dealt with before the line is broken up into
+        * words. These are the soon-to-be-defunct @sessionname and
+        * the internal-use-only &sharedmemoryhandle, neither of
+        * which are combined with anything else.
         */
-       while (*p == '-') {
-           char *q = p + strcspn(p, " \t");
+       while (*p && isspace(*p))
            p++;
-           if (q == p + 3 &&
-               tolower(p[0]) == 's' &&
-               tolower(p[1]) == 's' && tolower(p[2]) == 'h') {
-               default_protocol = cfg.protocol = PROT_SSH;
-               default_port = cfg.port = 22;
-           } else if (q == p + 7 &&
-                      tolower(p[0]) == 'c' &&
-                      tolower(p[1]) == 'l' &&
-                      tolower(p[2]) == 'e' &&
-                      tolower(p[3]) == 'a' &&
-                      tolower(p[4]) == 'n' &&
-                      tolower(p[5]) == 'u' && tolower(p[6]) == 'p') {
-               /*
-                * `putty -cleanup'. Remove all registry entries
-                * associated with PuTTY, and also find and delete
-                * the random seed file.
-                */
-               if (MessageBox(NULL,
-                              "This procedure will remove ALL Registry\n"
-                              "entries associated with PuTTY, and will\n"
-                              "also remove the PuTTY random seed file.\n"
-                              "\n"
-                              "THIS PROCESS WILL DESTROY YOUR SAVED\n"
-                              "SESSIONS. Are you really sure you want\n"
-                              "to continue?",
-                              "PuTTY Warning",
-                              MB_YESNO | MB_ICONWARNING) == IDYES) {
-                   cleanup_all();
-               }
-               exit(0);
-           }
-           p = q + strspn(q, " \t");
-       }
-
-       /*
-        * An initial @ means to activate a saved session.
-        */
        if (*p == '@') {
            int i = strlen(p);
            while (i > 1 && isspace(p[i - 1]))
@@ -276,53 +328,110 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
                WSACleanup();
                return 0;
            }
-       } else if (*p) {
-           char *q = p;
+       } else {
            /*
-            * If the hostname starts with "telnet:", set the
-            * protocol to Telnet and process the string as a
-            * Telnet URL.
+            * Otherwise, break up the command line and deal with
+            * it sensibly.
             */
-           if (!strncmp(q, "telnet:", 7)) {
-               char c;
-
-               q += 7;
-               if (q[0] == '/' && q[1] == '/')
-                   q += 2;
-               cfg.protocol = PROT_TELNET;
-               p = q;
-               while (*p && *p != ':' && *p != '/')
-                   p++;
-               c = *p;
-               if (*p)
-                   *p++ = '\0';
-               if (c == ':')
-                   cfg.port = atoi(p);
-               else
-                   cfg.port = -1;
-               strncpy(cfg.host, q, sizeof(cfg.host) - 1);
-               cfg.host[sizeof(cfg.host) - 1] = '\0';
-           } else {
-               while (*p && !isspace(*p))
-                   p++;
-               if (*p)
-                   *p++ = '\0';
-               strncpy(cfg.host, q, sizeof(cfg.host) - 1);
-               cfg.host[sizeof(cfg.host) - 1] = '\0';
-               while (*p && isspace(*p))
-                   p++;
-               if (*p)
-                   cfg.port = atoi(p);
-               else
-                   cfg.port = -1;
-           }
-       } else {
-           if (!do_config()) {
-               WSACleanup();
-               return 0;
+           int argc, i;
+           char **argv;
+           
+           split_into_argv(cmdline, &argc, &argv, NULL);
+
+           for (i = 0; i < argc; i++) {
+               char *p = argv[i];
+               int ret;
+
+               ret = cmdline_process_param(p, i+1<argc?argv[i+1]:NULL,
+                                           1, &cfg);
+               if (ret == -2) {
+                   cmdline_error("option \"%s\" requires an argument", p);
+               } else if (ret == 2) {
+                   i++;               /* skip next argument */
+               } else if (ret == 1) {
+                   continue;          /* nothing further needs doing */
+               } else if (!strcmp(p, "-cleanup")) {
+                   /*
+                    * `putty -cleanup'. Remove all registry
+                    * entries associated with PuTTY, and also find
+                    * and delete the random seed file.
+                    */
+                   if (MessageBox(NULL,
+                                  "This procedure will remove ALL Registry\n"
+                                  "entries associated with PuTTY, and will\n"
+                                  "also remove the PuTTY random seed file.\n"
+                                  "\n"
+                                  "THIS PROCESS WILL DESTROY YOUR SAVED\n"
+                                  "SESSIONS. Are you really sure you want\n"
+                                  "to continue?",
+                                  "PuTTY Warning",
+                                  MB_YESNO | MB_ICONWARNING) == IDYES) {
+                       cleanup_all();
+                   }
+                   exit(0);
+               } else if (*p != '-') {
+                   char *q = p;
+                   if (got_host) {
+                       /*
+                        * If we already have a host name, treat
+                        * this argument as a port number. NB we
+                        * have to treat this as a saved -P
+                        * argument, so that it will be deferred
+                        * until it's a good moment to run it.
+                        */
+                       int ret = cmdline_process_param("-P", p, 1, &cfg);
+                       assert(ret == 2);
+                   } else if (!strncmp(q, "telnet:", 7)) {
+                       /*
+                        * If the hostname starts with "telnet:",
+                        * set the protocol to Telnet and process
+                        * the string as a Telnet URL.
+                        */
+                       char c;
+
+                       q += 7;
+                       if (q[0] == '/' && q[1] == '/')
+                           q += 2;
+                       cfg.protocol = PROT_TELNET;
+                       p = q;
+                       while (*p && *p != ':' && *p != '/')
+                           p++;
+                       c = *p;
+                       if (*p)
+                           *p++ = '\0';
+                       if (c == ':')
+                           cfg.port = atoi(p);
+                       else
+                           cfg.port = -1;
+                       strncpy(cfg.host, q, sizeof(cfg.host) - 1);
+                       cfg.host[sizeof(cfg.host) - 1] = '\0';
+                       got_host = 1;
+                   } else {
+                       /*
+                        * Otherwise, treat this argument as a host
+                        * name.
+                        */
+                       while (*p && !isspace(*p))
+                           p++;
+                       if (*p)
+                           *p++ = '\0';
+                       strncpy(cfg.host, q, sizeof(cfg.host) - 1);
+                       cfg.host[sizeof(cfg.host) - 1] = '\0';
+                       got_host = 1;
+                   }
+               } else {
+                   cmdline_error("unknown option \"%s\"", p);
+               }
            }
        }
 
+       cmdline_run_saved(&cfg);
+
+       if (!*cfg.host && !do_config()) {
+           WSACleanup();
+           return 0;
+       }
+
        /*
         * Trim leading whitespace off the hostname if it's there.
         */
@@ -348,6 +457,21 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
         * Trim a colon suffix off the hostname if it's there.
         */
        cfg.host[strcspn(cfg.host, ":")] = '\0';
+
+       /*
+        * Remove any remaining whitespace from the hostname.
+        */
+       {
+           int p1 = 0, p2 = 0;
+           while (cfg.host[p2] != '\0') {
+               if (cfg.host[p2] != ' ' && cfg.host[p2] != '\t') {
+                   cfg.host[p1] = cfg.host[p2];
+                   p1++;
+               }
+               p2++;
+           }
+           cfg.host[p1] = '\0';
+       }
     }
 
     /*
@@ -395,8 +519,11 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
     hwnd = NULL;
 
-    savelines = cfg.savelines;
-    term_init();
+    memset(&ucsdata, 0, sizeof(ucsdata));
+
+    term = term_init(&cfg, &ucsdata, NULL);
+    logctx = log_init(NULL, &cfg);
+    term_provide_logctx(term, logctx);
 
     cfgtopalette();
 
@@ -411,13 +538,12 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     font_height = 20;
     extra_width = 25;
     extra_height = 28;
-    term_size(cfg.height, cfg.width, cfg.savelines);
-    guess_width = extra_width + font_width * cols;
-    guess_height = extra_height + font_height * rows;
+    term_size(term, cfg.height, cfg.width, cfg.savelines);
+    guess_width = extra_width + font_width * term->cols;
+    guess_height = extra_height + font_height * term->rows;
     {
        RECT r;
-       HWND w = GetDesktopWindow();
-       GetWindowRect(w, &r);
+               get_fullscreen_rect(&r);
        if (guess_width > r.right - r.left)
            guess_width = r.right - r.left;
        if (guess_height > r.bottom - r.top)
@@ -463,8 +589,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      * Resize the window, now we know what size we _really_ want it
      * to be.
      */
-    guess_width = extra_width + font_width * cols;
-    guess_height = extra_height + font_height * rows;
+    guess_width = extra_width + font_width * term->cols;
+    guess_height = extra_height + font_height * term->rows;
     SetWindowPos(hwnd, NULL, 0, 0, guess_width, guess_height,
                 SWP_NOMOVE | SWP_NOREDRAW | SWP_NOZORDER);
 
@@ -474,7 +600,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     {
        char *bits;
        int size = (font_width + 15) / 16 * 2 * font_height;
-       bits = smalloc(size);
+       bits = snewn(size, char);
        memset(bits, 0, size);
        caretbm = CreateBitmap(font_width, font_height, 1, 1, bits);
        sfree(bits);
@@ -490,8 +616,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        si.cbSize = sizeof(si);
        si.fMask = SIF_ALL | SIF_DISABLENOSCROLL;
        si.nMin = 0;
-       si.nMax = rows - 1;
-       si.nPage = rows;
+       si.nMax = term->rows - 1;
+       si.nPage = term->rows;
        si.nPos = 0;
        SetScrollInfo(hwnd, SB_VERT, &si, FALSE);
     }
@@ -504,7 +630,9 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        char msg[1024], *title;
        char *realhost;
 
-       error = back->init(cfg.host, cfg.port, &realhost);
+       error = back->init((void *)term, &backhandle, &cfg,
+                          cfg.host, cfg.port, &realhost, cfg.tcp_nodelay);
+       back->provide_logctx(backhandle, logctx);
        if (error) {
            sprintf(msg, "Unable to open connection to\n"
                    "%.800s\n" "%s", cfg.host, error);
@@ -519,10 +647,20 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
            title = msg;
        }
        sfree(realhost);
-       set_title(title);
-       set_icon(title);
+       set_title(NULL, title);
+       set_icon(NULL, title);
     }
 
+    /*
+     * Connect the terminal to the backend for resize purposes.
+     */
+    term_provide_resize_fn(term, back->size, backhandle);
+
+    /*
+     * Set up a line discipline.
+     */
+    ldisc = ldisc_create(&cfg, term, back, backhandle, NULL);
+
     session_closed = FALSE;
 
     /*
@@ -568,10 +706,12 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        AppendMenu(m, MF_ENABLED, IDM_NEWSESS, "Ne&w Session...");
        AppendMenu(m, MF_ENABLED, IDM_DUPSESS, "&Duplicate Session");
        s = CreateMenu();
-       get_sesslist(TRUE);
-       for (i = 1; i < ((nsessions < 256) ? nsessions : 256); i++)
+       get_sesslist(&sesslist, TRUE);
+       for (i = 1;
+            i < ((sesslist.nsessions < 256) ? sesslist.nsessions : 256);
+            i++)
            AppendMenu(s, MF_ENABLED, IDM_SAVED_MIN + (16 * i),
-                      sessions[i]);
+                      sesslist.sessions[i]);
        AppendMenu(m, MF_POPUP | MF_ENABLED, (UINT) s, "Sa&ved Sessions");
        AppendMenu(m, MF_ENABLED, IDM_RECONF, "Chan&ge Settings...");
        AppendMenu(m, MF_SEPARATOR, 0, 0);
@@ -579,21 +719,29 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        AppendMenu(m, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback");
        AppendMenu(m, MF_ENABLED, IDM_RESET, "Rese&t Terminal");
        AppendMenu(m, MF_SEPARATOR, 0, 0);
-       AppendMenu(m, MF_ENABLED, IDM_FULLSCREEN, "&Full Screen");
+       AppendMenu(m, (cfg.resize_action == RESIZE_DISABLED) ?
+                  MF_GRAYED : MF_ENABLED, IDM_FULLSCREEN, "&Full Screen");
        AppendMenu(m, MF_SEPARATOR, 0, 0);
+        if (help_path)
+            AppendMenu(m, MF_ENABLED, IDM_HELP, "&Help");
        AppendMenu(m, MF_ENABLED, IDM_ABOUT, "&About PuTTY");
     }
 
     /*
-     * Finally show the window!
+     * Set up the initial input locale.
      */
-    ShowWindow(hwnd, show);
-    SetForegroundWindow(hwnd);
+    set_input_locale(GetKeyboardLayout(0));
 
     /*
      * Open the initial log file if there is one.
      */
-    logfopen();
+    logfopen(logctx);
+
+    /*
+     * Finally show the window!
+     */
+    ShowWindow(hwnd, show);
+    SetForegroundWindow(hwnd);
 
     /*
      * Set the palette up.
@@ -602,7 +750,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     logpal = NULL;
     init_palette();
 
-    has_focus = (GetForegroundWindow() == hwnd);
+    term->has_focus = (GetForegroundWindow() == hwnd);
     UpdateWindow(hwnd);
 
     if (GetMessage(&msg, NULL, 0, 0) == 1) {
@@ -625,10 +773,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
                DispatchMessage(&msg);
 
            /* Make sure we blink everything that needs it. */
-           term_blink(0);
+           term_blink(term, 0);
 
            /* Send the paste buffer if there's anything to send */
-           term_paste();
+           term_paste(term);
 
            /* If there's nothing new in the queue then we can do everything
             * we've delayed, reading the socket, writing, and repainting
@@ -641,7 +789,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
                enact_pending_netevent();
 
                /* Force the cursor blink on */
-               term_blink(1);
+               term_blink(term, 1);
 
                if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
                    continue;
@@ -656,16 +804,22 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
                timer_id = 0;
            }
            HideCaret(hwnd);
-           term_out();
-           term_update();
+           if (GetCapture() != hwnd || 
+               (send_raw_mouse &&
+                !(cfg.mouse_override && is_shift_pressed())))
+               term_out(term);
+           term_update(term);
            ShowCaret(hwnd);
 
            flash_window(1);           /* maintain */
 
-           if (in_vbell)
+           /* The messages seem unreliable; especially if we're being tricky */
+           term->has_focus = (GetForegroundWindow() == hwnd);
+
+           if (term->in_vbell)
                /* Hmm, term_update didn't want to do an update too soon ... */
                timer_id = SetTimer(hwnd, 1, 50, NULL);
-           else if (!has_focus)
+           else if (!term->has_focus)
                timer_id = SetTimer(hwnd, 1, 500, NULL);
            else
                timer_id = SetTimer(hwnd, 1, 100, NULL);
@@ -680,6 +834,15 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        }
     }
 
+    cleanup_exit(msg.wParam);         /* this doesn't return... */
+    return msg.wParam;                /* ... but optimiser doesn't know */
+}
+
+/*
+ * Clean up and exit.
+ */
+void cleanup_exit(int code)
+{
     /*
      * Clean up.
      */
@@ -687,7 +850,9 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     sfree(logpal);
     if (pal)
        DeleteObject(pal);
-    WSACleanup();
+    sk_cleanup();
+    if (wsa_started)
+       WSACleanup();
 
     if (cfg.protocol == PROT_SSH) {
        random_save_seed();
@@ -696,7 +861,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 #endif
     }
 
-    return msg.wParam;
+    exit(code);
 }
 
 /*
@@ -728,8 +893,9 @@ char *do_select(SOCKET skt, int startup)
 /*
  * set or clear the "raw mouse message" mode
  */
-void set_raw_mouse_mode(int activate)
+void set_raw_mouse_mode(void *frontend, int activate)
 {
+    activate = activate && !cfg.no_mouse_rep;
     send_raw_mouse = activate;
     SetCursor(LoadCursor(NULL, activate ? IDC_ARROW : IDC_IBEAM));
 }
@@ -737,7 +903,7 @@ void set_raw_mouse_mode(int activate)
 /*
  * Print a message box and close the connection.
  */
-void connection_fatal(char *fmt, ...)
+void connection_fatal(void *frontend, char *fmt, ...)
 {
     va_list ap;
     char stuff[200];
@@ -746,15 +912,31 @@ void connection_fatal(char *fmt, ...)
     vsprintf(stuff, fmt, ap);
     va_end(ap);
     MessageBox(hwnd, stuff, "PuTTY Fatal Error", MB_ICONERROR | MB_OK);
-    if (cfg.close_on_exit == COE_ALWAYS)
+    if (cfg.close_on_exit == FORCE_ON)
        PostQuitMessage(1);
     else {
        session_closed = TRUE;
-       SetWindowText(hwnd, "PuTTY (inactive)");
+       set_icon(NULL, "PuTTY (inactive)");
+       set_title(NULL, "PuTTY (inactive)");
     }
 }
 
 /*
+ * Report an error at the command-line parsing stage.
+ */
+void cmdline_error(char *fmt, ...)
+{
+    va_list ap;
+    char stuff[200];
+
+    va_start(ap, fmt);
+    vsprintf(stuff, fmt, ap);
+    va_end(ap);
+    MessageBox(hwnd, stuff, "PuTTY Command Line Error", MB_ICONERROR | MB_OK);
+    exit(1);
+}
+
+/*
  * Actually do the job requested by a WM_NETEVENT
  */
 static void enact_pending_netevent(void)
@@ -775,11 +957,12 @@ static void enact_pending_netevent(void)
     if (ret == 0 && !session_closed) {
        /* Abnormal exits will already have set session_closed and taken
         * appropriate action. */
-       if (cfg.close_on_exit == COE_ALWAYS ||
-           cfg.close_on_exit == COE_NORMAL) PostQuitMessage(0);
+       if (cfg.close_on_exit == FORCE_ON ||
+           cfg.close_on_exit == AUTO) PostQuitMessage(0);
        else {
            session_closed = TRUE;
-           SetWindowText(hwnd, "PuTTY (inactive)");
+           set_icon(NULL, "PuTTY (inactive)");
+           set_title(NULL, "PuTTY (inactive)");
            MessageBox(hwnd, "Connection closed by remote host",
                       "PuTTY", MB_OK | MB_ICONINFORMATION);
        }
@@ -816,6 +999,10 @@ static void init_palette(void)
     HDC hdc = GetDC(hwnd);
     if (hdc) {
        if (cfg.try_palette && GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE) {
+           /*
+            * This is a genuine case where we must use smalloc
+            * because the snew macros can't cope.
+            */
            logpal = smalloc(sizeof(*logpal)
                             - sizeof(logpal->palPalEntry)
                             + NCOLOURS * sizeof(PALETTEENTRY));
@@ -879,7 +1066,7 @@ static void init_fonts(int pick_width, int pick_height)
     bold_mode = cfg.bold_colour ? BOLD_COLOURS : BOLD_FONT;
     und_mode = UND_FONT;
 
-    if (cfg.fontisbold) {
+    if (cfg.font.isbold) {
        fw_dontcare = FW_BOLD;
        fw_bold = FW_HEAVY;
     } else {
@@ -892,7 +1079,7 @@ static void init_fonts(int pick_width, int pick_height)
     if (pick_height)
        font_height = pick_height;
     else {
-       font_height = cfg.fontheight;
+       font_height = cfg.font.height;
        if (font_height > 0) {
            font_height =
                -MulDiv(font_height, GetDeviceCaps(hdc, LOGPIXELSY), 72);
@@ -904,9 +1091,24 @@ static void init_fonts(int pick_width, int pick_height)
     fonts[i] = CreateFont (font_height, font_width, 0, 0, w, FALSE, u, FALSE, \
                           c, OUT_DEFAULT_PRECIS, \
                           CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, \
-                          FIXED_PITCH | FF_DONTCARE, cfg.font)
-
-    f(FONT_NORMAL, cfg.fontcharset, fw_dontcare, FALSE);
+                          FIXED_PITCH | FF_DONTCARE, cfg.font.name)
+
+    f(FONT_NORMAL, cfg.font.charset, fw_dontcare, FALSE);
+
+    lfont.lfHeight = font_height;
+    lfont.lfWidth = font_width;
+    lfont.lfEscapement = 0;
+    lfont.lfOrientation  = 0;
+    lfont.lfWeight  = fw_dontcare;
+    lfont.lfItalic = FALSE;
+    lfont.lfUnderline = FALSE;
+    lfont.lfStrikeOut = FALSE;
+    lfont.lfCharSet = cfg.font.charset;
+    lfont.lfOutPrecision = OUT_DEFAULT_PRECIS;
+    lfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+    lfont.lfQuality = DEFAULT_QUALITY;
+    lfont.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
+    strncpy(lfont.lfFaceName, cfg.font.name, LF_FACESIZE);
 
     SelectObject(hdc, fonts[FONT_NORMAL]);
     GetTextMetrics(hdc, &tm);
@@ -929,19 +1131,18 @@ static void init_fonts(int pick_width, int pick_height)
 
        /* !!! Yes the next line is right */
        if (cset == OEM_CHARSET)
-           font_codepage = GetOEMCP();
+           ucsdata.font_codepage = GetOEMCP();
        else
-           if (TranslateCharsetInfo
-               ((DWORD *) cset, &info, TCI_SRCCHARSET)) font_codepage =
-               info.ciACP;
+           if (TranslateCharsetInfo ((DWORD *) cset, &info, TCI_SRCCHARSET))
+               ucsdata.font_codepage = info.ciACP;
        else
-           font_codepage = -1;
+           ucsdata.font_codepage = -1;
 
-       GetCPInfo(font_codepage, &cpinfo);
-       dbcs_screenfont = (cpinfo.MaxCharSize > 1);
+       GetCPInfo(ucsdata.font_codepage, &cpinfo);
+       ucsdata.dbcs_screenfont = (cpinfo.MaxCharSize > 1);
     }
 
-    f(FONT_UNDERLINE, cfg.fontcharset, fw_dontcare, TRUE);
+    f(FONT_UNDERLINE, cfg.font.charset, fw_dontcare, TRUE);
 
     /*
      * Some fonts, e.g. 9-pt Courier, draw their underlines
@@ -992,7 +1193,7 @@ static void init_fonts(int pick_width, int pick_height)
     }
 
     if (bold_mode == BOLD_FONT) {
-       f(FONT_BOLD, cfg.fontcharset, fw_bold, FALSE);
+       f(FONT_BOLD, cfg.font.charset, fw_bold, FALSE);
     }
 #undef f
 
@@ -1026,7 +1227,7 @@ static void init_fonts(int pick_width, int pick_height)
     }
     fontflag[0] = fontflag[1] = fontflag[2] = 1;
 
-    init_ucs_tables();
+    init_ucs(&cfg, &ucsdata);
 }
 
 static void another_font(int fontno)
@@ -1043,7 +1244,7 @@ static void another_font(int fontno)
     if (basefont != fontno && !fontflag[basefont])
        another_font(basefont);
 
-    if (cfg.fontisbold) {
+    if (cfg.font.isbold) {
        fw_dontcare = FW_BOLD;
        fw_bold = FW_HEAVY;
     } else {
@@ -1051,10 +1252,10 @@ static void another_font(int fontno)
        fw_bold = FW_BOLD;
     }
 
-    c = cfg.fontcharset;
+    c = cfg.font.charset;
     w = fw_dontcare;
     u = FALSE;
-    s = cfg.font;
+    s = cfg.font.name;
     x = font_width;
 
     if (fontno & FONT_WIDE)
@@ -1088,18 +1289,18 @@ static void deinit_fonts(void)
     }
 }
 
-void request_resize(int w, int h)
+void request_resize(void *frontend, int w, int h)
 {
     int width, height;
 
     /* If the window is maximized supress resizing attempts */
     if (IsZoomed(hwnd)) {
-       if (cfg.resize_action != RESIZE_FONT)
+       if (cfg.resize_action == RESIZE_TERM)
            return;
     }
 
     if (cfg.resize_action == RESIZE_DISABLED) return;
-    if (h == rows && w == cols) return;
+    if (h == term->rows && w == term->cols) return;
 
     /* Sanity checks ... */
     {
@@ -1109,7 +1310,7 @@ void request_resize(int w, int h)
        switch (first_time) {
          case 1:
            /* Get the size of the screen */
-           if (GetClientRect(GetDesktopWindow(), &ss))
+           if (get_fullscreen_rect(&ss))
                /* first_time = 0 */ ;
            else {
                first_time = 2;
@@ -1129,9 +1330,9 @@ void request_resize(int w, int h)
        }
     }
 
-    term_size(h, w, cfg.savelines);
+    term_size(term, h, w, cfg.savelines);
 
-    if (cfg.resize_action != RESIZE_FONT) {
+    if (cfg.resize_action != RESIZE_FONT && !IsZoomed(hwnd)) {
        width = extra_width + font_width * w;
        height = extra_height + font_height * h;
 
@@ -1166,6 +1367,8 @@ static void reset_window(int reinit) {
     win_width  = cr.right - cr.left;
     win_height = cr.bottom - cr.top;
 
+    if (cfg.resize_action == RESIZE_DISABLED) reinit = 2;
+
     /* Are we being forced to reload the fonts ? */
     if (reinit>1) {
 #ifdef RDB_DEBUG_PATCH
@@ -1181,10 +1384,10 @@ static void reset_window(int reinit) {
 
     /* Is the window out of position ? */
     if ( !reinit && 
-           (offset_width != (win_width-font_width*cols)/2 ||
-            offset_height != (win_height-font_height*rows)/2) ){
-       offset_width = (win_width-font_width*cols)/2;
-       offset_height = (win_height-font_height*rows)/2;
+           (offset_width != (win_width-font_width*term->cols)/2 ||
+            offset_height != (win_height-font_height*term->rows)/2) ){
+       offset_width = (win_width-font_width*term->cols)/2;
+       offset_height = (win_height-font_height*term->rows)/2;
        InvalidateRect(hwnd, NULL, TRUE);
 #ifdef RDB_DEBUG_PATCH
        debug((27, "reset_window() -> Reposition terminal"));
@@ -1199,13 +1402,13 @@ static void reset_window(int reinit) {
        extra_width = wr.right - wr.left - cr.right + cr.left;
        extra_height = wr.bottom - wr.top - cr.bottom + cr.top;
 
-       if (cfg.resize_action == RESIZE_FONT) {
-           if (  font_width != win_width/cols || 
-                 font_height != win_height/rows) {
+       if (cfg.resize_action != RESIZE_TERM) {
+           if (  font_width != win_width/term->cols || 
+                 font_height != win_height/term->rows) {
                deinit_fonts();
-               init_fonts(win_width/cols, win_height/rows);
-               offset_width = (win_width-font_width*cols)/2;
-               offset_height = (win_height-font_height*rows)/2;
+               init_fonts(win_width/term->cols, win_height/term->rows);
+               offset_width = (win_width-font_width*term->cols)/2;
+               offset_height = (win_height-font_height*term->rows)/2;
                InvalidateRect(hwnd, NULL, TRUE);
 #ifdef RDB_DEBUG_PATCH
                debug((25, "reset_window() -> Z font resize to (%d, %d)",
@@ -1213,15 +1416,15 @@ static void reset_window(int reinit) {
 #endif
            }
        } else {
-           if (  font_width != win_width/cols || 
-                 font_height != win_height/rows) {
+           if (  font_width != win_width/term->cols || 
+                 font_height != win_height/term->rows) {
                /* Our only choice at this point is to change the 
                 * size of the terminal; Oh well.
                 */
-               term_size( win_height/font_height, win_width/font_width,
-                          cfg.savelines);
-               offset_width = (win_width-font_width*cols)/2;
-               offset_height = (win_height-font_height*rows)/2;
+               term_size(term, win_height/font_height, win_width/font_width,
+                         cfg.savelines);
+               offset_width = (win_width-font_width*term->cols)/2;
+               offset_height = (win_height-font_height*term->rows)/2;
                InvalidateRect(hwnd, NULL, TRUE);
 #ifdef RDB_DEBUG_PATCH
                debug((27, "reset_window() -> Zoomed term_size"));
@@ -1243,18 +1446,20 @@ static void reset_window(int reinit) {
        extra_width = wr.right - wr.left - cr.right + cr.left + offset_width*2;
        extra_height = wr.bottom - wr.top - cr.bottom + cr.top +offset_height*2;
 
-       if (win_width != font_width*cols + offset_width*2 ||
-           win_height != font_height*rows + offset_height*2) {
+       if (win_width != font_width*term->cols + offset_width*2 ||
+           win_height != font_height*term->rows + offset_height*2) {
 
            /* If this is too large windows will resize it to the maximum
             * allowed window size, we will then be back in here and resize
             * the font or terminal to fit.
             */
            SetWindowPos(hwnd, NULL, 0, 0, 
-                        font_width*cols + extra_width, 
-                        font_height*rows + extra_height,
+                        font_width*term->cols + extra_width, 
+                        font_height*term->rows + extra_height,
                         SWP_NOMOVE | SWP_NOZORDER);
        }
+
+       InvalidateRect(hwnd, NULL, TRUE);
        return;
     }
 
@@ -1262,42 +1467,61 @@ static void reset_window(int reinit) {
      * window. But that may be too big for the screen which forces us
      * to change the terminal.
      */
-    if ((cfg.resize_action != RESIZE_FONT  && reinit==0) || reinit>0) {
+    if ((cfg.resize_action == RESIZE_TERM && reinit<=0) ||
+        (cfg.resize_action == RESIZE_EITHER && reinit<0) ||
+           reinit>0) {
        offset_width = offset_height = cfg.window_border;
        extra_width = wr.right - wr.left - cr.right + cr.left + offset_width*2;
        extra_height = wr.bottom - wr.top - cr.bottom + cr.top +offset_height*2;
 
-       if (win_width != font_width*cols + offset_width*2 ||
-           win_height != font_height*rows + offset_height*2) {
+       if (win_width != font_width*term->cols + offset_width*2 ||
+           win_height != font_height*term->rows + offset_height*2) {
 
            static RECT ss;
            int width, height;
+               
+               get_fullscreen_rect(&ss);
 
-           GetClientRect(GetDesktopWindow(), &ss);
            width = (ss.right - ss.left - extra_width) / font_width;
            height = (ss.bottom - ss.top - extra_height) / font_height;
 
            /* Grrr too big */
-           if ( rows > height || cols > width ) {
-               if ( height > rows ) height = rows;
-               if ( width > cols )  width = cols;
-               term_size(height, width, cfg.savelines);
+           if ( term->rows > height || term->cols > width ) {
+               if (cfg.resize_action == RESIZE_EITHER) {
+                   /* Make the font the biggest we can */
+                   if (term->cols > width)
+                       font_width = (ss.right - ss.left - extra_width)
+                           / term->cols;
+                   if (term->rows > height)
+                       font_height = (ss.bottom - ss.top - extra_height)
+                           / term->rows;
+
+                   deinit_fonts();
+                   init_fonts(font_width, font_height);
+
+                   width = (ss.right - ss.left - extra_width) / font_width;
+                   height = (ss.bottom - ss.top - extra_height) / font_height;
+               } else {
+                   if ( height > term->rows ) height = term->rows;
+                   if ( width > term->cols )  width = term->cols;
+                   term_size(term, height, width, cfg.savelines);
 #ifdef RDB_DEBUG_PATCH
-               debug((27, "reset_window() -> term resize to (%d,%d)",
-                          height, width));
+                   debug((27, "reset_window() -> term resize to (%d,%d)",
+                              height, width));
 #endif
+               }
            }
            
            SetWindowPos(hwnd, NULL, 0, 0, 
-                        font_width*cols + extra_width, 
-                        font_height*rows + extra_height,
+                        font_width*term->cols + extra_width, 
+                        font_height*term->rows + extra_height,
                         SWP_NOMOVE | SWP_NOZORDER);
 
            InvalidateRect(hwnd, NULL, TRUE);
 #ifdef RDB_DEBUG_PATCH
            debug((27, "reset_window() -> window resize to (%d,%d)",
-                       font_width*cols + extra_width,
-                       font_height*rows + extra_height));
+                       font_width*term->cols + extra_width,
+                       font_height*term->rows + extra_height));
 #endif
        }
        return;
@@ -1305,14 +1529,14 @@ static void reset_window(int reinit) {
 
     /* We're allowed to or must change the font but do we want to ?  */
 
-    if (font_width != (win_width-cfg.window_border*2)/cols || 
-       font_height != (win_height-cfg.window_border*2)/rows) {
+    if (font_width != (win_width-cfg.window_border*2)/term->cols || 
+       font_height != (win_height-cfg.window_border*2)/term->rows) {
 
        deinit_fonts();
-       init_fonts((win_width-cfg.window_border*2)/cols, 
-                  (win_height-cfg.window_border*2)/rows);
-       offset_width = (win_width-font_width*cols)/2;
-       offset_height = (win_height-font_height*rows)/2;
+       init_fonts((win_width-cfg.window_border*2)/term->cols, 
+                  (win_height-cfg.window_border*2)/term->rows);
+       offset_width = (win_width-font_width*term->cols)/2;
+       offset_height = (win_height-font_height*term->rows)/2;
 
        extra_width = wr.right - wr.left - cr.right + cr.left +offset_width*2;
        extra_height = wr.bottom - wr.top - cr.bottom + cr.top+offset_height*2;
@@ -1325,13 +1549,24 @@ static void reset_window(int reinit) {
     }
 }
 
+static void set_input_locale(HKL kl)
+{
+    char lbuf[20];
+
+    GetLocaleInfo(LOWORD(kl), LOCALE_IDEFAULTANSICODEPAGE,
+                 lbuf, sizeof(lbuf));
+
+    kbd_codepage = atoi(lbuf);
+}
+
 static void click(Mouse_Button b, int x, int y, int shift, int ctrl, int alt)
 {
     int thistime = GetMessageTime();
 
     if (send_raw_mouse && !(cfg.mouse_override && shift)) {
        lastbtn = MBT_NOTHING;
-       term_mouse(b, MA_CLICK, x, y, shift, ctrl, alt);
+       term_mouse(term, b, translate_button(b), MA_CLICK,
+                  x, y, shift, ctrl, alt);
        return;
     }
 
@@ -1344,7 +1579,8 @@ static void click(Mouse_Button b, int x, int y, int shift, int ctrl, int alt)
        lastact = MA_CLICK;
     }
     if (lastact != MA_NOTHING)
-       term_mouse(b, lastact, x, y, shift, ctrl, alt);
+       term_mouse(term, b, translate_button(b), lastact,
+                  x, y, shift, ctrl, alt);
     lasttime = thistime;
 }
 
@@ -1352,7 +1588,7 @@ static void click(Mouse_Button b, int x, int y, int shift, int ctrl, int alt)
  * Translate a raw mouse button designation (LEFT, MIDDLE, RIGHT)
  * into a cooked one (SELECT, EXTEND, PASTE).
  */
-Mouse_Button translate_button(Mouse_Button button)
+static Mouse_Button translate_button(Mouse_Button button)
 {
     if (button == MBT_LEFT)
        return MBT_SELECT;
@@ -1388,28 +1624,43 @@ static int is_alt_pressed(void)
     return FALSE;
 }
 
+static int is_shift_pressed(void)
+{
+    BYTE keystate[256];
+    int r = GetKeyboardState(keystate);
+    if (!r)
+       return FALSE;
+    if (keystate[VK_SHIFT] & 0x80)
+       return TRUE;
+    return FALSE;
+}
+
+static int resizing;
+
 static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                                WPARAM wParam, LPARAM lParam)
 {
     HDC hdc;
     static int ignore_clip = FALSE;
-    static int resizing = FALSE;
     static int need_backend_resize = FALSE;
+    static int fullscr_on_max = FALSE;
 
     switch (message) {
       case WM_TIMER:
        if (pending_netevent)
            enact_pending_netevent();
-       term_out();
+       if (GetCapture() != hwnd || 
+           (send_raw_mouse && !(cfg.mouse_override && is_shift_pressed())))
+           term_out(term);
        noise_regular();
        HideCaret(hwnd);
-       term_update();
+       term_update(term);
        ShowCaret(hwnd);
        if (cfg.ping_interval > 0) {
            time_t now;
            time(&now);
            if (now - last_movement > cfg.ping_interval) {
-               back->special(TS_PING);
+               back->special(backhandle, TS_PING);
                last_movement = now;
            }
        }
@@ -1473,15 +1724,20 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                    sprintf(c, "putty &%p", filemap);
                    cl = c;
                } else if (wParam == IDM_SAVEDSESS) {
-                   char *session =
-                       sessions[(lParam - IDM_SAVED_MIN) / 16];
-                   cl = smalloc(16 + strlen(session)); /* 8, but play safe */
-                   if (!cl)
-                       cl = NULL;     /* not a very important failure mode */
-                   else {
-                       sprintf(cl, "putty @%s", session);
-                       freecl = TRUE;
-                   }
+                   if ((lParam - IDM_SAVED_MIN) / 16 < sesslist.nsessions) {
+                       char *session =
+                           sesslist.sessions[(lParam - IDM_SAVED_MIN) / 16];
+                       cl = snewn(16 + strlen(session), char);
+                                      /* 8, but play safe */
+                       if (!cl)
+                           cl = NULL;    
+                                      /* not a very important failure mode */
+                       else {
+                           sprintf(cl, "putty @%s", session);
+                           freecl = TRUE;
+                       }
+                   } else
+                       break;
                } else
                    cl = NULL;
 
@@ -1513,23 +1769,28 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                if (!do_reconfig(hwnd))
                    break;
 
-               /* If user forcibly disables full-screen, gracefully unzoom */
-               if (full_screen && !cfg.fullscreenonaltenter) {
-                   flip_full_screen();
+               {
+                   /* Disable full-screen if resizing forbidden */
+                   HMENU m = GetSystemMenu (hwnd, FALSE);
+                   EnableMenuItem(m, IDM_FULLSCREEN, MF_BYCOMMAND | 
+                                  (cfg.resize_action == RESIZE_DISABLED)
+                                  ? MF_GRAYED : MF_ENABLED);
+                   /* Gracefully unzoom if necessary */
+                   if (IsZoomed(hwnd) &&
+                       (cfg.resize_action == RESIZE_DISABLED)) {
+                       ShowWindow(hwnd, SW_RESTORE);
+                   }
                }
 
-               if (strcmp(prev_cfg.logfilename, cfg.logfilename) ||
-                   prev_cfg.logtype != cfg.logtype) {
-                   logfclose();       /* reset logging */
-                   logfopen();
-               }
+               /* Pass new config data to the logging module */
+               log_reconfig(logctx, &cfg);
 
                sfree(logpal);
                /*
                 * Flush the line discipline's edit buffer in the
                 * case where local editing has just been disabled.
                 */
-               ldisc_send(NULL, 0, 0);
+               ldisc_send(ldisc, NULL, 0, 0);
                if (pal)
                    DeleteObject(pal);
                logpal = NULL;
@@ -1537,12 +1798,20 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                cfgtopalette();
                init_palette();
 
+               /* Pass new config data to the terminal */
+               term_reconfig(term, &cfg);
+
+               /* Pass new config data to the back end */
+               back->reconfig(backhandle, &cfg);
+
                /* Screen size changed ? */
                if (cfg.height != prev_cfg.height ||
                    cfg.width != prev_cfg.width ||
                    cfg.savelines != prev_cfg.savelines ||
-                   cfg.resize_action != RESIZE_TERM)
-                   term_size(cfg.height, cfg.width, cfg.savelines);
+                   cfg.resize_action == RESIZE_FONT ||
+                   (cfg.resize_action == RESIZE_EITHER && IsZoomed(hwnd)) ||
+                   cfg.resize_action == RESIZE_DISABLED)
+                   term_size(term, cfg.height, cfg.width, cfg.savelines);
 
                /* Enable or disable the scroll bar, etc */
                {
@@ -1568,14 +1837,22 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                        nexflag &= ~(WS_EX_CLIENTEDGE);
 
                    nflg = flag;
-                   if (cfg.scrollbar)
+                   if (is_full_screen() ?
+                       cfg.scrollbar_in_fullscreen : cfg.scrollbar)
                        nflg |= WS_VSCROLL;
                    else
                        nflg &= ~WS_VSCROLL;
+
+                   if (cfg.resize_action == RESIZE_DISABLED ||
+                        is_full_screen())
+                       nflg &= ~WS_THICKFRAME;
+                   else
+                       nflg |= WS_THICKFRAME;
+
                    if (cfg.resize_action == RESIZE_DISABLED)
-                       nflg &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX);
+                       nflg &= ~WS_MAXIMIZEBOX;
                    else
-                       nflg |= (WS_THICKFRAME | WS_MAXIMIZEBOX);
+                       nflg |= WS_MAXIMIZEBOX;
 
                    if (nflg != flag || nexflag != exflag) {
                        if (nflg != flag)
@@ -1598,22 +1875,23 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                    init_lvl = 2;
                }
 
-               set_title(cfg.wintitle);
+               set_title(NULL, cfg.wintitle);
                if (IsIconic(hwnd)) {
                    SetWindowText(hwnd,
                                  cfg.win_name_always ? window_name :
                                  icon_name);
                }
 
-               if (strcmp(cfg.font, prev_cfg.font) != 0 ||
+               if (strcmp(cfg.font.name, prev_cfg.font.name) != 0 ||
                    strcmp(cfg.line_codepage, prev_cfg.line_codepage) != 0 ||
-                   cfg.fontisbold != prev_cfg.fontisbold ||
-                   cfg.fontheight != prev_cfg.fontheight ||
-                   cfg.fontcharset != prev_cfg.fontcharset ||
+                   cfg.font.isbold != prev_cfg.font.isbold ||
+                   cfg.font.height != prev_cfg.font.height ||
+                   cfg.font.charset != prev_cfg.font.charset ||
                    cfg.vtmode != prev_cfg.vtmode ||
                    cfg.bold_colour != prev_cfg.bold_colour ||
-                   (cfg.resize_action != RESIZE_FONT &&
-                    prev_cfg.resize_action == RESIZE_FONT))
+                   cfg.resize_action == RESIZE_DISABLED ||
+                   cfg.resize_action == RESIZE_EITHER ||
+                   (cfg.resize_action != prev_cfg.resize_action))
                    init_lvl = 2;
 
                InvalidateRect(hwnd, NULL, TRUE);
@@ -1622,83 +1900,97 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            }
            break;
          case IDM_COPYALL:
-           term_copyall();
+           term_copyall(term);
            break;
          case IDM_CLRSB:
-           term_clrsb();
+           term_clrsb(term);
            break;
          case IDM_RESET:
-           term_pwron();
+           term_pwron(term);
+           ldisc_send(ldisc, NULL, 0, 0);
            break;
          case IDM_TEL_AYT:
-           back->special(TS_AYT);
+           back->special(backhandle, TS_AYT);
            net_pending_errors();
            break;
          case IDM_TEL_BRK:
-           back->special(TS_BRK);
+           back->special(backhandle, TS_BRK);
            net_pending_errors();
            break;
          case IDM_TEL_SYNCH:
-           back->special(TS_SYNCH);
+           back->special(backhandle, TS_SYNCH);
            net_pending_errors();
            break;
          case IDM_TEL_EC:
-           back->special(TS_EC);
+           back->special(backhandle, TS_EC);
            net_pending_errors();
            break;
          case IDM_TEL_EL:
-           back->special(TS_EL);
+           back->special(backhandle, TS_EL);
            net_pending_errors();
            break;
          case IDM_TEL_GA:
-           back->special(TS_GA);
+           back->special(backhandle, TS_GA);
            net_pending_errors();
            break;
          case IDM_TEL_NOP:
-           back->special(TS_NOP);
+           back->special(backhandle, TS_NOP);
            net_pending_errors();
            break;
          case IDM_TEL_ABORT:
-           back->special(TS_ABORT);
+           back->special(backhandle, TS_ABORT);
            net_pending_errors();
            break;
          case IDM_TEL_AO:
-           back->special(TS_AO);
+           back->special(backhandle, TS_AO);
            net_pending_errors();
            break;
          case IDM_TEL_IP:
-           back->special(TS_IP);
+           back->special(backhandle, TS_IP);
            net_pending_errors();
            break;
          case IDM_TEL_SUSP:
-           back->special(TS_SUSP);
+           back->special(backhandle, TS_SUSP);
            net_pending_errors();
            break;
          case IDM_TEL_EOR:
-           back->special(TS_EOR);
+           back->special(backhandle, TS_EOR);
            net_pending_errors();
            break;
          case IDM_TEL_EOF:
-           back->special(TS_EOF);
+           back->special(backhandle, TS_EOF);
            net_pending_errors();
            break;
          case IDM_ABOUT:
            showabout(hwnd);
            break;
+         case IDM_HELP:
+           WinHelp(hwnd, help_path,
+                    help_has_contents ? HELP_FINDER : HELP_CONTENTS, 0);
+           break;
+         case SC_MOUSEMENU:
+           /*
+            * We get this if the System menu has been activated
+            * using the mouse.
+            */
+           show_mouseptr(1);
+           break;
           case SC_KEYMENU:
            /*
-            * We get this if the System menu has been activated.
-            * This might happen from within TranslateKey, in which
-            * case it really wants to be followed by a `space'
-            * character to actually _bring the menu up_ rather
-            * than just sitting there in `ready to appear' state.
+            * We get this if the System menu has been activated
+            * using the keyboard. This might happen from within
+            * TranslateKey, in which case it really wants to be
+            * followed by a `space' character to actually _bring
+            * the menu up_ rather than just sitting there in
+            * `ready to appear' state.
             */
+           show_mouseptr(1);          /* make sure pointer is visible */
            if( lParam == 0 )
                PostMessage(hwnd, WM_CHAR, ' ', 0);
            break;
          case IDM_FULLSCREEN:
-               flip_full_screen();     
-               break;
+           flip_full_screen();
+           break;
          default:
            if (wParam >= IDM_SAVED_MIN && wParam <= IDM_SAVED_MAX) {
                SendMessage(hwnd, WM_SYSCOMMAND, IDM_SAVEDSESS, wParam);
@@ -1711,45 +2003,6 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 
 #define TO_CHR_X(x) ((((x)<0 ? (x)-font_width+1 : (x))-offset_width) / font_width)
 #define TO_CHR_Y(y) ((((y)<0 ? (y)-font_height+1: (y))-offset_height) / font_height)
-#define WHEEL_DELTA 120
-      case WM_MOUSEWHEEL:
-       {
-           wheel_accumulator += (short) HIWORD(wParam);
-           wParam = LOWORD(wParam);
-
-           /* process events when the threshold is reached */
-           while (abs(wheel_accumulator) >= WHEEL_DELTA) {
-               int b;
-
-               /* reduce amount for next time */
-               if (wheel_accumulator > 0) {
-                   b = MBT_WHEEL_UP;
-                   wheel_accumulator -= WHEEL_DELTA;
-               } else if (wheel_accumulator < 0) {
-                   b = MBT_WHEEL_DOWN;
-                   wheel_accumulator += WHEEL_DELTA;
-               } else
-                   break;
-
-               if (send_raw_mouse) {
-                   /* send a mouse-down followed by a mouse up */
-                   
-                   term_mouse(b,
-                              MA_CLICK,
-                              TO_CHR_X(X_POS(lParam)),
-                              TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
-                              wParam & MK_CONTROL, is_alt_pressed());
-                   term_mouse(b, MA_RELEASE, TO_CHR_X(X_POS(lParam)),
-                              TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
-                              wParam & MK_CONTROL, is_alt_pressed());
-               } else {
-                   /* trigger a scroll */
-                   term_scroll(0,
-                               b == MBT_WHEEL_UP ? -rows / 2 : rows / 2);
-               }
-           }
-           return 0;
-       }
       case WM_LBUTTONDOWN:
       case WM_MBUTTONDOWN:
       case WM_RBUTTONDOWN:
@@ -1788,6 +2041,17 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                button = press = 0;    /* shouldn't happen */
            }
            show_mouseptr(1);
+           /*
+            * Special case: in full-screen mode, if the left
+            * button is clicked in the very top left corner of the
+            * window, we put up the System menu instead of doing
+            * selection.
+            */
+           if (is_full_screen() && press && button == MBT_LEFT &&
+               X_POS(lParam) == 0 && Y_POS(lParam) == 0) {
+               SendMessage(hwnd, WM_SYSCOMMAND, SC_MOUSEMENU, 0);
+               return 0;
+           }
            if (press) {
                click(button,
                      TO_CHR_X(X_POS(lParam)), TO_CHR_Y(Y_POS(lParam)),
@@ -1795,7 +2059,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                      is_alt_pressed());
                SetCapture(hwnd);
            } else {
-               term_mouse(button, MA_RELEASE,
+               term_mouse(term, button, translate_button(button), MA_RELEASE,
                           TO_CHR_X(X_POS(lParam)),
                           TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
                           wParam & MK_CONTROL, is_alt_pressed());
@@ -1811,7 +2075,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
         */
        noise_ultralight(lParam);
 
-       if (wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) {
+       if (wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON) &&
+           GetCapture() == hwnd) {
            Mouse_Button b;
            if (wParam & MK_LBUTTON)
                b = MBT_LEFT;
@@ -1819,7 +2084,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                b = MBT_MIDDLE;
            else
                b = MBT_RIGHT;
-           term_mouse(b, MA_DRAG, TO_CHR_X(X_POS(lParam)),
+           term_mouse(term, b, translate_button(b), MA_DRAG,
+                      TO_CHR_X(X_POS(lParam)),
                       TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
                       wParam & MK_CONTROL, is_alt_pressed());
        }
@@ -1833,7 +2099,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
        break;
       case WM_DESTROYCLIPBOARD:
        if (!ignore_clip)
-           term_deselect();
+           term_deselect(term);
        ignore_clip = FALSE;
        return 0;
       case WM_PAINT:
@@ -1845,17 +2111,18 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                SelectPalette(hdc, pal, TRUE);
                RealizePalette(hdc);
            }
-           term_paint(hdc, 
+           term_paint(term, hdc, 
                       (p.rcPaint.left-offset_width)/font_width,
                       (p.rcPaint.top-offset_height)/font_height,
                       (p.rcPaint.right-offset_width-1)/font_width,
-                      (p.rcPaint.bottom-offset_height-1)/font_height);
+                      (p.rcPaint.bottom-offset_height-1)/font_height,
+                      is_alt_pressed());
 
            if (p.fErase ||
                p.rcPaint.left  < offset_width  ||
                p.rcPaint.top   < offset_height ||
-               p.rcPaint.right >= offset_width + font_width*cols ||
-               p.rcPaint.bottom>= offset_height + font_height*rows)
+               p.rcPaint.right >= offset_width + font_width*term->cols ||
+               p.rcPaint.bottom>= offset_height + font_height*term->rows)
            {
                HBRUSH fillcolour, oldbrush;
                HPEN   edge, oldpen;
@@ -1866,10 +2133,21 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                                    colours[(ATTR_DEFBG>>ATTR_BGSHIFT)*2]);
                oldpen = SelectObject(hdc, edge);
 
+               /*
+                * Jordan Russell reports that this apparently
+                * ineffectual IntersectClipRect() call masks a
+                * Windows NT/2K bug causing strange display
+                * problems when the PuTTY window is taller than
+                * the primary monitor. It seems harmless enough...
+                */
+               IntersectClipRect(hdc,
+                       p.rcPaint.left, p.rcPaint.top,
+                       p.rcPaint.right, p.rcPaint.bottom);
+
                ExcludeClipRect(hdc, 
                        offset_width, offset_height,
-                       offset_width+font_width*cols,
-                       offset_height+font_height*rows);
+                       offset_width+font_width*term->cols,
+                       offset_height+font_height*term->rows);
 
                Rectangle(hdc, p.rcPaint.left, p.rcPaint.top, 
                          p.rcPaint.right, p.rcPaint.bottom);
@@ -1904,20 +2182,21 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
        time(&last_movement);
        return 0;
       case WM_SETFOCUS:
-       has_focus = TRUE;
+       term->has_focus = TRUE;
        CreateCaret(hwnd, caretbm, font_width, font_height);
        ShowCaret(hwnd);
        flash_window(0);               /* stop */
        compose_state = 0;
-       term_out();
-       term_update();
+       term_out(term);
+       term_update(term);
        break;
       case WM_KILLFOCUS:
        show_mouseptr(1);
-       has_focus = FALSE;
+       term->has_focus = FALSE;
        DestroyCaret();
-       term_out();
-       term_update();
+       caret_x = caret_y = -1;        /* ensure caret is replaced next time */
+       term_out(term);
+       term_update(term);
        break;
       case WM_ENTERSIZEMOVE:
 #ifdef RDB_DEBUG_PATCH
@@ -1934,7 +2213,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
        debug((27, "WM_EXITSIZEMOVE"));
 #endif
        if (need_backend_resize) {
-           term_size(cfg.height, cfg.width, cfg.savelines);
+           term_size(term, cfg.height, cfg.width, cfg.savelines);
            InvalidateRect(hwnd, NULL, TRUE);
        }
        break;
@@ -1944,22 +2223,26 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
         * 1) Keep the sizetip uptodate
         * 2) Make sure the window size is _stepped_ in units of the font size.
         */
-       if (cfg.resize_action == RESIZE_TERM && !alt_pressed) {
+       if (cfg.resize_action != RESIZE_FONT && !is_alt_pressed()) {
            int width, height, w, h, ew, eh;
            LPRECT r = (LPRECT) lParam;
 
-           if ( !need_backend_resize && 
-                   (cfg.height != rows || cfg.width != cols )) {
+           if ( !need_backend_resize && cfg.resize_action == RESIZE_EITHER &&
+                   (cfg.height != term->rows || cfg.width != term->cols )) {
                /* 
-                * Great! It seems the host has been changing the terminal
-                * size, well the user is now grabbing so this is probably
-                * the least confusing solution in the long run even though
-                * it a is suprise. Unfortunatly the only way to prevent 
-                * this seems to be to let the host change the window size 
-                * and as that's a user option we're still right back here.
-                */
-               term_size(cfg.height, cfg.width, cfg.savelines);
+                * Great! It seems that both the terminal size and the
+                * font size have been changed and the user is now dragging.
+                * 
+                * It will now be difficult to get back to the configured
+                * font size!
+                *
+                * This would be easier but it seems to be too confusing.
+
+               term_size(term, cfg.height, cfg.width, cfg.savelines);
                reset_window(2);
+                */
+               cfg.height=term->rows; cfg.width=term->cols;
+
                InvalidateRect(hwnd, NULL, TRUE);
                need_backend_resize = TRUE;
            }
@@ -2002,29 +2285,35 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            width = r->right - r->left - ex_width;
            height = r->bottom - r->top - ex_height;
 
-           w = (width + cols/2)/cols;
-           h = (height + rows/2)/rows;
-           if ( r->right != r->left + w*cols + ex_width) 
+           w = (width + term->cols/2)/term->cols;
+           h = (height + term->rows/2)/term->rows;
+           if ( r->right != r->left + w*term->cols + ex_width)
                rv = 1;
 
            if (wParam == WMSZ_LEFT ||
                wParam == WMSZ_BOTTOMLEFT || wParam == WMSZ_TOPLEFT)
-               r->left = r->right - w*cols - ex_width;
+               r->left = r->right - w*term->cols - ex_width;
            else
-               r->right = r->left + w*cols + ex_width;
+               r->right = r->left + w*term->cols + ex_width;
 
-           if (r->bottom != r->top + h*rows + ex_height)
+           if (r->bottom != r->top + h*term->rows + ex_height)
                rv = 1;
 
            if (wParam == WMSZ_TOP ||
                wParam == WMSZ_TOPRIGHT || wParam == WMSZ_TOPLEFT)
-               r->top = r->bottom - h*rows - ex_height;
+               r->top = r->bottom - h*term->rows - ex_height;
            else
-               r->bottom = r->top + h*rows + ex_height;
+               r->bottom = r->top + h*term->rows + ex_height;
 
            return rv;
        }
        /* break;  (never reached) */
+      case WM_FULLSCR_ON_MAX:
+       fullscr_on_max = TRUE;
+       break;
+      case WM_MOVE:
+       sys_cursor_update();
+       break;
       case WM_SIZE:
 #ifdef RDB_DEBUG_PATCH
        debug((27, "WM_SIZE %s (%d,%d)",
@@ -2035,13 +2324,17 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                "...",
            LOWORD(lParam), HIWORD(lParam)));
 #endif
-       if (wParam == SIZE_MINIMIZED) {
+       if (wParam == SIZE_MINIMIZED)
            SetWindowText(hwnd,
                          cfg.win_name_always ? window_name : icon_name);
-           break;
-       }
        if (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED)
            SetWindowText(hwnd, window_name);
+        if (wParam == SIZE_RESTORED)
+            clear_full_screen();
+        if (wParam == SIZE_MAXIMIZED && fullscr_on_max) {
+            fullscr_on_max = FALSE;
+            make_full_screen();
+        }
 
        if (cfg.resize_action == RESIZE_DISABLED) {
            /* A resize, well it better be a minimize. */
@@ -2054,24 +2347,27 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            height = HIWORD(lParam);
 
            if (!resizing) {
-               if (wParam == SIZE_MAXIMIZED) {
+               if (wParam == SIZE_MAXIMIZED && !was_zoomed) {
                    was_zoomed = 1;
-                   prev_rows = rows;
-                   prev_cols = cols;
-                   if (cfg.resize_action != RESIZE_FONT) {
+                   prev_rows = term->rows;
+                   prev_cols = term->cols;
+                   if (cfg.resize_action == RESIZE_TERM) {
                        w = width / font_width;
                        if (w < 1) w = 1;
                        h = height / font_height;
                        if (h < 1) h = 1;
 
-                       term_size(h, w, cfg.savelines);
+                       term_size(term, h, w, cfg.savelines);
                    }
                    reset_window(0);
                } else if (wParam == SIZE_RESTORED && was_zoomed) {
                    was_zoomed = 0;
+                   if (cfg.resize_action == RESIZE_TERM)
+                       term_size(term, prev_rows, prev_cols, cfg.savelines);
                    if (cfg.resize_action != RESIZE_FONT)
-                       term_size(prev_rows, prev_cols, cfg.savelines);
-                   reset_window(0);
+                       reset_window(2);
+                   else
+                       reset_window(0);
                }
                /* This is an unexpected resize, these will normally happen
                 * if the window is too large. Probably either the user
@@ -2088,7 +2384,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             * down the connection during an NT opaque drag.)
             */
            if (resizing) {
-               if (cfg.resize_action == RESIZE_TERM && !alt_pressed) {
+               if (cfg.resize_action != RESIZE_FONT && !is_alt_pressed()) {
                    need_backend_resize = TRUE;
                    w = (width-cfg.window_border*2) / font_width;
                    if (w < 1) w = 1;
@@ -2101,36 +2397,37 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                    reset_window(0);
            }
        }
+       sys_cursor_update();
        return 0;
       case WM_VSCROLL:
        switch (LOWORD(wParam)) {
          case SB_BOTTOM:
-           term_scroll(-1, 0);
+           term_scroll(term, -1, 0);
            break;
          case SB_TOP:
-           term_scroll(+1, 0);
+           term_scroll(term, +1, 0);
            break;
          case SB_LINEDOWN:
-           term_scroll(0, +1);
+           term_scroll(term, 0, +1);
            break;
          case SB_LINEUP:
-           term_scroll(0, -1);
+           term_scroll(term, 0, -1);
            break;
          case SB_PAGEDOWN:
-           term_scroll(0, +rows / 2);
+           term_scroll(term, 0, +term->rows / 2);
            break;
          case SB_PAGEUP:
-           term_scroll(0, -rows / 2);
+           term_scroll(term, 0, -term->rows / 2);
            break;
          case SB_THUMBPOSITION:
          case SB_THUMBTRACK:
-           term_scroll(1, HIWORD(wParam));
+           term_scroll(term, 1, HIWORD(wParam));
            break;
        }
        break;
       case WM_PALETTECHANGED:
        if ((HWND) wParam != hwnd && pal != NULL) {
-           HDC hdc = get_ctx();
+           HDC hdc = get_ctx(NULL);
            if (hdc) {
                if (RealizePalette(hdc) > 0)
                    UpdateColors(hdc);
@@ -2140,7 +2437,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
        break;
       case WM_QUERYNEWPALETTE:
        if (pal != NULL) {
-           HDC hdc = get_ctx();
+           HDC hdc = get_ctx(NULL);
            if (hdc) {
                if (RealizePalette(hdc) > 0)
                    UpdateColors(hdc);
@@ -2189,7 +2486,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                     * preferable to having to faff about buffering
                     * things.
                     */
-                   term_nopaste();
+                   term_nopaste(term);
 
                    /*
                     * We need not bother about stdin backlogs
@@ -2199,7 +2496,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                     * messages. We _have_ to buffer everything
                     * we're sent.
                     */
-                   ldisc_send(buf, len, 1);
+                   term_seen_key_event(term);
+                   ldisc_send(ldisc, buf, len, 1);
                    show_mouseptr(0);
                }
            }
@@ -2207,18 +2505,17 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
        net_pending_errors();
        return 0;
       case WM_INPUTLANGCHANGE:
-       {
-           /* wParam == Font number */
-           /* lParam == Locale */
-           char lbuf[20];
-           HKL NewInputLocale = (HKL) lParam;
-
-           // lParam == GetKeyboardLayout(0);
-
-           GetLocaleInfo(LOWORD(NewInputLocale),
-                         LOCALE_IDEFAULTANSICODEPAGE, lbuf, sizeof(lbuf));
-
-           kbd_codepage = atoi(lbuf);
+       /* wParam == Font number */
+       /* lParam == Locale */
+       set_input_locale((HKL)lParam);
+       sys_cursor_update();
+       break;
+      case WM_IME_NOTIFY:
+       if(wParam == IMN_SETOPENSTATUS) {
+           HIMC hImc = ImmGetContext(hwnd);
+           ImmSetCompositionFont(hImc, &lfont);
+           ImmReleaseContext(hwnd, hImc);
+           return 0;
        }
        break;
       case WM_IME_COMPOSITION:
@@ -2226,7 +2523,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            HIMC hIMC;
            int n;
            char *buff;
-   
+
            if(osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS || 
                osVersion.dwPlatformId == VER_PLATFORM_WIN32s) break; /* no Unicode */
 
@@ -2237,9 +2534,19 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            n = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
 
            if (n > 0) {
-               buff = (char*) smalloc(n);
+               int i;
+               buff = snewn(n, char);
                ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, buff, n);
-               luni_send((unsigned short *)buff, n / 2, 1);
+               /*
+                * Jaeyoun Chung reports that Korean character
+                * input doesn't work correctly if we do a single
+                * luni_send() covering the whole of buff. So
+                * instead we luni_send the characters one by one.
+                */
+               term_seen_key_event(term);
+               for (i = 0; i < n; i += 2) {
+                   luni_send(ldisc, (unsigned short *)(buff+i), 1, 1);
+               }
                free(buff);
            }
            ImmReleaseContext(hwnd, hIMC);
@@ -2252,10 +2559,12 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 
            buf[1] = wParam;
            buf[0] = wParam >> 8;
-           lpage_send(kbd_codepage, buf, 2, 1);
+           term_seen_key_event(term);
+           lpage_send(ldisc, kbd_codepage, buf, 2, 1);
        } else {
            char c = (unsigned char) wParam;
-           lpage_send(kbd_codepage, &c, 1, 1);
+           term_seen_key_event(term);
+           lpage_send(ldisc, kbd_codepage, &c, 1, 1);
        }
        return (0);
       case WM_CHAR:
@@ -2268,7 +2577,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
         */
        {
            char c = (unsigned char)wParam;
-           lpage_send(CP_ACP, &c, 1, 1);
+           term_seen_key_event(term);
+           lpage_send(ldisc, CP_ACP, &c, 1, 1);
        }
        return 0;
       case WM_SETCURSOR:
@@ -2276,6 +2586,58 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            SetCursor(LoadCursor(NULL, IDC_ARROW));
            return TRUE;
        }
+      default:
+       if (message == wm_mousewheel || message == WM_MOUSEWHEEL) {
+           int shift_pressed=0, control_pressed=0;
+
+           if (message == WM_MOUSEWHEEL) {
+               wheel_accumulator += (short)HIWORD(wParam);
+               shift_pressed=LOWORD(wParam) & MK_SHIFT;
+               control_pressed=LOWORD(wParam) & MK_CONTROL;
+           } else {
+               BYTE keys[256];
+               wheel_accumulator += (int)wParam;
+               if (GetKeyboardState(keys)!=0) {
+                   shift_pressed=keys[VK_SHIFT]&0x80;
+                   control_pressed=keys[VK_CONTROL]&0x80;
+               }
+           }
+
+           /* process events when the threshold is reached */
+           while (abs(wheel_accumulator) >= WHEEL_DELTA) {
+               int b;
+
+               /* reduce amount for next time */
+               if (wheel_accumulator > 0) {
+                   b = MBT_WHEEL_UP;
+                   wheel_accumulator -= WHEEL_DELTA;
+               } else if (wheel_accumulator < 0) {
+                   b = MBT_WHEEL_DOWN;
+                   wheel_accumulator += WHEEL_DELTA;
+               } else
+                   break;
+
+               if (send_raw_mouse &&
+                   !(cfg.mouse_override && shift_pressed)) {
+                   /* send a mouse-down followed by a mouse up */
+                   term_mouse(term, b, translate_button(b),
+                              MA_CLICK,
+                              TO_CHR_X(X_POS(lParam)),
+                              TO_CHR_Y(Y_POS(lParam)), shift_pressed,
+                              control_pressed, is_alt_pressed());
+                   term_mouse(term, b, translate_button(b),
+                              MA_RELEASE, TO_CHR_X(X_POS(lParam)),
+                              TO_CHR_Y(Y_POS(lParam)), shift_pressed,
+                              control_pressed, is_alt_pressed());
+               } else {
+                   /* trigger a scroll */
+                   term_scroll(term, 0,
+                               b == MBT_WHEEL_UP ?
+                               -term->rows / 2 : term->rows / 2);
+               }
+           }
+           return 0;
+       }
     }
 
     return DefWindowProc(hwnd, message, wParam, lParam);
@@ -2287,15 +2649,37 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
  * helper software tracks the system caret, so we should arrange to
  * have one.)
  */
-void sys_cursor(int x, int y)
+void sys_cursor(void *frontend, int x, int y)
+{
+    int cx, cy;
+
+    if (!term->has_focus) return;
+
+    /*
+     * Avoid gratuitously re-updating the cursor position and IMM
+     * window if there's no actual change required.
+     */
+    cx = x * font_width + offset_width;
+    cy = y * font_height + offset_height;
+    if (cx == caret_x && cy == caret_y)
+       return;
+    caret_x = cx;
+    caret_y = cy;
+
+    sys_cursor_update();
+}
+
+static void sys_cursor_update(void)
 {
     COMPOSITIONFORM cf;
     HIMC hIMC;
 
-    if (!has_focus) return;
-    
-    SetCaretPos(x * font_width + offset_width,
-               y * font_height + offset_height);
+    if (!term->has_focus) return;
+
+    if (caret_x < 0 || caret_y < 0)
+       return;
+
+    SetCaretPos(caret_x, caret_y);
 
     /* IMM calls on Win98 and beyond only */
     if(osVersion.dwPlatformId == VER_PLATFORM_WIN32s) return; /* 3.11 */
@@ -2306,8 +2690,8 @@ void sys_cursor(int x, int y)
     /* we should have the IMM functions */
     hIMC = ImmGetContext(hwnd);
     cf.dwStyle = CFS_POINT;
-    cf.ptCurrentPos.x = x * font_width;
-    cf.ptCurrentPos.y = y * font_height;
+    cf.ptCurrentPos.x = caret_x;
+    cf.ptCurrentPos.y = caret_y;
     ImmSetCompositionWindow(hIMC, &cf);
 
     ImmReleaseContext(hwnd, hIMC);
@@ -2339,7 +2723,7 @@ void do_text(Context ctx, int x, int y, char *text, int len,
        int i;
        if (len > IpDxLEN) {
            sfree(IpDx);
-           IpDx = smalloc((len + 16) * sizeof(int));
+           IpDx = snewn(len + 16, int);
            IpDxLEN = (len + 16);
        }
        for (i = 0; i < IpDxLEN; i++)
@@ -2347,7 +2731,7 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     }
 
     /* Only want the left half of double width lines */
-    if (lattr != LATTR_NORM && x*2 >= cols)
+    if (lattr != LATTR_NORM && x*2 >= term->cols)
        return;
 
     x *= fnt_width;
@@ -2355,7 +2739,7 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     x += offset_width;
     y += offset_height;
 
-    if ((attr & TATTR_ACTCURS) && (cfg.cursor_type == 0 || big_cursor)) {
+    if ((attr & TATTR_ACTCURS) && (cfg.cursor_type == 0 || term->big_cursor)) {
        attr &= ATTR_CUR_AND | (bold_mode != BOLD_COLOURS ? ATTR_BOLD : 0);
        attr ^= ATTR_CUR_XOR;
     }
@@ -2398,8 +2782,8 @@ void do_text(Context ctx, int x, int y, char *text, int len,
            if (lattr == LATTR_TOP || lattr == LATTR_BOT)
                text_adjust *= 2;
            attr &= ~CSET_MASK;
-           text[0] = (char) (unitab_xterm['q'] & CHAR_MASK);
-           attr |= (unitab_xterm['q'] & CSET_MASK);
+           text[0] = (char) (ucsdata.unitab_xterm['q'] & CHAR_MASK);
+           attr |= (ucsdata.unitab_xterm['q'] & CSET_MASK);
            if (attr & ATTR_UNDER) {
                attr &= ~ATTR_UNDER;
                force_manual_underline = 1;
@@ -2418,8 +2802,10 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     if ((attr & CSET_MASK) == ATTR_OEMCP)
        nfont |= FONT_OEM;
 
-    nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
-    nbg = 2 * ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+    nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
+    nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0);
+    nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+    nbg = 2 * (nbg & 0xF) + (nbg & 0x10 ? 1 : 0);
     if (bold_mode == BOLD_FONT && (attr & ATTR_BOLD))
        nfont |= FONT_BOLD;
     if (und_mode == UND_FONT && (attr & ATTR_UNDER))
@@ -2441,9 +2827,9 @@ void do_text(Context ctx, int x, int y, char *text, int len,
        nbg = t;
     }
     if (bold_mode == BOLD_COLOURS && (attr & ATTR_BOLD))
-       nfg++;
+       nfg |= 1;
     if (bold_mode == BOLD_COLOURS && (attr & ATTR_BLINK))
-       nbg++;
+       nbg |= 1;
     fg = colours[nfg];
     bg = colours[nbg];
     SelectObject(hdc, fonts[nfont]);
@@ -2456,11 +2842,11 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     line_box.bottom = y + font_height;
 
     /* Only want the left half of double width lines */
-    if (line_box.right > font_width*cols+offset_width)
-       line_box.right = font_width*cols+offset_width;
+    if (line_box.right > font_width*term->cols+offset_width)
+       line_box.right = font_width*term->cols+offset_width;
 
     /* We're using a private area for direct to font. (512 chars.) */
-    if (dbcs_screenfont && (attr & CSET_MASK) == ATTR_ACP) {
+    if (ucsdata.dbcs_screenfont && (attr & CSET_MASK) == ATTR_ACP) {
        /* Ho Hum, dbcs fonts are a PITA! */
        /* To display on W9x I have to convert to UCS */
        static wchar_t *uni_buf = 0;
@@ -2468,20 +2854,21 @@ void do_text(Context ctx, int x, int y, char *text, int len,
        int nlen, mptr;
        if (len > uni_len) {
            sfree(uni_buf);
-           uni_buf = smalloc((uni_len = len) * sizeof(wchar_t));
+           uni_len = len;
+           uni_buf = snewn(uni_len, wchar_t);
        }
 
        for(nlen = mptr = 0; mptr<len; mptr++) {
            uni_buf[nlen] = 0xFFFD;
-           if (IsDBCSLeadByteEx(font_codepage, (BYTE) text[mptr])) {
+           if (IsDBCSLeadByteEx(ucsdata.font_codepage, (BYTE) text[mptr])) {
                IpDx[nlen] += char_width;
-               MultiByteToWideChar(font_codepage, MB_USEGLYPHCHARS,
+               MultiByteToWideChar(ucsdata.font_codepage, MB_USEGLYPHCHARS,
                                   text+mptr, 2, uni_buf+nlen, 1);
                mptr++;
            }
            else
            {
-               MultiByteToWideChar(font_codepage, MB_USEGLYPHCHARS,
+               MultiByteToWideChar(ucsdata.font_codepage, MB_USEGLYPHCHARS,
                                   text+mptr, 1, uni_buf+nlen, 1);
            }
            nlen++;
@@ -2528,7 +2915,7 @@ void do_text(Context ctx, int x, int y, char *text, int len,
        if (wlen < len) {
            sfree(wbuf);
            wlen = len;
-           wbuf = smalloc(wlen * sizeof(WCHAR));
+           wbuf = snewn(wlen, WCHAR);
        }
        for (i = 0; i < len; i++)
            wbuf[i] = (WCHAR) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
@@ -2571,7 +2958,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
     HDC hdc = ctx;
     int ctype = cfg.cursor_type;
 
-    if ((attr & TATTR_ACTCURS) && (ctype == 0 || big_cursor)) {
+    if ((attr & TATTR_ACTCURS) && (ctype == 0 || term->big_cursor)) {
        if (((attr & CSET_MASK) | (unsigned char) *text) != UCSWIDE) {
            do_text(ctx, x, y, text, len, attr, lattr);
            return;
@@ -2588,7 +2975,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
     x += offset_width;
     y += offset_height;
 
-    if ((attr & TATTR_PASCURS) && (ctype == 0 || big_cursor)) {
+    if ((attr & TATTR_PASCURS) && (ctype == 0 || term->big_cursor)) {
        POINT pts[5];
        HPEN oldpen;
        pts[0].x = pts[1].x = pts[4].x = x;
@@ -2639,7 +3026,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
 
 /* This function gets the actual width of a character in the normal font.
  */
-int CharWidth(Context ctx, int uc) {
+int char_width(Context ctx, int uc) {
     HDC hdc = ctx;
     int ibuf = 0;
 
@@ -2650,17 +3037,17 @@ int CharWidth(Context ctx, int uc) {
 
     switch (uc & CSET_MASK) {
       case ATTR_ASCII:
-       uc = unitab_line[uc & 0xFF];
+       uc = ucsdata.unitab_line[uc & 0xFF];
        break;
       case ATTR_LINEDRW:
-       uc = unitab_xterm[uc & 0xFF];
+       uc = ucsdata.unitab_xterm[uc & 0xFF];
        break;
       case ATTR_SCOACS:
-       uc = unitab_scoacs[uc & 0xFF];
+       uc = ucsdata.unitab_scoacs[uc & 0xFF];
        break;
     }
     if (DIRECT_FONT(uc)) {
-       if (dbcs_screenfont) return 1;
+       if (ucsdata.dbcs_screenfont) return 1;
 
        /* Speedup, I know of no font where ascii is the wrong width */
        if ((uc&CHAR_MASK) >= ' ' && (uc&CHAR_MASK)<= '~') 
@@ -2804,7 +3191,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 
        /* Nastyness with NUMLock - Shift-NUMLock is left alone though */
        if ((cfg.funky_type == 3 ||
-            (cfg.funky_type <= 1 && app_keypad_keys && !cfg.no_applic_k))
+            (cfg.funky_type <= 1 && term->app_keypad_keys &&
+             !cfg.no_applic_k))
            && wParam == VK_NUMLOCK && !(keystate[VK_SHIFT] & 0x80)) {
 
            wParam = VK_EXECUTE;
@@ -2819,7 +3207,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
     }
 
     /* Disable Auto repeat if required */
-    if (repeat_off && (HIWORD(lParam) & (KF_UP | KF_REPEAT)) == KF_REPEAT)
+    if (term->repeat_off &&
+       (HIWORD(lParam) & (KF_UP | KF_REPEAT)) == KF_REPEAT)
        return 0;
 
     if ((HIWORD(lParam) & KF_ALTDOWN) && (keystate[VK_RMENU] & 0x80) == 0)
@@ -2837,8 +3226,6 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
        }
     }
 
-    alt_pressed = (left_alt && key_down);
-
     scan = (HIWORD(lParam) & (KF_UP | KF_EXTENDED | 0xFF));
     shift_state = ((keystate[VK_SHIFT] & 0x80) != 0)
        + ((keystate[VK_CONTROL] & 0x80) != 0) * 2;
@@ -2865,19 +3252,11 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
     } else if (compose_state == 1 && wParam != VK_CONTROL)
        compose_state = 0;
 
-    /* 
-     * Record that we pressed key so the scroll window can be reset, but
-     * be careful to avoid Shift-UP/Down
-     */
-    if (wParam != VK_SHIFT && wParam != VK_PRIOR && wParam != VK_NEXT) {
-       seen_key_event = 1;
-    }
-
     if (compose_state > 1 && left_alt)
        compose_state = 0;
 
     /* Sanitize the number pad if not using a PC NumPad */
-    if (left_alt || (app_keypad_keys && !cfg.no_applic_k
+    if (left_alt || (term->app_keypad_keys && !cfg.no_applic_k
                     && cfg.funky_type != 2)
        || cfg.funky_type == 3 || cfg.nethack_keypad || compose_state) {
        if ((HIWORD(lParam) & KF_EXTENDED) == 0) {
@@ -2936,12 +3315,20 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
            SendMessage(hwnd, WM_VSCROLL, SB_PAGEUP, 0);
            return 0;
        }
+       if (wParam == VK_PRIOR && shift_state == 2) {
+           SendMessage(hwnd, WM_VSCROLL, SB_LINEUP, 0);
+           return 0;
+       }
        if (wParam == VK_NEXT && shift_state == 1) {
            SendMessage(hwnd, WM_VSCROLL, SB_PAGEDOWN, 0);
            return 0;
        }
+       if (wParam == VK_NEXT && shift_state == 2) {
+           SendMessage(hwnd, WM_VSCROLL, SB_LINEDOWN, 0);
+           return 0;
+       }
        if (wParam == VK_INSERT && shift_state == 1) {
-           term_do_paste();
+           term_do_paste(term);
            return 0;
        }
        if (left_alt && wParam == VK_F4 && cfg.alt_f4) {
@@ -2951,13 +3338,15 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
            SendMessage(hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0);
            return -1;
        }
-       if (left_alt && wParam == VK_RETURN && cfg.fullscreenonaltenter) {
-           flip_full_screen();
+       if (left_alt && wParam == VK_RETURN && cfg.fullscreenonaltenter &&
+           (cfg.resize_action != RESIZE_DISABLED)) {
+           if ((HIWORD(lParam) & (KF_UP | KF_REPEAT)) != KF_REPEAT)
+               flip_full_screen();
            return -1;
        }
        /* Control-Numlock for app-keypad mode switch */
        if (wParam == VK_PAUSE && shift_state == 2) {
-           app_keypad_keys ^= 1;
+           term->app_keypad_keys ^= 1;
            return 0;
        }
 
@@ -3000,7 +3389,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 
            if (cfg.funky_type == 3 ||
                (cfg.funky_type <= 1 &&
-                app_keypad_keys && !cfg.no_applic_k)) switch (wParam) {
+                term->app_keypad_keys && !cfg.no_applic_k)) switch (wParam) {
                  case VK_EXECUTE:
                    xkey = 'P';
                    break;
@@ -3014,7 +3403,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
                    xkey = 'S';
                    break;
                }
-           if (app_keypad_keys && !cfg.no_applic_k)
+           if (term->app_keypad_keys && !cfg.no_applic_k)
                switch (wParam) {
                  case VK_NUMPAD0:
                    xkey = 'p';
@@ -3081,7 +3470,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
                    break;
                }
            if (xkey) {
-               if (vt52_mode) {
+               if (term->vt52_mode) {
                    if (xkey >= 'P' && xkey <= 'S')
                        p += sprintf((char *) p, "\x1B%c", xkey);
                    else
@@ -3097,6 +3486,12 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
            *p++ = 0;
            return -2;
        }
+       if (wParam == VK_BACK && shift_state == 1) {    /* Shift Backspace */
+           /* We do the opposite of what is configured */
+           *p++ = (cfg.bksp_is_delete ? 0x08 : 0x7F);
+           *p++ = 0;
+           return -2;
+       }
        if (wParam == VK_TAB && shift_state == 1) {     /* Shift tab */
            *p++ = 0x1B;
            *p++ = '[';
@@ -3126,7 +3521,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
            *p++ = "\000\033\034\035\036\037\177"[wParam - '2'];
            return p - output;
        }
-       if (shift_state == 2 && wParam == 0xBD) {
+       if (shift_state == 2 && (wParam == 0xBD || wParam == 0xBF)) {
            *p++ = 0x1F;
            return p - output;
        }
@@ -3134,7 +3529,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
            *p++ = 0x1C;
            return p - output;
        }
-       if (shift_state == 0 && wParam == VK_RETURN && cr_lf_return) {
+       if (shift_state == 0 && wParam == VK_RETURN && term->cr_lf_return) {
            *p++ = '\r';
            *p++ = '\n';
            return p - output;
@@ -3236,7 +3631,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
        if (cfg.funky_type == 3 && code <= 6)
            code = "\0\2\1\4\5\3\6"[code];
 
-       if (vt52_mode && code > 0 && code <= 6) {
+       if (term->vt52_mode && code > 0 && code <= 6) {
            p += sprintf((char *) p, "\x1B%c", " HLMEIG"[code]);
            return p - output;
        }
@@ -3274,13 +3669,13 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
            }
            return p - output;
        }
-       if ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) {
+       if ((term->vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) {
            int offt = 0;
            if (code > 15)
                offt++;
            if (code > 21)
                offt++;
-           if (vt52_mode)
+           if (term->vt52_mode)
                p += sprintf((char *) p, "\x1B%c", code + 'P' - 11 - offt);
            else
                p +=
@@ -3292,7 +3687,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
            return p - output;
        }
        if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
-           if (vt52_mode)
+           if (term->vt52_mode)
                p += sprintf((char *) p, "\x1B%c", code + 'P' - 11);
            else
                p += sprintf((char *) p, "\x1BO%c", code + 'P' - 11);
@@ -3331,15 +3726,28 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
                break;
            }
            if (xkey) {
-               if (vt52_mode)
+               if (term->vt52_mode)
                    p += sprintf((char *) p, "\x1B%c", xkey);
                else {
-                   int app_flg = (app_cursor_keys && !cfg.no_applic_c);
-                   /* VT100 & VT102 manuals both state the app cursor keys
-                    * only work if the app keypad is on.
+                   int app_flg = (term->app_cursor_keys && !cfg.no_applic_c);
+#if 0
+                   /*
+                    * RDB: VT100 & VT102 manuals both state the
+                    * app cursor keys only work if the app keypad
+                    * is on.
+                    * 
+                    * SGT: That may well be true, but xterm
+                    * disagrees and so does at least one
+                    * application, so I've #if'ed this out and the
+                    * behaviour is back to PuTTY's original: app
+                    * cursor and app keypad are independently
+                    * switchable modes. If anyone complains about
+                    * _this_ I'll have to put in a configurable
+                    * option.
                     */
-                   if (!app_keypad_keys)
+                   if (!term->app_keypad_keys)
                        app_flg = 0;
+#endif
                    /* Useful mapping of Ctrl-arrows */
                    if (shift_state == 2)
                        app_flg = !app_flg;
@@ -3384,7 +3792,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 #ifdef SHOW_TOASCII_RESULT
        if (r == 1 && !key_down) {
            if (alt_sum) {
-               if (in_utf || dbcs_screenfont)
+               if (in_utf(term) || ucsdata.dbcs_screenfont)
                    debug((", (U+%04x)", alt_sum));
                else
                    debug((", LCH(%d)", alt_sum));
@@ -3408,7 +3816,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
             * sensible, but for the moment it's preferable to
             * having to faff about buffering things.
             */
-           term_nopaste();
+           term_nopaste(term);
 
            p = output;
            for (i = 0; i < r; i++) {
@@ -3428,7 +3836,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
                        return 0;
                    }
                    keybuf = nc;
-                   luni_send(&keybuf, 1, 1);
+                   term_seen_key_event(term);
+                   luni_send(ldisc, &keybuf, 1, 1);
                    continue;
                }
 
@@ -3436,9 +3845,10 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 
                if (!key_down) {
                    if (alt_sum) {
-                       if (in_utf || dbcs_screenfont) {
+                       if (in_utf(term) || ucsdata.dbcs_screenfont) {
                            keybuf = alt_sum;
-                           luni_send(&keybuf, 1, 1);
+                           term_seen_key_event(term);
+                           luni_send(ldisc, &keybuf, 1, 1);
                        } else {
                            ch = (char) alt_sum;
                            /*
@@ -3450,22 +3860,27 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
                             * messages. We _have_ to buffer
                             * everything we're sent.
                             */
-                           ldisc_send(&ch, 1, 1);
+                           term_seen_key_event(term);
+                           ldisc_send(ldisc, &ch, 1, 1);
                        }
                        alt_sum = 0;
                    } else
-                       lpage_send(kbd_codepage, &ch, 1, 1);
+                       term_seen_key_event(term);
+                       lpage_send(ldisc, kbd_codepage, &ch, 1, 1);
                } else {
                    if(capsOn && ch < 0x80) {
                        WCHAR cbuf[2];
                        cbuf[0] = 27;
                        cbuf[1] = xlat_uskbd2cyrllic(ch);
-                       luni_send(cbuf+!left_alt, 1+!!left_alt, 1);
+                       term_seen_key_event(term);
+                       luni_send(ldisc, cbuf+!left_alt, 1+!!left_alt, 1);
                    } else {
                        char cbuf[2];
                        cbuf[0] = '\033';
                        cbuf[1] = ch;
-                       lpage_send(kbd_codepage, cbuf+!left_alt, 1+!!left_alt, 1);
+                       term_seen_key_event(term);
+                       lpage_send(ldisc, kbd_codepage,
+                                  cbuf+!left_alt, 1+!!left_alt, 1);
                    }
                }
                show_mouseptr(0);
@@ -3480,7 +3895,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
        if (!left_alt)
            keys[0] = 0;
        /* If we will be using alt_sum fix the 256s */
-       else if (keys[0] && (in_utf || dbcs_screenfont))
+       else if (keys[0] && (in_utf(term) || ucsdata.dbcs_screenfont))
            keys[0] = 10;
     }
 
@@ -3497,29 +3912,39 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
     return -1;
 }
 
-void set_title(char *title)
+void request_paste(void *frontend)
+{
+    /*
+     * In Windows, pasting is synchronous: we can read the
+     * clipboard with no difficulty, so request_paste() can just go
+     * ahead and paste.
+     */
+    term_do_paste(term);
+}
+
+void set_title(void *frontend, char *title)
 {
     sfree(window_name);
-    window_name = smalloc(1 + strlen(title));
+    window_name = snewn(1 + strlen(title), char);
     strcpy(window_name, title);
     if (cfg.win_name_always || !IsIconic(hwnd))
        SetWindowText(hwnd, title);
 }
 
-void set_icon(char *title)
+void set_icon(void *frontend, char *title)
 {
     sfree(icon_name);
-    icon_name = smalloc(1 + strlen(title));
+    icon_name = snewn(1 + strlen(title), char);
     strcpy(icon_name, title);
     if (!cfg.win_name_always && IsIconic(hwnd))
        SetWindowText(hwnd, title);
 }
 
-void set_sbar(int total, int start, int page)
+void set_sbar(void *frontend, int total, int start, int page)
 {
     SCROLLINFO si;
 
-    if (!cfg.scrollbar)
+    if (is_full_screen() ? !cfg.scrollbar_in_fullscreen : !cfg.scrollbar)
        return;
 
     si.cbSize = sizeof(si);
@@ -3532,7 +3957,7 @@ void set_sbar(int total, int start, int page)
        SetScrollInfo(hwnd, SB_VERT, &si, TRUE);
 }
 
-Context get_ctx(void)
+Context get_ctx(void *frontend)
 {
     HDC hdc;
     if (hwnd) {
@@ -3563,7 +3988,7 @@ static void real_palette_set(int n, int r, int g, int b)
        colours[n] = RGB(r, g, b);
 }
 
-void palette_set(int n, int r, int g, int b)
+void palette_set(void *frontend, int n, int r, int g, int b)
 {
     static const int first[21] = {
        0, 2, 4, 6, 8, 10, 12, 14,
@@ -3574,14 +3999,14 @@ void palette_set(int n, int r, int g, int b)
     if (first[n] >= 18)
        real_palette_set(first[n] + 1, r, g, b);
     if (pal) {
-       HDC hdc = get_ctx();
+       HDC hdc = get_ctx(frontend);
        UnrealizeObject(pal);
        RealizePalette(hdc);
        free_ctx(hdc);
     }
 }
 
-void palette_reset(void)
+void palette_reset(void *frontend)
 {
     int i;
 
@@ -3602,13 +4027,13 @@ void palette_reset(void)
     if (pal) {
        HDC hdc;
        SetPaletteEntries(pal, 0, NCOLOURS, logpal->palPalEntry);
-       hdc = get_ctx();
+       hdc = get_ctx(frontend);
        RealizePalette(hdc);
        free_ctx(hdc);
     }
 }
 
-void write_aclip(char *data, int len, int must_deselect)
+void write_aclip(void *frontend, char *data, int len, int must_deselect)
 {
     HGLOBAL clipdata;
     void *lock;
@@ -3640,12 +4065,11 @@ void write_aclip(char *data, int len, int must_deselect)
 /*
  * Note: unlike write_aclip() this will not append a nul.
  */
-void write_clip(wchar_t * data, int len, int must_deselect)
+void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
 {
-    HGLOBAL clipdata;
-    HGLOBAL clipdata2;
+    HGLOBAL clipdata, clipdata2, clipdata3;
     int len2;
-    void *lock, *lock2;
+    void *lock, *lock2, *lock3;
 
     len2 = WideCharToMultiByte(CP_ACP, 0, data, len, 0, 0, NULL, NULL);
 
@@ -3668,6 +4092,120 @@ void write_clip(wchar_t * data, int len, int must_deselect)
     memcpy(lock, data, len * sizeof(wchar_t));
     WideCharToMultiByte(CP_ACP, 0, data, len, lock2, len2, NULL, NULL);
 
+    if (cfg.rtf_paste) {
+       wchar_t unitab[256];
+       char *rtf = NULL;
+       unsigned char *tdata = (unsigned char *)lock2;
+       wchar_t *udata = (wchar_t *)lock;
+       int rtflen = 0, uindex = 0, tindex = 0;
+       int rtfsize = 0;
+       int multilen, blen, alen, totallen, i;
+       char before[16], after[4];
+
+       get_unitab(CP_ACP, unitab, 0);
+
+       rtfsize = 100 + strlen(cfg.font.name);
+       rtf = snewn(rtfsize, char);
+       sprintf(rtf, "{\\rtf1\\ansi%d{\\fonttbl\\f0\\fmodern %s;}\\f0",
+               GetACP(), cfg.font.name);
+       rtflen = strlen(rtf);
+
+       /*
+        * We want to construct a piece of RTF that specifies the
+        * same Unicode text. To do this we will read back in
+        * parallel from the Unicode data in `udata' and the
+        * non-Unicode data in `tdata'. For each character in
+        * `tdata' which becomes the right thing in `udata' when
+        * looked up in `unitab', we just copy straight over from
+        * tdata. For each one that doesn't, we must WCToMB it
+        * individually and produce a \u escape sequence.
+        * 
+        * It would probably be more robust to just bite the bullet
+        * and WCToMB each individual Unicode character one by one,
+        * then MBToWC each one back to see if it was an accurate
+        * translation; but that strikes me as a horrifying number
+        * of Windows API calls so I want to see if this faster way
+        * will work. If it screws up badly we can always revert to
+        * the simple and slow way.
+        */
+       while (tindex < len2 && uindex < len &&
+              tdata[tindex] && udata[uindex]) {
+           if (tindex + 1 < len2 &&
+               tdata[tindex] == '\r' &&
+               tdata[tindex+1] == '\n') {
+               tindex++;
+               uindex++;
+           }
+           if (unitab[tdata[tindex]] == udata[uindex]) {
+               multilen = 1;
+               before[0] = '\0';
+               after[0] = '\0';
+               blen = alen = 0;
+           } else {
+               multilen = WideCharToMultiByte(CP_ACP, 0, unitab+uindex, 1,
+                                              NULL, 0, NULL, NULL);
+               if (multilen != 1) {
+                   blen = sprintf(before, "{\\uc%d\\u%d", multilen,
+                                  udata[uindex]);
+                   alen = 1; strcpy(after, "}");
+               } else {
+                   blen = sprintf(before, "\\u%d", udata[uindex]);
+                   alen = 0; after[0] = '\0';
+               }
+           }
+           assert(tindex + multilen <= len2);
+           totallen = blen + alen;
+           for (i = 0; i < multilen; i++) {
+               if (tdata[tindex+i] == '\\' ||
+                   tdata[tindex+i] == '{' ||
+                   tdata[tindex+i] == '}')
+                   totallen += 2;
+               else if (tdata[tindex+i] == 0x0D || tdata[tindex+i] == 0x0A)
+                   totallen += 6;     /* \par\r\n */
+               else if (tdata[tindex+i] > 0x7E || tdata[tindex+i] < 0x20)
+                   totallen += 4;
+               else
+                   totallen++;
+           }
+
+           if (rtfsize < rtflen + totallen + 3) {
+               rtfsize = rtflen + totallen + 512;
+               rtf = sresize(rtf, rtfsize, char);
+           }
+
+           strcpy(rtf + rtflen, before); rtflen += blen;
+           for (i = 0; i < multilen; i++) {
+               if (tdata[tindex+i] == '\\' ||
+                   tdata[tindex+i] == '{' ||
+                   tdata[tindex+i] == '}') {
+                   rtf[rtflen++] = '\\';
+                   rtf[rtflen++] = tdata[tindex+i];
+               } else if (tdata[tindex+i] == 0x0D || tdata[tindex+i] == 0x0A) {
+                   rtflen += sprintf(rtf+rtflen, "\\par\r\n");
+               } else if (tdata[tindex+i] > 0x7E || tdata[tindex+i] < 0x20) {
+                   rtflen += sprintf(rtf+rtflen, "\\'%02x", tdata[tindex+i]);
+               } else {
+                   rtf[rtflen++] = tdata[tindex+i];
+               }
+           }
+           strcpy(rtf + rtflen, after); rtflen += alen;
+
+           tindex += multilen;
+           uindex++;
+       }
+
+       strcpy(rtf + rtflen, "}");
+       rtflen += 2;
+
+       clipdata3 = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, rtflen);
+       if (clipdata3 && (lock3 = GlobalLock(clipdata3)) != NULL) {
+           strcpy(lock3, rtf);
+           GlobalUnlock(clipdata3);
+       }
+       sfree(rtf);
+    } else
+       clipdata3 = NULL;
+
     GlobalUnlock(clipdata);
     GlobalUnlock(clipdata2);
 
@@ -3678,6 +4216,8 @@ void write_clip(wchar_t * data, int len, int must_deselect)
        EmptyClipboard();
        SetClipboardData(CF_UNICODETEXT, clipdata);
        SetClipboardData(CF_TEXT, clipdata2);
+       if (clipdata3)
+           SetClipboardData(RegisterClipboardFormat(CF_RTF), clipdata3);
        CloseClipboard();
     } else {
        GlobalFree(clipdata);
@@ -3688,7 +4228,7 @@ void write_clip(wchar_t * data, int len, int must_deselect)
        SendMessage(hwnd, WM_IGNORE_CLIP, FALSE, 0);
 }
 
-void get_clip(wchar_t ** p, int *len)
+void get_clip(void *frontend, wchar_t ** p, int *len)
 {
     static HGLOBAL clipdata = NULL;
     static wchar_t *converted = 0;
@@ -3718,7 +4258,7 @@ void get_clip(wchar_t ** p, int *len)
            CloseClipboard();
            s = GlobalLock(clipdata);
            i = MultiByteToWideChar(CP_ACP, 0, s, strlen(s) + 1, 0, 0);
-           *p = converted = smalloc(i * sizeof(wchar_t));
+           *p = converted = snewn(i, wchar_t);
            MultiByteToWideChar(CP_ACP, 0, s, strlen(s) + 1, converted, i);
            *len = i - 1;
            return;
@@ -3735,7 +4275,7 @@ void get_clip(wchar_t ** p, int *len)
  * Move `lines' lines from position `from' to position `to' in the
  * window.
  */
-void optimised_move(int to, int from, int lines)
+void optimised_move(void *frontend, int to, int from, int lines)
 {
     RECT r;
     int min, max;
@@ -3744,7 +4284,7 @@ void optimised_move(int to, int from, int lines)
     max = to + from - min;
 
     r.left = offset_width;
-    r.right = offset_width + cols * font_width;
+    r.right = offset_width + term->cols * font_width;
     r.top = offset_height + min * font_height;
     r.bottom = offset_height + (max + lines) * font_height;
     ScrollWindow(hwnd, 0, (to - from) * font_height, &r, &r);
@@ -3763,7 +4303,23 @@ void fatalbox(char *fmt, ...)
     vsprintf(stuff, fmt, ap);
     va_end(ap);
     MessageBox(hwnd, stuff, "PuTTY Fatal Error", MB_ICONERROR | MB_OK);
-    exit(1);
+    cleanup_exit(1);
+}
+
+/*
+ * Print a modal (Really Bad) message box and perform a fatal exit.
+ */
+void modalfatalbox(char *fmt, ...)
+{
+    va_list ap;
+    char stuff[200];
+
+    va_start(ap, fmt);
+    vsprintf(stuff, fmt, ap);
+    va_end(ap);
+    MessageBox(hwnd, stuff, "PuTTY Fatal Error",
+              MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
+    cleanup_exit(1);
 }
 
 /*
@@ -3805,7 +4361,7 @@ static void flash_window(int mode)
 /*
  * Beep.
  */
-void beep(int mode)
+void beep(void *frontend, int mode)
 {
     if (mode == BELL_DEFAULT) {
        /*
@@ -3827,7 +4383,8 @@ void beep(int mode)
         */
        lastbeep = GetTickCount();
     } else if (mode == BELL_WAVEFILE) {
-       if (!PlaySound(cfg.bell_wavefile, NULL, SND_ASYNC | SND_FILENAME)) {
+       if (!PlaySound(cfg.bell_wavefile.path, NULL,
+                      SND_ASYNC | SND_FILENAME)) {
            char buf[sizeof(cfg.bell_wavefile) + 80];
            sprintf(buf, "Unable to play sound file\n%s\n"
                    "Using default sound instead", cfg.bell_wavefile);
@@ -3837,65 +4394,237 @@ void beep(int mode)
        }
     }
     /* Otherwise, either visual bell or disabled; do nothing here */
-    if (!has_focus) {
+    if (!term->has_focus) {
        flash_window(2);               /* start */
     }
 }
 
 /*
- * Toggle full screen mode. Thanks to cwis@nerim.fr for the
- * implementation.
- * Revised by <wez@thebrainroom.com>
+ * Minimise or restore the window in response to a server-side
+ * request.
  */
-static void flip_full_screen(void)
+void set_iconic(void *frontend, int iconic)
 {
-    WINDOWPLACEMENT wp;
-    LONG style;
+    if (IsIconic(hwnd)) {
+       if (!iconic)
+           ShowWindow(hwnd, SW_RESTORE);
+    } else {
+       if (iconic)
+           ShowWindow(hwnd, SW_MINIMIZE);
+    }
+}
 
-    wp.length = sizeof(wp);
-    GetWindowPlacement(hwnd, &wp);
+/*
+ * Move the window in response to a server-side request.
+ */
+void move_window(void *frontend, int x, int y)
+{
+    if (cfg.resize_action == RESIZE_DISABLED || 
+        cfg.resize_action == RESIZE_FONT ||
+       IsZoomed(hwnd))
+       return;
 
-    full_screen = !full_screen;
+    SetWindowPos(hwnd, NULL, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
+}
+
+/*
+ * Move the window to the top or bottom of the z-order in response
+ * to a server-side request.
+ */
+void set_zorder(void *frontend, int top)
+{
+    if (cfg.alwaysontop)
+       return;                        /* ignore */
+    SetWindowPos(hwnd, top ? HWND_TOP : HWND_BOTTOM, 0, 0, 0, 0,
+                SWP_NOMOVE | SWP_NOSIZE);
+}
+
+/*
+ * Refresh the window in response to a server-side request.
+ */
+void refresh_window(void *frontend)
+{
+    InvalidateRect(hwnd, NULL, TRUE);
+}
+
+/*
+ * Maximise or restore the window in response to a server-side
+ * request.
+ */
+void set_zoomed(void *frontend, int zoomed)
+{
+    if (IsZoomed(hwnd)) {
+        if (!zoomed)
+           ShowWindow(hwnd, SW_RESTORE);
+    } else {
+       if (zoomed)
+           ShowWindow(hwnd, SW_MAXIMIZE);
+    }
+}
+
+/*
+ * Report whether the window is iconic, for terminal reports.
+ */
+int is_iconic(void *frontend)
+{
+    return IsIconic(hwnd);
+}
+
+/*
+ * Report the window's position, for terminal reports.
+ */
+void get_window_pos(void *frontend, int *x, int *y)
+{
+    RECT r;
+    GetWindowRect(hwnd, &r);
+    *x = r.left;
+    *y = r.top;
+}
+
+/*
+ * Report the window's pixel size, for terminal reports.
+ */
+void get_window_pixels(void *frontend, int *x, int *y)
+{
+    RECT r;
+    GetWindowRect(hwnd, &r);
+    *x = r.right - r.left;
+    *y = r.bottom - r.top;
+}
+
+/*
+ * Return the window or icon title.
+ */
+char *get_window_title(void *frontend, int icon)
+{
+    return icon ? icon_name : window_name;
+}
+
+/*
+ * See if we're in full-screen mode.
+ */
+int is_full_screen()
+{
+    if (!IsZoomed(hwnd))
+       return FALSE;
+    if (GetWindowLong(hwnd, GWL_STYLE) & WS_CAPTION)
+       return FALSE;
+    return TRUE;
+}
+
+/* Get the rect/size of a full screen window using the nearest available
+ * monitor in multimon systems; default to something sensible if only
+ * one monitor is present. */
+static int get_fullscreen_rect(RECT * ss)
+{
+#ifdef MONITOR_DEFAULTTONEAREST
+       HMONITOR mon;
+       MONITORINFO mi;
+       mon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+       mi.cbSize = sizeof(mi);
+       GetMonitorInfo(mon, &mi);
+
+       /* structure copy */
+       *ss = mi.rcMonitor;
+       return TRUE;
+#else
+/* could also use code like this:
+       ss->left = ss->top = 0;
+       ss->right = GetSystemMetrics(SM_CXSCREEN);
+       ss->bottom = GetSystemMetrics(SM_CYSCREEN);
+*/ 
+       return GetClientRect(GetDesktopWindow(), ss);
+#endif
+}
 
-    if (full_screen) {
-       if (wp.showCmd == SW_SHOWMAXIMIZED) {
-           /* Ooops it was already 'zoomed' we have to unzoom it before
-            * everything will work right.
-            */
-           wp.showCmd = SW_SHOWNORMAL;
-           SetWindowPlacement(hwnd, &wp);
-       }
 
-       style = GetWindowLong(hwnd, GWL_STYLE) & ~WS_CAPTION;
+/*
+ * Go full-screen. This should only be called when we are already
+ * maximised.
+ */
+void make_full_screen()
+{
+    DWORD style;
+       RECT ss;
+
+    assert(IsZoomed(hwnd));
+
+       if (is_full_screen())
+               return;
+       
+    /* Remove the window furniture. */
+    style = GetWindowLong(hwnd, GWL_STYLE);
+    style &= ~(WS_CAPTION | WS_BORDER | WS_THICKFRAME);
+    if (cfg.scrollbar_in_fullscreen)
+       style |= WS_VSCROLL;
+    else
        style &= ~WS_VSCROLL;
-       if (cfg.scrollbar_in_fullscreen)
-           style |= WS_VSCROLL;
-       SetWindowLong(hwnd, GWL_STYLE, style);
+    SetWindowLong(hwnd, GWL_STYLE, style);
 
-       /* This seems to be needed otherwize explorer doesn't notice
-        * we want to go fullscreen and it's bar is still visible
-        */
+    /* Resize ourselves to exactly cover the nearest monitor. */
+       get_fullscreen_rect(&ss);
+    SetWindowPos(hwnd, HWND_TOP, ss.left, ss.top,
+                       ss.right - ss.left,
+                       ss.bottom - ss.top,
+                       SWP_FRAMECHANGED);
+
+    /* Tick the menu item in the System menu. */
+    CheckMenuItem(GetSystemMenu(hwnd, FALSE), IDM_FULLSCREEN,
+                 MF_CHECKED);
+}
+
+/*
+ * Clear the full-screen attributes.
+ */
+void clear_full_screen()
+{
+    DWORD oldstyle, style;
+
+    /* Reinstate the window furniture. */
+    style = oldstyle = GetWindowLong(hwnd, GWL_STYLE);
+    style |= WS_CAPTION | WS_BORDER;
+    if (cfg.resize_action == RESIZE_DISABLED)
+        style &= ~WS_THICKFRAME;
+    else
+        style |= WS_THICKFRAME;
+    if (cfg.scrollbar)
+       style |= WS_VSCROLL;
+    else
+       style &= ~WS_VSCROLL;
+    if (style != oldstyle) {
+       SetWindowLong(hwnd, GWL_STYLE, style);
        SetWindowPos(hwnd, NULL, 0, 0, 0, 0,
-                    SWP_NOACTIVATE | SWP_NOCOPYBITS |
                     SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
                     SWP_FRAMECHANGED);
+    }
 
-       wp.showCmd = SW_SHOWMAXIMIZED;
-       SetWindowPlacement(hwnd, &wp);
-    } else {
-       style = GetWindowLong(hwnd, GWL_STYLE) | WS_CAPTION;
-       style &= ~WS_VSCROLL;
-       if (cfg.scrollbar)
-           style |= WS_VSCROLL;
-       SetWindowLong(hwnd, GWL_STYLE, style);
+    /* Untick the menu item in the System menu. */
+    CheckMenuItem(GetSystemMenu(hwnd, FALSE), IDM_FULLSCREEN,
+                 MF_UNCHECKED);
+}
 
-       /* Don't need to do a SetWindowPos as the resize will force a
-        * full redraw.
-        */
-       wp.showCmd = SW_SHOWNORMAL;
-       SetWindowPlacement(hwnd, &wp);
+/*
+ * Toggle full-screen mode.
+ */
+void flip_full_screen()
+{
+    if (is_full_screen()) {
+       ShowWindow(hwnd, SW_RESTORE);
+    } else if (IsZoomed(hwnd)) {
+       make_full_screen();
+    } else {
+       SendMessage(hwnd, WM_FULLSCR_ON_MAX, 0, 0);
+       ShowWindow(hwnd, SW_MAXIMIZE);
     }
+}
 
-    CheckMenuItem(GetSystemMenu(hwnd, FALSE), IDM_FULLSCREEN,
-                 MF_BYCOMMAND| full_screen ? MF_CHECKED : MF_UNCHECKED);
+void frontend_keypress(void *handle)
+{
+    /*
+     * Keypress termination in non-Close-On-Exit mode is not
+     * currently supported in PuTTY proper, because the window
+     * always has a perfectly good Close button anyway. So we do
+     * nothing here.
+     */
+    return;
 }