Patch by Apostolos Alexiadis grad0621@di.uoa.gr: - Greek keyboard layout Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/bootdata/txtsetup.sif Added: trunk/reactos/lib/keyboard/kbdhe/ Added: trunk/reactos/lib/keyboard/kbdhe/kbdhe.c Added: trunk/reactos/lib/keyboard/kbdhe/kbdhe.def Added: trunk/reactos/lib/keyboard/kbdhe/kbdhe.rc Added: trunk/reactos/lib/keyboard/kbdhe/kbdhe.xml _____
Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-12-04 22:28:29 UTC (rev 19891) +++ trunk/reactos/bootdata/hivesys.inf 2005-12-04 22:29:23 UTC (rev 19892) @@ -60,6 +60,8 @@
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout Text",0x00000000,"SG"
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\00000408","Layou t File",0x00000000,"kbdhe.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layou t Text",0x00000000,"Greek"
; Network
HKLM,"SYSTEM\CurrentControlSet\Control\Network{4D36E972-E325-11CE-BFC1- 08002BE10318}",,0x00000000,"Network Adapters" _____
Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-12-04 22:28:29 UTC (rev 19891) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-12-04 22:29:23 UTC (rev 19892) @@ -107,6 +107,7 @@
lib\keyboard\kbdes\kbdes.dll 1 lib\keyboard\kbdfr\kbdfr.dll 1 lib\keyboard\kbdgr\kbdgr.dll 1 +lib\keyboard\kbdhe\kbdhe.dll 1 lib\keyboard\kbdhu\kbdhu.dll 1 lib\keyboard\kbdru\kbdru.dll 1 lib\keyboard\kbdse\kbdse.dll 1 _____
Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-12-04 22:28:29 UTC (rev 19891) +++ trunk/reactos/bootdata/txtsetup.sif 2005-12-04 22:29:23 UTC (rev 19892) @@ -91,8 +91,9 @@
0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" 00000807 = "German (Swiss)" +00000408 = "Greek" +00010408 = "Greek 220"
- [Files.KeyboardLayout] 00000406 = kbdda.dll 00000407 = kbdgr.dll @@ -106,6 +107,8 @@ 00000809 = kbduk.dll 00000807 = kbdsg.dll 00000813 = kbdbe.dll +00000408 = kbdhe.dll +00010408 = kbdhe.dll
[HiveInfs.Install] AddReg=hivecls.inf,AddReg Property changes on: trunk/reactos/lib/keyboard/kbdhe ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____
Added: trunk/reactos/lib/keyboard/kbdhe/kbdhe.c --- trunk/reactos/lib/keyboard/kbdhe/kbdhe.c 2005-12-04 22:28:29 UTC (rev 19891) +++ trunk/reactos/lib/keyboard/kbdhe/kbdhe.c 2005-12-04 22:29:23 UTC (rev 19892) @@ -0,0 +1,358 @@
+/* + * ReactOS Greek ASCII Keyboard layout + * Copyright (C) 2005 ReactOS + * License: LGPL, see: LGPL.txt + * author: Apostolos Alexiadis (Dj Apal«) + * + * 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 */ + +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 | 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 } +}; + +ROSDATA 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', ')'} }, + + /* Specials */ + /* Ctrl-_ generates GR */ + { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, + { VK_OEM_1 ,NOCAPS, {';', ':'} }, + { VK_OEM_7 ,NOCAPS, {''','"'} }, + { VK_OEM_3 ,NOCAPS, {'`', '~'} }, + { VK_OEM_COMMA ,NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD ,NOCAPS, {'.', '>'} }, + { VK_OEM_2 ,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 */ + + /* The alphabet */ + { 'A', CAPS, {'ß', '?', 0x01, 0x01} }, + { 'B', CAPS, {'Ô', '?', 0x02, 0x02} }, + { 'C', CAPS, {'°', 'Ï', 0x03, 0x03} }, + { 'D', CAPS, {'õ', '?', 0x04, 0x04} }, + { 'E', CAPS, {'Õ', '?', 0x05, 0x05} }, + { 'F', CAPS, {'÷', 'Í', 0x06, 0x06} }, + { 'G', CAPS, {'Ò', '?', 0x07, 0x07} }, + { 'H', CAPS, {'þ', 'Ã', 0x08, 0x08} }, + { 'I', CAPS, {'Ú', '?', 0x09, 0x09} }, + { 'J', CAPS, {'¯', '?', 0x0a, 0x0a} }, + { 'K', CAPS, {'Û', '?', 0x0b, 0x0b} }, + { 'L', CAPS, {'Ù', '?', 0x0c, 0x0c} }, + { 'M', CAPS, {'ý', '?', 0x0d, 0x0d} }, + { 'N', CAPS, {'Ý', '?', 0x0e, 0x0e} }, + { 'O', CAPS, {'´', '¤', 0x0f, 0x0f} }, + { 'P', CAPS, {'', 'ð', 0x10, 0x10} }, + { 'Q', CAPS, {';', ';', 0x11, 0x11} }, + { 'R', CAPS, {'±', 'Ð', 0x12, 0x12} }, + { 'S', CAPS, {'¾', 'Ë', 0x13, 0x13} }, + { 'T', CAPS, {'¶', 'È', 0x14, 0x14} }, + { 'U', CAPS, {'Þ', '?', 0x15, 0x15} }, + { 'V', CAPS, {'¨', '?', 0x16, 0x16} }, + { 'W', CAPS, {'?', '?', 0x17, 0x17} }, + { 'X', CAPS, {'¸', 'Î', 0x18, 0x18} }, + { 'Y', CAPS, {'§', 'i', 0x19, 0x19} }, + { 'Z', CAPS, {'µ', 'ã', 0x1a, 0x1a} }, + + /* 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 */ + &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 -- Greek doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor() { + return &keyboard_layout_table; +} + Property changes on: trunk/reactos/lib/keyboard/kbdhe/kbdhe.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____
Added: trunk/reactos/lib/keyboard/kbdhe/kbdhe.def --- trunk/reactos/lib/keyboard/kbdhe/kbdhe.def 2005-12-04 22:28:29 UTC (rev 19891) +++ trunk/reactos/lib/keyboard/kbdhe/kbdhe.def 2005-12-04 22:29:23 UTC (rev 19892) @@ -0,0 +1,8 @@
+; +; ReactOS Operating System +; +LIBRARY kbdhe.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF \ No newline at end of file Property changes on: trunk/reactos/lib/keyboard/kbdhe/kbdhe.def ___________________________________________________________________ Name: svn:eol-style + native _____
Added: trunk/reactos/lib/keyboard/kbdhe/kbdhe.rc --- trunk/reactos/lib/keyboard/kbdhe/kbdhe.rc 2005-12-04 22:28:29 UTC (rev 19891) +++ trunk/reactos/lib/keyboard/kbdhe/kbdhe.rc 2005-12-04 22:29:23 UTC (rev 19892) @@ -0,0 +1,6 @@
+#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Greek Ascii Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdhe\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdhe.dll\0" +#include <reactos/version.rc> + Property changes on: trunk/reactos/lib/keyboard/kbdhe/kbdhe.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____
Added: trunk/reactos/lib/keyboard/kbdhe/kbdhe.xml --- trunk/reactos/lib/keyboard/kbdhe/kbdhe.xml 2005-12-04 22:28:29 UTC (rev 19891) +++ trunk/reactos/lib/keyboard/kbdhe/kbdhe.xml 2005-12-04 22:29:23 UTC (rev 19892) @@ -0,0 +1,9 @@
+<module name="kbdhe" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdhe.dll" allowwarnings="true"> + <importlibrary definition="kbdhe.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdhe.c</file> + <file>kbdhe.rc</file> +</module> \ No newline at end of file Property changes on: trunk/reactos/lib/keyboard/kbdhe/kbdhe.xml ___________________________________________________________________ Name: svn:eol-style + native
-
weiden＠svn.reactos.com