aboutsummaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2011-05-11 10:44:09 +0000
committerAdam Tkac <atkac@redhat.com>2011-05-11 10:44:09 +0000
commitdb512da0fbb49d9b96e64824ed381d2ac42769a8 (patch)
tree5798cf6bd9083738064201dea0cd35ed97f5ae33 /win
parentc65827f247f8d376e0ece49f4bbadb067f61afee (diff)
downloadtigervnc-db512da0fbb49d9b96e64824ed381d2ac42769a8.tar.gz
tigervnc-db512da0fbb49d9b96e64824ed381d2ac42769a8.zip
[Bugfix] Fix 3-button mouse emulation in win viewer.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4404 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win')
-rw-r--r--win/rfb_win32/CPointer.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/rfb_win32/CPointer.cxx b/win/rfb_win32/CPointer.cxx
index 03f8a386..eda6e388 100644
--- a/win/rfb_win32/CPointer.cxx
+++ b/win/rfb_win32/CPointer.cxx
@@ -54,7 +54,7 @@ void CPointer::pointerEvent(InputHandler* writer, const Point& pos, int buttonMa
}
-inline int _abs(int x) {return x>0 ? x : 0;}
+inline int _abs(int x) {return x>0 ? x : -x;}
int emulate3Mask(int buttonMask) {
// - Release left & right and press middle
@@ -102,7 +102,7 @@ void CPointer::threePointerEvent(InputHandler* writer, const Point& pos, int but
if (threeTimer.isActive()) {
// - We are timing for an emulation event
- if (_abs(threePos.x - pos.x) <= 4 || _abs(threePos.y - pos.y) <= 4) {
+ if (_abs(threePos.x - pos.x) > 4 || _abs(threePos.y - pos.y) > 4) {
// If the mouse has moved too far since the button-change event then flush
vlog.debug("emulate3: stop timer (moved)");
threeTimer.stop();