Configurable TCP_NODELAY option on network connections
[u/mdw/putty] / window.c
index c0e7f3e..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
 #endif
 #endif
 
-#if WINVER < 0x0500
-#define COMPILE_MULTIMON_STUBS
-#include <multimon.h>
-#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"
@@ -76,21 +73,17 @@ static void init_palette(void);
 static void init_fonts(int, int);
 static void another_font(int);
 static void deinit_fonts(void);
+static void set_input_locale(HKL);
 
 /* Window layout information */
 static void reset_window(int);
-static int full_screen = 0, want_full_screen = 0;
+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 was_full_screen = 0;
 static int prev_rows, prev_cols;
-static int pre_fs_rows, pre_fs_cols;
   
-static LONG old_wind_style;
-static WINDOWPLACEMENT old_wind_placement;
-
 static int pending_netevent = 0;
 static WPARAM pend_netevent_wParam = 0;
 static LPARAM pend_netevent_lParam = 0;
@@ -116,6 +109,7 @@ static time_t last_movement = 0;
 #define FONT_MAXNO     0x2F
 #define FONT_SHIFT     5
 static HFONT fonts[FONT_MAXNO];
+static LOGFONT lfont;
 static int fontflag[FONT_MAXNO];
 static enum {
     BOLD_COLOURS, BOLD_SHADOW, BOLD_FONT
@@ -514,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);
@@ -589,12 +583,18 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        AppendMenu(m, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback");
        AppendMenu(m, MF_ENABLED, IDM_RESET, "Rese&t Terminal");
        AppendMenu(m, MF_SEPARATOR, 0, 0);
-       AppendMenu(m, MF_ENABLED, IDM_FULLSCREEN, "&Full Screen");
+       AppendMenu(m, (cfg.resize_action == RESIZE_DISABLED) ?
+                  MF_GRAYED : MF_ENABLED, IDM_FULLSCREEN, "&Full Screen");
        AppendMenu(m, MF_SEPARATOR, 0, 0);
        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);
@@ -672,6 +672,9 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
            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);
@@ -918,6 +921,21 @@ static void init_fonts(int pick_width, int pick_height)
 
     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);
 
@@ -1104,7 +1122,7 @@ void request_resize(int w, int h)
 
     /* If the window is maximized supress resizing attempts */
     if (IsZoomed(hwnd)) {
-       if (cfg.resize_action != RESIZE_FONT)
+       if (cfg.resize_action == RESIZE_TERM)
            return;
     }
 
@@ -1141,7 +1159,7 @@ void request_resize(int w, int h)
 
     term_size(h, w, cfg.savelines);
 
-    if (cfg.resize_action != RESIZE_FONT) {
+    if (cfg.resize_action != RESIZE_FONT && !IsZoomed(hwnd)) {
        width = extra_width + font_width * w;
        height = extra_height + font_height * h;
 
@@ -1176,6 +1194,8 @@ static void reset_window(int reinit) {
     win_width  = cr.right - cr.left;
     win_height = cr.bottom - cr.top;
 
+    if (cfg.resize_action == RESIZE_DISABLED) reinit = 2;
+
     /* Are we being forced to reload the fonts ? */
     if (reinit>1) {
 #ifdef RDB_DEBUG_PATCH
@@ -1201,7 +1221,7 @@ static void reset_window(int reinit) {
 #endif
     }
 
-    if (IsZoomed(hwnd) || full_screen) {
+    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.
         */
@@ -1209,7 +1229,7 @@ static void reset_window(int reinit) {
        extra_width = wr.right - wr.left - cr.right + cr.left;
        extra_height = wr.bottom - wr.top - cr.bottom + cr.top;
 
-       if (cfg.resize_action == RESIZE_FONT) {
+       if (cfg.resize_action != RESIZE_TERM) {
            if (  font_width != win_width/cols || 
                  font_height != win_height/rows) {
                deinit_fonts();
@@ -1265,6 +1285,8 @@ static void reset_window(int reinit) {
                         font_height*rows + extra_height,
                         SWP_NOMOVE | SWP_NOZORDER);
        }
+
+       InvalidateRect(hwnd, NULL, TRUE);
        return;
     }
 
@@ -1272,7 +1294,9 @@ static void reset_window(int reinit) {
      * window. But that may be too big for the screen which forces us
      * to change the terminal.
      */
-    if ((cfg.resize_action != RESIZE_FONT  && reinit==0) || reinit>0) {
+    if ((cfg.resize_action == RESIZE_TERM && reinit<=0) ||
+        (cfg.resize_action == RESIZE_EITHER && reinit<0) ||
+           reinit>0) {
        offset_width = offset_height = cfg.window_border;
        extra_width = wr.right - wr.left - cr.right + cr.left + offset_width*2;
        extra_height = wr.bottom - wr.top - cr.bottom + cr.top +offset_height*2;
@@ -1289,13 +1313,27 @@ static void reset_window(int reinit) {
 
            /* Grrr too big */
            if ( rows > height || cols > width ) {
-               if ( height > rows ) height = rows;
-               if ( width > cols )  width = cols;
-               term_size(height, width, cfg.savelines);
+               if (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));
+                   debug((27, "reset_window() -> term resize to (%d,%d)",
+                              height, width));
 #endif
+               }
            }
            
            SetWindowPos(hwnd, NULL, 0, 0, 
@@ -1335,13 +1373,23 @@ static void reset_window(int reinit) {
     }
 }
 
-static void click(Mouse_Button b, int x, int y, int shift, int ctrl)
+static void set_input_locale(HKL kl)
+{
+    char lbuf[20];
+
+    GetLocaleInfo(LOWORD(kl), LOCALE_IDEFAULTANSICODEPAGE,
+                 lbuf, sizeof(lbuf));
+
+    kbd_codepage = atoi(lbuf);
+}
+
+static void click(Mouse_Button b, int x, int y, int shift, int ctrl, int alt)
 {
     int thistime = GetMessageTime();
 
     if (send_raw_mouse && !(cfg.mouse_override && shift)) {
        lastbtn = MBT_NOTHING;
-       term_mouse(b, MA_CLICK, x, y, shift, ctrl);
+       term_mouse(b, MA_CLICK, x, y, shift, ctrl, alt);
        return;
     }
 
@@ -1354,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;
 }
 
@@ -1385,12 +1433,26 @@ 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_clip = FALSE;
-    static int resizing = FALSE;
     static int need_backend_resize = FALSE;
 
     switch (message) {
@@ -1410,6 +1472,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                last_movement = now;
            }
        }
+       net_pending_errors();
        return 0;
       case WM_CREATE:
        break;
@@ -1509,9 +1572,17 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                if (!do_reconfig(hwnd))
                    break;
 
-               /* If user forcibly disables full-screen, gracefully unzoom */
-               if (full_screen && !cfg.fullscreenonaltenter) {
-                   flip_full_screen();
+               {
+                   /* Disable full-screen if resizing forbidden */
+                   HMENU m = GetSystemMenu (hwnd, FALSE);
+                   EnableMenuItem(m, IDM_FULLSCREEN, MF_BYCOMMAND | 
+                                  (cfg.resize_action == RESIZE_DISABLED)
+                                  ? MF_GRAYED : MF_ENABLED);
+                   /* Gracefully unzoom if necessary */
+                   if (full_screen &&
+                       (cfg.resize_action == RESIZE_DISABLED)) {
+                       flip_full_screen();
+                   }
                }
 
                if (strcmp(prev_cfg.logfilename, cfg.logfilename) ||
@@ -1537,7 +1608,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                if (cfg.height != prev_cfg.height ||
                    cfg.width != prev_cfg.width ||
                    cfg.savelines != prev_cfg.savelines ||
-                   cfg.resize_action != RESIZE_TERM)
+                   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 */
@@ -1564,7 +1636,8 @@ 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;
@@ -1608,12 +1681,14 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                    cfg.fontcharset != prev_cfg.fontcharset ||
                    cfg.vtmode != prev_cfg.vtmode ||
                    cfg.bold_colour != prev_cfg.bold_colour ||
-                   (cfg.resize_action != RESIZE_FONT &&
-                    prev_cfg.resize_action == RESIZE_FONT))
+                   cfg.resize_action == RESIZE_DISABLED ||
+                   cfg.resize_action == RESIZE_EITHER ||
+                   (cfg.resize_action != prev_cfg.resize_action))
                    init_lvl = 2;
 
                InvalidateRect(hwnd, NULL, TRUE);
                reset_window(init_lvl);
+               net_pending_errors();
            }
            break;
          case IDM_COPYALL:
@@ -1627,54 +1702,76 @@ 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.
-            * This might happen from within TranslateKey, in which
-            * case it really wants to be followed by a `space'
-            * character to actually _bring the menu up_ rather
-            * than just sitting there in `ready to appear' state.
+            * We get this if the System menu has been activated
+            * using the keyboard. This might happen from within
+            * TranslateKey, in which case it really wants to be
+            * followed by a `space' character to actually _bring
+            * the menu up_ rather than just sitting there in
+            * `ready to appear' state.
             */
+           show_mouseptr(1);          /* make sure pointer is visible */
            if( lParam == 0 )
                PostMessage(hwnd, WM_CHAR, ' ', 0);
            break;
@@ -1715,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,
@@ -1739,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;
@@ -1768,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();
            }
        }
@@ -1800,7 +1911,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                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:
@@ -1892,6 +2003,7 @@ 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();
@@ -1923,22 +2035,26 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
         * 1) Keep the sizetip uptodate
         * 2) Make sure the window size is _stepped_ in units of the font size.
         */
-       if (cfg.resize_action == RESIZE_TERM && !alt_pressed) {
+       if (cfg.resize_action != RESIZE_FONT && !alt_pressed) {
            int width, height, w, h, ew, eh;
            LPRECT r = (LPRECT) lParam;
 
-           if ( !need_backend_resize && 
+           if ( !need_backend_resize && cfg.resize_action == RESIZE_EITHER &&
                    (cfg.height != rows || cfg.width != cols )) {
                /* 
-                * Great! It seems the host has been changing the terminal
-                * size, well the user is now grabbing so this is probably
-                * the least confusing solution in the long run even though
-                * it a is suprise. Unfortunatly the only way to prevent 
-                * this seems to be to let the host change the window size 
-                * and as that's a user option we're still right back here.
-                */
+                * 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;
            }
@@ -2014,11 +2130,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                "...",
            LOWORD(lParam), HIWORD(lParam)));
 #endif
-       if (wParam == SIZE_MINIMIZED) {
+       if (wParam == SIZE_MINIMIZED)
            SetWindowText(hwnd,
                          cfg.win_name_always ? window_name : icon_name);
-           break;
-       }
        if (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED)
            SetWindowText(hwnd, window_name);
 
@@ -2033,11 +2147,11 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            height = HIWORD(lParam);
 
            if (!resizing) {
-               if (wParam == SIZE_MAXIMIZED) {
+               if (wParam == SIZE_MAXIMIZED && !was_zoomed) {
                    was_zoomed = 1;
                    prev_rows = rows;
                    prev_cols = cols;
-                   if (cfg.resize_action != RESIZE_FONT) {
+                   if (cfg.resize_action == RESIZE_TERM) {
                        w = width / font_width;
                        if (w < 1) w = 1;
                        h = height / font_height;
@@ -2048,14 +2162,12 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                    reset_window(0);
                } else if (wParam == SIZE_RESTORED && was_zoomed) {
                    was_zoomed = 0;
-                   if (cfg.resize_action != RESIZE_FONT)
+                   if (cfg.resize_action == RESIZE_TERM)
                        term_size(prev_rows, prev_cols, cfg.savelines);
-                   reset_window(0);
-               } else if (was_full_screen) {
-                   was_full_screen = 0;
                    if (cfg.resize_action != RESIZE_FONT)
-                       term_size(pre_fs_rows, pre_fs_cols, cfg.savelines);
-                   reset_window(0);
+                       reset_window(2);
+                   else
+                       reset_window(0);
                }
                /* This is an unexpected resize, these will normally happen
                 * if the window is too large. Probably either the user
@@ -2072,7 +2184,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             * down the connection during an NT opaque drag.)
             */
            if (resizing) {
-               if (cfg.resize_action == RESIZE_TERM && !alt_pressed) {
+               if (cfg.resize_action != RESIZE_FONT && !alt_pressed) {
                    need_backend_resize = TRUE;
                    w = (width-cfg.window_border*2) / font_width;
                    if (w < 1) w = 1;
@@ -2188,20 +2300,19 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                }
            }
        }
+       net_pending_errors();
        return 0;
       case WM_INPUTLANGCHANGE:
-       {
-           /* wParam == Font number */
-           /* lParam == Locale */
-           char lbuf[20];
-           HKL NewInputLocale = (HKL) lParam;
-
-           // lParam == GetKeyboardLayout(0);
-
-           GetLocaleInfo(LOWORD(NewInputLocale),
-                         LOCALE_IDEFAULTANSICODEPAGE, lbuf, sizeof(lbuf));
-
-           kbd_codepage = atoi(lbuf);
+       /* wParam == Font number */
+       /* lParam == Locale */
+       set_input_locale((HKL)lParam);
+       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:
@@ -2289,8 +2400,8 @@ void sys_cursor(int x, int y)
     /* we should have the IMM functions */
     hIMC = ImmGetContext(hwnd);
     cf.dwStyle = CFS_POINT;
-    cf.ptCurrentPos.x = x * font_width;
-    cf.ptCurrentPos.y = y * font_height;
+    cf.ptCurrentPos.x = x * font_width + offset_width;
+    cf.ptCurrentPos.y = y * font_height + offset_height;
     ImmSetCompositionWindow(hIMC, &cf);
 
     ImmReleaseContext(hwnd, hIMC);
@@ -2852,7 +2963,8 @@ 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;
     }
 
@@ -2934,8 +3046,10 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
            SendMessage(hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0);
            return -1;
        }
-       if (left_alt && wParam == VK_RETURN && cfg.fullscreenonaltenter) {
-           flip_full_screen();
+       if (left_alt && wParam == VK_RETURN && cfg.fullscreenonaltenter &&
+           (cfg.resize_action != RESIZE_DISABLED)) {
+           if ((HIWORD(lParam) & (KF_UP | KF_REPEAT)) != KF_REPEAT)
+               flip_full_screen();
            return -1;
        }
        /* Control-Numlock for app-keypad mode switch */
@@ -3502,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);
@@ -3625,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);
 
@@ -3636,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)))
@@ -3651,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);
 
@@ -3661,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);
@@ -3832,59 +4064,157 @@ void beep(int mode)
  */
 static void flip_full_screen(void)
 {
-    want_full_screen = !want_full_screen;
-
-    if (full_screen == want_full_screen)
-       return;
+    WINDOWPLACEMENT wp;
+    LONG style;
 
-    full_screen = want_full_screen;
+    wp.length = sizeof(wp);
+    GetWindowPlacement(hwnd, &wp);
 
-    old_wind_placement.length = sizeof(old_wind_placement);
+    full_screen = !full_screen;
 
     if (full_screen) {
-       int x, y, cx, cy;
-#ifdef MONITOR_DEFAULTTONEAREST
-       /* The multi-monitor safe way of doing things */
-       HMONITOR        mon;
-       MONITORINFO     mi;
-
-       mon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
-       mi.cbSize = sizeof(mi);
-       GetMonitorInfo(mon, &mi);
-       x = mi.rcMonitor.left;
-       y = mi.rcMonitor.top;
-       cx = mi.rcMonitor.right;
-       cy = mi.rcMonitor.bottom;
-#else
-       /* good old fashioned way of doing it */
-       x = 0;
-       y = 0;
-       cx = GetSystemMetrics(SM_CXSCREEN);
-       cy = GetSystemMetrics(SM_CYSCREEN);
-#endif
+       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);
+       }
 
-       /* save rows for when we "restore" back down again */
-       pre_fs_rows = rows;
-       pre_fs_cols = cols;
-
-       GetWindowPlacement(hwnd, &old_wind_placement);
-       SetWindowLong(hwnd, GWL_STYLE,
-                     GetWindowLong(hwnd, GWL_STYLE)
-                     & ~((cfg.scrollbar_in_fullscreen ? 0 : WS_VSCROLL)
-                         | WS_CAPTION | WS_BORDER | WS_THICKFRAME));
-       /* become topmost */
-       SetWindowPos(hwnd, HWND_TOP, x, y, cx, cy, SWP_FRAMECHANGED);
+       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 {
-       was_full_screen = 1;
-       SetWindowLong(hwnd, GWL_STYLE,
-                     GetWindowLong(hwnd, GWL_STYLE)
-                     | (cfg.scrollbar ? WS_VSCROLL : 0)
-                     | WS_CAPTION | WS_BORDER | WS_THICKFRAME);
-       SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0,
-                    SWP_NOMOVE|SWP_NOSIZE|SWP_FRAMECHANGED);
-       SetWindowPlacement(hwnd,&old_wind_placement);
+       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;
+}