[ros-diffs] [ablackmann] 43977: Generate modifier table. Generate extended scancode table X. Generate extended scancode table Y.

[ablackmann at svn.reactos.org]

Author: ablackmann
Date: Thu Nov  5 20:25:41 2009
New Revision: 43977

URL: http://svn.reactos.org/svn/reactos?rev=43977&view=rev
Log:
Generate modifier table. Generate extended scancode table X. Generate extended scancode table Y.


Modified:
    trunk/reactos/tools/kbdtool/output.c

Modified: trunk/reactos/tools/kbdtool/output.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev=43977&r1=43976&r2=43977&view=diff
==============================================================================
--- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original)
+++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Thu Nov  5 20:25:41 2009
@@ -388,6 +388,10 @@
 {
     CHAR OutputFile[13];
     FILE *FileHandle;
+    ULONG States[8];
+    ULONG i;
+    ULONG HighestState;
+    PVKNAME Entry;
     
     /* Build the keyboard name and internal name */
     strcpy(OutputFile, gKBDName);
@@ -528,7 +532,28 @@
     /* Key name table header */
     fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_VK aE0VscToVk[] = {\n");
     
-    /* FIXME: Key names */
+    /* Loop 110-key table */
+    for (i = 0; i < 110; i++)
+    {
+        /* Check for non-extended keys */
+        if ((Layout->Entry[i].ScanCode & 0xFF00) == 0xE000)
+        {
+            /* Which are valid */
+            if (Layout->Entry[i].ScanCode != 0xFF)
+            {
+                /* And mapped */
+                if (Layout->Entry[i].VirtualKey != 0xFF)
+                {
+                    /* Output them */
+                    fprintf(FileHandle,
+                            "        { 0x%02X, X%02X | KBDEXT              },  // %s\n",
+                            Layout->Entry[i].ScanCode,
+                            Layout->Entry[i].ScanCode,
+                            Layout->Entry[i].Name);
+                }
+            }
+        }
+    }
     
     /* Key name table finish */
     fprintf(FileHandle, "        { 0,      0                       }\n};\n\n");
@@ -536,7 +561,28 @@
     /* Extended key name table header */
     fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_VK aE1VscToVk[] = {\n");
     
-    /* FIXME: Extended scancodes */
+    /* Loop 110-key table */
+    for (i = 0; i < 110; i++)
+    {
+        /* Check for extended keys */
+        if ((Layout->Entry[i].ScanCode & 0xFF00) == 0xE100)
+        {
+            /* Which are valid */
+            if (Layout->Entry[i].ScanCode != 0xFF)
+            {
+                /* And mapped */
+                if (Layout->Entry[i].VirtualKey != 0xFF)
+                {
+                    /* Output them */
+                    fprintf(FileHandle,
+                            "        { 0x%02X, Y%02X | KBDEXT            },  // %s\n",
+                            Layout->Entry[i].ScanCode,
+                            Layout->Entry[i].ScanCode,
+                            Layout->Entry[i].Name);
+                }
+            }
+        }
+    }
     
     /* Extended key name table finish */
     fprintf(FileHandle,
@@ -559,7 +605,20 @@
     /* Modifier table header */
     fprintf(FileHandle, "static ALLOC_SECTION_LDATA VK_TO_BIT aVkToBits[] = {\n");
     
-    /* FIXME: Key modifiers */
+    /* Loop modifier table */
+    i = 0;
+    Entry = &Modifiers[0];
+    while (Entry->VirtualKey)
+    {
+        /* Print out entry */
+        fprintf(FileHandle,
+                "    { %-12s,   %-12s },\n",
+                getVKName(Entry->VirtualKey, 1),
+                Entry->Name);
+        
+        /* Move to the next one */
+        Entry = &Modifiers[++i];
+    }
     
     /* Modifier table finish */
     fprintf(FileHandle, "    { 0,          0        }\n};\n\n");
@@ -572,6 +631,16 @@
             "* See kbd.h for a full description.\n"
             "*\n"
             "\\***************************************************************************/\n\n");
+    
+    /* Zero out local state data */
+    for (i = 0; i < 8; i++) States[i] = -1;
+    
+    /* Find the highest set state */
+    for (HighestState = 1, i = 0; i < 8 && ShiftStates[i] > -1; i++)
+    {
+        States[ShiftStates[i]] = i;
+        if (ShiftStates[i] > HighestState) HighestState = ShiftStates[i];
+    }
     
     /* Modifier conversion table header */
     fprintf(FileHandle,