Refactor KeyboardLayoutHelper and KeyboardLayout

Most changes come from: cairoshell#54

Author: xoascf

src/ManagedShell.Common/Helpers/KeyboardLayoutHelper.cs

@@ -1,48 +1,40 @@
 using ManagedShell.Common.Structs;
 using ManagedShell.Interop;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
+using System;
 
 namespace ManagedShell.Common.Helpers
 {
     public static class KeyboardLayoutHelper
     {
-        public static KeyboardLayout GetKeyboardLayout(bool currentThread = false)
+        public static KeyboardLayout GetKeyboardLayout()
         {
-            uint threadId = 0;
-            if (!currentThread)
-                threadId = NativeMethods.GetWindowThreadProcessId(NativeMethods.GetForegroundWindow(), out _);
+            uint threadId = NativeMethods.GetWindowThreadProcessId(NativeMethods.GetForegroundWindow(), out _);
             var layout = NativeMethods.GetKeyboardLayout(threadId);
 
-            return new KeyboardLayout()
-            {
-                HKL = layout,
-                NativeName = CultureInfo.GetCultureInfo((short)layout).NativeName,
-                ThreeLetterName = CultureInfo.GetCultureInfo((short)layout).ThreeLetterISOLanguageName.ToUpper()
-            };
+            return new KeyboardLayout((uint)layout);
         }
 
         public static List<KeyboardLayout> GetKeyboardLayoutList()
         {
+            var keyboardLayouts = new List<KeyboardLayout>();
+
             var size = NativeMethods.GetKeyboardLayoutList(0, null);
-            var result = new long[size];
-            NativeMethods.GetKeyboardLayoutList(size, result);
+            var layoutIds = new IntPtr[size];
+            NativeMethods.GetKeyboardLayoutList(layoutIds.Length, layoutIds);
 
-            return result.Select(x => new KeyboardLayout()
+            foreach (var layoutId in layoutIds)
             {
-                HKL = (int)x,
-                NativeName = CultureInfo.GetCultureInfo((short)x).NativeName,
-                ThreeLetterName = CultureInfo.GetCultureInfo((short)x).ThreeLetterISOLanguageName.ToUpper()
-            }).ToList();
+                var keyboardLayout = new KeyboardLayout((uint)layoutId);
+                keyboardLayouts.Add(keyboardLayout);
+            }
+
+            return keyboardLayouts;
         }
 
-        public static bool SetKeyboardLayout(int layoutId)
+        public static bool SetKeyboardLayout(uint layoutId)
         {
-            return NativeMethods.PostMessage(0xffff,
-                (uint) NativeMethods.WM.INPUTLANGCHANGEREQUEST,
-                0,
-                NativeMethods.LoadKeyboardLayout(layoutId.ToString("x8"), (uint)(NativeMethods.KLF.SUBSTITUTE_OK | NativeMethods.KLF.ACTIVATE)));
+            return NativeMethods.PostMessage(NativeMethods.GetForegroundWindow(), (int)NativeMethods.WM.INPUTLANGCHANGEREQUEST, IntPtr.Zero, new IntPtr(layoutId));
         }
     }
-}
+}

src/ManagedShell.Common/Structs/KeyboardLayout.cs

@@ -1,9 +1,25 @@
-namespace ManagedShell.Common.Structs
+using System.Globalization;
+
+namespace ManagedShell.Common.Structs
 {
     public struct KeyboardLayout
     {
-        public int HKL { get; set; }
+        public ushort LanguageId { get; set; }
+        public ushort KeyboardId { get; set; }
+
         public string NativeName { get; set; }
         public string ThreeLetterName { get; set; }
+        public string DisplayName { get; set; }
+
+        public KeyboardLayout(uint layoutId)
+        {
+            LanguageId = (ushort)(layoutId & 0xFFFF);
+            KeyboardId = (ushort)(layoutId >> 16);
+
+            var cultureInfo = CultureInfo.GetCultureInfo(LanguageId);
+            NativeName = cultureInfo.NativeName;
+            ThreeLetterName = cultureInfo.ThreeLetterWindowsLanguageName;
+            DisplayName = cultureInfo.DisplayName;
+        }
     }
-}
+}

src/ManagedShell.Interop/NativeMethods.User32.cs

@@ -3000,10 +3000,10 @@ public static extern IntPtr CreateWindowEx(
             IntPtr lpParam);
 
         [DllImport(User32_DllName)]
-        public static extern int GetKeyboardLayout(uint idThread);
+        public static extern IntPtr GetKeyboardLayout(uint idThread);
 
         [DllImport(User32_DllName)]
-        public static extern int GetKeyboardLayoutList(int nBuff, long[] lpList);
+        public static extern uint GetKeyboardLayoutList(int nBuff, IntPtr[] lpList);
 
         [DllImport(User32_DllName)]
         public static extern int LoadKeyboardLayout(string pwszKLID, uint flags);