OSDN Git Service

入力したキーと表示されるキーが異なる現象を修正。
authorくまかみ工房 <kumakamikoubou@gmail.com>
Sat, 6 May 2017 15:34:02 +0000 (00:34 +0900)
committerくまかみ工房 <kumakamikoubou@gmail.com>
Sat, 6 May 2017 15:34:02 +0000 (00:34 +0900)
SlimDX.DirectInput.Key 配置を、SharpDX.DirectInput.Key 配置に置き換え。(要・Config.xml の再作成(キーアサインの初期化))

DTXManiaプロジェクト/DTXManiaプロジェクト.csproj
DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CActConfigKeyAssign.cs
DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CConfigXml.cs
FDK17プロジェクト/コード/02.入力/DeviceConstantConverter.cs
実行時フォルダ/DTXCreator.exe
実行時フォルダ/DTXManiaGR.exe
実行時フォルダ/dll/FDK.dll
実行時フォルダ/ja-JP/DTXCreator.resources.dll
実行時フォルダ/ja-JP/DTXManiaGR.resources.dll

index cb5ebaa..0c4ece5 100644 (file)
       <SubType>Designer</SubType>\r
     </EmbeddedResource>\r
     <None Include="packages.config" />\r
-    <None Include="コード\ステージ\04.コンフィグ\DeletedCode.cs" />\r
     <Compile Include="コード\ステージ\04.コンフィグ\CConfigXml.cs" />\r
     <Compile Include="コード\ステージ\04.コンフィグ\COption.cs" />\r
     <Compile Include="コード\ステージ\07.演奏\CAct演奏Lane.cs" />\r
index 8335ba5..a2620aa 100644 (file)
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Drawing;\r
 using FDK;\r
 using SharpDX;\r
+using SharpDX.DirectInput;\r
 \r
 using Rectangle = System.Drawing.Rectangle;\r
 using Color = System.Drawing.Color;\r
@@ -265,16 +266,142 @@ namespace DTXMania
                }\r
 \r
                private bool bキー入力待ち;\r
+\r
                private STKEYLABEL[] KeyLabel = new STKEYLABEL[] {\r
-                       new STKEYLABEL(0x35, "[ESC]"), new STKEYLABEL(1, "[ 1 ]"), new STKEYLABEL(2, "[ 2 ]"), new STKEYLABEL(3, "[ 3 ]"), new STKEYLABEL(4, "[ 4 ]"), new STKEYLABEL(5, "[ 5 ]"), new STKEYLABEL(6, "[ 6 ]"), new STKEYLABEL(7, "[ 7 ]"), new STKEYLABEL(8, "[ 8 ]"), new STKEYLABEL(9, "[ 9 ]"), new STKEYLABEL(0, "[ 0 ]"), new STKEYLABEL(0x53, "[ - ]"), new STKEYLABEL(0x34, "[ = ]"), new STKEYLABEL(0x2a, "[BSC]"), new STKEYLABEL(0x81, "[TAB]"), new STKEYLABEL(0x1a, "[ Q ]"),\r
-                       new STKEYLABEL(0x20, "[ W ]"), new STKEYLABEL(14, "[ E ]"), new STKEYLABEL(0x1b, "[ R ]"), new STKEYLABEL(0x1d, "[ T ]"), new STKEYLABEL(0x22, "[ Y ]"), new STKEYLABEL(30, "[ U ]"), new STKEYLABEL(0x12, "[ I ]"), new STKEYLABEL(0x18, "[ O ]"), new STKEYLABEL(0x19, "[ P ]"), new STKEYLABEL(0x4a, "[ [ ]"), new STKEYLABEL(0x73, "[ ] ]"), new STKEYLABEL(0x75, "[Enter]"), new STKEYLABEL(0x4b, "[L-Ctrl]"), new STKEYLABEL(10, "[ A ]"), new STKEYLABEL(0x1c, "[ S ]"), new STKEYLABEL(13, "[ D ]"),\r
-                       new STKEYLABEL(15, "[ F ]"), new STKEYLABEL(0x10, "[ G ]"), new STKEYLABEL(0x11, "[ H ]"), new STKEYLABEL(0x13, "[ J ]"), new STKEYLABEL(20, "[ K ]"), new STKEYLABEL(0x15, "[ L ]"), new STKEYLABEL(0x7b, "[ ; ]"), new STKEYLABEL(0x26, "[ ' ]"), new STKEYLABEL(0x45, "[ ` ]"), new STKEYLABEL(0x4e, "[L-Shift]"), new STKEYLABEL(0x2b, @"[ \]"), new STKEYLABEL(0x23, "[ Z ]"), new STKEYLABEL(0x21, "[ X ]"), new STKEYLABEL(12, "[ C ]"), new STKEYLABEL(0x1f, "[ V ]"), new STKEYLABEL(11, "[ B ]"),\r
-                       new STKEYLABEL(0x17, "[ N ]"), new STKEYLABEL(0x16, "[ M ]"), new STKEYLABEL(0x2f, "[ , ]"), new STKEYLABEL(0x6f, "[ . ]"), new STKEYLABEL(0x7c, "[ / ]"), new STKEYLABEL(120, "[R-Shift]"), new STKEYLABEL(0x6a, "[ * ]"), new STKEYLABEL(0x4d, "[L-Alt]"), new STKEYLABEL(0x7e, "[Space]"), new STKEYLABEL(0x2d, "[CAPS]"), new STKEYLABEL(0x36, "[F1]"), new STKEYLABEL(0x37, "[F2]"), new STKEYLABEL(0x38, "[F3]"), new STKEYLABEL(0x39, "[F4]"), new STKEYLABEL(0x3a, "[F5]"), new STKEYLABEL(0x3b, "[F6]"),\r
-                       new STKEYLABEL(60, "[F7]"), new STKEYLABEL(0x3d, "[F8]"), new STKEYLABEL(0x3e, "[F9]"), new STKEYLABEL(0x3f, "[F10]"), new STKEYLABEL(0x58, "[NumLock]"), new STKEYLABEL(0x7a, "[Scroll]"), new STKEYLABEL(0x60, "[NPad7]"), new STKEYLABEL(0x61, "[NPad8]"), new STKEYLABEL(0x62, "[NPad9]"), new STKEYLABEL(0x66, "[NPad-]"), new STKEYLABEL(0x5d, "[NPad4]"), new STKEYLABEL(0x5e, "[NPad5]"), new STKEYLABEL(0x5f, "[NPad6]"), new STKEYLABEL(0x68, "[NPad+]"), new STKEYLABEL(90, "[NPad1]"), new STKEYLABEL(0x5b, "[NPad2]"),\r
-                       new STKEYLABEL(0x5c, "[NPad3]"), new STKEYLABEL(0x59, "[NPad0]"), new STKEYLABEL(0x67, "[NPad.]"), new STKEYLABEL(0x40, "[F11]"), new STKEYLABEL(0x41, "[F12]"), new STKEYLABEL(0x42, "[F13]"), new STKEYLABEL(0x43, "[F14]"), new STKEYLABEL(0x44, "[F15]"), new STKEYLABEL(0x48, "[Kana]"), new STKEYLABEL(0x24, "[ ? ]"), new STKEYLABEL(0x30, "[Henkan]"), new STKEYLABEL(0x57, "[MuHenkan]"), new STKEYLABEL(0x8f, @"[ \ ]"), new STKEYLABEL(0x25, "[NPad.]"), new STKEYLABEL(0x65, "[NPad=]"), new STKEYLABEL(0x72, "[ ^ ]"),\r
-                       new STKEYLABEL(40, "[ @ ]"), new STKEYLABEL(0x2e, "[ : ]"), new STKEYLABEL(130, "[ _ ]"), new STKEYLABEL(0x49, "[Kanji]"), new STKEYLABEL(0x7f, "[Stop]"), new STKEYLABEL(0x29, "[AX]"), new STKEYLABEL(100, "[NPEnter]"), new STKEYLABEL(0x74, "[R-Ctrl]"), new STKEYLABEL(0x54, "[Mute]"), new STKEYLABEL(0x2c, "[Calc]"), new STKEYLABEL(0x70, "[PlayPause]"), new STKEYLABEL(0x52, "[MediaStop]"), new STKEYLABEL(0x85, "[Volume-]"), new STKEYLABEL(0x86, "[Volume+]"), new STKEYLABEL(0x8b, "[WebHome]"), new STKEYLABEL(0x63, "[NPad,]"),\r
-                       new STKEYLABEL(0x69, "[ / ]"), new STKEYLABEL(0x80, "[PrtScn]"), new STKEYLABEL(0x77, "[R-Alt]"), new STKEYLABEL(110, "[Pause]"), new STKEYLABEL(70, "[Home]"), new STKEYLABEL(0x84, "[Up]"), new STKEYLABEL(0x6d, "[PageUp]"), new STKEYLABEL(0x4c, "[Left]"), new STKEYLABEL(0x76, "[Right]"), new STKEYLABEL(0x33, "[End]"), new STKEYLABEL(50, "[Down]"), new STKEYLABEL(0x6c, "[PageDown]"), new STKEYLABEL(0x47, "[Insert]"), new STKEYLABEL(0x31, "[Delete]"), new STKEYLABEL(0x4f, "[L-Win]"), new STKEYLABEL(0x79, "[R-Win]"),\r
-                       new STKEYLABEL(0x27, "[APP]"), new STKEYLABEL(0x71, "[Power]"), new STKEYLABEL(0x7d, "[Sleep]"), new STKEYLABEL(0x87, "[Wake]")\r
+                       #region [ *** ]\r
+                       new STKEYLABEL((int)Key.Escape, "[ESC]"),\r
+                       new STKEYLABEL((int)Key.D1, "[ 1 ]"),\r
+                       new STKEYLABEL((int)Key.D2, "[ 2 ]"),\r
+                       new STKEYLABEL((int)Key.D3, "[ 3 ]"),\r
+                       new STKEYLABEL((int)Key.D4, "[ 4 ]"),\r
+                       new STKEYLABEL((int)Key.D5, "[ 5 ]"),\r
+                       new STKEYLABEL((int)Key.D6, "[ 6 ]"),\r
+                       new STKEYLABEL((int)Key.D7, "[ 7 ]"),\r
+                       new STKEYLABEL((int)Key.D8, "[ 8 ]"),\r
+                       new STKEYLABEL((int)Key.D9, "[ 9 ]"),\r
+                       new STKEYLABEL((int)Key.D0, "[ 0 ]"),\r
+                       new STKEYLABEL((int)Key.Minus, "[ - ]"),\r
+                       new STKEYLABEL((int)Key.Equals, "[ = ]"),\r
+                       new STKEYLABEL((int)Key.Back, "[BSC]"),\r
+                       new STKEYLABEL((int)Key.Tab, "[TAB]"),\r
+                       new STKEYLABEL((int)Key.Q, "[ Q ]"),\r
+                       new STKEYLABEL((int)Key.W, "[ W ]"),\r
+                       new STKEYLABEL((int)Key.E, "[ E ]"),\r
+                       new STKEYLABEL((int)Key.R, "[ R ]"),\r
+                       new STKEYLABEL((int)Key.T, "[ T ]"),\r
+                       new STKEYLABEL((int)Key.Y, "[ Y ]"),\r
+                       new STKEYLABEL((int)Key.U, "[ U ]"),\r
+                       new STKEYLABEL((int)Key.I, "[ I ]"),\r
+                       new STKEYLABEL((int)Key.O, "[ O ]"),\r
+                       new STKEYLABEL((int)Key.P, "[ P ]"),\r
+                       new STKEYLABEL((int)Key.LeftBracket, "[ [ ]"),\r
+                       new STKEYLABEL((int)Key.RightBracket, "[ ] ]"),\r
+                       new STKEYLABEL((int)Key.Return, "[Enter]"),\r
+                       new STKEYLABEL((int)Key.LeftControl, "[L-Ctrl]"),\r
+                       new STKEYLABEL((int)Key.A, "[ A ]"),\r
+                       new STKEYLABEL((int)Key.S, "[ S ]"),\r
+                       new STKEYLABEL((int)Key.D, "[ D ]"),\r
+                       new STKEYLABEL((int)Key.F, "[ F ]"),\r
+                       new STKEYLABEL((int)Key.G, "[ G ]"),\r
+                       new STKEYLABEL((int)Key.H, "[ H ]"),\r
+                       new STKEYLABEL((int)Key.J, "[ J ]"),\r
+                       new STKEYLABEL((int)Key.K, "[ K ]"),\r
+                       new STKEYLABEL((int)Key.L, "[ L ]"),\r
+                       new STKEYLABEL((int)Key.Semicolon, "[ ; ]"),\r
+                       new STKEYLABEL((int)Key.Apostrophe, "[ ' ]"),\r
+                       new STKEYLABEL((int)Key.Grave, "[ ` ]"),\r
+                       new STKEYLABEL((int)Key.LeftShift, "[L-Shift]"),\r
+                       new STKEYLABEL((int)Key.Backslash, @"[ \]"),\r
+                       new STKEYLABEL((int)Key.Z, "[ Z ]"),\r
+                       new STKEYLABEL((int)Key.X, "[ X ]"),\r
+                       new STKEYLABEL((int)Key.C, "[ C ]"),\r
+                       new STKEYLABEL((int)Key.V, "[ V ]"),\r
+                       new STKEYLABEL((int)Key.B, "[ B ]"),\r
+                       new STKEYLABEL((int)Key.N, "[ N ]"),\r
+                       new STKEYLABEL((int)Key.M, "[ M ]"),\r
+                       new STKEYLABEL((int)Key.Comma, "[ , ]"),\r
+                       new STKEYLABEL((int)Key.Period, "[ . ]"),\r
+                       new STKEYLABEL((int)Key.Slash, "[ / ]"),\r
+                       new STKEYLABEL((int)Key.RightShift, "[R-Shift]"),\r
+                       new STKEYLABEL((int)Key.Multiply, "[ * ]"),\r
+                       new STKEYLABEL((int)Key.LeftAlt, "[L-Alt]"),\r
+                       new STKEYLABEL((int)Key.Space, "[Space]"),\r
+                       new STKEYLABEL((int)Key.Capital, "[CAPS]"),\r
+                       new STKEYLABEL((int)Key.F1, "[F1]"),\r
+                       new STKEYLABEL((int)Key.F2, "[F2]"),\r
+                       new STKEYLABEL((int)Key.F3, "[F3]"),\r
+                       new STKEYLABEL((int)Key.F4, "[F4]"),\r
+                       new STKEYLABEL((int)Key.F5, "[F5]"),\r
+                       new STKEYLABEL((int)Key.F6, "[F6]"),\r
+                       new STKEYLABEL((int)Key.F7, "[F7]"),\r
+                       new STKEYLABEL((int)Key.F8, "[F8]"),\r
+                       new STKEYLABEL((int)Key.F9, "[F9]"),\r
+                       new STKEYLABEL((int)Key.F10, "[F10]"),\r
+                       new STKEYLABEL((int)Key.NumberLock, "[NumLock]"),\r
+                       new STKEYLABEL((int)Key.ScrollLock, "[Scroll]"),\r
+                       new STKEYLABEL((int)Key.NumberPad7, "[NPad7]"),\r
+                       new STKEYLABEL((int)Key.NumberPad8, "[NPad8]"),\r
+                       new STKEYLABEL((int)Key.NumberPad9, "[NPad9]"),\r
+                       new STKEYLABEL((int)Key.Subtract, "[NPad-]"),\r
+                       new STKEYLABEL((int)Key.NumberPad4, "[NPad4]"),\r
+                       new STKEYLABEL((int)Key.NumberPad5, "[NPad5]"),\r
+                       new STKEYLABEL((int)Key.NumberPad6, "[NPad6]"),\r
+                       new STKEYLABEL((int)Key.Add, "[NPad+]"),\r
+                       new STKEYLABEL((int)Key.NumberPad1, "[NPad1]"),\r
+                       new STKEYLABEL((int)Key.NumberPad2, "[NPad2]"),\r
+                       new STKEYLABEL((int)Key.NumberPad3, "[NPad3]"),\r
+                       new STKEYLABEL((int)Key.NumberPad0, "[NPad0]"),\r
+                       new STKEYLABEL((int)Key.Decimal, "[NPad.]"),\r
+                       new STKEYLABEL((int)Key.F11, "[F11]"),\r
+                       new STKEYLABEL((int)Key.F12, "[F12]"),\r
+                       new STKEYLABEL((int)Key.F13, "[F13]"),\r
+                       new STKEYLABEL((int)Key.F14, "[F14]"),\r
+                       new STKEYLABEL((int)Key.F15, "[F15]"),\r
+                       new STKEYLABEL((int)Key.Kana, "[Kana]"),\r
+                       new STKEYLABEL((int)Key.AbntC1, "[ ? ]"),\r
+                       new STKEYLABEL((int)Key.Convert, "[Henkan]"),\r
+                       new STKEYLABEL((int)Key.NoConvert, "[MuHenkan]"),\r
+                       new STKEYLABEL((int)Key.Backslash, @"[ \ ]"),\r
+                       new STKEYLABEL((int)Key.AbntC2, "[NPad.]"),\r
+                       new STKEYLABEL((int)Key.NumberPadEquals, "[NPad=]"),\r
+                       new STKEYLABEL((int)Key.PreviousTrack, "[ ^ ]"),        // DIK_CIRCUMFLEX = 0x90\r
+                       new STKEYLABEL((int)Key.AT, "[ @ ]"),\r
+                       new STKEYLABEL((int)Key.Colon, "[ : ]"),\r
+                       new STKEYLABEL((int)Key.Underline, "[ _ ]"),\r
+                       new STKEYLABEL((int)Key.Kanji, "[Kanji]"),\r
+                       new STKEYLABEL((int)Key.Stop, "[Stop]"),\r
+                       new STKEYLABEL((int)Key.AX, "[AX]"),\r
+                       new STKEYLABEL((int)Key.NumberPadEnter, "[NPEnter]"),\r
+                       new STKEYLABEL((int)Key.RightControl, "[R-Ctrl]"),\r
+                       new STKEYLABEL((int)Key.Mute, "[Mute]"),\r
+                       new STKEYLABEL((int)Key.Calculator, "[Calc]"),\r
+                       new STKEYLABEL((int)Key.PlayPause, "[PlayPause]"),\r
+                       new STKEYLABEL((int)Key.MediaStop, "[MediaStop]"),\r
+                       new STKEYLABEL((int)Key.VolumeDown, "[Volume-]"),\r
+                       new STKEYLABEL((int)Key.VolumeUp, "[Volume+]"),\r
+                       new STKEYLABEL((int)Key.WebHome, "[WebHome]"),\r
+                       new STKEYLABEL((int)Key.NumberPadComma, "[NPad,]"),\r
+                       new STKEYLABEL((int)Key.Divide, "[ / ]"),\r
+                       new STKEYLABEL((int)Key.PrintScreen, "[PrtScn]"),\r
+                       new STKEYLABEL((int)Key.RightAlt, "[R-Alt]"),\r
+                       new STKEYLABEL((int)Key.Pause, "[Pause]"),\r
+                       new STKEYLABEL((int)Key.Home, "[Home]"),\r
+                       new STKEYLABEL((int)Key.Up, "[Up]"),\r
+                       new STKEYLABEL((int)Key.PageUp, "[PageUp]"),\r
+                       new STKEYLABEL((int)Key.Left, "[Left]"),\r
+                       new STKEYLABEL((int)Key.Right, "[Right]"),\r
+                       new STKEYLABEL((int)Key.End, "[End]"),\r
+                       new STKEYLABEL((int)Key.Down, "[Down]"),\r
+                       new STKEYLABEL((int)Key.PageDown, "[PageDown]"),\r
+                       new STKEYLABEL((int)Key.Insert, "[Insert]"),\r
+                       new STKEYLABEL((int)Key.Delete, "[Delete]"),\r
+                       new STKEYLABEL((int)Key.LeftWindowsKey, "[L-Win]"),\r
+                       new STKEYLABEL((int)Key.RightWindowsKey, "[R-Win]"),\r
+                       new STKEYLABEL((int)Key.Applications, "[APP]"),\r
+                       new STKEYLABEL((int)Key.Power, "[Power]"),\r
+                       new STKEYLABEL((int)Key.Sleep, "[Sleep]"),\r
+                       new STKEYLABEL((int)Key.Wake, "[Wake]"),\r
+                       #endregion\r
                };\r
 \r
                private EPad pad;\r
@@ -420,18 +547,24 @@ namespace DTXMania
 \r
                private bool tキーチェックとアサイン_Keyboard()\r
                {\r
-                       for (int i = 0; i < 0x100; i++)\r
+                       for (int i = 0; i < 256; i++)\r
                        {\r
-                               if (i != (int)SharpDX.DirectInput.Key.Escape &&\r
-                                       i != (int)SharpDX.DirectInput.Key.Up &&\r
-                                       i != (int)SharpDX.DirectInput.Key.Down &&\r
-                                       i != (int)SharpDX.DirectInput.Key.Left &&\r
-                                       i != (int)SharpDX.DirectInput.Key.Right &&\r
-                                       i != (int)SharpDX.DirectInput.Key.Delete &&\r
+                               if (i != (int)Key.Escape &&\r
+                                       i != (int)Key.Up &&\r
+                                       i != (int)Key.Down &&\r
+                                       i != (int)Key.Left &&\r
+                                       i != (int)Key.Right &&\r
+                                       i != (int)Key.Delete &&\r
                                         CDTXMania.Instance.Input管理.Keyboard.bキーが押された(i))\r
                                {\r
                                        CDTXMania.Instance.Skin.sound決定音.t再生する();\r
+\r
+                                       // #xxxxx: 2017.5.7 from: アサイン済みのキーと今回割り当てるキーが同じである場合は、削除されないようコードを未使用値(ここでは-1)にする。\r
+                                       if( i == CDTXMania.Instance.ConfigIni.KeyAssign[ pad ][ ptr ].コード )\r
+                                               CDTXMania.Instance.ConfigIni.KeyAssign[ pad ][ ptr ].コード = -1;\r
+\r
                                        CDTXMania.Instance.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.Keyboard, 0, i);\r
+\r
                                        CDTXMania.Instance.ConfigIni.KeyAssign[pad][ptr].入力デバイス = EInputDevice.Keyboard;\r
                                        CDTXMania.Instance.ConfigIni.KeyAssign[pad][ptr].ID = 0;\r
                                        CDTXMania.Instance.ConfigIni.KeyAssign[pad][ptr].コード = i;\r
index afca0a8..95a0540 100644 (file)
@@ -1293,36 +1293,38 @@ namespace DTXMania
                                }\r
                        }\r
                }\r
-const string strDefaultKeyAssign = @"\r
-HH=K035,M042,M093\r
-SD=K033,M025,M026,M027,M028,M029,M031,M032,M034,M037,M038,M040,M0113\r
-BD=K012,K0126,M033,M035,M036,M0112\r
-HT=K031,M048,M050\r
-LT=K011,M047\r
-FT=K023,M041,M043,M045\r
-CY=K022,M049,M052,M055,M057,M091\r
-HHO=K010,M046,M092\r
-RD=K020,M051,M053,M059,M089\r
-LC=K026\r
+\r
+               // #36529: 2017.5.7 from: SlimDX.DirectInput.Key 配列から SharpDX.DirectInput.Key 配列に変更。\r
+               const string strDefaultKeyAssign = @"\r
+HH=K044,M042,M093\r
+SD=K045,M025,M026,M027,M028,M029,M031,M032,M034,M037,M038,M040,M0113\r
+BD=K046,K057,M033,M035,M036,M0112\r
+HT=K047,M048,M050\r
+LT=K048,M047\r
+FT=K049,M041,M043,M045\r
+CY=K050,M049,M052,M055,M057,M091\r
+HHO=K030,M046,M092\r
+RD=K037,M051,M053,M059,M089\r
+LC=K016\r
 HP=M044\r
 \r
-GtR=K055\r
-GtG=K056,J012\r
-GtB=K057\r
-GtPick=K0115,K046,J06\r
-GtWail=K0116\r
-GtDecide=K060\r
-GtCancel=K061\r
-\r
-BsR=K090\r
-BsG=K091,J013\r
-BsB=K092\r
-BsPick=K0103,K0100,J08\r
-BsWail=K089\r
-BsDecide=K096\r
-BsCancel=K097\r
-\r
-Capture=K065\r
+GtR=K060\r
+GtG=K061\r
+GtB=K062\r
+GtPick=K027,K0146\r
+GtWail=K0157\r
+GtDecide=K065\r
+GtCancel=K066\r
+\r
+BsR=K079\r
+BsG=K080\r
+BsB=K081\r
+BsPick=K083,K0156\r
+BsWail=K082\r
+BsDecide=K071\r
+BsCancel=K072\r
+\r
+Capture=K060\r
 ";\r
                private string GetRelativePath( string strBasePath, string strTargetPath )\r
                {\r
index f8700c0..0844ff8 100644 (file)
@@ -10,882 +10,886 @@ namespace FDK
        {\r
                // メソッド\r
 \r
-               public static Key DIKtoKey( int dik )\r
-               {\r
-                       switch( dik )\r
-                       {\r
-                               case 1:\r
-                                       return Key.Escape;\r
+               #region [ SlimDX 用メソッド。SharpDX では DIK(int) と同じ値になるので、廃止。]\r
+               //public static Key DIKtoKey( int dik )\r
+               //{\r
+               //      switch( dik )\r
+               //      {\r
+               //              case 1:\r
+               //                      return Key.Escape;\r
 \r
-                               case 2:\r
-                                       return Key.D1;\r
+               //              case 2:\r
+               //                      return Key.D1;\r
 \r
-                               case 3:\r
-                                       return Key.D2;\r
+               //              case 3:\r
+               //                      return Key.D2;\r
 \r
-                               case 4:\r
-                                       return Key.D3;\r
+               //              case 4:\r
+               //                      return Key.D3;\r
 \r
-                               case 5:\r
-                                       return Key.D4;\r
+               //              case 5:\r
+               //                      return Key.D4;\r
 \r
-                               case 6:\r
-                                       return Key.D5;\r
+               //              case 6:\r
+               //                      return Key.D5;\r
 \r
-                               case 7:\r
-                                       return Key.D6;\r
+               //              case 7:\r
+               //                      return Key.D6;\r
 \r
-                               case 8:\r
-                                       return Key.D7;\r
+               //              case 8:\r
+               //                      return Key.D7;\r
 \r
-                               case 9:\r
-                                       return Key.D8;\r
+               //              case 9:\r
+               //                      return Key.D8;\r
 \r
-                               case 10:\r
-                                       return Key.D9;\r
+               //              case 10:\r
+               //                      return Key.D9;\r
 \r
-                               case 11:\r
-                                       return Key.D0;\r
+               //              case 11:\r
+               //                      return Key.D0;\r
 \r
-                               case 12:\r
-                                       return Key.Minus;\r
+               //              case 12:\r
+               //                      return Key.Minus;\r
 \r
-                               case 13:\r
-                                       return Key.Equals;\r
+               //              case 13:\r
+               //                      return Key.Equals;\r
 \r
-                               case 14:\r
-                                       return Key.Back;\r
+               //              case 14:\r
+               //                      return Key.Back;\r
 \r
-                               case 15:\r
-                                       return Key.Tab;\r
+               //              case 15:\r
+               //                      return Key.Tab;\r
 \r
-                               case 0x10:\r
-                                       return Key.Q;\r
+               //              case 0x10:\r
+               //                      return Key.Q;\r
 \r
-                               case 0x11:\r
-                                       return Key.W;\r
+               //              case 0x11:\r
+               //                      return Key.W;\r
 \r
-                               case 0x12:\r
-                                       return Key.E;\r
+               //              case 0x12:\r
+               //                      return Key.E;\r
 \r
-                               case 0x13:\r
-                                       return Key.R;\r
+               //              case 0x13:\r
+               //                      return Key.R;\r
 \r
-                               case 20:\r
-                                       return Key.T;\r
+               //              case 20:\r
+               //                      return Key.T;\r
 \r
-                               case 0x15:\r
-                                       return Key.Y;\r
+               //              case 0x15:\r
+               //                      return Key.Y;\r
 \r
-                               case 0x16:\r
-                                       return Key.U;\r
+               //              case 0x16:\r
+               //                      return Key.U;\r
 \r
-                               case 0x17:\r
-                                       return Key.I;\r
+               //              case 0x17:\r
+               //                      return Key.I;\r
 \r
-                               case 0x18:\r
-                                       return Key.O;\r
+               //              case 0x18:\r
+               //                      return Key.O;\r
 \r
-                               case 0x19:\r
-                                       return Key.P;\r
+               //              case 0x19:\r
+               //                      return Key.P;\r
 \r
-                               case 0x1a:\r
-                                       return Key.LeftBracket;\r
+               //              case 0x1a:\r
+               //                      return Key.LeftBracket;\r
 \r
-                               case 0x1b:\r
-                                       return Key.RightBracket;\r
+               //              case 0x1b:\r
+               //                      return Key.RightBracket;\r
 \r
-                               case 0x1c:\r
-                                       return Key.Return;\r
+               //              case 0x1c:\r
+               //                      return Key.Return;\r
 \r
-                               case 0x1d:\r
-                                       return Key.LeftControl;\r
+               //              case 0x1d:\r
+               //                      return Key.LeftControl;\r
 \r
-                               case 30:\r
-                                       return Key.A;\r
+               //              case 30:\r
+               //                      return Key.A;\r
 \r
-                               case 0x1f:\r
-                                       return Key.S;\r
+               //              case 0x1f:\r
+               //                      return Key.S;\r
 \r
-                               case 0x20:\r
-                                       return Key.D;\r
+               //              case 0x20:\r
+               //                      return Key.D;\r
 \r
-                               case 0x21:\r
-                                       return Key.F;\r
+               //              case 0x21:\r
+               //                      return Key.F;\r
 \r
-                               case 0x22:\r
-                                       return Key.G;\r
+               //              case 0x22:\r
+               //                      return Key.G;\r
 \r
-                               case 0x23:\r
-                                       return Key.H;\r
+               //              case 0x23:\r
+               //                      return Key.H;\r
 \r
-                               case 0x24:\r
-                                       return Key.J;\r
+               //              case 0x24:\r
+               //                      return Key.J;\r
 \r
-                               case 0x25:\r
-                                       return Key.K;\r
+               //              case 0x25:\r
+               //                      return Key.K;\r
 \r
-                               case 0x26:\r
-                                       return Key.L;\r
+               //              case 0x26:\r
+               //                      return Key.L;\r
 \r
-                               case 0x27:\r
-                                       return Key.Semicolon;\r
+               //              case 0x27:\r
+               //                      return Key.Semicolon;\r
 \r
-                               case 40:\r
-                                       return Key.Apostrophe;\r
+               //              case 40:\r
+               //                      return Key.Apostrophe;\r
 \r
-                               case 0x29:\r
-                                       return Key.Grave;\r
+               //              case 0x29:\r
+               //                      return Key.Grave;\r
 \r
-                               case 0x2a:\r
-                                       return Key.LeftShift;\r
+               //              case 0x2a:\r
+               //                      return Key.LeftShift;\r
 \r
-                               case 0x2b:\r
-                                       return Key.Backslash;\r
+               //              case 0x2b:\r
+               //                      return Key.Backslash;\r
 \r
-                               case 0x2c:\r
-                                       return Key.Z;\r
+               //              case 0x2c:\r
+               //                      return Key.Z;\r
 \r
-                               case 0x2d:\r
-                                       return Key.X;\r
+               //              case 0x2d:\r
+               //                      return Key.X;\r
 \r
-                               case 0x2e:\r
-                                       return Key.C;\r
+               //              case 0x2e:\r
+               //                      return Key.C;\r
 \r
-                               case 0x2f:\r
-                                       return Key.V;\r
+               //              case 0x2f:\r
+               //                      return Key.V;\r
 \r
-                               case 0x30:\r
-                                       return Key.B;\r
+               //              case 0x30:\r
+               //                      return Key.B;\r
 \r
-                               case 0x31:\r
-                                       return Key.N;\r
+               //              case 0x31:\r
+               //                      return Key.N;\r
 \r
-                               case 50:\r
-                                       return Key.M;\r
+               //              case 50:\r
+               //                      return Key.M;\r
 \r
-                               case 0x33:\r
-                                       return Key.Comma;\r
+               //              case 0x33:\r
+               //                      return Key.Comma;\r
 \r
-                               case 0x34:\r
-                                       return Key.Period;\r
+               //              case 0x34:\r
+               //                      return Key.Period;\r
 \r
-                               case 0x35:\r
-                                       return Key.Slash;\r
+               //              case 0x35:\r
+               //                      return Key.Slash;\r
 \r
-                               case 0x36:\r
-                                       return Key.RightShift;\r
+               //              case 0x36:\r
+               //                      return Key.RightShift;\r
 \r
-                               case 0x37:\r
-                                       return Key.Multiply;\r
+               //              case 0x37:\r
+               //                      return Key.Multiply;\r
 \r
-                               case 0x38:\r
-                                       return Key.LeftAlt;\r
+               //              case 0x38:\r
+               //                      return Key.LeftAlt;\r
 \r
-                               case 0x39:\r
-                                       return Key.Space;\r
+               //              case 0x39:\r
+               //                      return Key.Space;\r
 \r
-                               case 0x3a:\r
-                                       return Key.Capital;\r
+               //              case 0x3a:\r
+               //                      return Key.Capital;\r
 \r
-                               case 0x3b:\r
-                                       return Key.F1;\r
+               //              case 0x3b:\r
+               //                      return Key.F1;\r
 \r
-                               case 60:\r
-                                       return Key.F2;\r
+               //              case 60:\r
+               //                      return Key.F2;\r
 \r
-                               case 0x3d:\r
-                                       return Key.F3;\r
+               //              case 0x3d:\r
+               //                      return Key.F3;\r
 \r
-                               case 0x3e:\r
-                                       return Key.F4;\r
+               //              case 0x3e:\r
+               //                      return Key.F4;\r
 \r
-                               case 0x3f:\r
-                                       return Key.F5;\r
+               //              case 0x3f:\r
+               //                      return Key.F5;\r
 \r
-                               case 0x40:\r
-                                       return Key.F6;\r
+               //              case 0x40:\r
+               //                      return Key.F6;\r
 \r
-                               case 0x41:\r
-                                       return Key.F7;\r
+               //              case 0x41:\r
+               //                      return Key.F7;\r
 \r
-                               case 0x42:\r
-                                       return Key.F8;\r
+               //              case 0x42:\r
+               //                      return Key.F8;\r
 \r
-                               case 0x43:\r
-                                       return Key.F9;\r
+               //              case 0x43:\r
+               //                      return Key.F9;\r
 \r
-                               case 0x44:\r
-                                       return Key.F10;\r
+               //              case 0x44:\r
+               //                      return Key.F10;\r
 \r
-                               case 0x45:\r
-                                       return Key.NumberLock;\r
+               //              case 0x45:\r
+               //                      return Key.NumberLock;\r
 \r
-                               case 70:\r
-                                       return Key.ScrollLock;\r
+               //              case 70:\r
+               //                      return Key.ScrollLock;\r
 \r
-                               case 0x47:\r
-                                       return Key.NumberPad7;\r
+               //              case 0x47:\r
+               //                      return Key.NumberPad7;\r
 \r
-                               case 0x48:\r
-                                       return Key.NumberPad8;\r
+               //              case 0x48:\r
+               //                      return Key.NumberPad8;\r
 \r
-                               case 0x49:\r
-                                       return Key.NumberPad9;\r
+               //              case 0x49:\r
+               //                      return Key.NumberPad9;\r
 \r
-                               case 0x4a:\r
-                                       return Key.Subtract;\r
+               //              case 0x4a:\r
+               //                      return Key.Subtract;\r
 \r
-                               case 0x4b:\r
-                                       return Key.NumberPad4;\r
+               //              case 0x4b:\r
+               //                      return Key.NumberPad4;\r
 \r
-                               case 0x4c:\r
-                                       return Key.NumberPad5;\r
+               //              case 0x4c:\r
+               //                      return Key.NumberPad5;\r
 \r
-                               case 0x4d:\r
-                                       return Key.NumberPad6;\r
+               //              case 0x4d:\r
+               //                      return Key.NumberPad6;\r
 \r
-                               case 0x4e:\r
-                                       return Key.Add;\r
+               //              case 0x4e:\r
+               //                      return Key.Add;\r
 \r
-                               case 0x4f:\r
-                                       return Key.NumberPad1;\r
+               //              case 0x4f:\r
+               //                      return Key.NumberPad1;\r
 \r
-                               case 80:\r
-                                       return Key.NumberPad2;\r
+               //              case 80:\r
+               //                      return Key.NumberPad2;\r
 \r
-                               case 0x51:\r
-                                       return Key.NumberPad3;\r
+               //              case 0x51:\r
+               //                      return Key.NumberPad3;\r
 \r
-                               case 0x52:\r
-                                       return Key.NumberPad0;\r
+               //              case 0x52:\r
+               //                      return Key.NumberPad0;\r
 \r
-                               case 0x53:\r
-                                       return Key.Decimal;\r
+               //              case 0x53:\r
+               //                      return Key.Decimal;\r
 \r
-                               case 0x56:\r
-                                       return Key.Oem102;\r
+               //              case 0x56:\r
+               //                      return Key.Oem102;\r
 \r
-                               case 0x57:\r
-                                       return Key.F11;\r
+               //              case 0x57:\r
+               //                      return Key.F11;\r
 \r
-                               case 0x58:\r
-                                       return Key.F12;\r
+               //              case 0x58:\r
+               //                      return Key.F12;\r
 \r
-                               case 100:\r
-                                       return Key.F13;\r
+               //              case 100:\r
+               //                      return Key.F13;\r
 \r
-                               case 0x65:\r
-                                       return Key.F14;\r
+               //              case 0x65:\r
+               //                      return Key.F14;\r
 \r
-                               case 0x66:\r
-                                       return Key.F15;\r
+               //              case 0x66:\r
+               //                      return Key.F15;\r
 \r
-                               case 0x70:\r
-                                       return Key.Kana;\r
+               //              case 0x70:\r
+               //                      return Key.Kana;\r
 \r
-                               case 0x73:\r
-                                       return Key.AbntC1;\r
+               //              case 0x73:\r
+               //                      return Key.AbntC1;\r
 \r
-                               case 0x79:\r
-                                       return Key.Convert;\r
+               //              case 0x79:\r
+               //                      return Key.Convert;\r
 \r
-                               case 0x7b:\r
-                                       return Key.NoConvert;\r
+               //              case 0x7b:\r
+               //                      return Key.NoConvert;\r
 \r
-                               case 0x7d:\r
-                                       return Key.Yen;\r
+               //              case 0x7d:\r
+               //                      return Key.Yen;\r
 \r
-                               case 0x7e:\r
-                                       return Key.AbntC2;\r
+               //              case 0x7e:\r
+               //                      return Key.AbntC2;\r
 \r
-                               case 0x8d:\r
-                                       return Key.NumberPadEquals;\r
+               //              case 0x8d:\r
+               //                      return Key.NumberPadEquals;\r
 \r
-                               case 0x90:\r
-                                       return Key.PreviousTrack;\r
+               //              case 0x90:\r
+               //                      return Key.PreviousTrack;\r
 \r
-                               case 0x91:\r
-                                       return Key.AT;\r
+               //              case 0x91:\r
+               //                      return Key.AT;\r
 \r
-                               case 0x92:\r
-                                       return Key.Colon;\r
+               //              case 0x92:\r
+               //                      return Key.Colon;\r
 \r
-                               case 0x93:\r
-                                       return Key.Underline;\r
+               //              case 0x93:\r
+               //                      return Key.Underline;\r
 \r
-                               case 0x94:\r
-                                       return Key.Kanji;\r
+               //              case 0x94:\r
+               //                      return Key.Kanji;\r
 \r
-                               case 0x95:\r
-                                       return Key.Stop;\r
+               //              case 0x95:\r
+               //                      return Key.Stop;\r
 \r
-                               case 150:\r
-                                       return Key.AX;\r
+               //              case 150:\r
+               //                      return Key.AX;\r
 \r
-                               case 0x97:\r
-                                       return Key.Unlabeled;\r
+               //              case 0x97:\r
+               //                      return Key.Unlabeled;\r
 \r
-                               case 0x99:\r
-                                       return Key.NextTrack;\r
+               //              case 0x99:\r
+               //                      return Key.NextTrack;\r
 \r
-                               case 0x9c:\r
-                                       return Key.NumberPadEnter;\r
+               //              case 0x9c:\r
+               //                      return Key.NumberPadEnter;\r
 \r
-                               case 0x9d:\r
-                                       return Key.RightControl;\r
+               //              case 0x9d:\r
+               //                      return Key.RightControl;\r
 \r
-                               case 160:\r
-                                       return Key.Mute;\r
+               //              case 160:\r
+               //                      return Key.Mute;\r
 \r
-                               case 0xa1:\r
-                                       return Key.Calculator;\r
+               //              case 0xa1:\r
+               //                      return Key.Calculator;\r
 \r
-                               case 0xa2:\r
-                                       return Key.PlayPause;\r
+               //              case 0xa2:\r
+               //                      return Key.PlayPause;\r
 \r
-                               case 0xa4:\r
-                                       return Key.MediaStop;\r
+               //              case 0xa4:\r
+               //                      return Key.MediaStop;\r
 \r
-                               case 0xae:\r
-                                       return Key.VolumeDown;\r
+               //              case 0xae:\r
+               //                      return Key.VolumeDown;\r
 \r
-                               case 0xb0:\r
-                                       return Key.VolumeUp;\r
+               //              case 0xb0:\r
+               //                      return Key.VolumeUp;\r
 \r
-                               case 0xb2:\r
-                                       return Key.WebHome;\r
+               //              case 0xb2:\r
+               //                      return Key.WebHome;\r
 \r
-                               case 0xb3:\r
-                                       return Key.NumberPadComma;\r
+               //              case 0xb3:\r
+               //                      return Key.NumberPadComma;\r
 \r
-                               case 0xb5:\r
-                                       return Key.Divide;\r
+               //              case 0xb5:\r
+               //                      return Key.Divide;\r
 \r
-                               case 0xb7:\r
-                                       return Key.PrintScreen;\r
+               //              case 0xb7:\r
+               //                      return Key.PrintScreen;\r
 \r
-                               case 0xb8:\r
-                                       return Key.RightAlt;\r
+               //              case 0xb8:\r
+               //                      return Key.RightAlt;\r
 \r
-                               case 0xc5:\r
-                                       return Key.Pause;\r
+               //              case 0xc5:\r
+               //                      return Key.Pause;\r
 \r
-                               case 0xc7:\r
-                                       return Key.Home;\r
+               //              case 0xc7:\r
+               //                      return Key.Home;\r
 \r
-                               case 200:\r
-                                       return Key.Up;\r
+               //              case 200:\r
+               //                      return Key.Up;\r
 \r
-                               case 0xc9:\r
-                                       return Key.PageUp;\r
+               //              case 0xc9:\r
+               //                      return Key.PageUp;\r
 \r
-                               case 0xcb:\r
-                                       return Key.Left;\r
+               //              case 0xcb:\r
+               //                      return Key.Left;\r
 \r
-                               case 0xcd:\r
-                                       return Key.Right;\r
+               //              case 0xcd:\r
+               //                      return Key.Right;\r
 \r
-                               case 0xcf:\r
-                                       return Key.End;\r
+               //              case 0xcf:\r
+               //                      return Key.End;\r
 \r
-                               case 0xd0:\r
-                                       return Key.Down;\r
+               //              case 0xd0:\r
+               //                      return Key.Down;\r
 \r
-                               case 0xd1:\r
-                                       return Key.PageDown;\r
+               //              case 0xd1:\r
+               //                      return Key.PageDown;\r
 \r
-                               case 210:\r
-                                       return Key.Insert;\r
+               //              case 210:\r
+               //                      return Key.Insert;\r
 \r
-                               case 0xd3:\r
-                                       return Key.Delete;\r
+               //              case 0xd3:\r
+               //                      return Key.Delete;\r
 \r
-                               case 0xdb:\r
-                                       return Key.LeftWindowsKey;\r
+               //              case 0xdb:\r
+               //                      return Key.LeftWindowsKey;\r
 \r
-                               case 220:\r
-                                       return Key.RightWindowsKey;\r
+               //              case 220:\r
+               //                      return Key.RightWindowsKey;\r
 \r
-                               case 0xdd:\r
-                                       return Key.Applications;\r
+               //              case 0xdd:\r
+               //                      return Key.Applications;\r
 \r
-                               case 0xde:\r
-                                       return Key.Power;\r
+               //              case 0xde:\r
+               //                      return Key.Power;\r
 \r
-                               case 0xdf:\r
-                                       return Key.Sleep;\r
+               //              case 0xdf:\r
+               //                      return Key.Sleep;\r
 \r
-                               case 0xe3:\r
-                                       return Key.Wake;\r
+               //              case 0xe3:\r
+               //                      return Key.Wake;\r
 \r
-                               case 0xe5:\r
-                                       return Key.WebSearch;\r
+               //              case 0xe5:\r
+               //                      return Key.WebSearch;\r
 \r
-                               case 230:\r
-                                       return Key.WebFavorites;\r
+               //              case 230:\r
+               //                      return Key.WebFavorites;\r
 \r
-                               case 0xe7:\r
-                                       return Key.WebRefresh;\r
+               //              case 0xe7:\r
+               //                      return Key.WebRefresh;\r
 \r
-                               case 0xe8:\r
-                                       return Key.WebStop;\r
+               //              case 0xe8:\r
+               //                      return Key.WebStop;\r
 \r
-                               case 0xe9:\r
-                                       return Key.WebForward;\r
+               //              case 0xe9:\r
+               //                      return Key.WebForward;\r
 \r
-                               case 0xea:\r
-                                       return Key.WebBack;\r
+               //              case 0xea:\r
+               //                      return Key.WebBack;\r
 \r
-                               case 0xeb:\r
-                                       return Key.MyComputer;\r
+               //              case 0xeb:\r
+               //                      return Key.MyComputer;\r
 \r
-                               case 0xec:\r
-                                       return Key.Mail;\r
+               //              case 0xec:\r
+               //                      return Key.Mail;\r
 \r
-                               case 0xed:\r
-                                       return Key.MediaSelect;\r
-                       }\r
-                       return Key.Unknown;\r
-               }\r
-               public static int KeyToDIK( Key key )\r
-               {\r
-                       switch( key )\r
-                       {\r
-                               case Key.D0:\r
-                                       return 11;\r
+               //              case 0xed:\r
+               //                      return Key.MediaSelect;\r
+               //      }\r
+               //      return Key.Unknown;\r
+               //}\r
 \r
-                               case Key.D1:\r
-                                       return 2;\r
+               //public static int KeyToDIK( Key key )\r
+               //{\r
+               //      switch( key )\r
+               //      {\r
+               //              case Key.D0:\r
+               //                      return 11;\r
 \r
-                               case Key.D2:\r
-                                       return 3;\r
+               //              case Key.D1:\r
+               //                      return 2;\r
 \r
-                               case Key.D3:\r
-                                       return 4;\r
+               //              case Key.D2:\r
+               //                      return 3;\r
 \r
-                               case Key.D4:\r
-                                       return 5;\r
+               //              case Key.D3:\r
+               //                      return 4;\r
 \r
-                               case Key.D5:\r
-                                       return 6;\r
+               //              case Key.D4:\r
+               //                      return 5;\r
 \r
-                               case Key.D6:\r
-                                       return 7;\r
+               //              case Key.D5:\r
+               //                      return 6;\r
 \r
-                               case Key.D7:\r
-                                       return 8;\r
+               //              case Key.D6:\r
+               //                      return 7;\r
 \r
-                               case Key.D8:\r
-                                       return 9;\r
+               //              case Key.D7:\r
+               //                      return 8;\r
 \r
-                               case Key.D9:\r
-                                       return 10;\r
+               //              case Key.D8:\r
+               //                      return 9;\r
 \r
-                               case Key.A:\r
-                                       return 30;\r
+               //              case Key.D9:\r
+               //                      return 10;\r
 \r
-                               case Key.B:\r
-                                       return 0x30;\r
+               //              case Key.A:\r
+               //                      return 30;\r
 \r
-                               case Key.C:\r
-                                       return 0x2e;\r
+               //              case Key.B:\r
+               //                      return 0x30;\r
 \r
-                               case Key.D:\r
-                                       return 0x20;\r
+               //              case Key.C:\r
+               //                      return 0x2e;\r
 \r
-                               case Key.E:\r
-                                       return 0x12;\r
+               //              case Key.D:\r
+               //                      return 0x20;\r
 \r
-                               case Key.F:\r
-                                       return 0x21;\r
+               //              case Key.E:\r
+               //                      return 0x12;\r
 \r
-                               case Key.G:\r
-                                       return 0x22;\r
+               //              case Key.F:\r
+               //                      return 0x21;\r
 \r
-                               case Key.H:\r
-                                       return 0x23;\r
+               //              case Key.G:\r
+               //                      return 0x22;\r
 \r
-                               case Key.I:\r
-                                       return 0x17;\r
+               //              case Key.H:\r
+               //                      return 0x23;\r
 \r
-                               case Key.J:\r
-                                       return 0x24;\r
+               //              case Key.I:\r
+               //                      return 0x17;\r
 \r
-                               case Key.K:\r
-                                       return 0x25;\r
+               //              case Key.J:\r
+               //                      return 0x24;\r
 \r
-                               case Key.L:\r
-                                       return 0x26;\r
+               //              case Key.K:\r
+               //                      return 0x25;\r
 \r
-                               case Key.M:\r
-                                       return 50;\r
+               //              case Key.L:\r
+               //                      return 0x26;\r
 \r
-                               case Key.N:\r
-                                       return 0x31;\r
+               //              case Key.M:\r
+               //                      return 50;\r
 \r
-                               case Key.O:\r
-                                       return 0x18;\r
+               //              case Key.N:\r
+               //                      return 0x31;\r
 \r
-                               case Key.P:\r
-                                       return 0x19;\r
+               //              case Key.O:\r
+               //                      return 0x18;\r
 \r
-                               case Key.Q:\r
-                                       return 0x10;\r
+               //              case Key.P:\r
+               //                      return 0x19;\r
 \r
-                               case Key.R:\r
-                                       return 0x13;\r
+               //              case Key.Q:\r
+               //                      return 0x10;\r
 \r
-                               case Key.S:\r
-                                       return 0x1f;\r
+               //              case Key.R:\r
+               //                      return 0x13;\r
 \r
-                               case Key.T:\r
-                                       return 20;\r
+               //              case Key.S:\r
+               //                      return 0x1f;\r
 \r
-                               case Key.U:\r
-                                       return 0x16;\r
+               //              case Key.T:\r
+               //                      return 20;\r
 \r
-                               case Key.V:\r
-                                       return 0x2f;\r
+               //              case Key.U:\r
+               //                      return 0x16;\r
 \r
-                               case Key.W:\r
-                                       return 0x11;\r
+               //              case Key.V:\r
+               //                      return 0x2f;\r
 \r
-                               case Key.X:\r
-                                       return 0x2d;\r
+               //              case Key.W:\r
+               //                      return 0x11;\r
 \r
-                               case Key.Y:\r
-                                       return 0x15;\r
+               //              case Key.X:\r
+               //                      return 0x2d;\r
 \r
-                               case Key.Z:\r
-                                       return 0x2c;\r
+               //              case Key.Y:\r
+               //                      return 0x15;\r
 \r
-                               case Key.AbntC1:\r
-                                       return 0x73;\r
+               //              case Key.Z:\r
+               //                      return 0x2c;\r
 \r
-                               case Key.AbntC2:\r
-                                       return 0x7e;\r
+               //              case Key.AbntC1:\r
+               //                      return 0x73;\r
 \r
-                               case Key.Apostrophe:\r
-                                       return 40;\r
+               //              case Key.AbntC2:\r
+               //                      return 0x7e;\r
 \r
-                               case Key.Applications:\r
-                                       return 0xdd;\r
+               //              case Key.Apostrophe:\r
+               //                      return 40;\r
 \r
-                               case Key.AT:\r
-                                       return 0x91;\r
+               //              case Key.Applications:\r
+               //                      return 0xdd;\r
 \r
-                               case Key.AX:\r
-                                       return 150;\r
+               //              case Key.AT:\r
+               //                      return 0x91;\r
 \r
-                               case Key.Back:\r
-                                       return 14;\r
+               //              case Key.AX:\r
+               //                      return 150;\r
 \r
-                               case Key.Backslash:\r
-                                       return 0x2b;\r
+               //              case Key.Back:\r
+               //                      return 14;\r
 \r
-                               case Key.Calculator:\r
-                                       return 0xa1;\r
+               //              case Key.Backslash:\r
+               //                      return 0x2b;\r
 \r
-                               case Key.Capital:\r
-                                       return 0x3a;\r
+               //              case Key.Calculator:\r
+               //                      return 0xa1;\r
 \r
-                               case Key.Colon:\r
-                                       return 0x92;\r
+               //              case Key.Capital:\r
+               //                      return 0x3a;\r
 \r
-                               case Key.Comma:\r
-                                       return 0x33;\r
+               //              case Key.Colon:\r
+               //                      return 0x92;\r
 \r
-                               case Key.Convert:\r
-                                       return 0x79;\r
+               //              case Key.Comma:\r
+               //                      return 0x33;\r
 \r
-                               case Key.Delete:\r
-                                       return 0xd3;\r
+               //              case Key.Convert:\r
+               //                      return 0x79;\r
 \r
-                               case Key.Down:\r
-                                       return 0xd0;\r
+               //              case Key.Delete:\r
+               //                      return 0xd3;\r
 \r
-                               case Key.End:\r
-                                       return 0xcf;\r
+               //              case Key.Down:\r
+               //                      return 0xd0;\r
 \r
-                               case Key.Equals:\r
-                                       return 13;\r
+               //              case Key.End:\r
+               //                      return 0xcf;\r
 \r
-                               case Key.Escape:\r
-                                       return 1;\r
+               //              case Key.Equals:\r
+               //                      return 13;\r
 \r
-                               case Key.F1:\r
-                                       return 0x3b;\r
+               //              case Key.Escape:\r
+               //                      return 1;\r
 \r
-                               case Key.F2:\r
-                                       return 60;\r
+               //              case Key.F1:\r
+               //                      return 0x3b;\r
 \r
-                               case Key.F3:\r
-                                       return 0x3d;\r
+               //              case Key.F2:\r
+               //                      return 60;\r
 \r
-                               case Key.F4:\r
-                                       return 0x3e;\r
+               //              case Key.F3:\r
+               //                      return 0x3d;\r
 \r
-                               case Key.F5:\r
-                                       return 0x3f;\r
+               //              case Key.F4:\r
+               //                      return 0x3e;\r
 \r
-                               case Key.F6:\r
-                                       return 0x40;\r
+               //              case Key.F5:\r
+               //                      return 0x3f;\r
 \r
-                               case Key.F7:\r
-                                       return 0x41;\r
+               //              case Key.F6:\r
+               //                      return 0x40;\r
 \r
-                               case Key.F8:\r
-                                       return 0x42;\r
+               //              case Key.F7:\r
+               //                      return 0x41;\r
 \r
-                               case Key.F9:\r
-                                       return 0x43;\r
+               //              case Key.F8:\r
+               //                      return 0x42;\r
 \r
-                               case Key.F10:\r
-                                       return 0x44;\r
+               //              case Key.F9:\r
+               //                      return 0x43;\r
 \r
-                               case Key.F11:\r
-                                       return 0x57;\r
+               //              case Key.F10:\r
+               //                      return 0x44;\r
 \r
-                               case Key.F12:\r
-                                       return 0x58;\r
+               //              case Key.F11:\r
+               //                      return 0x57;\r
 \r
-                               case Key.F13:\r
-                                       return 100;\r
+               //              case Key.F12:\r
+               //                      return 0x58;\r
 \r
-                               case Key.F14:\r
-                                       return 0x65;\r
+               //              case Key.F13:\r
+               //                      return 100;\r
 \r
-                               case Key.F15:\r
-                                       return 0x66;\r
+               //              case Key.F14:\r
+               //                      return 0x65;\r
 \r
-                               case Key.Grave:\r
-                                       return 0x29;\r
+               //              case Key.F15:\r
+               //                      return 0x66;\r
 \r
-                               case Key.Home:\r
-                                       return 0xc7;\r
+               //              case Key.Grave:\r
+               //                      return 0x29;\r
 \r
-                               case Key.Insert:\r
-                                       return 210;\r
+               //              case Key.Home:\r
+               //                      return 0xc7;\r
 \r
-                               case Key.Kana:\r
-                                       return 0x70;\r
+               //              case Key.Insert:\r
+               //                      return 210;\r
 \r
-                               case Key.Kanji:\r
-                                       return 0x94;\r
+               //              case Key.Kana:\r
+               //                      return 0x70;\r
 \r
-                               case Key.LeftBracket:\r
-                                       return 0x1a;\r
+               //              case Key.Kanji:\r
+               //                      return 0x94;\r
 \r
-                               case Key.LeftControl:\r
-                                       return 0x1d;\r
+               //              case Key.LeftBracket:\r
+               //                      return 0x1a;\r
 \r
-                               case Key.Left:\r
-                                       return 0xcb;\r
+               //              case Key.LeftControl:\r
+               //                      return 0x1d;\r
 \r
-                               case Key.LeftAlt:\r
-                                       return 0x38;\r
+               //              case Key.Left:\r
+               //                      return 0xcb;\r
 \r
-                               case Key.LeftShift:\r
-                                       return 0x2a;\r
+               //              case Key.LeftAlt:\r
+               //                      return 0x38;\r
 \r
-                               case Key.LeftWindowsKey:\r
-                                       return 0xdb;\r
+               //              case Key.LeftShift:\r
+               //                      return 0x2a;\r
 \r
-                               case Key.Mail:\r
-                                       return 0xec;\r
+               //              case Key.LeftWindowsKey:\r
+               //                      return 0xdb;\r
 \r
-                               case Key.MediaSelect:\r
-                                       return 0xed;\r
+               //              case Key.Mail:\r
+               //                      return 0xec;\r
 \r
-                               case Key.MediaStop:\r
-                                       return 0xa4;\r
+               //              case Key.MediaSelect:\r
+               //                      return 0xed;\r
 \r
-                               case Key.Minus:\r
-                                       return 12;\r
+               //              case Key.MediaStop:\r
+               //                      return 0xa4;\r
 \r
-                               case Key.Mute:\r
-                                       return 160;\r
+               //              case Key.Minus:\r
+               //                      return 12;\r
 \r
-                               case Key.MyComputer:\r
-                                       return 0xeb;\r
+               //              case Key.Mute:\r
+               //                      return 160;\r
 \r
-                               case Key.NextTrack:\r
-                                       return 0x99;\r
+               //              case Key.MyComputer:\r
+               //                      return 0xeb;\r
 \r
-                               case Key.NoConvert:\r
-                                       return 0x7b;\r
+               //              case Key.NextTrack:\r
+               //                      return 0x99;\r
 \r
-                               case Key.NumberLock:\r
-                                       return 0x45;\r
+               //              case Key.NoConvert:\r
+               //                      return 0x7b;\r
 \r
-                               case Key.NumberPad0:\r
-                                       return 0x52;\r
+               //              case Key.NumberLock:\r
+               //                      return 0x45;\r
 \r
-                               case Key.NumberPad1:\r
-                                       return 0x4f;\r
+               //              case Key.NumberPad0:\r
+               //                      return 0x52;\r
 \r
-                               case Key.NumberPad2:\r
-                                       return 80;\r
+               //              case Key.NumberPad1:\r
+               //                      return 0x4f;\r
 \r
-                               case Key.NumberPad3:\r
-                                       return 0x51;\r
+               //              case Key.NumberPad2:\r
+               //                      return 80;\r
 \r
-                               case Key.NumberPad4:\r
-                                       return 0x4b;\r
+               //              case Key.NumberPad3:\r
+               //                      return 0x51;\r
 \r
-                               case Key.NumberPad5:\r
-                                       return 0x4c;\r
+               //              case Key.NumberPad4:\r
+               //                      return 0x4b;\r
 \r
-                               case Key.NumberPad6:\r
-                                       return 0x4d;\r
+               //              case Key.NumberPad5:\r
+               //                      return 0x4c;\r
 \r
-                               case Key.NumberPad7:\r
-                                       return 0x47;\r
+               //              case Key.NumberPad6:\r
+               //                      return 0x4d;\r
 \r
-                               case Key.NumberPad8:\r
-                                       return 0x48;\r
+               //              case Key.NumberPad7:\r
+               //                      return 0x47;\r
 \r
-                               case Key.NumberPad9:\r
-                                       return 0x49;\r
+               //              case Key.NumberPad8:\r
+               //                      return 0x48;\r
 \r
-                               case Key.NumberPadComma:\r
-                                       return 0xb3;\r
+               //              case Key.NumberPad9:\r
+               //                      return 0x49;\r
 \r
-                               case Key.NumberPadEnter:\r
-                                       return 0x9c;\r
+               //              case Key.NumberPadComma:\r
+               //                      return 0xb3;\r
 \r
-                               case Key.NumberPadEquals:\r
-                                       return 0x8d;\r
+               //              case Key.NumberPadEnter:\r
+               //                      return 0x9c;\r
 \r
-                               case Key.Subtract:\r
-                                       return 0x4a;\r
+               //              case Key.NumberPadEquals:\r
+               //                      return 0x8d;\r
 \r
-                               case Key.Decimal:\r
-                                       return 0x53;\r
+               //              case Key.Subtract:\r
+               //                      return 0x4a;\r
 \r
-                               case Key.Add:\r
-                                       return 0x4e;\r
+               //              case Key.Decimal:\r
+               //                      return 0x53;\r
 \r
-                               case Key.Divide:\r
-                                       return 0xb5;\r
+               //              case Key.Add:\r
+               //                      return 0x4e;\r
 \r
-                               case Key.Multiply:\r
-                                       return 0x37;\r
+               //              case Key.Divide:\r
+               //                      return 0xb5;\r
 \r
-                               case Key.Oem102:\r
-                                       return 0x56;\r
+               //              case Key.Multiply:\r
+               //                      return 0x37;\r
 \r
-                               case Key.PageDown:\r
-                                       return 0xd1;\r
+               //              case Key.Oem102:\r
+               //                      return 0x56;\r
 \r
-                               case Key.PageUp:\r
-                                       return 0xc9;\r
+               //              case Key.PageDown:\r
+               //                      return 0xd1;\r
 \r
-                               case Key.Pause:\r
-                                       return 0xc5;\r
+               //              case Key.PageUp:\r
+               //                      return 0xc9;\r
 \r
-                               case Key.Period:\r
-                                       return 0x34;\r
+               //              case Key.Pause:\r
+               //                      return 0xc5;\r
 \r
-                               case Key.PlayPause:\r
-                                       return 0xa2;\r
+               //              case Key.Period:\r
+               //                      return 0x34;\r
 \r
-                               case Key.Power:\r
-                                       return 0xde;\r
+               //              case Key.PlayPause:\r
+               //                      return 0xa2;\r
 \r
-                               case Key.PreviousTrack:\r
-                                       return 0x90;\r
+               //              case Key.Power:\r
+               //                      return 0xde;\r
 \r
-                               case Key.RightBracket:\r
-                                       return 0x1b;\r
+               //              case Key.PreviousTrack:\r
+               //                      return 0x90;\r
 \r
-                               case Key.RightControl:\r
-                                       return 0x9d;\r
+               //              case Key.RightBracket:\r
+               //                      return 0x1b;\r
 \r
-                               case Key.Return:\r
-                                       return 0x1c;\r
+               //              case Key.RightControl:\r
+               //                      return 0x9d;\r
 \r
-                               case Key.Right:\r
-                                       return 0xcd;\r
+               //              case Key.Return:\r
+               //                      return 0x1c;\r
 \r
-                               case Key.RightAlt:\r
-                                       return 0xb8;\r
+               //              case Key.Right:\r
+               //                      return 0xcd;\r
 \r
-                               case Key.RightShift:\r
-                                       return 0x36;\r
+               //              case Key.RightAlt:\r
+               //                      return 0xb8;\r
 \r
-                               case Key.RightWindowsKey:\r
-                                       return 220;\r
+               //              case Key.RightShift:\r
+               //                      return 0x36;\r
 \r
-                               case Key.ScrollLock:\r
-                                       return 70;\r
+               //              case Key.RightWindowsKey:\r
+               //                      return 220;\r
 \r
-                               case Key.Semicolon:\r
-                                       return 0x27;\r
+               //              case Key.ScrollLock:\r
+               //                      return 70;\r
 \r
-                               case Key.Slash:\r
-                                       return 0x35;\r
+               //              case Key.Semicolon:\r
+               //                      return 0x27;\r
 \r
-                               case Key.Sleep:\r
-                                       return 0xdf;\r
+               //              case Key.Slash:\r
+               //                      return 0x35;\r
 \r
-                               case Key.Space:\r
-                                       return 0x39;\r
+               //              case Key.Sleep:\r
+               //                      return 0xdf;\r
 \r
-                               case Key.Stop:\r
-                                       return 0x95;\r
+               //              case Key.Space:\r
+               //                      return 0x39;\r
 \r
-                               case Key.PrintScreen:\r
-                                       return 0xb7;\r
+               //              case Key.Stop:\r
+               //                      return 0x95;\r
 \r
-                               case Key.Tab:\r
-                                       return 15;\r
+               //              case Key.PrintScreen:\r
+               //                      return 0xb7;\r
 \r
-                               case Key.Underline:\r
-                                       return 0x93;\r
+               //              case Key.Tab:\r
+               //                      return 15;\r
 \r
-                               case Key.Unlabeled:\r
-                                       return 0x97;\r
+               //              case Key.Underline:\r
+               //                      return 0x93;\r
 \r
-                               case Key.Up:\r
-                                       return 200;\r
+               //              case Key.Unlabeled:\r
+               //                      return 0x97;\r
 \r
-                               case Key.VolumeDown:\r
-                                       return 0xae;\r
+               //              case Key.Up:\r
+               //                      return 200;\r
 \r
-                               case Key.VolumeUp:\r
-                                       return 0xb0;\r
+               //              case Key.VolumeDown:\r
+               //                      return 0xae;\r
 \r
-                               case Key.Wake:\r
-                                       return 0xe3;\r
+               //              case Key.VolumeUp:\r
+               //                      return 0xb0;\r
 \r
-                               case Key.WebBack:\r
-                                       return 0xea;\r
+               //              case Key.Wake:\r
+               //                      return 0xe3;\r
 \r
-                               case Key.WebFavorites:\r
-                                       return 230;\r
+               //              case Key.WebBack:\r
+               //                      return 0xea;\r
 \r
-                               case Key.WebForward:\r
-                                       return 0xe9;\r
+               //              case Key.WebFavorites:\r
+               //                      return 230;\r
 \r
-                               case Key.WebHome:\r
-                                       return 0xb2;\r
+               //              case Key.WebForward:\r
+               //                      return 0xe9;\r
 \r
-                               case Key.WebRefresh:\r
-                                       return 0xe7;\r
+               //              case Key.WebHome:\r
+               //                      return 0xb2;\r
 \r
-                               case Key.WebSearch:\r
-                                       return 0xe5;\r
+               //              case Key.WebRefresh:\r
+               //                      return 0xe7;\r
 \r
-                               case Key.WebStop:\r
-                                       return 0xe8;\r
+               //              case Key.WebSearch:\r
+               //                      return 0xe5;\r
+\r
+               //              case Key.WebStop:\r
+               //                      return 0xe8;\r
+\r
+               //              case Key.Yen:\r
+               //                      return 0x7d;\r
+               //      }\r
+               //      return 0;\r
+               //}\r
+               #endregion\r
 \r
-                               case Key.Yen:\r
-                                       return 0x7d;\r
-                       }\r
-                       return 0;\r
-               }\r
                public static Keys KeyToKeyCode( Key key )\r
                {\r
                        switch ( key )\r
index af62cc7..7935a8c 100644 (file)
Binary files a/実行時フォルダ/DTXCreator.exe and b/実行時フォルダ/DTXCreator.exe differ
index fbbe6f7..cea632f 100644 (file)
Binary files a/実行時フォルダ/DTXManiaGR.exe and b/実行時フォルダ/DTXManiaGR.exe differ
index 3a82bb8..c7460ae 100644 (file)
Binary files a/実行時フォルダ/dll/FDK.dll and b/実行時フォルダ/dll/FDK.dll differ
index 1c130eb..648cc70 100644 (file)
Binary files a/実行時フォルダ/ja-JP/DTXCreator.resources.dll and b/実行時フォルダ/ja-JP/DTXCreator.resources.dll differ
index fdb0dd6..d27218b 100644 (file)
Binary files a/実行時フォルダ/ja-JP/DTXManiaGR.resources.dll and b/実行時フォルダ/ja-JP/DTXManiaGR.resources.dll differ