Configurable TCP_NODELAY option on network connections
[u/mdw/putty] / window.c
index ea349bd..8b404ab 100644 (file)
--- a/window.c
+++ b/window.c
@@ -1,6 +1,7 @@
 #include <windows.h>
 #include <imm.h>
 #include <commctrl.h>
+#include <richedit.h>
 #include <mmsystem.h>
 #ifndef AUTO_WINSOCK
 #ifdef WINSOCK_TWO
 #include <winsock.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"
@@ -42,6 +45,7 @@
 #define IDM_ABOUT     0x0140
 #define IDM_SAVEDSESS 0x0150
 #define IDM_COPYALL   0x0160
+#define IDM_FULLSCREEN 0x0170
 
 #define IDM_SESSLGP   0x0250          /* log type printable */
 #define IDM_SESSLGA   0x0260          /* log type all chars */
@@ -49,7 +53,6 @@
 #define IDM_SAVED_MIN 0x1000
 #define IDM_SAVED_MAX 0x2000
 
-#define WM_IGNORE_SIZE (WM_XUSER + 1)
 #define WM_IGNORE_CLIP (WM_XUSER + 2)
 
 /* Needed for Chinese support and apparently not always defined. */
@@ -67,16 +70,26 @@ 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);
 
+/* Window layout information */
+static void reset_window(int);
+static int full_screen = 0;
 static int extra_width, extra_height;
-
+static int font_width, font_height, font_dualwidth;
+static int offset_width, offset_height;
+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 flip_full_screen(void);
 
 static time_t last_movement = 0;
 
@@ -87,16 +100,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,6 +140,8 @@ static char *window_name, *icon_name;
 
 static int compose_state = 0;
 
+static OSVERSIONINFO osVersion;
+
 /* Dummy routine, only required in plink. */
 void ldisc_update(int echo, int edit)
 {
@@ -165,6 +180,16 @@ 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;
+        }
+    }
+
     /*
      * Process the command line.
      */
@@ -365,7 +390,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;
 
@@ -408,7 +433,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 +449,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,8 +458,9 @@ 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;
     }
 
     /*
@@ -445,7 +469,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      */
     guess_width = extra_width + font_width * cols;
     guess_height = extra_height + font_height * rows;
-    SendMessage(hwnd, WM_IGNORE_SIZE, 0, 0);
     SetWindowPos(hwnd, NULL, 0, 0, guess_width, guess_height,
                 SWP_NOMOVE | SWP_NOREDRAW | SWP_NOZORDER);
 
@@ -485,7 +508,7 @@ 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(cfg.host, cfg.port, &realhost, cfg.tcp_nodelay);
        if (error) {
            sprintf(msg, "Unable to open connection to\n"
                    "%.800s\n" "%s", cfg.host, error);
@@ -507,12 +530,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     session_closed = FALSE;
 
     /*
-     * Set up the input and output buffers.
-     */
-    inbuf_head = 0;
-    outbuf_reap = outbuf_head = 0;
-
-    /*
      * Prepare the mouse handler.
      */
     lastact = MA_NOTHING;
@@ -566,13 +583,22 @@ 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);
        AppendMenu(m, MF_ENABLED, IDM_ABOUT, "&About PuTTY");
     }
 
     /*
+     * Set up the initial input locale.
+     */
+    set_input_locale(GetKeyboardLayout(0));
+
+    /*
      * Finally show the window!
      */
     ShowWindow(hwnd, show);
+    SetForegroundWindow(hwnd);
 
     /*
      * Open the initial log file if there is one.
@@ -640,15 +666,20 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
                timer_id = 0;
            }
            HideCaret(hwnd);
-           if (inbuf_head)
-               term_out();
+           term_out();
            term_update();
            ShowCaret(hwnd);
+
+           flash_window(1);           /* maintain */
+
+           /* The messages seem unreliable; especially if we're being tricky */
+           has_focus = (GetForegroundWindow() == hwnd);
+
            if (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);
+               timer_id = SetTimer(hwnd, 1, 500, NULL);
            else
                timer_id = SetTimer(hwnd, 1, 100, NULL);
            long_timer = 1;
@@ -689,7 +720,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;
     }
@@ -845,7 +877,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 +889,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 +902,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 +921,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;
@@ -1025,7 +1088,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,25 +1116,21 @@ static void deinit_fonts(void)
     }
 }
 
-void request_resize(int w, int h, int refont)
+void request_resize(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 == rows && w == cols) return;
+
+    /* Sanity checks ... */
+    {
        static int first_time = 1;
        static RECT ss;
 
@@ -1086,34 +1145,251 @@ 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;
        }
     }
 
-    width = extra_width + font_width * w;
-    height = extra_height + font_height * h;
+    term_size(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);
 
-    SetWindowPos(hwnd, NULL, 0, 0, width, height,
-                SWP_NOACTIVATE | SWP_NOCOPYBITS |
-                SWP_NOMOVE | SWP_NOZORDER);
+    InvalidateRect(hwnd, NULL, TRUE);
 }
 
-static void click(Mouse_Button b, int x, int y, int shift, int ctrl)
+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*cols)/2 ||
+            offset_height != (win_height-font_height*rows)/2) ){
+       offset_width = (win_width-font_width*cols)/2;
+       offset_height = (win_height-font_height*rows)/2;
+       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/cols || 
+                 font_height != win_height/rows) {
+               deinit_fonts();
+               init_fonts(win_width/cols, win_height/rows);
+               offset_width = (win_width-font_width*cols)/2;
+               offset_height = (win_height-font_height*rows)/2;
+               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/cols || 
+                 font_height != win_height/rows) {
+               /* Our only choice at this point is to change the 
+                * size of the terminal; Oh well.
+                */
+               term_size( win_height/font_height, win_width/font_width,
+                          cfg.savelines);
+               offset_width = (win_width-font_width*cols)/2;
+               offset_height = (win_height-font_height*rows)/2;
+               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*cols + offset_width*2 ||
+           win_height != font_height*rows + offset_height*2) {
+
+           /* If this is too large windows will resize it to the maximum
+            * allowed window size, we will then be back in here and resize
+            * the font or terminal to fit.
+            */
+           SetWindowPos(hwnd, NULL, 0, 0, 
+                        font_width*cols + extra_width, 
+                        font_height*rows + extra_height,
+                        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*cols + offset_width*2 ||
+           win_height != font_height*rows + offset_height*2) {
+
+           static RECT ss;
+           int width, height;
+
+           GetClientRect(GetDesktopWindow(), &ss);
+           width = (ss.right - ss.left - extra_width) / font_width;
+           height = (ss.bottom - ss.top - extra_height) / font_height;
+
+           /* Grrr too big */
+           if ( rows > height || cols > width ) {
+               if (cfg.resize_action == RESIZE_EITHER) {
+                   /* Make the font the biggest we can */
+                   if (cols > width)
+                       font_width = (ss.right - ss.left - extra_width)/cols;
+                   if (rows > height)
+                       font_height = (ss.bottom - ss.top - extra_height)/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 > rows ) height = rows;
+                   if ( width > cols )  width = cols;
+                   term_size(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*cols + extra_width, 
+                        font_height*rows + extra_height,
+                        SWP_NOMOVE | SWP_NOZORDER);
+
+           InvalidateRect(hwnd, NULL, TRUE);
+#ifdef RDB_DEBUG_PATCH
+           debug((27, "reset_window() -> window resize to (%d,%d)",
+                       font_width*cols + extra_width,
+                       font_height*rows + extra_height));
+#endif
+       }
+       return;
+    }
+
+    /* We're allowed to or must change the font but do we want to ?  */
+
+    if (font_width != (win_width-cfg.window_border*2)/cols || 
+       font_height != (win_height-cfg.window_border*2)/rows) {
+
+       deinit_fonts();
+       init_fonts((win_width-cfg.window_border*2)/cols, 
+                  (win_height-cfg.window_border*2)/rows);
+       offset_width = (win_width-font_width*cols)/2;
+       offset_height = (win_height-font_height*rows)/2;
+
+       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, 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(b, MA_CLICK, x, y, shift, ctrl, alt);
        return;
     }
 
@@ -1126,7 +1402,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(b, lastact, x, y, shift, ctrl, alt);
     lasttime = thistime;
 }
 
@@ -1157,23 +1433,33 @@ 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 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;
 
     switch (message) {
       case WM_TIMER:
        if (pending_netevent)
            enact_pending_netevent();
-       if (inbuf_head)
-           term_out();
+       term_out();
        noise_regular();
        HideCaret(hwnd);
        term_update();
@@ -1186,6 +1472,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                last_movement = now;
            }
        }
+       net_pending_errors();
        return 0;
       case WM_CREATE:
        break;
@@ -1276,39 +1563,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) {
+               {
+                   /* 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 (full_screen &&
+                       (cfg.resize_action == RESIZE_DISABLED)) {
+                       flip_full_screen();
+                   }
+               }
+
+               if (strcmp(prev_cfg.logfilename, cfg.logfilename) ||
+                   prev_cfg.logtype != cfg.logtype) {
                    logfclose();       /* reset logging */
                    logfopen();
                }
 
-               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(NULL, 0, 0);
                if (pal)
                    DeleteObject(pal);
                logpal = NULL;
@@ -1316,6 +1604,14 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                cfgtopalette();
                init_palette();
 
+               /* 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_DISABLED)
+                   term_size(cfg.height, cfg.width, cfg.savelines);
+
                /* Enable or disable the scroll bar, etc */
                {
                    LONG nflg, flag = GetWindowLong(hwnd, GWL_STYLE);
@@ -1323,7 +1619,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,88 +1636,59 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                        nexflag &= ~(WS_EX_CLIENTEDGE);
 
                    nflg = flag;
-                   if (cfg.scrollbar)
+                   if (full_screen ?
+                       cfg.scrollbar_in_fullscreen : cfg.scrollbar)
                        nflg |= WS_VSCROLL;
                    else
                        nflg &= ~WS_VSCROLL;
-                   if (cfg.locksize)
+                   if (cfg.resize_action == RESIZE_DISABLED)
                        nflg &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX);
                    else
                        nflg |= (WS_THICKFRAME | WS_MAXIMIZEBOX);
 
                    if (nflg != flag || nexflag != exflag) {
-                       RECT cr, wr;
-
                        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);
+                   init_lvl = 2;
+               }
+
                set_title(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:
@@ -1435,46 +1702,82 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            break;
          case IDM_TEL_AYT:
            back->special(TS_AYT);
+           net_pending_errors();
            break;
          case IDM_TEL_BRK:
            back->special(TS_BRK);
+           net_pending_errors();
            break;
          case IDM_TEL_SYNCH:
            back->special(TS_SYNCH);
+           net_pending_errors();
            break;
          case IDM_TEL_EC:
            back->special(TS_EC);
+           net_pending_errors();
            break;
          case IDM_TEL_EL:
            back->special(TS_EL);
+           net_pending_errors();
            break;
          case IDM_TEL_GA:
            back->special(TS_GA);
+           net_pending_errors();
            break;
          case IDM_TEL_NOP:
            back->special(TS_NOP);
+           net_pending_errors();
            break;
          case IDM_TEL_ABORT:
            back->special(TS_ABORT);
+           net_pending_errors();
            break;
          case IDM_TEL_AO:
            back->special(TS_AO);
+           net_pending_errors();
            break;
          case IDM_TEL_IP:
            back->special(TS_IP);
+           net_pending_errors();
            break;
          case IDM_TEL_SUSP:
            back->special(TS_SUSP);
+           net_pending_errors();
            break;
          case IDM_TEL_EOR:
            back->special(TS_EOR);
+           net_pending_errors();
            break;
          case IDM_TEL_EOF:
            back->special(TS_EOF);
+           net_pending_errors();
            break;
          case IDM_ABOUT:
            showabout(hwnd);
            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,8 +1788,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 TO_CHR_X(x) ((((x)<0 ? (x)-font_width+1 : (x))-offset_width) / font_width)
+#define TO_CHR_Y(y) ((((y)<0 ? (y)-font_height+1: (y))-offset_height) / font_height)
 #define WHEEL_DELTA 120
       case WM_MOUSEWHEEL:
        {
@@ -1509,14 +1812,15 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 
                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);
+                              wParam & MK_CONTROL, is_alt_pressed());
                    term_mouse(b, MA_RELEASE, TO_CHR_X(X_POS(lParam)),
                               TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
-                              wParam & MK_CONTROL);
+                              wParam & MK_CONTROL, is_alt_pressed());
                } else {
                    /* trigger a scroll */
                    term_scroll(0,
@@ -1533,6 +1837,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 +1867,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 (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,
                           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();
            }
        }
@@ -1587,14 +1904,14 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
        if (wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) {
            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;
+               b = MBT_RIGHT;
            term_mouse(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:
@@ -1618,8 +1935,42 @@ 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(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);
+
+           if (p.fErase ||
+               p.rcPaint.left  < offset_width  ||
+               p.rcPaint.top   < offset_height ||
+               p.rcPaint.right >= offset_width + font_width*cols ||
+               p.rcPaint.bottom>= offset_height + font_height*rows)
+           {
+               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);
+
+               ExcludeClipRect(hdc, 
+                       offset_width, offset_height,
+                       offset_width+font_width*cols,
+                       offset_height+font_height*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 +1988,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;
        CreateCaret(hwnd, caretbm, font_width, font_height);
        ShowCaret(hwnd);
+       flash_window(0);               /* stop */
        compose_state = 0;
        term_out();
        term_update();
        break;
       case WM_KILLFOCUS:
+       if (full_screen) flip_full_screen();
        show_mouseptr(1);
        has_focus = FALSE;
        DestroyCaret();
        term_out();
        term_update();
        break;
-      case WM_IGNORE_SIZE:
-       ignore_size = TRUE;            /* don't panic on next WM_SIZE msg */
-       break;
       case WM_ENTERSIZEMOVE:
+#ifdef RDB_DEBUG_PATCH
+       debug((27, "WM_ENTERSIZEMOVE"));
+#endif
        EnableSizeTip(1);
        resizing = TRUE;
        need_backend_resize = FALSE;
@@ -1665,14 +2021,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(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 && !alt_pressed) {
            int width, height, w, h, ew, eh;
            LPRECT r = (LPRECT) lParam;
 
+           if ( !need_backend_resize && cfg.resize_action == RESIZE_EITHER &&
+                   (cfg.height != rows || cfg.width != 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(cfg.height, cfg.width, cfg.savelines);
+               reset_window(2);
+                */
+               cfg.height=rows; cfg.width=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,69 +2088,115 @@ 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 + cols/2)/cols;
+           h = (height + rows/2)/rows;
+           if ( r->right != r->left + w*cols + ex_width) 
+               rv = 1;
+
+           if (wParam == WMSZ_LEFT ||
+               wParam == WMSZ_BOTTOMLEFT || wParam == WMSZ_TOPLEFT)
+               r->left = r->right - w*cols - ex_width;
+           else
+               r->right = r->left + w*cols + ex_width;
+
+           if (r->bottom != r->top + h*rows + ex_height)
+               rv = 1;
+
+           if (wParam == WMSZ_TOP ||
+               wParam == WMSZ_TOPRIGHT || wParam == WMSZ_TOPLEFT)
+               r->top = r->bottom - h*rows - ex_height;
+           else
+               r->bottom = r->top + h*rows + ex_height;
+
+           return rv;
        }
        /* break;  (never reached) */
       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 (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 = rows;
+                   prev_cols = cols;
+                   if (cfg.resize_action == RESIZE_TERM) {
+                       w = width / font_width;
+                       if (w < 1) w = 1;
+                       h = height / font_height;
+                       if (h < 1) h = 1;
+
+                       term_size(h, w, cfg.savelines);
+                   }
+                   reset_window(0);
+               } else if (wParam == SIZE_RESTORED && was_zoomed) {
+                   was_zoomed = 0;
+                   if (cfg.resize_action == RESIZE_TERM)
+                       term_size(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 && !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;
        return 0;
       case WM_VSCROLL:
        switch (LOWORD(wParam)) {
@@ -1845,38 +2277,79 @@ 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();
+
+                   /*
+                    * 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.
+                    */
+                   ldisc_send(buf, len, 1);
                    show_mouseptr(0);
+               }
            }
        }
+       net_pending_errors();
        return 0;
       case WM_INPUTLANGCHANGE:
-       {
-           /* wParam == Font number */
-           /* lParam == Locale */
-           char lbuf[20];
-           HKL NewInputLocale = (HKL) lParam;
-
-           // lParam == GetKeyboardLayout(0);
-
-           GetLocaleInfo(LOWORD(NewInputLocale),
-                         LOCALE_IDEFAULTANSICODEPAGE, lbuf, sizeof(lbuf));
-
-           kbd_codepage = atoi(lbuf);
+       /* wParam == Font number */
+       /* lParam == Locale */
+       set_input_locale((HKL)lParam);
+       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:
+       {
+           HIMC hIMC;
+           int n;
+           char *buff;
+   
+           if(osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS || 
+               osVersion.dwPlatformId == VER_PLATFORM_WIN32s) break; /* no Unicode */
+
+           if ((lParam & GCS_RESULTSTR) == 0) /* Composition unfinished. */
+               break; /* fall back to DefWindowProc */
+
+           hIMC = ImmGetContext(hwnd);
+           n = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
+
+           if (n > 0) {
+               buff = (char*) smalloc(n);
+               ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, buff, n);
+               luni_send((unsigned short *)buff, n / 2, 1);
+               free(buff);
+           }
+           ImmReleaseContext(hwnd, hIMC);
+           return 1;
+       }
+
       case WM_IME_CHAR:
        if (wParam & 0xFF00) {
            unsigned char buf[2];
 
            buf[1] = wParam;
            buf[0] = wParam >> 8;
-           lpage_send(kbd_codepage, buf, 2);
+           lpage_send(kbd_codepage, buf, 2, 1);
        } else {
            char c = (unsigned char) wParam;
-           lpage_send(kbd_codepage, &c, 1);
+           lpage_send(kbd_codepage, &c, 1, 1);
        }
        return (0);
       case WM_CHAR:
@@ -1889,11 +2362,11 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
         */
        {
            char c = (unsigned char)wParam;
-           lpage_send(CP_ACP, &c, 1);
+           lpage_send(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;
        }
@@ -1910,8 +2383,28 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
  */
 void sys_cursor(int x, int y)
 {
-    if (has_focus)
-       SetCaretPos(x * font_width, y * font_height);
+    COMPOSITIONFORM cf;
+    HIMC hIMC;
+
+    if (!has_focus) return;
+    
+    SetCaretPos(x * font_width + offset_width,
+               y * font_height + offset_height);
+
+    /* 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 = x * font_width + offset_width;
+    cf.ptCurrentPos.y = y * font_height + offset_height;
+    ImmSetCompositionWindow(hIMC, &cf);
+
+    ImmReleaseContext(hwnd, hIMC);
 }
 
 /*
@@ -1947,8 +2440,14 @@ 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 >= cols)
+       return;
+
     x *= fnt_width;
     y *= font_height;
+    x += offset_width;
+    y += offset_height;
 
     if ((attr & TATTR_ACTCURS) && (cfg.cursor_type == 0 || big_cursor)) {
        attr &= ATTR_CUR_AND | (bold_mode != BOLD_COLOURS ? ATTR_BOLD : 0);
@@ -1970,11 +2469,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 +2505,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 +2549,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*cols+offset_width)
+       line_box.right = font_width*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 +2632,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 ==
@@ -2160,6 +2679,8 @@ 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)) {
        POINT pts[5];
@@ -2210,6 +2731,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 CharWidth(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 +2804,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);
@@ -2350,6 +2931,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
        }
     }
 
+    alt_pressed = (left_alt && key_down);
+
     scan = (HIWORD(lParam) & (KF_UP | KF_EXTENDED | 0xFF));
     shift_state = ((keystate[VK_SHIFT] & 0x80) != 0)
        + ((keystate[VK_CONTROL] & 0x80) != 0) * 2;
@@ -2380,14 +2963,11 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
      * 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) {
+    if (wParam != VK_SHIFT && wParam != VK_PRIOR && wParam != VK_NEXT &&
+       wParam != VK_MENU && wParam != VK_CONTROL) {
        seen_key_event = 1;
     }
 
-    /* Make sure we're not pasting */
-    if (key_down)
-       term_nopaste();
-
     if (compose_state > 1 && left_alt)
        compose_state = 0;
 
@@ -2456,19 +3036,22 @@ 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();
            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;
@@ -2725,6 +3308,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;
@@ -2753,7 +3338,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
            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,6 +3361,16 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
            p += sprintf((char *) p, "\x1B[%c", codes[index]);
            return p - output;
        }
+       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 ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) {
            int offt = 0;
            if (code > 15)
@@ -2873,11 +3469,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 || dbcs_screenfont)
                    debug((", (U+%04x)", alt_sum));
                else
                    debug((", LCH(%d)", alt_sum));
@@ -2895,6 +3499,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();
+
            p = output;
            for (i = 0; i < r; i++) {
                unsigned char ch = (unsigned char) keys[i];
@@ -2913,7 +3525,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
                        return 0;
                    }
                    keybuf = nc;
-                   luni_send(&keybuf, 1);
+                   luni_send(&keybuf, 1, 1);
                    continue;
                }
 
@@ -2921,22 +3533,39 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 
                if (!key_down) {
                    if (alt_sum) {
-                       if (utf || dbcs_screenfont) {
+                       if (in_utf || dbcs_screenfont) {
                            keybuf = alt_sum;
-                           luni_send(&keybuf, 1);
+                           luni_send(&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.
+                            */
+                           ldisc_send(&ch, 1, 1);
                        }
                        alt_sum = 0;
                    } else
-                       lpage_send(kbd_codepage, &ch, 1);
+                       lpage_send(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);
+                       luni_send(cbuf+!left_alt, 1+!!left_alt, 1);
+                   } else {
+                       char cbuf[2];
+                       cbuf[0] = '\033';
+                       cbuf[1] = ch;
+                       lpage_send(kbd_codepage, cbuf+!left_alt, 1+!!left_alt, 1);
+                   }
                }
+               show_mouseptr(0);
            }
 
            /* This is so the ALT-Numpad and dead keys work correctly. */
@@ -2948,23 +3577,19 @@ 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 || 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;
 }
@@ -2991,7 +3616,8 @@ void set_sbar(int total, int start, int page)
 {
     SCROLLINFO si;
 
-    if (!cfg.scrollbar)
+    if ((full_screen && !cfg.scrollbar_in_fullscreen) ||
+       (!full_screen && !cfg.scrollbar))
        return;
 
     si.cbSize = sizeof(si);
@@ -3114,10 +3740,9 @@ void write_aclip(char *data, int len, int must_deselect)
  */
 void write_clip(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);
 
@@ -3125,11 +3750,13 @@ void write_clip(wchar_t * data, int len, int must_deselect)
                           len * sizeof(wchar_t));
     clipdata2 = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, len2);
 
-    if (!clipdata || !clipdata2) {
+    if (!clipdata || !clipdata2 || !clipdata3) {
        if (clipdata)
            GlobalFree(clipdata);
        if (clipdata2)
            GlobalFree(clipdata2);
+       if (clipdata3)
+           GlobalFree(clipdata3);
        return;
     }
     if (!(lock = GlobalLock(clipdata)))
@@ -3140,6 +3767,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 +3891,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);
@@ -3215,10 +3958,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 + 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
@@ -3239,6 +3982,42 @@ void fatalbox(char *fmt, ...)
 }
 
 /*
+ * 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)
@@ -3272,4 +4051,170 @@ void beep(int mode)
            cfg.beep = BELL_DEFAULT;
        }
     }
+    /* Otherwise, either visual bell or disabled; do nothing here */
+    if (!has_focus) {
+       flash_window(2);               /* start */
+    }
+}
+
+/*
+ * Toggle full screen mode. Thanks to cwis@nerim.fr for the
+ * implementation.
+ * Revised by <wez@thebrainroom.com>
+ */
+static void flip_full_screen(void)
+{
+    WINDOWPLACEMENT wp;
+    LONG style;
+
+    wp.length = sizeof(wp);
+    GetWindowPlacement(hwnd, &wp);
+
+    full_screen = !full_screen;
+
+    if (full_screen) {
+       if (wp.showCmd == SW_SHOWMAXIMIZED) {
+           /* Ooops it was already 'zoomed' we have to unzoom it before
+            * everything will work right.
+            */
+           wp.showCmd = SW_SHOWNORMAL;
+           SetWindowPlacement(hwnd, &wp);
+       }
+
+       style = GetWindowLong(hwnd, GWL_STYLE) & ~(WS_CAPTION|WS_THICKFRAME);
+       style &= ~WS_VSCROLL;
+       if (cfg.scrollbar_in_fullscreen)
+           style |= WS_VSCROLL;
+       SetWindowLong(hwnd, GWL_STYLE, style);
+
+       /* Some versions of explorer get confused and don't take
+        * notice of us going fullscreen, so go topmost too.
+        */
+       SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
+                    SWP_NOACTIVATE | SWP_NOCOPYBITS |
+                    SWP_NOMOVE | SWP_NOSIZE |
+                    SWP_FRAMECHANGED);
+
+       wp.showCmd = SW_SHOWMAXIMIZED;
+       SetWindowPlacement(hwnd, &wp);
+    } else {
+       style = GetWindowLong(hwnd, GWL_STYLE) | WS_CAPTION;
+       if (cfg.resize_action != RESIZE_DISABLED)
+           style |= WS_THICKFRAME;
+       style &= ~WS_VSCROLL;
+       if (cfg.scrollbar)
+           style |= WS_VSCROLL;
+       SetWindowLong(hwnd, GWL_STYLE, style);
+
+       SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0,
+                    SWP_NOACTIVATE | SWP_NOCOPYBITS |
+                    SWP_NOMOVE | SWP_NOSIZE |
+                    SWP_FRAMECHANGED);
+
+       wp.showCmd = SW_SHOWNORMAL;
+       SetWindowPlacement(hwnd, &wp);
+    }
+
+    CheckMenuItem(GetSystemMenu(hwnd, FALSE), IDM_FULLSCREEN,
+                 MF_BYCOMMAND| full_screen ? MF_CHECKED : MF_UNCHECKED);
+}
+
+/*
+ * Minimise or restore the window in response to a server-side
+ * request.
+ */
+void set_iconic(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(int x, int y)
+{
+    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(int top)
+{
+    if (cfg.alwaysontop || full_screen)
+       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)
+{
+    InvalidateRect(hwnd, NULL, TRUE);
+}
+
+/*
+ * Maximise or restore the window in response to a server-side
+ * request.
+ */
+void set_zoomed(int zoomed)
+{
+    if (IsZoomed(hwnd) || full_screen) {
+       if (!zoomed) {
+           if (full_screen)
+               flip_full_screen();
+           else
+               ShowWindow(hwnd, SW_RESTORE);
+       }
+    } else {
+       if (zoomed)
+           ShowWindow(hwnd, SW_MAXIMIZE);
+    }
+}
+
+/*
+ * Report whether the window is iconic, for terminal reports.
+ */
+int is_iconic(void)
+{
+    return IsIconic(hwnd);
+}
+
+/*
+ * Report the window's position, for terminal reports.
+ */
+void get_window_pos(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(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(int icon)
+{
+    return icon ? icon_name : window_name;
 }