hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #6279: prevent sending keymap or repeat info events by keyboards without keyboard capability

This commit is contained in:
Harenayo 2024-06-28 18:15:20 +09:00
parent b7f42a1e88
commit 2d7a0ab21f
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/protocols/core/Seat.cpp
View File

@ -2,6 +2,7 @@
#include "Compositor.hpp" #include "Compositor.hpp"
#include "DataDevice.hpp" #include "DataDevice.hpp"
#include "../../devices/IKeyboard.hpp" #include "../../devices/IKeyboard.hpp"
#include "../../devices/IHID.hpp"
#include "../../managers/SeatManager.hpp" #include "../../managers/SeatManager.hpp"
#include "../../config/ConfigValue.hpp" #include "../../config/ConfigValue.hpp"
#include <algorithm> #include <algorithm>
@ -451,12 +452,20 @@ void CWLSeatProtocol::updateCapabilities(uint32_t caps) {
} }
void CWLSeatProtocol::updateKeymap() { void CWLSeatProtocol::updateKeymap() {
if (!(currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_KEYBOARD)) {
return;
}
for (auto& k : m_vKeyboards) { for (auto& k : m_vKeyboards) {
k->sendKeymap(g_pSeatManager->keyboard.lock()); k->sendKeymap(g_pSeatManager->keyboard.lock());
} }
} }
void CWLSeatProtocol::updateRepeatInfo(uint32_t rate, uint32_t delayMs) { void CWLSeatProtocol::updateRepeatInfo(uint32_t rate, uint32_t delayMs) {
if (!(currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_KEYBOARD)) {
return;
}
for (auto& k : m_vKeyboards) { for (auto& k : m_vKeyboards) {
k->repeatInfo(rate, delayMs); k->repeatInfo(rate, delayMs);
} }