X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/a401e5f372e4fced309043225df9fb4d6583275c..ebb0a59087941283764805d47cebfb56ae13e428:/window.c?ds=sidebyside diff --git a/window.c b/window.c index c0e7f3e5..1ff3f288 100644 --- a/window.c +++ b/window.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #ifndef AUTO_WINSOCK #ifdef WINSOCK_TWO @@ -10,15 +11,11 @@ #endif #endif -#if WINVER < 0x0500 -#define COMPILE_MULTIMON_STUBS -#include -#endif - #include #include #include #include +#include #define PUTTY_DO_GLOBALS /* actually _define_ globals */ #include "putty.h" @@ -79,18 +76,13 @@ static void deinit_fonts(void); /* 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; @@ -1201,7 +1193,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. */ @@ -1335,13 +1327,13 @@ static void reset_window(int reinit) { } } -static void click(Mouse_Button b, int x, int y, int shift, int ctrl) +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 +1346,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,6 +1377,19 @@ 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 LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -1410,6 +1415,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, last_movement = now; } } + net_pending_errors(); return 0; case WM_CREATE: break; @@ -1614,6 +1620,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, InvalidateRect(hwnd, NULL, TRUE); reset_window(init_lvl); + net_pending_errors(); } break; case IDM_COPYALL: @@ -1627,42 +1634,55 @@ 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); @@ -1715,14 +1735,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 +1760,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, case WM_RBUTTONUP: { int button, press; + switch (message) { case WM_LBUTTONDOWN: button = MBT_LEFT; @@ -1771,13 +1793,14 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, 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 +1823,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: @@ -2051,11 +2074,6 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, if (cfg.resize_action != RESIZE_FONT) 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); } /* This is an unexpected resize, these will normally happen * if the window is too large. Probably either the user @@ -2188,6 +2206,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, } } } + net_pending_errors(); return 0; case WM_INPUTLANGCHANGE: { @@ -3625,10 +3644,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 +3654,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 +3671,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 +3795,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 +3968,53 @@ void beep(int mode) */ static void flip_full_screen(void) { - want_full_screen = !want_full_screen; + WINDOWPLACEMENT wp; + LONG style; - if (full_screen == want_full_screen) - return; - - 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; + 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 + */ + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, + SWP_NOACTIVATE | SWP_NOCOPYBITS | + SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | + 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; + 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. + */ + wp.showCmd = SW_SHOWNORMAL; + SetWindowPlacement(hwnd, &wp); } + CheckMenuItem(GetSystemMenu(hwnd, FALSE), IDM_FULLSCREEN, MF_BYCOMMAND| full_screen ? MF_CHECKED : MF_UNCHECKED); } -