X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/8df7a775f6f8b0f81f84eafe28cd0bb8d4c6d1f4..239e40c09f74018d1cb25bcadb189a8656a40b24:/window.c?ds=sidebyside

diff --git a/window.c b/window.c
index 1e38a487..f2e4e7f1 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,5 @@
 #include <windows.h>
+#include <imm.h>
 #include <commctrl.h>
 #ifndef AUTO_WINSOCK
 #ifdef WINSOCK_TWO
@@ -500,14 +501,14 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
 	}
 	AppendMenu (m, MF_ENABLED, IDM_SHOWLOG, "&Event Log");
 	AppendMenu (m, MF_SEPARATOR, 0, 0);
-	AppendMenu (m, MF_ENABLED, IDM_NEWSESS, "Ne&w Session");
+	AppendMenu (m, MF_ENABLED, IDM_NEWSESS, "Ne&w Session...");
 	AppendMenu (m, MF_ENABLED, IDM_DUPSESS, "&Duplicate Session");
 	s = CreateMenu();
 	get_sesslist(TRUE);
 	for (i = 1 ; i < ((nsessions < 256) ? nsessions : 256) ; i++)
 	  AppendMenu (s, MF_ENABLED, IDM_SAVED_MIN + (16 * i) , sessions[i]);
 	AppendMenu (m, MF_POPUP | MF_ENABLED, (UINT) s, "Sa&ved Sessions");
-	AppendMenu (m, MF_ENABLED, IDM_RECONF, "Chan&ge Settings");
+	AppendMenu (m, MF_ENABLED, IDM_RECONF, "Chan&ge Settings...");
 	AppendMenu (m, MF_SEPARATOR, 0, 0);
 	AppendMenu (m, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback");
 	AppendMenu (m, MF_ENABLED, IDM_RESET, "Rese&t Terminal");
@@ -1051,6 +1052,7 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
 	    enact_pending_netevent();
 	if (inbuf_head)
 	    term_out();
+        noise_regular();
         HideCaret(hwnd);
 	term_update();
         ShowCaret(hwnd);
@@ -1288,10 +1290,9 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
       case WM_MOUSEMOVE:
 	/*
 	 * Add the mouse position and message time to the random
-	 * number noise, if we're using ssh.
+	 * number noise.
 	 */
-	if (cfg.protocol == PROT_SSH)
-	    noise_ultralight(lParam);
+        noise_ultralight(lParam);
 
 	if (wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) {
 	    Mouse_Button b;
@@ -1486,10 +1487,9 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
       case WM_SYSKEYUP:
 	/*
 	 * Add the scan code and keypress timing to the random
-	 * number noise, if we're using ssh.
+	 * number noise.
 	 */
-	if (cfg.protocol == PROT_SSH)
-	    noise_ultralight(lParam);
+        noise_ultralight(lParam);
 
 	/*
 	 * We don't do TranslateMessage since it disassociates the