Small keyboard patches from Robert de Bath. Should fix the dead-key

problem and also some unspecified woe with the ever-problematic
Compose key.

[originally from svn r1046]

diff --git a/window.c b/window.c
index 84550eb674286fc6bde5aa8f94653f22f48912dd..07dc6943f025012f145852f3e1ccfff48bbec84c 100644 (file)
--- a/window.c
+++ b/window.c
@@ -2063,7 +2063,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 
     /* Note if AltGr was pressed and if it was used as a compose key */
     if (!compose_state) {
-       compose_key = -1;
+       compose_key = 0x100;
        if (cfg.compose_key) {
            if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED))
                compose_key = wParam;
@@ -2427,6 +2427,8 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 
            return p-output;
        }
+       /* If we're definitly not building up an ALT-54321 then clear it */
+       if (!left_alt) keys[0] = 0;
     }
 
     /* ALT alone may or may not want to bring up the System menu */