1 files changed, 9 insertions, 4 deletions
diff --git a/vncviewer/Viewport.h b/vncviewer/Viewport.h
index 5f4c1ca7..16fa1da8 100644
--- a/vncviewer/Viewport.h
+++ b/vncviewer/Viewport.h
@@ -86,8 +86,9 @@ private:
 
   void resetKeyboard();
 
-  void handleKeyPress(int keyCode, uint32_t keySym);
-  void handleKeyRelease(int keyCode);
+  void handleKeyPress(int systemKeyCode,
+                      uint32_t keyCode, uint32_t keySym);
+  void handleKeyRelease(int systemKeyCode);
 
   static int handleSystemEvent(void *event, void *data);
 
@@ -113,8 +114,12 @@ private:
   rfb::Point lastPointerPos;
   uint8_t lastButtonMask;
 
-  typedef std::map<int, uint32_t> DownMap;
-  DownMap downKeySym;
+  struct DownKey {
+    uint32_t keyCode;
+    uint32_t keySym;
+  };
+  typedef std::map<int, DownKey> DownMap;
+  DownMap downKeys;
 
 #ifdef WIN32
   bool altGrArmed;