Author: rharabien Date: Thu Oct 20 13:16:40 2011 New Revision: 54211
URL: http://svn.reactos.org/svn/reactos?rev=54211&view=rev Log: - Add Polish keyboard layout (there was only "Polish programmer" layout). It should fix installing ROS in Polish.
Added: trunk/reactos/dll/keyboard/kbdpl/ - copied from r54194, trunk/reactos/dll/keyboard/kbdpl1/ trunk/reactos/dll/keyboard/kbdpl/kbdpl.c - copied unchanged from r54194, trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c trunk/reactos/dll/keyboard/kbdpl/kbdpl.rbuild - copied, changed from r54194, trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild trunk/reactos/dll/keyboard/kbdpl/kbdpl.rc - copied, changed from r54194, trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc trunk/reactos/dll/keyboard/kbdpl/kbdpl.spec - copied unchanged from r54194, trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.spec Removed: trunk/reactos/dll/keyboard/kbdpl/kbdpl1.c trunk/reactos/dll/keyboard/kbdpl/kbdpl1.rbuild trunk/reactos/dll/keyboard/kbdpl/kbdpl1.rc trunk/reactos/dll/keyboard/kbdpl/kbdpl1.spec Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/keyboard/CMakeLists.txt trunk/reactos/dll/keyboard/kbdpl/CMakeLists.txt trunk/reactos/dll/keyboard/keyboard.rbuild
Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386.... ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Thu Oct 20 13:16:40 2011 @@ -453,6 +453,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout File",0x00000000,"kbdpl1.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout Text",0x00000000,"Polish (Programmers)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5035" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010415","Layout File",0x00000000,"kbdpl.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010415","Layout Text",0x00000000,"Polish (214)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010415","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5036"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010416","Layout File",0x00000000,"kbdbr.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010416","Layout Text",0x00000000,"Portuguese (Brazilian ABNT2)"
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reac... ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Oct 20 13:16:40 2011 @@ -232,6 +232,7 @@ dll\keyboard\kbdmac\kbdmac.dll 1 dll\keyboard\kbdne\kbdne.dll 1 dll\keyboard\kbdno\kbdno.dll 1 +dll\keyboard\kbdpl\kbdpl.dll 1 dll\keyboard\kbdpl1\kbdpl1.dll 1 dll\keyboard\kbdpo\kbdpo.dll 1 dll\keyboard\kbdro\kbdro.dll 1
Modified: trunk/reactos/dll/keyboard/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/CMakeLists.txt... ============================================================================== --- trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] Thu Oct 20 13:16:40 2011 @@ -50,6 +50,7 @@ add_subdirectory(kbdmac) add_subdirectory(kbdne) add_subdirectory(kbdno) +add_subdirectory(kbdpl) add_subdirectory(kbdpl1) add_subdirectory(kbdpo) add_subdirectory(kbdro)
Modified: trunk/reactos/dll/keyboard/kbdpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl/CMakeLis... ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpl/CMakeLists.txt [iso-8859-1] Thu Oct 20 13:16:40 2011 @@ -1,12 +1,10 @@
-include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) +spec2def(kbdpl.dll kbdpl.spec)
-spec2def(kbdpl1.dll kbdpl1.spec) +add_library(kbdpl SHARED kbdpl.c kbdpl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpl.def)
-add_library(kbdpl1 SHARED kbdpl1.c kbdpl1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpl1.def) +set_entrypoint(kbdpl 0)
-set_entrypoint(kbdpl1 0) +add_dependencies(kbdpl psdk)
-add_dependencies(kbdpl1 psdk) - -add_cd_file(TARGET kbdpl1 DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET kbdpl DESTINATION reactos/system32 FOR all)
Copied: trunk/reactos/dll/keyboard/kbdpl/kbdpl.rbuild (from r54194, trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl/kbdpl.rb... ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpl/kbdpl.rbuild [iso-8859-1] Thu Oct 20 13:16:40 2011 @@ -1,8 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdpl1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpl1.dll"> - <importlibrary definition="kbdpl1.spec" /> - <include base="ntoskrnl">include</include> - <file>kbdpl1.c</file> - <file>kbdpl1.rc</file> +<module name="kbdpl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpl.dll"> + <importlibrary definition="kbdpl.spec" /> + <file>kbdpl.c</file> + <file>kbdpl.rc</file> </module>
Copied: trunk/reactos/dll/keyboard/kbdpl/kbdpl.rc (from r54194, trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl/kbdpl.rc... ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpl/kbdpl.rc [iso-8859-1] Thu Oct 20 13:16:40 2011 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Polish Programmer's Keyboard Layout\0" -#define REACTOS_STR_INTERNAL_NAME "kbdpl1\0" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdpl1.dll\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Polish Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdpl\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdpl.dll\0" #include <reactos/version.rc>
Removed: trunk/reactos/dll/keyboard/kbdpl/kbdpl1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl/kbdpl1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpl/kbdpl1.c (removed) @@ -1,426 +1,0 @@ -/* - * ReactOS Polish Keyboard layout - * Copyright (C) 2007 ReactOS - * License: LGPL, see: LGPL.txt - * author: Sebastian Gasiorek - * - * 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 <ndk/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 KNUMS KBDNUMPAD|KBDSPECIAL /* Special + number pad */ -#define KMEXT KBDEXT|KBDMULTIVK /* Multi + ext */ - -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_MINUS, VK_OEM_PLUS, VK_BACK, - /* - 0f - */ - /* First Letters Row */ - VK_TAB, 'Q', 'W', 'E', - 'R', 'T', 'Y', 'U', - 'I', 'O', 'P', - VK_OEM_4, VK_OEM_6, VK_RETURN, - /* - 1d - */ - /* Second Letters Row */ - VK_LCONTROL, - 'A', 'S', 'D', 'F', - 'G', 'H', 'J', 'K', - 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, - VK_LSHIFT, VK_OEM_5, - /* - 2c - */ - /* Third letters row */ - 'Z', 'X', 'C', 'V', - 'B', 'N', 'M', VK_OEM_COMMA, - VK_OEM_PERIOD,VK_OEM_2, 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 | KBDMULTIVK, - /* - 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[] = { - { 0x10, VK_MEDIA_PREV_TRACK | KBDEXT }, - { 0x19, VK_MEDIA_NEXT_TRACK | KBDEXT }, - { 0x1D, VK_RCONTROL | KBDEXT }, - { 0x20, VK_VOLUME_MUTE | KBDEXT }, - { 0x21, VK_LAUNCH_APP2 | KBDEXT }, - { 0x22, VK_MEDIA_PLAY_PAUSE | KBDEXT }, - { 0x24, VK_MEDIA_STOP | KBDEXT }, - { 0x2E, VK_VOLUME_DOWN | KBDEXT }, - { 0x30, VK_VOLUME_UP | KBDEXT }, - { 0x32, VK_BROWSER_HOME | KBDEXT }, - { 0x35, VK_DIVIDE | KBDEXT }, - { 0x37, VK_SNAPSHOT | KBDEXT }, - { 0x38, VK_RMENU | KBDEXT }, - { 0x47, VK_HOME | KBDEXT }, - { 0x48, VK_UP | KBDEXT }, - { 0x49, VK_PRIOR | KBDEXT }, - { 0x4B, VK_LEFT | KBDEXT }, - { 0x4D, VK_RIGHT | KBDEXT }, - { 0x4F, VK_END | KBDEXT }, - { 0x50, VK_DOWN | KBDEXT }, - { 0x51, VK_NEXT | KBDEXT }, - { 0x52, VK_INSERT | KBDEXT }, - { 0x53, VK_DELETE | KBDEXT }, - { 0x5B, VK_LWIN | KBDEXT }, - { 0x5C, VK_RWIN | KBDEXT }, - { 0x5D, VK_APPS | KBDEXT }, - { 0x5F, VK_SLEEP | KBDEXT }, - { 0x65, VK_BROWSER_SEARCH | KBDEXT }, - { 0x66, VK_BROWSER_FAVORITES | KBDEXT }, - { 0x67, VK_BROWSER_REFRESH | KBDEXT }, - { 0x68, VK_BROWSER_STOP | KBDEXT }, - { 0x69, VK_BROWSER_FORWARD | KBDEXT }, - { 0x6A, VK_BROWSER_BACK | KBDEXT }, - { 0x6B, VK_LAUNCH_APP1 | KBDEXT }, - { 0x6C, VK_LAUNCH_MAIL | KBDEXT }, - { 0x6D, VK_LAUNCH_MEDIA_SELECT | KBDEXT }, - { 0x1C, VK_RETURN | KBDEXT }, - { 0x46, VK_CANCEL | KBDEXT }, - { 0, 0 }, -}; - -ROSDATA VSC_VK extcode1_to_vk[] = { - { 0x1D, VK_PAUSE }, - { 0, 0 }, -}; - -ROSDATA VK_TO_BIT modifier_keys[] = { - { VK_SHIFT, KBDSHIFT }, - { VK_CONTROL, KBDCTRL }, - { VK_MENU, KBDALT }, - { 0, 0 } -}; - -ROSDATA MODIFIERS modifier_bits = { - modifier_keys, - 7, - { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } -}; - -ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - /* Normal vs Shifted */ - /* The alphabet */ - { 'B', CAPLOK, {'b', 'B'} }, - { 'D', CAPLOK, {'d', 'D'} }, - { 'F', CAPLOK, {'f', 'F'} }, - { 'G', CAPLOK, {'g', 'G'} }, - { 'H', CAPLOK, {'h', 'H'} }, - { 'I', CAPLOK, {'i', 'I'} }, - { 'J', CAPLOK, {'j', 'J'} }, - { 'K', CAPLOK, {'k', 'K'} }, - { 'M', CAPLOK, {'m', 'M'} }, - { 'P', CAPLOK, {'p', 'P'} }, - { 'Q', CAPLOK, {'q', 'Q'} }, - { 'R', CAPLOK, {'r', 'R'} }, - { 'T', CAPLOK, {'t', 'T'} }, - { 'U', CAPLOK, {'u', 'U'} }, - { 'V', CAPLOK, {'v', 'V'} }, - { 'W', CAPLOK, {'w', 'W'} }, - { 'Y', CAPLOK, {'y', 'Y'} }, - - /* The numbers */ - { '1', 0, {'1', '!'} }, - /* Ctrl-2 generates NUL */ - { '3', 0, {'3', '#'} }, - { '4', 0, {'4', '$'} }, - { '5', 0, {'5', '%'} }, - /* Ctrl-6 generates RS */ - { '7', 0, {'7', '&'} }, - { '8', 0, {'8', '*'} }, - { '9', 0, {'9', '('} }, - { '0', 0, {'0', ')'} }, - - /* Specials */ - /* Ctrl-_ generates US */ - { VK_OEM_PLUS, 0, {'=', '+'} }, - { VK_OEM_1, 0, {';', ':'} }, - { VK_OEM_7, 0, {''','"'} }, - { VK_OEM_3, 0, {'`', WCH_DEAD} }, - { 0xff, 0, {WCH_NONE,'~'} }, - { VK_OEM_COMMA, 0, {',', '<'} }, - { VK_OEM_PERIOD, 0, {'.', '>'} }, - { VK_OEM_2, 0, {'/', '?'} }, - /* Keys that do not have shift states */ - { VK_TAB, 0, {'\t','\t'} }, - { VK_ADD, 0, {'+', '+'} }, - { VK_SUBTRACT, 0, {'-', '-'} }, - { VK_MULTIPLY, 0, {'*', '*'} }, - { VK_DIVIDE, 0, {'/', '/'} }, - { VK_ESCAPE, 0, {0x1b,0x1b} }, - { VK_SPACE, 0, {' ', ' '} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - /* Normal, Shifted, C-A */ - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { - /* Normal, Shifted, Ctrl, C-S-x */ - { 'A', CAPLOK|CAPLOKALTGR, {'a', 'A', 0x0105, 0x0104} }, - { 'C', CAPLOK|CAPLOKALTGR, {'c', 'C', 0x0107, 0x0106} }, - { 'E', CAPLOK|CAPLOKALTGR, {'e', 'E', 0x0119, 0x0118} }, - { 'L', CAPLOK|CAPLOKALTGR, {'l', 'L', 0x0142, 0x0141} }, - { 'N', CAPLOK|CAPLOKALTGR, {'n', 'N', 0x0144, 0x0143} }, - { 'O', CAPLOK|CAPLOKALTGR, {'o', 'O', 0xF3, 0xD3} }, - { 'S', CAPLOK|CAPLOKALTGR, {'s', 'S', 0x015B, 0x015A} }, - { 'X', CAPLOK|CAPLOKALTGR, {'x', 'X', 0x017A, 0x0179} }, - { 'Z', CAPLOK|CAPLOKALTGR, {'z', 'Z', 0x017C, 0x017B} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { - /* Normal, Shifted, C-A, S-C-A, Ctrl */ - /* Legacy Ascii generators */ - { VK_OEM_4, 0, {'[', '{', WCH_NONE, WCH_NONE, 0x1b /* ESC */} }, - { VK_OEM_6, 0, {']', '}', WCH_NONE, WCH_NONE, 0x1d /* GS */} }, - { VK_OEM_5, 0, {'\','|', WCH_NONE, WCH_NONE, 0x1c /* FS */} }, - { VK_RETURN, 0, {'\r','\r',WCH_NONE, WCH_NONE, '\n'} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { - /* Normal, Shifted, Ctrl-Alt, Sh-Ctrl-Alt, Ctrl, Ctrl-Shift */ - /* Legacy Ascii generators */ - { '2', 0, {'2', '@', WCH_NONE, WCH_NONE, WCH_NONE, 0x00} }, - { '6', 0, {'6', '^', WCH_NONE, WCH_NONE, WCH_NONE, 0x1e /* RS */} }, - { VK_OEM_MINUS, 0, {'-', '_', WCH_NONE, WCH_NONE, 0x1f, 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), - vk_master(5, key_to_chars_5mod), - vk_master(6, key_to_chars_6mod), - { 0, 0, 0 } -}; - -ROSDATA VSC_LPWSTR key_names[] = { - { 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 }, -}; - -ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"~" L"Tylda", - NULL -}; - -#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags - -ROSDATA DEADKEY dead_key[] = { - { DEADTRANS(L'a', L'~', 0x0105, 0x00) }, - { DEADTRANS(L'c', L'~', 0x0107, 0x00) }, - { DEADTRANS(L'e', L'~', 0x0119, 0x00) }, - { DEADTRANS(L'l', L'~', 0x0142, 0x00) }, - { DEADTRANS(L'n', L'~', 0x0144, 0x00) }, - { DEADTRANS(L'o', L'~', 0xF3, 0x00) }, - { DEADTRANS(L's', L'~', 0x015B, 0x00) }, - { DEADTRANS(L'x', L'~', 0x017A, 0x00) }, - { DEADTRANS(L'z', L'~', 0x017C, 0x00) }, - - { DEADTRANS(L'A', L'~', 0x0104, 0x00) }, - { DEADTRANS(L'C', L'~', 0x0106, 0x00) }, - { DEADTRANS(L'E', L'~', 0x0118, 0x00) }, - { DEADTRANS(L'L', L'~', 0x0141, 0x00) }, - { DEADTRANS(L'N', L'~', 0x0143, 0x00) }, - { DEADTRANS(L'O', L'~', 0xD3, 0x00) }, - { DEADTRANS(L'S', L'~', 0x015A, 0x00) }, - { DEADTRANS(L'X', L'~', 0x0179, 0x00) }, - { DEADTRANS(L'Z', L'~', 0x017B, 0x00) }, -}; - -/* 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 */ - key_names, - 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(KLLF_ALTGR, 1), /* Version 1.0 */ - - 0, - 0, - NULL -}; - -PKBDTABLES WINAPI KbdLayerDescriptor(VOID) { - return &keyboard_layout_table; -} -
Removed: trunk/reactos/dll/keyboard/kbdpl/kbdpl1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl/kbdpl1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpl/kbdpl1.rbuild (removed) @@ -1,8 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdpl1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpl1.dll"> - <importlibrary definition="kbdpl1.spec" /> - <include base="ntoskrnl">include</include> - <file>kbdpl1.c</file> - <file>kbdpl1.rc</file> -</module>
Removed: trunk/reactos/dll/keyboard/kbdpl/kbdpl1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl/kbdpl1.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpl/kbdpl1.rc (removed) @@ -1,5 +1,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Polish Programmer's Keyboard Layout\0" -#define REACTOS_STR_INTERNAL_NAME "kbdpl1\0" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdpl1.dll\0" -#include <reactos/version.rc>
Removed: trunk/reactos/dll/keyboard/kbdpl/kbdpl1.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl/kbdpl1.spec [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpl/kbdpl1.spec (removed) @@ -1,1 +1,0 @@ -@ stdcall KbdLayerDescriptor()
Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbuil... ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] Thu Oct 20 13:16:40 2011 @@ -151,6 +151,9 @@ <directory name="kbdno"> <xi:include href="kbdno/kbdno.rbuild" /> </directory> + <directory name="kbdpl"> + <xi:include href="kbdpl/kbdpl.rbuild" /> + </directory> <directory name="kbdpl1"> <xi:include href="kbdpl1/kbdpl1.rbuild" /> </directory>