hyprwm/Hypr
1
0
Fork 0
mirror of https://github.com/hyprwm/Hypr.git synced 2024-11-22 13:35:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add support for all x keys

Browse source
This commit is contained in:
vaxerski 2021-12-27 09:40:37 +01:00
parent cf96eb5df8
commit fa20d13425
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/KeybindManager.cpp
View file

@ -18,6 +18,7 @@ uint32_t KeybindManager::getKeyCodeFromName(std::string name) {
if (name == "") if (name == "")
return 0; return 0;
const auto ORIGINALCASENAME = name;
transform(name.begin(), name.end(), name.begin(), ::tolower); transform(name.begin(), name.end(), name.begin(), ::tolower);
if (name.length() == 1) { if (name.length() == 1) {
@ -44,6 +45,19 @@ uint32_t KeybindManager::getKeyCodeFromName(std::string name) {
return 0xff54; return 0xff54;
} else if (name == "space") { } else if (name == "space") {
return 0x20; return 0x20;
} else {
// unknown key, find in the xmodmap
std::string command = "xmodmap -pk | grep \"(" + ORIGINALCASENAME + ")\"";
std::string returnValue = exec(command.c_str());
try {
returnValue = returnValue.substr(returnValue.find_first_of('x') + 1);
returnValue = returnValue.substr(0, returnValue.find_first_of(' '));
return std::stoi(returnValue, nullptr, 16); // return hex to int
} catch (...) {
Debug::log(ERR, "Unknown key: " + ORIGINALCASENAME);
}
} }
} }

2
src/config/ConfigManager.cpp
View file

@ -120,7 +120,7 @@ void handleBind(const std::string& command, const std::string& value) {
if (HANDLER == "workspace") dispatcher = KeybindManager::changeworkspace; if (HANDLER == "workspace") dispatcher = KeybindManager::changeworkspace;
if (HANDLER == "togglefloating") dispatcher = KeybindManager::toggleActiveWindowFloating; if (HANDLER == "togglefloating") dispatcher = KeybindManager::toggleActiveWindowFloating;
if (dispatcher) if (dispatcher && KEY != 0)
KeybindManager::keybinds.push_back(Keybind(KeybindManager::modToMask(MOD), KEY, COMMAND, dispatcher)); KeybindManager::keybinds.push_back(Keybind(KeybindManager::modToMask(MOD), KEY, COMMAND, dispatcher));
} }