fix estonian keyboard detection

Lauri Tulmin lauri_ at ut.ee
Sat Sep 25 12:11:31 CDT 2004


XLookupKeysym seems to return NoSymbol for alt-gr chars, so remove
those from estonian keymap. Without this patch i get swedish keyboard
layout.

changelog:
- fix estonian keyboard detection
-------------- next part --------------
--- dlls/x11drv/keyboard.c	2004-09-12 01:30:48.000000000 +0300
+++ dlls/x11drv/keyboard.c	2004-09-19 14:23:09.472528008 +0300
@@ -339,11 +339,11 @@
 /*** Estonian keyboard layout (contributed by Raul Metsma zombi82 at hot.ee) */
 static const char main_key_ET[MAIN_LEN][4] =
 {
- "~","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","???","???","'*",
+ "~","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",",;",".:","-_",
- "<>|"
+ "<>"
 };
 
 /*** Canadian French keyboard layout */
@@ -780,7 +780,7 @@
  {0x0807, "Swiss German keyboard layout", &main_key_SG, &main_key_scan_qwerty, &main_key_vkey_qwertz},
  {0x100c, "Swiss French keyboard layout", &main_key_SF, &main_key_scan_qwerty, &main_key_vkey_qwertz},
  {0x041d, "Swedish keyboard layout", &main_key_SE, &main_key_scan_qwerty, &main_key_vkey_qwerty_v2},
- {0x0425, "Estonian keyboard layout", &main_key_ET, &main_key_scan_qwerty, &main_key_vkey_qwerty},
+ {0x0425, "Estonian keyboard layout", &main_key_ET, &main_key_scan_qwerty, &main_key_vkey_qwerty_v2},
  {0x0414, "Norwegian keyboard layout", &main_key_NO, &main_key_scan_qwerty, &main_key_vkey_qwerty},
  {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty},
  {0x040c, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty, &main_key_vkey_azerty},


More information about the wine-patches mailing list