From 1898839d4ca93291d5987e10bed498d83f813e45 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Tue, 12 Apr 2022 22:14:04 +0200 Subject: [PATCH] I am an idiot, keysym fix --- src/KeybindManager.cpp | 9 +++++++-- src/events/events.cpp | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/KeybindManager.cpp b/src/KeybindManager.cpp index 9a82924..b8a96c0 100644 --- a/src/KeybindManager.cpp +++ b/src/KeybindManager.cpp @@ -21,8 +21,13 @@ uint32_t KeybindManager::getKeyCodeFromName(std::string name) { if (name == "") return 0; - if (name.find_first_not_of("1234567890") == std::string::npos) - return std::stoi(name); + if (name.find_first_not_of("1234567890") == std::string::npos) { + const auto KC = std::stoi(name); + + if (KC > 10) // 0-9 are OK for parsing they are on the KB + return std::stoi(name); + } + const auto ORIGINALCASENAME = name; transform(name.begin(), name.end(), name.begin(), ::tolower); diff --git a/src/events/events.cpp b/src/events/events.cpp index 301080b..dab0f62 100644 --- a/src/events/events.cpp +++ b/src/events/events.cpp @@ -780,7 +780,7 @@ void Events::eventKeyPress(xcb_generic_event_t* event) { const auto IGNOREDMOD = KeybindManager::modToMask(ConfigManager::getString("ignore_mod")); for (auto& keybind : KeybindManager::keybinds) { - if (keybind.getKeysym() != 0 && keybind.getKeysym() == KEYSYM && (keybind.getMod() == E->state || ((keybind.getMod() | IGNOREDMOD) == E->state))) { + if (keybind.getKeysym() != 0 && keybind.getKeysym() == KEYSYM && ((keybind.getMod() == E->state) || ((keybind.getMod() | IGNOREDMOD) == E->state))) { keybind.getDispatcher()(keybind.getCommand()); return; // TODO: fix duplicating keybinds