23 Feb
2007
23 Feb
'07
6:41 p.m.
Author: tretiakov
Date: Fri Feb 23 21:41:48 2007
New Revision: 25893
URL: http://svn.reactos.org/svn/reactos?rev=25893&view=rev
Log:
Update keyboard layout names. Add "Layout Id" key for Us-Dvorak. Rename
kbdse.dll to kbdsw.dll
Added:
trunk/reactos/dll/keyboard/kbdsw/
- copied from r25798, trunk/reactos/dll/keyboard/kbdse/
trunk/reactos/dll/keyboard/kbdsw/kbdsw.c
- copied unchanged from r25798, trunk/reactos/dll/keyboard/kbdse/kbdse.c
trunk/reactos/dll/keyboard/kbdsw/kbdsw.def
- copied unchanged from r25798, trunk/reactos/dll/keyboard/kbdse/kbdse.def
trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
- copied, changed from r25798, trunk/reactos/dll/keyboard/kbdse/kbdse.rbuild
trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc
- copied unchanged from r25798, trunk/reactos/dll/keyboard/kbdse/kbdse.rc
Removed:
trunk/reactos/dll/keyboard/kbdse/
trunk/reactos/dll/keyboard/kbdsw/kbdse.c
trunk/reactos/dll/keyboard/kbdsw/kbdse.def
trunk/reactos/dll/keyboard/kbdsw/kbdse.rbuild
trunk/reactos/dll/keyboard/kbdsw/kbdse.rc
Modified:
trunk/reactos/boot/bootdata/hivesys.inf
trunk/reactos/dll/keyboard/keyboard.rbuild
Modified: trunk/reactos/boot/bootdata/hivesys.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys.inf (original)
+++ trunk/reactos/boot/bootdata/hivesys.inf Fri Feb 23 21:41:48 2007
@@ -42,33 +42,34 @@
; Keyboard Layouts
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout
File",0x00000000,"kbdda.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout
Text",0x00000000,"DA"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout
Text",0x00000000,"Danish"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layout
File",0x00000000,"kbdes.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layout
Text",0x00000000,"ES"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layout
Text",0x00000000,"Spanish"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout
File",0x00000000,"kbdgr.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout
Text",0x00000000,"GR"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout
Text",0x00000000,"German"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout
File",0x00000000,"kbdus.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout
Text",0x00000000,"US"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout
Text",0x00000000,"United States"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout
File",0x00000000,"kbddv.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout
Id", 0x00000000,"0002"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout
Text",0x00000000,"US-Dvorak"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout
File",0x00000000,"kbdfr.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout
Text",0x00000000,"FR"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout
Text",0x00000000,"French"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout
File",0x00000000,"kbdit.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout
Text",0x00000000,"IT"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout
Text",0x00000000,"Italian"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout
File",0x00000000,"kbdru.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout
Text",0x00000000,"Russian"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout
File",0x00000000,"kbdse.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout
Text",0x00000000,"SE"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout
File",0x00000000,"kbdsw.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout
Text",0x00000000,"Swedish"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout
File",0x00000000,"kbdth.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout
Text",0x00000000,"Thai"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout
File",0x00000000,"kbdur.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout
Text",0x00000000,"Ukrainian"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout
File",0x00000000,"kbduk.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout
Text",0x00000000,"UK"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout
Text",0x00000000,"United Kingdom"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout
File",0x00000000,"kbdsg.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout
Text",0x00000000,"SG"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout
Text",0x00000000,"Swiss German"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout
File",0x00000000,"kbdbe.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout
Text",0x00000000,"BE (point)"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout
Text",0x00000000,"Belgian Dutch"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout
File",0x00000000,"kbdhe.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout
Text",0x00000000,"Greek"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041b","Layout
File",0x00000000,"kbdsk.dll"
@@ -76,7 +77,7 @@
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000816","Layout
File",0x00000000,"kbdpo.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000816","Layout
Text",0x00000000,"Portuguese"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout
File",0x00000000,"kbdja.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout
Text",0x00000000,"JP"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout
Text",0x00000000,"Japanese"
; Network
HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network
Adapters"
Removed: trunk/reactos/dll/keyboard/kbdsw/kbdse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.c…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdsw/kbdse.c (original)
+++ trunk/reactos/dll/keyboard/kbdsw/kbdse.c (removed)
@@ -1,491 +1,0 @@
-/*
- * ReactOS Swedish ASCII Keyboard layout
- * Copyright (C) 2004 ReactOS
- * License: LGPL, see: LGPL.txt
- *
- * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php
- * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html
- */
-
-#include <windows.h>
-#include <internal/kbd.h>
-
-#ifdef _M_IA64
-#define ROSDATA static __declspec(allocate(".data"))
-#else
-#ifdef _MSC_VER
-#pragma data_seg(".data")
-#define ROSDATA static
-#else
-#define ROSDATA static __attribute__((section(".data")))
-#endif
-#endif
-
-#define VK_EMPTY 0xff /* The non-existent VK */
-#define KSHIFT 0x001 /* Shift modifier */
-#define KCTRL 0x002 /* Ctrl modifier */
-#define KALT 0x004 /* Alt modifier */
-#define KEXT 0x100 /* Extended key code */
-#define KMULTI 0x200 /* Multi-key */
-#define KSPEC 0x400 /* Special key */
-#define KNUMP 0x800 /* Number-pad */
-#define KNUMS 0xc00 /* Special + number pad */
-#define KMEXT 0x300 /* Multi + ext */
-
-#define SHFT_INVALID 0x0F
-
-ROSDATA USHORT scancode_to_vk[] = {
- /* Numbers Row */
- /* - 00 - */
- /* 1 ... 2 ... 3 ... 4 ... */
- VK_EMPTY, VK_ESCAPE, '1', '2',
- '3', '4', '5', '6',
- '7', '8', '9', '0',
- VK_OEM_PLUS, VK_OEM_4, VK_BACK,
- /* - 0f - */
- /* First Letters Row */
- VK_TAB, 'Q', 'W', 'E',
- 'R', 'T', 'Y', 'U',
- 'I', 'O', 'P',
- VK_OEM_6, VK_OEM_1, VK_RETURN,
- /* - 1d - */
- /* Second Letters Row */
- VK_LCONTROL,
- 'A', 'S', 'D', 'F',
- 'G', 'H', 'J', 'K',
- 'L', VK_OEM_3, VK_OEM_7, VK_OEM_5,
- VK_LSHIFT, VK_OEM_2,
- /* - 2c - */
- /* Third letters row */
- 'Z', 'X', 'C', 'V',
- 'B', 'N', 'M', VK_OEM_COMMA,
- VK_OEM_PERIOD,VK_OEM_MINUS, VK_RSHIFT,
- /* - 37 - */
- /* Bottom Row */
- VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL,
-
- /* - 3b - */
- /* F-Keys */
- VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6,
- VK_F7, VK_F8, VK_F9, VK_F10,
- /* - 45 - */
- /* Locks */
- VK_NUMLOCK | KMEXT,
- VK_SCROLL | KMULTI,
- /* - 47 - */
- /* Number-Pad */
- VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT,
- VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD,
- VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS,
- VK_INSERT | KNUMS, VK_DELETE | KNUMS,
- /* - 54 - */
- /* Presumably PrtSc */
- VK_SNAPSHOT,
- /* - 55 - */
- /* Oddities, and the remaining standard F-Keys */
- VK_EMPTY, VK_OEM_102, VK_F11, VK_F12,
- /* - 59 - */
- VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */
- VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */
- VK_HELP,
- /* - 64 - */
- /* Even more F-Keys (for example, NCR keyboards from the early 90's) */
- VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20,
- VK_F21, VK_F22, VK_F23,
- /* - 6f - */
- /* Not sure who uses these codes */
- VK_EMPTY, VK_EMPTY, VK_EMPTY,
- /* - 72 - */
- VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
- /* - 76 - */
- /* One more f-key */
- VK_F24,
- /* - 77 - */
- VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
- VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
- VK_EMPTY,
- /* - 80 - */
- 0
-};
-
-ROSDATA VSC_VK extcode0_to_vk[] = {
- { 0x10, VK_MEDIA_PREV_TRACK | KEXT },
- { 0x19, VK_MEDIA_NEXT_TRACK | KEXT },
- { 0x1D, VK_RCONTROL | KEXT },
- { 0x20, VK_VOLUME_MUTE | KEXT },
- { 0x21, VK_LAUNCH_APP2 | KEXT },
- { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT },
- { 0x24, VK_MEDIA_STOP | KEXT },
- { 0x2E, VK_VOLUME_DOWN | KEXT },
- { 0x30, VK_VOLUME_UP | KEXT },
- { 0x32, VK_BROWSER_HOME | KEXT },
- { 0x35, VK_DIVIDE | KEXT },
- { 0x37, VK_SNAPSHOT | KEXT },
- { 0x38, VK_RMENU | KEXT },
- { 0x47, VK_HOME | KEXT },
- { 0x48, VK_UP | KEXT },
- { 0x49, VK_PRIOR | KEXT },
- { 0x4B, VK_LEFT | KEXT },
- { 0x4D, VK_RIGHT | KEXT },
- { 0x4F, VK_END | KEXT },
- { 0x50, VK_DOWN | KEXT },
- { 0x51, VK_NEXT | KEXT },
- { 0x52, VK_INSERT | KEXT },
- { 0x53, VK_DELETE | KEXT },
- { 0x5B, VK_LWIN | KEXT },
- { 0x5C, VK_RWIN | KEXT },
- { 0x5D, VK_APPS | KEXT },
- { 0x5F, VK_SLEEP | KEXT },
- { 0x65, VK_BROWSER_SEARCH | KEXT },
- { 0x66, VK_BROWSER_FAVORITES | KEXT },
- { 0x67, VK_BROWSER_REFRESH | KEXT },
- { 0x68, VK_BROWSER_STOP | KEXT },
- { 0x69, VK_BROWSER_FORWARD | KEXT },
- { 0x6A, VK_BROWSER_BACK | KEXT },
- { 0x6B, VK_LAUNCH_APP1 | KEXT },
- { 0x6C, VK_LAUNCH_MAIL | KEXT },
- { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT },
- { 0x1C, VK_RETURN | KEXT },
- { 0x46, VK_CANCEL | KEXT },
- { 0, 0 },
-};
-
-ROSDATA VSC_VK extcode1_to_vk[] = {
- { 0x1d, VK_PAUSE},
- { 0, 0 },
-};
-
-ROSDATA VK_TO_BIT modifier_keys[] = {
- { VK_SHIFT, KSHIFT },
- { VK_CONTROL, KCTRL },
- { VK_MENU, KALT },
- { 0, 0 }
-};
-
-ROSDATA MODIFIERS modifier_bits = {
- modifier_keys,
- 6,
- { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } /* Modifier bit order, NONE, SHIFT, CTRL,
ALT, MENU, SHIFT + MENU, CTRL + MENU */
-};
-
-#define NOCAPS 0
-#define CAPS KSHIFT /* Caps -> shift */
-
-ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
-
- /* The numbers */
- { '1', NOCAPS, {'1', '!'} },
- /* Ctrl-2 generates NUL */
-
- /* Specials */
- { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD} },
- { VK_OEM_7, CAPS, {0xe4,0xc4} },
- { VK_OEM_3, CAPS, {0xf6, 0xd6} },
-
- { VK_OEM_COMMA, CAPS, {',', ';'} },
- { VK_OEM_PERIOD, CAPS, {'.', ':'} },
- { VK_OEM_2, NOCAPS, {'\'', '*'} },
-
- { VK_DECIMAL, NOCAPS, {',',','} },
- { VK_TAB, NOCAPS, {'\t', '\t'} },
- { VK_ADD, NOCAPS, {'+', '+'} },
- { VK_DIVIDE, NOCAPS, {'/', '/'} },
- { VK_MULTIPLY, NOCAPS, {'*', '*'} },
- { VK_SUBTRACT, NOCAPS, {'-', '-'} },
- { 0, 0 }
-};
-
-ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
- /* Normal, Shifted, Ctrl */
-
- /* The alphabet */
- { 'A', CAPS, {'a', 'A', 0x01} },
- { 'B', CAPS, {'b', 'B', 0x02} },
- { 'C', CAPS, {'c', 'C', 0x03} },
- { 'D', CAPS, {'d', 'D', 0x04} },
- { 'F', CAPS, {'f', 'F', 0x06} },
- { 'G', CAPS, {'g', 'G', 0x07} },
- { 'H', CAPS, {'h', 'H', 0x08} },
- { 'I', CAPS, {'i', 'I', 0x09} },
- { 'J', CAPS, {'j', 'J', 0x0a} },
- { 'K', CAPS, {'k', 'K', 0x0b} },
- { 'L', CAPS, {'l', 'L', 0x0c} },
- { 'N', CAPS, {'n', 'N', 0x0e} },
- { 'O', CAPS, {'o', 'O', 0x0f} },
- { 'P', CAPS, {'p', 'P', 0x10} },
- { 'Q', CAPS, {'q', 'Q', 0x11} },
- { 'R', CAPS, {'r', 'R', 0x12} },
- { 'S', CAPS, {'s', 'S', 0x13} },
- { 'T', CAPS, {'t', 'T', 0x14} },
- { 'U', CAPS, {'u', 'U', 0x15} },
- { 'V', CAPS, {'v', 'V', 0x16} },
- { 'W', CAPS, {'w', 'W', 0x17} },
- { 'X', CAPS, {'x', 'X', 0x18} },
- { 'Y', CAPS, {'y', 'Y', 0x19} },
- { 'Z', CAPS, {'z', 'Z', 0x1a} },
-
- /* Legacy (telnet-style) ascii escapes */
- {VK_OEM_6, CAPS, {0xe5,0xc5, 0x1d /* GS */} },
- { VK_OEM_5, NOCAPS, {0xa7,0xbd, 0x1c /* FS */} },
- { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x1f /* US */} },
- { VK_RETURN,NOCAPS, {'\r', '\r', '\n'} },
-
- { VK_BACK, NOCAPS, {'\b', '\b', 0x7f} },
- { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} },
- { VK_SPACE, NOCAPS, {' ', ' ', ' '} },
- { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} },
-
- { 0,0 }
-};
-
-ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
- /* Normal, Shifted, Ctrl, Ctrl-Alt */
- /* Legacy Ascii generators */
-
- { '2', NOCAPS, {'2', '\"', WCH_NONE,'@'} },
- { '3', NOCAPS, {'3', '#', WCH_NONE, 0x00a3} },
- { '4', NOCAPS, {'4', 0xa4, WCH_NONE, '$'} },
- { '5', NOCAPS, {'5', '%', WCH_NONE, 0x00ac} },
- { '7', NOCAPS, {'7', '/', WCH_NONE, '{'} },
- { '8', NOCAPS, {'8', '(', WCH_NONE, '['} },
- { '9', NOCAPS, {'9', ')', WCH_NONE, ']'} },
- { '0', NOCAPS, {'0', '=', WCH_NONE, '}'} },
- { VK_OEM_PLUS ,NOCAPS, {'+', '?', WCH_NONE, '\\'} },
- { 'E', CAPS, {'e', 'E' , 0x05, 0x00ac} },
- { VK_OEM_1 ,NOCAPS, {0xa8, '^', 0x001d, '~'} },
- { 'M', CAPS, {'m', 'M', 0x0d, 0x00b5} },
- {VK_OEM_102, NOCAPS, {'<', '>' ,0x001c,'|'} },
- { 0, 0 }
-};
-
-ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = {
- /* Normal, Shifted, Ctrl, Ctrl-Alt, C-S-x */
- { '6', NOCAPS, {'6', '&', WCH_NONE, WCH_NONE, 0x1e /* RS
*/} },
- { 0, 0 }
-};
-
-ROSDATA VK_TO_WCHARS1 keypad_numbers[] = {
- { VK_DECIMAL, 0, {'.'} },
- { VK_NUMPAD0, 0, {'0'} },
- { VK_NUMPAD1, 0, {'1'} },
- { VK_NUMPAD2, 0, {'2'} },
- { VK_NUMPAD3, 0, {'3'} },
- { VK_NUMPAD4, 0, {'4'} },
- { VK_NUMPAD5, 0, {'5'} },
- { VK_NUMPAD6, 0, {'6'} },
- { VK_NUMPAD7, 0, {'7'} },
- { VK_NUMPAD8, 0, {'8'} },
- { VK_NUMPAD9, 0, {'9'} },
- { 0,0 }
-};
-
-#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
-
-ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
- vk_master(3,key_to_chars_3mod),
- vk_master(4,key_to_chars_4mod),
- vk_master(5,key_to_chars_5mod),
- vk_master(2,key_to_chars_2mod),
- vk_master(1,keypad_numbers),
- { 0,0,0 }
-};
-
-ROSDATA VSC_LPWSTR key_names[] = {
- { 0x00, L"" },
- { 0x01, L"ESC" },
- { 0x0e, L"BACKSTEG" },
- { 0x0f, L"TAB" },
- { 0x1c, L"RETUR" },
- { 0x1d, L"CTRL" },
- { 0x2a, L"SKIFT" },
- { 0x36, L"H\x00D6GER SKIFT" },
- { 0x37, L"NUM * (Numerisk tangent)" },
- { 0x38, L"ALT" },
- { 0x39, L"BLANKSTEG" },
- { 0x3a, L"CAPS LOCK" },
- { 0x3b, L"F1" },
- { 0x3c, L"F2" },
- { 0x3d, L"F3" },
- { 0x3e, L"F4" },
- { 0x3f, L"F5" },
- { 0x40, L"F6" },
- { 0x41, L"F7" },
- { 0x42, L"F8" },
- { 0x43, L"F9" },
- { 0x44, L"F10" },
- { 0x45, L"PAUSE" },
- { 0x46, L"SCROLL LOCK" },
- { 0x47, L"7 (Numerisk tangent)" },
- { 0x48, L"8 (Numerisk tangent)" },
- { 0x49, L"9 (Numerisk tangent)" },
- { 0x4a, L"- (Numerisk tangent)" },
- { 0x4b, L"4 (Numerisk tangent)" },
- { 0x4c, L"5 (Numerisk tangent)" },
- { 0x4d, L"6 (Numerisk tangent)" },
- { 0x4e, L"+ (Numerisk tangent)" },
- { 0x4f, L"1 (Numerisk tangent)" },
- { 0x50, L"2 (Numerisk tangent)" },
- { 0x51, L"3 (Numerisk tangent)" },
- { 0x52, L"0 (Numerisk tangent)" },
- { 0x53, L"DECIMAL (Numerisk tangent)" },
- { 0x54, L"Sys Req" },
- { 0x57, L"F11" },
- { 0x58, L"F12" },
- { 0x7c, L"F13" },
- { 0x7d, L"F14" },
- { 0x7e, L"F15" },
- { 0x7f, L"F16" },
- { 0x80, L"F17" },
- { 0x81, L"F18" },
- { 0x82, L"F19" },
- { 0x83, L"F20" },
- { 0x84, L"F21" },
- { 0x85, L"F22" },
- { 0x86, L"F23" },
- { 0x87, L"F24" },
- { 0, NULL }
-};
-
-ROSDATA VSC_LPWSTR extended_key_names[] = {
- { 0x1c, L"RETUR (Numerisk tangent)" },
- { 0x1d, L"H\x00D6GER CTRL" },
- { 0x35, L"DIVISION (Numerisk tangent)" },
- { 0x37, L"PRINT SCREEN" },
- { 0x38, L"H\x00D6GER ALT" },
- { 0x45, L"NUM LOCK" },
- { 0x46, L"BREAK" },
- { 0x47, L"HOME" },
- { 0x48, L"UPPIL" },
- { 0x49, L"PAGE UP" },
- { 0x4b, L"V\x00C4NSTER PIL" },
-//{ 0x4c, L"Center" },
- { 0x4d, L"H\x00D6GER PIL" },
- { 0x4f, L"END" },
- { 0x50, L"NEDPIL" },
- { 0x51, L"PAGE DOWN" },
- { 0x52, L"INS" },
- { 0x53, L"DEL" },
- { 0x54, L"<ReactOS>" },
- { 0x56, L"HELP" },
- { 0x5b, L"V\x00C4NSTER <ReactOS>" },
- { 0x5c, L"H\x00D6GER <ReactOS>" },
- { 0x5d, L"Program" },
- { 0, NULL }
-};
-
-ROSDATA DEADKEY_LPWSTR dead_key_names[] = {
- L"\x00a8" L"Omljud",
- L"\x005e" L"Cirkumflex",
- L"\x007e" L"Tilde",
- L"\x00b4" L"Akut",
- L"\x0060" L"Grav",
- NULL
-};
-
-#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags
-
-ROSDATA DEADKEY dead_key[] = {
- { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) },
- { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) },
- { DEADTRANS(0x0069, 0x00a8, 0x00ef, 0x0000) },
- { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) },
- { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) },
- { DEADTRANS(0x0079, 0x00a8, 0x00ff, 0x0000) },
- { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) },
- { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) },
- { DEADTRANS(0x0049, 0x00a8, 0x00cf, 0x0000) },
- { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) },
- { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) },
- { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) },
-
- { DEADTRANS(0x0061, 0x005e, 0x00e2, 0x0000) },
- { DEADTRANS(0x0065, 0x005e, 0x00ea, 0x0000) },
- { DEADTRANS(0x0069, 0x005e, 0x00ee, 0x0000) },
- { DEADTRANS(0x006f, 0x005e, 0x00f4, 0x0000) },
- { DEADTRANS(0x0075, 0x005e, 0x00fb, 0x0000) },
- { DEADTRANS(0x0041, 0x005e, 0x00c2, 0x0000) },
- { DEADTRANS(0x0045, 0x005e, 0x00ca, 0x0000) },
- { DEADTRANS(0x0049, 0x005e, 0x00ce, 0x0000) },
- { DEADTRANS(0x004f, 0x005e, 0x00d4, 0x0000) },
- { DEADTRANS(0x0055, 0x005e, 0x00db, 0x0000) },
- { DEADTRANS(0x0020, 0x005e, 0x005e, 0x0000) },
-
- { DEADTRANS(0x0061, 0x007e, 0x00e3, 0x0000) },
- { DEADTRANS(0x006f, 0x007e, 0x00f5, 0x0000) },
- { DEADTRANS(0x006e, 0x007e, 0x00f1, 0x0000) },
- { DEADTRANS(0x0041, 0x007e, 0x00c3, 0x0000) },
- { DEADTRANS(0x004f, 0x007e, 0x00d5, 0x0000) },
- { DEADTRANS(0x004e, 0x007e, 0x00d1, 0x0000) },
- { DEADTRANS(0x0020, 0x007e, 0x007e, 0x0000) },
-
- { DEADTRANS(0x0061, 0x00b4, 0x00e1, 0x0000) },
- { DEADTRANS(0x0065, 0x00b4, 0x00e9, 0x0000) },
- { DEADTRANS(0x0069, 0x00b4, 0x00ed, 0x0000) },
- { DEADTRANS(0x006f, 0x00b4, 0x00f3, 0x0000) },
- { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) },
- { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) },
- { DEADTRANS(0x0041, 0x00b4, 0x00c1, 0x0000) },
- { DEADTRANS(0x0045, 0x00b4, 0x00c9, 0x0000) },
- { DEADTRANS(0x0049, 0x00b4, 0x00cd, 0x0000) },
- { DEADTRANS(0x004f, 0x00b4, 0x00d3, 0x0000) },
- { DEADTRANS(0x0055, 0x00b4, 0x00da, 0x0000) },
- { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) },
- { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) },
-
- { DEADTRANS(0x0061, 0x0060, 0x00e0, 0x0000) },
- { DEADTRANS(0x0065, 0x0060, 0x00e8, 0x0000) },
- { DEADTRANS(0x0069, 0x0060, 0x00ec, 0x0000) },
- { DEADTRANS(0x006f, 0x0060, 0x00f2, 0x0000) },
- { DEADTRANS(0x0075, 0x0060, 0x00f9, 0x0000) },
- { DEADTRANS(0x0041, 0x0060, 0x00c0, 0x0000) },
- { DEADTRANS(0x0045, 0x0060, 0x00c8, 0x0000) },
- { DEADTRANS(0x0049, 0x0060, 0x00cc, 0x0000) },
- { DEADTRANS(0x004f, 0x0060, 0x00d2, 0x0000) },
- { DEADTRANS(0x0055, 0x0060, 0x00d9, 0x0000) },
- { DEADTRANS(0x0020, 0x0060, 0x0060, 0x0000) },
- { 0, 0 }
-};
-
-/* Finally, the master table */
-ROSDATA KBDTABLES keyboard_layout_table = {
- /* modifier assignments */
- &modifier_bits,
-
- /* character from vk tables */
- vk_to_wchar_master_table,
-
- /* diacritical marks -- currently implemented by wine code */
- dead_key,
-
- /* Key names */
- (VSC_LPWSTR *)key_names,
- (VSC_LPWSTR *)extended_key_names,
- dead_key_names, /* Dead key names */
-
- /* scan code to virtual key maps */
- scancode_to_vk,
- sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
- extcode0_to_vk,
- extcode1_to_vk,
-
- MAKELONG(1,1), /* Version 1.0 */
-
- /* Ligatures -- German doesn't have any */
- 0,
- 0,
- NULL
-};
-
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
- return &keyboard_layout_table;
-}
-
-INT STDCALL
-DllMain(
- PVOID hinstDll,
- ULONG dwReason,
- PVOID reserved)
-{
- return 1;
-}
-
Removed: trunk/reactos/dll/keyboard/kbdsw/kbdse.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.d…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdsw/kbdse.def (original)
+++ trunk/reactos/dll/keyboard/kbdsw/kbdse.def (removed)
@@ -1,8 +1,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdse.dll
-
-EXPORTS
-KbdLayerDescriptor
-;EOF
Removed: trunk/reactos/dll/keyboard/kbdsw/kbdse.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.r…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdsw/kbdse.rbuild (original)
+++ trunk/reactos/dll/keyboard/kbdsw/kbdse.rbuild (removed)
@@ -1,9 +1,0 @@
-<module name="kbdse" type="kernelmodedll" entrypoint="0"
installbase="system32" installname="kbdse.dll"
allowwarnings="true">
- <importlibrary definition="kbdse.def" />
- <include base="ntoskrnl">include</include>
- <define name="_DISABLE_TIDENTS" />
- <define name="__USE_W32API" />
- <define name="_WIN32_WINNT">0x0500</define>
- <file>kbdse.c</file>
- <file>kbdse.rc</file>
-</module>
Removed: trunk/reactos/dll/keyboard/kbdsw/kbdse.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.r…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdsw/kbdse.rc (original)
+++ trunk/reactos/dll/keyboard/kbdsw/kbdse.rc (removed)
@@ -1,5 +1,0 @@
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION "ReactOS SEAscii Keyboard Layout\0"
-#define REACTOS_STR_INTERNAL_NAME "kbdse\0"
-#define REACTOS_STR_ORIGINAL_FILENAME "kbdse.dll\0"
-#include <reactos/version.rc>
Copied: trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild (from r25798,
trunk/reactos/dll/keyboard/kbdse/kbdse.rbuild)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.r…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdse/kbdse.rbuild (original)
+++ trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild Fri Feb 23 21:41:48 2007
@@ -1,9 +1,9 @@
-<module name="kbdse" type="kernelmodedll" entrypoint="0"
installbase="system32" installname="kbdse.dll"
allowwarnings="true">
- <importlibrary definition="kbdse.def" />
+<module name="kbdsw" type="kernelmodedll" entrypoint="0"
installbase="system32" installname="kbdsw.dll"
allowwarnings="true">
+ <importlibrary definition="kbdsw.def" />
<include base="ntoskrnl">include</include>
<define name="_DISABLE_TIDENTS" />
<define name="__USE_W32API" />
<define name="_WIN32_WINNT">0x0500</define>
- <file>kbdse.c</file>
- <file>kbdse.rc</file>
+ <file>kbdsw.c</file>
+ <file>kbdsw.rc</file>
</module>
Modified: trunk/reactos/dll/keyboard/keyboard.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui…
==============================================================================
--- trunk/reactos/dll/keyboard/keyboard.rbuild (original)
+++ trunk/reactos/dll/keyboard/keyboard.rbuild Fri Feb 23 21:41:48 2007
@@ -29,8 +29,8 @@
<directory name="kbdru">
<xi:include href="kbdru/kbdru.rbuild" />
</directory>
- <directory name="kbdse">
- <xi:include href="kbdse/kbdse.rbuild" />
+ <directory name="kbdsw">
+ <xi:include href="kbdsw/kbdsw.rbuild" />
</directory>
<directory name="kbdsg">
<xi:include href="kbdsg/kbdsg.rbuild" />