From 9a153b0a7ad6e0bdf709142e2feb60ac74a4b44c Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 31 Aug 2015 10:01:14 +0200 Subject: [PATCH] Add keyboard debug log to servers Makes it easier to troubleshoot keyboard issues by printing exactly what key events the server is getting from the client. --- common/rfb/VNCSConnectionST.cxx | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx index 49975cbf..932f5796 100644 --- a/common/rfb/VNCSConnectionST.cxx +++ b/common/rfb/VNCSConnectionST.cxx @@ -100,8 +100,10 @@ VNCSConnectionST::~VNCSConnectionST() // Release any keys the client still had pressed std::set::iterator i; - for (i=pressedKeys.begin(); i!=pressedKeys.end(); i++) + for (i=pressedKeys.begin(); i!=pressedKeys.end(); i++) { + vlog.debug("Releasing key 0x%x on client disconnect", *i); server->desktop->keyEvent(*i, false); + } if (server->pointerClient == this) server->pointerClient = 0; @@ -499,9 +501,13 @@ public: VNCSConnectionSTShiftPresser(SDesktop* desktop_) : desktop(desktop_), pressed(false) {} ~VNCSConnectionSTShiftPresser() { - if (pressed) { desktop->keyEvent(XK_Shift_L, false); } + if (pressed) { + vlog.debug("Releasing fake Shift_L"); + desktop->keyEvent(XK_Shift_L, false); + } } void press() { + vlog.debug("Pressing fake Shift_L"); desktop->keyEvent(XK_Shift_L, true); pressed = true; } @@ -517,9 +523,20 @@ void VNCSConnectionST::keyEvent(rdr::U32 key, bool down) { if (!(accessRights & AccessKeyEvents)) return; if (!rfb::Server::acceptKeyEvents) return; + if (down) + vlog.debug("Key pressed: 0x%x", key); + else + vlog.debug("Key released: 0x%x", key); + // Remap the key if required - if (server->keyRemapper) - key = server->keyRemapper->remapKey(key); + if (server->keyRemapper) { + rdr::U32 newkey; + newkey = server->keyRemapper->remapKey(key); + if (newkey != key) { + vlog.debug("Key remapped to 0x%x", newkey); + key = newkey; + } + } // Turn ISO_Left_Tab into shifted Tab. VNCSConnectionSTShiftPresser shiftPresser(server->desktop); -- 2.39.5