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

Query for keys better with xmodmap

Browse source
This commit is contained in:
vaxerski 2022-04-17 10:13:06 +02:00
parent 83547e472d
commit 92d9a2556f
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/KeybindManager.cpp
View file

@ -33,14 +33,21 @@ uint32_t KeybindManager::getKeyCodeFromName(std::string 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) {
// key // key v keysyms can be max 8 places, + space, + 0x
std::string command = "xmodmap -pk | grep \"(" + name + ")\""; std::string command = "xmodmap -pk | grep -E -o \".{0,11}\\(" + name + "\\)\"";
std::string returnValue = exec(command.c_str()); std::string returnValue = exec(command.c_str());
if (returnValue == "") {
Debug::log(ERR, "Key " + name + " returned no results in the xmodmap!");
return 0;
}
try { try {
returnValue = returnValue.substr(returnValue.find_first_of('x') + 1); returnValue = returnValue.substr(returnValue.find_last_of('x') + 1);
returnValue = returnValue.substr(0, returnValue.find_first_of(' ')); returnValue = returnValue.substr(0, returnValue.find_first_of(' '));
Debug::log(LOG, "queried for key " + name + " -> response keysym " + returnValue);
return std::stoi(returnValue, nullptr, 16); // return hex to int return std::stoi(returnValue, nullptr, 16); // return hex to int
} catch(...) { } } catch(...) { }
} else { } else {
@ -57,17 +64,23 @@ uint32_t KeybindManager::getKeyCodeFromName(std::string name) {
} else if (name == "space") { } else if (name == "space") {
return 0x20; return 0x20;
} else { } else {
// unknown key, find in the xmodmap // unknown key, find in the xmodmap v case insensitive
std::string command = "xmodmap -pk | grep \"(" + ORIGINALCASENAME + ")\""; std::string command = "xmodmap -pk | grep -E -i -o \".{0,11}\\(" + name + "\\)\"";
std::string returnValue = exec(command.c_str()); std::string returnValue = exec(command.c_str());
if (returnValue == "") {
Debug::log(ERR, "Key " + name + " returned no results in the xmodmap!");
return 0;
}
try { try {
returnValue = returnValue.substr(returnValue.find_first_of('x') + 1); returnValue = returnValue.substr(returnValue.find_last_of('x') + 1);
returnValue = returnValue.substr(0, returnValue.find_first_of(' ')); returnValue = returnValue.substr(0, returnValue.find_first_of(' '));
Debug::log(LOG, "queried for key " + name + " -> response keysym " + returnValue);
return std::stoi(returnValue, nullptr, 16); // return hex to int return std::stoi(returnValue, nullptr, 16); // return hex to int
} catch (...) { } catch (...) {
Debug::log(ERR, "Unknown key: " + ORIGINALCASENAME);
} }
} }
} }