Ensure our network layer is properly cleaned up before PuTTY exits.
[u/mdw/putty] / window.c
index 8b404ab..a779dbc 100644 (file)
--- a/window.c
+++ b/window.c
 #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>
 #define IDM_TEL_SUSP  0x0110
 #define IDM_TEL_EOR   0x0120
 #define IDM_TEL_EOF   0x0130
-#define IDM_ABOUT     0x0140
-#define IDM_SAVEDSESS 0x0150
-#define IDM_COPYALL   0x0160
-#define IDM_FULLSCREEN 0x0170
+#define IDM_HELP      0x0140
+#define IDM_ABOUT     0x0150
+#define IDM_SAVEDSESS 0x0160
+#define IDM_COPYALL   0x0170
+#define IDM_FULLSCREEN 0x0180
 
 #define IDM_SESSLGP   0x0250          /* log type printable */
 #define IDM_SESSLGA   0x0260          /* log type all chars */
 #define IDM_SAVED_MAX 0x2000
 
 #define WM_IGNORE_CLIP (WM_XUSER + 2)
+#define WM_FULLSCR_ON_MAX (WM_XUSER + 3)
 
 /* Needed for Chinese support and apparently not always defined. */
 #ifndef VK_PROCESSKEY
 #define VK_PROCESSKEY 0xE5
 #endif
 
-/* Needed for mouse wheel support and not defined in earlier SDKs. */
+/* Mouse wheel support. */
 #ifndef WM_MOUSEWHEEL
-#define WM_MOUSEWHEEL 0x020A
+#define WM_MOUSEWHEEL 0x020A          /* not defined in earlier SDKs */
+#endif
+#ifndef WHEEL_DELTA
+#define WHEEL_DELTA 120
 #endif
 
 static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
@@ -74,10 +86,15 @@ static void init_fonts(int, int);
 static void another_font(int);
 static void deinit_fonts(void);
 static void set_input_locale(HKL);
+static int do_mouse_wheel_msg(UINT message, WPARAM wParam, LPARAM lParam);
+
+static int is_full_screen(void);
+static void make_full_screen(void);
+static void clear_full_screen(void);
+static void flip_full_screen(void);
 
 /* Window layout information */
 static void reset_window(int);
-static int full_screen = 0;
 static int extra_width, extra_height;
 static int font_width, font_height, font_dualwidth;
 static int offset_width, offset_height;
@@ -89,10 +106,12 @@ static WPARAM pend_netevent_wParam = 0;
 static LPARAM pend_netevent_lParam = 0;
 static void enact_pending_netevent(void);
 static void flash_window(int mode);
-static void flip_full_screen(void);
+static void sys_cursor_update(void);
 
 static time_t last_movement = 0;
 
+static int caret_x = -1, caret_y = -1;
+
 #define FONT_NORMAL 0
 #define FONT_BOLD 1
 #define FONT_UNDERLINE 2
@@ -140,8 +159,12 @@ 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)
 {
@@ -171,6 +194,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();
 
@@ -191,6 +215,42 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     }
 
     /*
+     * If we're running a version of Windows that doesn't support
+     * WM_MOUSEWHEEL, find out what message number we should be
+     * using instead.
+     */
+    if (osVersion.dwMajorVersion < 4 ||
+       (osVersion.dwMajorVersion == 4 && 
+        osVersion.dwPlatformId != VER_PLATFORM_WIN32_NT))
+       wm_mousewheel = RegisterWindowMessage("MSWHEEL_ROLLMSG");
+
+    /*
+     * See if we can find our Help file.
+     */
+    {
+        char b[2048], *p, *q, *r;
+        FILE *fp;
+        GetModuleFileName(NULL, b, sizeof(b) - 1);
+        r = b;
+        p = strrchr(b, '\\');
+        if (p && p >= r) r = p+1;
+        q = strrchr(b, ':');
+        if (q && q >= r) r = q+1;
+        strcpy(r, "putty.hlp");
+        if ( (fp = fopen(b, "r")) != NULL) {
+            help_path = dupstr(b);
+            fclose(fp);
+        } else
+            help_path = NULL;
+        strcpy(r, "putty.cnt");
+        if ( (fp = fopen(b, "r")) != NULL) {
+            help_has_contents = TRUE;
+            fclose(fp);
+        } else
+            help_has_contents = FALSE;
+    }
+
+    /*
      * Process the command line.
      */
     {
@@ -586,6 +646,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        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");
     }
 
@@ -595,15 +657,15 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     set_input_locale(GetKeyboardLayout(0));
 
     /*
-     * Finally show the window!
+     * Open the initial log file if there is one.
      */
-    ShowWindow(hwnd, show);
-    SetForegroundWindow(hwnd);
+    logfopen();
 
     /*
-     * Open the initial log file if there is one.
+     * Finally show the window!
      */
-    logfopen();
+    ShowWindow(hwnd, show);
+    SetForegroundWindow(hwnd);
 
     /*
      * Set the palette up.
@@ -666,7 +728,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
                timer_id = 0;
            }
            HideCaret(hwnd);
-           term_out();
+           if (GetCapture() != hwnd)
+               term_out();
            term_update();
            ShowCaret(hwnd);
 
@@ -693,6 +756,14 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        }
     }
 
+    cleanup_exit(msg.wParam);
+}
+
+/*
+ * Clean up and exit.
+ */
+void cleanup_exit(int code)
+{
     /*
      * Clean up.
      */
@@ -700,7 +771,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();
@@ -709,7 +782,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 #endif
     }
 
-    return msg.wParam;
+    exit(code);
 }
 
 /*
@@ -1454,12 +1527,14 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
     HDC hdc;
     static int ignore_clip = FALSE;
     static int need_backend_resize = FALSE;
+    static int fullscr_on_max = FALSE;
 
     switch (message) {
       case WM_TIMER:
        if (pending_netevent)
            enact_pending_netevent();
-       term_out();
+       if (GetCapture() != hwnd)
+           term_out();
        noise_regular();
        HideCaret(hwnd);
        term_update();
@@ -1532,15 +1607,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 < nsessions) {
+                       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;
+                       }
+                   } else
+                       break;
                } else
                    cl = NULL;
 
@@ -1579,9 +1659,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                                   (cfg.resize_action == RESIZE_DISABLED)
                                   ? MF_GRAYED : MF_ENABLED);
                    /* Gracefully unzoom if necessary */
-                   if (full_screen &&
+                   if (IsZoomed(hwnd) &&
                        (cfg.resize_action == RESIZE_DISABLED)) {
-                       flip_full_screen();
+                       ShowWindow(hwnd, SW_RESTORE);
                    }
                }
 
@@ -1609,6 +1689,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                    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(cfg.height, cfg.width, cfg.savelines);
 
@@ -1636,15 +1717,22 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                        nexflag &= ~(WS_EX_CLIENTEDGE);
 
                    nflg = flag;
-                   if (full_screen ?
+                   if (is_full_screen() ?
                        cfg.scrollbar_in_fullscreen : cfg.scrollbar)
                        nflg |= WS_VSCROLL;
                    else
                        nflg &= ~WS_VSCROLL;
+
+                   if (cfg.resize_action == RESIZE_DISABLED ||
+                        is_full_screen())
+                       nflg &= ~WS_THICKFRAME;
+                   else
+                       nflg |= WS_THICKFRAME;
+
                    if (cfg.resize_action == RESIZE_DISABLED)
-                       nflg &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX);
+                       nflg &= ~WS_MAXIMIZEBOX;
                    else
-                       nflg |= (WS_THICKFRAME | WS_MAXIMIZEBOX);
+                       nflg |= WS_MAXIMIZEBOX;
 
                    if (nflg != flag || nexflag != exflag) {
                        if (nflg != flag)
@@ -1755,6 +1843,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
          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
@@ -1776,8 +1868,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                PostMessage(hwnd, WM_CHAR, ' ', 0);
            break;
          case IDM_FULLSCREEN:
-               flip_full_screen();     
-               break;
+           flip_full_screen();
+           break;
          default:
            if (wParam >= IDM_SAVED_MIN && wParam <= IDM_SAVED_MAX) {
                SendMessage(hwnd, WM_SYSCOMMAND, IDM_SAVEDSESS, wParam);
@@ -1790,45 +1882,6 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 
 #define TO_CHR_X(x) ((((x)<0 ? (x)-font_width+1 : (x))-offset_width) / font_width)
 #define TO_CHR_Y(y) ((((y)<0 ? (y)-font_height+1: (y))-offset_height) / font_height)
-#define WHEEL_DELTA 120
-      case WM_MOUSEWHEEL:
-       {
-           wheel_accumulator += (short) HIWORD(wParam);
-           wParam = LOWORD(wParam);
-
-           /* process events when the threshold is reached */
-           while (abs(wheel_accumulator) >= WHEEL_DELTA) {
-               int b;
-
-               /* reduce amount for next time */
-               if (wheel_accumulator > 0) {
-                   b = MBT_WHEEL_UP;
-                   wheel_accumulator -= WHEEL_DELTA;
-               } else if (wheel_accumulator < 0) {
-                   b = MBT_WHEEL_DOWN;
-                   wheel_accumulator += WHEEL_DELTA;
-               } else
-                   break;
-
-               if (send_raw_mouse) {
-                   /* send a mouse-down followed by a mouse up */
-                   
-                   term_mouse(b,
-                              MA_CLICK,
-                              TO_CHR_X(X_POS(lParam)),
-                              TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
-                              wParam & MK_CONTROL, is_alt_pressed());
-                   term_mouse(b, MA_RELEASE, TO_CHR_X(X_POS(lParam)),
-                              TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
-                              wParam & MK_CONTROL, is_alt_pressed());
-               } else {
-                   /* trigger a scroll */
-                   term_scroll(0,
-                               b == MBT_WHEEL_UP ? -rows / 2 : rows / 2);
-               }
-           }
-           return 0;
-       }
       case WM_LBUTTONDOWN:
       case WM_MBUTTONDOWN:
       case WM_RBUTTONDOWN:
@@ -1873,7 +1926,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             * window, we put up the System menu instead of doing
             * selection.
             */
-           if (full_screen && press && button == MBT_LEFT &&
+           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;
@@ -1901,7 +1954,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
         */
        noise_ultralight(lParam);
 
-       if (wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) {
+       if (wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON) &&
+           GetCapture() == hwnd) {
            Mouse_Button b;
            if (wParam & MK_LBUTTON)
                b = MBT_LEFT;
@@ -2003,10 +2057,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
        term_update();
        break;
       case WM_KILLFOCUS:
-       if (full_screen) flip_full_screen();
        show_mouseptr(1);
        has_focus = FALSE;
        DestroyCaret();
+       caret_x = caret_y = -1;        /* ensure caret is replaced next time */
        term_out();
        term_update();
        break;
@@ -2120,6 +2174,12 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            return rv;
        }
        /* break;  (never reached) */
+      case WM_FULLSCR_ON_MAX:
+       fullscr_on_max = TRUE;
+       break;
+      case WM_MOVE:
+       sys_cursor_update();
+       break;
       case WM_SIZE:
 #ifdef RDB_DEBUG_PATCH
        debug((27, "WM_SIZE %s (%d,%d)",
@@ -2135,6 +2195,12 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                          cfg.win_name_always ? window_name : icon_name);
        if (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED)
            SetWindowText(hwnd, window_name);
+        if (wParam == SIZE_RESTORED)
+            clear_full_screen();
+        if (wParam == SIZE_MAXIMIZED && fullscr_on_max) {
+            make_full_screen();
+            fullscr_on_max = FALSE;
+        }
 
        if (cfg.resize_action == RESIZE_DISABLED) {
            /* A resize, well it better be a minimize. */
@@ -2197,6 +2263,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                    reset_window(0);
            }
        }
+       sys_cursor_update();
        return 0;
       case WM_VSCROLL:
        switch (LOWORD(wParam)) {
@@ -2306,6 +2373,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
        /* wParam == Font number */
        /* lParam == Locale */
        set_input_locale((HKL)lParam);
+       sys_cursor_update();
        break;
       case WM_IME_NOTIFY:
        if(wParam == IMN_SETOPENSTATUS) {
@@ -2320,7 +2388,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            HIMC hIMC;
            int n;
            char *buff;
-   
+
            if(osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS || 
                osVersion.dwPlatformId == VER_PLATFORM_WIN32s) break; /* no Unicode */
 
@@ -2331,9 +2399,17 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            n = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
 
            if (n > 0) {
+               int i;
                buff = (char*) smalloc(n);
                ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, buff, n);
-               luni_send((unsigned short *)buff, n / 2, 1);
+               /*
+                * Jaeyoun Chung reports that Korean character
+                * input doesn't work correctly if we do a single
+                * luni_send() covering the whole of buff. So
+                * instead we luni_send the characters one by one.
+                */
+               for (i = 0; i < n; i += 2)
+                   luni_send((unsigned short *)(buff+i), 1, 1);
                free(buff);
            }
            ImmReleaseContext(hwnd, hIMC);
@@ -2370,6 +2446,56 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            SetCursor(LoadCursor(NULL, IDC_ARROW));
            return TRUE;
        }
+      default:
+       if (message == wm_mousewheel || message == WM_MOUSEWHEEL) {
+           int shift_pressed=0, control_pressed=0, alt_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(b,
+                              MA_CLICK,
+                              TO_CHR_X(X_POS(lParam)),
+                              TO_CHR_Y(Y_POS(lParam)), shift_pressed,
+                              control_pressed, is_alt_pressed());
+                   term_mouse(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(0,
+                               b == MBT_WHEEL_UP ? -rows / 2 : rows / 2);
+               }
+           }
+           return 0;
+       }
     }
 
     return DefWindowProc(hwnd, message, wParam, lParam);
@@ -2383,13 +2509,35 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
  */
 void sys_cursor(int x, int y)
 {
+    int cx, cy;
+
+    if (!has_focus) return;
+
+    /*
+     * Avoid gratuitously re-updating the cursor position and IMM
+     * window if there's no actual change required.
+     */
+    cx = x * font_width + offset_width;
+    cy = y * font_height + offset_height;
+    if (cx == caret_x && cy == caret_y)
+       return;
+    caret_x = cx;
+    caret_y = cy;
+
+    sys_cursor_update();
+}
+
+static void sys_cursor_update(void)
+{
     COMPOSITIONFORM cf;
     HIMC hIMC;
 
     if (!has_focus) return;
-    
-    SetCaretPos(x * font_width + offset_width,
-               y * font_height + offset_height);
+
+    if (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 */
@@ -2400,8 +2548,8 @@ void sys_cursor(int x, int y)
     /* we should have the IMM functions */
     hIMC = ImmGetContext(hwnd);
     cf.dwStyle = CFS_POINT;
-    cf.ptCurrentPos.x = x * font_width + offset_width;
-    cf.ptCurrentPos.y = y * font_height + offset_height;
+    cf.ptCurrentPos.x = caret_x;
+    cf.ptCurrentPos.y = caret_y;
     ImmSetCompositionWindow(hIMC, &cf);
 
     ImmReleaseContext(hwnd, hIMC);
@@ -3432,11 +3580,24 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
                    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.
+#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)
                        app_flg = 0;
+#endif
                    /* Useful mapping of Ctrl-arrows */
                    if (shift_state == 2)
                        app_flg = !app_flg;
@@ -3616,8 +3777,7 @@ void set_sbar(int total, int start, int page)
 {
     SCROLLINFO si;
 
-    if ((full_screen && !cfg.scrollbar_in_fullscreen) ||
-       (!full_screen && !cfg.scrollbar))
+    if (is_full_screen() ? !cfg.scrollbar_in_fullscreen : !cfg.scrollbar)
        return;
 
     si.cbSize = sizeof(si);
@@ -3750,13 +3910,11 @@ 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 || !clipdata3) {
+    if (!clipdata || !clipdata2) {
        if (clipdata)
            GlobalFree(clipdata);
        if (clipdata2)
            GlobalFree(clipdata2);
-       if (clipdata3)
-           GlobalFree(clipdata3);
        return;
     }
     if (!(lock = GlobalLock(clipdata)))
@@ -3978,7 +4136,7 @@ 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);
 }
 
 /*
@@ -4058,68 +4216,6 @@ void beep(int mode)
 }
 
 /*
- * 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.
  */
@@ -4139,6 +4235,11 @@ void set_iconic(int iconic)
  */
 void move_window(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);
 }
 
@@ -4148,7 +4249,7 @@ void move_window(int x, int y)
  */
 void set_zorder(int top)
 {
-    if (cfg.alwaysontop || full_screen)
+    if (cfg.alwaysontop)
        return;                        /* ignore */
     SetWindowPos(hwnd, top ? HWND_TOP : HWND_BOTTOM, 0, 0, 0, 0,
                 SWP_NOMOVE | SWP_NOSIZE);
@@ -4168,13 +4269,9 @@ void refresh_window(void)
  */
 void set_zoomed(int zoomed)
 {
-    if (IsZoomed(hwnd) || full_screen) {
-       if (!zoomed) {
-           if (full_screen)
-               flip_full_screen();
-           else
-               ShowWindow(hwnd, SW_RESTORE);
-       }
+    if (IsZoomed(hwnd)) {
+        if (!zoomed)
+           ShowWindow(hwnd, SW_RESTORE);
     } else {
        if (zoomed)
            ShowWindow(hwnd, SW_MAXIMIZE);
@@ -4218,3 +4315,105 @@ char *get_window_title(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;
+}
+
+/*
+ * Go full-screen. This should only be called when we are already
+ * maximised.
+ */
+void make_full_screen()
+{
+    DWORD style;
+    int x, y, w, h;
+
+    assert(IsZoomed(hwnd));
+
+    /* 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. */
+#ifdef MONITOR_DEFAULTTONEAREST
+    {
+       HMONITOR mon;
+       MONITORINFO mi;
+       mon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+       mi.cbSize = sizeof(mi);
+       GetMonitorInfo(mon, &mi);
+       x = mi.rcMonitor.left;
+       y = mi.rcMonitor.top;
+       w = mi.rcMonitor.right;
+       h = mi.rcMonitor.bottom;
+    }
+#else
+    x = y = 0;
+    w = GetSystemMetrics(SM_CXSCREEN);
+    h = GetSystemMetrics(SM_CYSCREEN);
+#endif
+    SetWindowPos(hwnd, HWND_TOP, x, y, w, h, 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);
+    }
+}