17 Jul
2007
17 Jul
'07
2:28 p.m.
Author: weiden
Date: Tue Jul 17 18:28:49 2007
New Revision: 27709
URL: http://svn.reactos.org/svn/reactos?rev=27709&view=rev
Log:
Patch by Frode Lillerud <frode(a)enkelt.no>
- Norwegian keyboard layout
See issue #2419 for more details.
Added:
trunk/reactos/dll/keyboard/kbdno/ (with props)
trunk/reactos/dll/keyboard/kbdno/kbdno.c (with props)
trunk/reactos/dll/keyboard/kbdno/kbdno.def (with props)
trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild (with props)
trunk/reactos/dll/keyboard/kbdno/kbdno.rc (with props)
Modified:
trunk/reactos/boot/bootdata/hivesys.inf
trunk/reactos/boot/bootdata/packages/reactos.dff
trunk/reactos/boot/bootdata/txtsetup.sif
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 Tue Jul 17 18:28:49 2007
@@ -88,6 +88,8 @@
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout
Text",0x00000000,"Ukrainian"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout
File",0x00000000,"kbdbur.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout
Text",0x00000000,"Burmese"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout
File",0x00000000,"kbdno.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout
Text",0x00000000,"Norwegian"
; Network
HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network
Adapters"
@@ -216,6 +218,7 @@
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0411",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0412",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0413",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0414",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0813",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0414",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0814",0x00000000,"l_intl.nls"
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Jul 17 18:28:49 2007
@@ -130,6 +130,7 @@
dll\keyboard\kbdhu\kbdhu.dll 1
dll\keyboard\kbdit\kbdit.dll 1
dll\keyboard\kbdja\kbdja.dll 1
+dll\keyboard\kbdno\kbdno.dll 1
dll\keyboard\kbdpl1\kbdpl1.dll 1
dll\keyboard\kbdpo\kbdpo.dll 1
dll\keyboard\kbdru\kbdru.dll 1
Modified: trunk/reactos/boot/bootdata/txtsetup.sif
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif…
==============================================================================
--- trunk/reactos/boot/bootdata/txtsetup.sif (original)
+++ trunk/reactos/boot/bootdata/txtsetup.sif Tue Jul 17 18:28:49 2007
@@ -110,6 +110,7 @@
0000040E = "Hungarian"
00000410 = "Italian"
00000411 = "Japanese"
+00000414 = "Norwegian"
00000415 = "Polish (programmer's)"
00000816 = "Portuguese (Portugal)"
00000419 = "Russian"
@@ -135,6 +136,7 @@
0000040E = kbdhu.dll
00000410 = kbdit.dll
00000411 = kbdja.dll
+00000414 = kbdno.dll
00000415 = kbdpl1.dll
00000816 = kbdpo.dll
00000419 = kbdru.dll
Propchange: trunk/reactos/dll/keyboard/kbdno/
------------------------------------------------------------------------------
--- bugtraq:url (added)
+++ bugtraq:url Tue Jul 17 18:28:49 2007
@@ -1,0 +1,3 @@
+*.cbp
+*.user
+*.vcproj
Added: trunk/reactos/dll/keyboard/kbdno/kbdno.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.c…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdno/kbdno.c (added)
+++ trunk/reactos/dll/keyboard/kbdno/kbdno.c Tue Jul 17 18:28:49 2007
@@ -1,0 +1,497 @@
+/*
+ * Norwegian Keyboard layout
+ * Copyright (C) 2004 ReactOS Development Team
+ */
+#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[] = {
+ /* Normal vs Shifted */
+ /* The numbers */
+ { VK_OEM_5, NOCAPS, {0xbd, 0xa7} },
+ { '1', NOCAPS, {'1', '!'} },
+ /* Ctrl-2 generates NUL */
+ { VK_OEM_PLUS, NOCAPS, {'+', '?'} },
+ { VK_OEM_6, CAPS, {0xe5, 0xc5} }, /* Å */
+
+ /* Specials */
+ { VK_OEM_7, CAPS, {0xf8, 0xd8} }, /* Ø */
+ { VK_OEM_3, CAPS, {0xe6, 0xc6} }, /* Æ */
+
+ { 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} },
+ { 'M', CAPS, {'m', 'M', 0x0d} },
+ { '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_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, 0x20ac}
},
+ { '7', NOCAPS, {'7', '/', WCH_NONE,
'{'} },
+ { '8', NOCAPS, {'8', '(', WCH_NONE,
'['} },
+ { '9', NOCAPS, {'9', ')', WCH_NONE,
']'} },
+ { '0', NOCAPS, {'0', '=', WCH_NONE,
'}'} },
+ { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_DEAD, '|'} },
+ { VK_EMPTY , NOCAPS, {0xb4, '`', '|', WCH_NONE} },
+
+ { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} },
+ { VK_OEM_1, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD} },
+ { VK_EMPTY , NOCAPS, {0xa8, '^', WCH_NONE, '~'} },
+
+ { '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_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, {'.'} },
+ { 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"TILBAKE" },
+ { 0x0f, L"TAB" },
+ { 0x1c, L"ENTER" },
+ { 0x1d, L"CTRL" },
+ { 0x2a, L"SHIFT" },
+ { 0x36, L"H\x00D8JRE SHIFT" },
+ { 0x37, L"NUM * (Numerisk del)" },
+ { 0x38, L"ALT" },
+ { 0x39, L"MELLOMRUM" },
+ { 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 del)" },
+ { 0x48, L"8 (Numerisk del)" },
+ { 0x49, L"9 (Numerisk del)" },
+ { 0x4a, L"- (Numerisk del)" },
+ { 0x4b, L"4 (Numerisk del)" },
+ { 0x4c, L"5 (Numerisk del)" },
+ { 0x4d, L"6 (Numerisk del)" },
+ { 0x4e, L"+ (Numerisk del)" },
+ { 0x4f, L"1 (Numerisk del)" },
+ { 0x50, L"2 (Numerisk del)" },
+ { 0x51, L"3 (Numerisk del)" },
+ { 0x52, L"0 (Numerisk del)" },
+ { 0x53, L"DESIMAL (Numerisk 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"ENTER (Numerisk del)" },
+ { 0x1d, L"H\x00D8JRE CTRL" },
+ { 0x35, L"DIVISION (Numerisk del)" },
+ { 0x37, L"PRINT SCREEN" },
+ { 0x38, L"H\x00D8JRE ALT" },
+ { 0x45, L"NUM LOCK" },
+ { 0x46, L"BREAK" },
+ { 0x47, L"HOME" },
+ { 0x48, L"PIL OPP" },
+ { 0x49, L"PAGE UP" },
+ { 0x4b, L"VENSTRE PIL" },
+//{ 0x4c, L"Center" },
+ { 0x4d, L"H\x00D8JRE PIL" },
+ { 0x4f, L"END" },
+ { 0x50, L"PIL NED" },
+ { 0x51, L"PAGE DOWN" },
+ { 0x52, L"INS" },
+ { 0x53, L"DEL" },
+ { 0x54, L"<ReactOS>" },
+ { 0x56, L"HJELP" },
+ { 0x5b, L"VENSTRE <ReactOS>" },
+ { 0x5c, L"H\x00D8JRE <ReactOS>" },
+ { 0x5d, L"Program" },
+ { 0, NULL }
+};
+
+ROSDATA DEADKEY_LPWSTR dead_key_names[] = {
+ L"\x00a8" L"Omlyd",
+ L"\x005e" L"Cirkumfleks",
+ L"\x007e" L"Tilde",
+ L"\x00b4" L"Akut",
+ L"\x0060" L"Grave",
+ 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 -- Norwegian doesn't have any (æ is not a ligature!)*/
+ 0,
+ 0,
+ NULL
+};
+
+PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+ return &keyboard_layout_table;
+}
+
+INT STDCALL
+DllMain(
+ PVOID hinstDll,
+ ULONG dwReason,
+ PVOID reserved)
+{
+ UNREFERENCED_PARAMETER(hinstDll);
+ UNREFERENCED_PARAMETER(dwReason);
+ UNREFERENCED_PARAMETER(reserved);
+ return 1;
+}
Propchange: trunk/reactos/dll/keyboard/kbdno/kbdno.c
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/keyboard/kbdno/kbdno.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.d…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdno/kbdno.def (added)
+++ trunk/reactos/dll/keyboard/kbdno/kbdno.def Tue Jul 17 18:28:49 2007
@@ -1,0 +1,3 @@
+LIBRARY kbdno.dll
+EXPORTS
+KbdLayerDescriptor
Propchange: trunk/reactos/dll/keyboard/kbdno/kbdno.def
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.r…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild (added)
+++ trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild Tue Jul 17 18:28:49 2007
@@ -1,0 +1,9 @@
+<module name="kbdno" type="kernelmodedll" entrypoint="0"
installbase="system32" installname="kbdno.dll"
allowwarnings="true">
+ <importlibrary definition="kbdno.def" />
+ <include base="ntoskrnl">include</include>
+ <define name="_DISABLE_TIDENTS" />
+ <define name="__USE_W32API" />
+ <define name="_WIN32_WINNT">0x0500</define>
+ <file>kbdno.c</file>
+ <file>kbdno.rc</file>
+</module>
Propchange: trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/keyboard/kbdno/kbdno.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.r…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdno/kbdno.rc (added)
+++ trunk/reactos/dll/keyboard/kbdno/kbdno.rc Tue Jul 17 18:28:49 2007
@@ -1,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS NOAscii Keyboard Layout\0"
+#define REACTOS_STR_INTERNAL_NAME "kbdno\0"
+#define REACTOS_STR_ORIGINAL_FILENAME "kbdno.dll\0"
+#include <reactos/version.rc>
Propchange: trunk/reactos/dll/keyboard/kbdno/kbdno.rc
------------------------------------------------------------------------------
svn:eol-style = native
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 Tue Jul 17 18:28:49 2007
@@ -38,6 +38,9 @@
<directory name="kbdja">
<xi:include href="kbdja/kbdja.rbuild" />
</directory>
+ <directory name="kbdno">
+ <xi:include href="kbdno/kbdno.rbuild" />
+ </directory>
<directory name="kbdpl1">
<xi:include href="kbdpl1/kbdpl1.rbuild" />
</directory>