Add support for most of the ESC[<low number>t sequences, which xterm
[u/mdw/putty] / window.c
index 1496650..944fdba 100644 (file)
--- a/window.c
+++ b/window.c
@@ -108,6 +108,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
@@ -581,7 +582,8 @@ 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");
     }
@@ -910,6 +912,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);
 
@@ -1390,12 +1407,13 @@ static int is_alt_pressed(void)
     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) {
@@ -1515,9 +1533,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) ||
@@ -1570,7 +1596,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;
@@ -1687,14 +1714,23 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
          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;
@@ -1790,6 +1826,17 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                button = press = 0;    /* shouldn't happen */
            }
            show_mouseptr(1);
+           /*
+            * Special case: in full-screen mode, if the left
+            * button is clicked in the very top left corner of the
+            * window, we put up the System menu instead of doing
+            * selection.
+            */
+           if (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)),
@@ -2223,6 +2270,14 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            kbd_codepage = atoi(lbuf);
        }
        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;
@@ -2308,8 +2363,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);
@@ -2954,7 +3009,8 @@ 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) {
+       if (left_alt && wParam == VK_RETURN && cfg.fullscreenonaltenter &&
+           (cfg.resize_action != RESIZE_DISABLED)) {
            flip_full_screen();
            return -1;
        }
@@ -4019,3 +4075,103 @@ static void flip_full_screen(void)
     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;
+}