diff options
author | Pierre Ossman <ossman@cendio.se> | 2024-11-18 13:22:13 +0100 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2024-11-18 13:22:13 +0100 |
commit | 581698685b9cc3155aed5f5c6c1b293dee44144a (patch) | |
tree | 26762adbf7ce6d36771e55556b0c1e199bbf3d77 /vncviewer/EmulateMB.cxx | |
parent | 0959ce953e3578d16e3922a9326968f3cf449fb2 (diff) | |
parent | c40d8a4debbfbf98045ef25fcac91672f0cc1049 (diff) | |
download | tigervnc-581698685b9cc3155aed5f5c6c1b293dee44144a.tar.gz tigervnc-581698685b9cc3155aed5f5c6c1b293dee44144a.zip |
Merge branch 'mouse-button-support' of https://github.com/CendioHalim/tigervnc
Diffstat (limited to 'vncviewer/EmulateMB.cxx')
-rw-r--r-- | vncviewer/EmulateMB.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vncviewer/EmulateMB.cxx b/vncviewer/EmulateMB.cxx index 8eeed568..44d92752 100644 --- a/vncviewer/EmulateMB.cxx +++ b/vncviewer/EmulateMB.cxx @@ -199,7 +199,7 @@ EmulateMB::EmulateMB() { } -void EmulateMB::filterPointerEvent(const rfb::Point& pos, uint8_t buttonMask) +void EmulateMB::filterPointerEvent(const rfb::Point& pos, uint16_t buttonMask) { int btstate; int action1, action2; @@ -280,7 +280,7 @@ void EmulateMB::filterPointerEvent(const rfb::Point& pos, uint8_t buttonMask) void EmulateMB::handleTimeout(rfb::Timer *t) { int action1, action2; - uint8_t buttonMask; + uint16_t buttonMask; if (&timer != t) return; @@ -312,7 +312,7 @@ void EmulateMB::handleTimeout(rfb::Timer *t) state = stateTab[state][4][2]; } -void EmulateMB::sendAction(const rfb::Point& pos, uint8_t buttonMask, int action) +void EmulateMB::sendAction(const rfb::Point& pos, uint16_t buttonMask, int action) { assert(action != 0); @@ -325,7 +325,7 @@ void EmulateMB::sendAction(const rfb::Point& pos, uint8_t buttonMask, int action sendPointerEvent(pos, buttonMask); } -int EmulateMB::createButtonMask(uint8_t buttonMask) +int EmulateMB::createButtonMask(uint16_t buttonMask) { // Unset left and right buttons in the mask buttonMask &= ~0x5; |