Merge branch 'develop'

AonaSuzutsuki · Jul 26, 2020 · d3adf30 · d3adf30
2 parents 84738aa + d6496ac
commit d3adf30
Show file tree

Hide file tree

Showing 8 changed files with 629 additions and 377 deletions.
diff --git a/KeyConverter/InterceptKeyboardLib/KeyMap/KeyMap.cs b/KeyConverter/InterceptKeyboardLib/KeyMap/KeyMap.cs
@@ -8,98 +8,127 @@ namespace LowLevelKeyboardLib.KeyMap
 {
     public enum OriginalKey
     {
-        None = -1,
-        Unknown = 0,
+        None = -0x1,
+        Unknown = 0x0,
 
-        Back = 8,
-        Tab = 9,
-        Enter = 13,
-        ESC = 27,
-        Henkan = 28,
-        Muhenkan = 29,
-        Space = 32,
-        Home = 36,
-        Insert = 45,
+        Back = 0x8,
+        Tab = 0x9,
+        Enter = 0xD,
+        ESC = 0x1B,
+        Henkan = 0x1C,
+        Muhenkan = 0x1D,
+        Space = 0x20,
+        Home = 0x24,
+        Insert = 0x2D,
+        Delete = 0x2E,
+        PrintScreen = 0x2C,
+        ScrollLock = 0x91,
+        Pause = 0x13,
+        End = 0x23,
+        PageUp = 0x21,
+        PageDown = 0x22,
 
-        D0 = 48,
-        D1 = 49,
-        D2 = 50,
-        D3 = 51,
-        D4 = 52,
-        D5 = 53,
-        D6 = 54,
-        D7 = 55,
-        D8 = 56,
-        D9 = 57,
+        Left = 0x25,
+        Up = 0x26,
+        Right = 0x27,
+        Down = 0x28,
 
-        A = 65,
-        B = 66,
-        C = 67,
-        D = 68,
-        E = 69,
-        F = 70,
-        G = 71,
-        H = 72,
-        I = 73,
-        J = 74,
-        K = 75,
-        L = 76,
-        M = 77,
-        N = 78,
-        O = 79,
-        P = 80,
-        Q = 81,
-        R = 82,
-        S = 83,
-        T = 84,
-        U = 85,
-        V = 86,
-        W = 87,
-        X = 88,
-        Y = 89,
-        Z = 90,
-
-        LeftWindows = 91,
-        RightWindows = 92,
-        Menu = 93,
+        D0 = 0x30,
+        D1 = 0x31,
+        D2 = 0x32,
+        D3 = 0x33,
+        D4 = 0x34,
+        D5 = 0x35,
+        D6 = 0x36,
+        D7 = 0x37,
+        D8 = 0x38,
+        D9 = 0x39,
 
-        F1 = 112,
-        F2 = 113,
-        F3 = 114,
-        F4 = 115,
-        F5 = 116,
-        F6 = 117,
-        F7 = 118,
-        F8 = 119,
-        F9 = 120,
-        F10 = 121,
-        F11 = 122,
-        F12 = 123,
+        A = 0x41,
+        B = 0x42,
+        C = 0x43,
+        D = 0x44,
+        E = 0x45,
+        F = 0x46,
+        G = 0x47,
+        H = 0x48,
+        I = 0x49,
+        J = 0x4A,
+        K = 0x4B,
+        L = 0x4C,
+        M = 0x4D,
+        N = 0x4E,
+        O = 0x4F,
+        P = 0x50,
+        Q = 0x51,
+        R = 0x52,
+        S = 0x53,
+        T = 0x54,
+        U = 0x55,
+        V = 0x56,
+        W = 0x57,
+        X = 0x58,
+        Y = 0x59,
+        Z = 0x5A,
 
-        LeftShift = 160,
-        RightShift = 161,
-        LeftCtrl = 162,
-        RightCtrl = 163,
-        RightAlt = 165,
-        LeftAlt = 164,
-        Multiply = 186,
-        Plus = 187,
-        Comma = 188,
-        Equal = 189,
-        Period = 190,
-        Question = 191,
-        AtMark = 192,
-        LeftBrace = 219,
-        VerticalBar = 220,
-        RightBrace = 221,
-        Tilde = 222,
+        NumLock = 0x90,
+        N0 = 0x60,
+        N1 = 0x61,
+        N2 = 0x62,
+        N3 = 0x63,
+        N4 = 0x64,
+        N5 = 0x65,
+        N6 = 0x66,
+        N7 = 0x67,
+        N8 = 0x68,
+        N9 = 0x69,
+        NDiv = 0x6F,
+        NMul = 0x6A,
+        NMinus = 0x6D,
+        NPlus = 0x6B,
+        NDot = 0x6E,
 
-        UnderBar = 226,
+        LeftWindows = 0x5B,
+        RightWindows = 0x5C,
+        Menu = 0x5D,
 
-        Caps = 240,
-        Kana = 242,
-        Hankaku = 243,
-        Zenkaku = 244,
-        HankakuZenkaku = 9999,
+        F1 = 0x70,
+        F2 = 0x71,
+        F3 = 0x72,
+        F4 = 0x73,
+        F5 = 0x74,
+        F6 = 0x75,
+        F7 = 0x76,
+        F8 = 0x77,
+        F9 = 0x78,
+        F10 = 0x79,
+        F11 = 0x7A,
+        F12 = 0x7B,
+
+        LeftShift = 0xA0,
+        RightShift = 0xA1,
+        LeftCtrl = 0xA2,
+        RightCtrl = 0xA3,
+        RightAlt = 0xA5,
+        LeftAlt = 0xA4,
+        Multiply = 0xBA,
+        Plus = 0xBB,
+        Comma = 0xBC,
+        Equal = 0xBD,
+        Period = 0xBE,
+        Question = 0xBF,
+        AtMark = 0xC0,
+        LeftBrace = 0xDB,
+        VerticalBar = 0xDC,
+        RightBrace = 0xDD,
+        Tilde = 0xDE,
+
+        UnderBar = 0xE2,
+
+        Caps = 0xF0,
+        Kana = 0xF2,
+        Hankaku = 0xF3,
+        Zenkaku = 0xF4,
+        HankakuZenkaku = 0x270F,
     }
 }
diff --git a/KeyConverter/InterceptKeyboardLib/LowLevelKeyboardLib.csproj b/KeyConverter/InterceptKeyboardLib/LowLevelKeyboardLib.csproj
@@ -48,6 +48,7 @@
     <Compile Include="Input\LowLevelKeyDetector.cs" />
     <Compile Include="KeyMap\KeyMap.cs" />
     <Compile Include="KeyMap\KeyMapConverter.cs" />
+    <Compile Include="ProcessFunctions\ForegroundProcess.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup />

diff --git a/KeyConverter/InterceptKeyboardLib/ProcessFunctions/ForegroundProcess.cs b/KeyConverter/InterceptKeyboardLib/ProcessFunctions/ForegroundProcess.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LowLevelKeyboardLib.ProcessFunctions
+{
+    public class ForegroundProcess
+    {
+
+        public static string GetProcessName()
+        {
+            return null;
+        }
+    }
+}
diff --git a/KeyConverter/KeyConverterGUI/Styles/Button.xaml b/KeyConverter/KeyConverterGUI/Styles/Button.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:KeyConverterGUI.Styles">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <SolidColorBrush x:Key="BorderColor" Color="#999" />
 

diff --git a/KeyConverter/KeyConverterGUI/Styles/Keyboard.xaml b/KeyConverter/KeyConverterGUI/Styles/Keyboard.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:KeyConverterGUI.Styles">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="DefinedLabel" TargetType="Label">
         <Setter Property="FontSize" Value="10" />