[ros-diffs] [ablackmann] 43984: Add table of shift state combinations, and add table of shift state types.

[ablackmann at svn.reactos.org]

Author: ablackmann
Date: Fri Nov  6 01:37:06 2009
New Revision: 43984

URL: http://svn.reactos.org/svn/reactos?rev=43984&view=rev
Log:
Add table of shift state combinations, and add table of shift state types.


Modified:
    trunk/reactos/tools/kbdtool/data.c
    trunk/reactos/tools/kbdtool/kbdtool.h

Modified: trunk/reactos/tools/kbdtool/data.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/data.c?rev=43984&r1=43983&r2=43984&view=diff
==============================================================================
--- trunk/reactos/tools/kbdtool/data.c [iso-8859-1] (original)
+++ trunk/reactos/tools/kbdtool/data.c [iso-8859-1] Fri Nov  6 01:37:06 2009
@@ -58,6 +58,88 @@
     {0x10, "KBDSHIFT"},
     {0x11, "KBDCTRL"},
     {0x12, "KBDALT"}
+};
+
+/* Table of states */
+PCHAR StateLabel[] =
+{
+    "",
+    "Shift",
+    "  Ctrl",
+    "S+Ctrl",
+    "      Alt",
+    "Shift+Alt",
+    "  Ctl+Alt",
+    "S+Ctl+Alt",
+    "      X1      ",
+    "S+    X1      ",
+    "  C+  X1      ",
+    "S+C+  X1      ",
+    "    A+X1      ",
+    "S+  A+X1      ",
+    "  C+A+X1      ",
+    "S+C+A+X1      ",
+    "         X2   ",
+    "S+       X2   ",
+    "  C+     X2   ",
+    "S+C+     X2   ",
+    "    A+   X2   ",
+    "S+  A+   X2   ",
+    "  C+A+   X2   ",
+    "S+C+A+   X2   ",
+    "      X1+X2   ",
+    "S+    X1+X2   ",
+    "  C+  X1+X2   ",
+    "S+C+  X1+X2   ",
+    "    A+X1+X2   ",
+    "S+  A+X1+X2   ",
+    "  C+A+X1+X2   ",
+    "S+C+A+X1+X2   ",
+    "            X3",
+    "S+          X3",
+    "  C+        X3",
+    "S+C+        X3",
+    "    A+      X3",
+    "S+  A+      X3",
+    "  C+A+      X3",
+    "S+C+A+      X3",
+    "      X1+   X3",
+    "S+    X1+   X3",
+    "  C+  X1+   X3",
+    "S+C+  X1+   X3",
+    "    A+X1+   X3",
+    "S+  A+X1+   X3",
+    "  C+A+X1+   X3",
+    "S+C+A+X1+   X3",
+    "         X2+X3",
+    "S+       X2+X3",
+    "  C+     X2+X3",
+    "S+C+     X2+X3",
+    "    A+   X2+X3",
+    "S+  A+   X2+X3",
+    "  C+A+   X2+X3",
+    "S+C+A+   X2+X3",
+    "      X1+X2+X3",
+    "S+    X1+X2+X3",
+    "  C+  X1+X2+X3",
+    "S+C+  X1+X2+X3",
+    "    A+X1+X2+X3",
+    "S+  A+X1+X2+X3",
+    "  C+A+X1+X2+X3",
+    "S+C+A+X1+X2+X3",
+    "unexpected",
+    "unexpected"
+};
+
+/* Table of Cap States */
+PCHAR CapState[] =
+{
+    "0",
+    "CAPLOK",
+    "SGCAPS",
+    "CAPLOCK | SGCAPS",
+    "CAPLOKALTGR",
+    "CAPLOK | CAPLOKALTGR"
 };
 
 /* ISO 110-key Keyboard Scancode to Virtual Key Conversion Table */

Modified: trunk/reactos/tools/kbdtool/kbdtool.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.h?rev=43984&r1=43983&r2=43984&view=diff
==============================================================================
--- trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] (original)
+++ trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] Fri Nov  6 01:37:06 2009
@@ -78,6 +78,8 @@
 extern VKNAME VKName[];
 extern VKNAME Modifiers[];
 extern SCVK ScVk[];
+extern PCHAR StateLabel[];
+extern PCHAR CapState[];
 extern LAYOUT g_Layout;
 extern CHAR gVKeyName[32];
 extern CHAR gKBDName[10];