smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add search evdev.xml path for NetBSD/OpenBSD

Browse source
This commit is contained in:
SASANO Takayoshi 2026-05-12 23:44:12 +09:00 committed by Chris Rizzitello
parent a006681843
commit 958c3f5a2e
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/lib/deskflow/unix/AppUtilUnix.cpp
View file

@ -46,9 +46,15 @@ std::vector<std::string> AppUtilUnix::getKeyboardLayoutList()
#if WINAPI_XWINDOWS #if WINAPI_XWINDOWS
// Check /usr/local first used on bsd and some systems // Check /usr/local first used on bsd and some systems
m_evdev = "/usr/local/share/X11/xkb/rules/evdev.xml"; std::vector<std::string> evdev_candidate = {
if (!std::filesystem::exists(m_evdev)) "/usr/share/X11/xkb/rules/evdev.xml", // Linux
m_evdev = "/usr/share/X11/xkb/rules/evdev.xml"; "/usr/local/share/X11/xkb/rules/evdev.xml", // FreeBSD, DragonFlyBSD
"/usr/X11R7/lib/X11/xkb/rules/evdev.xml", // NetBSD
"/usr/X11R6/share/X11/xkb/rules/evdev.xml", // OpenBSD
};
for (auto it = evdev_candidate.begin(); it != evdev_candidate.end() && !std::filesystem::exists(m_evdev = *it); it++)
;
layoutLangCodes = X11LayoutsParser::getX11LanguageList(m_evdev); layoutLangCodes = X11LayoutsParser::getX11LanguageList(m_evdev);
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)