Changeset 10322 in vbox

Timestamp:

Jul 7, 2008 1:48:02 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt: Linux host keyboard fixes

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/src/linux/keyboard-layouts.h (modified) (3 diffs)
• VirtualBox/src/linux/keyboard-list.h (modified) (3 diffs)
• VirtualBox/src/linux/keyboard-new.c (modified) (1 diff)
• VirtualBox4/src/linux/keyboard-layouts.h (modified) (3 diffs)
• VirtualBox4/src/linux/keyboard-list.h (modified) (3 diffs)
• VirtualBox4/src/linux/keyboard-new.c (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/linux/keyboard-layouts.h

@@ -61 +61 @@
 };
 
-/* U.S. English, no 102nd key */
-static const char main_key_us_101[MAIN_LEN][2] =
-{
-"`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+",
-"qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}",
-"aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"","\\|",
-"zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?","\x0\x0","\x0\x0","\x0\x0"
-};
-
 /* U.S. English, International (with dead keys) */
 static const char main_key_us_intl[MAIN_LEN][2] =
@@ -1006 +997 @@
 };
 
+/* Germany, paragraph */
+static const char main_key_de_para[MAIN_LEN][2] =
+{
+"R\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","\xdf?","QP",
+"qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*",
+"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'",
+"yY","xX","cC","vV","bB","nN","mM",",;",".:","-_","<>","\x0\x0","\x0\x0"
+};
+
+/* Germany, Dead acute, paragraph */
+static const char main_key_de_deadacute_para[MAIN_LEN][2] =
+{
+"^\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","\xdf?","Q`",
+"qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*",
+"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'",
+"yY","xX","cC","vV","bB","nN","mM",",;",".:","-_","<>","\x0\x0","\x0\x0"
+};
+
+/* Germany, Dead grave acute, paragraph */
+static const char main_key_de_deadgraveacute_para[MAIN_LEN][2] =
+{
+"^\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","\xdf?","QP",
+"qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*",
+"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'",
+"yY","xX","cC","vV","bB","nN","mM",",;",".:","-_","<>","\x0\x0","\x0\x0"
+};
+
+/* Germany, Eliminate dead keys, paragraph */
+static const char main_key_de_nodeadkeys_para[MAIN_LEN][2] =
+{
+"^\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","\xdf?","\xb4`",
+"qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*",
+"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'",
+"yY","xX","cC","vV","bB","nN","mM",",;",".:","-_","<>","\x0\x0","\x0\x0"
+};
+
+/* Germany, Eliminate dead keys, acute replaced by apostrophe, paragraph */
+static const char main_key_de_nodeadkeys_noacute_para[MAIN_LEN][2] =
+{
+"^\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","\xdf?","\x27`",
+"qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*",
+"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'",
+"yY","xX","cC","vV","bB","nN","mM",",;",".:","-_","<>","\x0\x0","\x0\x0"
+};
+
+/* Germany, Dvorak, paragraph */
+static const char main_key_de_dvorak_para[MAIN_LEN][2] =
+{
+"^\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","+*","<>",
+"\xfc\xdc",",;",".:","pP","yY","fF","gG","cC","tT","zZ","?\xdf","/\\",
+"aA","oO","eE","iI","uU","hH","dD","rR","nN","sS","lL","-_",
+"\xf6\xd6","qQ","jJ","kK","xX","bB","mM","wW","vV","#'","\xe4\xc4","\x0\x0","\x0\x0"
+};
+
 /* Greece */
 static const char main_key_gr[MAIN_LEN][2] =
@@ -1153 +1198 @@
 static const char main_key_jp[MAIN_LEN][2] =
 {
-"*!","1!","2\"","3#","4$","5%","6&","7'","8(","9)","0~","-=","^~",
+"\x0\x0","1!","2\"","3#","4$","5%","6&","7'","8(","9)","0~","-=","^~",
 "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","@`","[{",
 "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";+",":*","]}",
 "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?","<>","\\_","\\|"
-};
-
-/* Japan no 102nd key */
-static const char main_key_jp_no_102[MAIN_LEN][2] =
-{
-"*!","1!","2\"","3#","4$","5%","6&","7'","8(","9)","0~","-=","^~",
-"qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","@`","[{",
-"aA","sS","dD","fF","gG","hH","jJ","kK","lL",";+",":*","]}",
-"zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?","\x0\x0","\\_","\\|"
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/linux/keyboard-list.h

@@ -36 +36 @@
 
  {"U.S. English", &main_key_us},
- {"U.S. English, no 102nd key", &main_key_us_101},
  {"U.S. English, International (with dead keys)", &main_key_us_intl},
  {"U.S. English, Dvorak", &main_key_us_dvorak},
@@ -141 +140 @@
  {"Germany, Dvorak", &main_key_de_dvorak},
  {"Germany, Neostyle", &main_key_de_neo},
+ {"Germany, paragraph", &main_key_de_para},
+ {"Germany, Dead acute, paragraph", &main_key_de_deadacute_para},
+ {"Germany, Dead grave acute, paragraph", &main_key_de_deadgraveacute_para},
+ {"Germany, Eliminate dead keys, paragraph", &main_key_de_nodeadkeys_para},
+ {"Germany, Eliminate dead keys, acute replaced by apostrophe, paragraph", &main_key_de_nodeadkeys_noacute_para},
+ {"Germany, Dvorak, paragraph", &main_key_de_dvorak_para},
  {"Greece", &main_key_gr},
  {"Greece, Eliminate dead keys", &main_key_gr_nodeadkeys},
@@ -158 +163 @@
  {"Italy, Macintosh", &main_key_it_mac},
  {"Japan", &main_key_jp},
- {"Japan, no 102nd key", &main_key_jp_no_102},
  {"Kyrgyzstan", &main_key_kg},
  {"Cambodia", &main_key_kh},

trunk/src/VBox/Frontends/VirtualBox/src/linux/keyboard-new.c

@@ -364 +364 @@
     }
     LOG_KB_1(("Finished mapping keyboard, matches=%d, entries=%d\n", matches, entries));
+#if 0 /* This can happen in a few situations, like a 101-key keyboard matched
+       * with a 102-key map.  Usually harmless, and if it isn't we will have
+       * to investigate in more detail than a layout dump will bring anyway. */
     if (matches != entries)
     {
         return 0;
     }
+#endif
     return 1;
 }

trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-layouts.h

@@ -61 +61 @@
 };
 
-/* U.S. English, no 102nd key */
-static const char main_key_us_101[MAIN_LEN][2] =
-{
-"`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+",
-"qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}",
-"aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"","\\|",
-"zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?","\x0\x0","\x0\x0","\x0\x0"
-};
-
 /* U.S. English, International (with dead keys) */
 static const char main_key_us_intl[MAIN_LEN][2] =
@@ -1006 +997 @@
 };
 
+/* Germany, paragraph */
+static const char main_key_de_para[MAIN_LEN][2] =
+{
+"R\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","\xdf?","QP",
+"qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*",
+"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'",
+"yY","xX","cC","vV","bB","nN","mM",",;",".:","-_","<>","\x0\x0","\x0\x0"
+};
+
+/* Germany, Dead acute, paragraph */
+static const char main_key_de_deadacute_para[MAIN_LEN][2] =
+{
+"^\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","\xdf?","Q`",
+"qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*",
+"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'",
+"yY","xX","cC","vV","bB","nN","mM",",;",".:","-_","<>","\x0\x0","\x0\x0"
+};
+
+/* Germany, Dead grave acute, paragraph */
+static const char main_key_de_deadgraveacute_para[MAIN_LEN][2] =
+{
+"^\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","\xdf?","QP",
+"qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*",
+"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'",
+"yY","xX","cC","vV","bB","nN","mM",",;",".:","-_","<>","\x0\x0","\x0\x0"
+};
+
+/* Germany, Eliminate dead keys, paragraph */
+static const char main_key_de_nodeadkeys_para[MAIN_LEN][2] =
+{
+"^\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","\xdf?","\xb4`",
+"qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*",
+"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'",
+"yY","xX","cC","vV","bB","nN","mM",",;",".:","-_","<>","\x0\x0","\x0\x0"
+};
+
+/* Germany, Eliminate dead keys, acute replaced by apostrophe, paragraph */
+static const char main_key_de_nodeadkeys_noacute_para[MAIN_LEN][2] =
+{
+"^\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","\xdf?","\x27`",
+"qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*",
+"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'",
+"yY","xX","cC","vV","bB","nN","mM",",;",".:","-_","<>","\x0\x0","\x0\x0"
+};
+
+/* Germany, Dvorak, paragraph */
+static const char main_key_de_dvorak_para[MAIN_LEN][2] =
+{
+"^\xb0","1!","2\"","3\xb6","4$","5%","6&","7/","8(","9)","0=","+*","<>",
+"\xfc\xdc",",;",".:","pP","yY","fF","gG","cC","tT","zZ","?\xdf","/\\",
+"aA","oO","eE","iI","uU","hH","dD","rR","nN","sS","lL","-_",
+"\xf6\xd6","qQ","jJ","kK","xX","bB","mM","wW","vV","#'","\xe4\xc4","\x0\x0","\x0\x0"
+};
+
 /* Greece */
 static const char main_key_gr[MAIN_LEN][2] =
@@ -1153 +1198 @@
 static const char main_key_jp[MAIN_LEN][2] =
 {
-"*!","1!","2\"","3#","4$","5%","6&","7'","8(","9)","0~","-=","^~",
+"\x0\x0","1!","2\"","3#","4$","5%","6&","7'","8(","9)","0~","-=","^~",
 "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","@`","[{",
 "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";+",":*","]}",
 "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?","<>","\\_","\\|"
-};
-
-/* Japan no 102nd key */
-static const char main_key_jp_no_102[MAIN_LEN][2] =
-{
-"*!","1!","2\"","3#","4$","5%","6&","7'","8(","9)","0~","-=","^~",
-"qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","@`","[{",
-"aA","sS","dD","fF","gG","hH","jJ","kK","lL",";+",":*","]}",
-"zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?","\x0\x0","\\_","\\|"
 };
 

trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-list.h

@@ -36 +36 @@
 
  {"U.S. English", &main_key_us},
- {"U.S. English, no 102nd key", &main_key_us_101},
  {"U.S. English, International (with dead keys)", &main_key_us_intl},
  {"U.S. English, Dvorak", &main_key_us_dvorak},
@@ -141 +140 @@
  {"Germany, Dvorak", &main_key_de_dvorak},
  {"Germany, Neostyle", &main_key_de_neo},
+ {"Germany, paragraph", &main_key_de_para},
+ {"Germany, Dead acute, paragraph", &main_key_de_deadacute_para},
+ {"Germany, Dead grave acute, paragraph", &main_key_de_deadgraveacute_para},
+ {"Germany, Eliminate dead keys, paragraph", &main_key_de_nodeadkeys_para},
+ {"Germany, Eliminate dead keys, acute replaced by apostrophe, paragraph", &main_key_de_nodeadkeys_noacute_para},
+ {"Germany, Dvorak, paragraph", &main_key_de_dvorak_para},
  {"Greece", &main_key_gr},
  {"Greece, Eliminate dead keys", &main_key_gr_nodeadkeys},
@@ -158 +163 @@
  {"Italy, Macintosh", &main_key_it_mac},
  {"Japan", &main_key_jp},
- {"Japan, no 102nd key", &main_key_jp_no_102},
  {"Kyrgyzstan", &main_key_kg},
  {"Cambodia", &main_key_kh},

trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-new.c

@@ -364 +364 @@
     }
     LOG_KB_1(("Finished mapping keyboard, matches=%d, entries=%d\n", matches, entries));
+#if 0 /* This can happen in a few situations, like a 101-key keyboard matched
+       * with a 102-key map.  Usually harmless, and if it isn't we will have
+       * to investigate in more detail than a layout dump will bring anyway. */
     if (matches != entries)
     {
         return 0;
     }
+#endif
     return 1;
 }