Added Israeli Hebrew keyboard, and fixed a problem in the matching of

characters against dead keys.
This commit is contained in:
Shachar Shemesh 2002-05-31 18:21:33 +00:00 committed by Alexandre Julliard
parent be367c7270
commit 4b050944fe
1 changed files with 11 additions and 1 deletions

View File

@ -531,6 +531,15 @@ static const char main_key_TK[MAIN_LEN][4] =
"zZ","xX","cC","vV","bB","nN","mM","öÖ","çÇ",".:" "zZ","xX","cC","vV","bB","nN","mM","öÖ","çÇ",".:"
}; };
/*** Israeli keyboard layout */
static const char main_key_IL[MAIN_LEN][4] =
{
"`~;","1!1","2@2","3#3","4$4","5%5","6^6","7&7","8*8","9(9","0)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ö",",<ú",".>õ","/?."
};
/*** VNC keyboard layout */ /*** VNC keyboard layout */
static const WORD main_key_scan_vnc[MAIN_LEN] = static const WORD main_key_scan_vnc[MAIN_LEN] =
{ {
@ -600,6 +609,7 @@ static const struct {
{"Latin American keyboard layout", 28591, &main_key_LA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {"Latin American keyboard layout", 28591, &main_key_LA, &main_key_scan_qwerty, &main_key_vkey_qwerty},
{"Lithuanian (Baltic) keyboard layout", 28603, &main_key_LT_B, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {"Lithuanian (Baltic) keyboard layout", 28603, &main_key_LT_B, &main_key_scan_qwerty, &main_key_vkey_qwerty},
{"Turkish keyboard layout", 28599, &main_key_TK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {"Turkish keyboard layout", 28599, &main_key_TK, &main_key_scan_qwerty, &main_key_vkey_qwerty},
{"Israeli keyboard layout", 28598, &main_key_IL, &main_key_scan_qwerty, &main_key_vkey_qwerty},
{"VNC keyboard layout", 28591, &main_key_vnc, &main_key_scan_vnc, &main_key_vkey_vnc}, {"VNC keyboard layout", 28591, &main_key_vnc, &main_key_scan_vnc, &main_key_vkey_vnc},
{NULL, 0, NULL, NULL, NULL} /* sentinel */ {NULL, 0, NULL, NULL, NULL} /* sentinel */
@ -989,7 +999,7 @@ X11DRV_KEYBOARD_DetectLayout (void)
for (i = 0; i < syms; i++) { for (i = 0; i < syms; i++) {
keysym = TSXKeycodeToKeysym (display, keyc, i); keysym = TSXKeycodeToKeysym (display, keyc, i);
/* Allow both one-byte and two-byte national keysyms */ /* Allow both one-byte and two-byte national keysyms */
if ((keysym < 0x800) && (keysym != ' ')) if ((keysym < 0x8000) && (keysym != ' '))
ckey[i] = keysym & 0xFF; ckey[i] = keysym & 0xFF;
else { else {
ckey[i] = KEYBOARD_MapDeadKeysym(keysym); ckey[i] = KEYBOARD_MapDeadKeysym(keysym);