X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2d466ffd08675d26db45e524c2fe6a8cf4628e2b..86916870d36cb70e7ef0ea760e75a6ae8b2d83a5:/window.c

diff --git a/window.c b/window.c
index ea349bda..ebf554ea 100644
--- 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
@@ -9,13 +10,23 @@
 #include <winsock.h>
 #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"
@@ -39,9 +50,11 @@
 #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_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 */
@@ -49,17 +62,20 @@
 #define IDM_SAVED_MIN 0x1000
 #define IDM_SAVED_MAX 0x2000
 
-#define WM_IGNORE_SIZE (WM_XUSER + 1)
 #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 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
@@ -67,19 +83,47 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 			unsigned char *output);
 static void cfgtopalette(void);
 static void init_palette(void);
-static void init_fonts(int);
+static void init_fonts(int, int);
 static void another_font(int);
 static void deinit_fonts(void);
+static void set_input_locale(HKL);
 
-static int extra_width, extra_height;
+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 extra_width, extra_height;
+static int font_width, font_height, font_dualwidth;
+static int offset_width, offset_height;
+static int was_zoomed = 0;
+static int prev_rows, prev_cols;
+  
 static int pending_netevent = 0;
 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 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 int session_closed;
+
+extern struct sesslist sesslist;       /* imported from windlg.c */
+
 #define FONT_NORMAL 0
 #define FONT_BOLD 1
 #define FONT_UNDERLINE 2
@@ -87,16 +131,16 @@ static time_t last_movement = 0;
 #define FONT_WIDE	0x04
 #define FONT_HIGH	0x08
 #define FONT_NARROW	0x10
+
 #define FONT_OEM 	0x20
 #define FONT_OEMBOLD 	0x21
 #define FONT_OEMUND 	0x22
 #define FONT_OEMBOLDUND 0x23
-#define FONT_MSGOTHIC 	0x40
-#define FONT_MINGLIU 	0x60
-#define FONT_GULIMCHE 	0x80
-#define FONT_MAXNO 	0x8F
+
+#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
@@ -127,8 +171,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)
 {
 }
 
@@ -156,6 +206,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();
 
@@ -165,11 +216,58 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      * config box. */
     defuse_showwindow();
 
+    {
+	ZeroMemory(&osVersion, sizeof(osVersion));
+	osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+	if (!GetVersionEx ( (OSVERSIONINFO *) &osVersion)) {
+            MessageBox(NULL, "Windows refuses to report a version",
+                       "PuTTY Fatal Error", MB_OK | MB_ICONEXCLAMATION);
+	    return 1;
+        }
+    }
+
+    /*
+     * 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;
@@ -178,54 +276,16 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	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]))
@@ -255,53 +315,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.
 	 */
@@ -327,6 +444,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';
+	}
     }
 
     /*
@@ -365,7 +497,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	wndclass.hInstance = inst;
 	wndclass.hIcon = LoadIcon(inst, MAKEINTRESOURCE(IDI_MAINICON));
 	wndclass.hCursor = LoadCursor(NULL, IDC_IBEAM);
-	wndclass.hbrBackground = GetStockObject(BLACK_BRUSH);
+	wndclass.hbrBackground = NULL;
 	wndclass.lpszMenuName = NULL;
 	wndclass.lpszClassName = appname;
 
@@ -374,8 +506,9 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
     hwnd = NULL;
 
-    savelines = cfg.savelines;
-    term_init();
+    term = term_init(&cfg, NULL);
+    logctx = log_init(NULL);
+    term_provide_logctx(term, logctx);
 
     cfgtopalette();
 
@@ -390,13 +523,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)
@@ -408,7 +540,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	int exwinmode = 0;
 	if (!cfg.scrollbar)
 	    winmode &= ~(WS_VSCROLL);
-	if (cfg.locksize)
+	if (cfg.resize_action == RESIZE_DISABLED)
 	    winmode &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX);
 	if (cfg.alwaysontop)
 	    exwinmode |= WS_EX_TOPMOST;
@@ -424,9 +556,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      * Initialise the fonts, simultaneously correcting the guesses
      * for font_{width,height}.
      */
-    bold_mode = cfg.bold_colour ? BOLD_COLOURS : BOLD_FONT;
-    und_mode = UND_FONT;
-    init_fonts(0);
+    init_fonts(0,0);
 
     /*
      * Correct the guesses for extra_{width,height}.
@@ -435,17 +565,17 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	RECT cr, wr;
 	GetWindowRect(hwnd, &wr);
 	GetClientRect(hwnd, &cr);
-	extra_width = wr.right - wr.left - cr.right + cr.left;
-	extra_height = wr.bottom - wr.top - cr.bottom + cr.top;
+	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;
     }
 
     /*
      * 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;
-    SendMessage(hwnd, WM_IGNORE_SIZE, 0, 0);
+    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);
 
@@ -471,8 +601,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);
     }
@@ -485,7 +615,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);
@@ -500,17 +632,21 @@ 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);
     }
 
-    session_closed = FALSE;
+    /*
+     * Connect the terminal to the backend for resize purposes.
+     */
+    term_provide_resize_fn(term, back->size, backhandle);
 
     /*
-     * Set up the input and output buffers.
+     * Set up a line discipline.
      */
-    inbuf_head = 0;
-    outbuf_reap = outbuf_head = 0;
+    ldisc = ldisc_create(&cfg, term, back, backhandle, NULL);
+
+    session_closed = FALSE;
 
     /*
      * Prepare the mouse handler.
@@ -555,10 +691,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);
@@ -566,18 +704,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, (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);
+    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.
@@ -586,7 +735,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) {
@@ -609,10 +758,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
@@ -625,7 +774,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;
@@ -640,15 +789,23 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 		timer_id = 0;
 	    }
 	    HideCaret(hwnd);
-	    if (inbuf_head)
-		term_out();
-	    term_update();
+	    if (GetCapture() != hwnd || 
+		(send_raw_mouse &&
+		 !(cfg.mouse_override && is_shift_pressed())))
+		term_out(term);
+	    term_update(term);
 	    ShowCaret(hwnd);
-	    if (in_vbell)
+
+	    flash_window(1);	       /* maintain */
+
+	    /* 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)
-		timer_id = SetTimer(hwnd, 1, 2000, NULL);
+	    else if (!term->has_focus)
+		timer_id = SetTimer(hwnd, 1, 500, NULL);
 	    else
 		timer_id = SetTimer(hwnd, 1, 100, NULL);
 	    long_timer = 1;
@@ -662,6 +819,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.
      */
@@ -669,7 +835,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();
@@ -678,7 +846,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 #endif
     }
 
-    return msg.wParam;
+    exit(code);
 }
 
 /*
@@ -689,7 +857,8 @@ char *do_select(SOCKET skt, int startup)
     int msg, events;
     if (startup) {
 	msg = WM_NETEVENT;
-	events = FD_READ | FD_WRITE | FD_OOB | FD_CLOSE;
+	events = (FD_CONNECT | FD_READ | FD_WRITE |
+		  FD_OOB | FD_CLOSE | FD_ACCEPT);
     } else {
 	msg = events = 0;
     }
@@ -709,8 +878,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));
 }
@@ -718,7 +888,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];
@@ -736,6 +906,21 @@ void connection_fatal(char *fmt, ...)
 }
 
 /*
+ * 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)
@@ -845,7 +1030,7 @@ static void init_palette(void)
  *   ordinary one (manual underlining by means of line drawing can
  *   be done in a pinch).
  */
-static void init_fonts(int pick_width)
+static void init_fonts(int pick_width, int pick_height)
 {
     TEXTMETRIC tm;
     CPINFO cpinfo;
@@ -857,6 +1042,9 @@ static void init_fonts(int pick_width)
     for (i = 0; i < FONT_MAXNO; i++)
 	fonts[i] = NULL;
 
+    bold_mode = cfg.bold_colour ? BOLD_COLOURS : BOLD_FONT;
+    und_mode = UND_FONT;
+
     if (cfg.fontisbold) {
 	fw_dontcare = FW_BOLD;
 	fw_bold = FW_HEAVY;
@@ -867,10 +1055,14 @@ static void init_fonts(int pick_width)
 
     hdc = GetDC(hwnd);
 
-    font_height = cfg.fontheight;
-    if (font_height > 0) {
-	font_height =
-	    -MulDiv(font_height, GetDeviceCaps(hdc, LOGPIXELSY), 72);
+    if (pick_height)
+	font_height = pick_height;
+    else {
+	font_height = cfg.fontheight;
+	if (font_height > 0) {
+	    font_height =
+		-MulDiv(font_height, GetDeviceCaps(hdc, LOGPIXELSY), 72);
+	}
     }
     font_width = pick_width;
 
@@ -882,10 +1074,34 @@ static void init_fonts(int pick_width)
 
     f(FONT_NORMAL, cfg.fontcharset, 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.fontcharset;
+    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, LF_FACESIZE);
+
     SelectObject(hdc, fonts[FONT_NORMAL]);
     GetTextMetrics(hdc, &tm);
-    font_height = tm.tmHeight;
-    font_width = tm.tmAveCharWidth;
+
+    if (pick_width == 0 || pick_height == 0) {
+	font_height = tm.tmHeight;
+	font_width = tm.tmAveCharWidth;
+    }
+    font_dualwidth = (tm.tmAveCharWidth != tm.tmMaxCharWidth);
+
+#ifdef RDB_DEBUG_PATCH
+    debug(23, "Primary font H=%d, AW=%d, MW=%d",
+	    tm.tmHeight, tm.tmAveCharWidth, tm.tmMaxCharWidth);
+#endif
 
     {
 	CHARSETINFO info;
@@ -991,7 +1207,7 @@ static void init_fonts(int pick_width)
     }
     fontflag[0] = fontflag[1] = fontflag[2] = 1;
 
-    init_ucs_tables();
+    init_ucs();
 }
 
 static void another_font(int fontno)
@@ -1025,7 +1241,7 @@ static void another_font(int fontno)
     if (fontno & FONT_WIDE)
 	x *= 2;
     if (fontno & FONT_NARROW)
-	x /= 2;
+	x = (x+1)/2;
     if (fontno & FONT_OEM)
 	c = OEM_CHARSET;
     if (fontno & FONT_BOLD)
@@ -1053,32 +1269,28 @@ static void deinit_fonts(void)
     }
 }
 
-void request_resize(int w, int h, int refont)
+void request_resize(void *frontend, int w, int h)
 {
     int width, height;
 
     /* If the window is maximized supress resizing attempts */
-    if (IsZoomed(hwnd))
-	return;
+    if (IsZoomed(hwnd)) {
+	if (cfg.resize_action == RESIZE_TERM)
+	    return;
+    }
 
-    if (refont && w != cols && (cols == 80 || cols == 132)) {
-	/* If font width too big for screen should we shrink the font more ? */
-	if (w == 132)
-	    font_width = ((font_width * cols + w / 2) / w);
-	else
-	    font_width = 0;
-	deinit_fonts();
-	bold_mode = cfg.bold_colour ? BOLD_COLOURS : BOLD_FONT;
-	und_mode = UND_FONT;
-	init_fonts(font_width);
-    } else {
+    if (cfg.resize_action == RESIZE_DISABLED) return;
+    if (h == term->rows && w == term->cols) return;
+
+    /* Sanity checks ... */
+    {
 	static int first_time = 1;
 	static RECT ss;
 
 	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;
@@ -1086,34 +1298,254 @@ void request_resize(int w, int h, int refont)
 	    }
 	  case 0:
 	    /* Make sure the values are sane */
-	    width = (ss.right - ss.left - extra_width) / font_width;
-	    height = (ss.bottom - ss.top - extra_height) / font_height;
+	    width = (ss.right - ss.left - extra_width) / 4;
+	    height = (ss.bottom - ss.top - extra_height) / 6;
 
-	    if (w > width)
-		w = width;
-	    if (h > height)
-		h = height;
+	    if (w > width || h > height)
+		return;
 	    if (w < 15)
 		w = 15;
 	    if (h < 1)
-		w = 1;
+		h = 1;
+	}
+    }
+
+    term_size(term, h, w, cfg.savelines);
+
+    if (cfg.resize_action != RESIZE_FONT && !IsZoomed(hwnd)) {
+	width = extra_width + font_width * w;
+	height = extra_height + font_height * h;
+
+	SetWindowPos(hwnd, NULL, 0, 0, width, height,
+	    SWP_NOACTIVATE | SWP_NOCOPYBITS |
+	    SWP_NOMOVE | SWP_NOZORDER);
+    } else
+	reset_window(0);
+
+    InvalidateRect(hwnd, NULL, TRUE);
+}
+
+static void reset_window(int reinit) {
+    /*
+     * This function decides how to resize or redraw when the 
+     * user changes something. 
+     *
+     * This function doesn't like to change the terminal size but if the
+     * font size is locked that may be it's only soluion.
+     */
+    int win_width, win_height;
+    RECT cr, wr;
+
+#ifdef RDB_DEBUG_PATCH
+    debug((27, "reset_window()"));
+#endif
+
+    /* Current window sizes ... */
+    GetWindowRect(hwnd, &wr);
+    GetClientRect(hwnd, &cr);
+
+    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
+	debug((27, "reset_window() -- Forced deinit"));
+#endif
+	deinit_fonts();
+	init_fonts(0,0);
+    }
+
+    /* Oh, looks like we're minimised */
+    if (win_width == 0 || win_height == 0)
+	return;
+
+    /* Is the window out of position ? */
+    if ( !reinit && 
+	    (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"));
+#endif
+    }
+
+    if (IsZoomed(hwnd)) {
+	/* We're fullscreen, this means we must not change the size of
+	 * the window so it's the font size or the terminal itself.
+	 */
+
+	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_TERM) {
+	    if (  font_width != win_width/term->cols || 
+		  font_height != win_height/term->rows) {
+		deinit_fonts();
+		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)",
+			font_width, font_height));
+#endif
+	    }
+	} else {
+	    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(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"));
+#endif
+	    }
+	}
+	return;
+    }
+
+    /* Hmm, a force re-init means we should ignore the current window
+     * so we resize to the default font size.
+     */
+    if (reinit>0) {
+#ifdef RDB_DEBUG_PATCH
+	debug((27, "reset_window() -> Forced re-init"));
+#endif
+
+	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*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*term->cols + extra_width, 
+			 font_height*term->rows + extra_height,
+			 SWP_NOMOVE | SWP_NOZORDER);
+	}
+
+	InvalidateRect(hwnd, NULL, TRUE);
+	return;
+    }
+
+    /* Okay the user doesn't want us to change the font so we try the 
+     * window. But that may be too big for the screen which forces us
+     * to change the terminal.
+     */
+    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*term->cols + offset_width*2 ||
+	    win_height != font_height*term->rows + offset_height*2) {
+
+	    static RECT ss;
+	    int width, height;
+		
+		get_fullscreen_rect(&ss);
+
+	    width = (ss.right - ss.left - extra_width) / font_width;
+	    height = (ss.bottom - ss.top - extra_height) / font_height;
+
+	    /* Grrr too big */
+	    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));
+#endif
+		}
+	    }
+	    
+	    SetWindowPos(hwnd, NULL, 0, 0, 
+		         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*term->cols + extra_width,
+			font_height*term->rows + extra_height));
+#endif
 	}
+	return;
     }
 
-    width = extra_width + font_width * w;
-    height = extra_height + font_height * h;
+    /* We're allowed to or must change the font but do we want to ?  */
 
-    SetWindowPos(hwnd, NULL, 0, 0, width, height,
-		 SWP_NOACTIVATE | SWP_NOCOPYBITS |
-		 SWP_NOMOVE | SWP_NOZORDER);
+    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)/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;
+
+	InvalidateRect(hwnd, NULL, TRUE);
+#ifdef RDB_DEBUG_PATCH
+	debug((25, "reset_window() -> font resize to (%d,%d)", 
+		   font_width, font_height));
+#endif
+    }
+}
+
+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)
+static void click(Mouse_Button b, int x, int y, int shift, int ctrl, int alt)
 {
     int thistime = GetMessageTime();
 
-    if (send_raw_mouse) {
-	term_mouse(b, MA_CLICK, x, y, shift, ctrl);
+    if (send_raw_mouse && !(cfg.mouse_override && shift)) {
+	lastbtn = MBT_NOTHING;
+	term_mouse(term, b, MA_CLICK, x, y, shift, ctrl, alt);
 	return;
     }
 
@@ -1126,7 +1558,7 @@ static void click(Mouse_Button b, int x, int y, int shift, int ctrl)
 	lastact = MA_CLICK;
     }
     if (lastact != MA_NOTHING)
-	term_mouse(b, lastact, x, y, shift, ctrl);
+	term_mouse(term, b, lastact, x, y, shift, ctrl, alt);
     lasttime = thistime;
 }
 
@@ -1134,7 +1566,7 @@ static void click(Mouse_Button b, int x, int y, int shift, int ctrl)
  * Translate a raw mouse button designation (LEFT, MIDDLE, RIGHT)
  * into a cooked one (SELECT, EXTEND, PASTE).
  */
-Mouse_Button translate_button(Mouse_Button button)
+Mouse_Button translate_button(void *frontend, Mouse_Button button)
 {
     if (button == MBT_LEFT)
 	return MBT_SELECT;
@@ -1157,35 +1589,60 @@ static void show_mouseptr(int show)
     cursor_visible = show;
 }
 
+static int is_alt_pressed(void)
+{
+    BYTE keystate[256];
+    int r = GetKeyboardState(keystate);
+    if (!r)
+	return FALSE;
+    if (keystate[VK_MENU] & 0x80)
+	return TRUE;
+    if (keystate[VK_RMENU] & 0x80)
+	return TRUE;
+    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_size = FALSE;
     static int ignore_clip = FALSE;
-    static int just_reconfigged = FALSE;
-    static int resizing = FALSE;
     static int need_backend_resize = FALSE;
-    static int defered_resize = FALSE;
+    static int fullscr_on_max = FALSE;
 
     switch (message) {
       case WM_TIMER:
 	if (pending_netevent)
 	    enact_pending_netevent();
-	if (inbuf_head)
-	    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;
 	    }
 	}
+	net_pending_errors();
 	return 0;
       case WM_CREATE:
 	break;
@@ -1245,15 +1702,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 = 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;
+			}
+		    } else
+			break;
 		} else
 		    cl = NULL;
 
@@ -1276,39 +1738,40 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    break;
 	  case IDM_RECONF:
 	    {
-		int prev_alwaysontop = cfg.alwaysontop;
-		int prev_sunken_edge = cfg.sunken_edge;
-		char oldlogfile[FILENAME_MAX];
-		int oldlogtype;
-		int need_setwpos = FALSE;
-		int old_fwidth, old_fheight;
-
-		strcpy(oldlogfile, cfg.logfilename);
-		oldlogtype = cfg.logtype;
-		old_fwidth = font_width;
-		old_fheight = font_height;
+		Config prev_cfg;
+		int init_lvl = 1;
+
 		GetWindowText(hwnd, cfg.wintitle, sizeof(cfg.wintitle));
+		prev_cfg = cfg;
 
 		if (!do_reconfig(hwnd))
 		    break;
 
-		if (strcmp(oldlogfile, cfg.logfilename) ||
-		    oldlogtype != cfg.logtype) {
-		    logfclose();       /* reset logging */
-		    logfopen();
+		{
+		    /* 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(logctx); /* reset logging */
+		    logfopen(logctx);
 		}
 
-		just_reconfigged = TRUE;
-		deinit_fonts();
-		bold_mode = cfg.bold_colour ? BOLD_COLOURS : BOLD_FONT;
-		und_mode = UND_FONT;
-		init_fonts(0);
 		sfree(logpal);
 		/*
 		 * Flush the line discipline's edit buffer in the
 		 * case where local editing has just been disabled.
 		 */
-		ldisc_send(NULL, 0);
+		ldisc_send(ldisc, NULL, 0, 0);
 		if (pal)
 		    DeleteObject(pal);
 		logpal = NULL;
@@ -1316,6 +1779,21 @@ 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(back, &cfg);
+
+		/* Screen size changed ? */
+		if (cfg.height != prev_cfg.height ||
+		    cfg.width != prev_cfg.width ||
+		    cfg.savelines != prev_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 */
 		{
 		    LONG nflg, flag = GetWindowLong(hwnd, GWL_STYLE);
@@ -1323,7 +1801,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 			GetWindowLong(hwnd, GWL_EXSTYLE);
 
 		    nexflag = exflag;
-		    if (cfg.alwaysontop != prev_alwaysontop) {
+		    if (cfg.alwaysontop != prev_cfg.alwaysontop) {
 			if (cfg.alwaysontop) {
 			    nexflag |= WS_EX_TOPMOST;
 			    SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
@@ -1340,141 +1818,160 @@ 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.locksize)
-			nflg &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX);
+
+		    if (cfg.resize_action == RESIZE_DISABLED ||
+                        is_full_screen())
+			nflg &= ~WS_THICKFRAME;
 		    else
-			nflg |= (WS_THICKFRAME | WS_MAXIMIZEBOX);
+			nflg |= WS_THICKFRAME;
 
-		    if (nflg != flag || nexflag != exflag) {
-			RECT cr, wr;
+		    if (cfg.resize_action == RESIZE_DISABLED)
+			nflg &= ~WS_MAXIMIZEBOX;
+		    else
+			nflg |= WS_MAXIMIZEBOX;
 
+		    if (nflg != flag || nexflag != exflag) {
 			if (nflg != flag)
 			    SetWindowLong(hwnd, GWL_STYLE, nflg);
 			if (nexflag != exflag)
 			    SetWindowLong(hwnd, GWL_EXSTYLE, nexflag);
 
-			SendMessage(hwnd, WM_IGNORE_SIZE, 0, 0);
-
 			SetWindowPos(hwnd, NULL, 0, 0, 0, 0,
 				     SWP_NOACTIVATE | SWP_NOCOPYBITS |
-				     SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER
-				     | SWP_FRAMECHANGED);
-
-			GetWindowRect(hwnd, &wr);
-			GetClientRect(hwnd, &cr);
-			extra_width =
-			    wr.right - wr.left - cr.right + cr.left;
-			extra_height =
-			    wr.bottom - wr.top - cr.bottom + cr.top;
-			need_setwpos = TRUE;
-		    }
-		}
+				     SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
+				     SWP_FRAMECHANGED);
 
-		if (cfg.height != rows ||
-		    cfg.width != cols ||
-		    old_fwidth != font_width ||
-		    old_fheight != font_height ||
-		    cfg.savelines != savelines ||
-		    cfg.sunken_edge != prev_sunken_edge)
-			need_setwpos = TRUE;
-
-		if (IsZoomed(hwnd)) {
-		    int w, h;
-		    RECT cr;
-		    if (need_setwpos)
-			defered_resize = TRUE;
-
-		    GetClientRect(hwnd, &cr);
-		    w = cr.right - cr.left;
-		    h = cr.bottom - cr.top;
-		    w = w / font_width;
-		    if (w < 1)
-			w = 1;
-		    h = h / font_height;
-		    if (h < 1)
-			h = 1;
-
-		    term_size(h, w, cfg.savelines);
-		    InvalidateRect(hwnd, NULL, TRUE);
-		    back->size();
-		} else {
-		    term_size(cfg.height, cfg.width, cfg.savelines);
-		    InvalidateRect(hwnd, NULL, TRUE);
-		    if (need_setwpos) {
-			SetWindowPos(hwnd, NULL, 0, 0,
-				     extra_width + font_width * cfg.width,
-				     extra_height +
-				     font_height * cfg.height,
-				     SWP_NOACTIVATE | SWP_NOCOPYBITS |
-				     SWP_NOMOVE | SWP_NOZORDER);
+			init_lvl = 2;
 		    }
 		}
+
 		/* Oops */
-		if (cfg.locksize && IsZoomed(hwnd))
+		if (cfg.resize_action == RESIZE_DISABLED && IsZoomed(hwnd)) {
 		    force_normal(hwnd);
-		set_title(cfg.wintitle);
+		    init_lvl = 2;
+		}
+
+		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 ||
+		    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.vtmode != prev_cfg.vtmode ||
+		    cfg.bold_colour != prev_cfg.bold_colour ||
+		    cfg.resize_action == RESIZE_DISABLED ||
+		    cfg.resize_action == RESIZE_EITHER ||
+		    (cfg.resize_action != prev_cfg.resize_action))
+		    init_lvl = 2;
+
+		InvalidateRect(hwnd, NULL, TRUE);
+		reset_window(init_lvl);
+		net_pending_errors();
 	    }
 	    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
+	     * 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;
 	  default:
 	    if (wParam >= IDM_SAVED_MIN && wParam <= IDM_SAVED_MAX) {
 		SendMessage(hwnd, WM_SYSCOMMAND, IDM_SAVEDSESS, wParam);
@@ -1485,46 +1982,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 #define X_POS(l) ((int)(short)LOWORD(l))
 #define Y_POS(l) ((int)(short)HIWORD(l))
 
-#define TO_CHR_X(x) (((x)<0 ? (x)-font_width+1 : (x)) / font_width)
-#define TO_CHR_Y(y) (((y)<0 ? (y)-font_height+1: (y)) / 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);
-		    term_mouse(b, MA_RELEASE, TO_CHR_X(X_POS(lParam)),
-			       TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
-			       wParam & MK_CONTROL);
-		} else {
-		    /* trigger a scroll */
-		    term_scroll(0,
-				b == MBT_WHEEL_UP ? -rows / 2 : rows / 2);
-		}
-	    }
-	    return 0;
-	}
+#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)
       case WM_LBUTTONDOWN:
       case WM_MBUTTONDOWN:
       case WM_RBUTTONDOWN:
@@ -1533,6 +1992,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
       case WM_RBUTTONUP:
 	{
 	    int button, press;
+
 	    switch (message) {
 	      case WM_LBUTTONDOWN:
 		button = MBT_LEFT;
@@ -1562,16 +2022,28 @@ 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)),
-		      wParam & MK_SHIFT, wParam & MK_CONTROL);
+		      wParam & MK_SHIFT, wParam & MK_CONTROL,
+		      is_alt_pressed());
 		SetCapture(hwnd);
 	    } else {
-		term_mouse(button, MA_RELEASE,
+		term_mouse(term, button, MA_RELEASE,
 			   TO_CHR_X(X_POS(lParam)),
 			   TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
-			   wParam & MK_CONTROL);
+			   wParam & MK_CONTROL, is_alt_pressed());
 		ReleaseCapture();
 	    }
 	}
@@ -1584,17 +2056,18 @@ 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_SELECT;
+		b = MBT_LEFT;
 	    else if (wParam & MK_MBUTTON)
-		b = cfg.mouse_is_xterm ? MBT_PASTE : MBT_EXTEND;
+		b = MBT_MIDDLE;
 	    else
-		b = cfg.mouse_is_xterm ? MBT_EXTEND : MBT_PASTE;
-	    term_mouse(b, MA_DRAG, TO_CHR_X(X_POS(lParam)),
+		b = MBT_RIGHT;
+	    term_mouse(term, b, MA_DRAG, TO_CHR_X(X_POS(lParam)),
 		       TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
-		       wParam & MK_CONTROL);
+		       wParam & MK_CONTROL, is_alt_pressed());
 	}
 	return 0;
       case WM_NCMOUSEMOVE:
@@ -1606,7 +2079,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:
@@ -1618,8 +2091,54 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		SelectPalette(hdc, pal, TRUE);
 		RealizePalette(hdc);
 	    }
-	    term_paint(hdc, p.rcPaint.left, p.rcPaint.top,
-		       p.rcPaint.right, p.rcPaint.bottom);
+	    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,
+		       is_alt_pressed());
+
+	    if (p.fErase ||
+	        p.rcPaint.left  < offset_width  ||
+		p.rcPaint.top   < offset_height ||
+		p.rcPaint.right >= offset_width + font_width*term->cols ||
+		p.rcPaint.bottom>= offset_height + font_height*term->rows)
+	    {
+		HBRUSH fillcolour, oldbrush;
+		HPEN   edge, oldpen;
+		fillcolour = CreateSolidBrush (
+				    colours[(ATTR_DEFBG>>ATTR_BGSHIFT)*2]);
+		oldbrush = SelectObject(hdc, fillcolour);
+		edge = CreatePen(PS_SOLID, 0, 
+				    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*term->cols,
+			offset_height+font_height*term->rows);
+
+		Rectangle(hdc, p.rcPaint.left, p.rcPaint.top, 
+			  p.rcPaint.right, p.rcPaint.bottom);
+
+		// SelectClipRgn(hdc, NULL);
+
+		SelectObject(hdc, oldbrush);
+		DeleteObject(fillcolour);
+		SelectObject(hdc, oldpen);
+		DeleteObject(edge);
+	    }
 	    SelectObject(hdc, GetStockObject(SYSTEM_FONT));
 	    SelectObject(hdc, GetStockObject(WHITE_PEN));
 	    EndPaint(hwnd, &p);
@@ -1637,27 +2156,32 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	pending_netevent = TRUE;
 	pend_netevent_wParam = wParam;
 	pend_netevent_lParam = lParam;
+	if (WSAGETSELECTEVENT(lParam) != FD_READ)
+	    enact_pending_netevent();
+
 	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();
-	break;
-      case WM_IGNORE_SIZE:
-	ignore_size = TRUE;	       /* don't panic on next WM_SIZE msg */
+	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
+	debug((27, "WM_ENTERSIZEMOVE"));
+#endif
 	EnableSizeTip(1);
 	resizing = TRUE;
 	need_backend_resize = FALSE;
@@ -1665,14 +2189,44 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
       case WM_EXITSIZEMOVE:
 	EnableSizeTip(0);
 	resizing = FALSE;
-	if (need_backend_resize)
-	    back->size();
+#ifdef RDB_DEBUG_PATCH
+	debug((27, "WM_EXITSIZEMOVE"));
+#endif
+	if (need_backend_resize) {
+	    term_size(term, cfg.height, cfg.width, cfg.savelines);
+	    InvalidateRect(hwnd, NULL, TRUE);
+	}
 	break;
       case WM_SIZING:
-	{
+	/*
+	 * This does two jobs:
+	 * 1) Keep the sizetip uptodate
+	 * 2) Make sure the window size is _stepped_ in units of the font size.
+	 */
+	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.resize_action == RESIZE_EITHER &&
+		    (cfg.height != term->rows || cfg.width != term->cols )) {
+		/* 
+		 * 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;
+	    }
+
 	    width = r->right - r->left - extra_width;
 	    height = r->bottom - r->top - extra_height;
 	    w = (width + font_width / 2) / font_width;
@@ -1702,99 +2256,158 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		return 1;
 	    else
 		return 0;
+	} else {
+	    int width, height, w, h, rv = 0;
+	    int ex_width = extra_width + (cfg.window_border - offset_width) * 2;
+	    int ex_height = extra_height + (cfg.window_border - offset_height) * 2;
+	    LPRECT r = (LPRECT) lParam;
+
+	    width = r->right - r->left - ex_width;
+	    height = r->bottom - r->top - ex_height;
+
+	    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*term->cols - ex_width;
+	    else
+		r->right = r->left + w*term->cols + ex_width;
+
+	    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*term->rows - ex_height;
+	    else
+		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:
-	if (wParam == SIZE_MINIMIZED) {
+#ifdef RDB_DEBUG_PATCH
+	debug((27, "WM_SIZE %s (%d,%d)",
+		(wParam == SIZE_MINIMIZED) ? "SIZE_MINIMIZED":
+		(wParam == SIZE_MAXIMIZED) ? "SIZE_MAXIMIZED":
+		(wParam == SIZE_RESTORED && resizing) ? "to":
+		(wParam == SIZE_RESTORED) ? "SIZE_RESTORED":
+		"...",
+	    LOWORD(lParam), HIWORD(lParam)));
+#endif
+	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 (!ignore_size) {
+        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. */
+	    reset_window(-1);
+	} else {
+
 	    int width, height, w, h;
-#if 0				       /* we have fixed this using WM_SIZING now */
-	    int ew, eh;
-#endif
 
 	    width = LOWORD(lParam);
 	    height = HIWORD(lParam);
-	    w = width / font_width;
-	    if (w < 1)
-		w = 1;
-	    h = height / font_height;
-	    if (h < 1)
-		h = 1;
-#if 0				       /* we have fixed this using WM_SIZING now */
-	    ew = width - w * font_width;
-	    eh = height - h * font_height;
-	    if (ew != 0 || eh != 0) {
-		RECT r;
-		GetWindowRect(hwnd, &r);
-		SendMessage(hwnd, WM_IGNORE_SIZE, 0, 0);
-		SetWindowPos(hwnd, NULL, 0, 0,
-			     r.right - r.left - ew, r.bottom - r.top - eh,
-			     SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
-	    }
-#endif
-	    if (w != cols || h != rows || just_reconfigged) {
-		term_invalidate();
-		term_size(h, w, cfg.savelines);
-		/*
-		 * Don't call back->size in mid-resize. (To prevent
-		 * massive numbers of resize events getting sent
-		 * down the connection during an NT opaque drag.)
+
+	    if (!resizing) {
+		if (wParam == SIZE_MAXIMIZED && !was_zoomed) {
+		    was_zoomed = 1;
+		    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(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)
+			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
+		 * selected a huge font or the screen size has changed.
+		 *
+		 * This is also called with minimize.
 		 */
-		if (!resizing)
-		    back->size();
-		else {
+		else reset_window(-1);
+	    }
+
+	    /*
+	     * Don't call back->size in mid-resize. (To prevent
+	     * massive numbers of resize events getting sent
+	     * down the connection during an NT opaque drag.)
+	     */
+	    if (resizing) {
+		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;
+		    h = (height-cfg.window_border*2) / font_height;
+		    if (h < 1) h = 1;
+
 		    cfg.height = h;
 		    cfg.width = w;
-		}
-		just_reconfigged = FALSE;
+	        } else 
+		    reset_window(0);
 	    }
 	}
-	if (wParam == SIZE_RESTORED && defered_resize) {
-	    defered_resize = FALSE;
-	    SetWindowPos(hwnd, NULL, 0, 0,
-			 extra_width + font_width * cfg.width,
-			 extra_height + font_height * cfg.height,
-			 SWP_NOACTIVATE | SWP_NOCOPYBITS |
-			 SWP_NOMOVE | SWP_NOZORDER);
-	}
-	ignore_size = FALSE;
+	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);
@@ -1804,7 +2417,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);
@@ -1845,38 +2458,93 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		len = TranslateKey(message, wParam, lParam, buf);
 		if (len == -1)
 		    return DefWindowProc(hwnd, message, wParam, lParam);
-		ldisc_send(buf, len);
 
-		if (len > 0)
+		if (len != 0) {
+		    /*
+		     * Interrupt an ongoing paste. I'm not sure
+		     * this is sensible, but for the moment it's
+		     * preferable to having to faff about buffering
+		     * things.
+		     */
+		    term_nopaste(term);
+
+		    /*
+		     * We need not bother about stdin backlogs
+		     * here, because in GUI PuTTY we can't do
+		     * anything about it anyway; there's no means
+		     * of asking Windows to hold off on KEYDOWN
+		     * messages. We _have_ to buffer everything
+		     * we're sent.
+		     */
+		    term_seen_key_event(term);
+		    ldisc_send(ldisc, buf, len, 1);
 		    show_mouseptr(0);
+		}
 	    }
 	}
+	net_pending_errors();
 	return 0;
       case WM_INPUTLANGCHANGE:
+	/* 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:
 	{
-	    /* wParam == Font number */
-	    /* lParam == Locale */
-	    char lbuf[20];
-	    HKL NewInputLocale = (HKL) lParam;
+	    HIMC hIMC;
+	    int n;
+	    char *buff;
 
-	    // lParam == GetKeyboardLayout(0);
+	    if(osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS || 
+	        osVersion.dwPlatformId == VER_PLATFORM_WIN32s) break; /* no Unicode */
 
-	    GetLocaleInfo(LOWORD(NewInputLocale),
-			  LOCALE_IDEFAULTANSICODEPAGE, lbuf, sizeof(lbuf));
+	    if ((lParam & GCS_RESULTSTR) == 0) /* Composition unfinished. */
+		break; /* fall back to DefWindowProc */
 
-	    kbd_codepage = atoi(lbuf);
+	    hIMC = ImmGetContext(hwnd);
+	    n = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
+
+	    if (n > 0) {
+		int i;
+		buff = (char*) smalloc(n);
+		ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, buff, n);
+		/*
+		 * 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);
+	    return 1;
 	}
-	break;
+
       case WM_IME_CHAR:
 	if (wParam & 0xFF00) {
 	    unsigned char buf[2];
 
 	    buf[1] = wParam;
 	    buf[0] = wParam >> 8;
-	    lpage_send(kbd_codepage, buf, 2);
+	    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);
+	    term_seen_key_event(term);
+	    lpage_send(ldisc, kbd_codepage, &c, 1, 1);
 	}
 	return (0);
       case WM_CHAR:
@@ -1889,14 +2557,66 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	 */
 	{
 	    char c = (unsigned char)wParam;
-	    lpage_send(CP_ACP, &c, 1);
+	    term_seen_key_event(term);
+	    lpage_send(ldisc, CP_ACP, &c, 1, 1);
 	}
 	return 0;
       case WM_SETCURSOR:
-	if (send_raw_mouse) {
+	if (send_raw_mouse && LOWORD(lParam) == HTCLIENT) {
 	    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,
+			       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, 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);
@@ -1908,10 +2628,52 @@ 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)
 {
-    if (has_focus)
-	SetCaretPos(x * font_width, y * font_height);
+    COMPOSITIONFORM cf;
+    HIMC hIMC;
+
+    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 */
+    
+    if(osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS &&
+	    osVersion.dwMinorVersion == 0) return; /* 95 */
+
+    /* we should have the IMM functions */
+    hIMC = ImmGetContext(hwnd);
+    cf.dwStyle = CFS_POINT;
+    cf.ptCurrentPos.x = caret_x;
+    cf.ptCurrentPos.y = caret_y;
+    ImmSetCompositionWindow(hIMC, &cf);
+
+    ImmReleaseContext(hwnd, hIMC);
 }
 
 /*
@@ -1947,10 +2709,16 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 	    IpDx[i] = char_width;
     }
 
+    /* Only want the left half of double width lines */
+    if (lattr != LATTR_NORM && x*2 >= term->cols)
+	return;
+
     x *= fnt_width;
     y *= font_height;
+    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;
     }
@@ -1970,11 +2738,12 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 	    nfont |= FONT_WIDE + FONT_HIGH;
 	    break;
 	}
+    if (attr & ATTR_NARROW)
+	nfont |= FONT_NARROW;
 
     /* Special hack for the VT100 linedraw glyphs. */
     if ((attr & CSET_MASK) == 0x2300) {
-	if (!dbcs_screenfont &&
-	    text[0] >= (char) 0xBA && text[0] <= (char) 0xBD) {
+	if (text[0] >= (char) 0xBA && text[0] <= (char) 0xBD) {
 	    switch ((unsigned char) (text[0])) {
 	      case 0xBA:
 		text_adjust = -2 * font_height / 5;
@@ -2005,7 +2774,7 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     if (DIRECT_CHAR(attr)) {
 	attr &= ~CSET_MASK;
 	attr |= 0xFF00;
-	memset(text, 0xFF, len);
+	memset(text, 0xFD, len);
     }
 
     /* OEM CP */
@@ -2049,33 +2818,52 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     line_box.right = x + char_width * len;
     line_box.bottom = y + font_height;
 
+    /* Only want the left half of double width lines */
+    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) {
 	/* Ho Hum, dbcs fonts are a PITA! */
 	/* To display on W9x I have to convert to UCS */
 	static wchar_t *uni_buf = 0;
 	static int uni_len = 0;
-	int nlen;
+	int nlen, mptr;
 	if (len > uni_len) {
 	    sfree(uni_buf);
 	    uni_buf = smalloc((uni_len = len) * sizeof(wchar_t));
 	}
-	nlen = MultiByteToWideChar(font_codepage, MB_USEGLYPHCHARS,
-				   text, len, uni_buf, uni_len);
 
+	for(nlen = mptr = 0; mptr<len; mptr++) {
+	    uni_buf[nlen] = 0xFFFD;
+	    if (IsDBCSLeadByteEx(font_codepage, (BYTE) text[mptr])) {
+		IpDx[nlen] += char_width;
+	        MultiByteToWideChar(font_codepage, MB_USEGLYPHCHARS,
+				   text+mptr, 2, uni_buf+nlen, 1);
+		mptr++;
+	    }
+	    else
+	    {
+	        MultiByteToWideChar(font_codepage, MB_USEGLYPHCHARS,
+				   text+mptr, 1, uni_buf+nlen, 1);
+	    }
+	    nlen++;
+	}
 	if (nlen <= 0)
 	    return;		       /* Eeek! */
 
 	ExtTextOutW(hdc, x,
 		    y - font_height * (lattr == LATTR_BOT) + text_adjust,
-		    ETO_CLIPPED | ETO_OPAQUE, &line_box, uni_buf, nlen, 0);
+		    ETO_CLIPPED | ETO_OPAQUE, &line_box, uni_buf, nlen, IpDx);
 	if (bold_mode == BOLD_SHADOW && (attr & ATTR_BOLD)) {
 	    SetBkMode(hdc, TRANSPARENT);
 	    ExtTextOutW(hdc, x - 1,
 			y - font_height * (lattr ==
 					   LATTR_BOT) + text_adjust,
-			ETO_CLIPPED, &line_box, uni_buf, nlen, 0);
+			ETO_CLIPPED, &line_box, uni_buf, nlen, IpDx);
 	}
+
+	IpDx[0] = -1;
     } else if (DIRECT_FONT(attr)) {
 	ExtTextOut(hdc, x,
 		   y - font_height * (lattr == LATTR_BOT) + text_adjust,
@@ -2113,7 +2901,7 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 		    ETO_CLIPPED | ETO_OPAQUE, &line_box, wbuf, len, IpDx);
 
 	/* And the shadow bold hack. */
-	if (bold_mode == BOLD_SHADOW) {
+	if (bold_mode == BOLD_SHADOW && (attr & ATTR_BOLD)) {
 	    SetBkMode(hdc, TRANSPARENT);
 	    ExtTextOutW(hdc, x - 1,
 			y - font_height * (lattr ==
@@ -2146,7 +2934,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;
@@ -2160,8 +2948,10 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
 	char_width *= 2;
     x *= fnt_width;
     y *= font_height;
+    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;
@@ -2210,6 +3000,67 @@ 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 char_width(Context ctx, int uc) {
+    HDC hdc = ctx;
+    int ibuf = 0;
+
+    /* If the font max is the same as the font ave width then this
+     * function is a no-op.
+     */
+    if (!font_dualwidth) return 1;
+
+    switch (uc & CSET_MASK) {
+      case ATTR_ASCII:
+	uc = unitab_line[uc & 0xFF];
+	break;
+      case ATTR_LINEDRW:
+	uc = unitab_xterm[uc & 0xFF];
+	break;
+      case ATTR_SCOACS:
+	uc = unitab_scoacs[uc & 0xFF];
+	break;
+    }
+    if (DIRECT_FONT(uc)) {
+	if (dbcs_screenfont) return 1;
+
+	/* Speedup, I know of no font where ascii is the wrong width */
+	if ((uc&CHAR_MASK) >= ' ' && (uc&CHAR_MASK)<= '~') 
+	    return 1;
+
+	if ( (uc & CSET_MASK) == ATTR_ACP ) {
+	    SelectObject(hdc, fonts[FONT_NORMAL]);
+	} else if ( (uc & CSET_MASK) == ATTR_OEMCP ) {
+	    another_font(FONT_OEM);
+	    if (!fonts[FONT_OEM]) return 0;
+
+	    SelectObject(hdc, fonts[FONT_OEM]);
+	} else
+	    return 0;
+
+	if ( GetCharWidth32(hdc, uc&CHAR_MASK, uc&CHAR_MASK, &ibuf) != 1 && 
+	     GetCharWidth(hdc, uc&CHAR_MASK, uc&CHAR_MASK, &ibuf) != 1)
+	    return 0;
+    } else {
+	/* Speedup, I know of no font where ascii is the wrong width */
+	if (uc >= ' ' && uc <= '~') return 1;
+
+	SelectObject(hdc, fonts[FONT_NORMAL]);
+	if ( GetCharWidth32W(hdc, uc, uc, &ibuf) == 1 )
+	    /* Okay that one worked */ ;
+	else if ( GetCharWidthW(hdc, uc, uc, &ibuf) == 1 )
+	    /* This should work on 9x too, but it's "less accurate" */ ;
+	else
+	    return 0;
+    }
+
+    ibuf += font_width / 2 -1;
+    ibuf /= font_width;
+
+    return ibuf;
+}
+
 /*
  * Translate a WM_(SYS)?KEY(UP|DOWN) message into a string of ASCII
  * codes. Returns number of bytes used or zero to drop the message
@@ -2222,7 +3073,6 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
     int scan, left_alt = 0, key_down, shift_state;
     int r, i, code;
     unsigned char *p = output;
-    static int alt_state = 0;
     static int alt_sum = 0;
 
     HKL kbd_layout = GetKeyboardLayout(0);
@@ -2317,7 +3167,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;
@@ -2332,7 +3183,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)
@@ -2376,23 +3228,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;
-    }
-
-    /* Make sure we're not pasting */
-    if (key_down)
-	term_nopaste();
-
     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) {
@@ -2456,22 +3296,25 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    return 0;
 	}
 	if (wParam == VK_INSERT && shift_state == 1) {
-	    term_mouse(MBT_PASTE, MA_CLICK, 0, 0, 0, 0);
-	    term_mouse(MBT_PASTE, MA_RELEASE, 0, 0, 0, 0);
+	    term_do_paste(term);
 	    return 0;
 	}
 	if (left_alt && wParam == VK_F4 && cfg.alt_f4) {
 	    return -1;
 	}
 	if (left_alt && wParam == VK_SPACE && cfg.alt_space) {
-	    alt_state = 0;
-	    PostMessage(hwnd, WM_CHAR, ' ', 0);
 	    SendMessage(hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0);
 	    return -1;
 	}
+	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;
 	}
 
@@ -2514,7 +3357,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;
@@ -2528,7 +3371,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';
@@ -2595,7 +3438,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
@@ -2611,6 +3454,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++ = '[';
@@ -2648,7 +3497,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;
@@ -2725,6 +3574,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	  case VK_F20:
 	    code = 34;
 	    break;
+	}
+	if ((shift_state&2) == 0) switch (wParam) {
 	  case VK_HOME:
 	    code = 1;
 	    break;
@@ -2748,12 +3599,13 @@ 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;
 	}
 
-	if (cfg.funky_type == 5 && code >= 11 && code <= 34) {
+	if (cfg.funky_type == 5 &&     /* SCO function keys */
+	    code >= 11 && code <= 34) {
 	    char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{";
 	    int index = 0;
 	    switch (wParam) {
@@ -2775,13 +3627,23 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    p += sprintf((char *) p, "\x1B[%c", codes[index]);
 	    return p - output;
 	}
-	if ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) {
+	if (cfg.funky_type == 5 &&     /* SCO small keypad */
+	    code >= 1 && code <= 6) {
+	    char codes[] = "HL.FIG";
+	    if (code == 3) {
+		*p++ = '\x7F';
+	    } else {
+		p += sprintf((char *) p, "\x1B[%c", codes[code-1]);
+	    }
+	    return p - output;
+	}
+	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 +=
@@ -2793,7 +3655,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);
@@ -2832,15 +3694,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;
@@ -2873,11 +3748,19 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
     /* Okay we've done everything interesting; let windows deal with 
      * the boring stuff */
     {
+	BOOL capsOn=0;
+
+	/* helg: clear CAPS LOCK state if caps lock switches to cyrillic */
+	if(cfg.xlat_capslockcyr && keystate[VK_CAPITAL] != 0) {
+	    capsOn= !left_alt;
+	    keystate[VK_CAPITAL] = 0;
+	}
+
 	r = ToAsciiEx(wParam, scan, keystate, keys, 0, kbd_layout);
 #ifdef SHOW_TOASCII_RESULT
 	if (r == 1 && !key_down) {
 	    if (alt_sum) {
-		if (utf || dbcs_screenfont)
+		if (in_utf(term) || dbcs_screenfont)
 		    debug((", (U+%04x)", alt_sum));
 		else
 		    debug((", LCH(%d)", alt_sum));
@@ -2895,6 +3778,14 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 #endif
 	if (r > 0) {
 	    WCHAR keybuf;
+
+	    /*
+	     * Interrupt an ongoing paste. I'm not sure this is
+	     * sensible, but for the moment it's preferable to
+	     * having to faff about buffering things.
+	     */
+	    term_nopaste(term);
+
 	    p = output;
 	    for (i = 0; i < r; i++) {
 		unsigned char ch = (unsigned char) keys[i];
@@ -2913,7 +3804,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 			return 0;
 		    }
 		    keybuf = nc;
-		    luni_send(&keybuf, 1);
+		    term_seen_key_event(term);
+		    luni_send(ldisc, &keybuf, 1, 1);
 		    continue;
 		}
 
@@ -2921,22 +3813,45 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 
 		if (!key_down) {
 		    if (alt_sum) {
-			if (utf || dbcs_screenfont) {
+			if (in_utf(term) || dbcs_screenfont) {
 			    keybuf = alt_sum;
-			    luni_send(&keybuf, 1);
+			    term_seen_key_event(term);
+			    luni_send(ldisc, &keybuf, 1, 1);
 			} else {
 			    ch = (char) alt_sum;
-			    ldisc_send(&ch, 1);
+			    /*
+			     * We need not bother about stdin
+			     * backlogs here, because in GUI PuTTY
+			     * we can't do anything about it
+			     * anyway; there's no means of asking
+			     * Windows to hold off on KEYDOWN
+			     * messages. We _have_ to buffer
+			     * everything we're sent.
+			     */
+			    term_seen_key_event(term);
+			    ldisc_send(ldisc, &ch, 1, 1);
 			}
 			alt_sum = 0;
 		    } else
-			lpage_send(kbd_codepage, &ch, 1);
+			term_seen_key_event(term);
+			lpage_send(ldisc, kbd_codepage, &ch, 1, 1);
 		} else {
-		    static char cbuf[] = "\033 ";
-		    cbuf[1] = ch;
-		    lpage_send(kbd_codepage, cbuf + !left_alt,
-			       1 + !!left_alt);
+		    if(capsOn && ch < 0x80) {
+			WCHAR cbuf[2];
+			cbuf[0] = 27;
+			cbuf[1] = xlat_uskbd2cyrllic(ch);
+			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;
+			term_seen_key_event(term);
+			lpage_send(ldisc, kbd_codepage,
+				   cbuf+!left_alt, 1+!!left_alt, 1);
+		    }
 		}
+		show_mouseptr(0);
 	    }
 
 	    /* This is so the ALT-Numpad and dead keys work correctly. */
@@ -2948,28 +3863,34 @@ 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] && (utf || dbcs_screenfont))
+	else if (keys[0] && (in_utf(term) || dbcs_screenfont))
 	    keys[0] = 10;
     }
 
-    /* ALT alone may or may not want to bring up the System menu */
-    if (wParam == VK_MENU) {
-	if (cfg.alt_only) {
-	    if (message == WM_SYSKEYDOWN)
-		alt_state = 1;
-	    else if (message == WM_SYSKEYUP && alt_state)
-		PostMessage(hwnd, WM_CHAR, ' ', 0);
-	    if (message == WM_SYSKEYUP)
-		alt_state = 0;
-	} else
-	    return 0;
-    } else
-	alt_state = 0;
+    /*
+     * ALT alone may or may not want to bring up the System menu.
+     * If it's not meant to, we return 0 on presses or releases of
+     * ALT, to show that we've swallowed the keystroke. Otherwise
+     * we return -1, which means Windows will give the keystroke
+     * its default handling (i.e. bring up the System menu).
+     */
+    if (wParam == VK_MENU && !cfg.alt_only)
+	return 0;
 
     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));
@@ -2978,7 +3899,7 @@ void set_title(char *title)
 	SetWindowText(hwnd, title);
 }
 
-void set_icon(char *title)
+void set_icon(void *frontend, char *title)
 {
     sfree(icon_name);
     icon_name = smalloc(1 + strlen(title));
@@ -2987,11 +3908,11 @@ void set_icon(char *title)
 	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);
@@ -3004,7 +3925,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) {
@@ -3035,7 +3956,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,
@@ -3046,14 +3967,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;
 
@@ -3074,13 +3995,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;
@@ -3112,12 +4033,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);
 
@@ -3140,6 +4060,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);
+	rtf = smalloc(rtfsize);
+	sprintf(rtf, "{\\rtf1\\ansi%d{\\fonttbl\\f0\\fmodern %s;}\\f0",
+		GetACP(), cfg.font);
+	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 = srealloc(rtf, rtfsize);
+	    }
+
+	    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);
 
@@ -3150,6 +4184,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);
@@ -3160,7 +4196,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;
@@ -3207,7 +4243,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;
@@ -3215,10 +4251,10 @@ void optimised_move(int to, int from, int lines)
     min = (to < from ? to : from);
     max = to + from - min;
 
-    r.left = 0;
-    r.right = cols * font_width;
-    r.top = min * font_height;
-    r.bottom = (max + lines) * font_height;
+    r.left = offset_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);
 }
 #endif
@@ -3235,13 +4271,65 @@ 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);
+}
+
+/*
+ * Manage window caption / taskbar flashing, if enabled.
+ * 0 = stop, 1 = maintain, 2 = start
+ */
+static void flash_window(int mode)
+{
+    static long last_flash = 0;
+    static int flashing = 0;
+    if ((mode == 0) || (cfg.beep_ind == B_IND_DISABLED)) {
+	/* stop */
+	if (flashing) {
+	    FlashWindow(hwnd, FALSE);
+	    flashing = 0;
+	}
+
+    } else if (mode == 2) {
+	/* start */
+	if (!flashing) {
+	    last_flash = GetTickCount();
+	    flashing = 1;
+	    FlashWindow(hwnd, TRUE);
+	}
+
+    } else if ((mode == 1) && (cfg.beep_ind == B_IND_FLASH)) {
+	/* maintain */
+	if (flashing) {
+	    long now = GetTickCount();
+	    long fdiff = now - last_flash;
+	    if (fdiff < 0 || fdiff > 450) {
+		last_flash = now;
+		FlashWindow(hwnd, TRUE);	/* toggle */
+	    }
+	}
+    }
 }
 
 /*
  * Beep.
  */
-void beep(int mode)
+void beep(void *frontend, int mode)
 {
     if (mode == BELL_DEFAULT) {
 	/*
@@ -3272,4 +4360,238 @@ void beep(int mode)
 	    cfg.beep = BELL_DEFAULT;
 	}
     }
+    /* Otherwise, either visual bell or disabled; do nothing here */
+    if (!term->has_focus) {
+	flash_window(2);	       /* start */
+    }
+}
+
+/*
+ * Minimise or restore the window in response to a server-side
+ * request.
+ */
+void set_iconic(void *frontend, int iconic)
+{
+    if (IsIconic(hwnd)) {
+	if (!iconic)
+	    ShowWindow(hwnd, SW_RESTORE);
+    } else {
+	if (iconic)
+	    ShowWindow(hwnd, SW_MINIMIZE);
+    }
+}
+
+/*
+ * 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;
+
+    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
+}
+
+
+/*
+ * 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;
+    SetWindowLong(hwnd, GWL_STYLE, style);
+
+    /* 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_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
+		     SWP_FRAMECHANGED);
+    }
+
+    /* Untick the menu item in the System menu. */
+    CheckMenuItem(GetSystemMenu(hwnd, FALSE), IDM_FULLSCREEN,
+		  MF_UNCHECKED);
+}
+
+/*
+ * 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);
+    }
+}
+
+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;
 }