[ros-diffs] [pschweitzer] 30333: - Added dead keys name - Removed some comments

Author: pschweitzer
Date: Sat Nov 10 19:22:06 2007
New Revision: 30333

URL: http://svn.reactos.org/svn/reactos?rev=30333&view=rev
Log:
- Added dead keys name
- Removed some comments

Modified:
    trunk/reactos/dll/keyboard/kbdfr/kbdfr.c

Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.c…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdfr/kbdfr.c (original)
+++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.c Sat Nov 10 19:22:06 2007
@@ -180,7 +180,7 @@
   /* The numbers */
   { '1',         NOCAPS, {'&', '1'} },
   /* Specials */
-  /* Ctrl-_ generates US */
+  /* Ctrl-_ generates FR */
   { VK_OEM_5       ,NOCAPS, {'*',0xb5} }, /* œ */
   { VK_OEM_3       ,NOCAPS, {0xf9, '%'} }, /* ù */
   { VK_OEM_COMMA   ,NOCAPS, {',', '?'} },
@@ -257,10 +257,6 @@
 ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = {
   /* x,x,      Normal, Shifted, Ctrl, Alt, 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 */} },
-  //{ '5'  | KEXT , NOCAPS, {')', '°', '#' , 0x1f /* US
*/} },
   { '5' , 1  ,  {'(', '5', WCH_NONE , '[' , 0x1b} },
   { '6' , 1  ,  {'-', '6', WCH_NONE , '|' , 0x1f} },
   { '8' , 1  ,  {'_', '8', WCH_NONE , '\\' , 0x1c} },
@@ -437,6 +433,13 @@
   { 0, NULL },
 };
 
+ROSDATA DEADKEY_LPWSTR dead_key_names[] = {
+    L"\x005e"	L"Circumflex",
+    L"\x007e"	L"Tilde",
+    L"\x0060"	L"Grave",
+    NULL
+};
+
 /* Finally, the master table */
 ROSDATA KBDTABLES keyboard_layout_table = {
   /* modifier assignments */
@@ -451,7 +454,7 @@
   /* Key names */
   (VSC_LPWSTR *)key_names,
   (VSC_LPWSTR *)extended_key_names,
-  NULL, /* Dead key names */
+  dead_key_names, /* Dead key names */
 
   /* scan code to virtual key maps */
   scancode_to_vk,