X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2cae8529efd99957bff88ecd09398cf241cd1cf0..2184a5d91ffbcf2de2f730c83dda2d9443035f50:/window.c diff --git a/window.c b/window.c index a42d5887..8b404ab1 100644 --- a/window.c +++ b/window.c @@ -73,6 +73,7 @@ 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); @@ -507,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,6 +590,11 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) } /* + * Set up the initial input locale. + */ + set_input_locale(GetKeyboardLayout(0)); + + /* * Finally show the window! */ ShowWindow(hwnd, show); @@ -666,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); @@ -1113,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; } @@ -1150,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; @@ -1185,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 @@ -1218,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(); @@ -1274,6 +1285,8 @@ static void reset_window(int reinit) { font_height*rows + extra_height, SWP_NOMOVE | SWP_NOZORDER); } + + InvalidateRect(hwnd, NULL, TRUE); return; } @@ -1281,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; @@ -1298,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, @@ -1344,6 +1373,16 @@ static void reset_window(int reinit) { } } +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(); @@ -1407,12 +1446,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) { @@ -1568,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 */ @@ -1640,8 +1681,9 @@ 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); @@ -1961,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(); @@ -1992,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; } @@ -2083,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); @@ -2102,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; @@ -2117,9 +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); + 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 @@ -2136,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; @@ -2255,19 +2303,9 @@ 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) { @@ -3010,7 +3048,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, } if (left_alt && wParam == VK_RETURN && cfg.fullscreenonaltenter && (cfg.resize_action != RESIZE_DISABLED)) { - flip_full_screen(); + if ((HIWORD(lParam) & (KF_UP | KF_REPEAT)) != KF_REPEAT) + flip_full_screen(); return -1; } /* Control-Numlock for app-keypad mode switch */ @@ -3577,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); @@ -4041,32 +4081,36 @@ static void flip_full_screen(void) SetWindowPlacement(hwnd, &wp); } - style = GetWindowLong(hwnd, GWL_STYLE) & ~WS_CAPTION; + 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); - /* This seems to be needed otherwize explorer doesn't notice - * we want to go fullscreen and it's bar is still visible + /* Some versions of explorer get confused and don't take + * notice of us going fullscreen, so go topmost too. */ - SetWindowPos(hwnd, NULL, 0, 0, 0, 0, + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOCOPYBITS | - SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | + 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); - /* Don't need to do a SetWindowPos as the resize will force a - * full redraw. - */ + 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); } @@ -4074,3 +4118,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; +}