Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 01:40:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix "Turkish Q" keyboard layout (thanks to user mergulcu from the forum).

Browse source 
- Change AltGr behavior for several keyboard layouts (bug #3887).
- Change file description for some keyboard layouts.
- Other minor changes.

svn path=/trunk/; revision=38710
This commit is contained in:
Dmitry Gorbachev 2009-01-11 19:09:25 +00:00
parent c89abc23b7
commit 4d1f9ce1d4
73 changed files with 124 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/keyboard/kbda2/kbda2.c
View file

@ -395,7 +395,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
2, 2,

2
reactos/dll/keyboard/kbda3/kbda3.c
View file

@ -395,7 +395,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
2, 2,

4
reactos/dll/keyboard/kbdal/kbdal.c
View file

@ -392,9 +392,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Albanian doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdarme/kbdarme.c
View file

@ -367,7 +367,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Armenian doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdarmw/kbdarmw.c
View file

@ -355,7 +355,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Armenian doesn't have any */
0, 0,
0, 0,
NULL NULL

5
reactos/dll/keyboard/kbdbga/kbdbga.c
View file

@ -1,4 +1,5 @@
/* /*
* Arda - Bulgarian keyboard layout
* Àðäà -Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà '÷øåðòú' çà ÐåàêòÎÑ * Àðäà -Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà '÷øåðòú' çà ÐåàêòÎÑ
* Copyright (C) 2007 ReactOS * Copyright (C) 2007 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
@ -165,7 +166,7 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
3, 3,
{ 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ { 0, 1, 2, 3 }
}; };
#define NOCAPS 0 #define NOCAPS 0
@ -396,7 +397,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- */ /* Ligatures -- Bulgarian doesn't have any */
0, 0,
0, 0,
NULL NULL

5
reactos/dll/keyboard/kbdbgm/kbdbgm.c
View file

@ -1,4 +1,5 @@
/* /*
* Maritsa - Bulgarian keyboard layout
* Ìàðèöà - Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà ïî ÁÄÑ 5237-78 çà ÐåàêòÎÑ * Ìàðèöà - Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà ïî ÁÄÑ 5237-78 çà ÐåàêòÎÑ
* Copyright (C) 2007 ReactOS * Copyright (C) 2007 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
@ -165,7 +166,7 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
3, 3,
{ 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ { 0, 1, 2, 3 }
}; };
#define NOCAPS 0 #define NOCAPS 0
@ -397,7 +398,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Bulgarian doesn't have any */
0, 0,
0, 0,
NULL NULL

7
reactos/dll/keyboard/kbdbgt/kbdbgt.c
View file

@ -1,4 +1,5 @@
/* /*
* Tundzha - Bulgarian keyboard layout
* Òóíäæà - Áúëãàðñêà êëàâèàòóðíà ïîçâóêîâà ïîäðåäáà 'ÿâåðòú' çà ÐåàêòÎÑ * Òóíäæà - Áúëãàðñêà êëàâèàòóðíà ïîçâóêîâà ïîäðåäáà 'ÿâåðòú' çà ÐåàêòÎÑ
* Copyright (C) 2007 ReactOS * Copyright (C) 2007 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
@ -405,7 +406,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
/* Key names */ /* Key names */
(VSC_LPWSTR *)key_names, (VSC_LPWSTR *)key_names,
(VSC_LPWSTR *)extended_key_names, (VSC_LPWSTR *)extended_key_names,
// dead_key_names, /* Dead key names */ // dead_key_names, /* Dead key names */
NULL, /* Dead key names */ NULL, /* Dead key names */
/* scan code to virtual key maps */ /* scan code to virtual key maps */
@ -414,9 +415,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- */ /* Ligatures -- Bulgarian doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdbr/kbdbr.c
View file

@ -453,7 +453,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

2
reactos/dll/keyboard/kbdbur/kbdbur.c
View file

@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

2
reactos/dll/keyboard/kbdcan/kbdcan.c
View file

@ -586,7 +586,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
0, 0,
0, 0,

4
reactos/dll/keyboard/kbdcr/kbdcr.c
View file

@ -500,9 +500,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Croatian doesn't have any */
0, 0,
0, 0,
NULL NULL

7
reactos/dll/keyboard/kbdcz1/kbdcz1.c
View file

@ -32,6 +32,8 @@
#define KNUMS 0xc00 /* Special + number pad */ #define KNUMS 0xc00 /* Special + number pad */
#define KMEXT 0x300 /* Multi + ext */ #define KMEXT 0x300 /* Multi + ext */
#define SHFT_INVALID 0x0F
ROSDATA USHORT scancode_to_vk[] = { ROSDATA USHORT scancode_to_vk[] = {
/* Numbers Row */ /* Numbers Row */
/* - 00 - */ /* - 00 - */
@ -124,7 +126,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
7, 7,
{ 0, 1, 2, 0,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ { 0, 1, 2, 0, 0, 0, 3, 0 }
/* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */
}; };
#define NOCAPS 0 #define NOCAPS 0
@ -405,7 +408,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Czech keyboard doesn't have any */ /* Ligatures -- Czech keyboard doesn't have any */
0, 0,

2
reactos/dll/keyboard/kbdda/kbdda.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS DAAscii Keyboard Layout\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Danish Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbdda\0" #define REACTOS_STR_INTERNAL_NAME "kbdda\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbdda.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdda.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

2
reactos/dll/keyboard/kbddv/kbddv.c
View file

@ -1,5 +1,5 @@
/* /*
* ReactOS USASCII Keyboard layout * ReactOS US Dvorak keyboard layout
* Copyright (C) 2003 ReactOS * Copyright (C) 2003 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
* *

4
reactos/dll/keyboard/kbdes/kbdes.c
View file

@ -1,5 +1,5 @@
/* /*
* ReactOS ESASCII Keyboard layout * ReactOS Spanish Keyboard Layout
* Copyright (C) 2003 ReactOS * Copyright (C) 2003 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
* Created by HUMA2000 from kbdus, kbdgr, kbdda and kbdfr * Created by HUMA2000 from kbdus, kbdgr, kbdda and kbdfr
@ -524,7 +524,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Spanish doesn't have any */ /* Ligatures -- Spanish doesn't have any */
0, 0,

2
reactos/dll/keyboard/kbdest/kbdest.c
View file

@ -447,7 +447,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
0, 0,
0, 0,

2
reactos/dll/keyboard/kbdfc/kbdfc.c
View file

@ -464,7 +464,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
0, 0,
0, 0,

2
reactos/dll/keyboard/kbdfi/kbdfi.c
View file

@ -463,7 +463,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0, 1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

15
reactos/dll/keyboard/kbdfr/kbdfr.c
View file

@ -1,9 +1,9 @@
/* /*
* ReactOS FRASCII Keyboard layout * ReactOS French keyboard layout
* Copyright (C) 2003 ReactOS * Copyright (C) 2003 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
* autor: Jean-Michel Gay 2003 * Autors: Jean-Michel Gay, 2003
* Pierre Schweitzer 2007 * Pierre Schweitzer, 2007
* *
*/ */
@ -32,6 +32,8 @@
#define KNUMS 0xc00 /* Special + number pad */ #define KNUMS 0xc00 /* Special + number pad */
#define KMEXT 0x300 /* Multi + ext */ #define KMEXT 0x300 /* Multi + ext */
#define SHFT_INVALID 0x0F
/** /**
* FIXME : - VK_DIVIDE produces ! instead of / * FIXME : - VK_DIVIDE produces ! instead of /
* - VK_SNAPSHOT produces * * - VK_SNAPSHOT produces *
@ -167,9 +169,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
6, 6,
{ 0, 1, 2, 4,15,15,3 } { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 }
/* new: Modifier bit order, NONE, SHIFT, CTRL, ALT , ? ,? , shift+control*/ /* Modifier bit order: NONE, SHIFT, CTRL, ALT, ?, ?, SHIFT-CTRL */
/* old: Modifier bit order, NONE, SHIFT, CTRL, ALT */
}; };
#define NOCAPS 0 #define NOCAPS 0
@ -462,7 +463,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- French doesn't have any */ /* Ligatures -- French doesn't have any */
0, 0,

2
reactos/dll/keyboard/kbdfr/kbdfr.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS FRAscii Keyboard Layout\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS French Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbdfr\0" #define REACTOS_STR_INTERNAL_NAME "kbdfr\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbdfr.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdfr.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

4
reactos/dll/keyboard/kbdgeo/kbdgeo.c
View file

@ -370,9 +370,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Georgian doesn't have any */
0, 0,
0, 0,
NULL NULL

3
reactos/dll/keyboard/kbdhe/kbdhe.c
View file

@ -361,8 +361,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
vk_to_wchar_master_table, vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */ /* diacritical marks -- currently implemented by wine code */
/* English doesn't have any, anyway */ deadkey,
deadkey,
/* Key names */ /* Key names */
(VSC_LPWSTR *)key_names, (VSC_LPWSTR *)key_names,

2
reactos/dll/keyboard/kbdhe/kbdhe.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Greek Ascii Keyboard Layout\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Greek Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbdhe\0" #define REACTOS_STR_INTERNAL_NAME "kbdhe\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbdhe.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdhe.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

3
reactos/dll/keyboard/kbdheb/kbdheb.c
View file

@ -448,7 +448,6 @@ ROSDATA KBDTABLES keyboard_layout_table =
vk_to_wchar_master_table, vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */ /* diacritical marks -- currently implemented by wine code */
/* English doesn't have any, anyway */
NULL, NULL,
/* Key names */ /* Key names */
@ -464,7 +463,7 @@ ROSDATA KBDTABLES keyboard_layout_table =
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- does Hebrew have any? */ /* Ligatures -- Hebrew doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdheb/kbdheb.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hebrew Ascii Keyboard Layout\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hebrew Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbdheb\0" #define REACTOS_STR_INTERNAL_NAME "kbdheb\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbdheb.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdheb.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

5
reactos/dll/keyboard/kbdhu/kbdhu.c
View file

@ -1,5 +1,5 @@
/* /*
* ReactOS HUASCII Keyboard layout * ReactOS Hungarian keyboard layout
* Copyright (C) 2003 ReactOS * Copyright (C) 2003 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
* *
@ -329,7 +329,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
vk_to_wchar_master_table, vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */ /* diacritical marks -- currently implemented by wine code */
/* English doesn't have any, anyway */
NULL, NULL,
/* Key names */ /* Key names */
@ -345,7 +344,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- English doesn't have any */ /* Ligatures -- Hungarian doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdhu/kbdhu.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS HUAscii Keyboard Layout\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hungarian Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbdhu\0" #define REACTOS_STR_INTERNAL_NAME "kbdhu\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbdhu.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdhu.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

4
reactos/dll/keyboard/kbdic/kbdic.c
View file

@ -454,9 +454,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Icelandic doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdinasa/kbdinasa.c
View file

@ -391,7 +391,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
3, 3,

2
reactos/dll/keyboard/kbdinben/kbdinben.c
View file

@ -386,7 +386,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
3, 3,

2
reactos/dll/keyboard/kbdindev/kbdindev.c
View file

@ -391,7 +391,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
3, 3,

2
reactos/dll/keyboard/kbdinguj/kbdinguj.c
View file

@ -391,7 +391,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
3, 3,

2
reactos/dll/keyboard/kbdinmal/kbdinmal.c
View file

@ -387,7 +387,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
3, 3,

2
reactos/dll/keyboard/kbdir/kbdir.c
View file

@ -419,7 +419,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

4
reactos/dll/keyboard/kbdit/kbdit.c
View file

@ -183,7 +183,7 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
6, 6,
{ 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 }
}; };
#define NOCAPS 0 #define NOCAPS 0
@ -403,7 +403,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

6
reactos/dll/keyboard/kbdja/kbdja.c
View file

@ -1,5 +1,5 @@
/* /*
* ReactOS USASCII Keyboard layout * ReactOS Japanese (JIS 106) keyboard layout
* Copyright (C) 2003 ReactOS * Copyright (C) 2003 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
* *
@ -343,7 +343,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
vk_to_wchar_master_table, vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */ /* diacritical marks -- currently implemented by wine code */
/* English doesn't have any, anyway */
NULL, NULL,
/* Key names */ /* Key names */
@ -359,7 +358,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- English doesn't have any */ /* Ligatures -- Japanese doesn't have any */
0, 0,
0, 0,
NULL NULL
@ -369,4 +368,3 @@ PKBDTABLES WINAPI KbdLayerDescriptor() {
return &keyboard_layout_table; return &keyboard_layout_table;
} }

2
reactos/dll/keyboard/kbdkaz/kbdkaz.c
View file

@ -1,5 +1,5 @@
/* /*
* ReactOS Kazak (Cyrillic) Keyboard layout * ReactOS Kazakh (Cyrillic) Keyboard layout
* Copyright (C) 2008 ReactOS * Copyright (C) 2008 ReactOS
* Author: Dmitry Chapyshev * Author: Dmitry Chapyshev
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt

2
reactos/dll/keyboard/kbdkaz/kbdkaz.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kazak (Cyrillic) Keyboard Layout\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kazakh (Cyrillic) Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbdkaz\0" #define REACTOS_STR_INTERNAL_NAME "kbdkaz\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbdkaz.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdkaz.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

5
reactos/dll/keyboard/kbdko/kbdko.c
View file

@ -9,7 +9,7 @@
/* /*
* Important Note / TODO: * Important Note / TODO:
* This file is a copy of kbdus.c and needs to adapt to korean * This file is a copy of kbdus.c and needs to adapt to Korean
* keyboard layout! * keyboard layout!
*/ */
@ -336,7 +336,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
vk_to_wchar_master_table, vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */ /* diacritical marks -- currently implemented by wine code */
/* English doesn't have any, anyway */
NULL, NULL,
/* Key names */ /* Key names */
@ -352,7 +351,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- English doesn't have any */ /* Ligatures -- Korean doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdla/kbdla.c
View file

@ -440,7 +440,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

2
reactos/dll/keyboard/kbdlt/kbdlt.c
View file

@ -381,7 +381,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Lithuanian doesn't have any */ /* Ligatures -- Lithuanian doesn't have any */
0, 0,

2
reactos/dll/keyboard/kbdlv/kbdlv.c
View file

@ -431,7 +431,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

2
reactos/dll/keyboard/kbdmac/kbdmac.c
View file

@ -376,7 +376,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

2
reactos/dll/keyboard/kbdne/kbdne.c
View file

@ -458,7 +458,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

2
reactos/dll/keyboard/kbdno/kbdno.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS NOAscii Keyboard Layout\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Norwegian Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbdno\0" #define REACTOS_STR_INTERNAL_NAME "kbdno\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbdno.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdno.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

40
reactos/dll/keyboard/kbdpo/kbdpo.c
View file

@ -1,5 +1,5 @@
/* /*
* ReactOS POASCII Keyboard layout * ReactOS Portuguese keyboard layout
* Copyright (C) 2006 ReactOS * Copyright (C) 2006 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
* Based on kbdes, skbdda and skbdfr * Based on kbdes, skbdda and skbdfr
@ -10,7 +10,7 @@
* http://keytouch.sourceforge.net/howto_keyboard/node4.html (Very Good) * http://keytouch.sourceforge.net/howto_keyboard/node4.html (Very Good)
* http://www.microsoft.com/globaldev/tools/msklc.mspx (Keyboard layout file from MS) * http://www.microsoft.com/globaldev/tools/msklc.mspx (Keyboard layout file from MS)
* *
*TODO * TODO
* Correct DEADKEYS * Correct DEADKEYS
* Correct DIVIDE and PrtScr * Correct DIVIDE and PrtScr
*/ */
@ -223,10 +223,6 @@ ROSDATA VSC_VK extcode1_to_vk[] = {
}; };
#define TIDLE_CIRC VK_OEM_2 #define TIDLE_CIRC VK_OEM_2
#define ACUTE_GRAVE VK_OEM_1 #define ACUTE_GRAVE VK_OEM_1
#define ORDERN_SUPERSCRIPT VK_OEM_7 #define ORDERN_SUPERSCRIPT VK_OEM_7
@ -237,7 +233,6 @@ ROSDATA VSC_VK extcode1_to_vk[] = {
#define MATH_RELATE VK_OEM_102 #define MATH_RELATE VK_OEM_102
#define ACUTE_CHAR 0xB4 #define ACUTE_CHAR 0xB4
#define GRAVE_CHAR 0x60 #define GRAVE_CHAR 0x60
#define CIRC_CHAR 0x5E #define CIRC_CHAR 0x5E
@ -258,14 +253,10 @@ ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
6, 6,
{ 0, 1<<0, 1<<1, 1<<2, SHFT_INVALID, SHFT_INVALID, 3 } { 0, 1<<0, 1<<1, 1<<2, SHFT_INVALID, SHFT_INVALID, 3 }
/* NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, SHIFT+CONTROL */ /* NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, SHIFT+CONTROL */
}; };
#define NOCAPS 0 #define NOCAPS 0
#define CAPS KSHIFT /* Caps -> shift */ #define CAPS KSHIFT /* Caps -> shift */
@ -381,12 +372,6 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
}; };
#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } #define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
@ -398,15 +383,6 @@ ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
}; };
#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags #define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags
ROSDATA DEADKEY deadkey[] = ROSDATA DEADKEY deadkey[] =
@ -478,10 +454,6 @@ ROSDATA DEADKEY deadkey[] =
}; };
ROSDATA VSC_LPWSTR key_names[] = { ROSDATA VSC_LPWSTR key_names[] = {
{ 0x01, L"Escape" }, { 0x01, L"Escape" },
{ 0x0e, L"BackSpace" }, { 0x0e, L"BackSpace" },
@ -579,10 +551,6 @@ ROSDATA DEADKEY_LPWSTR dead_key_names[] = {
}; };
/* Finally, the master table */ /* Finally, the master table */
ROSDATA KBDTABLES keyboard_layout_table = { ROSDATA KBDTABLES keyboard_layout_table = {
@ -608,7 +576,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Portuguese doesn't have any, that i'm aware */ /* Ligatures -- Portuguese doesn't have any, that i'm aware */
0, 0,

2
reactos/dll/keyboard/kbdro/kbdro.c
View file

@ -375,7 +375,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

2
reactos/dll/keyboard/kbdru/kbdru.c
View file

@ -166,7 +166,7 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
3, 3,
{ 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ { 0, 1, 2, 3 }
}; };
#define NOCAPS 0 #define NOCAPS 0

7
reactos/dll/keyboard/kbdsk/kbdsk.c
View file

@ -32,6 +32,8 @@
#define KNUMS 0xc00 /* Special + number pad */ #define KNUMS 0xc00 /* Special + number pad */
#define KMEXT 0x300 /* Multi + ext */ #define KMEXT 0x300 /* Multi + ext */
#define SHFT_INVALID 0x0F
ROSDATA USHORT scancode_to_vk[] = { ROSDATA USHORT scancode_to_vk[] = {
/* Numbers Row */ /* Numbers Row */
/* - 00 - */ /* - 00 - */
@ -162,7 +164,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
7, 7,
{ 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ { 0, 1, 2, 0, 0, 0, 3, 0 }
/* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */
}; };
#define NOCAPS 0 #define NOCAPS 0
@ -455,7 +458,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Slovak doesn't have any */ /* Ligatures -- Slovak doesn't have any */
0, 0,

7
reactos/dll/keyboard/kbdsk1/kbdsk1.c
View file

@ -32,6 +32,8 @@
#define KNUMS 0xc00 /* Special + number pad */ #define KNUMS 0xc00 /* Special + number pad */
#define KMEXT 0x300 /* Multi + ext */ #define KMEXT 0x300 /* Multi + ext */
#define SHFT_INVALID 0x0F
ROSDATA USHORT scancode_to_vk[] = { ROSDATA USHORT scancode_to_vk[] = {
/* Numbers Row */ /* Numbers Row */
/* - 00 - */ /* - 00 - */
@ -162,7 +164,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
7, 7,
{ 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ { 0, 1, 2, 0, 0, 0, 3, 0 }
/* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */
}; };
#define NOCAPS 0 #define NOCAPS 0
@ -455,7 +458,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Slovak doesn't have any */ /* Ligatures -- Slovak doesn't have any */
0, 0,

2
reactos/dll/keyboard/kbdsw/kbdsw.c
View file

@ -470,7 +470,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(1,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- German doesn't have any */ /* Ligatures -- Swedish doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdsw/kbdsw.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS SEAscii Keyboard Layout\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Swedish Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbdsw\0" #define REACTOS_STR_INTERNAL_NAME "kbdsw\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbdsw.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdsw.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

4
reactos/dll/keyboard/kbdtat/kbdtat.c
View file

@ -380,9 +380,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Tatar doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdth0/kbdth0.c
View file

@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Thai doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdth1/kbdth1.c
View file

@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Thai doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdth2/kbdth2.c
View file

@ -1,5 +1,5 @@
/* /*
* ReactOS Thai keyboard layout (traditional) * ReactOS Thai Kedmanee (non-ShiftLock) Keyboard layout
* Copyright (C) 2007 ReactOS * Copyright (C) 2007 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
* *

2
reactos/dll/keyboard/kbdth2/kbdth2.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Keyboard Layout (traditional)\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Kedmanee (non-ShiftLock) Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbdth2\0" #define REACTOS_STR_INTERNAL_NAME "kbdth2\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbdth2.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdth2.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

2
reactos/dll/keyboard/kbdth3/kbdth3.c
View file

@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- Thai doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdtuf/kbdtuf.c
View file

@ -465,7 +465,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

12
reactos/dll/keyboard/kbdtuq/kbdtuq.c
View file

@ -195,11 +195,11 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
{ 'B', CAPS, {'b', 'B' } }, { 'B', CAPS, {'b', 'B' } },
{ 'N', CAPS, {'n', 'N' } }, { 'N', CAPS, {'n', 'N' } },
{ 'M', CAPS, {'m', 'M' } }, { 'M', CAPS, {'m', 'M' } },
{ VK_OEM_2, CAPS, {0x00f6, 0x00d6} }, { VK_OEM_COMMA, CAPS, {0x00f6, 0x00d6} },
{ VK_OEM_5, CAPS, {0x00e7, 0x00c7} }, { VK_OEM_PERIOD, CAPS, {0x00e7, 0x00c7} },
{ VK_OEM_PERIOD, NOCAPS, {'.', ':' } }, { VK_OEM_2, NOCAPS, {'.', ':' } },
{ VK_DECIMAL, NOCAPS, {',', ',' } }, { VK_DECIMAL, NOCAPS, {',', ',' } },
{ VK_TAB, NOCAPS, {'\t' ,'\t'} }, { VK_TAB, NOCAPS, {'\t', '\t' } },
{ VK_ADD, NOCAPS, {'+', '+' } }, { VK_ADD, NOCAPS, {'+', '+' } },
{ VK_DIVIDE, NOCAPS, {'/', '/' } }, { VK_DIVIDE, NOCAPS, {'/', '/' } },
{ VK_MULTIPLY, NOCAPS, {'*', '*' } }, { VK_MULTIPLY, NOCAPS, {'*', '*' } },
@ -232,7 +232,7 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
{ 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00a8, WCH_NONE} }, { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00a8, WCH_NONE} },
{ VK_OEM_6, CAPS, {0x00fc, 0x00dc, WCH_DEAD, 0x001d } }, { VK_OEM_6, CAPS, {0x00fc, 0x00dc, WCH_DEAD, 0x001d } },
{ 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '~', WCH_NONE} }, { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '~', WCH_NONE} },
{ VK_OEM_COMMA, NOCAPS, {',', ';', WCH_DEAD, 0x001c } }, { VK_OEM_5, NOCAPS, {',', ';', WCH_DEAD, 0x001c } },
{ 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '`', WCH_NONE} }, { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '`', WCH_NONE} },
{ VK_OEM_102, NOCAPS, {'<', '>', '|', 0x001c } }, { VK_OEM_102, NOCAPS, {'<', '>', '|', 0x001c } },
{ VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, 0x007f } }, { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, 0x007f } },
@ -465,7 +465,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

9
reactos/dll/keyboard/kbduk/kbduk.c
View file

@ -1,5 +1,5 @@
/* /*
* ReactOS USASCII Keyboard layout * ReactOS United Kingdom keyboard layout
* Copyright (C) 2003 ReactOS * Copyright (C) 2003 ReactOS
* License: LGPL, see: LGPL.txt * License: LGPL, see: LGPL.txt
* *
@ -32,6 +32,8 @@
#define KNUMS 0xc00 /* Special + number pad */ #define KNUMS 0xc00 /* Special + number pad */
#define KMEXT 0x300 /* Multi + ext */ #define KMEXT 0x300 /* Multi + ext */
#define SHFT_INVALID 0x0F
ROSDATA USHORT scancode_to_vk[] = { ROSDATA USHORT scancode_to_vk[] = {
/* Numbers Row */ /* Numbers Row */
/* - 00 - */ /* - 00 - */
@ -128,7 +130,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
7, 7,
{ 0, 1, 2, 3 ,0, 0,4,5} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ { 0, 1, 2, 3, 0, 0, 4, 5 }
/* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */
}; };
#define NOCAPS 0 #define NOCAPS 0
@ -361,7 +364,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- English doesn't have any */ /* Ligatures -- English doesn't have any */
0, 0,

2
reactos/dll/keyboard/kbduk/kbduk.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS UKAscii Keyboard Layout\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS United Kingdom Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbduk\0" #define REACTOS_STR_INTERNAL_NAME "kbduk\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbduk.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbduk.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

2
reactos/dll/keyboard/kbdur/kbdur.c
View file

@ -166,7 +166,7 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
3, 3,
{ 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ { 0, 1, 2, 3 }
}; };
#define NOCAPS 0 #define NOCAPS 0

5
reactos/dll/keyboard/kbdurs/kbdurs.c
View file

@ -166,7 +166,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
ROSDATA MODIFIERS modifier_bits = { ROSDATA MODIFIERS modifier_bits = {
modifier_keys, modifier_keys,
7, 7,
{ 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 }
/* Modifier bit order: NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */
}; };
#define NOCAPS 0 #define NOCAPS 0
@ -375,7 +376,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

2
reactos/dll/keyboard/kbdus/kbdus.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS USAscii Keyboard Layout\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS United States Keyboard Layout\0"
#define REACTOS_STR_INTERNAL_NAME "kbdus\0" #define REACTOS_STR_INTERNAL_NAME "kbdus\0"
#define REACTOS_STR_ORIGINAL_FILENAME "kbdus.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdus.dll\0"
#include <reactos/version.rc> #include <reactos/version.rc>

2
reactos/dll/keyboard/kbdusa/kbdusa.c
View file

@ -377,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdusl/kbdusl.c
View file

@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- English doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdusr/kbdusr.c
View file

@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(0,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures -- English doesn't have any */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdusx/kbdusx.c
View file

@ -461,7 +461,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
MAKELONG(1,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Russian doesn't have any */ /* Ligatures */
0, 0,
0, 0,
NULL NULL

2
reactos/dll/keyboard/kbdvntc/kbdvntc.c
View file

@ -375,7 +375,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

2
reactos/dll/keyboard/kbdycc/kbdycc.c
View file

@ -391,7 +391,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
0, 0,

2
reactos/dll/keyboard/kbdycl/kbdycl.c
View file

@ -511,7 +511,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
extcode0_to_vk, extcode0_to_vk,
extcode1_to_vk, extcode1_to_vk,
MAKELONG(0,1), /* Version 1.0 */ MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ /* Ligatures */
2, 2,