prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

When looking for English keyboard layout, use pre-defined IDs instead of relying on layout name as a string

Browse source
This commit is contained in:
Yusyuriv 2025-03-22 08:32:35 +06:00
parent 81a4632722
commit aa3ad10044
No known key found for this signature in database
GPG key ID: A91C52E6F73148E0
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Flow.Launcher/Helper/KeyboardLayoutHelper.cs
View file

@ -1,6 +1,6 @@
using System;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
namespace Flow.Launcher.Helper;
@ -20,17 +20,15 @@ public static class KeyboardLayoutHelper
[DllImport("user32.dll")]
private static extern int GetKeyboardLayoutList(int nBuff, [Out] IntPtr[] lpList);
[DllImport("kernel32.dll")]
private static extern int GetLocaleInfoA(uint Locale, uint LCType, StringBuilder lpLCData, int cchData);
[DllImport("user32.dll")]
private static extern IntPtr GetForegroundWindow();
// Used to get the language name of the keyboard layout
private const uint LOCALE_SLANGUAGE = 0x00000002;
// The string to search for in the language name of a keyboard layout
private const string LAYOUT_ENGLISH_SEARCH = "english";
// https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/70feba9f-294e-491e-b6eb-56532684c37f
private static readonly uint[] EnglishLanguageIds =
{
0x0009, 0x0409, 0x0809, 0x0C09, 0x1000, 0x1009, 0x1409, 0x1809, 0x1C09, 0x2009, 0x2409, 0x2809, 0x2C09,
0x3009, 0x3409, 0x3C09, 0x4009, 0x4409, 0x4809, 0x4C09,
};
private static IntPtr FindEnglishKeyboardLayout()
{
@ -48,13 +46,8 @@ public static class KeyboardLayoutHelper
// The lower word contains the language identifier
var langId = (uint)layout.ToInt32() & 0xFFFF;
// Get language name for the layout
var sb = new StringBuilder(256);
GetLocaleInfoA(langId, LOCALE_SLANGUAGE, sb, sb.Capacity);
var langName = sb.ToString().ToLowerInvariant();
// Check if it's an English layout
if (langName.Contains(LAYOUT_ENGLISH_SEARCH))
if (EnglishLanguageIds.Contains(langId))
{
return layout;
}