X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=window.c;h=a17d0b27ba79642863275914ff63c76fcb8c55df;hb=5176e1e9bbdc6620a115da0f92ca2282a6714721;hp=c7c652bb316fa8ae563934a83c9c0d0a6795e0e2;hpb=8446532e4ad4e8e68eb82bf86a36ba1f5a38d78f;p=PuTTY.git

diff --git a/window.c b/window.c
index c7c652bb..a17d0b27 100644
--- a/window.c
+++ b/window.c
@@ -129,6 +129,11 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
 		tolower(p[2]) == 'h') {
 		default_protocol = cfg.protocol = PROT_SSH;
 		default_port = cfg.port = 22;
+	    } else if (q == p + 3 &&
+		tolower(p[0]) == 'l' &&
+		tolower(p[1]) == 'o' &&
+		tolower(p[2]) == 'g') {
+                logfile = "putty.log";
 	    }
 	    p = q + strspn(q, " \t");
 	}
@@ -310,6 +315,11 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
     inbuf_reap = inbuf_head = 0;
     outbuf_reap = outbuf_head = 0;
 
+    /* 
+     * Choose unscroll method
+     */
+    unscroll_event = US_DISP;
+
     /*
      * Prepare the mouse handler.
      */
@@ -347,21 +357,21 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
 	    AppendMenu (m, MF_POPUP | MF_ENABLED, (UINT) p, "Telnet Command");
 	    AppendMenu (m, MF_SEPARATOR, 0, 0);
 	}
-	AppendMenu (m, MF_ENABLED, IDM_SHOWLOG, "Event Log");
+	AppendMenu (m, MF_ENABLED, IDM_SHOWLOG, "&Event Log");
 	AppendMenu (m, MF_SEPARATOR, 0, 0);
-	AppendMenu (m, MF_ENABLED, IDM_NEWSESS, "New Session");
-	AppendMenu (m, MF_ENABLED, IDM_DUPSESS, "Duplicate 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, "Saved Sessions");
-	AppendMenu (m, MF_ENABLED, IDM_RECONF, "Change Settings");
+	AppendMenu (m, MF_POPUP | MF_ENABLED, (UINT) s, "Sa&ved Sessions");
+	AppendMenu (m, MF_ENABLED, IDM_RECONF, "Chan&ge Settings");
 	AppendMenu (m, MF_SEPARATOR, 0, 0);
-	AppendMenu (m, MF_ENABLED, IDM_CLRSB, "Clear Scrollback");
-	AppendMenu (m, MF_ENABLED, IDM_RESET, "Reset Terminal");
+	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_ABOUT, "About PuTTY");
+	AppendMenu (m, MF_ENABLED, IDM_ABOUT, "&About PuTTY");
     }
 
     /*
@@ -1224,6 +1234,14 @@ static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output) {
      */
     ret = GetKeyboardState(keystate);
 
+    /* 
+     * 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 ) {
+        seen_key_event = 1; 
+    }
+
     /* 
      * Windows does not always want to distinguish left and right
      * Alt or Control keys. Thus we keep track of them ourselves.