From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 10 May 2010 19:23:40 +0000 (+0200)
Subject: cleaner AltGr handling
X-Git-Tag: 1.99~488^2~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=176194068fd30237e1262271cb8d9cbfcd380fb0;p=thirdparty%2Fgrub.git

cleaner AltGr handling
---

diff --git a/commands/keylayouts.c b/commands/keylayouts.c
index 9b1d92c73..370d55c4f 100644
--- a/commands/keylayouts.c
+++ b/commands/keylayouts.c
@@ -111,8 +111,13 @@ get_abstract_code (grub_term_input_t term, int in)
 }
 
 static int
-map (grub_term_input_t term __attribute__ ((unused)), int in)
+map (grub_term_input_t term, int in)
 {
+  /* No match with AltGr. Interpret it as Alt rather than as L3 modifier then.  
+   */
+  if (in & GRUB_TERM_ALT_GR)
+    return map (term, in & ~GRUB_TERM_ALT_GR) | GRUB_TERM_ALT_GR;
+
   if (in == GRUB_TERM_KEY_102)
     return '\\';
   if (in == GRUB_TERM_KEY_SHIFT_102)
@@ -124,7 +129,7 @@ map (grub_term_input_t term __attribute__ ((unused)), int in)
 static int
 translate (grub_term_input_t term, int in)
 {
-  int code, code2;
+  int code, flags;
   code = get_abstract_code (term, in);
   if ((code & GRUB_TERM_CAPS) && (code & 0xff) >= 'a' && (code & 0xff) <= 'z')
     code = (code & 0xff) + 'A' - 'a';
@@ -132,13 +137,21 @@ translate (grub_term_input_t term, int in)
 	   && (code & 0xff) <= 'Z')
     code = (code & 0xff) + 'a' - 'A';    
 
-  code2 = map (term, code & 0x1ffffff);
-  if ((code & GRUB_TERM_CAPS) && (code2 & 0xff) >= 'a' && (code2 & 0xff) <= 'z')
-    code2 = code2 + 'A' - 'a';
-  else if ((code & GRUB_TERM_CAPS) && (code2 & 0xff) >= 'A'
-	   && (code2 & 0xff) <= 'Z')
-    code2 = code2 + 'a' - 'A';
-  return code2 | (code & ~0x1ffffff);
+  flags = code & ~(GRUB_TERM_KEY_MASK | GRUB_TERM_ALT_GR);
+  code &= (GRUB_TERM_KEY_MASK | GRUB_TERM_ALT_GR);
+  code = map (term, code);
+  /* Transform unconsumed AltGr into Alt.  */
+  if (code & GRUB_TERM_ALT_GR)
+    {
+      flags |= GRUB_TERM_ALT;
+      code &= ~GRUB_TERM_ALT_GR;
+    }
+  if ((flags & GRUB_TERM_CAPS) && code >= 'a' && code <= 'z')
+    code += 'A' - 'a';
+  else if ((flags & GRUB_TERM_CAPS) && code >= 'A'
+	   && code <= 'Z')
+    code += 'a' - 'A';
+  return code | flags;
 }
 
 static int
diff --git a/include/grub/term.h b/include/grub/term.h
index 064093bc5..626349ac5 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -28,6 +28,7 @@
 
 /* Keys without associated character.  */
 #define GRUB_TERM_EXTENDED      0x1000000
+#define GRUB_TERM_KEY_MASK      0x1ffffff
 #define GRUB_TERM_KEY_LEFT      (GRUB_TERM_EXTENDED | 1)
 #define GRUB_TERM_KEY_RIGHT     (GRUB_TERM_EXTENDED | 2)
 #define GRUB_TERM_KEY_UP        (GRUB_TERM_EXTENDED | 3)