From: Simon Tatham <anakin@pobox.com>
Date: Sun, 7 Jan 2001 14:30:00 +0000 (+0000)
Subject: AltGr should now work again even when Compose key disabled
X-Git-Tag: r8855-g4f798d~2847
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e422b818498114a0d6a4371fdd84bede79d82650;p=PuTTY_svn.git

AltGr should now work again even when Compose key disabled


git-svn-id: http://svn.tartarus.org/sgt/putty@838 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/window.c b/window.c
index 1568617b..2797c53e 100644
--- a/window.c
+++ b/window.c
@@ -1911,11 +1911,14 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
        }
 #endif
 
+	if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED)) {
+	    keystate[VK_RMENU] = keystate[VK_MENU];
+	}
+
 	/* Note if AltGr was pressed and if it was used as a compose key */
 	if (cfg.compose_key) {
 	    if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED))
 	    {
-		keystate[VK_RMENU] = keystate[VK_MENU];
 		if (!compose_state) compose_key = wParam;
 	    }
 	    if (wParam == VK_APPS && !compose_state)
@@ -1932,8 +1935,9 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    }
 	    else if (compose_state==1 && wParam != VK_CONTROL)
 		compose_state = 0;
-	} else
+	} else {
 	    compose_state = 0;
+	}
 
 	/* Nastyness with NUMLock - Shift-NUMLock is left alone though */
 	if ( (cfg.funky_type == 3 ||