diff options
Diffstat (limited to 'win')
-rw-r--r-- | win/rfb_win32/SDisplay.cxx | 4 | ||||
-rw-r--r-- | win/rfb_win32/SDisplay.h | 2 | ||||
-rw-r--r-- | win/rfb_win32/SInput.cxx | 2 | ||||
-rw-r--r-- | win/rfb_win32/SInput.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/win/rfb_win32/SDisplay.cxx b/win/rfb_win32/SDisplay.cxx index 2696f5dc..ad55d490 100644 --- a/win/rfb_win32/SDisplay.cxx +++ b/win/rfb_win32/SDisplay.cxx @@ -280,12 +280,12 @@ void SDisplay::pointerEvent(const Point& pos, int buttonmask) { } } -void SDisplay::keyEvent(rdr::U32 key, bool down) { +void SDisplay::keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down) { // - Check that the SDesktop doesn't need restarting if (isRestartRequired()) restartCore(); if (kbd) - kbd->keyEvent(key, down); + kbd->keyEvent(keysym, keycode, down); } bool SDisplay::checkLedState() { diff --git a/win/rfb_win32/SDisplay.h b/win/rfb_win32/SDisplay.h index e43e3021..9892ed99 100644 --- a/win/rfb_win32/SDisplay.h +++ b/win/rfb_win32/SDisplay.h @@ -66,7 +66,7 @@ namespace rfb { virtual void start(VNCServer* vs); virtual void stop(); virtual void pointerEvent(const Point& pos, int buttonmask); - virtual void keyEvent(rdr::U32 key, bool down); + virtual void keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down); virtual void clientCutText(const char* str, int len); virtual Point getFbSize(); diff --git a/win/rfb_win32/SInput.cxx b/win/rfb_win32/SInput.cxx index 0923118a..15ef4b06 100644 --- a/win/rfb_win32/SInput.cxx +++ b/win/rfb_win32/SInput.cxx @@ -321,7 +321,7 @@ win32::SKeyboard::SKeyboard() } -void win32::SKeyboard::keyEvent(rdr::U32 keysym, bool down) +void win32::SKeyboard::keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down) { for (unsigned int i = 0; i < sizeof(keysymToAscii) / sizeof(keysymToAscii_t); i++) { if (keysymToAscii[i].keysym == keysym) { diff --git a/win/rfb_win32/SInput.h b/win/rfb_win32/SInput.h index 2a0b3e67..f7949ec4 100644 --- a/win/rfb_win32/SInput.h +++ b/win/rfb_win32/SInput.h @@ -53,7 +53,7 @@ namespace rfb { class SKeyboard { public: SKeyboard(); - void keyEvent(rdr::U32 key, bool down); + void keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down); static BoolParameter deadKeyAware; private: std::map<rdr::U32,rdr::U8> vkMap; |