diff --git a/src/VirtualKeyboard.cpp b/src/VirtualKeyboard.cpp index 07eafe5..7e3f851 100644 --- a/src/VirtualKeyboard.cpp +++ b/src/VirtualKeyboard.cpp @@ -52,17 +52,21 @@ bool VirtualKeyboard::init() { return false; } -std::string VirtualKeyboard::get_uid() const { - std::size_t hash = std::hash{}(name); +std::string VirtualKeyboard::make_uid(const char *dev_name, int bus, int vid, int pid, int ver) { + std::size_t hash = std::hash{}(dev_name ? dev_name : ""); char buf[64]; std::snprintf(buf, sizeof(buf), "%04x:%04x:%04x:%04x:%016zx", - bustype, vendor, product, version, hash); + bus, vid, pid, ver, hash); return buf; } +std::string VirtualKeyboard::get_uid() const { + return make_uid(name, bustype, vendor, product, version); +} + void VirtualKeyboard::emit_key(int code, int value) { if (!uidev_) return; diff --git a/src/VirtualKeyboard.h b/src/VirtualKeyboard.h index d6d42ce..f2bd097 100644 --- a/src/VirtualKeyboard.h +++ b/src/VirtualKeyboard.h @@ -22,6 +22,8 @@ class VirtualKeyboard { bool init(); + static std::string make_uid(const char *dev_name, int bus, int vid, int pid, int ver); + std::string get_uid() const; void emit_key(int code, int value); diff --git a/src/main.cpp b/src/main.cpp index 64d4762..1c4c022 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -281,7 +281,7 @@ bool configure() { return false; } - std::string uid = vk.get_uid(); + std::string uid = VirtualKeyboard::make_uid(vk.name, vk.bustype, vk.vendor, vk.product, vk.version); reader.add_to_blacklist(uid); bool connected;