X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0e5e7f463ee689f7f29297678a605b85befe58e0..887035a593c8c0a1af853657c80046e17dc5581a:/window.c diff --git a/window.c b/window.c index 27a432cc..abbfdd89 100644 --- a/window.c +++ b/window.c @@ -11,10 +11,12 @@ #endif #endif +#ifndef NO_MULTIMON #if WINVER < 0x0500 #define COMPILE_MULTIMON_STUBS #include #endif +#endif #include #include @@ -24,6 +26,7 @@ #define PUTTY_DO_GLOBALS /* actually _define_ globals */ #include "putty.h" +#include "terminal.h" #include "winstuff.h" #include "storage.h" #include "win_res.h" @@ -67,9 +70,12 @@ #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); @@ -81,6 +87,7 @@ 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); @@ -100,9 +107,13 @@ 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 sys_cursor_update(void); +static int get_fullscreen_rect(RECT * ss); 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 @@ -150,8 +161,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) { @@ -181,6 +196,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(); @@ -201,6 +217,16 @@ 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. */ { @@ -231,6 +257,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) */ { char *p; + int got_host = 0; default_protocol = DEFAULT_PROTOCOL; default_port = DEFAULT_PORT; @@ -239,54 +266,16 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) do_defaults(NULL, &cfg); p = cmdline; - while (*p && isspace(*p)) - p++; /* - * Process command line options first. Yes, this can be - * done better, and it will be as soon as I have the - * energy... + * Process a couple of command-line options which are more + * easily dealt with before the line is broken up into + * words. These are the soon-to-be-defunct @sessionname and + * the internal-use-only &sharedmemoryhandle, neither of + * which are combined with anything else. */ - while (*p == '-') { - char *q = p + strcspn(p, " \t"); + while (*p && isspace(*p)) p++; - if (q == p + 3 && - tolower(p[0]) == 's' && - tolower(p[1]) == 's' && tolower(p[2]) == 'h') { - default_protocol = cfg.protocol = PROT_SSH; - default_port = cfg.port = 22; - } else if (q == p + 7 && - tolower(p[0]) == 'c' && - tolower(p[1]) == 'l' && - tolower(p[2]) == 'e' && - tolower(p[3]) == 'a' && - tolower(p[4]) == 'n' && - tolower(p[5]) == 'u' && tolower(p[6]) == 'p') { - /* - * `putty -cleanup'. Remove all registry entries - * associated with PuTTY, and also find and delete - * the random seed file. - */ - if (MessageBox(NULL, - "This procedure will remove ALL Registry\n" - "entries associated with PuTTY, and will\n" - "also remove the PuTTY random seed file.\n" - "\n" - "THIS PROCESS WILL DESTROY YOUR SAVED\n" - "SESSIONS. Are you really sure you want\n" - "to continue?", - "PuTTY Warning", - MB_YESNO | MB_ICONWARNING) == IDYES) { - cleanup_all(); - } - exit(0); - } - p = q + strspn(q, " \t"); - } - - /* - * An initial @ means to activate a saved session. - */ if (*p == '@') { int i = strlen(p); while (i > 1 && isspace(p[i - 1])) @@ -316,53 +305,107 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) WSACleanup(); return 0; } - } else if (*p) { - char *q = p; + } else { /* - * If the hostname starts with "telnet:", set the - * protocol to Telnet and process the string as a - * Telnet URL. + * Otherwise, break up the command line and deal with + * it sensibly. */ - if (!strncmp(q, "telnet:", 7)) { - char c; - - q += 7; - if (q[0] == '/' && q[1] == '/') - q += 2; - cfg.protocol = PROT_TELNET; - p = q; - while (*p && *p != ':' && *p != '/') - p++; - c = *p; - if (*p) - *p++ = '\0'; - if (c == ':') - cfg.port = atoi(p); - else - cfg.port = -1; - strncpy(cfg.host, q, sizeof(cfg.host) - 1); - cfg.host[sizeof(cfg.host) - 1] = '\0'; - } else { - while (*p && !isspace(*p)) - p++; - if (*p) - *p++ = '\0'; - strncpy(cfg.host, q, sizeof(cfg.host) - 1); - cfg.host[sizeof(cfg.host) - 1] = '\0'; - while (*p && isspace(*p)) - p++; - if (*p) - cfg.port = atoi(p); - else - cfg.port = -1; - } - } else { - if (!do_config()) { - WSACleanup(); - return 0; + int argc, i; + char **argv; + + split_into_argv(cmdline, &argc, &argv, NULL); + + for (i = 0; i < argc; i++) { + char *p = argv[i]; + int ret; + + ret = cmdline_process_param(p, i+1cols; + guess_height = extra_height + font_height * term->rows; { RECT r; - HWND w = GetDesktopWindow(); - GetWindowRect(w, &r); + get_fullscreen_rect(&r); if (guess_width > r.right - r.left) guess_width = r.right - r.left; if (guess_height > r.bottom - r.top) @@ -503,8 +559,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) * Resize the window, now we know what size we _really_ want it * to be. */ - guess_width = extra_width + font_width * cols; - guess_height = extra_height + font_height * rows; + guess_width = extra_width + font_width * term->cols; + guess_height = extra_height + font_height * term->rows; SetWindowPos(hwnd, NULL, 0, 0, guess_width, guess_height, SWP_NOMOVE | SWP_NOREDRAW | SWP_NOZORDER); @@ -530,8 +586,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) si.cbSize = sizeof(si); si.fMask = SIF_ALL | SIF_DISABLENOSCROLL; si.nMin = 0; - si.nMax = rows - 1; - si.nPage = rows; + si.nMax = term->rows - 1; + si.nPage = term->rows; si.nPos = 0; SetScrollInfo(hwnd, SB_VERT, &si, FALSE); } @@ -544,7 +600,8 @@ 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, cfg.tcp_nodelay); + error = back->init((void *)term, + cfg.host, cfg.port, &realhost, cfg.tcp_nodelay); if (error) { sprintf(msg, "Unable to open connection to\n" "%.800s\n" "%s", cfg.host, error); @@ -633,15 +690,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. @@ -650,7 +707,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) logpal = NULL; init_palette(); - has_focus = (GetForegroundWindow() == hwnd); + term->has_focus = (GetForegroundWindow() == hwnd); UpdateWindow(hwnd); if (GetMessage(&msg, NULL, 0, 0) == 1) { @@ -673,10 +730,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) DispatchMessage(&msg); /* Make sure we blink everything that needs it. */ - term_blink(0); + term_blink(term, 0); /* Send the paste buffer if there's anything to send */ - term_paste(); + term_paste(term); /* If there's nothing new in the queue then we can do everything * we've delayed, reading the socket, writing, and repainting @@ -689,7 +746,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) enact_pending_netevent(); /* Force the cursor blink on */ - term_blink(1); + term_blink(term, 1); if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) continue; @@ -704,19 +761,22 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) timer_id = 0; } HideCaret(hwnd); - term_out(); - term_update(); + if (GetCapture() != hwnd || + (send_raw_mouse && + !(cfg.mouse_override && is_shift_pressed()))) + term_out(term); + term_update(term); ShowCaret(hwnd); flash_window(1); /* maintain */ /* The messages seem unreliable; especially if we're being tricky */ - has_focus = (GetForegroundWindow() == hwnd); + term->has_focus = (GetForegroundWindow() == hwnd); - if (in_vbell) + if (term->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) + else if (!term->has_focus) timer_id = SetTimer(hwnd, 1, 500, NULL); else timer_id = SetTimer(hwnd, 1, 100, NULL); @@ -731,6 +791,15 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) } } + cleanup_exit(msg.wParam); /* this doesn't return... */ + return msg.wParam; /* ... but optimiser doesn't know */ +} + +/* + * Clean up and exit. + */ +void cleanup_exit(int code) +{ /* * Clean up. */ @@ -738,7 +807,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(); @@ -747,7 +818,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) #endif } - return msg.wParam; + exit(code); } /* @@ -781,6 +852,7 @@ char *do_select(SOCKET skt, int startup) */ void set_raw_mouse_mode(int activate) { + activate = activate && !cfg.no_mouse_rep; send_raw_mouse = activate; SetCursor(LoadCursor(NULL, activate ? IDC_ARROW : IDC_IBEAM)); } @@ -806,6 +878,21 @@ void connection_fatal(char *fmt, ...) } /* + * Report an error at the command-line parsing stage. + */ +void cmdline_error(char *fmt, ...) +{ + va_list ap; + char stuff[200]; + + va_start(ap, fmt); + vsprintf(stuff, fmt, ap); + va_end(ap); + MessageBox(hwnd, stuff, "PuTTY Command Line Error", MB_ICONERROR | MB_OK); + exit(1); +} + +/* * Actually do the job requested by a WM_NETEVENT */ static void enact_pending_netevent(void) @@ -1165,7 +1252,7 @@ void request_resize(int w, int h) } if (cfg.resize_action == RESIZE_DISABLED) return; - if (h == rows && w == cols) return; + if (h == term->rows && w == term->cols) return; /* Sanity checks ... */ { @@ -1175,7 +1262,7 @@ void request_resize(int w, int h) switch (first_time) { case 1: /* Get the size of the screen */ - if (GetClientRect(GetDesktopWindow(), &ss)) + if (get_fullscreen_rect(&ss)) /* first_time = 0 */ ; else { first_time = 2; @@ -1195,7 +1282,7 @@ void request_resize(int w, int h) } } - term_size(h, w, cfg.savelines); + term_size(term, h, w, cfg.savelines); if (cfg.resize_action != RESIZE_FONT && !IsZoomed(hwnd)) { width = extra_width + font_width * w; @@ -1249,10 +1336,10 @@ static void reset_window(int reinit) { /* 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; + (offset_width != (win_width-font_width*term->cols)/2 || + offset_height != (win_height-font_height*term->rows)/2) ){ + offset_width = (win_width-font_width*term->cols)/2; + offset_height = (win_height-font_height*term->rows)/2; InvalidateRect(hwnd, NULL, TRUE); #ifdef RDB_DEBUG_PATCH debug((27, "reset_window() -> Reposition terminal")); @@ -1268,12 +1355,12 @@ static void reset_window(int reinit) { 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) { + if ( font_width != win_width/term->cols || + font_height != win_height/term->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; + init_fonts(win_width/term->cols, win_height/term->rows); + offset_width = (win_width-font_width*term->cols)/2; + offset_height = (win_height-font_height*term->rows)/2; InvalidateRect(hwnd, NULL, TRUE); #ifdef RDB_DEBUG_PATCH debug((25, "reset_window() -> Z font resize to (%d, %d)", @@ -1281,15 +1368,15 @@ static void reset_window(int reinit) { #endif } } else { - if ( font_width != win_width/cols || - font_height != win_height/rows) { + if ( font_width != win_width/term->cols || + font_height != win_height/term->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; + term_size(term, win_height/font_height, win_width/font_width, + cfg.savelines); + offset_width = (win_width-font_width*term->cols)/2; + offset_height = (win_height-font_height*term->rows)/2; InvalidateRect(hwnd, NULL, TRUE); #ifdef RDB_DEBUG_PATCH debug((27, "reset_window() -> Zoomed term_size")); @@ -1311,16 +1398,16 @@ static void reset_window(int reinit) { 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 (win_width != font_width*term->cols + offset_width*2 || + win_height != font_height*term->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, + font_width*term->cols + extra_width, + font_height*term->rows + extra_height, SWP_NOMOVE | SWP_NOZORDER); } @@ -1339,24 +1426,27 @@ static void reset_window(int reinit) { 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 (win_width != font_width*term->cols + offset_width*2 || + win_height != font_height*term->rows + offset_height*2) { static RECT ss; int width, height; + + get_fullscreen_rect(&ss); - 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 ( term->rows > height || term->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; + if (term->cols > width) + font_width = (ss.right - ss.left - extra_width) + / term->cols; + if (term->rows > height) + font_height = (ss.bottom - ss.top - extra_height) + / term->rows; deinit_fonts(); init_fonts(font_width, font_height); @@ -1364,9 +1454,9 @@ static void reset_window(int reinit) { 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); + if ( height > term->rows ) height = term->rows; + if ( width > term->cols ) width = term->cols; + term_size(term, height, width, cfg.savelines); #ifdef RDB_DEBUG_PATCH debug((27, "reset_window() -> term resize to (%d,%d)", height, width)); @@ -1375,15 +1465,15 @@ static void reset_window(int reinit) { } SetWindowPos(hwnd, NULL, 0, 0, - font_width*cols + extra_width, - font_height*rows + extra_height, + font_width*term->cols + extra_width, + font_height*term->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)); + font_width*term->cols + extra_width, + font_height*term->rows + extra_height)); #endif } return; @@ -1391,14 +1481,14 @@ static void reset_window(int reinit) { /* 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) { + if (font_width != (win_width-cfg.window_border*2)/term->cols || + font_height != (win_height-cfg.window_border*2)/term->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; + init_fonts((win_width-cfg.window_border*2)/term->cols, + (win_height-cfg.window_border*2)/term->rows); + offset_width = (win_width-font_width*term->cols)/2; + offset_height = (win_height-font_height*term->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; @@ -1427,7 +1517,7 @@ static void click(Mouse_Button b, int x, int y, int shift, int ctrl, int alt) if (send_raw_mouse && !(cfg.mouse_override && shift)) { lastbtn = MBT_NOTHING; - term_mouse(b, MA_CLICK, x, y, shift, ctrl, alt); + term_mouse(term, b, MA_CLICK, x, y, shift, ctrl, alt); return; } @@ -1440,7 +1530,7 @@ static void click(Mouse_Button b, int x, int y, int shift, int ctrl, int alt) lastact = MA_CLICK; } if (lastact != MA_NOTHING) - term_mouse(b, lastact, x, y, shift, ctrl, alt); + term_mouse(term, b, lastact, x, y, shift, ctrl, alt); lasttime = thistime; } @@ -1484,6 +1574,17 @@ static int is_alt_pressed(void) return FALSE; } +static int is_shift_pressed(void) +{ + BYTE keystate[256]; + int r = GetKeyboardState(keystate); + if (!r) + return FALSE; + if (keystate[VK_SHIFT] & 0x80) + return TRUE; + return FALSE; +} + static int resizing; static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, @@ -1498,10 +1599,12 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, case WM_TIMER: if (pending_netevent) enact_pending_netevent(); - term_out(); + if (GetCapture() != hwnd || + (send_raw_mouse && !(cfg.mouse_override && is_shift_pressed()))) + term_out(term); noise_regular(); HideCaret(hwnd); - term_update(); + term_update(term); ShowCaret(hwnd); if (cfg.ping_interval > 0) { time_t now; @@ -1648,13 +1751,17 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, cfgtopalette(); init_palette(); + /* Give terminal a heads-up on miscellaneous stuff */ + term_reconfig(term); + /* 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_EITHER && IsZoomed(hwnd)) || cfg.resize_action == RESIZE_DISABLED) - term_size(cfg.height, cfg.width, cfg.savelines); + term_size(term, cfg.height, cfg.width, cfg.savelines); /* Enable or disable the scroll bar, etc */ { @@ -1685,10 +1792,17 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, 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) @@ -1736,13 +1850,14 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, } break; case IDM_COPYALL: - term_copyall(); + term_copyall(term); break; case IDM_CLRSB: - term_clrsb(); + term_clrsb(term); break; case IDM_RESET: - term_pwron(); + term_pwron(term); + ldisc_send(NULL, 0, 0); break; case IDM_TEL_AYT: back->special(TS_AYT); @@ -1838,45 +1953,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: @@ -1933,7 +2009,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, is_alt_pressed()); SetCapture(hwnd); } else { - term_mouse(button, MA_RELEASE, + term_mouse(term, button, MA_RELEASE, TO_CHR_X(X_POS(lParam)), TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT, wParam & MK_CONTROL, is_alt_pressed()); @@ -1949,7 +2025,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; @@ -1957,7 +2034,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, b = MBT_MIDDLE; else b = MBT_RIGHT; - term_mouse(b, MA_DRAG, TO_CHR_X(X_POS(lParam)), + term_mouse(term, b, MA_DRAG, TO_CHR_X(X_POS(lParam)), TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT, wParam & MK_CONTROL, is_alt_pressed()); } @@ -1971,7 +2048,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, break; case WM_DESTROYCLIPBOARD: if (!ignore_clip) - term_deselect(); + term_deselect(term); ignore_clip = FALSE; return 0; case WM_PAINT: @@ -1983,7 +2060,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, SelectPalette(hdc, pal, TRUE); RealizePalette(hdc); } - term_paint(hdc, + term_paint(term, hdc, (p.rcPaint.left-offset_width)/font_width, (p.rcPaint.top-offset_height)/font_height, (p.rcPaint.right-offset_width-1)/font_width, @@ -1992,8 +2069,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, 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) + p.rcPaint.right >= offset_width + font_width*term->cols || + p.rcPaint.bottom>= offset_height + font_height*term->rows) { HBRUSH fillcolour, oldbrush; HPEN edge, oldpen; @@ -2004,10 +2081,21 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, colours[(ATTR_DEFBG>>ATTR_BGSHIFT)*2]); oldpen = SelectObject(hdc, edge); + /* + * Jordan Russell reports that this apparently + * ineffectual IntersectClipRect() call masks a + * Windows NT/2K bug causing strange display + * problems when the PuTTY window is taller than + * the primary monitor. It seems harmless enough... + */ + IntersectClipRect(hdc, + p.rcPaint.left, p.rcPaint.top, + p.rcPaint.right, p.rcPaint.bottom); + ExcludeClipRect(hdc, offset_width, offset_height, - offset_width+font_width*cols, - offset_height+font_height*rows); + offset_width+font_width*term->cols, + offset_height+font_height*term->rows); Rectangle(hdc, p.rcPaint.left, p.rcPaint.top, p.rcPaint.right, p.rcPaint.bottom); @@ -2042,20 +2130,21 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, time(&last_movement); return 0; case WM_SETFOCUS: - has_focus = TRUE; + term->has_focus = TRUE; CreateCaret(hwnd, caretbm, font_width, font_height); ShowCaret(hwnd); flash_window(0); /* stop */ compose_state = 0; - term_out(); - term_update(); + term_out(term); + term_update(term); break; case WM_KILLFOCUS: show_mouseptr(1); - has_focus = FALSE; + term->has_focus = FALSE; DestroyCaret(); - term_out(); - term_update(); + caret_x = caret_y = -1; /* ensure caret is replaced next time */ + term_out(term); + term_update(term); break; case WM_ENTERSIZEMOVE: #ifdef RDB_DEBUG_PATCH @@ -2072,7 +2161,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, debug((27, "WM_EXITSIZEMOVE")); #endif if (need_backend_resize) { - term_size(cfg.height, cfg.width, cfg.savelines); + term_size(term, cfg.height, cfg.width, cfg.savelines); InvalidateRect(hwnd, NULL, TRUE); } break; @@ -2087,7 +2176,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, LPRECT r = (LPRECT) lParam; if ( !need_backend_resize && cfg.resize_action == RESIZE_EITHER && - (cfg.height != rows || cfg.width != cols )) { + (cfg.height != term->rows || cfg.width != term->cols )) { /* * Great! It seems that both the terminal size and the * font size have been changed and the user is now dragging. @@ -2097,10 +2186,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, * * This would be easier but it seems to be too confusing. - term_size(cfg.height, cfg.width, cfg.savelines); + term_size(term, cfg.height, cfg.width, cfg.savelines); reset_window(2); */ - cfg.height=rows; cfg.width=cols; + cfg.height=term->rows; cfg.width=term->cols; InvalidateRect(hwnd, NULL, TRUE); need_backend_resize = TRUE; @@ -2144,25 +2233,25 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, 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) + w = (width + term->cols/2)/term->cols; + h = (height + term->rows/2)/term->rows; + if ( r->right != r->left + w*term->cols + ex_width) rv = 1; if (wParam == WMSZ_LEFT || wParam == WMSZ_BOTTOMLEFT || wParam == WMSZ_TOPLEFT) - r->left = r->right - w*cols - ex_width; + r->left = r->right - w*term->cols - ex_width; else - r->right = r->left + w*cols + ex_width; + r->right = r->left + w*term->cols + ex_width; - if (r->bottom != r->top + h*rows + ex_height) + if (r->bottom != r->top + h*term->rows + ex_height) rv = 1; if (wParam == WMSZ_TOP || wParam == WMSZ_TOPRIGHT || wParam == WMSZ_TOPLEFT) - r->top = r->bottom - h*rows - ex_height; + r->top = r->bottom - h*term->rows - ex_height; else - r->bottom = r->top + h*rows + ex_height; + r->bottom = r->top + h*term->rows + ex_height; return rv; } @@ -2170,6 +2259,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, 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)", @@ -2185,6 +2277,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) { + fullscr_on_max = FALSE; + make_full_screen(); + } if (cfg.resize_action == RESIZE_DISABLED) { /* A resize, well it better be a minimize. */ @@ -2199,25 +2297,21 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, if (!resizing) { if (wParam == SIZE_MAXIMIZED && !was_zoomed) { was_zoomed = 1; - prev_rows = rows; - prev_cols = cols; + prev_rows = term->rows; + prev_cols = term->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); + term_size(term, h, w, cfg.savelines); } - if (fullscr_on_max) - make_full_screen(); - fullscr_on_max = FALSE; reset_window(0); } else if (wParam == SIZE_RESTORED && was_zoomed) { was_zoomed = 0; - clear_full_screen(); if (cfg.resize_action == RESIZE_TERM) - term_size(prev_rows, prev_cols, cfg.savelines); + term_size(term, prev_rows, prev_cols, cfg.savelines); if (cfg.resize_action != RESIZE_FONT) reset_window(2); else @@ -2251,30 +2345,31 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, reset_window(0); } } + sys_cursor_update(); return 0; case WM_VSCROLL: switch (LOWORD(wParam)) { case SB_BOTTOM: - term_scroll(-1, 0); + term_scroll(term, -1, 0); break; case SB_TOP: - term_scroll(+1, 0); + term_scroll(term, +1, 0); break; case SB_LINEDOWN: - term_scroll(0, +1); + term_scroll(term, 0, +1); break; case SB_LINEUP: - term_scroll(0, -1); + term_scroll(term, 0, -1); break; case SB_PAGEDOWN: - term_scroll(0, +rows / 2); + term_scroll(term, 0, +term->rows / 2); break; case SB_PAGEUP: - term_scroll(0, -rows / 2); + term_scroll(term, 0, -term->rows / 2); break; case SB_THUMBPOSITION: case SB_THUMBTRACK: - term_scroll(1, HIWORD(wParam)); + term_scroll(term, 1, HIWORD(wParam)); break; } break; @@ -2339,7 +2434,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, * preferable to having to faff about buffering * things. */ - term_nopaste(); + term_nopaste(term); /* * We need not bother about stdin backlogs @@ -2349,6 +2444,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, * messages. We _have_ to buffer everything * we're sent. */ + term_seen_key_event(term); ldisc_send(buf, len, 1); show_mouseptr(0); } @@ -2360,6 +2456,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) { @@ -2374,7 +2471,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 */ @@ -2385,9 +2482,19 @@ 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. + */ + term_seen_key_event(term); + for (i = 0; i < n; i += 2) { + luni_send((unsigned short *)(buff+i), 1, 1); + } free(buff); } ImmReleaseContext(hwnd, hIMC); @@ -2400,9 +2507,11 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, buf[1] = wParam; buf[0] = wParam >> 8; + term_seen_key_event(term); lpage_send(kbd_codepage, buf, 2, 1); } else { char c = (unsigned char) wParam; + term_seen_key_event(term); lpage_send(kbd_codepage, &c, 1, 1); } return (0); @@ -2416,6 +2525,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, */ { char c = (unsigned char)wParam; + term_seen_key_event(term); lpage_send(CP_ACP, &c, 1, 1); } return 0; @@ -2424,6 +2534,57 @@ 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(term, b, + MA_CLICK, + TO_CHR_X(X_POS(lParam)), + TO_CHR_Y(Y_POS(lParam)), shift_pressed, + control_pressed, is_alt_pressed()); + term_mouse(term, 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(term, 0, + b == MBT_WHEEL_UP ? + -term->rows / 2 : term->rows / 2); + } + } + return 0; + } } return DefWindowProc(hwnd, message, wParam, lParam); @@ -2437,13 +2598,35 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, */ void sys_cursor(int x, int y) { + int cx, cy; + + if (!term->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 (!term->has_focus) return; + + 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 */ @@ -2454,8 +2637,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); @@ -2495,7 +2678,7 @@ void do_text(Context ctx, int x, int y, char *text, int len, } /* Only want the left half of double width lines */ - if (lattr != LATTR_NORM && x*2 >= cols) + if (lattr != LATTR_NORM && x*2 >= term->cols) return; x *= fnt_width; @@ -2503,7 +2686,7 @@ void do_text(Context ctx, int x, int y, char *text, int len, x += offset_width; y += offset_height; - if ((attr & TATTR_ACTCURS) && (cfg.cursor_type == 0 || big_cursor)) { + if ((attr & TATTR_ACTCURS) && (cfg.cursor_type == 0 || term->big_cursor)) { attr &= ATTR_CUR_AND | (bold_mode != BOLD_COLOURS ? ATTR_BOLD : 0); attr ^= ATTR_CUR_XOR; } @@ -2604,8 +2787,8 @@ void do_text(Context ctx, int x, int y, char *text, int 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; + if (line_box.right > font_width*term->cols+offset_width) + line_box.right = font_width*term->cols+offset_width; /* We're using a private area for direct to font. (512 chars.) */ if (dbcs_screenfont && (attr & CSET_MASK) == ATTR_ACP) { @@ -2719,7 +2902,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, HDC hdc = ctx; int ctype = cfg.cursor_type; - if ((attr & TATTR_ACTCURS) && (ctype == 0 || big_cursor)) { + if ((attr & TATTR_ACTCURS) && (ctype == 0 || term->big_cursor)) { if (((attr & CSET_MASK) | (unsigned char) *text) != UCSWIDE) { do_text(ctx, x, y, text, len, attr, lattr); return; @@ -2736,7 +2919,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, x += offset_width; y += offset_height; - if ((attr & TATTR_PASCURS) && (ctype == 0 || big_cursor)) { + if ((attr & TATTR_PASCURS) && (ctype == 0 || term->big_cursor)) { POINT pts[5]; HPEN oldpen; pts[0].x = pts[1].x = pts[4].x = x; @@ -2952,7 +3135,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, /* Nastyness with NUMLock - Shift-NUMLock is left alone though */ if ((cfg.funky_type == 3 || - (cfg.funky_type <= 1 && app_keypad_keys && !cfg.no_applic_k)) + (cfg.funky_type <= 1 && term->app_keypad_keys && + !cfg.no_applic_k)) && wParam == VK_NUMLOCK && !(keystate[VK_SHIFT] & 0x80)) { wParam = VK_EXECUTE; @@ -2967,7 +3151,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, } /* Disable Auto repeat if required */ - if (repeat_off && (HIWORD(lParam) & (KF_UP | KF_REPEAT)) == KF_REPEAT) + if (term->repeat_off && + (HIWORD(lParam) & (KF_UP | KF_REPEAT)) == KF_REPEAT) return 0; if ((HIWORD(lParam) & KF_ALTDOWN) && (keystate[VK_RMENU] & 0x80) == 0) @@ -3013,20 +3198,11 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, } else if (compose_state == 1 && wParam != VK_CONTROL) compose_state = 0; - /* - * 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 && - wParam != VK_MENU && wParam != VK_CONTROL) { - seen_key_event = 1; - } - if (compose_state > 1 && left_alt) compose_state = 0; /* Sanitize the number pad if not using a PC NumPad */ - if (left_alt || (app_keypad_keys && !cfg.no_applic_k + if (left_alt || (term->app_keypad_keys && !cfg.no_applic_k && cfg.funky_type != 2) || cfg.funky_type == 3 || cfg.nethack_keypad || compose_state) { if ((HIWORD(lParam) & KF_EXTENDED) == 0) { @@ -3090,7 +3266,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, return 0; } if (wParam == VK_INSERT && shift_state == 1) { - term_do_paste(); + term_do_paste(term); return 0; } if (left_alt && wParam == VK_F4 && cfg.alt_f4) { @@ -3108,7 +3284,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, } /* Control-Numlock for app-keypad mode switch */ if (wParam == VK_PAUSE && shift_state == 2) { - app_keypad_keys ^= 1; + term->app_keypad_keys ^= 1; return 0; } @@ -3151,7 +3327,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, if (cfg.funky_type == 3 || (cfg.funky_type <= 1 && - app_keypad_keys && !cfg.no_applic_k)) switch (wParam) { + term->app_keypad_keys && !cfg.no_applic_k)) switch (wParam) { case VK_EXECUTE: xkey = 'P'; break; @@ -3165,7 +3341,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, xkey = 'S'; break; } - if (app_keypad_keys && !cfg.no_applic_k) + if (term->app_keypad_keys && !cfg.no_applic_k) switch (wParam) { case VK_NUMPAD0: xkey = 'p'; @@ -3232,7 +3408,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, break; } if (xkey) { - if (vt52_mode) { + if (term->vt52_mode) { if (xkey >= 'P' && xkey <= 'S') p += sprintf((char *) p, "\x1B%c", xkey); else @@ -3248,6 +3424,12 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, *p++ = 0; return -2; } + if (wParam == VK_BACK && shift_state == 1) { /* Shift Backspace */ + /* We do the opposite of what is configured */ + *p++ = (cfg.bksp_is_delete ? 0x08 : 0x7F); + *p++ = 0; + return -2; + } if (wParam == VK_TAB && shift_state == 1) { /* Shift tab */ *p++ = 0x1B; *p++ = '['; @@ -3285,7 +3467,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, *p++ = 0x1C; return p - output; } - if (shift_state == 0 && wParam == VK_RETURN && cr_lf_return) { + if (shift_state == 0 && wParam == VK_RETURN && term->cr_lf_return) { *p++ = '\r'; *p++ = '\n'; return p - output; @@ -3387,7 +3569,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, if (cfg.funky_type == 3 && code <= 6) code = "\0\2\1\4\5\3\6"[code]; - if (vt52_mode && code > 0 && code <= 6) { + if (term->vt52_mode && code > 0 && code <= 6) { p += sprintf((char *) p, "\x1B%c", " HLMEIG"[code]); return p - output; } @@ -3425,13 +3607,13 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, } return p - output; } - if ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) { + if ((term->vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) { int offt = 0; if (code > 15) offt++; if (code > 21) offt++; - if (vt52_mode) + if (term->vt52_mode) p += sprintf((char *) p, "\x1B%c", code + 'P' - 11 - offt); else p += @@ -3443,7 +3625,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, return p - output; } if (cfg.funky_type == 2 && code >= 11 && code <= 14) { - if (vt52_mode) + if (term->vt52_mode) p += sprintf((char *) p, "\x1B%c", code + 'P' - 11); else p += sprintf((char *) p, "\x1BO%c", code + 'P' - 11); @@ -3482,15 +3664,28 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, break; } if (xkey) { - if (vt52_mode) + if (term->vt52_mode) 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. + int app_flg = (term->app_cursor_keys && !cfg.no_applic_c); +#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) + if (!term->app_keypad_keys) app_flg = 0; +#endif /* Useful mapping of Ctrl-arrows */ if (shift_state == 2) app_flg = !app_flg; @@ -3535,7 +3730,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, #ifdef SHOW_TOASCII_RESULT if (r == 1 && !key_down) { if (alt_sum) { - if (in_utf || dbcs_screenfont) + if (in_utf(term) || dbcs_screenfont) debug((", (U+%04x)", alt_sum)); else debug((", LCH(%d)", alt_sum)); @@ -3559,7 +3754,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, * sensible, but for the moment it's preferable to * having to faff about buffering things. */ - term_nopaste(); + term_nopaste(term); p = output; for (i = 0; i < r; i++) { @@ -3579,6 +3774,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, return 0; } keybuf = nc; + term_seen_key_event(term); luni_send(&keybuf, 1, 1); continue; } @@ -3587,8 +3783,9 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, if (!key_down) { if (alt_sum) { - if (in_utf || dbcs_screenfont) { + if (in_utf(term) || dbcs_screenfont) { keybuf = alt_sum; + term_seen_key_event(term); luni_send(&keybuf, 1, 1); } else { ch = (char) alt_sum; @@ -3601,21 +3798,25 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, * messages. We _have_ to buffer * everything we're sent. */ + term_seen_key_event(term); ldisc_send(&ch, 1, 1); } alt_sum = 0; } else + term_seen_key_event(term); lpage_send(kbd_codepage, &ch, 1, 1); } else { if(capsOn && ch < 0x80) { WCHAR cbuf[2]; cbuf[0] = 27; cbuf[1] = xlat_uskbd2cyrllic(ch); + term_seen_key_event(term); luni_send(cbuf+!left_alt, 1+!!left_alt, 1); } else { char cbuf[2]; cbuf[0] = '\033'; cbuf[1] = ch; + term_seen_key_event(term); lpage_send(kbd_codepage, cbuf+!left_alt, 1+!!left_alt, 1); } } @@ -3631,7 +3832,7 @@ 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] && (in_utf || dbcs_screenfont)) + else if (keys[0] && (in_utf(term) || dbcs_screenfont)) keys[0] = 10; } @@ -3648,6 +3849,16 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, return -1; } +void request_paste(void) +{ + /* + * In Windows, pasting is synchronous: we can read the + * clipboard with no difficulty, so request_paste() can just go + * ahead and paste. + */ + term_do_paste(term); +} + void set_title(char *title) { sfree(window_name); @@ -4010,7 +4221,7 @@ void optimised_move(int to, int from, int lines) max = to + from - min; r.left = offset_width; - r.right = offset_width + cols * font_width; + r.right = offset_width + term->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); @@ -4029,7 +4240,23 @@ 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); +} + +/* + * Print a modal (Really Bad) message box and perform a fatal exit. + */ +void modalfatalbox(char *fmt, ...) +{ + va_list ap; + char stuff[200]; + + va_start(ap, fmt); + vsprintf(stuff, fmt, ap); + va_end(ap); + MessageBox(hwnd, stuff, "PuTTY Fatal Error", + MB_SYSTEMMODAL | MB_ICONERROR | MB_OK); + cleanup_exit(1); } /* @@ -4103,7 +4330,7 @@ void beep(int mode) } } /* Otherwise, either visual bell or disabled; do nothing here */ - if (!has_focus) { + if (!term->has_focus) { flash_window(2); /* start */ } } @@ -4128,6 +4355,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); } @@ -4216,6 +4448,32 @@ int is_full_screen() return TRUE; } +/* Get the rect/size of a full screen window using the nearest available + * monitor in multimon systems; default to something sensible if only + * one monitor is present. */ +static int get_fullscreen_rect(RECT * ss) +{ +#ifdef MONITOR_DEFAULTTONEAREST + HMONITOR mon; + MONITORINFO mi; + mon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + mi.cbSize = sizeof(mi); + GetMonitorInfo(mon, &mi); + + /* structure copy */ + *ss = mi.rcMonitor; + return TRUE; +#else +/* could also use code like this: + ss->left = ss->top = 0; + ss->right = GetSystemMetrics(SM_CXSCREEN); + ss->bottom = GetSystemMetrics(SM_CYSCREEN); +*/ + return GetClientRect(GetDesktopWindow(), ss); +#endif +} + + /* * Go full-screen. This should only be called when we are already * maximised. @@ -4223,10 +4481,13 @@ int is_full_screen() void make_full_screen() { DWORD style; - int x, y, w, h; + RECT ss; assert(IsZoomed(hwnd)); + if (is_full_screen()) + return; + /* Remove the window furniture. */ style = GetWindowLong(hwnd, GWL_STYLE); style &= ~(WS_CAPTION | WS_BORDER | WS_THICKFRAME); @@ -4237,24 +4498,11 @@ void make_full_screen() 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); + get_fullscreen_rect(&ss); + SetWindowPos(hwnd, HWND_TOP, ss.left, ss.top, + ss.right - ss.left, + ss.bottom - ss.top, + SWP_FRAMECHANGED); /* Tick the menu item in the System menu. */ CheckMenuItem(GetSystemMenu(hwnd, FALSE), IDM_FULLSCREEN, @@ -4270,7 +4518,11 @@ void clear_full_screen() /* Reinstate the window furniture. */ style = oldstyle = GetWindowLong(hwnd, GWL_STYLE); - style |= WS_CAPTION | WS_BORDER | WS_THICKFRAME; + 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