Add US-Dvorak keyboard layout and enable swedish keyboard layout.

Patch by ai2097.
This fixes bug #329.

svn path=/trunk/; revision=9602
This commit is contained in:
Eric Kohl 2004-06-03 11:20:10 +00:00
parent 1d286fa480
commit df6802c1fd
11 changed files with 529 additions and 3 deletions

View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.224 2004/06/01 19:06:50 sedwards Exp $
# $Id: Makefile,v 1.225 2004/06/03 11:14:38 ekohl Exp $
#
# Global makefile
#
@ -35,7 +35,7 @@ LIB_FSLIB = vfatlib
LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt
# Keyboard layout libraries
DLLS_KBD = kbdus kbdgr kbdfr kbduk
DLLS_KBD = kbddv kbdfr kbdgr kbdse kbduk kbdus
# Control Panels
DLLS_CPL = cpl

View file

@ -12,8 +12,12 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout File",0
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout Text",0x00000000,"GR"
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\00010409","Layout File",0x00000000,"kbddv.dll"
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\0000041d","Layout File",0x00000000,"kbdse.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"SE"
; NLS Files
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","10000",0x00000000,"c_10000.nls"
@ -41,6 +45,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","040d",0x00000000,"l_intl.n
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","040e",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","040f",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0410",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","041d",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x00000000,"0409"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0x00000000,"0409"

View file

@ -60,8 +60,10 @@ lib\freetype\freetype.dll 1
lib\gdi32\gdi32.dll 1
lib\imm32\imm32.dll 1
lib\iphlpapi\iphlpapi.dll 1
lib\kbdfr\kbddv.dll 1
lib\kbdfr\kbdfr.dll 1
lib\kbdgr\kbdgr.dll 1
lib\kbdse\kbdse.dll 1
lib\kbduk\kbduk.dll 1
lib\kbdus\kbdus.dll 1
lib\kernel32\kernel32.dll 1

View file

@ -58,7 +58,8 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
[KeyboardLayout]
00000809 = "English (United Kingdom)"
00000409 = "English (US)"
00000409 = "English (USA)"
00010409 = "English (USA-Dvorak)"
0000040C = "French (France)"
00000407 = "German (Germany)"
0000041D = "Swedish"
@ -66,6 +67,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
[Files.KeyboardLayout]
00000407 = kbdgr.dll
00000409 = kbdus.dll
00010409 = kbddv.dll
0000040C = kbdfr.dll
0000041D = kbdse.dll
00000809 = kgbgb.dll

View file

@ -0,0 +1,12 @@
errcodes.rc
temp.exp
*.a
*.o
*.bin
*.dll
*.lib
*.coff
*.sym
*.tmp
*.map
*.d

15
reactos/lib/kbddv/Jamfile Normal file
View file

@ -0,0 +1,15 @@
SubDir ROS_TOP lib kbddv ;
# This stuff should actually be moved to Jamrules
# in order to more easily support other compilers
CCFLAGS += -Wall -fno-builtin ;
# NOTE - I'm no Jam expert, yet. This stuff should be
# abstracted into the Jamrules file.
LINKFLAGS = -nostartfiles -nostdlib -shared ;
LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ;
SRCS = kbddv
SharedLibrary kbddv : $(SRCS) ;
LINKLIBS = ;

400
reactos/lib/kbddv/kbddv.c Normal file
View file

@ -0,0 +1,400 @@
/*
* ReactOS USASCII Keyboard layout
* Copyright (C) 2003 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
#pragma data_seg(".data")
#define ROSDATA static
#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 */
/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */
#ifndef VK_OEM_1 /* ;/: */
#define VK_OEM_1 0xba
#endif
#ifndef VK_OEM_PLUS
#define VK_OEM_PLUS 0xbb
#endif
#ifndef VK_OEM_COMMA
#define VK_OEM_COMMA 0xbc
#endif
#ifndef VK_OEM_MINUS
#define VK_OEM_MINUS 0xbd
#endif
#ifndef VK_OEM_PERIOD
#define VK_OEM_PERIOD 0xbe
#endif
#ifndef VK_OEM_2 /* //? */
#define VK_OEM_2 0xbf
#endif
#ifndef VK_OEM_3 /* `/~ */
#define VK_OEM_3 0xc0
#endif
#ifndef VK_OEM_4 /* [/{ */
#define VK_OEM_4 0xdb
#endif
#ifndef VK_OEM_5 /* \/| */
#define VK_OEM_5 0xdc
#endif
#ifndef VK_OEM_6 /* ]/} */
#define VK_OEM_6 0xdd
#endif
#ifndef VK_OEM_7 /* '/" */
#define VK_OEM_7 0xde
#endif
#ifndef VK_OEM_8
#define VK_OEM_8 0xdf
#endif
#ifndef VK_OEM_102
#define VK_OEM_102 0xe1
#endif
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_4, VK_OEM_6, VK_BACK,
/* - 0f - */
/* First Letters Row */
VK_TAB, VK_OEM_7, VK_OEM_COMMA, VK_OEM_PERIOD,
'P', 'Y', 'F', 'G',
'C', 'R', 'L',
VK_OEM_2, VK_OEM_PLUS, VK_RETURN,
/* - 1d - */
/* Second Letters Row */
VK_LCONTROL,
'A', 'O', 'E', 'U',
'I', 'D', 'H', 'T',
'N', 'S', VK_OEM_MINUS,VK_OEM_3,
VK_LSHIFT, VK_OEM_5,
/* - 2c - */
/* Third letters row */
VK_OEM_1, 'Q', 'J', 'K',
'X', 'B', 'M', 'W',
'V', 'Z', 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_EMPTY, 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[] = {
{ 0, 0 },
};
ROSDATA VSC_VK extcode1_to_vk[] = {
{ 0, 0 },
};
ROSDATA VK_TO_BIT modifier_keys[] = {
{ VK_SHIFT, KSHIFT },
{ VK_CONTROL, KCTRL },
{ VK_MENU, KALT },
{ 0, 0 }
};
typedef struct _mymod {
PVOID mod_keys;
WORD maxmod;
BYTE mod_max[4];
} INTERNAL_KBD_MODIFIERS;
ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = {
modifier_keys,
3,
{ 0, 1, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT */
};
#define NOCAPS 0
#define CAPS KSHIFT /* Caps -> shift */
ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
/* Normal vs Shifted */
/* The numbers */
{ '1', NOCAPS, '1', '!' },
/* Ctrl-2 generates NUL */
{ '3', NOCAPS, '3', '#' },
{ '4', NOCAPS, '4', '$' },
{ '5', NOCAPS, '5', '%' },
/* Ctrl-6 generates RS */
{ '7', NOCAPS, '7', '&' },
{ '8', NOCAPS, '8', '*' },
{ '9', NOCAPS, '9', '(' },
{ '0', NOCAPS, '0', ')' },
/* First letter row */
{ 'P', CAPS, 'p', 'P' },
{ 'Y', CAPS, 'y', 'Y' },
{ 'F', CAPS, 'f', 'F' },
{ 'G', CAPS, 'g', 'G' },
{ 'C', CAPS, 'c', 'C' },
{ 'R', CAPS, 'r', 'R' },
{ 'L', CAPS, 'l', 'L' },
/* Second letter row */
{ 'A', CAPS, 'a', 'A' },
{ 'O', CAPS, 'o', 'O' },
{ 'E', CAPS, 'e', 'E' },
{ 'U', CAPS, 'u', 'U' },
{ 'I', CAPS, 'i', 'I' },
{ 'D', CAPS, 'd', 'D' },
{ 'H', CAPS, 'h', 'H' },
{ 'T', CAPS, 't', 'T' },
{ 'N', CAPS, 'n', 'N' },
{ 'S', CAPS, 's', 'S' },
/* Third letter row */
{ 'Q', CAPS, 'q', 'Q' },
{ 'J', CAPS, 'j', 'J' },
{ 'K', CAPS, 'k', 'K' },
{ 'X', CAPS, 'x', 'X' },
{ 'B', CAPS, 'b', 'B' },
{ 'M', CAPS, 'm', 'M' },
{ 'W', CAPS, 'w', 'W' },
{ 'V', CAPS, 'v', 'V' },
{ 'Z', CAPS, 'z', 'Z' },
/* Specials */
/* Ctrl-_ generates US */
{ VK_OEM_7 ,NOCAPS, '\'','\"'},
{ VK_OEM_COMMA ,NOCAPS, ',', '<' },
{ VK_OEM_PERIOD ,NOCAPS, '.', '>' },
{ VK_OEM_2 ,NOCAPS, '/', '?' },
{ VK_OEM_PLUS ,NOCAPS, '=', '+' },
{ VK_OEM_1 ,NOCAPS, ';', ':' },
{ VK_OEM_3 ,NOCAPS, '`', '~' },
/* Keys that do not have shift states */
{ VK_TAB ,NOCAPS, '\t','\t'},
{ VK_ADD ,NOCAPS, '+', '+' },
{ VK_SUBTRACT,NOCAPS, '-', '-' },
{ VK_MULTIPLY,NOCAPS, '*', '*' },
{ VK_DIVIDE ,NOCAPS, '/', '/' },
{ VK_ESCAPE ,NOCAPS, '\x1b','\x1b' },
{ VK_SPACE ,NOCAPS, ' ', ' ' },
{ 0, 0 }
};
ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
/* Normal, Shifted, Ctrl */
/* Legacy (telnet-style) ascii escapes */
{ VK_OEM_4, 0, '[', '{', 0x1b /* ESC */ },
{ VK_OEM_6, 0, ']', '}', 0x1d /* GS */ },
{ VK_OEM_5, 0, '\\','|', 0x1c /* FS */ },
{ VK_RETURN,0, '\r', '\r', '\n' },
{ 0,0 }
};
ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
/* Normal, Shifted, Ctrl, C-S-x */
/* Legacy Ascii generators */
{ '2', NOCAPS, '2', '@', WCH_NONE, 0 },
{ '6', NOCAPS, '6', '^', WCH_NONE, 0x1e /* RS */ },
{ VK_OEM_MINUS, NOCAPS, '-', '_', WCH_NONE, 0x1f /* US */ },
{ 0, 0 }
};
ROSDATA VK_TO_WCHARS1 keypad_numbers[] = {
{ 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' },
{ VK_DECIMAL, 0, '.' },
{ VK_BACK, 0, '\010' },
{ 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(1,keypad_numbers),
vk_master(2,key_to_chars_2mod),
vk_master(3,key_to_chars_3mod),
vk_master(4,key_to_chars_4mod),
{ 0,0,0 }
};
ROSDATA VSC_LPWSTR key_names[] = {
{ 0x00, L"" },
{ 0x01, L"Esc" },
{ 0x0e, L"Backspace" },
{ 0x0f, L"Tab" },
{ 0x1c, L"Enter" },
{ 0x1d, L"Ctrl" },
{ 0x2a, L"Shift" },
{ 0x36, L"Right Shift" },
{ 0x37, L"Num *" },
{ 0x38, L"Alt" },
{ 0x39, L"Space" },
{ 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"Num 7" },
{ 0x48, L"Num 8" },
{ 0x49, L"Num 9" },
{ 0x4a, L"Num -" },
{ 0x4b, L"Num 4" },
{ 0x4c, L"Num 5" },
{ 0x4d, L"Num 6" },
{ 0x4e, L"Num +" },
{ 0x4f, L"Num 1" },
{ 0x50, L"Num 2" },
{ 0x51, L"Num 3" },
{ 0x52, L"Num 0" },
{ 0x53, L"Num Del" },
{ 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"Num Enter" },
{ 0x1d, L"Right Ctrl" },
{ 0x35, L"Num /" },
{ 0x37, L"Prnt Scrn" },
{ 0x38, L"Right Alt" },
{ 0x45, L"Num Lock" },
{ 0x46, L"Break" },
{ 0x47, L"Home" },
{ 0x48, L"Up" },
{ 0x49, L"Page Up" },
{ 0x4a, L"Left" },
{ 0x4c, L"Center" },
{ 0x4d, L"Right" },
{ 0x4f, L"End" },
{ 0x50, L"Down" },
{ 0x51, L"Page Down" },
{ 0x52, L"Insert" },
{ 0x53, L"Delete" },
{ 0x54, L"<ReactOS>" },
{ 0x55, L"Help" },
{ 0x56, L"Left Windows" },
{ 0x5b, L"Right Windows" },
{ 0, NULL },
};
/* Finally, the master table */
ROSDATA KBDTABLES keyboard_layout_table = {
/* modifier assignments */
(PMODIFIERS)&modifier_bits,
/* character from vk tables */
vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */
/* English doesn't have any, anyway */
NULL,
/* Key names */
(VSC_LPWSTR *)key_names,
(VSC_LPWSTR *)extended_key_names,
NULL, /* 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(0,1), /* Version 1.0 */
/* Ligatures -- English doesn't have any */
0,
0,
NULL
};
PKBDTABLES STDCALL KbdLayerDescriptor() {
return &keyboard_layout_table;
}

View file

@ -0,0 +1,8 @@
;
; ReactOS Operating System
;
LIBRARY kbddvorak.dll
EXPORTS
KbdLayerDescriptor@0
;EOF

View file

@ -0,0 +1,5 @@
LIBRARY user32.dll
EXPORTS
KbdLayerDescriptor=KbdLayerDescriptor@0
; EOF

View file

@ -0,0 +1,36 @@
#include <defines.h>
#include <reactos/resource.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
VS_VERSION_INFO VERSIONINFO
FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", RES_STR_COMPANY_NAME
VALUE "FileDescription", "ReactOS US Dvorak Keyboard Layout\0"
VALUE "FileVersion", RES_STR_FILE_VERSION
VALUE "InternalName", "kbddvorak\0"
VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT
VALUE "OriginalFilename", "kbddvorak.dll\0"
VALUE "ProductName", RES_STR_PRODUCT_NAME
VALUE "ProductVersion", RES_STR_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END

View file

@ -0,0 +1,41 @@
# $Id: makefile,v 1.1 2004/06/03 11:14:06 ekohl Exp $
PATH_TO_TOP = ../..
TARGET_TYPE = dynlink
TARGET_NAME = kbddv
TARGET_BASE = 0x5500000
TARGET_ENTRY = 0x00000000
TARGET_CFLAGS = -I$(PATH_TO_TOP)/ntoskrnl/include
# require os code to explicitly request A/W version of structs/functions
TARGET_CFLAGS += -D_DISABLE_TIDENTS
TARGET_LFLAGS = -nostartfiles -nostdlib
TARGET_SDKLIBS =
TARGET_GCCLIBS = gcc
TARGET_PCH =
TARGET_CLEAN =
TARGET_OBJECTS = kbddv.o
DEP_OBJECTS = $(TARGET_OBJECTS)
include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk
include $(TOOLS_PATH)/depend.mk
%/TAGS:
etags -o $(@D)/TAGS $(@D)/\*.c
etags: ./TAGS