summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2014-07-15 09:33:34 +0200
committerPierre Ossman <ossman@cendio.se>2014-07-15 09:33:34 +0200
commitc9629acf518634441c66e730721e0e9099382340 (patch)
treefc97b1d1139cdbdd4421e15b57514a1fba23e446
parentc8e34fe1485e4e63cfe4a84ed83dd7967bb156d9 (diff)
parent2770cfbf86141e4c4edaae0ab4228991b5e66bfb (diff)
downloadtigervnc-c9629acf518634441c66e730721e0e9099382340.tar.gz
tigervnc-c9629acf518634441c66e730721e0e9099382340.zip
Merge branch 'pointersync' of https://github.com/twaugh/tigervnc
-rw-r--r--unix/xserver/hw/vnc/Input.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
index 28b84c71..4ecd81e9 100644
--- a/unix/xserver/hw/vnc/Input.cc
+++ b/unix/xserver/hw/vnc/Input.cc
@@ -1,5 +1,5 @@
/* Copyright (C) 2009 TightVNC Team
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 2009, 2014 Red Hat, Inc.
* Copyright 2013 Pierre Ossman for Cendio AB
*
* This is free software; you can redistribute it and/or modify
@@ -202,6 +202,14 @@ void InputDevice::PointerMove(const rfb::Point &pos)
const rfb::Point &InputDevice::getPointerPos(void)
{
+ if (pointerDev != NULL) {
+ int x, y;
+
+ GetSpritePosition (pointerDev, &x, &y);
+ cursorPos.x = x;
+ cursorPos.y = y;
+ }
+
return cursorPos;
}